chore(release): publish

- @standardnotes/[email protected]

.github/workflows/web.release.prod.yml

@@ -45,10 +45,18 @@ jobs:
           aws-region: us-east-1
       - name: Deploy static site to S3 bucket
         run: aws s3 sync packages/web/dist/ s3://app.standardnotes.com --delete
-      - name: Invalidate CloudFront Cache
+      - name: Invalidate CloudFront Cache on .COM
         uses: chetan/invalidate-cloudfront-action@master
         env:
-          DISTRIBUTION: ${{ secrets.WEBAPP_CLOUDFRONT_DISTRIBUTION_ID }}
+          DISTRIBUTION: ${{ secrets.WEBAPP_CLOUDFRONT_COM_DISTRIBUTION_ID }}
+          PATHS: '/*'
+          AWS_REGION: 'us-east-1'
+          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+      - name: Invalidate CloudFront Cache on .ORG
+        uses: chetan/invalidate-cloudfront-action@master
+        env:
+          DISTRIBUTION: ${{ secrets.WEBAPP_CLOUDFRONT_ORG_DISTRIBUTION_ID }}
           PATHS: '/*'
           AWS_REGION: 'us-east-1'
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}

packages/blocks-editor/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.9.7](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-07)
+
+### Bug Fixes
+
+* improve variance between Super header font sizes and weights ([8b10330](https://github.com/standardnotes/app/commit/8b103307cba41855713b8627cf5d66a6fef6ff52))
+
 ## [1.9.6](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-11-30)
 
 ### Bug Fixes

packages/blocks-editor/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/blocks-editor",
-  "version": "1.9.6",
+  "version": "1.9.7",
   "private": true,
   "main": "./src/index.ts",
   "scripts": {

packages/blocks-editor/src/Lexical/Theme/editor.scss

@@ -20,19 +20,20 @@
   padding-left: 16px;
 }
 .Lexical__h1 {
-  font-size: 24px;
+  font-size: 26px;
   color: var(--sn-stylekit-editor-foreground-color);
-  font-weight: 400;
+  font-weight: 700;
   margin: 0;
 }
 .Lexical__h2 {
-  font-size: 15px;
+  font-size: 22px;
   color: var(--sn-stylekit-editor-foreground-color);
   font-weight: 700;
   margin: 0;
 }
 .Lexical__h3 {
-  font-size: 12px;
+  font-size: 19px;
+  font-weight: 700;
   margin: 0;
 }
 .Lexical__textBold {

packages/desktop/CHANGELOG.md

@@ -3,6 +3,26 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.104.15](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-07)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.104.14](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-07)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.104.13](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-06)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.104.12](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-06)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.104.11](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-05)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
 ## [3.104.10](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-05)
 
 **Note:** Version bump only for package @standardnotes/desktop

packages/desktop/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@standardnotes/desktop",
   "main": "./app/dist/index.js",
-  "version": "3.104.10",
+  "version": "3.104.15",
   "license": "AGPL-3.0-or-later",
   "author": "Standard Notes.",
   "private": true,

packages/docs/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.2.3](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-07)
+
+**Note:** Version bump only for package @standardnotes/docs
+
 ## [0.2.2](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-11-15)
 
 **Note:** Version bump only for package @standardnotes/docs

packages/docs/docs/extensions/themes.md

@@ -90,7 +90,7 @@ _Note that font and font sizes do not apply to mobile; only desktop/web._
   --sn-stylekit-sans-serif-font: -apple-system, BlinkMacSystemFont, 'Segoe UI',
     'Roboto', 'Oxygen', 'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans',
     'Helvetica Neue', sans-serif;
-    
+
   --sn-stylekit-grey-1:  #72767e;
   --sn-stylekit-grey-2:  #bbbec4;
   --sn-stylekit-grey-3:  #dfe1e4;
@@ -98,7 +98,7 @@ _Note that font and font sizes do not apply to mobile; only desktop/web._
   --sn-stylekit-grey-4-opacity-variant:  #bbbec43d;
   --sn-stylekit-grey-5:  #f4f5f7;
   --sn-stylekit-grey-6:  #e5e5e5;
-  
+
   --sn-stylekit-accessory-tint-color-1:  #086dd6;
   --sn-stylekit-accessory-tint-color-2:  #ea6595;
   --sn-stylekit-accessory-tint-color-3:  #ebad00;
@@ -108,6 +108,53 @@ _Note that font and font sizes do not apply to mobile; only desktop/web._
 }
 ```
 
+### Optional Overrides
+
+```css
+  --modal-background-color: var(--sn-stylekit-background-color);
+
+  --editor-header-bar-background-color: var(--sn-stylekit-background-color);
+  --editor-background-color: var(--sn-stylekit-editor-background-color);
+  --editor-foreground-color: var(--sn-stylekit-editor-foreground-color);
+  --editor-title-bar-border-bottom-color: var(--sn-stylekit-border-color);
+  --editor-title-input-color: var(--sn-stylekit-editor-foreground-color);
+  --editor-pane-background-color: var(--sn-stylekit-background-color);
+  --editor-pane-editor-background-color: var(--sn-stylekit-editor-background-color);
+  --editor-pane-editor-foreground-color: var(--sn-stylekit-editor-foreground-color);
+  --editor-pane-component-stack-item-background-color: var(--sn-stylekit-background-color);
+
+  --text-selection-color: var(--sn-stylekit-info-contrast-color);
+  --text-selection-background-color: var(--sn-stylekit-info-color);
+
+  --note-preview-progress-color: var(--sn-stylekit-info-color);
+  --note-preview-progress-background-color: var(--sn-stylekit-passive-color-4-opacity-variant);
+
+  --note-preview-selected-progress-color: var(--sn-stylekit-secondary-background-color);
+  --note-preview-selected-progress-background-color: var(--sn-stylekit-passive-color-4-opacity-variant);
+
+  --items-column-background-color: var(--sn-stylekit-background-color);
+  --items-column-items-background-color: var(--sn-stylekit-background-color);
+  --items-column-border-left-color: var(--sn-stylekit-border-color);
+  --items-column-border-right-color: var(--sn-stylekit-border-color);
+  --items-column-search-background-color: var(--sn-stylekit-contrast-background-color);
+  --item-cell-selected-background-color: var(--sn-stylekit-contrast-background-color);
+  --item-cell-selected-border-left-color: var(--sn-stylekit-info-color);
+
+  --navigation-column-background-color: var(--sn-stylekit-secondary-background-color);
+  --navigation-section-title-color: var(--sn-stylekit-secondary-foreground-color);
+  --navigation-item-text-color: var(--sn-stylekit-secondary-foreground-color);
+  --navigation-item-count-color: var(--sn-stylekit-neutral-color);
+  --navigation-item-selected-background-color: rgb(253, 253, 253);
+
+  --preferences-navigation-icon-color: var(--sn-stylekit-neutral-color);
+  --preferences-navigation-selected-background-color: var(--sn-stylekit-info-backdrop-color);
+
+  --dropdown-menu-radio-button-inactive-color: var(--sn-stylekit-passive-color-1);
+
+  --panel-resizer-background-color: var(--sn-stylekit-secondary-contrast-background-color);
+  --link-element-color: var(--sn-stylekit-info-color);
+```
+
 In order to get SN to display a dock icon for your theme (a circle in the lower right corner of the app that allows you to quickly toggle themes), add the following payload into the your ext.json file when [publishing your theme](/extensions/publishing):
 
 ```json

packages/docs/docs/specification/auth.md

