chore(release): publish

- @standardnotes/[email protected]
 - @standardnotes/[email protected]
 - @standardnotes/[email protected]
 - @standardnotes/[email protected].0

.github/workflows/desktop.release.prod.yml

@@ -3,7 +3,7 @@ name: Desktop Release
 on:
   push:
     tags:
-      - '*standardnotes/*desktop*'
+      - '*standardnotes/*web*'
       - '!*standardnotes/*inner-desktop*'
   workflow_dispatch:
 

.github/workflows/desktop.release.reuse.yml

@@ -27,14 +27,14 @@ jobs:
           cache: 'yarn'
       - run: yarn install --immutable
       - run: yarn build:desktop
-      - run: echo APP_VERSION=$(node -p "require('./package.json').version") >> $GITHUB_ENV
+      - run: echo APP_VERSION=$(node -p "require('./../web/package.json').version") >> $GITHUB_ENV
 
       - name: Compile Mac
         run: yarn run webpack --config desktop.webpack.prod.js
       - name: MacX64
         run: |
           yarn run electron-builder --mac --x64 --publish=never --c.extraMetadata.version=${{ env.APP_VERSION }}
-          node scripts/fixMacZip.js
+          node scripts/fixMacZip.js ${{ env.APP_VERSION }}
       - name: MacArm64
         run: yarn run electron-builder --mac --arm64 --publish=never --c.extraMetadata.version=${{ env.APP_VERSION }}
 
@@ -69,7 +69,7 @@ jobs:
       - run: yarn install --immutable
       - run: yarn build:desktop
 
-      - run: echo APP_VERSION=$(node -p "require('./package.json').version") >> $GITHUB_ENV
+      - run: echo APP_VERSION=$(node -p "require('./../web/package.json').version") >> $GITHUB_ENV
 
       - name: Compile for AppImage
         run: yarn run webpack --config desktop.webpack.prod.js
@@ -139,7 +139,7 @@ jobs:
       - run: yarn install --immutable
       - run: yarn build:desktop
       - run: yarn run webpack --config desktop.webpack.prod.js
-      - run: echo APP_VERSION=$(node -p "require('./package.json').version") >> $GITHUB_ENV
+      - run: echo APP_VERSION=$(node -p "require('./../web/package.json').version") >> $GITHUB_ENV
       - run: yarn run electron-builder --windows --x64 --ia32 --publish=never --c.extraMetadata.version=${{ env.APP_VERSION }}
 
       - name: Upload
@@ -160,6 +160,8 @@ jobs:
       run:
         working-directory: packages/desktop
     steps:
+      - run: echo APP_VERSION=$(node -p "require('./../web/package.json').version") >> $GITHUB_ENV
+
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
@@ -194,8 +196,8 @@ jobs:
         uses: softprops/action-gh-release@v1
         with:
           token: ${{ secrets.CI_PAT_TOKEN }}
-          tag_name: "@standardnotes/desktop@${{ steps.package-version.outputs.current-version}}"
-          name: "Desktop ${{ steps.package-version.outputs.current-version }}"
+          tag_name: "@standardnotes/desktop@${{ env.APP_VERSION }}"
+          name: "Desktop ${{ env.APP_VERSION }}"
           body: ${{ steps.release-notes.outputs.result }}
           prerelease: true
           draft: false
@@ -214,4 +216,4 @@ jobs:
           sudo snap install snapcraft --classic
           echo "${{ secrets.SNAPCRAFT_LOGIN_FILE }}" >> snapauth.txt
           snapcraft login --with=snapauth.txt
-          snapcraft upload dist/standard-notes-${{ steps.package-version.outputs.current-version}}-linux-amd64.snap --release stable,candidate,beta,edge
+          snapcraft upload dist/standard-notes-${{ env.APP_VERSION }}-linux-amd64.snap --release stable,candidate,beta,edge

.github/workflows/desktop.windows.sign.yml

@@ -23,7 +23,7 @@ jobs:
       - run: yarn install --immutable
       - run: yarn build:desktop
       - run: yarn run webpack --config desktop.webpack.prod.js
-      - run: echo APP_VERSION=$(node -p "require('./package.json').version") >> $GITHUB_ENV
+      - run: echo APP_VERSION=$(node -p "require('./../web/package.json').version") >> $GITHUB_ENV
       - run: yarn run electron-builder --windows --x64 --ia32 --publish=never --c.extraMetadata.version=${{ env.APP_VERSION }}
 
       - name: Upload

.github/workflows/mobile.release.prod.yml

@@ -3,7 +3,7 @@ name: Mobile Release Production
 on:
   push:
     tags:
-      - '*standardnotes/mobile*'
+      - '*standardnotes/web*'
   workflow_dispatch:
 
 jobs:
@@ -18,7 +18,7 @@ jobs:
         uses: actions/checkout@v3
       - name: Export version from package.json
         run:
-          echo "PACKAGE_VERSION=$(grep '"version"' package.json | cut -d '"' -f 4 | cut -d "-" -f 1)" >> $GITHUB_ENV
+          echo "PACKAGE_VERSION=$(grep '"version"' ../web/package.json | cut -d '"' -f 4 | cut -d "-" -f 1)" >> $GITHUB_ENV
       - name: Setup react-native kernel and increase watchers
         run: echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p
       - name: Decode Production Android keystore
@@ -82,7 +82,7 @@ jobs:
         uses: actions/checkout@v3
       - name: Export version from package.json
         run:
-          echo "PACKAGE_VERSION=$(grep '"version"' package.json | cut -d '"' -f 4 | cut -d "-" -f 1)" >> $GITHUB_ENV
+          echo "PACKAGE_VERSION=$(grep '"version"' ../web/package.json | cut -d '"' -f 4 | cut -d "-" -f 1)" >> $GITHUB_ENV
       - name: Install dependencies
         run: yarn install --immutable && yarn install:pods
       - run: yarn build:mobile

.github/workflows/mobile.release.test.yml

@@ -3,7 +3,7 @@ name: Mobile TestFlight
 on:
   push:
     tags:
-      - '*standardnotes/mobile*'
+      - '*standardnotes/web*'
   workflow_dispatch:
 
 jobs:
@@ -18,7 +18,7 @@ jobs:
         uses: actions/checkout@v3
       - name: Export version from package.json
         run: |
-          echo "PACKAGE_VERSION=$(grep '"version"' package.json | cut -d '"' -f 4 | cut -d "-" -f 1)" >> $GITHUB_ENV
+          echo "PACKAGE_VERSION=$(grep '"version"' ../web/package.json | cut -d '"' -f 4 | cut -d "-" -f 1)" >> $GITHUB_ENV
       - name: Setup react-native kernel and increase watchers
         run: echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p
       - name: Decode Dev Android keystore
@@ -61,7 +61,7 @@ jobs:
         uses: actions/checkout@v3
       - name: Export version from package.json
         run: |
-          echo "PACKAGE_VERSION=$(grep '"version"' package.json | cut -d '"' -f 4 | cut -d "-" -f 1)" >> $GITHUB_ENV
+          echo "PACKAGE_VERSION=$(grep '"version"' ../web/package.json | cut -d '"' -f 4 | cut -d "-" -f 1)" >> $GITHUB_ENV
       - name: Ruby Setup for Fastlane
         uses: ruby/setup-ruby@v1
       - name: Install dependencies

package.json

@@ -31,7 +31,8 @@
     "reset": "find . -type dir -name node_modules | xargs rm -rf && rm -rf yarn.lock && yarn install",
     "release:prod": "lerna version --conventional-commits --yes -m \"chore(release): publish\"",
     "publish:prod": "lerna publish from-git --yes --no-verify-access --loglevel verbose",
-    "version": "yarn install --no-immutable && git add yarn.lock",
+    "version": "yarn install --no-immutable && git add yarn.lock && yarn changelog:json",
+    "changelog:json": "node scripts/ChangelogToJson.js && git add .",
     "postversion": "./scripts/push-tags-one-by-one.sh",
     "workspace:list": " yarn lerna list -all",
     "upgrade:snjs": "ncu -u '@standardnotes/*' && yarn workspaces foreach --verbose run upgrade:snjs"

packages/api/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.20.11](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-11-27)
+
+**Note:** Version bump only for package @standardnotes/api
+
+## [1.20.10](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-11-23)
+
+**Note:** Version bump only for package @standardnotes/api
+
 ## [1.20.9](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-11-23)
 
 **Note:** Version bump only for package @standardnotes/api

packages/api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/api",
-  "version": "1.20.9",
+  "version": "1.20.11",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },

packages/blocks-editor/CHANGELOG.md