@@ -1,303 +0,0 @@
----
-id: auth
-title: Auth API
-sidebar_label: Auth
-description: Authentication portion of the Standard Notes API.
-keywords:
-  - standard notes
-  - docs
-  - notes app
-  - end-to-end encryption
-  - sync
-image: /img/logo.png
-hide_title: false
-hide_table_of_contents: false
----
-
-### POST /auth
-
-**Registers a new user**
-
-|          |   |             |
-|-------------|---------|---------------------------------------------------------------------------------------------------------------------|
-| api         | `string`  | The API version to use. Must not be null, otherwise oldest API version used. Latest value is "20200115"             |
-| created     | `string`  | Integer timestamp representing the date the client generated the account's encryption keys. Example "1622494310383" |
-| email       | `string`  | The account email.                                                                                                  |
-| ephemeral   | `boolean` | Whether the initial session created for this account is ephemeral ("Stay signed in" unchecked).                     |
-| identifier  | `string`  | Should equal the account email.                                                                                     |
-| origination | `string`  | Should equal "registration"                                                                                         |
-| password    | `string`  | The server password generated by the client from the user's master password.                                        |
-| pw_nonce    | `string`  | The nonce generated by the client for the user's encryption key.                                                    |
-| version     | `string`  | The protocol version the client used to generate the user's encryption key. Latest is "004".                        |
-
-#### Response
-
-```JSON
-{
-	"session": {
-		"access_token": "1:457b1f4b-88c2-4328-bf32-fe7dd9431d62:WwKgTEDUoEhxECu6",
-		"refresh_token": "1:457b1f4b-88c2-4328-bf32-fe7dd9431d62:G-qEoZsFtoj~RLL-",
-		"access_expiration": 1627678312000,
-		"refresh_expiration": 1654051238000
-	},
-	"key_params": {
-		"created": "1622494310383",
-		"identifier": "[email protected]",
-		"origination": "registration",
-		"pw_nonce": "d97ed41c581fe8c3e0dce7d2ee72afcb63f9f461ae875bae66e30ecf3d952900",
-		"version": "004"
-	},
-	"user": {
-		"uuid": "682f9deb-b75f-4d97-91fa-6fd82a482db1",
-		"email": "[email protected]"
-	}
-}
-```
-
-### POST /auth/sign_in
-
-**Authenticates a user and returns a session.**
-
-|          |   |             |
-|-------------|---------|---------------------------------------------------------------------------------------------------------------------|
-| api         | `string`  | The API version to use. Must not be null, otherwise oldest API version used. Latest value is "20200115"             |
-| email       | `string`  | The account email.                                                                                                  |
-| ephemeral   | `boolean` | Whether the session created for this account is ephemeral ("Stay signed in" unchecked).                     |
-| password    | `string`  | The server password generated by the client from the user's master password.                                        |
-
-#### Response
-
-```JSON
-{
-	"session": {
-		"access_token": "1:ee03808d-dd05-417c-9c87-d471e49bcc49:Q~-UoIpDhdtkii_t",
-		"refresh_token": "1:ee03808d-dd05-417c-9c87-d471e49bcc49:Jn8UWzeHx2H5nZI5",
-		"access_expiration": 1627678779000,
-		"refresh_expiration": 1654051705000
-	},
-	"key_params": {
-		"created": "1622494310383",
-		"identifier": "[email protected]",
-		"origination": "registration",
-		"pw_nonce": "d97ed41c581fe8c3e0dce7d2ee72afcb63f9f461ae875bae66e30ecf3d952900",
-		"version": "004"
-	},
-	"user": {
-		"uuid": "682f9deb-b75f-4d97-91fa-6fd82a482db1",
-		"email": "[email protected]"
-	}
-}
-```
-
-### GET /auth/params
-
-**Queries the parameters used for key generation for an email address. Queried before signing into an account.**
-
-|          |   |             |
-|-------------|---------|---------------------------------------------------------------------------------------------------------------------|
-| api         | `string`  | The API version to use. Must not be null, otherwise oldest API version used. Latest value is "20200115"             |
-| email       | `string`  | The account email.                                                                                                  |
-
-#### Response
-
-```JSON
-{
-	"identifier": "[email protected]",
-	"pw_nonce": "d97ed41c581fe8c3e0dce7d2ee72afcb63f9f461ae875bae66e30ecf3d952900",
-	"version": "004"
-}
-```
-
-### POST /auth/change_pw
-
-**Changes a user's password.**
-
-|          |   |             |
-|-------------|---------|---------------------------------------------------------------------------------------------------------------------|
-| api         | `string`  | The API version to use. Must not be null, otherwise oldest API version used. Latest value is "20200115"             |
-| created     | `string`  | Integer timestamp representing the date the client generated the account's new encryption keys. Example "1622494310383" |
-| identifier  | `string`  | The account email.                                                                                                  |
-| origination | `string`  | Should equal "password-change"                                                                                         |
-| current_password    | `string`  | The old server password generated by the client from the user's master password.                                        |
-| new_password    | `string`  | The new server password generated by the client from the user's master password.                                        |
-| pw_nonce    | `string`  | The nonce generated by the client for the user's encryption key.                                                    |
-| version     | `string`  | The protocol version the client used to generate the user's encryption key. Latest is "004".                        |
-
-#### Response
-
-```JSON
-{
-	"session": {
-		"access_token": "1:27d4fd8f-b730-4e0a-afd3-1600fb466aaa:HMgmZwV5k5ePt0vj",
-		"refresh_token": "1:27d4fd8f-b730-4e0a-afd3-1600fb466aaa:wHuTeOB-qWGP3AE3",
-		"access_expiration": 1627679129000,
-		"refresh_expiration": 1654052055000
-	},
-	"key_params": {
-		"created": "1622494310383",
-		"identifier": "[email protected]",
-		"origination": "password-change",
-		"pw_nonce": "be1974ff6fb1c541aa8c71fd3c66851b6492cf224b661c72daf44e0bef3096bb",
-		"version": "004"
-	},
-	"user": {
-		"uuid": "682f9deb-b75f-4d97-91fa-6fd82a482db1",
-		"email": "[email protected]"
-	}
-}
-```
-
-## Sessions
-
-### Session Model
-
-| Field          | Type      | Description                                       |
-|----------------|-----------|---------------------------------------------------|
-| uuid           | `string`    | Unique identifier of the session                  |
-| user_uuid      | `string`    | Unique identifier of the user                     |
-| user_agent     | `string`    | The user agent used to create the session         |
-| api_version    | `string`    | The server API version used to create the session |
-| access_token   | `string`    | The access token used to authenticate requests    |
-| refresh_token  | `string`    | The refresh token used to extend tokens           |
-| access_expiration      | `datetime`  | The expiration time of the access token                |
-| refresh_expiration      | `datetime`  | The expiration time of the refresh token                |
-| created_at     | `datetime`  | Date and time of creation of the session          |
-| updated_at     | `datetime`  | Last updated date and time of the session         |
-
-- Each `session` includes the API version they were created with. This way we can deny sessions for a given API version if we detect a vulnerability with that version in the future
-- Sessions are created in the following cases:
-  - When a user signs in
-  - When a user registers a new account
-
----
-
-### Authenticated requests
-
-The `Authorization` request header field is used by clients to make authenticated request. `Bearer` is the only authentication scheme allowed.
-
-The client must send the `access` token generated by the session, in the `Authorization` header. For example:
-
-```
-GET /sessions HTTP/1.1
-Host: sync.standardnotes.org
-Authorization: Bearer <access token>
-```
-
----
-
-Below is a list of endpoints related to session management:
-
-| Method    | URL                      | Params              | Description                                            | Successful response code |
-|-----------|--------------------------|---------------------|--------------------------------------------------------|--------------------------|
-|`POST`     | /auth/sign_out           | *None*              | Terminates the current session                         | `204`                    |
-|`DELETE`   | /session                 | **uuid**            | Terminates the specified session by UUID               | `204`                    |
-|`DELETE`   | /sessions                | *None*              | Terminates all sessions, except the current one        | `204`                    |
-|`GET`      | /sessions                | *None*              | Lists all sessions active sessions                     | `200`                    |
-|`POST`     | /session/token/refresh   | **refresh_token**   | Obtains new pair of `access_token` and `refresh_token` | `200`                    |
-
-A successful request to `GET /sessions` returns the following JSON response:
-
-```json
-{
-  "sessions": [
-    {
-      "uuid": "xxxxxxxx-xxxx-Mxxx-Nxxx-xxxxxxxxxxxx",
-      "user_agent": "<product> / <product-version> <comment>",
-      "api_version": "xxxxyyzz",
-      "current": "<boolean>",
-      "created_at": "2020-01-01T00:00:00.000Z"
-    }
-    ...
-  ]
-}
-```
-
-#### Obtaining tokens
-
-Tokens can be obtained every time the user performs any of the following actions:
-
-1. When a user signs in
-1. When a user registers an account
-1. When the tokens are refreshed
-
-#### Refreshing tokens
-
-When an expired `access_token` is provided in the `Authorization` HTTP header, the following JSON response is returned:
-
-HTTP Status Code: `498 Expired Access Token`
-
-```json
-{
-  "error": {
-    "tag": "expired-access-token",
-    "message": "The provided access token has expired."
-  }
-}
-```
-
-To continue accessing resources, the `access_token` must be refreshed. That is, the current `access_token` is replaced with a new one with an extended expiration date.
-
-To refresh an `access_token`, a valid `refresh_token` is needed. This `refresh_token` must meet the following requirements:
-
-  - It should belong to the session of the `access_token`
-  - It should not be expired
-
-Since the `refresh_token` is of single-use, a new `refresh_token` is obtained when the `access_token` is refreshed.
-
-Refreshing tokens is a process that is transparent to the user, meaning that the client will perform the requests to keep valid tokens without user intervention.
-
-Here's how to refresh tokens:
-
-1. Send a `POST` request to `/session/token/refresh`. The body should contain a JSON paylaod with the `refresh_token`:
-    ```
-    POST /session/token/refresh HTTP/1.1
-    Host: sync.standardnotes.org
-    Authorization: Bearer <access token>
-
-    {
-      "refresh_token": "R_xxxxxxx-xxxx-Mxxx-Nxxx-xxxxxxxxxxxx"
-    }
-    ```
-
-1. The `refresh_token` is validated on the server. Depending of the circumstances, there should be two outcomes:
-    1. The provided `refresh_token` is valid. If so, a new pair of tokens is generated and the following JSON response is returned:
-        ```json
-        {
-          "token": "xxxxxxx-xxxx-Mxxx-Nxxx-xxxxxxxxxxxx",
-          "session": {
-            "refresh_expiration": 1583020800,
-            "refresh_token": "xxxxxxx-xxxx-Mxxx-Nxxx-xxxxxxxxxxxx",
-          }
-        }
-        ```
-    1. The provided `refresh_token` is expired. If so, the following JSON response is returned:
-
-        HTTP Status Code: `400 Bad Request`
-        ```json
-        {
-          "error": {
-            "tag": "expired-refresh-token",
-            "message": "The refresh token has expired."
-          }
-        }
-        ```
-        User must start a new session by re-entering their credentials.
-
-### Expiration
-
-#### Sessions
-
-Sessions should be terminated after a period of inactivity. This is for best security practices.
-
-`Long-lived sessions` are a good choice for our use case, because it can build a better user experience than expiring sessions for a short idle-timeout.
-
-- A `session` that remains inactive for `1 year` will be terminated, along with all `tokens`
-
-#### Tokens
-
-| Name      | Type        | Expiration    |
-|-----------|-------------|---------------|
-| `access`  | Short-lived | `60 days`     |
-| `refresh` | Long-lived  | `1 year`      |
-
-- A `refresh` token is of single-use, while an `access` token can be used as long as it is not expired

packages/docs/docs/specification/sync.md

@@ -1,118 +0,0 @@
----
-id: sync
-title: Sync API
-sidebar_label: Sync
-description: Specification for the Standard Notes Sync API.
-keywords:
-  - standard notes
-  - docs
-  - notes app
-  - end-to-end encryption
-  - sync
-image: /img/logo.png
-hide_title: false
-hide_table_of_contents: false
----
-
-This document outlines the client-server communication of the Standard Notes ecosystem.
-
-## Item
-
-An `Item` is largely the only model that both clients and server are concerned wtih. The `content` field stores an encrypted object that can be anything the client needs to operate.
-
-Relationships between items are handled by the client, and not the server, and are stored encrypted in the `content` field as `references`.
-
-Items have the following properties:
-
-| name         | type                                | description                                                                                  |
-| ------------ | ----------------------------------- | -------------------------------------------------------------------------------------------- |
-| uuid         | `string` (or uuid for some databases) | The unique identifier for this item.                                                        |
-| content      | `text`                                | An encrypted string generated by the client.                                           |
-| content_type | `string`                              | The type of data contained in the `content` field. (i.e Note, Tag, SN|Component, etc.) |
-| enc_item_key | `text`                                | The key used to encrypt `content`, itself also encrypted.                                           |
-| deleted      | `boolean`                                | Whether the model has been deleted.                                                          |
-| created_at_timestamp   | `integer`                                | Timestamp representing when the item was created, with microsecond precision.                                                              |
-| updated_at_timestamp   | `integer`                                | Timestamp representing when the item was updated _by the server_, with microsecond precision.                                                             |
-
-## Content
-
-Data generated by the client is stored in the `content` field of the `Item`. An item's `content` is "sticky" and can have any property the client chooses, as well as the following:
-
-| name       | type       | description                                                                                                                                 |
-| ---------- | ---------- | ------------------------------------------------------------------------------------------------------------------------------------------- |
-| appData    | `dictionary` | A domain based dictionary whose content must be preserved between platforms. `appData[domain]` contains data the client stores in the item. |
-| references | `array`      | A metadata array of other `Item` uuids this item is related to and their respective `content_type`. See sample below.                      |
-
-`references` array structure:
-
-```JSON
-[
-  {uuid: xxxx, content_type: "Tag"},
-  {uuid: xxxxx, content_type: "Tag"},
-]
-```
-
-## REST API
-
-General:
-
-1.  All requests after initial authentication should be authenticated with a session token in the `Authorization` header:
-
-    ```
-    Authorization: Bearer <access token>
-
-    ```
-
-### POST items/sync
-
-|          |   |             |
-|-------------------|---------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| api               | `string`  | The API version to use. Must not be null, otherwise oldest API version used. Latest value is "20200115".                                                                         |
-| compute_integrity | `boolean` | Should be false in most cases. Pass true if you plan to read the `integrity_hash` result (integrity can be optionally checked once on app launch).                                           |
-| items             | `array`   | An array of Items.                                                                                                                                                              |
-| limit             | `integer` | The maximum number of items to return per request. Official clients use 150.                                                                                                    |
-| sync_token        | `string`  | An opaque token returned by the server from a previous sync request. This lets the server know to pull in only new changes.                                                     |
-| cursor_token      | `string`  | An opaque pagination token returned by the server from a previous multi-page sync request. Send this value back only if the server returned this value from a previous request. |
-
-#### Response
-
-```JSON
-{
-    "retrieved_items": Array<Item>,
-    "saved_items": Array<Item>,
-    "conflicts": Array<Conflict>,
-    "sync_token": string,
-    "cursor_token": string?,
-    "integrity_hash": string?,
-}
-```
-
-|          |             |
-|-----------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| retrieved_items | Items that are new to the client or have been modified since last sync and should be merged with local values or created locally.                                                                   |
-| saved_items     | Items which have been successfully saved. Clients should merge *only* the resulting `updated_at_timestamp` with local values. Do not update local value of `content` from remote `saved_items` value. |
-| conflicts       | Items which have not been saved by the server and returned to client.                                                                                                                               |
-| sync_token      | An opaque token which should be sent back to server in subsequent sync request.                                                                                                                     |
-| cursor_token    | An opaque token which should be sent back to server in subsequent sync request (if present).                                                                                                        |
-
-#### Conflicts
-
-```typescript
-type Conflict = {
-  server_item?: Item
-  unsaved_item?: Item
-  type: 'sync_conflict' | 'uuid_conflict'
-}
-```
-
-A `sync_conflict` occurs when the item the client is attempting to save has a newer change on the server. The server is able to determine this by reading the `updated_at_timestamp` value from both the incoming payload and the server payload. If the incoming payload's `updated_at_timestamp` != to the server's `updated_at_timestamp` for that item, the save is rejected and returned to client as a `sync_conflict`. These types of conflicts are not uncommon.
-
-To resolve a `sync_conflict`, the client must choose a winner between server_item and unsaved_item then re-sync. The winning item should have its updated_at_timestamp value set to the server's value.
-
-A `uuid_conflict` occurs when the UUID the client has choosen for an item for X user already belongs to an item for Y user. This should mostly only occur when a user registers a new account and imports a data backup from another account.
-
-To resolve a `uuid_conflict`, change the UUID of the item attempting to be saved to a new UUID, then re-sync.
-
-#### Deletion
-
-To delete an item permanently, set `deleted` to `true` on the `Item` and sync. When receiving an item that is `deleted`, remove it from the local database immediately.

packages/docs/docs/welcome.md

@@ -23,8 +23,6 @@ This documentation explains how to get started with using Standard Notes, publis
 - [Self-hosting a Syncing Server](/self-hosting/getting-started)
 - [Developing Extensions](/extensions/intro)
 - [Client Encryption API](/specification/encryption)
-- [Sync API](/specification/sync)
-- [Auth API](/specification/auth)
 
 ## Staying informed
 

packages/docs/docusaurus.config.js

@@ -43,11 +43,6 @@ module.exports = {
               label: 'Client Encryption API',
               position: 'left',
             },