@@ -3,6 +3,23 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.9.1](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-11-28)
+
+**Note:** Version bump only for package @standardnotes/blocks-editor
+
+# [1.9.0](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-11-23)
+
+### Features
+
+* dim checked list items in super editor ([#2046](https://github.com/standardnotes/app/issues/2046)) ([8a70915](https://github.com/standardnotes/app/commit/8a709158d6839b9eb1092923a14b0dcadb0da25b))
+* option to show markdown preview for super notes (skip e2e) ([#2048](https://github.com/standardnotes/app/issues/2048)) ([8579ff3](https://github.com/standardnotes/app/commit/8579ff39b1f81dbbcf22b4031ede183ab4287262))
+
+# [1.8.0](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-11-23)
+
+### Features
+
+* use line height preference in super editor (skip e2e) ([#2045](https://github.com/standardnotes/app/issues/2045)) ([87cd31a](https://github.com/standardnotes/app/commit/87cd31ae5d630a528ce6d4895b2c144bf51808f0))
+
 # [1.7.0](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-11-19)
 
 ### Features

packages/blocks-editor/package.json

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

packages/blocks-editor/src/Editor/BlocksEditor.tsx

@@ -7,12 +7,6 @@ import {CheckListPlugin} from '@lexical/react/LexicalCheckListPlugin';
 import {ClearEditorPlugin} from '@lexical/react/LexicalClearEditorPlugin';
 import {MarkdownShortcutPlugin} from '@lexical/react/LexicalMarkdownShortcutPlugin';
 import {TablePlugin} from '@lexical/react/LexicalTablePlugin';
-import {
-  CHECK_LIST,
-  ELEMENT_TRANSFORMERS,
-  TEXT_FORMAT_TRANSFORMERS,
-  TEXT_MATCH_TRANSFORMERS,
-} from '@lexical/markdown';
 import LexicalErrorBoundary from '@lexical/react/LexicalErrorBoundary';
 import {HashtagPlugin} from '@lexical/react/LexicalHashtagPlugin';
 import {HistoryPlugin} from '@lexical/react/LexicalHistoryPlugin';
@@ -30,14 +24,19 @@ import FloatingTextFormatToolbarPlugin from '../Lexical/Plugins/FloatingTextForm
 import FloatingLinkEditorPlugin from '../Lexical/Plugins/FloatingLinkEditorPlugin';
 import {truncateString} from './Utils';
 import {SuperEditorContentId} from './Constants';
+import {classNames} from '@standardnotes/utils';
+import {EditorLineHeight} from '@standardnotes/snjs';
+import {MarkdownTransformers} from './MarkdownTransformers';
 
 type BlocksEditorProps = {
-  onChange: (value: string, preview: string) => void;
+  onChange?: (value: string, preview: string) => void;
   className?: string;
   children?: React.ReactNode;
-  previewLength: number;
+  previewLength?: number;
   spellcheck?: boolean;
   ignoreFirstChange?: boolean;
+  lineHeight?: EditorLineHeight;
+  readonly?: boolean;
 };
 
 export const BlocksEditor: FunctionComponent<BlocksEditorProps> = ({
@@ -47,6 +46,8 @@ export const BlocksEditor: FunctionComponent<BlocksEditorProps> = ({
   previewLength,
   spellcheck,
   ignoreFirstChange = false,
+  lineHeight,
+  readonly,
 }) => {
   const [didIgnoreFirstChange, setDidIgnoreFirstChange] = useState(false);
   const handleChange = useCallback(
@@ -65,11 +66,14 @@ export const BlocksEditor: FunctionComponent<BlocksEditorProps> = ({
             previewText += '\n';
           }
         });
-        previewText = truncateString(previewText, previewLength);
+
+        if (previewLength) {
+          previewText = truncateString(previewText, previewLength);
+        }
 
         try {
           const stringifiedEditorState = JSON.stringify(editorState.toJSON());
-          onChange(stringifiedEditorState, previewText);
+          onChange?.(stringifiedEditorState, previewText);
         } catch (error) {
           window.alert(
             `An invalid change was made inside the Super editor. Your change was not saved. Please report this error to the team: ${error}`,
@@ -98,7 +102,11 @@ export const BlocksEditor: FunctionComponent<BlocksEditorProps> = ({
             <div className="editor" ref={onRef}>
               <ContentEditable
                 id={SuperEditorContentId}
-                className={`ContentEditable__root overflow-y-auto ${className}`}
+                className={classNames(
+                  'ContentEditable__root overflow-y-auto',
+                  lineHeight && `leading-${lineHeight.toLowerCase()}`,
+                  className,
+                )}
                 spellCheck={spellcheck}
               />
             </div>
@@ -108,14 +116,7 @@ export const BlocksEditor: FunctionComponent<BlocksEditorProps> = ({
         ErrorBoundary={LexicalErrorBoundary}
       />
       <ListPlugin />
-      <MarkdownShortcutPlugin
-        transformers={[
-          CHECK_LIST,
-          ...ELEMENT_TRANSFORMERS,
-          ...TEXT_FORMAT_TRANSFORMERS,
-          ...TEXT_MATCH_TRANSFORMERS,
-        ]}
-      />
+      <MarkdownShortcutPlugin transformers={MarkdownTransformers} />
       <TablePlugin />
       <OnChangePlugin onChange={handleChange} ignoreSelectionChange={true} />
       <HistoryPlugin />
@@ -130,7 +131,7 @@ export const BlocksEditor: FunctionComponent<BlocksEditorProps> = ({
       <TwitterPlugin />
       <YouTubePlugin />
       <CollapsiblePlugin />
-      {floatingAnchorElem && (
+      {!readonly && floatingAnchorElem && (
         <>
           <FloatingTextFormatToolbarPlugin anchorElem={floatingAnchorElem} />
           <FloatingLinkEditorPlugin />

packages/blocks-editor/src/Editor/MarkdownTransformers.ts

@@ -0,0 +1,13 @@
+import {
+  CHECK_LIST,
+  ELEMENT_TRANSFORMERS,
+  TEXT_FORMAT_TRANSFORMERS,
+  TEXT_MATCH_TRANSFORMERS,
+} from '@lexical/markdown';
+
+export const MarkdownTransformers = [
+  CHECK_LIST,
+  ...ELEMENT_TRANSFORMERS,
+  ...TEXT_FORMAT_TRANSFORMERS,
+  ...TEXT_MATCH_TRANSFORMERS,
+];

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

@@ -325,6 +325,7 @@
 }
 .Lexical__listItemChecked {
   text-decoration: line-through;
+  opacity: 0.4;
 }
 .Lexical__listItemUnchecked:before,
 .Lexical__listItemChecked:before {

packages/blocks-editor/src/index.ts

@@ -1,3 +1,4 @@
 export * from './Editor/BlocksEditor';
 export * from './Editor/BlocksEditorComposer';
 export * from './Editor/Constants';
+export * from './Editor/MarkdownTransformers';

packages/desktop/CHANGELOG.md

@@ -3,6 +3,64 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.102.11](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-11-28)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.102.10](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-11-28)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.102.9](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-11-28)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.102.8](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-11-27)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.102.7](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-11-27)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.102.6](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-11-27)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.102.5](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-11-27)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.102.4](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-11-25)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.102.3](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-11-25)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.102.2](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-11-24)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.102.1](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-11-24)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+# [3.102.0](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-11-24)
+
+### Features
+
+* New 'What's New' section in Preferences ([#2049](https://github.com/standardnotes/app/issues/2049)) (skip e2e) ([0a01ddb](https://github.com/standardnotes/app/commit/0a01ddb430154fa4518985458c15c644855c80ea))
+
+## [3.101.2](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-11-23)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.101.1](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-11-23)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
 # [3.101.0](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-11-23)
 
 ### Features

packages/desktop/package.json

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

packages/desktop/scripts/fixMacZip.js

@@ -31,7 +31,7 @@ async function getBlockMapInfo(fileName) {
 
 ;(async () => {
   try {
-    const { version } = JSON.parse(await fs.promises.readFile('package.json'))
+    const version = process.argv.slice(2)[0]
     const zipName = `standard-notes-${version}-mac-x64.zip`
     const zipPath = `dist/${zipName}`
     console.log(`Removing ${zipPath}`)

packages/encryption/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.19.19](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-11-27)
+
+**Note:** Version bump only for package @standardnotes/encryption
+
+## [1.19.18](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-11-23)
+
+**Note:** Version bump only for package @standardnotes/encryption
+
 ## [1.19.17](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-11-23)
 
 **Note:** Version bump only for package @standardnotes/encryption

packages/encryption/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/encryption",
-  "version": "1.19.17",
+  "version": "1.19.19",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },

packages/filepicker/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.26.2](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-11-27)
+
+**Note:** Version bump only for package @standardnotes/filepicker
+
+## [1.26.1](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-11-23)
+
+**Note:** Version bump only for package @standardnotes/filepicker
+
 # [1.26.0](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-11-23)
 
 ### Features

packages/filepicker/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/filepicker",
-  "version": "1.26.0",
+  "version": "1.26.2",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },

packages/files/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.13.2](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-11-27)
+
+**Note:** Version bump only for package @standardnotes/files
+
+## [1.13.1](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-11-23)
+
+**Note:** Version bump only for package @standardnotes/files
+
 # [1.13.0](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-11-23)
 
 ### Features

packages/files/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/files",
-  "version": "1.13.0",
+  "version": "1.13.2",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },

packages/icons/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.6.1](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-11-28)
+
+### Bug Fixes
+
+* add new line after embedding files ([7f6c53d](https://github.com/standardnotes/app/commit/7f6c53dfcbc8952ca9eee76b9c4af70fea3c1bf1))
+
 # [1.6.0](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-11-19)
 
 ### Features

packages/icons/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/icons",
-  "version": "1.6.0",
+  "version": "1.6.1",
   "private": true,
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

packages/icons/src/Icons/ic-sync.svg

@@ -1,4 +1,4 @@
 <svg viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-  <path d="M9.99992 15C8.67384 15 7.40207 14.4732 6.46438 13.5355C5.5267 12.5978 4.99992 11.3261 4.99992 9.99998C4.99992 9.16665 5.20825 8.35831 5.58325 7.66665L4.36659 6.44998C3.71659 7.47498 3.33325 8.69165 3.33325 9.99998C3.33325 11.7681 4.03563 13.4638 5.28587 14.714C6.53612 15.9643 8.23181 16.6666 9.99992 16.6666V19.1666L13.3333 15.8333L9.99992 12.5V15ZM9.99992 3.33331V0.833313L6.66658 4.16665L9.99992 7.49998V4.99998C11.326 4.99998 12.5978 5.52676 13.5355 6.46445C14.4731 7.40213 14.9999 8.6739 14.9999 9.99998C14.9999 10.8333 14.7916 11.6416 14.4166 12.3333L15.6333 13.55C16.2833 12.525 16.6666 11.3083 16.6666 9.99998C16.6666 8.23187 15.9642 6.53618 14.714 5.28593C13.4637 4.03569 11.768 3.33331 9.99992 3.33331Z" />
+  <path d="M9.99999 15C11.3261 15 12.5978 14.4732 13.5355 13.5355C14.4732 12.5979 15 11.3261 15 10C15 9.16666 14.7917 8.35833 14.4167 7.66667L15.6333 6.45C16.2833 7.475 16.6667 8.69166 16.6667 10C16.6667 11.7681 15.9643 13.4638 14.714 14.714C13.4638 15.9643 11.7681 16.6667 9.99999 16.6667V19.1667L6.66666 15.8333L9.99999 12.5V15ZM9.99999 3.33333V0.833333L13.3333 4.16667L9.99999 7.5V5C8.67391 5 7.40214 5.52678 6.46446 6.46447C5.52677 7.40215 4.99999 8.67392 4.99999 10C4.99999 10.8333 5.20832 11.6417 5.58332 12.3333L4.36666 13.55C3.71666 12.525 3.33332 11.3083 3.33332 10C3.33332 8.23189 4.0357 6.5362 5.28594 5.28595C6.53619 4.03571 8.23188 3.33333 9.99999 3.33333Z" />
 </svg>
   

packages/mobile/CHANGELOG.md

@@ -3,6 +3,66 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.47.11](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-11-28)
+
+### Bug Fixes
+
+* Super editor popover menus on iOS ([#2061](https://github.com/standardnotes/app/issues/2061)) ([148aee4](https://github.com/standardnotes/app/commit/148aee441b816c58599d95db2e5b0f3f93414511))
+
+## [3.47.10](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-11-28)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.47.9](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-11-28)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.47.8](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-11-27)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.47.7](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-11-27)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.47.6](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-11-27)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.47.5](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-11-27)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.47.4](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-11-25)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.47.3](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-11-25)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.47.2](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-11-24)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.47.1](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-11-24)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+# [3.47.0](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-11-24)
+
+### Features
+
+* New 'What's New' section in Preferences ([#2049](https://github.com/standardnotes/app/issues/2049)) (skip e2e) ([0a01ddb](https://github.com/standardnotes/app/commit/0a01ddb430154fa4518985458c15c644855c80ea))
+
+## [3.46.31](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-11-23)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.46.30](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-11-23)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
 ## [3.46.29](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-11-23)
 
 **Note:** Version bump only for package @standardnotes/mobile

packages/mobile/ios/Podfile.lock

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

packages/mobile/package.json

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

packages/mobile/src/MobileWebAppContainer.tsx

@@ -4,7 +4,6 @@ import { Keyboard, Platform } from 'react-native'
 import VersionInfo from 'react-native-version-info'
 import { WebView, WebViewMessageEvent } from 'react-native-webview'
 import { OnShouldStartLoadWithRequest } from 'react-native-webview/lib/WebViewTypes'
-import pjson from '../package.json'
 import { AndroidBackHandlerService } from './AndroidBackHandlerService'
 import { AppStateObserverService } from './AppStateObserverService'
 import { ColorSchemeObserverService } from './ColorSchemeObserverService'
@@ -129,7 +128,7 @@ const MobileWebAppContents = ({ destroyAndReload }: { destroyAndReload: () => vo
   const WebProcessDeviceInterface = `
   class WebProcessDeviceInterface {
     constructor(messageSender) {
-      this.appVersion = '${pjson.version} (${VersionInfo.buildVersion})'
+      this.appVersion = '${VersionInfo.appVersion} (${VersionInfo.buildVersion})'
       this.environment = 3
       this.platform = ${device.platform}
       this.databases = []

packages/models/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.37.8](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-11-27)
+
+**Note:** Version bump only for package @standardnotes/models
+
+## [1.37.7](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-11-23)
+
+**Note:** Version bump only for package @standardnotes/models
+
 ## [1.37.6](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-11-23)
 
 **Note:** Version bump only for package @standardnotes/models

packages/models/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/models",
-  "version": "1.37.6",
+  "version": "1.37.8",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },

packages/models/src/Domain/Utilities/Icon/IconType.ts

@@ -1,6 +1,6 @@
 export type VectorIconNameOrEmoji = EmojiString | IconType
 
-export type EmojiString = string
+export type EmojiString = Omit<string, IconType>
 
 export type IconType =
   | 'accessibility'

packages/releases/CHANGELOG.md

@@ -3,6 +3,68 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.4.12](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-11-28)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.4.11](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-11-28)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.4.10](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-11-28)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.4.9](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-11-27)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.4.8](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-11-27)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.4.7](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-11-27)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.4.6](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-11-27)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.4.5](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-11-25)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.4.4](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-11-25)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.4.3](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-11-24)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.4.2](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-11-24)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.4.1](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-11-24)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+# [1.4.0](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-11-24)
+
+### Features
+
+* New 'What's New' section in Preferences ([#2049](https://github.com/standardnotes/app/issues/2049)) (skip e2e) ([0a01ddb](https://github.com/standardnotes/app/commit/0a01ddb430154fa4518985458c15c644855c80ea))
+
+## [1.3.257](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-11-23)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.3.256](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-11-23)
+
+**Note:** Version bump only for package @standardnotes/releases
+
 ## [1.3.255](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-11-23)
 
 **Note:** Version bump only for package @standardnotes/releases

packages/releases/package.json

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

packages/releases/src/build-json.mjs

@@ -5,13 +5,13 @@ import { writeJson, ensureDirExists } from '../../../scripts/ScriptUtils.mjs'
 
 const CdnUrl = 'https://github.com/standardnotes/app/releases/download/'
 const DesktopPackageName = '@standardnotes/desktop'
-const DesktopVersion = Desktop.version
+const DesktopVersion = Web.version
 const BaseFileName = `standard-notes-${DesktopVersion}`
 const ReleaseUrl = `${CdnUrl}${DesktopPackageName}@${DesktopVersion}/${BaseFileName}`.replaceAll('@', '%40')
 
 const Versions = {
-  [Desktop.name]: Desktop.version,
-  [Mobile.name]: Mobile.version,
+  [Desktop.name]: Web.version,
+  [Mobile.name]: Web.version,
   [Web.name]: Web.version,
 }
 

packages/services/CHANGELOG.md

@@ -3,6 +3,20 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.47.1](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-11-27)
+
+**Note:** Version bump only for package @standardnotes/services
+
+# [1.47.0](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-11-24)
+
+### Features
+
+* New 'What's New' section in Preferences ([#2049](https://github.com/standardnotes/app/issues/2049)) (skip e2e) ([0a01ddb](https://github.com/standardnotes/app/commit/0a01ddb430154fa4518985458c15c644855c80ea))
+
+## [1.46.1](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-11-23)
+
+**Note:** Version bump only for package @standardnotes/services
+
 # [1.46.0](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-11-23)
 
 ### Features

packages/services/package.json

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

packages/services/src/Domain/Storage/StorageKeys.ts

@@ -39,6 +39,7 @@ export enum StorageKey {
   DeinitMode = 'deinit_mode',
   CodeVerifier = 'code_verifier',
   LaunchPriorityUuids = 'launch_priority_uuids',
+  LastReadChangelogVersion = 'last_read_changelog_version',
 }
 
 export enum NonwrappedStorageKey {

packages/snjs/CHANGELOG.md

@@ -3,6 +3,56 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.152.5](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-11-27)
+
+**Note:** Version bump only for package @standardnotes/snjs
+
+## [2.152.4](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-11-24)
+
+### Bug Fixes
+
+* **snjs:** initial value of subscription ids on files test - run e2e ([81b5123](https://github.com/standardnotes/app/commit/81b51232940b5fade61ad6e72237f739607bed2b))
+* **snjs:** subscription id increments - run e2e ([7a89a3c](https://github.com/standardnotes/app/commit/7a89a3cd9cb2c364d3b22da96c894040bcf7167b))
+
+## [2.152.3](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-11-24)
+
+### Bug Fixes
+
+* **snjs:** add additional sign in missing - run e2e ([6bbf0c0](https://github.com/standardnotes/app/commit/6bbf0c02bda0350772638ee19424420b6430dec3))
+* **snjs:** decrease factory sleep in order to have a continuing session - run e2e ([0fac2dd](https://github.com/standardnotes/app/commit/0fac2dd93974f7072e5e3a73ef705836e163dcac))
+* **snjs:** remove extra sign in - run e2e ([212e784](https://github.com/standardnotes/app/commit/212e7843ec2ec565c46e06a3acd52a7bbfc16f0b))
+* **snjs:** run e2e ([75303b5](https://github.com/standardnotes/app/commit/75303b5eb8c1e403541bca57b20ae293cb67f979))
+
+## [2.152.1](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-11-24)
+
+### Bug Fixes
+
+* subscription expiring event ([07e2691](https://github.com/standardnotes/app/commit/07e26915b07656e813d439a24f8d4682ba6773af))
+
+# [2.152.0](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-11-24)
+
+### Bug Fixes
+
+* **snjs:** factory timeout to propagate subscription purchase ([c40b17b](https://github.com/standardnotes/app/commit/c40b17bd4cdb943b299e3cb17f0cbb5ce8e736e2))
+
+### Features
+
+* New 'What's New' section in Preferences ([#2049](https://github.com/standardnotes/app/issues/2049)) (skip e2e) ([0a01ddb](https://github.com/standardnotes/app/commit/0a01ddb430154fa4518985458c15c644855c80ea))
+
+## [2.151.11](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-11-23)
+
+### Bug Fixes
+
+* **snjs:** adjust file bytes used expected ([e36a1ff](https://github.com/standardnotes/app/commit/e36a1ffea0aba9e860c511fa64e0b0ad87890b30))
+* **snjs:** file subscriptions tests subscription assignment ([25cf4cf](https://github.com/standardnotes/app/commit/25cf4cfd2210b4032f362b4ec86ff6c6aa485891))
+* **snjs:** remove unnecessary file uploaded event in tests ([b05c793](https://github.com/standardnotes/app/commit/b05c793fe9c0016ce744eace14871291511399a6))
+* **snjs:** subscription events in tests ([c454176](https://github.com/standardnotes/app/commit/c45417623cc65f4369183069b9df0ba97e9f9965))
+* **snjs:** wait timeout after subscription purchase ([99163d9](https://github.com/standardnotes/app/commit/99163d90d2084d118433afe311362a1f943087b7))
+
+## [2.151.10](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-11-23)
+
+**Note:** Version bump only for package @standardnotes/snjs
+
 ## [2.151.9](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-11-23)
 
 **Note:** Version bump only for package @standardnotes/snjs

packages/snjs/lib/Application/Application.ts

@@ -291,6 +291,10 @@ export class SNApplication implements ApplicationInterface, AppGroupManagedAppli
     return this.alertService
   }
 
+  public get storage(): ExternalServices.StorageServiceInterface {
+    return this.diskStorageService
+  }
+
   public computePrivateUsername(username: string): Promise<string | undefined> {
     return ComputePrivateUsername(this.options.crypto, username)
   }

packages/snjs/lib/Services/Api/WebsocketsService.ts

@@ -38,19 +38,21 @@ export class SNWebSocketsService extends AbstractService<WebSocketsServiceEvent,
   }
 
   async startWebSocketConnection(): Promise<void> {
+    if (!this.webSocketUrl) {
+      return
+    }
+
     const webSocketConectionToken = await this.createWebSocketConnectionToken()
     if (webSocketConectionToken === undefined) {
       return
     }
 
-    if (this.webSocketUrl) {
-      try {
-        this.webSocket = new WebSocket(`${this.webSocketUrl}?authToken=${webSocketConectionToken}`)
-        this.webSocket.onmessage = this.onWebSocketMessage.bind(this)
-        this.webSocket.onclose = this.onWebSocketClose.bind(this)
-      } catch (e) {
-        console.error('Error starting WebSocket connection', e)
-      }
+    try {
+      this.webSocket = new WebSocket(`${this.webSocketUrl}?authToken=${webSocketConectionToken}`)
+      this.webSocket.onmessage = this.onWebSocketMessage.bind(this)
+      this.webSocket.onclose = this.onWebSocketClose.bind(this)
+    } catch (e) {
+      console.error('Error starting WebSocket connection', e)
     }
   }
 

packages/snjs/mocha/files.test.js

@@ -12,6 +12,7 @@ describe('files', function () {
   let context
   let fileService
   let itemManager
+  let subscriptionId = 1001
 
   beforeEach(function () {
     localStorage.clear()
@@ -39,13 +40,20 @@ describe('files', function () {
     if (subscription) {
       await Factory.publishMockedEvent('SUBSCRIPTION_PURCHASED', {
         userEmail: context.email,
-        subscriptionId: 1,
-        subscriptionName: 'PLUS_PLAN',
+        subscriptionId: subscriptionId++,
+        subscriptionName: 'PRO_PLAN',
         subscriptionExpiresAt: (new Date().getTime() + 3_600_000) * 1_000,
         timestamp: Date.now(),
         offline: false,
+        discountCode: null,
+        limitedDiscountPurchased: false,
+        newSubscriber: true,
+        totalActiveSubscriptionsCount: 1,
+        userRegisteredAt: 1,
+        billingFrequency: 12,
+        payAmount: 59.00
       })
-      await Factory.sleep(0.25)
+      await Factory.sleep(2)
     }
   }
 
@@ -56,6 +64,7 @@ describe('files', function () {
 
   it('should create valet token from server', async function () {
     await setup({ fakeCrypto: true, subscription: true })
+
     const remoteIdentifier = Utils.generateUuid()
     const token = await application.apiService.createFileValetToken(remoteIdentifier, 'write')
 
@@ -76,14 +85,21 @@ describe('files', function () {
 
     await Factory.publishMockedEvent('SUBSCRIPTION_PURCHASED', {
       userEmail: context.email,
-      subscriptionId: 1,
+      subscriptionId: subscriptionId++,
       subscriptionName: 'PLUS_PLAN',
       subscriptionExpiresAt: (new Date().getTime() - 3_600_000) * 1_000,
       timestamp: Date.now(),
       offline: false,
+      discountCode: null,
+      limitedDiscountPurchased: false,
+      newSubscriber: true,
+      totalActiveSubscriptionsCount: 1,
+      userRegisteredAt: 1,
+      billingFrequency: 12,
+      payAmount: 59.00
     })
 
-    await Factory.sleep(0.25)
+    await Factory.sleep(2)
 
     const remoteIdentifier = Utils.generateUuid()
     const tokenOrError = await application.apiService.createFileValetToken(remoteIdentifier, 'write')
@@ -149,10 +165,4 @@ describe('files', function () {
 
     expect(downloadError).to.be.ok
   })
-
-  it.skip('should cancel file download', async function () {
-    await setup({ fakeCrypto: false, subscription: true })
-
-    // ...
-  })
 })

packages/snjs/mocha/settings.test.js

@@ -5,7 +5,7 @@ chai.use(chaiAsPromised)
 const expect = chai.expect
 
 describe('settings service', function () {
-  this.timeout(Factory.TwentySecondTimeout)
+  this.timeout(Factory.ThirtySecondTimeout)
 
   const validSetting = SettingName.GoogleDriveBackupFrequency
   const fakePayload = 'Im so meta even this acronym'
@@ -13,21 +13,21 @@ describe('settings service', function () {
 
   let application
   let context
-  let user
+  let subscriptionId = 2001
 
   beforeEach(async function () {
+    localStorage.clear()
     context = await Factory.createAppContextWithFakeCrypto()
 
     await context.launch()
 
     application = context.application
 
-    const registerResponse = await Factory.registerUserToApplication({
+    await Factory.registerUserToApplication({
       application: context.application,
       email: context.email,
       password: context.password,
     })
-    user = registerResponse.user
   })
 
   const reInitializeApplicationWithRealCrypto = async () => {
@@ -39,16 +39,16 @@ describe('settings service', function () {
 
     application = context.application
 
-    const registerResponse = await Factory.registerUserToApplication({
+    await Factory.registerUserToApplication({
       application: context.application,
       email: context.email,
       password: context.password,
     })
-    user = registerResponse.user
   }
 
   afterEach(async function () {
     await Factory.safeDeinit(application)
+    localStorage.clear()
   })
 
   it('creates and reads a setting', async function () {
@@ -119,14 +119,21 @@ describe('settings service', function () {
   it('reads a subscription setting', async () => {
     await Factory.publishMockedEvent('SUBSCRIPTION_PURCHASED', {
       userEmail: context.email,
-      subscriptionId: 1,
+      subscriptionId: subscriptionId++,
       subscriptionName: 'PRO_PLAN',
       subscriptionExpiresAt: (new Date().getTime() + 3_600_000) * 1_000,
       timestamp: Date.now(),
       offline: false,
+      discountCode: null,
+      limitedDiscountPurchased: false,
+      newSubscriber: true,
+      totalActiveSubscriptionsCount: 1,
+      userRegisteredAt: 1,
+      billingFrequency: 12,
+      payAmount: 59.00
     })
 
-    await Factory.sleep(1)
+    await Factory.sleep(2)
 
     const setting = await application.settings.getSubscriptionSetting('FILE_UPLOAD_BYTES_LIMIT')
     expect(setting).to.be.a('string')
@@ -137,11 +144,18 @@ describe('settings service', function () {
 
     await Factory.publishMockedEvent('SUBSCRIPTION_PURCHASED', {
       userEmail: context.email,
-      subscriptionId: 1,
+      subscriptionId: subscriptionId,
       subscriptionName: 'PRO_PLAN',
       subscriptionExpiresAt: (new Date().getTime() + 3_600_000) * 1_000,
       timestamp: Date.now(),
       offline: false,
+      discountCode: null,
+      limitedDiscountPurchased: false,
+      newSubscriber: true,
+      totalActiveSubscriptionsCount: 1,
+      userRegisteredAt: 1,
+      billingFrequency: 12,
+      payAmount: 59.00
     })
     await Factory.sleep(1)
 
@@ -150,37 +164,41 @@ describe('settings service', function () {
 
     await Files.uploadFile(application.fileService, buffer, 'my-file', 'md', 1000)
 
-    await Factory.publishMockedEvent('FILE_UPLOADED', {
-      userUuid: user.uuid,
-      fileByteSize: 123,
-      filePath: 'foobar',
-      fileName: 'barbuzz',
-    })
     await Factory.sleep(1)
 
     const limitSettingBefore = await application.settings.getSubscriptionSetting('FILE_UPLOAD_BYTES_LIMIT')
     expect(limitSettingBefore).to.equal('107374182400')
 
     const usedSettingBefore = await application.settings.getSubscriptionSetting('FILE_UPLOAD_BYTES_USED')
-    expect(usedSettingBefore).to.equal('123')
-
+    expect(usedSettingBefore).to.equal('196')
 
     await Factory.publishMockedEvent('SUBSCRIPTION_EXPIRED', {
       userEmail: context.email,
-      subscriptionId: 1,
+      subscriptionId: subscriptionId++,
       subscriptionName: 'PRO_PLAN',
       timestamp: Date.now(),
       offline: false,
+      totalActiveSubscriptionsCount: 1,
+      userExistingSubscriptionsCount: 1,
+      billingFrequency: 12,
+      payAmount: 59.00
     })
     await Factory.sleep(1)
 
     await Factory.publishMockedEvent('SUBSCRIPTION_PURCHASED', {
       userEmail: context.email,
-      subscriptionId: 2,
+      subscriptionId: subscriptionId++,
       subscriptionName: 'PRO_PLAN',
       subscriptionExpiresAt: (new Date().getTime() + 3_600_000) * 1_000,
       timestamp: Date.now(),
       offline: false,
+      discountCode: null,
+      limitedDiscountPurchased: false,
+      newSubscriber: false,
+      totalActiveSubscriptionsCount: 2,
+      userRegisteredAt: 1,
+      billingFrequency: 12,
+      payAmount: 59.00
     })
     await Factory.sleep(1)
 

packages/snjs/mocha/subscriptions.test.js

@@ -8,6 +8,7 @@ describe('subscriptions', function () {
   let application
   let context
   let subscriptionManager
+  let subscriptionId = 3001
 
   afterEach(async function () {
     await Factory.safeDeinit(application)
@@ -32,13 +33,20 @@ describe('subscriptions', function () {
 
     await Factory.publishMockedEvent('SUBSCRIPTION_PURCHASED', {
       userEmail: context.email,
-      subscriptionId: 1,
+      subscriptionId: subscriptionId++,
       subscriptionName: 'PRO_PLAN',
       subscriptionExpiresAt: (new Date().getTime() + 3_600_000) * 1_000,
       timestamp: Date.now(),
       offline: false,
+      discountCode: null,
+      limitedDiscountPurchased: false,
+      newSubscriber: true,
+      totalActiveSubscriptionsCount: 1,
+      userRegisteredAt: 1,
+      billingFrequency: 12,
+      payAmount: 59.00
     })
-    await Factory.sleep(0.25)
+    await Factory.sleep(2)
   })
 
   it('should invite a user by email to a shared subscription', async () => {

packages/snjs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/snjs",
-  "version": "2.151.9",
+  "version": "2.152.5",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },

packages/toast/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.
 
+## [1.3.12](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-11-28)
+
+**Note:** Version bump only for package @standardnotes/toast
+
 ## [1.3.11](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-11-19)
 
 **Note:** Version bump only for package @standardnotes/toast

packages/toast/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/toast",
-  "version": "1.3.11",
+  "version": "1.3.12",
   "private": true,
   "main": "./src/index.ts",
   "scripts": {

packages/ui-services/CHANGELOG.md

@@ -3,6 +3,36 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.17.2](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-11-28)
+
+**Note:** Version bump only for package @standardnotes/ui-services
+
+## [1.17.1](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-11-27)
+
+**Note:** Version bump only for package @standardnotes/ui-services
+
+# [1.17.0](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-11-25)
+
+### Features
+
+* Markdown, HTML & JSON export options for super notes ([#2054](https://github.com/standardnotes/app/issues/2054)) ([dcc8cfb](https://github.com/standardnotes/app/commit/dcc8cfbe45644dbb77e0ade0073017e6ac66164c))
+
+# [1.16.0](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-11-24)
+
+### Features
+
+* New 'What's New' section in Preferences ([#2049](https://github.com/standardnotes/app/issues/2049)) (skip e2e) ([0a01ddb](https://github.com/standardnotes/app/commit/0a01ddb430154fa4518985458c15c644855c80ea))
+
+# [1.15.0](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-11-23)
+
+### Features
+
+* option to show markdown preview for super notes (skip e2e) ([#2048](https://github.com/standardnotes/app/issues/2048)) ([8579ff3](https://github.com/standardnotes/app/commit/8579ff39b1f81dbbcf22b4031ede183ab4287262))
+
+## [1.14.4](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-11-23)
+
+**Note:** Version bump only for package @standardnotes/ui-services
+
 ## [1.14.3](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-11-23)
 
 **Note:** Version bump only for package @standardnotes/ui-services

packages/ui-services/package.json

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

packages/ui-services/src/Changelog/Changelog.ts

@@ -0,0 +1,13 @@
+export type ChangelogVersion = {
+  version: string | null
+  title: string
+  date: string | null
+  body: string
+  parsed: Record<string, string[]>
+}
+
+export interface Changelog {
+  title: string
+  description: string
+  versions: Array<ChangelogVersion>
+}

packages/ui-services/src/Changelog/ChangelogService.ts

@@ -0,0 +1,78 @@
+import { Environment } from '@standardnotes/models'
+import { StorageServiceInterface, StorageKey } from '@standardnotes/services'
+import { Changelog, ChangelogVersion } from './Changelog'
+import { ChangelogServiceInterface } from './ChangelogServiceInterface'
+import { LegacyWebToDesktopVersionMapping } from './LegacyDesktopMapping'
+import { LegacyWebToMobileVersionMapping } from './LegacyMobileMapping'
+
+const WebChangelogUrl = 'https://raw.githubusercontent.com/standardnotes/app/main/packages/web/CHANGELOG.md.json'
+const DesktopDownloadsUrlBase = 'https://github.com/standardnotes/app/releases/tag/%40standardnotes%2Fdesktop%40'
+
+export class ChangelogService implements ChangelogServiceInterface {
+  private changeLog?: Changelog
+
+  constructor(private environment: Environment, private diskService: StorageServiceInterface) {}
+
+  private async performDownloadChangelog(): Promise<Changelog> {
+    const response = await fetch(WebChangelogUrl)
+    const changelog = await response.text()
+    const parsedData = JSON.parse(changelog)
+    return parsedData
+  }
+
+  public async getChangelog(): Promise<Changelog> {
+    if (this.changeLog) {
+      return this.changeLog
+    }
+
+    this.changeLog = await this.performDownloadChangelog()
+
+    if (this.environment !== Environment.Web) {
+      const legacyMapping = this.getLegacyMapping()
+
+      this.changeLog.versions = this.changeLog.versions.map((versionRecord) => {
+        const versionString = versionRecord.version || ''
+        return {
+          ...versionRecord,
+          version: legacyMapping[versionString] || versionRecord.version,
+        }
+      })
+    }
+
+    return this.changeLog
+  }
+
+  public markAsRead(): void {
+    if (!this.changeLog) {
+      return
+    }
+
+    this.diskService.setValue(StorageKey.LastReadChangelogVersion, this.changeLog.versions[0].version)
+  }
+
+  public getLastReadVersion(): string | undefined {
+    return this.diskService.getValue(StorageKey.LastReadChangelogVersion)
+  }
+
+  public async getVersions(): Promise<ChangelogVersion[]> {
+    const changelog = await this.getChangelog()
+
+    return changelog.versions
+  }
+
+  private getLegacyMapping(): Record<string, string> {
+    return this.environment === Environment.Desktop
+      ? LegacyWebToDesktopVersionMapping
+      : this.environment === Environment.Mobile
+      ? LegacyWebToMobileVersionMapping
+      : {}
+  }
+
+  public getDesktopDownloadsUrl(version: string): string {
+    return DesktopDownloadsUrlBase + version
+  }
+
+  public getDesktopVersionForWebVersion(webVersion: string): string {
+    return LegacyWebToDesktopVersionMapping[webVersion] ?? webVersion
+  }
+}

packages/ui-services/src/Changelog/ChangelogServiceInterface.ts

@@ -0,0 +1,10 @@
+import { Changelog, ChangelogVersion } from './Changelog'
+
+export interface ChangelogServiceInterface {
+  getChangelog(): Promise<Changelog>
+  getVersions(): Promise<ChangelogVersion[]>
+  getDesktopDownloadsUrl(version: string): string
+  getDesktopVersionForWebVersion(webVersion: string): string
+  markAsRead(): void
+  getLastReadVersion(): string | undefined
+}

packages/ui-services/src/Changelog/LegacyDesktopMapping.ts

@@ -0,0 +1,351 @@
+/**
+ * Before 11/23/2022, web and desktop used independent semantic versioning. After this point, desktop automatically
+ * uses web's versioning. The mapping below allows us to see what particular web version a legacy desktop version maps to
+ */
+export const LegacyWebToDesktopVersionMapping: Record<string, string> = {
+  '3.107.0': '3.101.2',
+  '3.106.0': '3.101.1',
+  '3.105.0': '3.101.0',
+  '3.104.1': '3.100.18',
+  '3.104.0': '3.100.17',
+  '3.103.2': '3.100.16',
+  '3.103.1': '3.100.15',
+  '3.103.0': '3.100.14',
+  '3.102.0': '3.100.13',
+  '3.101.2': '3.100.12',
+  '3.101.1': '3.100.11',
+  '3.101.0': '3.100.10',
+  '3.100.8': '3.100.9',
+  '3.100.7': '3.100.8',
+  '3.100.6': '3.100.7',
+  '3.100.5': '3.100.6',
+  '3.100.4': '3.100.5',
+  '3.100.3': '3.100.4',
+  '3.100.2': '3.100.3',
+  '3.100.1': '3.100.2',
+  '3.100.0': '3.100.1',
+  '3.99.0': '3.100.0',
+  '3.98.2': '3.23.301',
+  '3.98.1': '3.23.300',
+  '3.98.0': '3.23.299',
+  '3.97.0': '3.23.298',
+  '3.96.1': '3.23.297',
+  '3.96.0': '3.23.296',
+  '3.95.1': '3.23.295',
+  '3.95.0': '3.23.294',
+  '3.94.2': '3.23.293',
+  '3.94.1': '3.23.292',
+  '3.94.0': '3.23.291',
+  '3.93.19': '3.23.290',
+  '3.93.18': '3.23.289',
+  '3.93.17': '3.23.288',
+  '3.93.16': '3.23.287',
+  '3.93.15': '3.23.286',
+  '3.93.14': '3.23.285',
+  '3.93.13': '3.23.284',
+  '3.93.12': '3.23.283',
+  '3.93.11': '3.23.282',
+  '3.93.10': '3.23.281',
+  '3.93.9': '3.23.280',
+  '3.93.8': '3.23.279',
+  '3.93.7': '3.23.278',
+  '3.93.6': '3.23.277',
+  '3.93.5': '3.23.276',
+  '3.93.4': '3.23.275',
+  '3.93.3': '3.23.274',
+  '3.93.2': '3.23.273',
+  '3.93.1': '3.23.272',
+  '3.93.0': '3.23.271',
+  '3.92.0': '3.23.270',
+  '3.91.1': '3.23.269',
+  '3.91.0': '3.23.268',
+  '3.90.11': '3.23.267',
+  '3.90.10': '3.23.266',
+  '3.90.9': '3.23.265',
+  '3.90.8': '3.23.264',
+  '3.90.7': '3.23.263',
+  '3.90.6': '3.23.262',
+  '3.90.5': '3.23.261',
+  '3.90.4': '3.23.260',
+  '3.90.3': '3.23.259',
+  '3.90.2': '3.23.258',
+  '3.90.1': '3.23.257',
+  '3.90.0': '3.23.256',
+  '3.89.0': '3.23.255',
+  '3.88.1': '3.23.254',
+  '3.88.0': '3.23.253',
+  '3.87.2': '3.23.252',
+  '3.87.1': '3.23.251',
+  '3.87.0': '3.23.250',
+  '3.86.0': '3.23.249',
+  '3.85.2': '3.23.248',
+  '3.85.1': '3.23.247',
+  '3.85.0': '3.23.246',
+  '3.84.7': '3.23.245',
+  '3.84.6': '3.23.244',
+  '3.84.5': '3.23.243',
+  '3.84.4': '3.23.242',
+  '3.84.3': '3.23.241',
+  '3.84.2': '3.23.240',
+  '3.84.1': '3.23.239',
+  '3.84.0': '3.23.238',
+  '3.83.0': '3.23.237',
+  '3.82.6': '3.23.236',
+  '3.82.5': '3.23.235',
+  '3.82.4': '3.23.234',
+  '3.82.3': '3.23.233',
+  '3.82.2': '3.23.232',
+  '3.82.1': '3.23.231',
+  '3.82.0': '3.23.230',
+  '3.81.0': '3.23.229',
+  '3.80.1': '3.23.228',
+  '3.80.0': '3.23.227',
+  '3.79.0': '3.23.226',
+  '3.78.1': '3.23.225',
+  '3.78.0': '3.23.224',
+  '3.77.1': '3.23.223',
+  '3.77.0': '3.23.222',
+  '3.76.2': '3.23.221',
+  '3.76.1': '3.23.220',
+  '3.76.0': '3.23.219',
+  '3.75.1': '3.23.218',
+  '3.75.0': '3.23.217',
+  '3.74.0': '3.23.216',
+  '3.73.0': '3.23.215',
+  '3.72.4': '3.23.214',
+  '3.72.3': '3.23.213',
+  '3.72.2': '3.23.212',
+  '3.72.1': '3.23.211',
+  '3.72.0': '3.23.210',
+  '3.71.8': '3.23.209',
+  '3.71.7': '3.23.208',
+  '3.71.6': '3.23.207',
+  '3.71.5': '3.23.206',
+  '3.71.4': '3.23.205',
+  '3.71.3': '3.23.204',
+  '3.71.2': '3.23.203',
+  '3.71.1': '3.23.202',
+  '3.71.0': '3.23.201',
+  '3.70.5': '3.23.200',
+  '3.70.4': '3.23.199',
+  '3.70.3': '3.23.198',
+  '3.70.2': '3.23.197',
+  '3.70.1': '3.23.196',
+  '3.70.0': '3.23.195',
+  '3.69.1': '3.23.194',
+  '3.69.0': '3.23.193',
+  '3.68.6': '3.23.192',
+  '3.68.5': '3.23.191',
+  '3.68.4': '3.23.190',
+  '3.68.3': '3.23.189',
+  '3.68.2': '3.23.188',
+  '3.68.1': '3.23.187',
+  '3.68.0': '3.23.186',
+  '3.67.4': '3.23.185',
+  '3.67.3': '3.23.184',
+  '3.67.2': '3.23.183',
+  '3.67.1': '3.23.182',
+  '3.67.0': '3.23.181',
+  '3.66.0': '3.23.180',
+  '3.65.0': '3.23.179',
+  '3.64.0': '3.23.178',
+  '3.63.3': '3.23.177',
+  '3.63.2': '3.23.176',
+  '3.63.1': '3.23.175',
+  '3.63.0': '3.23.174',
+  '3.62.4': '3.23.173',
+  '3.62.3': '3.23.172',
+  '3.62.2': '3.23.171',
+  '3.62.1': '3.23.170',
+  '3.62.0': '3.23.169',
+  '3.61.0': '3.23.168',
+  '3.60.0': '3.23.167',
+  '3.59.3': '3.23.166',
+  '3.59.2': '3.23.165',
+  '3.59.1': '3.23.164',
+  '3.59.0': '3.23.163',
+  '3.58.1': '3.23.162',
+  '3.58.0': '3.23.161',
+  '3.57.3': '3.23.160',
+  '3.57.2': '3.23.159',
+  '3.57.1': '3.23.158',
+  '3.57.0': '3.23.157',
+  '3.56.0': '3.23.156',
+  '3.55.2': '3.23.155',
+  '3.55.1': '3.23.154',
+  '3.55.0': '3.23.153',
+  '3.54.6': '3.23.152',
+  '3.54.5': '3.23.151',
+  '3.54.4': '3.23.150',
+  '3.54.3': '3.23.149',
+  '3.54.2': '3.23.148',
+  '3.54.1': '3.23.147',
+  '3.54.0': '3.23.146',
+  '3.53.0': '3.23.145',
+  '3.52.1': '3.23.144',
+  '3.52.0': '3.23.143',
+  '3.51.0': '3.23.142',
+  '3.50.6': '3.23.141',
+  '3.50.5': '3.23.140',
+  '3.50.4': '3.23.139',
+  '3.50.3': '3.23.138',
+  '3.50.2': '3.23.137',
+  '3.50.1': '3.23.136',
+  '3.50.0': '3.23.135',
+  '3.49.3': '3.23.134',
+  '3.49.2': '3.23.133',
+  '3.49.1': '3.23.132',
+  '3.49.0': '3.23.131',
+  '3.48.3': '3.23.130',
+  '3.48.2': '3.23.129',
+  '3.48.1': '3.23.128',
+  '3.48.0': '3.23.127',
+  '3.47.3': '3.23.126',
+  '3.47.2': '3.23.125',
+  '3.47.1': '3.23.124',
+  '3.47.0': '3.23.123',
+  '3.46.3': '3.23.122',
+  '3.46.2': '3.23.121',
+  '3.46.1': '3.23.120',
+  '3.46.0': '3.23.119',
+  '3.45.18': '3.23.118',
+  '3.45.17': '3.23.117',
+  '3.45.16': '3.23.116',
+  '3.45.15': '3.23.115',
+  '3.45.14': '3.23.114',
+  '3.45.13': '3.23.113',
+  '3.45.12': '3.23.112',
+  '3.45.11': '3.23.111',
+  '3.45.10': '3.23.110',
+  '3.45.9': '3.23.109',
+  '3.45.8': '3.23.108',
+  '3.45.7': '3.23.107',
+  '3.45.6': '3.23.106',
+  '3.45.5': '3.23.105',
+  '3.45.4': '3.23.104',
+  '3.45.3': '3.23.103',
+  '3.45.2': '3.23.102',
+  '3.45.1': '3.23.101',
+  '3.45.0': '3.23.100',
+  '3.44.7': '3.23.99',
+  '3.44.6': '3.23.98',
+  '3.44.5': '3.23.97',
+  '3.44.4': '3.23.96',
+  '3.44.3': '3.23.95',
+  '3.44.2': '3.23.94',
+  '3.44.1': '3.23.93',
+  '3.44.0': '3.23.92',
+  '3.43.1': '3.23.91',
+  '3.43.0': '3.23.90',
+  '3.42.1': '3.23.89',
+  '3.42.0': '3.23.88',
+  '3.41.3': '3.23.87',
+  '3.41.2': '3.23.86',
+  '3.41.1': '3.23.85',
+  '3.41.0': '3.23.84',
+  '3.40.7': '3.23.83',
+  '3.40.6': '3.23.82',
+  '3.40.5': '3.23.81',
+  '3.40.4': '3.23.80',
+  '3.40.3': '3.23.79',
+  '3.40.2': '3.23.78',
+  '3.40.1': '3.23.77',
+  '3.40.0': '3.23.76',
+  '3.39.1': '3.23.75',
+  '3.39.0': '3.23.74',
+  '3.38.6': '3.23.73',
+  '3.38.5': '3.23.72',
+  '3.38.4': '3.23.71',
+  '3.38.3': '3.23.70',
+  '3.38.2': '3.23.69',
+  '3.38.1': '3.23.68',
+  '3.38.0': '3.23.67',
+  '3.37.7': '3.23.66',
+  '3.37.6': '3.23.65',
+  '3.37.5': '3.23.64',
+  '3.37.4': '3.23.63',
+  '3.37.3': '3.23.62',
+  '3.37.2': '3.23.61',
+  '3.37.1': '3.23.60',
+  '3.37.0': '3.23.59',
+  '3.36.0': '3.23.58',
+  '3.35.2': '3.23.57',
+  '3.35.1': '3.23.56',
+  '3.35.0': '3.23.55',
+  '3.34.0': '3.23.54',
+  '3.33.8': '3.23.53',
+  '3.33.7': '3.23.52',
+  '3.33.6': '3.23.51',
+  '3.33.5': '3.23.50',
+  '3.33.4': '3.23.49',
+  '3.33.3': '3.23.48',
+  '3.33.2': '3.23.47',
+  '3.33.1': '3.23.46',
+  '3.33.0': '3.23.45',
+  '3.32.0': '3.23.44',
+  '3.31.1': '3.23.43',
+  '3.31.0': '3.23.42',
+  '3.30.0': '3.23.41',
+  '3.29.2': '3.23.40',
+  '3.29.1': '3.23.39',
+  '3.29.0': '3.23.38',
+  '3.28.1': '3.23.37',
+  '3.28.0': '3.23.36',
+  '3.27.7': '3.23.35',
+  '3.27.6': '3.23.34',
+  '3.27.5': '3.23.33',
+  '3.27.4': '3.23.32',
+  '3.27.3': '3.23.31',
+  '3.27.2': '3.23.30',
+  '3.27.1': '3.23.29',
+  '3.27.0': '3.23.28',
+  '3.26.4': '3.23.27',
+  '3.26.3': '3.23.26',
+  '3.26.2': '3.23.25',
+  '3.26.1': '3.23.24',
+  '3.26.0': '3.23.23',
+  '3.25.0': '3.23.22',
+  '3.24.6': '3.23.21',
+  '3.24.5': '3.23.20',
+  '3.24.4': '3.23.19',
+  '3.24.3': '3.23.18',
+  '3.24.3-alpha.1': '3.23.17',
+  '3.24.3-alpha.0': '3.23.16',
+  '3.24.2': '3.23.15',
+  '3.24.2-alpha.1': '3.23.14',
+  '3.24.2-alpha.0': '3.23.13',
+  '3.24.1': '3.23.12',
+  '3.24.1-alpha.0': '3.23.11',
+  '3.24.0': '3.23.10',
+  '3.24.0-alpha.7': '3.23.9',
+  '3.24.0-alpha.6': '3.23.8',
+  '3.24.0-alpha.5': '3.23.7',
+  '3.24.0-alpha.4': '3.23.6',
+  '3.24.0-alpha.3': '3.23.5',
+  '3.24.0-alpha.2': '3.23.4',
+  '3.24.0-alpha.1': '3.23.3',
+  '3.24.0-alpha.0': '3.23.2',
+  '3.23.0': '3.23.1',
+  '3.23.0-alpha.1': '3.23.0',
+  '3.23.0-alpha.0': '3.22.21',
+  '3.22.7-alpha.0': '3.22.20',
+  '3.22.6': '3.22.19',
+  '3.22.6-alpha.0': '3.22.18',
+  '3.22.5': '3.22.17',
+  '3.22.4': '3.22.13-alpha.9',
+  '3.22.3': '3.22.13-alpha.8',
+  '3.22.3-alpha.9': '3.22.16-alpha.1',
+  '3.22.3-alpha.8': '3.22.16-alpha.0',
+  '3.22.3-alpha.7': '3.22.15',
+  '3.22.3-alpha.6': '3.22.15-alpha.3',
+  '3.22.3-alpha.5': '3.22.15-alpha.2',
+  '3.22.3-alpha.4': '3.22.15-alpha.1',
+  '3.22.3-alpha.3': '3.22.15-alpha.0',
+  '3.22.3-alpha.2': '3.22.14',
+  '3.22.3-alpha.1': '3.22.14-alpha.0',
+  '3.22.3-alpha.0': '3.22.13',
+  '3.22.2': '3.22.13-alpha.10',
+  '3.22.1': '3.22.13-alpha.7',
+  '3.22.0': '3.22.13-alpha.6',
+  '3.21.0': '3.22.13-alpha.5',
+}

packages/ui-services/src/Changelog/LegacyMobileMapping.ts

@@ -0,0 +1,351 @@
+/**
+ * Before 11/23/2022, web and mobile used independent semantic versioning. After this point, mobile automatically
+ * uses web's versioning. The mapping below allows us to see what particular web version a legacy mobile version maps to
+ */
+export const LegacyWebToMobileVersionMapping: Record<string, string> = {
+  '3.107.0': '3.46.31',
+  '3.106.0': '3.46.30',
+  '3.105.0': '3.46.29',
+  '3.104.1': '3.46.28',
+  '3.104.0': '3.46.27',
+  '3.103.2': '3.46.26',
+  '3.103.1': '3.46.25',
+  '3.103.0': '3.46.24',
+  '3.102.0': '3.46.23',
+  '3.101.2': '3.46.22',
+  '3.101.1': '3.46.21',
+  '3.101.0': '3.46.20',
+  '3.100.8': '3.46.19',
+  '3.100.7': '3.46.18',
+  '3.100.6': '3.46.17',
+  '3.100.5': '3.46.16',
+  '3.100.4': '3.46.15',
+  '3.100.3': '3.46.14',
+  '3.100.2': '3.46.13',
+  '3.100.1': '3.46.12',
+  '3.100.0': '3.46.11',
+  '3.99.0': '3.46.10',
+  '3.98.2': '3.46.9',
+  '3.98.1': '3.46.8',
+  '3.98.0': '3.46.7',
+  '3.97.0': '3.46.6',
+  '3.96.1': '3.46.5',
+  '3.96.0': '3.46.4',
+  '3.95.1': '3.46.3',
+  '3.95.0': '3.46.2',
+  '3.94.2': '3.46.1',
+  '3.94.1': '3.46.0',
+  '3.94.0': '3.45.42',
+  '3.93.19': '3.45.41',
+  '3.93.18': '3.45.40',
+  '3.93.17': '3.45.39',
+  '3.93.16': '3.45.38',
+  '3.93.15': '3.45.37',
+  '3.93.14': '3.45.36',
+  '3.93.13': '3.45.35',
+  '3.93.12': '3.45.34',
+  '3.93.11': '3.45.33',
+  '3.93.10': '3.45.32',
+  '3.93.9': '3.45.31',
+  '3.93.8': '3.45.30',
+  '3.93.7': '3.45.29',
+  '3.93.6': '3.45.28',
+  '3.93.5': '3.45.27',
+  '3.93.4': '3.45.26',
+  '3.93.3': '3.45.25',
+  '3.93.2': '3.45.24',
+  '3.93.1': '3.45.23',
+  '3.93.0': '3.45.22',
+  '3.92.0': '3.45.21',
+  '3.91.1': '3.45.20',
+  '3.91.0': '3.45.19',
+  '3.90.11': '3.45.18',
+  '3.90.10': '3.45.17',
+  '3.90.9': '3.45.16',
+  '3.90.8': '3.45.15',
+  '3.90.7': '3.45.14',
+  '3.90.6': '3.45.13',
+  '3.90.5': '3.45.12',
+  '3.90.4': '3.45.11',
+  '3.90.3': '3.45.10',
+  '3.90.2': '3.45.9',
+  '3.90.1': '3.45.8',
+  '3.90.0': '3.45.7',
+  '3.89.0': '3.45.6',
+  '3.88.1': '3.45.5',
+  '3.88.0': '3.45.4',
+  '3.87.2': '3.45.3',
+  '3.87.1': '3.45.2',
+  '3.87.0': '3.45.1',
+  '3.86.0': '3.45.0',
+  '3.85.2': '3.44.5',
+  '3.85.1': '3.44.4',
+  '3.85.0': '3.44.3',
+  '3.84.7': '3.44.2',
+  '3.84.6': '3.44.1',
+  '3.84.5': '3.44.0',
+  '3.84.4': '3.43.33',
+  '3.84.3': '3.43.32',
+  '3.84.2': '3.43.31',
+  '3.84.1': '3.43.30',
+  '3.84.0': '3.43.29',
+  '3.83.0': '3.43.28',
+  '3.82.6': '3.43.27',
+  '3.82.5': '3.43.26',
+  '3.82.4': '3.43.25',
+  '3.82.3': '3.43.24',
+  '3.82.2': '3.43.23',
+  '3.82.1': '3.43.22',
+  '3.82.0': '3.43.21',
+  '3.81.0': '3.43.20',
+  '3.80.1': '3.43.19',
+  '3.80.0': '3.43.18',
+  '3.79.0': '3.43.17',
+  '3.78.1': '3.43.16',
+  '3.78.0': '3.43.15',
+  '3.77.1': '3.43.14',
+  '3.77.0': '3.43.13',
+  '3.76.2': '3.43.12',
+  '3.76.1': '3.43.11',
+  '3.76.0': '3.43.10',
+  '3.75.1': '3.43.9',
+  '3.75.0': '3.43.8',
+  '3.74.0': '3.43.7',
+  '3.73.0': '3.43.6',
+  '3.72.4': '3.43.5',
+  '3.72.3': '3.43.4',
+  '3.72.2': '3.43.3',
+  '3.72.1': '3.43.2',
+  '3.72.0': '3.43.1',
+  '3.71.8': '3.43.0',
+  '3.71.7': '3.42.5',
+  '3.71.6': '3.42.4',
+  '3.71.5': '3.42.3',
+  '3.71.4': '3.42.2',
+  '3.71.3': '3.42.1',
+  '3.71.2': '3.42.0',
+  '3.71.1': '3.41.10',
+  '3.71.0': '3.41.9',
+  '3.70.5': '3.41.8',
+  '3.70.4': '3.41.7',
+  '3.70.3': '3.41.6',
+  '3.70.2': '3.41.5',
+  '3.70.1': '3.41.4',
+  '3.70.0': '3.41.3',
+  '3.69.1': '3.41.2',
+  '3.69.0': '3.41.1',
+  '3.68.6': '3.41.0',
+  '3.68.5': '3.40.2',
+  '3.68.4': '3.40.1',
+  '3.68.3': '3.40.0',
+  '3.68.2': '3.39.12',
+  '3.68.1': '3.39.11',
+  '3.68.0': '3.39.10',
+  '3.67.4': '3.39.9',
+  '3.67.3': '3.39.8',
+  '3.67.2': '3.39.7',
+  '3.67.1': '3.39.6',
+  '3.67.0': '3.39.5',
+  '3.66.0': '3.39.4',
+  '3.65.0': '3.39.3',
+  '3.64.0': '3.39.2',
+  '3.63.3': '3.39.1',
+  '3.63.2': '3.39.0',
+  '3.63.1': '3.38.1',
+  '3.63.0': '3.38.0',
+  '3.62.4': '3.37.14',
+  '3.62.3': '3.37.13',
+  '3.62.2': '3.37.12',
+  '3.62.1': '3.37.11',
+  '3.62.0': '3.37.10',
+  '3.61.0': '3.37.9',
+  '3.60.0': '3.37.8',
+  '3.59.3': '3.37.7',
+  '3.59.2': '3.37.6',
+  '3.59.1': '3.37.5',
+  '3.59.0': '3.37.4',
+  '3.58.1': '3.37.3',
+  '3.58.0': '3.37.2',
+  '3.57.3': '3.37.1',
+  '3.57.2': '3.37.0',
+  '3.57.1': '3.36.18',
+  '3.57.0': '3.36.17',
+  '3.56.0': '3.36.16',
+  '3.55.2': '3.36.15',
+  '3.55.1': '3.36.14',
+  '3.55.0': '3.36.13',
+  '3.54.6': '3.36.12',
+  '3.54.5': '3.36.11',
+  '3.54.4': '3.36.10',
+  '3.54.3': '3.36.9',
+  '3.54.2': '3.36.8',
+  '3.54.1': '3.36.7',
+  '3.54.0': '3.36.6',
+  '3.53.0': '3.36.5',
+  '3.52.1': '3.36.4',
+  '3.52.0': '3.36.3',
+  '3.51.0': '3.36.2',
+  '3.50.6': '3.36.1',
+  '3.50.5': '3.36.0',
+  '3.50.4': '3.35.16',
+  '3.50.3': '3.35.15',
+  '3.50.2': '3.35.14',
+  '3.50.1': '3.35.13',
+  '3.50.0': '3.35.12',
+  '3.49.3': '3.35.11',
+  '3.49.2': '3.35.10',
+  '3.49.1': '3.35.9',
+  '3.49.0': '3.35.8',
+  '3.48.3': '3.35.7',
+  '3.48.2': '3.35.6',
+  '3.48.1': '3.35.5',
+  '3.48.0': '3.35.4',
+  '3.47.3': '3.35.3',
+  '3.47.2': '3.35.2',
+  '3.47.1': '3.35.1',
+  '3.47.0': '3.35.0',
+  '3.46.3': '3.34.3',
+  '3.46.2': '3.34.2',
+  '3.46.1': '3.34.1',
+  '3.46.0': '3.34.0',
+  '3.45.18': '3.33.7',
+  '3.45.17': '3.33.6',
+  '3.45.16': '3.33.5',
+  '3.45.15': '3.33.4',
+  '3.45.14': '3.33.3',
+  '3.45.13': '3.33.2',
+  '3.45.12': '3.33.1',
+  '3.45.11': '3.33.0',
+  '3.45.10': '3.32.5',
+  '3.45.9': '3.32.4',
+  '3.45.8': '3.32.3',
+  '3.45.7': '3.32.2',
+  '3.45.6': '3.32.1',
+  '3.45.5': '3.32.0',
+  '3.45.4': '3.31.29',
+  '3.45.3': '3.31.28',
+  '3.45.2': '3.31.27',
+  '3.45.1': '3.31.26',
+  '3.45.0': '3.31.25',
+  '3.44.7': '3.31.24',
+  '3.44.6': '3.31.23',
+  '3.44.5': '3.31.22',
+  '3.44.4': '3.31.21',
+  '3.44.3': '3.31.20',
+  '3.44.2': '3.31.19',
+  '3.44.1': '3.31.18',
+  '3.44.0': '3.31.17',
+  '3.43.1': '3.31.16',
+  '3.43.0': '3.31.15',
+  '3.42.1': '3.31.14',
+  '3.42.0': '3.31.13',
+  '3.41.3': '3.31.12',
+  '3.41.2': '3.31.11',
+  '3.41.1': '3.31.10',
+  '3.41.0': '3.31.9',
+  '3.40.7': '3.31.8',
+  '3.40.6': '3.31.7',
+  '3.40.5': '3.31.6',
+  '3.40.4': '3.31.5',
+  '3.40.3': '3.31.4',
+  '3.40.2': '3.31.3',
+  '3.40.1': '3.31.2',
+  '3.40.0': '3.31.1',
+  '3.39.1': '3.31.0',
+  '3.39.0': '3.30.38',
+  '3.38.6': '3.30.37',
+  '3.38.5': '3.30.36',
+  '3.38.4': '3.30.35',
+  '3.38.3': '3.30.34',
+  '3.38.2': '3.30.33',
+  '3.38.1': '3.30.32',
+  '3.38.0': '3.30.31',
+  '3.37.7': '3.30.30',
+  '3.37.6': '3.30.29',
+  '3.37.5': '3.30.28',
+  '3.37.4': '3.30.27',
+  '3.37.3': '3.30.26',
+  '3.37.2': '3.30.25',
+  '3.37.1': '3.30.24',
+  '3.37.0': '3.30.23',
+  '3.36.0': '3.30.22',
+  '3.35.2': '3.30.21',
+  '3.35.1': '3.30.20',
+  '3.35.0': '3.30.19',
+  '3.34.0': '3.30.18',
+  '3.33.8': '3.30.17',
+  '3.33.7': '3.30.16',
+  '3.33.6': '3.30.15',
+  '3.33.5': '3.30.14',
+  '3.33.4': '3.30.13',
+  '3.33.3': '3.30.12',
+  '3.33.2': '3.30.11',
+  '3.33.1': '3.30.10',
+  '3.33.0': '3.30.9',
+  '3.32.0': '3.30.8',
+  '3.31.1': '3.30.7',
+  '3.31.0': '3.30.6',
+  '3.30.0': '3.30.5',
+  '3.29.2': '3.30.4',
+  '3.29.1': '3.30.3',
+  '3.29.0': '3.30.2',
+  '3.28.1': '3.30.1',
+  '3.28.0': '3.30.0',
+  '3.27.7': '3.29.0',
+  '3.27.6': '3.28.3',
+  '3.27.5': '3.28.2',
+  '3.27.4': '3.28.1',
+  '3.27.3': '3.28.0',
+  '3.27.2': '3.27.13',
+  '3.27.1': '3.27.12',
+  '3.27.0': '3.27.11',
+  '3.26.4': '3.27.10',
+  '3.26.3': '3.27.9',
+  '3.26.2': '3.27.8',
+  '3.26.1': '3.27.7',
+  '3.26.0': '3.27.6',
+  '3.25.0': '3.27.5',
+  '3.24.6': '3.27.4',
+  '3.24.5': '3.27.3',
+  '3.24.4': '3.27.2',
+  '3.24.3': '3.27.1',
+  '3.24.3-alpha.1': '3.27.0',
+  '3.24.3-alpha.0': '3.26.14',
+  '3.24.2': '3.26.13',
+  '3.24.2-alpha.1': '3.26.12',
+  '3.24.2-alpha.0': '3.26.11',
+  '3.24.1': '3.26.10',
+  '3.24.1-alpha.0': '3.26.9',
+  '3.24.0': '3.26.8',
+  '3.24.0-alpha.7': '3.26.7',
+  '3.24.0-alpha.6': '3.26.6',
+  '3.24.0-alpha.5': '3.26.5',
+  '3.24.0-alpha.4': '3.26.4',
+  '3.24.0-alpha.3': '3.26.3',
+  '3.24.0-alpha.2': '3.26.2',
+  '3.24.0-alpha.1': '3.26.1',
+  '3.24.0-alpha.0': '3.26.0',
+  '3.23.0': '3.25.15',
+  '3.23.0-alpha.1': '3.25.14',
+  '3.23.0-alpha.0': '3.25.13',
+  '3.22.7-alpha.0': '3.25.12',
+  '3.22.6': '3.25.11',
+  '3.22.6-alpha.0': '3.25.10',
+  '3.22.5': '3.25.9',
+  '3.22.4': '3.24.4',
+  '3.22.3': '3.24.3',
+  '3.22.3-alpha.9': '3.25.6',
+  '3.22.3-alpha.8': '3.25.5',
+  '3.22.3-alpha.7': '3.25.4',
+  '3.22.3-alpha.6': '3.25.3',
+  '3.22.3-alpha.5': '3.25.2',
+  '3.22.3-alpha.4': '3.25.1',
+  '3.22.3-alpha.3': '3.25.0',
+  '3.22.3-alpha.2': '3.24.8',
+  '3.22.3-alpha.1': '3.24.7',
+  '3.22.3-alpha.0': '3.24.6',
+  '3.22.2': '3.24.5',
+  '3.22.1': '3.24.2',
+  '3.22.0': '3.24.2-alpha.2',
+  '3.21.0': '3.24.2-alpha.1',
+}

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

@@ -2,8 +2,8 @@ import { KeyboardCommand } from './KeyboardCommands'
 
 export type KeyboardCommandHandler = {
   command: KeyboardCommand
-  onKeyDown?: (event: KeyboardEvent) => boolean | void
-  onKeyUp?: (event: KeyboardEvent) => boolean | void
+  onKeyDown?: (event: KeyboardEvent, data?: unknown) => boolean | void
+  onKeyUp?: (event: KeyboardEvent, data?: unknown) => boolean | void
   element?: HTMLElement
   elements?: HTMLElement[]
   notElement?: HTMLElement

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

@@ -24,3 +24,7 @@ export const OPEN_NOTE_HISTORY_COMMAND = createKeyboardCommand('OPEN_NOTE_HISTOR
 export const CAPTURE_SAVE_COMMAND = createKeyboardCommand('CAPTURE_SAVE_COMMAND')
 export const STAR_NOTE_COMMAND = createKeyboardCommand('STAR_NOTE_COMMAND')
 export const PIN_NOTE_COMMAND = createKeyboardCommand('PIN_NOTE_COMMAND')
+export const SUPER_SHOW_MARKDOWN_PREVIEW = createKeyboardCommand('SUPER_SHOW_MARKDOWN_PREVIEW')
+export const SUPER_EXPORT_JSON = createKeyboardCommand('SUPER_EXPORT_JSON')
+export const SUPER_EXPORT_MARKDOWN = createKeyboardCommand('SUPER_EXPORT_MARKDOWN')
+export const SUPER_EXPORT_HTML = createKeyboardCommand('SUPER_EXPORT_HTML')

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

@@ -165,6 +165,22 @@ export class KeyboardService {
     }
   }
 
+  public triggerCommand(command: KeyboardCommand, data?: unknown): void {
+    for (const observer of this.commandHandlers) {
+      if (observer.command !== command) {
+        continue
+      }
+
+      const callback = observer.onKeyDown || observer.onKeyUp
+      if (callback) {
+        const exclusive = callback(new KeyboardEvent('command-trigger'), data)
+        if (exclusive) {
+          return
+        }
+      }
+    }
+  }
+
   registerShortcut(shortcut: KeyboardShortcut): void {
     this.commandMap.set(shortcut.command, shortcut)
   }

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

@@ -21,6 +21,7 @@ import {
   CAPTURE_SAVE_COMMAND,
   STAR_NOTE_COMMAND,
   PIN_NOTE_COMMAND,
+  SUPER_SHOW_MARKDOWN_PREVIEW,
 } from './KeyboardCommands'
 import { KeyboardKey } from './KeyboardKey'
 import { KeyboardModifier } from './KeyboardModifier'
@@ -132,5 +133,11 @@ export function getKeyboardShortcuts(platform: Platform, _environment: Environme
       modifiers: [primaryModifier, KeyboardModifier.Shift],
       preventDefault: true,
     },
+    {
+      command: SUPER_SHOW_MARKDOWN_PREVIEW,
+      key: 'm',
+      modifiers: [primaryModifier, KeyboardModifier.Shift],
+      preventDefault: true,
+    },
   ]
 }

packages/ui-services/src/Preferences/PreferenceId.ts

@@ -9,6 +9,7 @@ const PREFERENCE_IDS = [
   'accessibility',
   'get-free-month',
   'help-feedback',
+  'whats-new',
 ] as const
 
 export type PreferenceId = typeof PREFERENCE_IDS[number]

packages/ui-services/src/index.ts

@@ -1,6 +1,9 @@
 export * from './Alert/Functions'
 export * from './Alert/WebAlertService'
 export * from './Archive/ArchiveManager'
+export * from './Changelog/Changelog'
+export * from './Changelog/ChangelogService'
+export * from './Changelog/ChangelogServiceInterface'
 export * from './Keyboard/KeyboardService'
 export * from './Keyboard/KeyboardShortcut'
 export * from './Keyboard/KeyboardCommands'

packages/utils/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.13.0](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-11-23)
+
+### Features
+
+* use line height preference in super editor (skip e2e) ([#2045](https://github.com/standardnotes/app/issues/2045)) ([87cd31a](https://github.com/standardnotes/app/commit/87cd31ae5d630a528ce6d4895b2c144bf51808f0))
+
 # [1.12.0](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-11-23)
 
 ### Features

packages/utils/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/utils",
-  "version": "1.12.0",
+  "version": "1.13.0",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },

packages/utils/src/Domain/index.ts

@@ -1,4 +1,5 @@
 export * from './Utils/Utils'
+export * from './Utils/ClassNames'
 export * from './Uuid/UuidGenerator'
 export * from './Uuid/UuidMap'
 export * from './Uuid/Utils'

packages/web/CHANGELOG.md

@@ -3,6 +3,102 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [3.112.0](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-11-28)
+
+### Bug Fixes
+
+* Super editor popover menus on iOS ([#2061](https://github.com/standardnotes/app/issues/2061)) ([148aee4](https://github.com/standardnotes/app/commit/148aee441b816c58599d95db2e5b0f3f93414511))
+
+### Features
+
+* Paste files in Super notes to upload and embed them ([#2060](https://github.com/standardnotes/app/issues/2060)) ([db3069e](https://github.com/standardnotes/app/commit/db3069eab373636e3fa5ebdd15324644579dd93c))
+
+## [3.111.2](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-11-28)
+
+### Bug Fixes
+
+* add new line after embedding files ([7f6c53d](https://github.com/standardnotes/app/commit/7f6c53dfcbc8952ca9eee76b9c4af70fea3c1bf1))
+
+## [3.111.1](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-11-28)
+
+### Bug Fixes
+
+* navigation footer padding ([6fc1bb5](https://github.com/standardnotes/app/commit/6fc1bb5e841543c7c07814764edfc68af6b53f5c))
+
+# [3.111.0](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-11-27)
+
+### Features
+
+* add arrow key navigation to file context menu & options panel ([ac91621](https://github.com/standardnotes/app/commit/ac916212714e219fc203597cb873e79aa9d6a6f2))
+
+## [3.110.4](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-11-27)
+
+**Note:** Version bump only for package @standardnotes/web
+
+## [3.110.3](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-11-27)
+
+**Note:** Version bump only for package @standardnotes/web
+
+## [3.110.2](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-11-27)
+
+**Note:** Version bump only for package @standardnotes/web
+
+## [3.110.1](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-11-25)
+
+### Bug Fixes
+
+* issue where plaintext editor autofocus would interfere with sign in form ([a6efc53](https://github.com/standardnotes/app/commit/a6efc5336b5e5b4814e7e833ccdc2cd4b0096ce8))
+
+# [3.110.0](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-11-25)
+
+### Features
+
+* Markdown, HTML & JSON export options for super notes ([#2054](https://github.com/standardnotes/app/issues/2054)) ([dcc8cfb](https://github.com/standardnotes/app/commit/dcc8cfbe45644dbb77e0ade0073017e6ac66164c))
+
+### Reverts
+
+* Revert "chore: e2e tests opt in" ([9b91875](https://github.com/standardnotes/app/commit/9b91875d3d31609449e22a386d7305fd7ca5a68f))
+
+## [3.109.1](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-11-24)
+
+**Note:** Version bump only for package @standardnotes/web
+
+# [3.109.0](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-11-24)
+
+### Bug Fixes
+
+* include more search results in linking autocomplete menu ([2e517c9](https://github.com/standardnotes/app/commit/2e517c985dfff5e1980f505f1b38cbdea292211a))
+
+### Features
+
+* resize images in super editor ([#2052](https://github.com/standardnotes/app/issues/2052)) ([2485bed](https://github.com/standardnotes/app/commit/2485bed3508b194137f058064cb36d1ba1d2c41c))
+
+## [3.108.1](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-11-24)
+
+**Note:** Version bump only for package @standardnotes/web
+
+# [3.108.0](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-11-24)
+
+### Features
+
+* New 'What's New' section in Preferences ([#2049](https://github.com/standardnotes/app/issues/2049)) (skip e2e) ([0a01ddb](https://github.com/standardnotes/app/commit/0a01ddb430154fa4518985458c15c644855c80ea))
+
+# [3.107.0](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-11-23)
+
+### Bug Fixes
+
+* change editor button icon & selection ([9d5a575](https://github.com/standardnotes/app/commit/9d5a57521e58823f7d8e17c7a9d7776c5e0bc672))
+
+### Features
+
+* option to show markdown preview for super notes (skip e2e) ([#2048](https://github.com/standardnotes/app/issues/2048)) ([8579ff3](https://github.com/standardnotes/app/commit/8579ff39b1f81dbbcf22b4031ede183ab4287262))
+
+# [3.106.0](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-11-23)
+
+### Features
+
+* use line height preference in super editor (skip e2e) ([#2045](https://github.com/standardnotes/app/issues/2045)) ([87cd31a](https://github.com/standardnotes/app/commit/87cd31ae5d630a528ce6d4895b2c144bf51808f0))
+
 # [3.105.0](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-11-23)
 
 ### Bug Fixes

packages/web/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@standardnotes/web",
-  "version": "3.105.0",
+  "version": "3.112.0",
   "license": "AGPL-3.0-or-later",
   "main": "dist/app.js",
-  "author": "Standard Notes.",
+  "author": "Standard Notes",
   "private": true,
   "files": [
     "dist"

packages/web/src/javascripts/App.tsx

@@ -16,6 +16,7 @@ declare global {
     webClient?: DesktopManagerInterface
     electronRemoteBridge?: unknown
     reactNativeDevice?: WebDevice
+    platform?: Platform
 
     application?: WebApplication
     mainApplicationGroup?: ApplicationGroup
@@ -25,7 +26,7 @@ declare global {
 
 import { disableIosTextFieldZoom } from '@/Utils'
 import { IsWebPlatform, WebAppVersion } from '@/Constants/Version'
-import { DesktopManagerInterface, SNLog } from '@standardnotes/snjs'
+import { DesktopManagerInterface, Platform, SNLog } from '@standardnotes/snjs'
 import ApplicationGroupView from './Components/ApplicationGroupView/ApplicationGroupView'
 import { WebDevice } from './Application/Device/WebDevice'
 import { StartApplication } from './Application/Device/StartApplication'
@@ -100,6 +101,7 @@ if (IsWebPlatform) {
 
   setTimeout(() => {
     const device = window.reactNativeDevice || new WebDevice(WebAppVersion)
+    window.platform = device.platform
 
     startApplication(window.defaultSyncServer, device, window.enabledUnfinishedFeatures, window.websocketUrl).catch(
       console.error,

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

@@ -29,6 +29,7 @@ import { DesktopManager } from './Device/DesktopManager'
 import {
   ArchiveManager,
   AutolockService,
+  ChangelogService,
   KeyboardService,
   PreferenceId,
   RouteService,
@@ -97,6 +98,7 @@ export class WebApplication extends SNApplication implements WebApplicationInter
       ? new DesktopManager(this, deviceInterface)
       : undefined
     this.webServices.viewControllerManager = new ViewControllerManager(this, deviceInterface)
+    this.webServices.changelogService = new ChangelogService(this.environment, this.storage)
 
     if (this.isNativeMobileWeb()) {
       this.mobileWebReceiver = new MobileWebReceiver(this)
@@ -193,6 +195,10 @@ export class WebApplication extends SNApplication implements WebApplicationInter
     return this.webServices.viewControllerManager.paneController
   }
 
+  public get changelogService() {
+    return this.webServices.changelogService
+  }
+
   public get desktopDevice(): DesktopDeviceInterface | undefined {
     if (isDesktopDevice(this.deviceInterface)) {
       return this.deviceInterface

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

@@ -1,6 +1,12 @@
 import { ViewControllerManager } from '@/Controllers/ViewControllerManager'
 import { DesktopManager } from './Device/DesktopManager'
-import { ArchiveManager, AutolockService, KeyboardService, ThemeManager } from '@standardnotes/ui-services'
+import {
+  ArchiveManager,
+  AutolockService,
+  ChangelogServiceInterface,
+  KeyboardService,
+  ThemeManager,
+} from '@standardnotes/ui-services'
 
 export type WebServices = {
   viewControllerManager: ViewControllerManager
@@ -9,4 +15,5 @@ export type WebServices = {
   archiveService: ArchiveManager
   themeService: ThemeManager
   keyboardService: KeyboardService
+  changelogService: ChangelogServiceInterface
 }

packages/web/src/javascripts/Components/AccountMenu/GeneralAccountMenu.tsx

@@ -9,7 +9,6 @@ import { AccountMenuPane } from './AccountMenuPane'
 import Menu from '@/Components/Menu/Menu'
 import MenuItem from '@/Components/Menu/MenuItem'
 import MenuItemSeparator from '@/Components/Menu/MenuItemSeparator'
-import { MenuItemType } from '@/Components/Menu/MenuItemType'
 import WorkspaceSwitcherOption from './WorkspaceSwitcher/WorkspaceSwitcherOption'
 import { ApplicationGroup } from '@/Application/ApplicationGroup'
 import { formatLastSyncDate } from '@/Utils/DateUtils'
@@ -150,23 +149,23 @@ const GeneralAccountMenu: FunctionComponent<Props> = ({
         />
         <MenuItemSeparator />
         {user ? (
-          <MenuItem type={MenuItemType.IconButton} onClick={openPreferences}>
+          <MenuItem onClick={openPreferences}>
             <Icon type="user" className={iconClassName} />
             Account settings
           </MenuItem>
         ) : (
           <>
-            <MenuItem type={MenuItemType.IconButton} onClick={activateRegisterPane}>
+            <MenuItem onClick={activateRegisterPane}>
               <Icon type="user" className={iconClassName} />
               Create free account
             </MenuItem>
-            <MenuItem type={MenuItemType.IconButton} onClick={activateSignInPane}>
+            <MenuItem onClick={activateSignInPane}>
               <Icon type="signIn" className={iconClassName} />
               Sign in
             </MenuItem>
           </>
         )}
-        <MenuItem className="justify-between" type={MenuItemType.IconButton} onClick={openHelp}>
+        <MenuItem className="justify-between" onClick={openHelp}>
           <div className="flex items-center">
             <Icon type="help" className={iconClassName} />
             Help &amp; feedback
@@ -176,7 +175,7 @@ const GeneralAccountMenu: FunctionComponent<Props> = ({
         {user ? (
           <>
             <MenuItemSeparator />
-            <MenuItem type={MenuItemType.IconButton} onClick={signOut}>
+            <MenuItem onClick={signOut}>
               <Icon type="signOut" className={iconClassName} />
               Sign out workspace
             </MenuItem>

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

@@ -1,6 +1,4 @@
 import Icon from '@/Components/Icon/Icon'
-import MenuItem from '@/Components/Menu/MenuItem'
-import { MenuItemType } from '@/Components/Menu/MenuItemType'
 import { KeyboardKey } from '@standardnotes/ui-services'
 import { ApplicationDescriptor } from '@standardnotes/snjs'
 import {
@@ -13,6 +11,7 @@ import {
   useRef,
   useState,
 } from 'react'
+import MenuRadioButtonItem from '@/Components/Menu/MenuRadioButtonItem'
 
 type Props = {
   descriptor: ApplicationDescriptor
@@ -56,8 +55,7 @@ const WorkspaceMenuItem: FunctionComponent<Props> = ({
   }, [inputValue, renameDescriptor])
 
   return (
-    <MenuItem
-      type={MenuItemType.RadioButton}
+    <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}
@@ -100,7 +98,7 @@ const WorkspaceMenuItem: FunctionComponent<Props> = ({
           </div>
         )}
       </div>
-    </MenuItem>
+    </MenuRadioButtonItem>
   )
 }
 

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

@@ -7,7 +7,6 @@ import Icon from '@/Components/Icon/Icon'
 import Menu from '@/Components/Menu/Menu'
 import MenuItem from '@/Components/Menu/MenuItem'
 import MenuItemSeparator from '@/Components/Menu/MenuItemSeparator'
-import { MenuItemType } from '@/Components/Menu/MenuItemType'
 import WorkspaceMenuItem from './WorkspaceMenuItem'
 
 type Props = {
@@ -85,13 +84,13 @@ const WorkspaceSwitcherMenu: FunctionComponent<Props> = ({
       ))}
       <MenuItemSeparator />
 
-      <MenuItem type={MenuItemType.IconButton} onClick={addAnotherWorkspace}>
+      <MenuItem onClick={addAnotherWorkspace}>
         <Icon type="user-add" className="mr-2 text-neutral" />
         Add another workspace
       </MenuItem>
 
       {!hideWorkspaceOptions && (
-        <MenuItem type={MenuItemType.IconButton} onClick={signoutAll}>
+        <MenuItem onClick={signoutAll}>
           <Icon type="signOut" className="mr-2 text-neutral" />
           Sign out all workspaces
         </MenuItem>

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

@@ -6,7 +6,6 @@ import { FunctionComponent, useCallback, useRef, useState } from 'react'
 import Icon from '@/Components/Icon/Icon'
 import WorkspaceSwitcherMenu from './WorkspaceSwitcherMenu'
 import MenuItem from '@/Components/Menu/MenuItem'
-import { MenuItemType } from '@/Components/Menu/MenuItemType'
 import Popover from '@/Components/Popover/Popover'
 import { MenuItemIconSize } from '@/Constants/TailwindClassNames'
 
@@ -25,13 +24,7 @@ const WorkspaceSwitcherOption: FunctionComponent<Props> = ({ mainApplicationGrou
 
   return (
     <>
-      <MenuItem
-        tabIndex={FOCUSABLE_BUT_NOT_TABBABLE}
-        ref={buttonRef}
-        type={MenuItemType.IconButton}
-        onClick={toggleMenu}
-        className="justify-between"
-      >
+      <MenuItem tabIndex={FOCUSABLE_BUT_NOT_TABBABLE} ref={buttonRef} onClick={toggleMenu} className="justify-between">
         <div className="flex items-center">
           <Icon type="user-switch" className={`mr-2 text-neutral ${MenuItemIconSize}`} />
           Switch workspace

packages/web/src/javascripts/Components/Button/RoundIconButton.tsx

@@ -1,7 +1,7 @@
 import { ForwardedRef, forwardRef, MouseEventHandler } from 'react'
 import Icon from '@/Components/Icon/Icon'
 import { IconType } from '@standardnotes/snjs'
-import { classNames } from '@/Utils/ConcatenateClassNames'
+import { classNames } from '@standardnotes/utils'
 
 type Props = {
   onClick: () => void

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

@@ -20,7 +20,7 @@ import { ViewControllerManager } from '@/Controllers/ViewControllerManager'
 import { ChallengeModalValues } from './ChallengeModalValues'
 import { InputValue } from './InputValue'
 import { isMobileScreen } from '@/Utils'
-import { classNames } from '@/Utils/ConcatenateClassNames'
+import { classNames } from '@standardnotes/utils'
 
 type Props = {
   application: WebApplication

packages/web/src/javascripts/Components/ChangeEditor/ChangeEditorButton.tsx

@@ -26,7 +26,9 @@ const ChangeEditorButton: FunctionComponent<Props> = ({
   const [selectedEditor, setSelectedEditor] = useState(() => {
     return note ? application.componentManager.editorForNote(note) : undefined
   })
-  const [selectedEditorIcon, selectedEditorIconTint] = getIconAndTintForNoteType(selectedEditor?.package_info.note_type)
+  const [selectedEditorIcon, selectedEditorIconTint] = getIconAndTintForNoteType(
+    note?.noteType || selectedEditor?.package_info.note_type,
+  )
   const [isClickOutsideDisabled, setIsClickOutsideDisabled] = useState(false)
 
   const toggleMenu = useCallback(async () => {

packages/web/src/javascripts/Components/ChangeEditor/ChangeEditorMenu.tsx

@@ -1,7 +1,5 @@
 import Icon from '@/Components/Icon/Icon'
 import Menu from '@/Components/Menu/Menu'
-import MenuItem from '@/Components/Menu/MenuItem'
-import { MenuItemType } from '@/Components/Menu/MenuItemType'
 import { usePremiumModal } from '@/Hooks/usePremiumModal'
 import { STRING_EDIT_LOCKED_ATTEMPT } from '@/Constants/Strings'
 import { WebApplication } from '@/Application/Application'
@@ -13,6 +11,7 @@ import { createEditorMenuGroups } from '../../Utils/createEditorMenuGroups'
 import { reloadFont } from '../NoteView/FontFunctions'
 import { PremiumFeatureIconClass, PremiumFeatureIconName } from '../Icon/PremiumFeatureIcon'
 import { SuperNoteImporter } from '../NoteView/SuperEditor/SuperNoteImporter'
+import MenuRadioButtonItem from '../Menu/MenuRadioButtonItem'
 
 type ChangeEditorMenuProps = {
   application: WebApplication
@@ -59,7 +58,11 @@ const ChangeEditorMenu: FunctionComponent<ChangeEditorMenuProps> = ({
         return item.component?.identifier === currentComponent.identifier
       }
 
-      return item.noteType === note?.noteType || (!note?.noteType && item.noteType === NoteType.Plain)
+      const itemNoteTypeIsSameAsCurrentNoteType = item.noteType === note?.noteType
+      const noteDoesntHaveTypeAndItemIsPlain = !note?.noteType && item.noteType === NoteType.Plain
+      const unknownNoteTypeAndItemIsPlain = note?.noteType === NoteType.Unknown && item.noteType === NoteType.Plain
+
+      return itemNoteTypeIsSameAsCurrentNoteType || noteDoesntHaveTypeAndItemIsPlain || unknownNoteTypeAndItemIsPlain
     },
     [currentComponent, note],
   )
@@ -186,12 +189,11 @@ const ChangeEditorMenu: FunctionComponent<ChangeEditorMenuProps> = ({
                       selectItem(item).catch(console.error)
                     }
                     return (
-                      <MenuItem
+                      <MenuRadioButtonItem
                         key={item.name}
-                        type={MenuItemType.RadioButton}
                         onClick={onClickEditorItem}
                         className={'flex-row-reverse py-2'}
-                        checked={item.isEntitled ? isSelected(item) : undefined}
+                        checked={item.isEntitled ? isSelected(item) : false}
                       >
                         <div className="flex flex-grow items-center justify-between">
                           <div className={`flex items-center ${group.featured ? 'font-bold' : ''}`}>
@@ -202,7 +204,7 @@ const ChangeEditorMenu: FunctionComponent<ChangeEditorMenuProps> = ({
                             <Icon type={PremiumFeatureIconName} className={PremiumFeatureIconClass} />
                           )}
                         </div>
-                      </MenuItem>
+                      </MenuRadioButtonItem>
                     )
                   })}
                 </div>

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

@@ -1,4 +1,4 @@
-import { classNames } from '@/Utils/ConcatenateClassNames'
+import { classNames } from '@standardnotes/utils'
 import { ComponentPropsWithoutRef } from 'react'
 import Icon from '../Icon/Icon'
 

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

@@ -6,7 +6,7 @@ import { CalendarMonth } from './CalendarMonth'
 import { CalendarMonths } from './Constants'
 import { insertMonths, insertMonthsWithTarget } from './CalendarUtilts'
 import { InfiniteScrollerInterface, InfinteScroller } from '../InfiniteScroller/InfiniteScroller'
-import { classNames } from '@/Utils/ConcatenateClassNames'
+import { classNames } from '@standardnotes/utils'
 import { LoggingDomain, log } from '@/Logging'
 import { usePrevious } from './usePrevious'
 import { isMobileScreen } from '@/Utils'

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

@@ -11,7 +11,7 @@ import { SelectedItemsController } from '@/Controllers/SelectedItemsController'
 import { NavigationController } from '@/Controllers/Navigation/NavigationController'
 import { NotesController } from '@/Controllers/NotesController/NotesController'
 import { ElementIds } from '@/Constants/ElementIDs'
-import { classNames } from '@/Utils/ConcatenateClassNames'
+import { classNames } from '@standardnotes/utils'
 import { ContentType, SNTag } from '@standardnotes/snjs'
 
 type Props = {

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

@@ -30,7 +30,7 @@ import { useResponsiveAppPane } from '../ResponsivePane/ResponsivePaneProvider'
 import { StreamingFileReader } from '@standardnotes/filepicker'
 import SearchBar from '../SearchBar/SearchBar'
 import { SearchOptionsController } from '@/Controllers/SearchOptionsController'
-import { classNames } from '@/Utils/ConcatenateClassNames'
+import { classNames } from '@standardnotes/utils'
 import { MediaQueryBreakpoints, useMediaQuery } from '@/Hooks/useMediaQuery'
 import { useFileDragNDrop } from '../FileDragNDropProvider/FileDragNDropProvider'
 import { LinkingController } from '@/Controllers/LinkingController'

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

@@ -9,7 +9,6 @@ import { ListableContentItem } from '../Types/ListableContentItem'
 import { DailyItemsDay } from './DailyItemsDaySection'
 import { ListItemTitle } from '../ListItemTitle'
 import { EmptyPlaceholderBars } from './EmptyPlaceholderBars'
-import { isMobileScreen } from '@/Utils'
 
 type DaySquareProps = {
   day: number
@@ -73,7 +72,7 @@ export const DailyItemCell = forwardRef(
               {!item && (
                 <div className="w-full">
                   <div className="break-word mr-2 font-semibold">{formatDateAndTimeForNote(section.date, false)}</div>
-                  <EmptyPlaceholderBars rows={isMobileScreen() ? 2 : 4} />
+                  <EmptyPlaceholderBars rows={1} />
                 </div>
               )}
             </div>

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

@@ -9,7 +9,7 @@ import { DisplayableListItemProps } from './Types/DisplayableListItemProps'
 import { useResponsiveAppPane } from '../ResponsivePane/ResponsivePaneProvider'
 import { AppPaneId } from '../ResponsivePane/AppPaneMetadata'
 import { useContextMenuEvent } from '@/Hooks/useContextMenuEvent'
-import { classNames } from '@/Utils/ConcatenateClassNames'
+import { classNames } from '@standardnotes/utils'
 import { formatSizeToReadableString } from '@standardnotes/filepicker'
 import { getIconForFileType } from '@/Utils/Items/Icons/getIconForFileType'
 import { useApplication } from '../ApplicationView/ApplicationProvider'

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

@@ -1,11 +1,11 @@
 import { WebApplication } from '@/Application/Application'
 import { memo, useCallback, useMemo, useRef, useState } from 'react'
 import Icon from '../../Icon/Icon'
-import { classNames } from '@/Utils/ConcatenateClassNames'
+import { classNames } from '@standardnotes/utils'
 import Popover from '@/Components/Popover/Popover'
 import DisplayOptionsMenu from './DisplayOptionsMenu'
 import { NavigationMenuButton } from '@/Components/NavigationMenu/NavigationMenu'
-import { IconType, isTag } from '@standardnotes/snjs'
+import { isTag, VectorIconNameOrEmoji } from '@standardnotes/snjs'
 import RoundIconButton from '@/Components/Button/RoundIconButton'
 import { AnyTag } from '@/Controllers/Navigation/AnyTagType'
 import { MediaQueryBreakpoints, useMediaQuery } from '@/Hooks/useMediaQuery'
@@ -13,7 +13,7 @@ import { MediaQueryBreakpoints, useMediaQuery } from '@/Hooks/useMediaQuery'
 type Props = {
   application: WebApplication
   panelTitle: string
-  icon?: IconType | string
+  icon?: VectorIconNameOrEmoji
   addButtonLabel: string
   addNewItem: () => void
   isFilesSmartView: boolean
@@ -65,7 +65,6 @@ const ContentListHeader = ({
           >
             <DisplayOptionsMenu
               application={application}
-              closeDisplayOptionsMenu={toggleDisplayOptionsMenu}
               isFilesSmartView={isFilesSmartView}
               isOpen={showDisplayOptionsMenu}
               selectedTag={selectedTag}
@@ -108,7 +107,7 @@ const ContentListHeader = ({
         <div className={`flex min-w-0 flex-grow flex-row ${!optionsSubtitle ? 'items-center' : ''}`}>
           {icon && (
             <Icon
-              type={icon as IconType}
+              type={icon}
               size={'custom'}
               className={` ml-0.5 mr-1.5 h-7 w-7 text-2xl text-neutral lg:h-6 lg:w-6 lg:text-lg ${
                 optionsSubtitle ? 'mt-1' : ''

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

@@ -13,20 +13,19 @@ import { observer } from 'mobx-react-lite'
 import { FunctionComponent, useCallback, useEffect, useState } from 'react'
 import Icon from '@/Components/Icon/Icon'
 import Menu from '@/Components/Menu/Menu'
-import MenuItem from '@/Components/Menu/MenuItem'
 import MenuItemSeparator from '@/Components/Menu/MenuItemSeparator'
-import { MenuItemType } from '@/Components/Menu/MenuItemType'
 import { DisplayOptionsMenuProps } from './DisplayOptionsMenuProps'
 import { PrefDefaults } from '@/Constants/PrefDefaults'
 import NewNotePreferences from './NewNotePreferences'
 import { PreferenceMode } from './PreferenceMode'
-import { classNames } from '@/Utils/ConcatenateClassNames'
+import { classNames } from '@standardnotes/utils'
 import NoSubscriptionBanner from '@/Components/NoSubscriptionBanner/NoSubscriptionBanner'
+import MenuRadioButtonItem from '@/Components/Menu/MenuRadioButtonItem'
+import MenuSwitchButtonItem from '@/Components/Menu/MenuSwitchButtonItem'
 
 const DailyEntryModeEnabled = true
 
 const DisplayOptionsMenu: FunctionComponent<DisplayOptionsMenuProps> = ({
-  closeDisplayOptionsMenu,
   application,
   isOpen,
   isFilesSmartView,
@@ -179,7 +178,9 @@ const DisplayOptionsMenu: FunctionComponent<DisplayOptionsMenuProps> = ({
       <button
         className={classNames(
           'relative cursor-pointer rounded-full border-2 border-solid border-transparent px-2 text-base focus:shadow-none lg:text-sm',
-          isSelected ? 'bg-info text-info-contrast' : 'bg-transparent text-text hover:bg-info-backdrop',
+          isSelected
+            ? 'bg-info text-info-contrast'
+            : 'bg-transparent text-text hover:bg-info-backdrop focus:bg-info-backdrop',
         )}
         onClick={() => {
           setCurrentMode(mode)
@@ -200,7 +201,7 @@ const DisplayOptionsMenu: FunctionComponent<DisplayOptionsMenuProps> = ({
   }
 
   return (
-    <Menu className="text-sm" a11yLabel="Notes list options menu" closeMenu={closeDisplayOptionsMenu} isOpen={isOpen}>
+    <Menu className="text-sm" a11yLabel="Notes list options menu" isOpen={isOpen}>
       <div className="my-1 px-3 text-base font-semibold uppercase text-text lg:text-xs">Preferences for</div>
       <div className={classNames('mt-1.5 flex w-full justify-between px-3', !controlsDisabled && 'mb-3')}>
         <div className="flex items-center gap-1.5">
@@ -230,10 +231,9 @@ const DisplayOptionsMenu: FunctionComponent<DisplayOptionsMenuProps> = ({
       <MenuItemSeparator />
 
       <div className="my-1 px-3 text-base font-semibold uppercase text-text lg:text-xs">Sort by</div>
-      <MenuItem
+      <MenuRadioButtonItem
         disabled={controlsDisabled || isDailyEntry}
         className="py-2"
-        type={MenuItemType.RadioButton}
         onClick={toggleSortByDateModified}
         checked={preferences.sortBy === CollectionSort.UpdatedAt}
       >
@@ -247,11 +247,10 @@ const DisplayOptionsMenu: FunctionComponent<DisplayOptionsMenuProps> = ({
             )
           ) : null}
         </div>
-      </MenuItem>
-      <MenuItem
+      </MenuRadioButtonItem>
+      <MenuRadioButtonItem
         disabled={controlsDisabled || isDailyEntry}
         className="py-2"
-        type={MenuItemType.RadioButton}
         onClick={toggleSortByCreationDate}
         checked={preferences.sortBy === CollectionSort.CreatedAt}
       >
@@ -265,11 +264,10 @@ const DisplayOptionsMenu: FunctionComponent<DisplayOptionsMenuProps> = ({
             )
           ) : null}
         </div>
-      </MenuItem>
-      <MenuItem
+      </MenuRadioButtonItem>
+      <MenuRadioButtonItem
         disabled={controlsDisabled || isDailyEntry}
         className="py-2"
-        type={MenuItemType.RadioButton}
         onClick={toggleSortByTitle}
         checked={preferences.sortBy === CollectionSort.Title}
       >
@@ -283,92 +281,83 @@ const DisplayOptionsMenu: FunctionComponent<DisplayOptionsMenuProps> = ({
             )
           ) : null}
         </div>
-      </MenuItem>
+      </MenuRadioButtonItem>
       <MenuItemSeparator />
       <div className="px-3 py-1 text-base font-semibold uppercase text-text lg:text-xs">View</div>
       {!isFilesSmartView && (
-        <MenuItem
+        <MenuSwitchButtonItem
           disabled={controlsDisabled}
-          type={MenuItemType.SwitchButton}
           className="py-1 hover:bg-contrast focus:bg-info-backdrop"
           checked={!preferences.hideNotePreview}
           onChange={toggleHidePreview}
         >
           <div className="max-w-3/4 flex flex-col">Show note preview</div>
-        </MenuItem>
+        </MenuSwitchButtonItem>
       )}
-      <MenuItem
+      <MenuSwitchButtonItem
         disabled={controlsDisabled}
-        type={MenuItemType.SwitchButton}
         className="py-1 hover:bg-contrast focus:bg-info-backdrop"
         checked={!preferences.hideDate}
         onChange={toggleHideDate}
       >
         Show date
-      </MenuItem>
-      <MenuItem
+      </MenuSwitchButtonItem>
+      <MenuSwitchButtonItem
         disabled={controlsDisabled}
-        type={MenuItemType.SwitchButton}
         className="py-1 hover:bg-contrast focus:bg-info-backdrop"
         checked={!preferences.hideTags}
         onChange={toggleHideTags}
       >
         Show tags
-      </MenuItem>
-      <MenuItem
+      </MenuSwitchButtonItem>
+      <MenuSwitchButtonItem
         disabled={controlsDisabled}
-        type={MenuItemType.SwitchButton}
         className="py-1 hover:bg-contrast focus:bg-info-backdrop"
         checked={!preferences.hideEditorIcon}
         onChange={toggleEditorIcon}
       >
         Show icon
-      </MenuItem>
+      </MenuSwitchButtonItem>
       <MenuItemSeparator />
       <div className="px-3 py-1 text-base font-semibold uppercase text-text lg:text-xs">Other</div>
-      <MenuItem
+      <MenuSwitchButtonItem
         disabled={controlsDisabled}
-        type={MenuItemType.SwitchButton}
         className="py-1 hover:bg-contrast focus:bg-info-backdrop"
         checked={!preferences.hidePinned}
         onChange={toggleHidePinned}
       >
         Show pinned
-      </MenuItem>
-      <MenuItem
+      </MenuSwitchButtonItem>
+      <MenuSwitchButtonItem
         disabled={controlsDisabled}
-        type={MenuItemType.SwitchButton}
         className="py-1 hover:bg-contrast focus:bg-info-backdrop"
         checked={!preferences.hideProtected}
         onChange={toggleHideProtected}
       >
         Show protected
-      </MenuItem>
-      <MenuItem
+      </MenuSwitchButtonItem>
+      <MenuSwitchButtonItem
         disabled={controlsDisabled}
-        type={MenuItemType.SwitchButton}
         className="py-1 hover:bg-contrast focus:bg-info-backdrop"
-        checked={preferences.showArchived}
+        checked={Boolean(preferences.showArchived)}
         onChange={toggleShowArchived}
       >
         Show archived
-      </MenuItem>
-      <MenuItem
+      </MenuSwitchButtonItem>
+      <MenuSwitchButtonItem
         disabled={controlsDisabled}
-        type={MenuItemType.SwitchButton}
         className="py-1 hover:bg-contrast focus:bg-info-backdrop"
-        checked={preferences.showTrashed}
+        checked={Boolean(preferences.showTrashed)}
         onChange={toggleShowTrashed}
       >
         Show trashed
-      </MenuItem>
+      </MenuSwitchButtonItem>
 
       {currentMode === 'tag' && DailyEntryModeEnabled && (
         <>
           <MenuItemSeparator />
-          <MenuItem
+          <MenuSwitchButtonItem
             disabled={controlsDisabled}
-            type={MenuItemType.SwitchButton}
             className="py-1 hover:bg-contrast focus:bg-info-backdrop"
             checked={isDailyEntry}
             onChange={toggleEntryMode}
@@ -382,7 +371,7 @@ const DisplayOptionsMenu: FunctionComponent<DisplayOptionsMenuProps> = ({
               </div>
               <div className="mt-1">Capture new notes daily with a calendar-based layout</div>
             </div>
-          </MenuItem>
+          </MenuSwitchButtonItem>
         </>
       )}
 

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

@@ -9,7 +9,6 @@ export type DisplayOptionsMenuPositionProps = {
 export type DisplayOptionsMenuProps = {
   application: WebApplication
   selectedTag: AnyTag
-  closeDisplayOptionsMenu: () => void
   isOpen: boolean
   isFilesSmartView: boolean
 }

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

@@ -9,7 +9,7 @@ import { AnyTag } from '@/Controllers/Navigation/AnyTagType'
 import { PreferenceMode } from './PreferenceMode'
 import dayjs from 'dayjs'
 import { EditorOption, getDropdownItemsForAllEditors } from '@/Utils/DropdownItemsForEditors'
-import { classNames } from '@/Utils/ConcatenateClassNames'
+import { classNames } from '@standardnotes/utils'
 import { NoteTitleFormatOptions } from './NoteTitleFormatOptions'
 
 const PrefChangeDebounceTimeInMs = 25

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

@@ -13,7 +13,7 @@ import { useContextMenuEvent } from '@/Hooks/useContextMenuEvent'
 import ListItemNotePreviewText from './ListItemNotePreviewText'
 import { ListItemTitle } from './ListItemTitle'
 import { log, LoggingDomain } from '@/Logging'
-import { classNames } from '@/Utils/ConcatenateClassNames'
+import { classNames } from '@standardnotes/utils'
 import { getIconAndTintForNoteType } from '@/Utils/Items/Icons/getIconAndTintForNoteType'
 
 const NoteListItem: FunctionComponent<DisplayableListItemProps<SNNote>> = ({

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

@@ -1,7 +1,8 @@
 import { FilesController } from '@/Controllers/FilesController'
 import { SelectedItemsController } from '@/Controllers/SelectedItemsController'
 import { observer } from 'mobx-react-lite'
-import { FunctionComponent, useRef } from 'react'
+import { FunctionComponent } from 'react'
+import Menu from '../Menu/Menu'
 import Popover from '../Popover/Popover'
 import FileMenuOptions from './FileMenuOptions'
 
@@ -13,8 +14,6 @@ type Props = {
 const FileContextMenu: FunctionComponent<Props> = observer(({ filesController, selectionController }) => {
   const { showFileContextMenu, setShowFileContextMenu, fileContextMenuLocation } = filesController
 
-  const contextMenuRef = useRef<HTMLDivElement>(null)
-
   return (
     <Popover
       open={showFileContextMenu}
@@ -23,7 +22,7 @@ const FileContextMenu: FunctionComponent<Props> = observer(({ filesController, s
       align="start"
       className="py-2"
     >
-      <div ref={contextMenuRef}>
+      <Menu a11yLabel="File context menu" isOpen={showFileContextMenu}>
         <FileMenuOptions
           filesController={filesController}
           selectionController={selectionController}
@@ -31,7 +30,7 @@ const FileContextMenu: FunctionComponent<Props> = observer(({ filesController, s
           shouldShowRenameOption={false}
           shouldShowAttachOption={false}
         />
-      </div>
+      </Menu>
     </Popover>
   )
 })

packages/web/src/javascripts/Components/FileContextMenu/FileMenuOptions.tsx

@@ -9,8 +9,8 @@ import { formatSizeToReadableString } from '@standardnotes/filepicker'
 import { useResponsiveAppPane } from '../ResponsivePane/ResponsivePaneProvider'
 import { AppPaneId } from '../ResponsivePane/AppPaneMetadata'
 import MenuItem from '../Menu/MenuItem'
-import { MenuItemType } from '../Menu/MenuItemType'
 import { FileContextMenuBackupOption } from './FileContextMenuBackupOption'
+import MenuSwitchButtonItem from '../Menu/MenuSwitchButtonItem'
 
 type Props = {
   closeMenu: () => void
@@ -83,8 +83,7 @@ const FileMenuOptions: FunctionComponent<Props> = ({
           ) : null}
         </>
       )}
-      <MenuItem
-        type={MenuItemType.SwitchButton}
+      <MenuSwitchButtonItem
         checked={hasProtectedFiles}
         onChange={(hasProtectedFiles) => {
           void filesController.setProtectionForFiles(hasProtectedFiles, selectionController.selectedFiles)
@@ -92,7 +91,7 @@ const FileMenuOptions: FunctionComponent<Props> = ({
       >
         <Icon type="lock" className="mr-2 text-neutral" />
         Password protect
-      </MenuItem>
+      </MenuSwitchButtonItem>
       <HorizontalSeparator classes="my-1" />
       <MenuItem
         onClick={() => {

packages/web/src/javascripts/Components/FileContextMenu/FileOptionsPanel.tsx

@@ -5,6 +5,7 @@ import { FilesController } from '@/Controllers/FilesController'
 import { SelectedItemsController } from '@/Controllers/SelectedItemsController'
 import Popover from '../Popover/Popover'
 import RoundIconButton from '../Button/RoundIconButton'
+import Menu from '../Menu/Menu'
 
 type Props = {
   filesController: FilesController
@@ -21,15 +22,17 @@ const FilesOptionsPanel = ({ filesController, selectionController }: Props) => {
     <>
       <RoundIconButton label="File options menu" onClick={toggleMenu} ref={buttonRef} icon="more" />
       <Popover togglePopover={toggleMenu} anchorElement={buttonRef.current} open={isOpen} className="py-2">
-        <FileMenuOptions
-          filesController={filesController}
-          selectionController={selectionController}
-          closeMenu={() => {
-            setIsOpen(false)
-          }}
-          shouldShowAttachOption={false}
-          shouldShowRenameOption={false}
-        />
+        <Menu a11yLabel="File options panel" isOpen={isOpen}>
+          <FileMenuOptions
+            filesController={filesController}
+            selectionController={selectionController}
+            closeMenu={() => {
+              setIsOpen(false)
+            }}
+            shouldShowAttachOption={false}
+            shouldShowRenameOption={false}
+          />
+        </Menu>
       </Popover>
     </>
   )

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

@@ -2,7 +2,7 @@ import { WebApplication } from '@/Application/Application'
 import { FeaturesController } from '@/Controllers/FeaturesController'
 import { FilesController } from '@/Controllers/FilesController'
 import { usePremiumModal } from '@/Hooks/usePremiumModal'
-import { classNames } from '@/Utils/ConcatenateClassNames'
+import { classNames } from '@standardnotes/utils'
 import { isHandlingFileDrag } from '@/Utils/DragTypeCheck'
 import { StreamingFileReader } from '@standardnotes/filepicker'
 import { FileItem } from '@standardnotes/snjs'

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

@@ -8,13 +8,15 @@ import { isFileTypePreviewable } from './isFilePreviewable'
 import PreviewComponent from './PreviewComponent'
 import Button from '../Button/Button'
 import { ProtectedIllustration } from '@standardnotes/icons'
+import { ImageZoomLevelProps } from './ImageZoomLevelProps'
 
 type Props = {
   application: WebApplication
   file: FileItem
-}
+  isEmbeddedInSuper?: boolean
+} & ImageZoomLevelProps
 
-const FilePreview = ({ file, application }: Props) => {
+const FilePreview = ({ file, application, isEmbeddedInSuper = false, imageZoomLevel, setImageZoomLevel }: Props) => {
   const [isAuthorized, setIsAuthorized] = useState(application.isAuthorizedToRenderItem(file))
 
   const isFilePreviewable = useMemo(() => {
@@ -112,7 +114,14 @@ const FilePreview = ({ file, application }: Props) => {
       <span className="mt-3">Loading file...</span>
     </div>
   ) : downloadedBytes ? (
-    <PreviewComponent application={application} file={file} bytes={downloadedBytes} />
+    <PreviewComponent
+      application={application}
+      file={file}
+      bytes={downloadedBytes}
+      isEmbeddedInSuper={isEmbeddedInSuper}
+      imageZoomLevel={imageZoomLevel}
+      setImageZoomLevel={setImageZoomLevel}
+    />
   ) : (
     <FilePreviewError
       file={file}

packages/web/src/javascripts/Components/FilePreview/ImagePreview.tsx

@@ -1,24 +1,66 @@
-import { IconType } from '@standardnotes/snjs'
-import { FunctionComponent, useRef, useState } from 'react'
+import { classNames, IconType } from '@standardnotes/snjs'
+import { FunctionComponent, useCallback, useEffect, useState } from 'react'
 import IconButton from '../Button/IconButton'
+import { ImageZoomLevelProps } from './ImageZoomLevelProps'
 
 type Props = {
   objectUrl: string
-}
+  isEmbeddedInSuper: boolean
+} & ImageZoomLevelProps
 
-const ImagePreview: FunctionComponent<Props> = ({ objectUrl }) => {
-  const initialImgHeightRef = useRef<number>()
+const MinimumZoomPercent = 10
+const DefaultZoomPercent = 100
+const MaximumZoomPercent = 1000
+const ZoomPercentModifier = 10
+const PercentageDivisor = 100
 
-  const [imageZoomPercent, setImageZoomPercent] = useState(100)
+const ImagePreview: FunctionComponent<Props> = ({
+  objectUrl,
+  isEmbeddedInSuper,
+  imageZoomLevel,
+  setImageZoomLevel,
+}) => {
+  const [imageHeight, setImageHeight] = useState<number>(0)
+  const [imageZoomPercent, setImageZoomPercent] = useState(imageZoomLevel ? imageZoomLevel : DefaultZoomPercent)
+  const [isZoomInputVisible, setIsZoomInputVisible] = useState(false)
+
+  useEffect(() => {
+    setImageZoomPercent(imageZoomLevel ? imageZoomLevel : DefaultZoomPercent)
+  }, [imageZoomLevel])
+
+  const setImageZoom = useCallback(
+    (zoomLevel: number) => {
+      setImageZoomPercent(zoomLevel)
+      setImageZoomLevel?.(zoomLevel)
+    },
+    [setImageZoomLevel],
+  )
+
+  useEffect(() => {
+    const image = new Image()
+    image.src = objectUrl
+    image.onload = () => {
+      setImageHeight(image.height)
+    }
+  }, [objectUrl])
+
+  const heightIfEmbedded = imageHeight * (imageZoomPercent / PercentageDivisor)
 
   return (
-    <div className="flex h-full min-h-0 w-full items-center justify-center">
-      <div className="relative flex h-full w-full items-center justify-center overflow-auto">
+    <div className="group flex h-full min-h-0 w-full items-center justify-center">
+      <div
+        className="relative flex h-full w-full items-center justify-center overflow-auto"
+        style={{
+          height: isEmbeddedInSuper ? `${heightIfEmbedded}px` : '',
+        }}
+      >
         <img
           src={objectUrl}
           style={{
-            height: `${imageZoomPercent}%`,
-            ...(imageZoomPercent <= 100
+            height: isEmbeddedInSuper ? `${heightIfEmbedded}px` : `${imageZoomPercent}%`,
+            ...(isEmbeddedInSuper
+              ? {}
+              : imageZoomPercent <= DefaultZoomPercent
               ? {
                   minWidth: '100%',
                   objectFit: 'contain',
@@ -31,39 +73,70 @@ const ImagePreview: FunctionComponent<Props> = ({ objectUrl }) => {
                   maxWidth: 'none',
                 }),
           }}
-          ref={(imgElement) => {
-            if (!initialImgHeightRef.current) {
-              initialImgHeightRef.current = imgElement?.height
-            }
-          }}
         />
       </div>
-      <div className="absolute left-1/2 bottom-6 flex -translate-x-1/2 items-center rounded border border-solid border-border bg-default py-1 px-3">
-        <span className="mr-1.5">Zoom:</span>
+      <div
+        className={classNames(
+          isEmbeddedInSuper ? 'hidden focus-within:flex group-hover:flex' : '',
+          'absolute left-1/2 bottom-6 flex -translate-x-1/2 items-center rounded border border-solid border-border bg-default py-1 px-3',
+        )}
+      >
+        <span className="mr-1.5">{isEmbeddedInSuper ? 'Size' : 'Zoom'}:</span>
         <IconButton
           className="rounded p-1 hover:bg-contrast"
           icon={'subtract' as IconType}
-          title="Zoom Out"
+          title={isEmbeddedInSuper ? 'Decrease size' : 'Zoom Out'}
           focusable={true}
           onClick={() => {
-            setImageZoomPercent((percent) => {
-              const newPercent = percent - 10
-              if (newPercent >= 10) {
-                return newPercent
-              } else {
-                return percent
-              }
-            })
+            const newPercent = imageZoomPercent - ZoomPercentModifier
+            if (newPercent >= ZoomPercentModifier) {
+              setImageZoom(newPercent)
+            } else {
+              setImageZoom(imageZoomPercent)
+            }
           }}
         />
-        <span className="mx-2">{imageZoomPercent}%</span>
+        {isZoomInputVisible ? (
+          <div className="mx-2">
+            <input
+              type="number"
+              className="w-10 text-center"
+              defaultValue={imageZoomPercent}
+              onKeyDown={(event) => {
+                event.stopPropagation()
+                if (event.key === 'Enter') {
+                  const value = parseInt(event.currentTarget.value)
+                  if (value >= MinimumZoomPercent && value <= MaximumZoomPercent) {
+                    setImageZoom(value)
+                  }
+                  setIsZoomInputVisible(false)
+                }
+              }}
+              onBlur={(event) => {
+                setIsZoomInputVisible(false)
+                const value = parseInt(event.currentTarget.value)
+                if (value >= MinimumZoomPercent && value <= MaximumZoomPercent) {
+                  setImageZoom(value)
+                }
+              }}
+            />
+            %
+          </div>
+        ) : (
+          <button
+            className="mx-1 rounded py-1 px-1.5 hover:bg-contrast"
+            onClick={() => setIsZoomInputVisible((visible) => !visible)}
+          >
+            {imageZoomPercent}%
+          </button>
+        )}
         <IconButton
           className="rounded p-1 hover:bg-contrast"
           icon="add"
-          title="Zoom In"
+          title={isEmbeddedInSuper ? 'Increase size' : 'Zoom In'}
           focusable={true}
           onClick={() => {
-            setImageZoomPercent((percent) => percent + 10)
+            setImageZoom(imageZoomPercent + ZoomPercentModifier)
           }}
         />
       </div>

packages/web/src/javascripts/Components/FilePreview/ImageZoomLevelProps.tsx

@@ -0,0 +1,4 @@
+export type ImageZoomLevelProps = {
+  imageZoomLevel?: number
+  setImageZoomLevel?: (zoomLevel: number) => void
+}

packages/web/src/javascripts/Components/FilePreview/PreviewComponent.tsx

@@ -7,6 +7,7 @@ import { AppPaneId } from '../ResponsivePane/AppPaneMetadata'
 import { useResponsiveAppPane } from '../ResponsivePane/ResponsivePaneProvider'
 import { createObjectURLWithRef } from './CreateObjectURLWithRef'
 import ImagePreview from './ImagePreview'
+import { ImageZoomLevelProps } from './ImageZoomLevelProps'
 import { PreviewableTextFileTypes, RequiresNativeFilePreview } from './isFilePreviewable'
 import TextPreview from './TextPreview'
 
@@ -14,9 +15,17 @@ type Props = {
   application: WebApplication
   file: FileItem
   bytes: Uint8Array
-}
+  isEmbeddedInSuper: boolean
+} & ImageZoomLevelProps
 
-const PreviewComponent: FunctionComponent<Props> = ({ application, file, bytes }) => {
+const PreviewComponent: FunctionComponent<Props> = ({
+  application,
+  file,
+  bytes,
+  isEmbeddedInSuper,
+  imageZoomLevel,
+  setImageZoomLevel,
+}) => {
   const { selectedPane } = useResponsiveAppPane()
 
   const objectUrlRef = useRef<string>()
@@ -73,7 +82,14 @@ const PreviewComponent: FunctionComponent<Props> = ({ application, file, bytes }
   }
 
   if (file.mimeType.startsWith('image/')) {
-    return <ImagePreview objectUrl={objectUrl} />
+    return (
+      <ImagePreview
+        objectUrl={objectUrl}
+        isEmbeddedInSuper={isEmbeddedInSuper}
+        imageZoomLevel={imageZoomLevel}
+        setImageZoomLevel={setImageZoomLevel}
+      />
+    )
   }
 
   if (file.mimeType.startsWith('video/')) {