-            {
-              to: '/specification/sync',
-              label: 'Server API',
-              position: 'left',
-            },
             {
               to: '/extensions/intro',
               label: 'Build an Extension',

packages/docs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/docs",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "license": "AGPL-3.0-or-later",
   "author": "Standard Notes.",
   "private": true,

packages/docs/sidebars.js

@@ -14,11 +14,7 @@ module.exports = {
         ],
       },
       {
-        API: [
-          'specification/encryption',
-          'specification/sync',
-          'specification/auth',
-        ],
+        API: ['specification/encryption'],
       },
       {
         Extensions: [

packages/mobile/CHANGELOG.md

@@ -3,6 +3,30 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.49.14](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-07)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.49.13](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-07)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.49.12](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-06)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.49.11](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-06)
+
+### Bug Fixes
+
+* fixed issue where camera was not accessible for Moments on Android ([ffbc984](https://github.com/standardnotes/app/commit/ffbc984c5851f3cd286cd0a832111ba707bbd8f5))
+
+## [3.49.10](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-05)
+
+### Bug Fixes
+
+* fixes issue where add button would not be visible at times on iOS ([#2087](https://github.com/standardnotes/app/issues/2087)) ([c928f8a](https://github.com/standardnotes/app/commit/c928f8a281ad4e45c79c6c43f009175e5cbbed46))
+
 ## [3.49.9](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-05)
 
 **Note:** Version bump only for package @standardnotes/mobile

packages/mobile/android/app/src/main/AndroidManifest.xml

@@ -14,6 +14,9 @@
     <uses-permission android:name="android.permission.USE_BIOMETRIC"/>
     <uses-permission android:name="android.permission.USE_FINGERPRINT"/>
 
+    <uses-permission android:name="android.permission.CAMERA" />
+    <uses-feature android:name="android.hardware.camera" android:required="false" />
+
     <uses-permission android:name="com.fingerprints.service.ACCESS_FINGERPRINT_MANAGER"/>
     <uses-permission android:name="com.samsung.android.providers.context.permission.WRITE_USE_APP_FEATURE_SURVEY"/>
 

packages/mobile/ios/Podfile.lock

@@ -583,7 +583,7 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
   boost: a7c83b31436843459a1961bfd74b96033dc77234
   CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
-  DoubleConversion: 831926d9b8bf8166fd87886c4abab286c2422662
+  DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54
   FBLazyVector: 48289402952f4f7a4e235de70a9a590aa0b79ef4
   FBReactNativeSpec: dd1186fd05255e3457baa2f4ca65e94c2cd1e3ac
   Flipper: 26fc4b7382499f1281eb8cb921e5c3ad6de91fe0
@@ -596,7 +596,7 @@ SPEC CHECKSUMS:
   Flipper-RSocket: d9d9ade67cbecf6ac10730304bf5607266dd2541
   FlipperKit: cbdee19bdd4e7f05472a66ce290f1b729ba3cb86
   fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
-  glog: 85ecdd10ee8d8ec362ef519a6a45ff9aa27b2e85
+  glog: 04b94705f318337d7ead9e6d17c019bd9b1f6b1b
   hermes-engine: 2af7b7a59128f250adfd86f15aa1d5a2ecd39995
   libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
   OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c

packages/mobile/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/mobile",
-  "version": "3.49.9",
+  "version": "3.49.14",
   "author": "Standard Notes.",
   "private": true,
   "license": "AGPL-3.0-or-later",

packages/releases/CHANGELOG.md

@@ -3,6 +3,26 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.4.38](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-07)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.4.37](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-07)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.4.36](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-06)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.4.35](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-06)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.4.34](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-05)
+
+**Note:** Version bump only for package @standardnotes/releases
+
 ## [1.4.33](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-05)
 
 **Note:** Version bump only for package @standardnotes/releases

packages/releases/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/releases",
-  "version": "1.4.33",
+  "version": "1.4.38",
   "license": "AGPL-3.0-or-later",
   "main": "dist/releases.json",
   "types": "dist/index.d.ts",

packages/ui-services/CHANGELOG.md

@@ -3,6 +3,16 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.19.3](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-07)
+
+### Bug Fixes
+
+* Fixed workspace menu item rename issue ([45cdab6](https://github.com/standardnotes/app/commit/45cdab6f6c0416e0a01a66e4b4983ff0a52c1afc))
+
+## [1.19.2](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-06)
+
+**Note:** Version bump only for package @standardnotes/ui-services
+
 ## [1.19.1](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-05)
 
 **Note:** Version bump only for package @standardnotes/ui-services

packages/ui-services/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/ui-services",
-  "version": "1.19.1",
+  "version": "1.19.3",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },

packages/ui-services/src/Keyboard/KeyboardKey.ts

@@ -9,4 +9,5 @@ export enum KeyboardKey {
   Escape = 'Escape',
   Home = 'Home',
   End = 'End',
+  Space = ' ',
 }

packages/ui-services/src/Route/RouteService.ts

@@ -35,6 +35,10 @@ export class RouteService
     return new RouteParser(window.location.href)
   }
 
+  get isDotOrg(): boolean {
+    return window.location.host === 'app.standardnotes.org'
+  }
+
   removeQueryParameterFromURL(param: RootQueryParam): void {
     const urlSearchParams = new URLSearchParams(window.location.search)
     urlSearchParams.delete(param)

packages/ui-services/src/Route/RouteServiceInterface.ts

@@ -5,4 +5,5 @@ export interface RouteServiceInterface {
   deinit(): void
   getRoute(): RouteParserInterface
   removeQueryParameterFromURL(param: RootQueryParam): void
+  get isDotOrg(): boolean
 }

packages/web/CHANGELOG.md

@@ -3,6 +3,42 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.121.1](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-07)
+
+### Bug Fixes
+
+* Fixed issue about note UUID not being selectable in menu ([5a0c005](https://github.com/standardnotes/app/commit/5a0c005e8c0373e2f47fa613fc5bfec0e84cdb37))
+* Fixed workspace menu item rename issue ([45cdab6](https://github.com/standardnotes/app/commit/45cdab6f6c0416e0a01a66e4b4983ff0a52c1afc))
+
+# [3.121.0](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-07)
+
+### Bug Fixes
+
+* Fixed issue where Dark theme could be called 'Focus' in Appearance preferences ([d691d7a](https://github.com/standardnotes/app/commit/d691d7a3b34f7f4249138baa4c3f27b79a9f8e6c))
+* Fixed issue where entering a space or punctuation in Super autocomplete would dismiss menu ([a5b1ff9](https://github.com/standardnotes/app/commit/a5b1ff95957a9d407663d28429785457aef3a1b4))
+
+### Features
+
+* add Indent/Outdent options in Super when on mobile ([a70d100](https://github.com/standardnotes/app/commit/a70d1009a3d8d6be1395bf148a46c3cb2260dcdc))
+
+## [3.120.3](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-06)
+
+### Bug Fixes
+
+* Fixed error when trying to upload file ([6a1b6ce](https://github.com/standardnotes/app/commit/6a1b6cef1bab42d9de1a0a396c38cd899529648a))
+
+## [3.120.2](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-06)
+
+### Bug Fixes
+
+* fixed issue where popover menus would open with incorrect positioning on desktop ([a66bb08](https://github.com/standardnotes/app/commit/a66bb08c3b715f942480c7006fdea213a0bfc956))
+
+## [3.120.1](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-05)
+
+### Bug Fixes
+
+* fixes issue where add button would not be visible at times on iOS ([#2087](https://github.com/standardnotes/app/issues/2087)) ([c928f8a](https://github.com/standardnotes/app/commit/c928f8a281ad4e45c79c6c43f009175e5cbbed46))
+
 # [3.120.0](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-05)
 
 ### Bug Fixes

packages/web/CHANGELOG.md.json

@@ -1,5 +1,83 @@
 {
   "versions": [
+    {
+      "version": "3.121.1",
+      "title": "[3.121.1](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-07)",
+      "date": null,
+      "body": "### Bug Fixes\n\n* Fixed issue about note UUID not being selectable in menu ([5a0c005](https://github.com/standardnotes/app/commit/5a0c005e8c0373e2f47fa613fc5bfec0e84cdb37))\n* Fixed workspace menu item rename issue ([45cdab6](https://github.com/standardnotes/app/commit/45cdab6f6c0416e0a01a66e4b4983ff0a52c1afc))",
+      "parsed": {
+        "_": [
+          "Fixed issue about note UUID not being selectable in menu (5a0c005)",
+          "Fixed workspace menu item rename issue (45cdab6)"
+        ],
+        "Bug Fixes": [
+          "Fixed issue about note UUID not being selectable in menu (5a0c005)",
+          "Fixed workspace menu item rename issue (45cdab6)"
+        ]
+      }
+    },
+    {
+      "version": "3.121.0",
+      "title": "[3.121.0](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-07)",
+      "date": null,
+      "body": "### Bug Fixes\n\n* Fixed issue where Dark theme could be called 'Focus' in Appearance preferences ([d691d7a](https://github.com/standardnotes/app/commit/d691d7a3b34f7f4249138baa4c3f27b79a9f8e6c))\n* Fixed issue where entering a space or punctuation in Super autocomplete would dismiss menu ([a5b1ff9](https://github.com/standardnotes/app/commit/a5b1ff95957a9d407663d28429785457aef3a1b4))\n\n### Features\n\n* add Indent/Outdent options in Super when on mobile ([a70d100](https://github.com/standardnotes/app/commit/a70d1009a3d8d6be1395bf148a46c3cb2260dcdc))",
+      "parsed": {
+        "_": [
+          "Fixed issue where Dark theme could be called 'Focus' in Appearance preferences (d691d7a)",
+          "Fixed issue where entering a space or punctuation in Super autocomplete would dismiss menu (a5b1ff9)",
+          "add Indent/Outdent options in Super when on mobile (a70d100)"
+        ],
+        "Bug Fixes": [
+          "Fixed issue where Dark theme could be called 'Focus' in Appearance preferences (d691d7a)",
+          "Fixed issue where entering a space or punctuation in Super autocomplete would dismiss menu (a5b1ff9)"
+        ],
+        "Features": [
+          "add Indent/Outdent options in Super when on mobile (a70d100)"
+        ]
+      }
+    },
+    {
+      "version": "3.120.3",
+      "title": "[3.120.3](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-06)",
+      "date": null,
+      "body": "### Bug Fixes\n\n* Fixed error when trying to upload file ([6a1b6ce](https://github.com/standardnotes/app/commit/6a1b6cef1bab42d9de1a0a396c38cd899529648a))",
+      "parsed": {
+        "_": [
+          "Fixed error when trying to upload file (6a1b6ce)"
+        ],
+        "Bug Fixes": [
+          "Fixed error when trying to upload file (6a1b6ce)"
+        ]
+      }
+    },
+    {
+      "version": "3.120.2",
+      "title": "[3.120.2](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-06)",
+      "date": null,
+      "body": "### Bug Fixes\n\n* fixed issue where popover menus would open with incorrect positioning on desktop ([a66bb08](https://github.com/standardnotes/app/commit/a66bb08c3b715f942480c7006fdea213a0bfc956))",
+      "parsed": {
+        "_": [
+          "fixed issue where popover menus would open with incorrect positioning on desktop (a66bb08)"
+        ],
+        "Bug Fixes": [
+          "fixed issue where popover menus would open with incorrect positioning on desktop (a66bb08)"
+        ]
+      }
+    },
+    {
+      "version": "3.120.1",
+      "title": "[3.120.1](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-05)",
+      "date": null,
+      "body": "### Bug Fixes\n\n* fixes issue where add button would not be visible at times on iOS ([#2087](https://github.com/standardnotes/app/issues/2087)) ([c928f8a](https://github.com/standardnotes/app/commit/c928f8a281ad4e45c79c6c43f009175e5cbbed46))",
+      "parsed": {
+        "_": [
+          "fixes issue where add button would not be visible at times on iOS (#2087) (c928f8a)"
+        ],
+        "Bug Fixes": [
+          "fixes issue where add button would not be visible at times on iOS (#2087) (c928f8a)"
+        ]
+      }
+    },
     {
       "version": "3.120.0",
       "title": "[3.120.0](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-05)",

packages/web/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/web",
-  "version": "3.120.0",
+  "version": "3.121.1",
   "license": "AGPL-3.0-or-later",
   "main": "dist/app.js",
   "author": "Standard Notes",

packages/web/src/javascripts/Application/Application.spec.ts

@@ -27,7 +27,7 @@ describe('web application', () => {
   beforeEach(() => {
     const identifier = '123'
 
-    window.matchMedia = jest.fn().mockReturnValue({ matches: true, addListener: jest.fn() })
+    window.matchMedia = jest.fn().mockReturnValue({ matches: false, addListener: jest.fn() })
 
     const device = {
       environment: Environment.Desktop,

packages/web/src/javascripts/Components/AccountMenu/WorkspaceSwitcher/WorkspaceMenuItem.tsx

@@ -51,54 +51,56 @@ const WorkspaceMenuItem: FunctionComponent<Props> = ({
   const handleInputBlur: FocusEventHandler<HTMLInputElement> = useCallback(() => {
     renameDescriptor(inputValue)
     setIsRenaming(false)
-    setInputValue('')
   }, [inputValue, renameDescriptor])
 
   return (
-    <MenuRadioButtonItem
-      className="flex w-full cursor-pointer items-center border-0 bg-transparent px-3 py-2 text-left text-sm text-text hover:bg-contrast hover:text-foreground focus:bg-info-backdrop focus:shadow-none"
-      onClick={onClick}
-      checked={descriptor.primary}
-    >
-      <div className="ml-2 flex w-full items-center justify-between">
-        {isRenaming ? (
-          <input
-            ref={inputRef}
-            type="text"
-            value={inputValue}
-            onChange={handleChange}
-            onKeyDown={handleInputKeyDown}
-            onBlur={handleInputBlur}
-          />
-        ) : (
-          <div>{descriptor.label}</div>
-        )}
-        {descriptor.primary && !hideOptions && (
-          <div className="flex items-center">
-            <a
-              role="button"
-              className="mr-3 h-5 w-5 cursor-pointer border-0 bg-transparent p-0 hover:bg-contrast"
-              onClick={(e) => {
-                e.stopPropagation()
-                setIsRenaming((isRenaming) => !isRenaming)
-              }}
-            >
-              <Icon type="pencil" className="text-neutral" size="medium" />
-            </a>
-            <a
-              role="button"
-              className="h-5 w-5 cursor-pointer border-0 bg-transparent p-0 hover:bg-contrast"
-              onClick={(e) => {
-                e.stopPropagation()
-                onDelete()
-              }}
-            >
-              <Icon type="trash" className="text-danger" size="medium" />
-            </a>
-          </div>
-        )}
-      </div>
-    </MenuRadioButtonItem>
+    <div className="relative">
+      <MenuRadioButtonItem
+        className="flex w-full cursor-pointer items-center border-0 bg-transparent px-3 py-2 text-left text-sm text-text hover:bg-contrast hover:text-foreground focus:bg-info-backdrop focus:shadow-none"
+        onClick={onClick}
+        checked={descriptor.primary}
+      >
+        <div className="ml-2 flex w-full items-center justify-between">
+          {!isRenaming && <div>{descriptor.label}</div>}
+          {descriptor.primary && !hideOptions && (
+            <div className="flex items-center">
+              <a
+                role="button"
+                className="mr-3 flex h-5 w-5 cursor-pointer items-center justify-center border-0 bg-transparent p-0 hover:bg-contrast"
+                onClick={(e) => {
+                  e.stopPropagation()
+                  setIsRenaming((isRenaming) => !isRenaming)
+                }}
+              >
+                <Icon type="pencil" className="text-neutral" size="medium" />
+              </a>
+              <a
+                role="button"
+                className="flex h-5 w-5 cursor-pointer items-center justify-center border-0 bg-transparent p-0 hover:bg-contrast"
+                onClick={(e) => {
+                  e.stopPropagation()
+                  onDelete()
+                }}
+              >
+                <Icon type="trash" className="text-danger" size="medium" />
+              </a>
+            </div>
+          )}
+        </div>
+      </MenuRadioButtonItem>
+      {isRenaming && (
+        <input
+          ref={inputRef}
+          type="text"
+          value={inputValue}
+          onChange={handleChange}
+          onKeyDown={handleInputKeyDown}
+          onBlur={handleInputBlur}
+          onClick={(e) => e.stopPropagation()}
+          className="absolute top-1/2 left-11 -translate-y-1/2 bg-default"
+        />
+      )}
+    </div>
   )
 }
 

packages/web/src/javascripts/Components/ApplicationView/ApplicationView.tsx

@@ -26,6 +26,7 @@ import DarkModeHandler from '../DarkModeHandler/DarkModeHandler'
 import ApplicationProvider from '../ApplicationProvider'
 import CommandProvider from '../CommandProvider'
 import PanesSystemComponent from '../Panes/PanesSystemComponent'
+import DotOrgNotice from './DotOrgNotice'
 
 type Props = {
   application: WebApplication
@@ -230,6 +231,7 @@ const ApplicationView: FunctionComponent<Props> = ({ application, mainApplicatio
                     viewControllerManager={viewControllerManager}
                   />
                 </>
+                {application.routeService.isDotOrg && <DotOrgNotice />}
               </div>
             </PremiumModalProvider>
           </ResponsivePaneProvider>

packages/web/src/javascripts/Components/ApplicationView/DotOrgNotice.tsx

@@ -0,0 +1,16 @@
+import { FunctionComponent } from 'react'
+
+const DotOrgNotice: FunctionComponent = () => {
+  return (
+    <div className="align-center z-modal flex h-30 w-full w-full items-center bg-danger text-center text-info-contrast">
+      <div className="w-full text-center text-xl font-bold">
+        app.standardnotes.org is no longer maintained. Please switch to{' '}
+        <a className="underline" href="https://app.standardnotes.com">
+          app.standardnotes.com
+        </a>
+      </div>
+    </div>
+  )
+}
+
+export default DotOrgNotice

packages/web/src/javascripts/Components/ContentListView/ContentListView.tsx

@@ -35,6 +35,8 @@ import { ListableContentItem } from './Types/ListableContentItem'
 import { FeatureName } from '@/Controllers/FeatureName'
 import { PanelResizedData } from '@/Types/PanelResizedData'
 import { useForwardedRef } from '@/Hooks/useForwardedRef'
+import { isMobileScreen } from '@/Utils'
+import FloatingAddButton from './FloatingAddButton'
 
 type Props = {
   accountMenuController: AccountMenuController
@@ -285,6 +287,9 @@ const ContentListView = forwardRef<HTMLDivElement, Props>(
         aria-label={'Notes & Files'}
         ref={innerRef}
       >
+        {isMobileScreen() && (
+          <FloatingAddButton onClick={addNewItem} label={addButtonLabel} style={dailyMode ? 'danger' : 'info'} />
+        )}
         <div id="items-title-bar" className="section-title-bar border-b border-solid border-border">
           <div id="items-title-bar-container">
             {selectedTag && (

packages/web/src/javascripts/Components/ContentListView/FloatingAddButton.tsx

@@ -0,0 +1,34 @@
+import { classNames } from '@standardnotes/snjs'
+import { ButtonStyle, getColorsForPrimaryVariant } from '../Button/Button'
+import Icon from '../Icon/Icon'
+
+type Props = {
+  label: string
+  style: ButtonStyle
+  onClick?: () => void
+}
+
+const PropertiesRequiredForFixedPositioningToWorkOnIOSSafari: React.CSSProperties = {
+  transform: 'translate3d(0, 0, 0)',
+}
+
+const FloatingAddButton = ({ label, style, onClick }: Props) => {
+  const buttonClasses = getColorsForPrimaryVariant(style)
+  return (
+    <button
+      className={classNames(
+        'fixed bottom-6 right-6 z-editor-title-bar ml-3 flex h-15 w-15 cursor-pointer items-center',
+        `justify-center rounded-full border border-solid border-transparent ${buttonClasses}`,
+        'hover:brightness-125',
+      )}
+      title={label}
+      aria-label={label}
+      onClick={onClick}
+      style={PropertiesRequiredForFixedPositioningToWorkOnIOSSafari}
+    >
+      <Icon type="add" size="custom" className="h-8 w-8" />
+    </button>
+  )
+}
+
+export default FloatingAddButton

packages/web/src/javascripts/Components/ContentListView/Header/ContentListHeader.tsx

@@ -86,17 +86,18 @@ const ContentListHeader = ({
     return (
       <button
         className={classNames(
-          'fixed bottom-6 right-6 z-editor-title-bar ml-3 flex h-15 w-15 cursor-pointer items-center',
+          'hidden md:flex',
+          'h-8 w-8 hover:brightness-125',
+          'z-editor-title-bar ml-3  cursor-pointer items-center',
           `justify-center rounded-full border border-solid border-transparent ${
             isDailyEntry ? 'bg-danger text-danger-contrast' : 'bg-info text-info-contrast'
           }`,
-          'hover:brightness-125 md:static md:h-8 md:w-8',
         )}
         title={addButtonLabel}
         aria-label={addButtonLabel}
         onClick={addNewItem}
       >
-        <Icon type="add" size="custom" className="h-8 w-8 md:h-5 md:w-5" />
+        <Icon type="add" size="custom" className="h-5 w-5" />
       </button>
     )
   }, [addButtonLabel, addNewItem, isDailyEntry])

packages/web/src/javascripts/Components/LinkedItems/LinkedItemBubble.tsx

@@ -10,6 +10,7 @@ import { LinkableItem } from '@/Utils/Items/Search/LinkableItem'
 import { getIconForItem } from '@/Utils/Items/Icons/getIconForItem'
 import { useApplication } from '../ApplicationProvider'
 import { getTitleForLinkedTag } from '@/Utils/Items/Display/getTitleForLinkedTag'
+import { getItemTitleInContextOfLinkBubble } from '@/Utils/Items/Search/doesItemMatchSearchQuery'
 
 type Props = {
   link: ItemLink
@@ -117,7 +118,7 @@ const LinkedItemBubble = ({
           {link.type === 'linked-by' && link.item.content_type !== ContentType.Tag && (
             <span className={!isBidirectional ? 'hidden group-focus:block' : ''}>Linked By:</span>
           )}
-          {link.item.title}
+          {getItemTitleInContextOfLinkBubble(link.item)}
         </span>
       </span>
       {showUnlinkButton && (

packages/web/src/javascripts/Components/LinkedItems/LinkedItemMeta.tsx

@@ -6,6 +6,7 @@ import { LinkableItem } from '@/Utils/Items/Search/LinkableItem'
 import { observer } from 'mobx-react-lite'
 import { useApplication } from '../ApplicationProvider'
 import Icon from '../Icon/Icon'
+import { getItemTitleInContextOfLinkBubble } from '@/Utils/Items/Search/doesItemMatchSearchQuery'
 
 type Props = {
   item: LinkableItem
@@ -16,7 +17,7 @@ const LinkedItemMeta = ({ item, searchQuery }: Props) => {
   const application = useApplication()
   const [icon, className] = getIconForItem(item, application)
   const tagTitle = getTitleForLinkedTag(item, application)
-  const title = item.title ?? ''
+  const title = getItemTitleInContextOfLinkBubble(item)
 
   return (
     <>

packages/web/src/javascripts/Components/Menu/Menu.tsx

@@ -1,4 +1,4 @@
-import { CSSProperties, forwardRef, KeyboardEventHandler, ReactNode, Ref, useCallback, useEffect, useRef } from 'react'
+import { CSSProperties, forwardRef, KeyboardEventHandler, ReactNode, Ref, useCallback, useRef } from 'react'
 import { KeyboardKey } from '@standardnotes/ui-services'
 import { useListKeyboardNavigation } from '@/Hooks/useListKeyboardNavigation'
 import { mergeRefs } from '@/Hooks/mergeRefs'
@@ -23,7 +23,6 @@ const Menu = forwardRef(
       style,
       a11yLabel,
       closeMenu,
-      isOpen,
       initialFocus,
       onKeyDown,
       shouldAutoFocus = true,
@@ -44,15 +43,7 @@ const Menu = forwardRef(
       [closeMenu, onKeyDown],
     )
 
-    useListKeyboardNavigation(menuElementRef, initialFocus)
-
-    useEffect(() => {
-      if (isOpen && shouldAutoFocus) {
-        setTimeout(() => {
-          menuElementRef.current?.focus()
-        }, 5)
-      }
-    }, [isOpen, shouldAutoFocus])
+    useListKeyboardNavigation(menuElementRef, initialFocus, shouldAutoFocus)
 
     return (
       <menu

packages/web/src/javascripts/Components/NoteView/NoteView.tsx

@@ -905,9 +905,7 @@ class NoteView extends AbstractComponent<NoteViewProps, State> {
                 </div>
               )}
             </div>
-            {editorMode !== 'super' && (
-              <LinkedItemBubblesContainer linkingController={this.viewControllerManager.linkingController} />
-            )}
+            <LinkedItemBubblesContainer linkingController={this.viewControllerManager.linkingController} />
           </div>
         )}
 

packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/BlockPickerPlugin/BlockPickerPlugin.tsx

@@ -23,9 +23,12 @@ import Popover from '@/Components/Popover/Popover'
 import { PopoverClassNames } from '../ClassNames'
 import { GetDatetimeBlocks } from './Blocks/DateTime'
 import { isMobileScreen } from '@/Utils'
+import { useApplication } from '@/Components/ApplicationProvider'
+import { GetIndentOutdentBlocks } from './Blocks/IndentOutdent'
 
 export default function BlockPickerMenuPlugin(): JSX.Element {
   const [editor] = useLexicalComposerContext()
+  const application = useApplication()
   const [modal, showModal] = useModal()
   const [queryString, setQueryString] = useState<string | null>(null)
 
@@ -36,9 +39,12 @@ export default function BlockPickerMenuPlugin(): JSX.Element {
   const [popoverOpen, setPopoverOpen] = useState(true)
 
   const options = useMemo(() => {
+    const indentOutdentOptions = application.isNativeMobileWeb() ? GetIndentOutdentBlocks(editor) : []
+
     const baseOptions = [
       GetParagraphBlock(editor),
       ...GetHeadingsBlocks(editor),
+      ...indentOutdentOptions,
       GetTableBlock(() =>
         showModal('Insert Table', (onClose) => <InsertTableDialog activeEditor={editor} onClose={onClose} />),
       ),
@@ -70,7 +76,7 @@ export default function BlockPickerMenuPlugin(): JSX.Element {
           }),
         ]
       : baseOptions
-  }, [editor, queryString, showModal])
+  }, [editor, queryString, showModal, application])
 
   const onSelectOption = useCallback(
     (

packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/BlockPickerPlugin/Blocks/IndentOutdent.tsx

@@ -0,0 +1,17 @@
+import { BlockPickerOption } from '../BlockPickerOption'
+import { INDENT_CONTENT_COMMAND, OUTDENT_CONTENT_COMMAND, LexicalEditor } from 'lexical'
+
+export function GetIndentOutdentBlocks(editor: LexicalEditor) {
+  return [
+    new BlockPickerOption('Indent', {
+      iconName: 'arrow-right',
+      keywords: ['indent'],
+      onSelect: () => editor.dispatchCommand(INDENT_CONTENT_COMMAND, undefined),
+    }),
+    new BlockPickerOption('Outdent', {
+      iconName: 'arrow-left',
+      keywords: ['outdent'],
+      onSelect: () => editor.dispatchCommand(OUTDENT_CONTENT_COMMAND, undefined),
+    }),
+  ]
+}

packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/ItemSelectionPlugin/ItemSelectionPlugin.tsx

@@ -1,5 +1,5 @@
 import { useLexicalComposerContext } from '@lexical/react/LexicalComposerContext'
-import { LexicalTypeaheadMenuPlugin, useBasicTypeaheadTriggerMatch } from '@lexical/react/LexicalTypeaheadMenuPlugin'
+import { LexicalTypeaheadMenuPlugin } from '@lexical/react/LexicalTypeaheadMenuPlugin'
 import { TextNode } from 'lexical'
 import { FunctionComponent, useCallback, useMemo, useState } from 'react'
 import { ItemSelectionItemComponent } from './ItemSelectionItemComponent'
@@ -12,6 +12,7 @@ import { INSERT_BUBBLE_COMMAND, INSERT_FILE_COMMAND } from '../Commands'
 import { useLinkingController } from '../../../../../Controllers/LinkingControllerProvider'
 import { PopoverClassNames } from '../ClassNames'
 import { isMobileScreen } from '@/Utils'
+import { useTypeaheadAllowingSpacesAndPunctuation } from './useTypeaheadAllowingSpacesAndPunctuation'
 
 type Props = {
   currentNote: SNNote
@@ -26,7 +27,7 @@ export const ItemSelectionPlugin: FunctionComponent<Props> = ({ currentNote }) =
 
   const [queryString, setQueryString] = useState<string | null>('')
 
-  const checkForTriggerMatch = useBasicTypeaheadTriggerMatch('@', {
+  const checkForTriggerMatch = useTypeaheadAllowingSpacesAndPunctuation('@', {
     minLength: 0,
   })
 

packages/web/src/javascripts/Components/NoteView/SuperEditor/Plugins/ItemSelectionPlugin/useTypeaheadAllowingSpacesAndPunctuation.tsx

@@ -0,0 +1,41 @@
+import { LexicalEditor } from 'lexical'
+import { useCallback } from 'react'
+
+export type QueryMatch = {
+  leadOffset: number
+  matchingString: string
+  replaceableString: string
+}
+type TriggerFn = (text: string, editor: LexicalEditor) => QueryMatch | null
+
+/**
+ * Derived from
+ * https://github.com/facebook/lexical/blob/main/packages/lexical-react/src/LexicalTypeaheadMenuPlugin.tsx#L545
+ */
+export function useTypeaheadAllowingSpacesAndPunctuation(
+  trigger: string,
+  { minLength = 1, maxLength = 75 }: { minLength?: number; maxLength?: number },
+): TriggerFn {
+  return useCallback(
+    (text: string) => {
+      const validChars = '[^' + trigger + ']'
+      const TypeaheadTriggerRegex = new RegExp(
+        '(^|\\s|\\()(' + '[' + trigger + ']' + '((?:' + validChars + '){0,' + maxLength + '})' + ')$',
+      )
+      const match = TypeaheadTriggerRegex.exec(text)
+      if (match !== null) {
+        const maybeLeadingWhitespace = match[1]
+        const matchingString = match[3]
+        if (matchingString.length >= minLength) {
+          return {
+            leadOffset: match.index + maybeLeadingWhitespace.length,
+            matchingString,
+            replaceableString: match[2],
+          }
+        }
+      }
+      return null
+    },
+    [maxLength, minLength, trigger],
+  )
+}

packages/web/src/javascripts/Components/Panes/PaneAnimator.tsx

@@ -22,7 +22,7 @@ export async function animatePaneEntranceTransitionFromOffscreenToTheRight(eleme
     {
       duration: ENTRANCE_DURATION,
       easing: 'ease-in-out',
-      fill: 'forwards',
+      fill: 'both',
     },
   )
 
@@ -50,7 +50,7 @@ export async function animatePaneExitTransitionOffscreenToTheRight(elementId: st
     {
       duration: EXIT_DURATION,
       easing: 'ease-in-out',
-      fill: 'forwards',
+      fill: 'both',
     },
   )
 

packages/web/src/javascripts/Components/Preferences/Panes/Appearance.tsx

@@ -4,11 +4,19 @@ import { usePremiumModal } from '@/Hooks/usePremiumModal'
 import HorizontalSeparator from '@/Components/Shared/HorizontalSeparator'
 import Switch from '@/Components/Switch/Switch'
 import { WebApplication } from '@/Application/Application'
-import { ContentType, FeatureIdentifier, PrefKey, GetFeatures, SNTheme } from '@standardnotes/snjs'
+import {
+  ContentType,
+  FeatureIdentifier,
+  PrefKey,
+  GetFeatures,
+  SNTheme,
+  FindNativeFeature,
+  FeatureStatus,
+  naturalSort,
+} from '@standardnotes/snjs'
 import { observer } from 'mobx-react-lite'
 import { FunctionComponent, useEffect, useState } from 'react'
 import { Subtitle, Title, Text } from '@/Components/Preferences/PreferencesComponents/Content'
-import { sortThemes } from '@/Utils/SortThemes'
 import PreferencesPane from '../PreferencesComponents/PreferencesPane'
 import PreferencesGroup from '../PreferencesComponents/PreferencesGroup'
 import PreferencesSegment from '../PreferencesComponents/PreferencesSegment'
@@ -37,9 +45,8 @@ const Appearance: FunctionComponent<Props> = ({ application }) => {
   useEffect(() => {
     const themesAsItems: DropdownItem[] = application.items
       .getDisplayableComponents()
-      .filter((component) => component.isTheme())
-      .filter((component) => !(component as SNTheme).isLayerable())
-      .sort(sortThemes)
+      .filter((component) => component.isTheme() && !(component as SNTheme).isLayerable())
+      .filter((theme) => !FindNativeFeature(theme.identifier))
       .map((theme) => {
         return {
           label: theme.name,
@@ -50,13 +57,14 @@ const Appearance: FunctionComponent<Props> = ({ application }) => {
     GetFeatures()
       .filter((feature) => feature.content_type === ContentType.Theme && !feature.layerable)
       .forEach((theme) => {
-        if (themesAsItems.findIndex((item) => item.value === theme.identifier) === -1) {
-          themesAsItems.push({
-            label: theme.name as string,
-            value: theme.identifier,
-            icon: PremiumFeatureIconName,
-          })
-        }
+        themesAsItems.push({
+          label: theme.name as string,
+          value: theme.identifier,
+          icon:
+            application.features.getFeatureStatus(theme.identifier) !== FeatureStatus.Entitled
+              ? PremiumFeatureIconName
+              : undefined,
+        })
       })
 
     themesAsItems.unshift({
@@ -64,7 +72,7 @@ const Appearance: FunctionComponent<Props> = ({ application }) => {
       value: 'Default',
     })
 
-    setThemeItems(themesAsItems)
+    setThemeItems(naturalSort(themesAsItems, 'label'))
   }, [application])
 
   const toggleUseDeviceSettings = () => {

packages/web/src/javascripts/Controllers/FilesController.ts

@@ -357,12 +357,17 @@ export class FilesController extends AbstractViewController<FilesControllerEvent
     try {
       const minimumChunkSize = this.application.files.minimumChunkSize()
 
-      if (fileOrHandle instanceof FileSystemFileHandle && !this.shouldUseStreamingReader) {
+      const fileToUpload =
+        fileOrHandle instanceof File
+          ? fileOrHandle
+          : fileOrHandle instanceof FileSystemFileHandle && this.shouldUseStreamingReader
+          ? await fileOrHandle.getFile()
+          : undefined
+
+      if (!fileToUpload) {
         return
       }
 
-      const fileToUpload = fileOrHandle instanceof File ? fileOrHandle : await fileOrHandle.getFile()
-
       if (this.alertIfFileExceedsSizeLimit(fileToUpload)) {
         return
       }

packages/web/src/javascripts/Hooks/useIsTabletOrMobileScreen.tsx

@@ -1,6 +1,6 @@
 import { WebApplication } from '@/Application/Application'
 import { useApplication } from '@/Components/ApplicationProvider'
-import { isMobileScreen, isTabletOrMobileScreen, isTabletScreen } from '@/Utils'
+import { debounce, isMobileScreen, isTabletOrMobileScreen, isTabletScreen } from '@/Utils'
 import { useEffect, useState } from 'react'
 
 export function getIsTabletOrMobileScreen(application: WebApplication) {
@@ -9,6 +9,10 @@ export function getIsTabletOrMobileScreen(application: WebApplication) {
   const isTablet = isTabletScreen() || (isNativeMobile && !isMobileScreen())
   const isMobile = isMobileScreen() || (isNativeMobile && !isTablet)
 
+  if (isTablet && isMobile) {
+    throw Error('isTablet and isMobile cannot both be true')
+  }
+
   return {
     isTabletOrMobile,
     isTablet,
@@ -21,9 +25,9 @@ export default function useIsTabletOrMobileScreen() {
   const application = useApplication()
 
   useEffect(() => {
-    const handleResize = () => {
+    const handleResize = debounce(() => {
       setWindowSize(window.innerWidth)
-    }
+    }, 100)
 
     window.addEventListener('resize', handleResize)
     handleResize()

packages/web/src/javascripts/Hooks/useListKeyboardNavigation.ts

@@ -2,7 +2,11 @@ import { KeyboardKey } from '@standardnotes/ui-services'
 import { FOCUSABLE_BUT_NOT_TABBABLE } from '@/Constants/Constants'
 import { useCallback, useEffect, RefObject, useRef } from 'react'
 
-export const useListKeyboardNavigation = (container: RefObject<HTMLElement | null>, initialFocus = 0) => {
+export const useListKeyboardNavigation = (
+  container: RefObject<HTMLElement | null>,
+  initialFocus = 0,
+  shouldAutoFocus = false,
+) => {
   const listItems = useRef<HTMLButtonElement[]>([])
   const focusedItemIndex = useRef<number>(initialFocus)
 
@@ -69,13 +73,17 @@ export const useListKeyboardNavigation = (container: RefObject<HTMLElement | nul
     }, FIRST_ITEM_FOCUS_TIMEOUT)
   }, [container, focusItemWithIndex, initialFocus])
 
+  useEffect(() => {
+    if (shouldAutoFocus) {
+      containerFocusHandler()
+    }
+  }, [containerFocusHandler, shouldAutoFocus])
+
   useEffect(() => {
     const containerElement = container.current
-    containerElement?.addEventListener('focus', containerFocusHandler)
     containerElement?.addEventListener('keydown', keyDownHandler)
 
     return () => {
-      containerElement?.removeEventListener('focus', containerFocusHandler)
       containerElement?.removeEventListener('keydown', keyDownHandler)
     }
   }, [container, containerFocusHandler, keyDownHandler])

packages/web/src/javascripts/Hooks/useMediaQuery.tsx

@@ -2,7 +2,7 @@ import { useEffect, useState } from 'react'
 
 // Follows https://tailwindcss.com/docs/responsive-design
 export const MediaQueryBreakpoints = {
-  sm: '(max-width: 640px)',
+  sm: '(max-width: 767px)',
   md: '(min-width: 768px)',
   lg: '(min-width: 1024px)',
   xl: '(min-width: 1280px)',
@@ -10,6 +10,15 @@ export const MediaQueryBreakpoints = {
   pointerFine: '(pointer: fine)',
 } as const
 
+export const MutuallyExclusiveMediaQueryBreakpoints = {
+  sm: '(min-width: 0px) and (max-width: 767px)',
+  md: '(min-width: 768px) and (max-width: 1023px)',
+  lg: '(min-width: 1024px) and (max-width: 1279px)',
+  xl: '(min-width: 1280px) and (max-width: 1536px)',
+  '2xl': '(min-width:  1536px)',
+  pointerFine: '(pointer: fine)',
+} as const
+
 export const useMediaQuery = (mediaQuery: string) => {
   const [matches, setMatches] = useState(() => window.matchMedia(mediaQuery).matches)
 

packages/web/src/javascripts/Utils/Items/Search/doesItemMatchSearchQuery.ts

@@ -1,12 +1,26 @@
-import { SNTag, WebApplicationInterface, DecryptedItemInterface, ItemContent } from '@standardnotes/snjs'
+import { WebApplicationInterface, DecryptedItemInterface, ItemContent, isNote, isTag } from '@standardnotes/snjs'
+
+export function getItemTitleInContextOfLinkBubble(item: DecryptedItemInterface<ItemContent>) {
+  return item.title && item.title.length > 0 ? item.title : isNote(item) ? item.preview_plain : ''
+}
+
+function getItemSearchableString(item: DecryptedItemInterface<ItemContent>, application: WebApplicationInterface) {
+  if (isNote(item)) {
+    return item.title.length > 0 ? item.title : item.preview_plain
+  } else if (isTag(item)) {
+    return application.items.getTagLongTitle(item)
+  }
+
+  return item.title ?? ''
+}
 
 export function doesItemMatchSearchQuery(
   item: DecryptedItemInterface<ItemContent>,
   searchQuery: string,
   application: WebApplicationInterface,
 ) {
-  const title = item instanceof SNTag ? application.items.getTagLongTitle(item) : item.title ?? ''
-  const matchesQuery = title.toLowerCase().includes(searchQuery.toLowerCase())
+  const title = getItemSearchableString(item, application).toLowerCase()
+  const matchesQuery = title.includes(searchQuery.toLowerCase())
   const isArchivedOrTrashed = item.archived || item.trashed
   const isValidSearchResult = matchesQuery && !isArchivedOrTrashed
 

packages/web/src/javascripts/Utils/Utils.ts

@@ -1,7 +1,7 @@
 import { DeviceInterface, MobileDeviceInterface, Platform, platformFromString } from '@standardnotes/snjs'
 import { IsDesktopPlatform, IsWebPlatform } from '@/Constants/Version'
 import { EMAIL_REGEX } from '../Constants/Constants'
-import { MediaQueryBreakpoints } from '@/Hooks/useMediaQuery'
+import { MutuallyExclusiveMediaQueryBreakpoints } from '@/Hooks/useMediaQuery'
 
 declare const process: {
   env: {
@@ -206,10 +206,9 @@ export const disableIosTextFieldZoom = () => {
   }
 }
 
-export const isMobileScreen = () => !window.matchMedia(MediaQueryBreakpoints.md).matches
+export const isMobileScreen = () => window.matchMedia(MutuallyExclusiveMediaQueryBreakpoints.sm).matches
 
-export const isTabletScreen = () =>
-  !window.matchMedia(MediaQueryBreakpoints.sm).matches && !window.matchMedia(MediaQueryBreakpoints.lg).matches
+export const isTabletScreen = () => window.matchMedia(MutuallyExclusiveMediaQueryBreakpoints.md).matches
 
 export const isTabletOrMobileScreen = () => isMobileScreen() || isTabletScreen()
 

packages/web/tailwind.config.js

@@ -15,6 +15,7 @@ module.exports = {
         18: '4.5rem',
         26: '6.5rem',
         30: '7.5rem',
+        50: '12.5rem',
         70: '17.5rem',
         87.5: '21.875rem',
         125: '31.25rem',
@@ -41,6 +42,7 @@ module.exports = {
         30: '7.5rem',
         40: '10rem',
         42: '10.5rem',
+        50: '12.5rem',
         55: '13.75rem',
         60: '15rem',
         68: '17rem',