Doc: Update sponsors

.env-transcribe-sample

@@ -9,7 +9,6 @@ API_KEY=random-string
 QUEUE_TTL=900000
 QUEUE_RETRY_COUNT=2
 QUEUE_MAINTENANCE_INTERVAL=30000
-IMAGE_MAX_DIMENSION=400
 
 HTR_CLI_DOCKER_IMAGE=joplin/htr-cli:latest
 # Fullpath to images folder e.g.:

.eslintignore

@@ -90,7 +90,7 @@ plugin_types/
 readme/
 packages/react-native-vosk/lib/
 packages/lib/countable/Countable.js
-packages/onenote-converter/renderer/pkg/*
+packages/onenote-converter/pkg/onenote_converter.js
 
 # AUTO-GENERATED - EXCLUDED TYPESCRIPT BUILD
 packages/app-cli/app/LinkSelector.js
@@ -270,7 +270,6 @@ packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/v6/useEditorCommands.js
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/v6/utils/localisation.js
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/v6/utils/useKeymap.js
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/v6/utils/useRefocusOnVisiblePaneChange.js
-packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/v6/utils/useSyncEditorValue.js
 packages/app-desktop/gui/NoteEditor/NoteBody/PlainEditor/PlainEditor.js
 packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/TinyMCE.js
 packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/styles/index.js
@@ -281,7 +280,6 @@ packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/utils/shouldPasteResources.
 packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/utils/shouldPasteResources.js
 packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/utils/types.js
 packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/utils/useContextMenu.js
-packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/utils/useCursorPositioning.js
 packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/utils/useEditDialog.js
 packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/utils/useEditDialogEventListeners.js
 packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/utils/useKeyboardRefocusHandler.js
@@ -323,7 +321,6 @@ packages/app-desktop/gui/NoteEditor/utils/useEffectiveNoteId.js
 packages/app-desktop/gui/NoteEditor/utils/useFolder.js
 packages/app-desktop/gui/NoteEditor/utils/useFormNote.test.js
 packages/app-desktop/gui/NoteEditor/utils/useFormNote.js
-packages/app-desktop/gui/NoteEditor/utils/useInitialCursorLocation.js
 packages/app-desktop/gui/NoteEditor/utils/useMessageHandler.js
 packages/app-desktop/gui/NoteEditor/utils/useNoteSearchBar.js
 packages/app-desktop/gui/NoteEditor/utils/usePluginEditorView.test.js
@@ -607,7 +604,6 @@ packages/app-desktop/tools/generateLatestArm64Yml.js
 packages/app-desktop/tools/githubReleasesUtils.js
 packages/app-desktop/tools/modifyReleaseAssets.js
 packages/app-desktop/tools/notarizeMacApp.js
-packages/app-desktop/tools/resolveSourceMap.js
 packages/app-desktop/utils/7zip/getPathToExecutable7Zip.js
 packages/app-desktop/utils/7zip/pathToBundled7Zip.js
 packages/app-desktop/utils/checkForUpdatesUtils.test.js
@@ -701,7 +697,6 @@ packages/app-mobile/components/NoteEditor/ImageEditor/ImageEditor.js
 packages/app-mobile/components/NoteEditor/ImageEditor/autosave.js
 packages/app-mobile/components/NoteEditor/ImageEditor/isEditableResource.js
 packages/app-mobile/components/NoteEditor/ImageEditor/promptRestoreAutosave.js
-packages/app-mobile/components/NoteEditor/MarkdownEditor.test.js
 packages/app-mobile/components/NoteEditor/MarkdownEditor.js
 packages/app-mobile/components/NoteEditor/NoteEditor.test.js
 packages/app-mobile/components/NoteEditor/NoteEditor.js
@@ -730,8 +725,6 @@ packages/app-mobile/components/SearchInput.js
 packages/app-mobile/components/SelectDateTimeDialog.js
 packages/app-mobile/components/SideMenu.js
 packages/app-mobile/components/SideMenuContentNote.js
-packages/app-mobile/components/SyncWizard/JoplinCloudIcon.js
-packages/app-mobile/components/SyncWizard/SyncWizard.js
 packages/app-mobile/components/TagEditor.test.js
 packages/app-mobile/components/TagEditor.js
 packages/app-mobile/components/TextInput.js
@@ -748,7 +741,6 @@ packages/app-mobile/components/base-screen.js
 packages/app-mobile/components/biometrics/BiometricPopup.js
 packages/app-mobile/components/biometrics/biometricAuthenticate.js
 packages/app-mobile/components/biometrics/sensorInfo.js
-packages/app-mobile/components/buttons/CardButton.js
 packages/app-mobile/components/buttons/FloatingActionButton.js
 packages/app-mobile/components/buttons/LabelledIconButton.js
 packages/app-mobile/components/buttons/MultiTouchableOpacity.js
@@ -849,7 +841,6 @@ packages/app-mobile/components/screens/NoteTagsDialog.js
 packages/app-mobile/components/screens/Notes/NewNoteButton.test.js
 packages/app-mobile/components/screens/Notes/NewNoteButton.js
 packages/app-mobile/components/screens/Notes/Notes.js
-packages/app-mobile/components/screens/SearchScreen/SearchResults.test.js
 packages/app-mobile/components/screens/SearchScreen/SearchResults.js
 packages/app-mobile/components/screens/SearchScreen/index.js
 packages/app-mobile/components/screens/ShareManager/AcceptedShareItem.js
@@ -1055,7 +1046,6 @@ packages/editor/CodeMirror/extensions/rendering/types.js
 packages/editor/CodeMirror/extensions/rendering/utils/makeBlockReplaceExtension.js
 packages/editor/CodeMirror/extensions/rendering/utils/makeInlineReplaceExtension.js
 packages/editor/CodeMirror/extensions/rendering/utils/nodeIntersectsSelection.js
-packages/editor/CodeMirror/extensions/searchExtension.test.js
 packages/editor/CodeMirror/extensions/searchExtension.js
 packages/editor/CodeMirror/extensions/selectedNoteIdExtension.js
 packages/editor/CodeMirror/getScrollFraction.js
@@ -1102,16 +1092,12 @@ packages/editor/CodeMirror/utils/markdown/renumberSelectedLists.js
 packages/editor/CodeMirror/utils/markdown/stripBlockquote.js
 packages/editor/CodeMirror/utils/markdown/toggleCheckboxAt.js
 packages/editor/CodeMirror/utils/setupVim.js
-packages/editor/CodeMirror/vendor/announceSearchMatch.js
-packages/editor/ProseMirror/commands/commands.test.js
-packages/editor/ProseMirror/commands/commands.js
-packages/editor/ProseMirror/commands/focusEditor.js
+packages/editor/ProseMirror/commands.test.js
+packages/editor/ProseMirror/commands.js
 packages/editor/ProseMirror/createEditor.js
 packages/editor/ProseMirror/index.js
 packages/editor/ProseMirror/plugins/detailsPlugin.test.js
 packages/editor/ProseMirror/plugins/detailsPlugin.js
-packages/editor/ProseMirror/plugins/imagePlugin.test.js
-packages/editor/ProseMirror/plugins/imagePlugin.js
 packages/editor/ProseMirror/plugins/inputRulesPlugin.js
 packages/editor/ProseMirror/plugins/joplinEditablePlugin/createEditorDialog.js
 packages/editor/ProseMirror/plugins/joplinEditablePlugin/joplinEditablePlugin.test.js
@@ -1123,16 +1109,12 @@ packages/editor/ProseMirror/plugins/linkTooltipPlugin.test.js
 packages/editor/ProseMirror/plugins/linkTooltipPlugin.js
 packages/editor/ProseMirror/plugins/listPlugin.js
 packages/editor/ProseMirror/plugins/originalMarkupPlugin.js
+packages/editor/ProseMirror/plugins/resourcePlaceholderPlugin.js
 packages/editor/ProseMirror/plugins/searchPlugin.js
-packages/editor/ProseMirror/plugins/tablePlugin.js
-packages/editor/ProseMirror/plugins/utils/createExternalEditorPlugin.js
-packages/editor/ProseMirror/plugins/utils/createFloatingButtonPlugin.js
 packages/editor/ProseMirror/schema.js
 packages/editor/ProseMirror/styles.js
 packages/editor/ProseMirror/testing/createTestEditor.js
-packages/editor/ProseMirror/testing/createTestEditorWithSerializer.js
 packages/editor/ProseMirror/types.js
-packages/editor/ProseMirror/utils/SelectableNodeView.js
 packages/editor/ProseMirror/utils/UndoStackSynchronizer.js
 packages/editor/ProseMirror/utils/canReplaceSelectionWith.js
 packages/editor/ProseMirror/utils/computeSelectionFormatting.js
@@ -1140,7 +1122,6 @@ packages/editor/ProseMirror/utils/dom/createButton.js
 packages/editor/ProseMirror/utils/dom/createTextArea.js
 packages/editor/ProseMirror/utils/dom/createTextNode.js
 packages/editor/ProseMirror/utils/dom/createUniqueId.js
-packages/editor/ProseMirror/utils/dom/showModal.js
 packages/editor/ProseMirror/utils/extractSelectedLinesTo.test.js
 packages/editor/ProseMirror/utils/extractSelectedLinesTo.js
 packages/editor/ProseMirror/utils/forEachHeading.js
@@ -1151,15 +1132,8 @@ packages/editor/ProseMirror/utils/postprocessEditorOutput.js
 packages/editor/ProseMirror/utils/preprocessEditorInput.test.js
 packages/editor/ProseMirror/utils/preprocessEditorInput.js
 packages/editor/ProseMirror/utils/sanitizeHtml.js
-packages/editor/ProseMirror/utils/selectFirstInstanceOfNode.js
 packages/editor/ProseMirror/utils/trimEmptyParagraphs.js
 packages/editor/ProseMirror/vendor/changedDescendants.js
-packages/editor/ProseMirror/vendor/icons/addColumnRight.js
-packages/editor/ProseMirror/vendor/icons/addRowBelow.js
-packages/editor/ProseMirror/vendor/icons/icon.js
-packages/editor/ProseMirror/vendor/icons/removeColumn.js
-packages/editor/ProseMirror/vendor/icons/removeRow.js
-packages/editor/ProseMirror/vendor/icons/types.js
 packages/editor/ProseMirror/vendor/splitBlockAs.js
 packages/editor/SelectionFormatting.js
 packages/editor/events.js
@@ -1428,7 +1402,6 @@ packages/lib/services/database/migrations/45.js
 packages/lib/services/database/migrations/46.js
 packages/lib/services/database/migrations/47.js
 packages/lib/services/database/migrations/48.js
-packages/lib/services/database/migrations/49.js
 packages/lib/services/database/migrations/index.js
 packages/lib/services/database/sqlStringToLines.js
 packages/lib/services/database/types.js
@@ -1552,7 +1525,6 @@ packages/lib/services/plugins/utils/createViewHandle.js
 packages/lib/services/plugins/utils/executeSandboxCall.js
 packages/lib/services/plugins/utils/getActivePluginEditorView.js
 packages/lib/services/plugins/utils/getActivePluginEditorViews.js
-packages/lib/services/plugins/utils/getPluginHelpUrl.js
 packages/lib/services/plugins/utils/getPluginIssueReportUrl.test.js
 packages/lib/services/plugins/utils/getPluginIssueReportUrl.js
 packages/lib/services/plugins/utils/getPluginNamespacedSettingKey.js
@@ -1757,7 +1729,6 @@ packages/plugin-repo-cli/lib/gitCompareUrl.test.js
 packages/plugin-repo-cli/lib/gitCompareUrl.js
 packages/plugin-repo-cli/lib/overrideUtils.test.js
 packages/plugin-repo-cli/lib/overrideUtils.js
-packages/plugin-repo-cli/lib/searchPlugins.js
 packages/plugin-repo-cli/lib/types.js
 packages/plugin-repo-cli/lib/updateReadme.test.js
 packages/plugin-repo-cli/lib/updateReadme.js
@@ -1873,8 +1844,6 @@ packages/tools/updateMarkdownDoc.js
 packages/tools/utils/discourse.test.js
 packages/tools/utils/discourse.js
 packages/tools/utils/loadSponsors.js
-packages/tools/utils/parsePluralLocalizationForm.js
-packages/tools/utils/parsePlurallLocalizationForm.test.js
 packages/tools/utils/translation.js
 packages/tools/validateFilenames.js
 packages/tools/website/build.js

.github/workflows/build-android.yml

@@ -59,10 +59,10 @@ jobs:
           fi
           # The build-tools/ directory contains different subdirectories
           # for each build tools version. As a result, there may be multiple
-          # zipalign tools. Select the most recent (biggest two-digit version number):
-          ZIPALIGN_PATH="$(find $BUILD_TOOLS_PATH -name "zipalign" -print | sort | tail -n1)"
+          # zipalign tools. Select one of them:
+          ZIPALIGN_PATH="$(find $BUILD_TOOLS_PATH -name "zipalign" -print | head -n1)"
           if test ! -x "$ZIPALIGN_PATH" ; then
             echo "zipalign not found (searching in $BUILD_TOOLS_PATH, candidate: $ZIPALIGN_PATH)"
             exit 1
           fi
-          "$ZIPALIGN_PATH" -c -P 16 -v 4 "$APK_FILE"
+          "$ZIPALIGN_PATH" -c -P 16 -v 4 "$APK_FILE"

.github/workflows/github-actions-main.yml

@@ -9,7 +9,7 @@ jobs:
       matrix:
         # Do not use unbuntu-latest because it causes `The operation was canceled` failures:
         # https://github.com/actions/runner-images/issues/6709
-        os: [macos-15-intel, ubuntu-22.04, windows-2025, ubuntu-22.04-arm]
+        os: [macos-13, ubuntu-22.04, windows-2025, ubuntu-22.04-arm]
     steps:
       - uses: actions/checkout@v4
 
@@ -31,16 +31,6 @@ jobs:
           sudo apt-get update || true
           sudo apt-get install -y docker-ce docker-ce-cli containerd.io docker-buildx-plugin
 
-      - name: Free disk space
-        if: runner.os == 'Linux'
-        run: |
-          sudo rm -rf /usr/local/lib/android || true
-          sudo rm -rf /usr/share/dotnet || true
-          sudo rm -rf /opt/ghc || true
-          docker system prune -af || true
-          docker builder prune -af || true
-          sudo rm -rf /var/lib/docker/tmp/* || true
-
       # Login to Docker only if we're on a server release tag. If we run this on
       # a pull request it will fail because the PR doesn't have access to
       # secrets
@@ -50,22 +40,6 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-      # - name: Test Windows app signing
-      #   if: runner.os == 'Windows'
-      #   env:
-      #     GH_TOKEN: ${{ secrets.GH_TOKEN }}
-      #     IS_CONTINUOUS_INTEGRATION: 1
-      #     BUILD_SEQUENCIAL: 1
-      #     SSL_ESIGNER_USER_NAME: ${{ secrets.SSL_ESIGNER_USER_NAME }}
-      #     SSL_ESIGNER_USER_PASSWORD: ${{ secrets.SSL_ESIGNER_USER_PASSWORD }}
-      #     SSL_ESIGNER_CREDENTIAL_ID: ${{ secrets.SSL_ESIGNER_CREDENTIAL_ID }}
-      #     SSL_ESIGNER_USER_TOTP: ${{ secrets.SSL_ESIGNER_USER_TOTP }}
-      #     SIGN_APPLICATION: 1
-      #   # To ensure that the operations stop on failure, all commands
-      #   # should be on one line with "&&" in between.
-      #   run: |
-      #     yarn install && cd packages/app-desktop && yarn dist
-
       - name: Run tests, build and publish Linux and macOS apps
         if: runner.os == 'Linux' || runner.os == 'macOs'
         env:
@@ -87,14 +61,11 @@ jobs:
       - name: Build and publish Windows app
         if: runner.os == 'Windows' && startsWith(github.ref, 'refs/tags/v')
         env:
+          CSC_KEY_PASSWORD: ${{ secrets.WINDOWS_CSC_KEY_PASSWORD }}
+          CSC_LINK: ${{ secrets.WINDOWS_CSC_LINK }}
           GH_TOKEN: ${{ secrets.GH_TOKEN }}
           IS_CONTINUOUS_INTEGRATION: 1
           BUILD_SEQUENCIAL: 1
-          SSL_ESIGNER_USER_NAME: ${{ secrets.SSL_ESIGNER_USER_NAME }}
-          SSL_ESIGNER_USER_PASSWORD: ${{ secrets.SSL_ESIGNER_USER_PASSWORD }}
-          SSL_ESIGNER_CREDENTIAL_ID: ${{ secrets.SSL_ESIGNER_CREDENTIAL_ID }}
-          SSL_ESIGNER_USER_TOTP: ${{ secrets.SSL_ESIGNER_USER_TOTP }}
-          SIGN_APPLICATION: 1
         # To ensure that the operations stop on failure, all commands
         # should be on one line with "&&" in between.
         run: |
@@ -151,16 +122,6 @@ jobs:
         with:
           node-version: '18'
 
-      - name: Free disk space
-        if: runner.os == 'Linux'
-        run: |
-          sudo rm -rf /usr/local/lib/android || true
-          sudo rm -rf /usr/share/dotnet || true
-          sudo rm -rf /opt/ghc || true
-          docker system prune -af || true
-          docker builder prune -af || true
-          sudo rm -rf /var/lib/docker/tmp/* || true
-
       - name: Install Yarn
         run: |
           # https://yarnpkg.com/getting-started/install
@@ -188,7 +149,7 @@ jobs:
       - name: Check HTTP request
         run: |
           # Need to pass environment variables:
-          docker run --env MAX_TIME_DRIFT=0 --publish 22300:22300 joplin/server:$(dpkg --print-architecture)-0.0.0 node dist/app.js --env dev &
+          docker run -p 22300:22300 joplin/server:$(dpkg --print-architecture)-0.0.0 node dist/app.js --env dev &
 
           # Wait for server to start
           sleep 120
@@ -214,4 +175,5 @@ jobs:
           if [[ "$actual_body" != "$expected_body" ]]; then
             echo 'Failed while checking the body response after request to /api/ping'
             exit 1;
-          fi
+          fi
+

.gitignore

@@ -243,7 +243,6 @@ packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/v6/useEditorCommands.js
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/v6/utils/localisation.js
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/v6/utils/useKeymap.js
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/v6/utils/useRefocusOnVisiblePaneChange.js
-packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/v6/utils/useSyncEditorValue.js
 packages/app-desktop/gui/NoteEditor/NoteBody/PlainEditor/PlainEditor.js
 packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/TinyMCE.js
 packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/styles/index.js
@@ -254,7 +253,6 @@ packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/utils/shouldPasteResources.
 packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/utils/shouldPasteResources.js
 packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/utils/types.js
 packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/utils/useContextMenu.js
-packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/utils/useCursorPositioning.js
 packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/utils/useEditDialog.js
 packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/utils/useEditDialogEventListeners.js
 packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/utils/useKeyboardRefocusHandler.js
@@ -296,7 +294,6 @@ packages/app-desktop/gui/NoteEditor/utils/useEffectiveNoteId.js
 packages/app-desktop/gui/NoteEditor/utils/useFolder.js
 packages/app-desktop/gui/NoteEditor/utils/useFormNote.test.js
 packages/app-desktop/gui/NoteEditor/utils/useFormNote.js
-packages/app-desktop/gui/NoteEditor/utils/useInitialCursorLocation.js
 packages/app-desktop/gui/NoteEditor/utils/useMessageHandler.js
 packages/app-desktop/gui/NoteEditor/utils/useNoteSearchBar.js
 packages/app-desktop/gui/NoteEditor/utils/usePluginEditorView.test.js
@@ -580,7 +577,6 @@ packages/app-desktop/tools/generateLatestArm64Yml.js
 packages/app-desktop/tools/githubReleasesUtils.js
 packages/app-desktop/tools/modifyReleaseAssets.js
 packages/app-desktop/tools/notarizeMacApp.js
-packages/app-desktop/tools/resolveSourceMap.js
 packages/app-desktop/utils/7zip/getPathToExecutable7Zip.js
 packages/app-desktop/utils/7zip/pathToBundled7Zip.js
 packages/app-desktop/utils/checkForUpdatesUtils.test.js
@@ -674,7 +670,6 @@ packages/app-mobile/components/NoteEditor/ImageEditor/ImageEditor.js
 packages/app-mobile/components/NoteEditor/ImageEditor/autosave.js
 packages/app-mobile/components/NoteEditor/ImageEditor/isEditableResource.js
 packages/app-mobile/components/NoteEditor/ImageEditor/promptRestoreAutosave.js
-packages/app-mobile/components/NoteEditor/MarkdownEditor.test.js
 packages/app-mobile/components/NoteEditor/MarkdownEditor.js
 packages/app-mobile/components/NoteEditor/NoteEditor.test.js
 packages/app-mobile/components/NoteEditor/NoteEditor.js
@@ -703,8 +698,6 @@ packages/app-mobile/components/SearchInput.js
 packages/app-mobile/components/SelectDateTimeDialog.js
 packages/app-mobile/components/SideMenu.js
 packages/app-mobile/components/SideMenuContentNote.js
-packages/app-mobile/components/SyncWizard/JoplinCloudIcon.js
-packages/app-mobile/components/SyncWizard/SyncWizard.js
 packages/app-mobile/components/TagEditor.test.js
 packages/app-mobile/components/TagEditor.js
 packages/app-mobile/components/TextInput.js
@@ -721,7 +714,6 @@ packages/app-mobile/components/base-screen.js
 packages/app-mobile/components/biometrics/BiometricPopup.js
 packages/app-mobile/components/biometrics/biometricAuthenticate.js
 packages/app-mobile/components/biometrics/sensorInfo.js
-packages/app-mobile/components/buttons/CardButton.js
 packages/app-mobile/components/buttons/FloatingActionButton.js
 packages/app-mobile/components/buttons/LabelledIconButton.js
 packages/app-mobile/components/buttons/MultiTouchableOpacity.js
@@ -822,7 +814,6 @@ packages/app-mobile/components/screens/NoteTagsDialog.js
 packages/app-mobile/components/screens/Notes/NewNoteButton.test.js
 packages/app-mobile/components/screens/Notes/NewNoteButton.js
 packages/app-mobile/components/screens/Notes/Notes.js
-packages/app-mobile/components/screens/SearchScreen/SearchResults.test.js
 packages/app-mobile/components/screens/SearchScreen/SearchResults.js
 packages/app-mobile/components/screens/SearchScreen/index.js
 packages/app-mobile/components/screens/ShareManager/AcceptedShareItem.js
@@ -1028,7 +1019,6 @@ packages/editor/CodeMirror/extensions/rendering/types.js
 packages/editor/CodeMirror/extensions/rendering/utils/makeBlockReplaceExtension.js
 packages/editor/CodeMirror/extensions/rendering/utils/makeInlineReplaceExtension.js
 packages/editor/CodeMirror/extensions/rendering/utils/nodeIntersectsSelection.js
-packages/editor/CodeMirror/extensions/searchExtension.test.js
 packages/editor/CodeMirror/extensions/searchExtension.js
 packages/editor/CodeMirror/extensions/selectedNoteIdExtension.js
 packages/editor/CodeMirror/getScrollFraction.js
@@ -1075,16 +1065,12 @@ packages/editor/CodeMirror/utils/markdown/renumberSelectedLists.js
 packages/editor/CodeMirror/utils/markdown/stripBlockquote.js
 packages/editor/CodeMirror/utils/markdown/toggleCheckboxAt.js
 packages/editor/CodeMirror/utils/setupVim.js
-packages/editor/CodeMirror/vendor/announceSearchMatch.js
-packages/editor/ProseMirror/commands/commands.test.js
-packages/editor/ProseMirror/commands/commands.js
-packages/editor/ProseMirror/commands/focusEditor.js
+packages/editor/ProseMirror/commands.test.js
+packages/editor/ProseMirror/commands.js
 packages/editor/ProseMirror/createEditor.js
 packages/editor/ProseMirror/index.js
 packages/editor/ProseMirror/plugins/detailsPlugin.test.js
 packages/editor/ProseMirror/plugins/detailsPlugin.js
-packages/editor/ProseMirror/plugins/imagePlugin.test.js
-packages/editor/ProseMirror/plugins/imagePlugin.js
 packages/editor/ProseMirror/plugins/inputRulesPlugin.js
 packages/editor/ProseMirror/plugins/joplinEditablePlugin/createEditorDialog.js
 packages/editor/ProseMirror/plugins/joplinEditablePlugin/joplinEditablePlugin.test.js
@@ -1096,16 +1082,12 @@ packages/editor/ProseMirror/plugins/linkTooltipPlugin.test.js
 packages/editor/ProseMirror/plugins/linkTooltipPlugin.js
 packages/editor/ProseMirror/plugins/listPlugin.js
 packages/editor/ProseMirror/plugins/originalMarkupPlugin.js
+packages/editor/ProseMirror/plugins/resourcePlaceholderPlugin.js
 packages/editor/ProseMirror/plugins/searchPlugin.js
-packages/editor/ProseMirror/plugins/tablePlugin.js
-packages/editor/ProseMirror/plugins/utils/createExternalEditorPlugin.js
-packages/editor/ProseMirror/plugins/utils/createFloatingButtonPlugin.js
 packages/editor/ProseMirror/schema.js
 packages/editor/ProseMirror/styles.js
 packages/editor/ProseMirror/testing/createTestEditor.js
-packages/editor/ProseMirror/testing/createTestEditorWithSerializer.js
 packages/editor/ProseMirror/types.js
-packages/editor/ProseMirror/utils/SelectableNodeView.js
 packages/editor/ProseMirror/utils/UndoStackSynchronizer.js
 packages/editor/ProseMirror/utils/canReplaceSelectionWith.js
 packages/editor/ProseMirror/utils/computeSelectionFormatting.js
@@ -1113,7 +1095,6 @@ packages/editor/ProseMirror/utils/dom/createButton.js
 packages/editor/ProseMirror/utils/dom/createTextArea.js
 packages/editor/ProseMirror/utils/dom/createTextNode.js
 packages/editor/ProseMirror/utils/dom/createUniqueId.js
-packages/editor/ProseMirror/utils/dom/showModal.js
 packages/editor/ProseMirror/utils/extractSelectedLinesTo.test.js
 packages/editor/ProseMirror/utils/extractSelectedLinesTo.js
 packages/editor/ProseMirror/utils/forEachHeading.js
@@ -1124,15 +1105,8 @@ packages/editor/ProseMirror/utils/postprocessEditorOutput.js
 packages/editor/ProseMirror/utils/preprocessEditorInput.test.js
 packages/editor/ProseMirror/utils/preprocessEditorInput.js
 packages/editor/ProseMirror/utils/sanitizeHtml.js
-packages/editor/ProseMirror/utils/selectFirstInstanceOfNode.js
 packages/editor/ProseMirror/utils/trimEmptyParagraphs.js
 packages/editor/ProseMirror/vendor/changedDescendants.js
-packages/editor/ProseMirror/vendor/icons/addColumnRight.js
-packages/editor/ProseMirror/vendor/icons/addRowBelow.js
-packages/editor/ProseMirror/vendor/icons/icon.js
-packages/editor/ProseMirror/vendor/icons/removeColumn.js
-packages/editor/ProseMirror/vendor/icons/removeRow.js
-packages/editor/ProseMirror/vendor/icons/types.js
 packages/editor/ProseMirror/vendor/splitBlockAs.js
 packages/editor/SelectionFormatting.js
 packages/editor/events.js
@@ -1401,7 +1375,6 @@ packages/lib/services/database/migrations/45.js
 packages/lib/services/database/migrations/46.js
 packages/lib/services/database/migrations/47.js
 packages/lib/services/database/migrations/48.js
-packages/lib/services/database/migrations/49.js
 packages/lib/services/database/migrations/index.js
 packages/lib/services/database/sqlStringToLines.js
 packages/lib/services/database/types.js
@@ -1525,7 +1498,6 @@ packages/lib/services/plugins/utils/createViewHandle.js
 packages/lib/services/plugins/utils/executeSandboxCall.js
 packages/lib/services/plugins/utils/getActivePluginEditorView.js
 packages/lib/services/plugins/utils/getActivePluginEditorViews.js
-packages/lib/services/plugins/utils/getPluginHelpUrl.js
 packages/lib/services/plugins/utils/getPluginIssueReportUrl.test.js
 packages/lib/services/plugins/utils/getPluginIssueReportUrl.js
 packages/lib/services/plugins/utils/getPluginNamespacedSettingKey.js
@@ -1730,7 +1702,6 @@ packages/plugin-repo-cli/lib/gitCompareUrl.test.js
 packages/plugin-repo-cli/lib/gitCompareUrl.js
 packages/plugin-repo-cli/lib/overrideUtils.test.js
 packages/plugin-repo-cli/lib/overrideUtils.js
-packages/plugin-repo-cli/lib/searchPlugins.js
 packages/plugin-repo-cli/lib/types.js
 packages/plugin-repo-cli/lib/updateReadme.test.js
 packages/plugin-repo-cli/lib/updateReadme.js
@@ -1846,8 +1817,6 @@ packages/tools/updateMarkdownDoc.js
 packages/tools/utils/discourse.test.js
 packages/tools/utils/discourse.js
 packages/tools/utils/loadSponsors.js
-packages/tools/utils/parsePluralLocalizationForm.js
-packages/tools/utils/parsePlurallLocalizationForm.test.js
 packages/tools/utils/translation.js
 packages/tools/validateFilenames.js
 packages/tools/website/build.js

.yarn/patches/depd-npm-1.1.2-b0c8414da7.patch

@@ -1,36 +0,0 @@
-# Patch to remove eval. This allows using depd in an environment with
-# a strict Content-Security-Policy.
-# Ref: https://github.com/dougwilson/nodejs-depd/pull/33
-diff --git a/index.js b/index.js
-index d758d3c8f58a60bf27ef377ad77639bf10ce7854..2bad40d4eeba553d3bcfb206873eac059067ae3b 100644
---- a/index.js
-+++ b/index.js
-@@ -399,19 +399,20 @@ function wrapfunction (fn, message) {
-     throw new TypeError('argument fn must be a function')
-   }
- 
--  var args = createArgumentsString(fn.length)
--  var deprecate = this // eslint-disable-line no-unused-vars
-   var stack = getStack()
-   var site = callSiteLocation(stack[1])
- 
-   site.name = fn.name
- 
--   // eslint-disable-next-line no-eval
--  var deprecatedfn = eval('(function (' + args + ') {\n' +
--    '"use strict"\n' +
--    'log.call(deprecate, message, site)\n' +
--    'return fn.apply(this, arguments)\n' +
--    '})')
-+  var deprecatedfn
-+  var self = this
-+  deprecatedfn = function () {
-+    'use strict'
-+    log.call(self, message, site)
-+    return fn.apply(this, arguments)
-+  }
-+  Object.defineProperty(deprecatedfn, 'length', { value: fn.length })
-+  Object.defineProperty(deprecatedfn, 'name', { value: fn.name })
- 
-   return deprecatedfn
- }

.yarn/patches/depd-npm-2.0.0-b6c51a4b43.patch

@@ -1,35 +0,0 @@
-# Patch to remove eval. This allows using depd in an environment with
-# a strict Content-Security-Policy.
-# Ref: https://github.com/dougwilson/nodejs-depd/pull/33
-diff --git a/index.js b/index.js
-index 1bf2fcfdeffc984e5ad792eec08744c29d4a4590..1b24aa2414458bc651abfdded81b103c131efeaa 100644
---- a/index.js
-+++ b/index.js
-@@ -415,19 +415,19 @@ function wrapfunction (fn, message) {
-     throw new TypeError('argument fn must be a function')
-   }
- 
--  var args = createArgumentsString(fn.length)
-   var stack = getStack()
-   var site = callSiteLocation(stack[1])
- 
-   site.name = fn.name
- 
--  // eslint-disable-next-line no-new-func
--  var deprecatedfn = new Function('fn', 'log', 'deprecate', 'message', 'site',
--    '"use strict"\n' +
--    'return function (' + args + ') {' +
--    'log.call(deprecate, message, site)\n' +
--    'return fn.apply(this, arguments)\n' +
--    '}')(fn, log, this, message, site)
-+  var self = this
-+  var deprecatedfn = function () {
-+    'use strict'
-+    log.call(self, message, site)
-+    return fn.apply(this, arguments)
-+  }
-+  Object.defineProperty(deprecatedfn, 'length', { value: fn.length })
-+  Object.defineProperty(deprecatedfn, 'name', { value: fn.name })
- 
-   return deprecatedfn
- }

Assets/WebsiteAssets/rss.xml

@@ -1,77 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><rss xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:content="http://purl.org/rss/1.0/modules/content/" xmlns:atom="http://www.w3.org/2005/Atom" version="2.0"><channel><title><![CDATA[Joplin]]></title><description><![CDATA[Joplin, the open source note-taking application]]></description><link>https://joplinapp.org</link><generator>RSS for Node</generator><lastBuildDate>Mon, 22 Sep 2025 00:00:00 GMT</lastBuildDate><atom:link href="https://joplinapp.org/rss.xml" rel="self" type="application/rss+xml"/><pubDate>Mon, 22 Sep 2025 00:00:00 GMT</pubDate><item><title><![CDATA[What's new in Joplin 3.4]]></title><description><![CDATA[<p>Joplin 3.4 includes many bug fixes and improvements, with a focus on the mobile app.</p>
-<h2>Mobile<a name="mobile" href="#mobile" class="heading-anchor">🔗</a></h2>
-<h3>Rich Text Editor<a name="rich-text-editor" href="#rich-text-editor" class="heading-anchor">🔗</a></h3>
-<p>The mobile app now includes a beta <a href="https://joplinapp.org/help/apps/rich_text_editor">Rich Text Editor</a>! The new editor renders formatting/math/images within the editor:</p>
-<img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/news/20250922-mobile-rte.png" width="400" alt="screenshot: Mobile Rich Text Editor editing the welcome notes. Images, headings, etc are rendering."/>
-<p>To try it, 1) open a note in the default Markdown editor 2) open the note actions menu (the three vertical dots) for the note and 3) click “Edit as Rich Text”.</p>
-<p>Be aware that this editor is still in active development and <a href="https://github.com/laurent22/joplin/issues/12840">has a number of known limitations and issues</a>. The Rich Text editor is based on <a href="https://prosemirror.net/">ProseMirror</a> and will behave differently from the desktop Rich Text Editor in many cases.</p>
-<h3>Support for publishing notes with Joplin Cloud and Server<a name="support-for-publishing-notes-with-joplin-cloud-and-server" href="#support-for-publishing-notes-with-joplin-cloud-and-server" class="heading-anchor">🔗</a></h3>
-<p>It's now possible to <a href="https://joplinapp.org/help/apps/publish_note">publish notes</a> from the mobile app! To do so, open the “Properties” menu for a note, then click “Publish/unpublish”:</p>
-<p><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/news/20250922-publish-notes.png" alt="screenshot: A Publish/unpublish note action is shown in the &quot;Note properties&quot; sidebar, just below a &quot;Previous versions&quot; button"></p>
-<p>Next, in the “publish note” dialog, click “Copy shareable link”. Notes can later be unpublished by clicking &quot;Unpublish&quot; in the publication dialog.</p>
-<h3>Viewing note history<a name="viewing-note-history" href="#viewing-note-history" class="heading-anchor">🔗</a></h3>
-<p>It is now possible to view and restore previous note versions from the mobile app. Like the &quot;publish note&quot; feature, previous note versions can be accessed from the note properties menu.</p>
-<p><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/news/20250922-note-history.png" alt="screenshot: The note history page"></p>
-<p>As on desktop, the note history feature can be configured from the “Note History” tab in settings.</p>
-<h3>Updated tag dialog<a name="updated-tag-dialog" href="#updated-tag-dialog" class="heading-anchor">🔗</a></h3>
-<p>The tag dialog has been redesigned, with a new UI for adding, removing, and creating new tags:<br>
-<img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/news/20250922-tag-editor.png" width="500" alt="screenshot: Tag dialog now consists of three sections: Added tags, Add new tags, Actions."/></p>
-<h3>Android: Improved voice typing<a name="android-improved-voice-typing" href="#android-improved-voice-typing" class="heading-anchor">🔗</a></h3>
-<p>The voice typing feature on Android has been updated with <a href="https://github.com/laurent22/joplin/pull/12404">improved silence detection</a> and a new “<a href="https://github.com/laurent22/joplin/pull/12370">custom glossary</a>” setting. Voice typing also now <a href="https://github.com/laurent22/joplin/pull/12352">defaults to a more accurate (but somewhat slower) model</a>.</p>
-<h3>Quickly creating a note from multiple photos<a name="quickly-creating-a-note-from-multiple-photos" href="#quickly-creating-a-note-from-multiple-photos" class="heading-anchor">🔗</a></h3>
-<p>A “scan notebook” action has been added to the “New note” menu:</p>
-<img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/news/20250922-scan-notebook.png" width="500"/>
-<p>This action allows quickly creating a new note with multiple pictures taken from the camera.</p>
-<h2>Desktop<a name="desktop" href="#desktop" class="heading-anchor">🔗</a></h2>
-<h3>More Markdown Editor settings<a name="more-markdown-editor-settings" href="#more-markdown-editor-settings" class="heading-anchor">🔗</a></h3>
-<p>The &quot;Note&quot; tab in settings now includes new settings for the Markdown editor, including:</p>
-<ul>
-<li>An option to render headers, lists, and certain other formatting within the editor.</li>
-<li>An option to render images in the editor.</li>
-</ul>
-<p>When enabled, these settings bring the Markdown editor closer to the Rich Text Editor, without <a href="https://joplinapp.org/help/apps/rich_text_editor">some of the Rich Text Editor's limitations</a>.</p>
-<p>These settings are also available on mobile.</p>
-<h3>Smaller application size and faster startup<a name="smaller-application-size-and-faster-startup" href="#smaller-application-size-and-faster-startup" class="heading-anchor">🔗</a></h3>
-<p>We've made the desktop application roughly 33% smaller! In addition to faster application startup, this means that the desktop app should be faster to download take up less space.</p>
-<table class="table">
-<thead>
-<tr>
-<th>Joplin version</th>
-<th>Previous size (v3.3.13)</th>
-<th>New size (v3.4.12)</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td>Joplin for MacOS (ARM)</td>
-<td>211 MB</td>
-<td>141 MB</td>
-</tr>
-<tr>
-<td>Joplin for Windows (installer)</td>
-<td>321 MB</td>
-<td>219 MB</td>
-</tr>
-<tr>
-<td>Joplin for Windows (portable)</td>
-<td>320 MB</td>
-<td>219 MB</td>
-</tr>
-<tr>
-<td>Joplin for Linux (AppImage)</td>
-<td>219 MB</td>
-<td>147 MB</td>
-</tr>
-</tbody>
-</table>
-<h2>Terminal app<a name="terminal-app" href="#terminal-app" class="heading-anchor">🔗</a></h2>
-<h3>Collapsible folders<a name="collapsible-folders" href="#collapsible-folders" class="heading-anchor">🔗</a></h3>
-<p>The <a href="https://joplinapp.org/help/apps/terminal/">terminal application</a> now supports expanding and collapsing folders by pressing <kbd>z</kbd>. For additional information, see <a href="https://github.com/laurent22/joplin/pull/12718">the original pull request</a>.</p>
-<h3>Managing shared notebooks and published notes<a name="managing-shared-notebooks-and-published-notes" href="#managing-shared-notebooks-and-published-notes" class="heading-anchor">🔗</a></h3>
-<p>New commands have been added to the terminal app, including <code>publish</code>, <code>unpublish</code>, and <code>share</code>. This allows the terminal app to manage shared folders and published notes.</p>
-<h2>Bug fixes<a name="bug-fixes" href="#bug-fixes" class="heading-anchor">🔗</a></h2>
-<p>For the full list of changes, see <a href="https://joplinapp.org/help/about/changelog/desktop/">the desktop changelog</a> and <a href="https://joplinapp.org/help/about/changelog/android/">the mobile changelog</a>.</p>
-]]></description><link>https://joplinapp.org/news/20250922-release-3-4</link><guid isPermaLink="false">20250922-release-3-4</guid><pubDate>Mon, 22 Sep 2025 00:00:00 GMT</pubDate><twitter-text></twitter-text></item><item><title><![CDATA[What's new in Joplin 3.3]]></title><description><![CDATA[<h2>Desktop application<a name="desktop-application" href="#desktop-application" class="heading-anchor">🔗</a></h2>
+<?xml version="1.0" encoding="UTF-8"?><rss xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:content="http://purl.org/rss/1.0/modules/content/" xmlns:atom="http://www.w3.org/2005/Atom" version="2.0"><channel><title><![CDATA[Joplin]]></title><description><![CDATA[Joplin, the open source note-taking application]]></description><link>https://joplinapp.org</link><generator>RSS for Node</generator><lastBuildDate>Mon, 28 Apr 2025 00:00:00 GMT</lastBuildDate><atom:link href="https://joplinapp.org/rss.xml" rel="self" type="application/rss+xml"/><pubDate>Mon, 28 Apr 2025 00:00:00 GMT</pubDate><item><title><![CDATA[What's new in Joplin 3.3]]></title><description><![CDATA[<h2>Desktop application<a name="desktop-application" href="#desktop-application" class="heading-anchor">🔗</a></h2>
 <h3>Accessibility improvements<a name="accessibility-improvements" href="#accessibility-improvements" class="heading-anchor">🔗</a></h3>
 <p>The Joplin 3.3 release introduces significant accessibility enhancements designed to make the application more inclusive and user-friendly. Users can now benefit from improved keyboard navigation, thanks to newly added shortcuts and clearer labels that streamline interaction across the interface. We've also added a &quot;go to viewer&quot; menu item that moves focus from the note editor to the note viewer. Focus is moved to the location in the viewer corresponding to the location of the cursor in the editor.</p>
 <p>Screen reader support has been bolstered, ensuring elements like the note list and sidebar are easier to toggle and interact with. These updates make the application more usable for individuals relying on assistive technologies.</p>
@@ -519,4 +446,10 @@ sys 0m38.013s</p>
 <p>Unfortunately we cannot publish the Android version because it is based on a framework version that Google does not accept. To upgrade the app a lot of changes are needed and another round of pre-releases, and therefore there will not be a 2.9 version for Google Play. You may however download the official APK directly from there: <a href="https://github.com/laurent22/joplin-android/releases/tag/android-v2.9.8">Android 2.9 Official Release</a></p>
 <p>This is the reality of app stores in general - small developers being imposed never ending new requirements by all-powerful companies, and by the time a version is finally ready we can't even publish it because yet more requirements are in place.</p>
 <p>For the record the current 2.9 app works perfectly fine. It targets Android 11, which is only 2 years old and is still supported (and installed on millions of phones). Google requires us to target Android 12 which only came out last year.</p>
-]]></description><link>https://joplinapp.org/news/20221216-release-2-9</link><guid isPermaLink="false">20221216-release-2-9</guid><pubDate>Fri, 16 Dec 2022 00:00:00 GMT</pubDate><twitter-text>What&apos;s new in Joplin 2.9</twitter-text></item></channel></rss>
+]]></description><link>https://joplinapp.org/news/20221216-release-2-9</link><guid isPermaLink="false">20221216-release-2-9</guid><pubDate>Fri, 16 Dec 2022 00:00:00 GMT</pubDate><twitter-text>What&apos;s new in Joplin 2.9</twitter-text></item><item><title><![CDATA[Joplin is hiring!]]></title><description><![CDATA[<p>Joplin is an open source note-taking app. Capture your thoughts and securely access them from any device.</p>
+<p>We are looking to hire two JavaScript software developers to work on the desktop, mobile, and server applications. All those are built using modern technologies, including React, React Native and Electron with a strong focus on test units.</p>
+<p>You need to demonstrate some experience with at least some of these technologies, and willing to learn more and touch various different projects.</p>
+<p>You will be part of a small team, so you will have an opportunity for a high-impact role, targeting hundreds of thousands of users.</p>
+<p>If you're interested please contact us at job-AT-joplin.cloud</p>
+<p>No agencies please.</p>
+]]></description><link>https://joplinapp.org/news/20221209-job</link><guid isPermaLink="false">20221209-job</guid><pubDate>Fri, 09 Dec 2022 00:00:00 GMT</pubDate><twitter-text>Joplin is hiring!</twitter-text></item></channel></rss>

Dockerfile.server

@@ -73,10 +73,8 @@ USER $user
 COPY --chown=$user:$user --from=builder /build/packages /home/$user/packages
 COPY --chown=$user:$user --from=builder /usr/bin/tini /usr/local/bin/tini
 
-# We download a specific version of the plugin to prevent pm2 from fetching the latest, since it may
-# not have been properly audited (that fact was used to spread malware at some point). Ref:
-# https://github.com/laurent22/joplin/issues/12754
-RUN pm2 install https://registry.npmjs.org/pm2-logrotate/-/pm2-logrotate-3.0.0.tgz \
+# Install pm2-logrotate and default settings as the runtime user
+RUN pm2 install pm2-logrotate \
 	&& pm2 set pm2-logrotate:max_size 100MB \
 	&& pm2 set pm2-logrotate:retain 5 \
 	&& pm2 set pm2-logrotate:compress true

README.md

@@ -31,7 +31,7 @@ Please see the [donation page](https://github.com/laurent22/joplin/blob/dev/read
 # Sponsors
 
 <!-- SPONSORS-ORG -->
-<a href="https://seirei.ne.jp"><img title="Serei Network" width="256" src="https://joplinapp.org/images/sponsors/SeireiNetwork.png"/></a> <a href="https://citricsheep.com"><img title="Citric Sheep" width="256" src="https://joplinapp.org/images/sponsors/CitricSheep.png"/></a> <a href="https://sorted.travel/?utm_source=joplinapp"><img title="Sorted Travel" width="256" src="https://joplinapp.org/images/sponsors/SortedTravel.png"/></a> <a href="https://celebian.com"><img title="Celebian" width="256" src="https://joplinapp.org/images/sponsors/Celebian.png"/></a> <a href="https://bestkru.com"><img title="BestKru" width="256" src="https://joplinapp.org/images/sponsors/BestKru.png"/></a> <a href="https://www.socialfollowers.uk/buy-tiktok-followers/"><img title="Social Followers" width="256" src="https://joplinapp.org/images/sponsors/SocialFollowers.png"/></a> <a href="https://stormlikes.com/"><img title="Stormlikes" width="256" src="https://joplinapp.org/images/sponsors/Stormlikes.png"/></a> <a href="https://route4me.com"><img title="Route4Me" width="256" src="https://joplinapp.org/images/sponsors/Route4Me.png"/></a> <a href="https://topagency.webflow.io"><img title="WebDesignAgency" width="256" src="https://joplinapp.org/images/sponsors/WebDesignAgency.png" alt="topagency"/></a> <a href="https://www.slotozilla.com/nz/no-deposit-bonus"><img title="casino without making any upfront cost" width="256" src="https://joplinapp.org/images/sponsors/Slotozilla.png" alt="casino without making any upfront cost"/></a> <a href="https://writepaper.com/"><img title="best service to write my paper for me" width="256" src="https://joplinapp.org/images/sponsors/WritePaper.png" alt="best service to write my paper for me"/></a> <a href="https://paperwriter.com/"><img title="high-quality paper writing service PaperWriter" width="256" src="https://joplinapp.org/images/sponsors/PaperWriter.png" alt="high-quality paper writing service PaperWriter"/></a> <a href="https://www.bestetf.net/"><img title="BestETF" width="256" src="https://joplinapp.org/images/sponsors/BestEtf.png" alt="BestETF"/></a> <a href="https://freespinny.io/free-spins-no-deposit/"><img title="Freespinny.io Free Spins Bonus site" width="256" src="https://joplinapp.org/images/sponsors/Freespinny.png" alt="Freespinny.io Free Spins Bonus site"/></a> <a href="https://essayshark.com"><img title="EssayShark - essay writers for hire" width="256" src="https://joplinapp.org/images/sponsors/EssayShark.png" alt="EssayShark - essay writers for hire"/></a> <a href="https://pokieslab1.com/real-money-pokies/"><img title="Australian Real Money Pokies" width="256" src="https://joplinapp.org/images/sponsors/PokiesLab.png" alt="Australian Real Money Pokies"/></a> <a href="https://pokiesman1.net/real-money-pokies/"><img title="Australian Real Money Pokies" width="256" src="https://joplinapp.org/images/sponsors/Pokiesman.png" alt="Australian Real Money Pokies"/></a> <a href="https://domyessay.com"><img title="Essay writers DoMyEssay are dedicated to providing top-notch, custom-written papers that meet your academic requirements" width="256" src="https://joplinapp.org/images/sponsors/DoMyEssay.png" alt="DoMyEssay"/></a> <a href="https://essaypro.com/"><img title="best essay writing service" width="256" src="https://joplinapp.org/images/sponsors/EssayPro.png" alt="best essay writing service"/></a> <a href="https://socialkings.online"><img title="Boost your reach and buy real followers" width="256" src="https://joplinapp.org/images/sponsors/SocialKings.png" alt="Boost your reach and buy real followers"/></a> <a href="https://uk.notgamstop.com/bonuses/free-spins-no-deposit-no-gamstop/"><img title="free spins no deposit at NotGamstop" width="256" src="https://joplinapp.org/images/sponsors/NotGamStop.jpg" alt="free spins no deposit at NotGamstop"/></a> <a href="https://www.writemyessay.com/"><img title="writing service for students WriteMyEssay" width="256" src="https://joplinapp.org/images/sponsors/WriteMyEssay.png" alt="writing service for students WriteMyEssay"/></a> <a href="https://essayservice.com/"><img title="For those in need of immediate academic assistance, EssayService offers a fast and reliable service to write my essay for me now, ensuring high-quality results within tight deadlines" width="256" src="https://joplinapp.org/images/sponsors/EssayService.png" alt="For those in need of immediate academic assistance, EssayService offers a fast and reliable service to write my essay for me now, ensuring high-quality results within tight deadlines"/></a>
+<a href="https://seirei.ne.jp"><img title="Serei Network" width="256" src="https://joplinapp.org/images/sponsors/SeireiNetwork.png"/></a> <a href="https://citricsheep.com"><img title="Citric Sheep" width="256" src="https://joplinapp.org/images/sponsors/CitricSheep.png"/></a> <a href="https://sorted.travel/?utm_source=joplinapp"><img title="Sorted Travel" width="256" src="https://joplinapp.org/images/sponsors/SortedTravel.png"/></a> <a href="https://celebian.com"><img title="Celebian" width="256" src="https://joplinapp.org/images/sponsors/Celebian.png"/></a> <a href="https://bestkru.com"><img title="BestKru" width="256" src="https://joplinapp.org/images/sponsors/BestKru.png"/></a> <a href="https://www.socialfollowers.uk/buy-tiktok-followers/"><img title="Social Followers" width="256" src="https://joplinapp.org/images/sponsors/SocialFollowers.png"/></a> <a href="https://stormlikes.com/"><img title="Stormlikes" width="256" src="https://joplinapp.org/images/sponsors/Stormlikes.png"/></a> <a href="https://route4me.com"><img title="Route4Me" width="256" src="https://joplinapp.org/images/sponsors/Route4Me.png"/></a> <a href="https://topagency.webflow.io"><img title="WebDesignAgency" width="256" src="https://joplinapp.org/images/sponsors/WebDesignAgency.png" alt="topagency"/></a> <a href="https://www.slotozilla.com/nz/no-deposit-bonus"><img title="casino without making any upfront cost" width="256" src="https://joplinapp.org/images/sponsors/Slotozilla.png" alt="casino without making any upfront cost"/></a> <a href="https://writepaper.com/"><img title="best service to write my paper for me" width="256" src="https://joplinapp.org/images/sponsors/WritePaper.png" alt="best service to write my paper for me"/></a> <a href="https://paperwriter.com/"><img title="high-quality paper writing service PaperWriter" width="256" src="https://joplinapp.org/images/sponsors/PaperWriter.png" alt="high-quality paper writing service PaperWriter"/></a> <a href="https://www.bestetf.net/"><img title="BestETF" width="256" src="https://joplinapp.org/images/sponsors/BestEtf.png" alt="BestETF"/></a> <a href="https://freespinny.io/free-spins-no-deposit/"><img title="Freespinny.io Free Spins Bonus site" width="256" src="https://joplinapp.org/images/sponsors/Freespinny.png" alt="Freespinny.io Free Spins Bonus site"/></a> <a href="https://damangameplay.in"><img title="Daman Game" width="256" src="https://joplinapp.org/images/sponsors/DamanGame.png" alt="Daman Game"/></a> <a href="https://essayshark.com"><img title="EssayShark - essay writers for hire" width="256" src="https://joplinapp.org/images/sponsors/EssayShark.png" alt="EssayShark - essay writers for hire"/></a> <a href="https://pokieslab1.com/real-money-pokies/"><img title="Australian Real Money Pokies" width="256" src="https://joplinapp.org/images/sponsors/PokiesLab.png" alt="Australian Real Money Pokies"/></a> <a href="https://pokiesman1.net/real-money-pokies/"><img title="Australian Real Money Pokies" width="256" src="https://joplinapp.org/images/sponsors/Pokiesman.png" alt="Australian Real Money Pokies"/></a> <a href="https://domyessay.com"><img title="Essay writers DoMyEssay are dedicated to providing top-notch, custom-written papers that meet your academic requirements" width="256" src="https://joplinapp.org/images/sponsors/DoMyEssay.png" alt="DoMyEssay"/></a> <a href="https://essaypro.com/"><img title="best essay writing service" width="256" src="https://joplinapp.org/images/sponsors/EssayPro.png" alt="best essay writing service"/></a> <a href="https://socialkings.online"><img title="Boost your reach and buy real followers" width="256" src="https://joplinapp.org/images/sponsors/SocialKings.png" alt="Boost your reach and buy real followers"/></a> <a href="https://uk.notgamstop.com/bonuses/free-spins-no-deposit-no-gamstop/"><img title="free spins no deposit at NotGamstop" width="256" src="https://joplinapp.org/images/sponsors/NotGamStop.jpg" alt="free spins no deposit at NotGamstop"/></a>
 <!-- SPONSORS-ORG -->
 
 * * *

docker-compose.db-dev.yml

@@ -16,6 +16,8 @@
 # SLAVE_POSTGRES_PORT=5433
 # SLAVE_POSTGRES_HOST=localhost
 
+version: '2'
+
 services:
 
     postgresql-master:

docker-compose.server-dev.yml

@@ -1,6 +1,8 @@
 # This compose file can be used in development to run both the database and app
 # within Docker.
 
+version: '3'
+
 services:
     app:
         build:

docker-compose.server.yml

@@ -15,6 +15,8 @@
 #	- This would typically be mapped to port to 443 (TLS) with a reverse proxy.
 #	- If Joplin Server does not need to be accessible over the internet, the port can be mapped to 22300.
 
+version: '3'
+
 networks:
     app-network:
     transcribe-network:

package.json

@@ -79,7 +79,7 @@
     "eslint-plugin-import": "2.31.0",
     "eslint-plugin-jest": "27.9.0",
     "eslint-plugin-promise": "6.6.0",
-    "eslint-plugin-react": "7.37.5",
+    "eslint-plugin-react": "7.37.4",
     "execa": "5.1.1",
     "fs-extra": "11.2.0",
     "glob": "11.0.3",
@@ -89,7 +89,7 @@
     "lint-staged": "15.5.2",
     "madge": "8.0.0",
     "npm-package-json-lint": "8.0.0",
-    "typescript": "5.8.3"
+    "typescript": "5.8.2"
   },
   "dependencies": {
     "@types/fs-extra": "11.0.4",
@@ -117,12 +117,6 @@
     "pdfjs-dist@*": "patch:pdfjs-dist@npm%3A3.11.174#./.yarn/patches/pdfjs-dist-npm-3.11.174-67f2fee6d6.patch",
     "pdfjs-dist@3.11.174": "patch:pdfjs-dist@npm%3A3.11.174#./.yarn/patches/pdfjs-dist-npm-3.11.174-67f2fee6d6.patch",
     "canvas@npm:^2.11.2": "link:./.yarn/joplin-empty-package/",
-    "node-gyp@npm:^9.0.0": "11.2.0",
-    "depd@npm:^2.0.0": "patch:depd@npm%3A2.0.0#~/.yarn/patches/depd-npm-2.0.0-b6c51a4b43.patch",
-    "depd@npm:~2.0.0": "patch:depd@npm%3A2.0.0#~/.yarn/patches/depd-npm-2.0.0-b6c51a4b43.patch",
-    "depd@npm:~1.1.2": "patch:depd@npm%3A2.0.0#~/.yarn/patches/depd-npm-2.0.0-b6c51a4b43.patch",
-    "depd@npm:2.0.0": "patch:depd@npm%3A2.0.0#~/.yarn/patches/depd-npm-2.0.0-b6c51a4b43.patch",
-    "depd@npm:^1.1.2": "patch:depd@npm%3A2.0.0#~/.yarn/patches/depd-npm-2.0.0-b6c51a4b43.patch",
-    "depd@npm:^1.1.0": "patch:depd@npm%3A2.0.0#~/.yarn/patches/depd-npm-2.0.0-b6c51a4b43.patch"
+    "node-gyp@npm:^9.0.0": "11.2.0"
   }
 }

packages/app-cli/package.json

@@ -35,15 +35,15 @@
     ],
     "owner": "Laurent Cozic"
   },
-  "version": "3.5.1",
+  "version": "3.4.1",
   "bin": "./main.js",
   "engines": {
     "node": ">=10.0.0"
   },
   "dependencies": {
-    "@joplin/lib": "~3.5",
-    "@joplin/renderer": "~3.5",
-    "@joplin/utils": "~3.5",
+    "@joplin/lib": "~3.4",
+    "@joplin/renderer": "~3.4",
+    "@joplin/utils": "~3.4",
     "aws-sdk": "2.1340.0",
     "chalk": "4.1.2",
     "compare-version": "0.1.2",
@@ -57,7 +57,7 @@
     "proper-lockfile": "4.1.2",
     "redux": "4.2.1",
     "server-destroy": "1.0.1",
-    "sharp": "0.34.3",
+    "sharp": "0.34.2",
     "sprintf-js": "1.1.3",
     "sqlite3": "5.1.6",
     "string-padding": "1.0.2",
@@ -70,14 +70,14 @@
     "yargs-parser": "21.1.1"
   },
   "devDependencies": {
-    "@joplin/tools": "~3.5",
+    "@joplin/tools": "~3.4",
     "@types/fs-extra": "11.0.4",
     "@types/jest": "29.5.14",
-    "@types/node": "18.19.130",
+    "@types/node": "18.19.112",
     "@types/proper-lockfile": "^4.1.2",
     "gulp": "4.0.2",
     "jest": "29.7.0",
     "temp": "0.9.4",
-    "typescript": "5.8.3"
+    "typescript": "5.8.2"
   }
 }

packages/app-cli/tests/enex_to_html/attachment-image.enex

@@ -1,8 +0,0 @@
-<en-note>
-  <div>
-    <en-media style="--en-viewerProps:{};" type="image/jpeg" hash="e2d4887c5a32ab1686276c7c5ae733ef" width="1.125in" />
-  </div>
-  <div>
-    <br />
-  </div>
-</en-note>

packages/app-cli/tests/enex_to_html/attachment-image.html

@@ -1,8 +0,0 @@
-<en-note>
-  <div>
-    <img src=":/e2d4887c5a32ab1686276c7c5ae733ef"  style="--en-viewerProps:{};" type="image/jpeg" hash="e2d4887c5a32ab1686276c7c5ae733ef" width="108" alt="attachment-image" />
-  </div>
-  <div>
-    <br/>
-  </div>
-</en-note>

packages/app-cli/tests/enex_to_html/attachment.html

@@ -1,8 +1,6 @@
 <en-note>
+  <div><a href=":/21ca2b948f222a38802940ec7e2e5de3" hash="21ca2b948f222a38802940ec7e2e5de3" type="application/pdf" style="cursor:pointer;" alt="attachment-1">attachment-1</a></div>
   <div>
-    <a href=':/21ca2b948f222a38802940ec7e2e5de3'  hash="21ca2b948f222a38802940ec7e2e5de3" type="application/pdf" style="cursor:pointer;" alt="attachment-1">  attachment-1</a>
-  </div>
-  <div>
-    <br/>
+    <br>
   </div>
 </en-note>

packages/app-cli/tests/enex_to_html/checkbox-list.html

@@ -1,11 +1,16 @@
 <en-note>
   <div>
     <p>For example, consider an exported Evernote list with todo checkboxes like this:</p>
-
     <ul>
-      <li><div><input checked="checked" type="checkbox" onclick="return false;" />Foo</div></li>
-      <li><div><input type="checkbox" onclick="return false;" /><b>Bar</b></div></li>
-      <li><div><input type="checkbox" onclick="return false;" /><i>Baz</i></div></li>
+      <li>
+        <div><input checked="checked" type="checkbox" onclick="return false;">Foo</div>
+      </li>
+      <li>
+        <div><input type="checkbox" onclick="return false;"><b>Bar</b></div>
+      </li>
+      <li>
+        <div><input type="checkbox" onclick="return false;"><i>Baz</i></div>
+      </li>
     </ul>
   </div>
 </en-note>

packages/app-cli/tests/enex_to_html/checklist.html

@@ -1,11 +1,19 @@
 <en-note>
   <div>
     <p>In Evernote a checklist is not the same as a list with checkboxes.</p>
-
-    <ul STYLE="--en-todo:true;">
-        <li STYLE="--en-checked:false;"> <input type="checkbox" onclick="return false;" /><div>One</div></li>
-        <li STYLE="--en-checked:true;"> <input checked="checked" type="checkbox" onclick="return false;" /><div>Two</div>
-        </li><li STYLE="--en-checked:false;"> <input type="checkbox" onclick="return false;" /><div>Three</div></li>
+    <ul style="--en-todo:true;">
+      <li style="--en-checked:false;">
+        <input type="checkbox" onclick="return false;">
+        <div>One</div>
+      </li>
+      <li style="--en-checked:true;">
+        <input checked="checked" type="checkbox" onclick="return false;">
+        <div>Two</div>
+      </li>
+      <li style="--en-checked:false;">
+        <input type="checkbox" onclick="return false;">
+        <div>Three</div>
+      </li>
     </ul>
   </div>
 </en-note>

packages/app-cli/tests/enex_to_html/en-media--audio.html

@@ -1 +1,12 @@
-<en-note><div><audio controls preload="none" style="width:480px;"><source src=":/9168ee833d03c5ea7c730ac6673978c1" type="audio/mp4" /><p>Your browser does not support HTML5 audio.</p></audio><p><a href=":/9168ee833d03c5ea7c730ac6673978c1">audio test</a></p></div><div><br/></div></en-note>
+<en-note>
+  <div>
+    <audio controls="" preload="none" style="width:480px;">
+      <source src=":/9168ee833d03c5ea7c730ac6673978c1" type="audio/mp4">
+      <p>Your browser does not support HTML5 audio.</p>
+    </audio>
+    <p><a href=":/9168ee833d03c5ea7c730ac6673978c1">audio test</a></p>
+  </div>
+  <div>
+    <br>
+  </div>
+</en-note>

packages/app-cli/tests/enex_to_html/en-media--image.html

@@ -1 +1,12 @@
-<en-note><div><input type="checkbox" onclick="return false;" />This is a test</div><div><input type="checkbox" onclick="return false;" />A test for <span STYLE="font-weight: bold;">bold</span></div><div><input type="checkbox" onclick="return false;" />A test for <i>italic</i><br/></div><div><br/></div><div><i><img src=":/89ce7da62c6b2832929a6964237e98e9"  hash="89ce7da62c6b2832929a6964237e98e9" type="image/jpeg" alt="" /></i></div></en-note>
+<en-note>
+  <div><input type="checkbox" onclick="return false;">This is a test</div>
+  <div><input type="checkbox" onclick="return false;">A test for <span style="font-weight: bold;">bold</span></div>
+  <div>
+    <input type="checkbox" onclick="return false;">A test for <i>italic</i>
+    <br>
+  </div>
+  <div>
+    <br>
+  </div>
+  <div><i><img src=":/89ce7da62c6b2832929a6964237e98e9" hash="89ce7da62c6b2832929a6964237e98e9" type="image/jpeg" alt=""></i></div>
+</en-note>

packages/app-cli/tests/enex_to_html/quoted-attributes.html

@@ -1,3 +1,3 @@
 <en-note>
-  <h1 STYLE="box-sizing:inherit;font-family:&quot;Guardian TextSans Web&quot;, &quot;Helvetica Neue&quot;, Helvetica, Arial, sans-serif;margin-top:0.2em;margin-bottom:0.35em;font-size:2.125em;font-weight:600;line-height:1.3;">Association Between mRNA Vaccination and COVID-19 Hospitalization and Disease Severity</h1>
+  <h1 style="box-sizing:inherit;font-family:&quot;Guardian TextSans Web&quot;, &quot;Helvetica Neue&quot;, Helvetica, Arial, sans-serif;margin-top:0.2em;margin-bottom:0.35em;font-size:2.125em;font-weight:600;line-height:1.3;">Association Between mRNA Vaccination and COVID-19 Hospitalization and Disease Severity</h1>
 </en-note>

packages/app-cli/tests/enex_to_html/svg.html

@@ -1,5 +1,3 @@
 <en-note>
-  <div>
-    <img STYLE="margin:0px;padding:0px;outline:0px;width:74px;height:36px;position:absolute;bottom:-5px;left:0px;transform:translate(0px, 100%);stroke-dasharray:90;transition:stroke-dashoffset 0.5s cubic-bezier(0.97, 0.16, 0.62, 0.76) 0s;stroke-dashoffset:0;" SRC="data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' data-evernote-id='97' class='js-evernote-checked'%3e%3cuse xlink:href='https://wordminds.com/wp-content/themes/wordminds/assets/img/hint_left.svg%23hint_left' data-evernote-id='98' class='js-evernote-checked'%3e%3c/use%3e%3c/svg%3e"/>
-  </div>
+  <div><img style="margin:0px;padding:0px;outline:0px;width:74px;height:36px;position:absolute;bottom:-5px;left:0px;transform:translate(0px, 100%);stroke-dasharray:90;transition:stroke-dashoffset 0.5s cubic-bezier(0.97, 0.16, 0.62, 0.76) 0s;stroke-dashoffset:0;" src="data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' data-evernote-id='97' class='js-evernote-checked'%3e%3cuse xlink:href='https://wordminds.com/wp-content/themes/wordminds/assets/img/hint_left.svg%23hint_left' data-evernote-id='98' class='js-evernote-checked'%3e%3c/use%3e%3c/svg%3e"></div>
 </en-note>

packages/app-cli/tests/enex_to_md/resource_with_missing_encoding.enex

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE en-export SYSTEM "http://xml.evernote.com/pub/evernote-export4.dtd">
-<en-export export-date="20230724T173816Z" application="Evernote" version="10.58.8">
-<note>
-	<title>test.json</title>
-	<content><![CDATA[<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE en-note SYSTEM "http://xml.evernote.com/pub/enml2.dtd">
-<en-note><en-media hash="ac91cc691d21261b222681dd38c1e4ad" type="application/json"/></en-note>
-]]>
-</content>
-<created>20191002T075850Z</created>
-<updated>20191002T075850Z</updated>
-<note-attributes><latitude>48.79547119140625</latitude><longitude>9.809423921920198</longitude><altitude>398.0</altitude><author>Laurent</author><source>desktop.mac</source></note-attributes>
-<resource><data>eyAidGVzdCI6IDEyMyB9</data><mime>application/json</mime><width>0</width><height>0</height><resource-attributes><file-name>test.json</file-name><attachment>false</attachment></resource-attributes></resource></note></en-export>

packages/app-cli/tests/services/plugins/PluginService.ts

@@ -2,7 +2,7 @@ import PluginRunner from '../../../app/services/plugins/PluginRunner';
 import PluginService, { PluginSettings, defaultPluginSetting } from '@joplin/lib/services/plugins/PluginService';
 import { ContentScriptType } from '@joplin/lib/services/plugins/api/types';
 import MdToHtml from '@joplin/renderer/MdToHtml';
-import shim, { MobilePlatform } from '@joplin/lib/shim';
+import shim from '@joplin/lib/shim';
 import Setting from '@joplin/lib/models/Setting';
 import * as fs from 'fs-extra';
 import Note from '@joplin/lib/models/Note';
@@ -310,7 +310,7 @@ describe('services_PluginService', () => {
 
 		let resetPlatformMock = () => {};
 		if (!isDesktop) {
-			resetPlatformMock = mockMobilePlatform(MobilePlatform.Android).reset;
+			resetPlatformMock = mockMobilePlatform('android').reset;
 		}
 
 		try {

packages/app-clipper/manifest.json

@@ -1,7 +1,7 @@
 {
     "manifest_version": 3,
     "name": "Joplin Web Clipper [DEV]",
-    "version": "3.5.0",
+    "version": "3.4.0",
     "description": "Capture and save web pages and screenshots from your browser to Joplin.",
     "homepage_url": "https://joplinapp.org",
     "content_security_policy": {

packages/app-desktop/ElectronAppWrapper.ts

@@ -407,17 +407,7 @@ export default class ElectronAppWrapper {
 					isGoingToExit = true;
 				} else {
 					event.preventDefault();
-
-					const w = this.win_;
-					if (!w) return;
-
-					if (w.isFullScreen()) {
-						// leave fullscreen, then hide
-						w.once('leave-full-screen', () => w.hide());
-						w.setFullScreen(false);
-					} else {
-						w.hide();
-					}
+					this.hide();
 				}
 			} else {
 				const hasBackgroundWindows = this.secondaryWindows_.size > 0;
@@ -622,11 +612,7 @@ export default class ElectronAppWrapper {
 					console.warn('The window object was not available during the click event from tray icon');
 					return;
 				}
-				if (!this.mainWindow().isVisible()) {
-					this.mainWindow().show();
-				} else {
-					this.mainWindow().hide();
-				}
+				this.mainWindow().show();
 			});
 		} catch (error) {
 			console.error('Cannot create tray', error);

packages/app-desktop/app.reducer.test.ts

@@ -52,7 +52,7 @@ describe('app.reducer', () => {
 			...createAppDefaultState({}),
 			backgroundWindows: {
 				testWindow: {
-					...createAppDefaultWindowState(null),
+					...createAppDefaultWindowState(),
 					windowId: 'testWindow',
 
 					visibleDialogs: {

packages/app-desktop/app.reducer.ts

@@ -26,21 +26,10 @@ export interface AppStateDialog {
 	props: Record<string, any>;
 }
 
-export interface NoteIdToScrollPercent {
+export interface EditorScrollPercents {
 	[noteId: string]: number;
 }
 
-type RichTextEditorSelectionBookmark = unknown;
-
-export interface EditorCursorLocations {
-	readonly richText?: RichTextEditorSelectionBookmark;
-	readonly markdown?: number;
-}
-
-export interface NoteIdToEditorCursorLocations {
-	[noteId: string]: EditorCursorLocations;
-}
-
 export interface VisibleDialogs {
 	[dialogKey: string]: boolean;
 }
@@ -53,9 +42,6 @@ export interface AppWindowState extends WindowState {
 	devToolsVisible: boolean;
 	// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
 	watchedResources: any;
-
-	lastEditorScrollPercents: NoteIdToScrollPercent;
-	lastEditorCursorLocations: NoteIdToEditorCursorLocations;
 }
 
 interface BackgroundWindowStates {
@@ -69,6 +55,7 @@ export interface AppState extends State, AppWindowState {
 	// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
 	navHistory: any[];
 	watchedNoteFiles: string[];
+	lastEditorScrollPercents: EditorScrollPercents;
 	focusedField: string;
 	layoutMoveMode: boolean;
 	startupPluginsLoaded: boolean;
@@ -79,7 +66,7 @@ export interface AppState extends State, AppWindowState {
 	isResettingLayout: boolean;
 }
 
-export const createAppDefaultWindowState = (globalState: AppState|null): AppWindowState => {
+export const createAppDefaultWindowState = (): AppWindowState => {
 	return {
 		...defaultWindowState,
 		visibleDialogs: {},
@@ -88,12 +75,6 @@ export const createAppDefaultWindowState = (globalState: AppState|null): AppWind
 		editorCodeView: true,
 		devToolsVisible: false,
 		watchedResources: {},
-
-		// Maintain the scroll and cursor location for secondary windows separate from the
-		// main window. This prevents scrolling in a secondary window from changing/resetting
-		// the default scroll position in the main window:
-		lastEditorCursorLocations: globalState?.lastEditorCursorLocations ?? {},
-		lastEditorScrollPercents: globalState?.lastEditorScrollPercents ?? {},
 	};
 };
 
@@ -101,7 +82,7 @@ export const createAppDefaultWindowState = (globalState: AppState|null): AppWind
 export function createAppDefaultState(resourceEditWatcherDefaultState: any): AppState {
 	return {
 		...defaultState,
-		...createAppDefaultWindowState(null),
+		...createAppDefaultWindowState(),
 		route: {
 			type: 'NAV_GO',
 			routeName: 'Main',
@@ -109,6 +90,7 @@ export function createAppDefaultState(resourceEditWatcherDefaultState: any): App
 		},
 		navHistory: [],
 		watchedNoteFiles: [],
+		lastEditorScrollPercents: {},
 		visibleDialogs: {}, // empty object if no dialog is visible. Otherwise contains the list of visible dialogs.
 		focusedField: null,
 		layoutMoveMode: false,
@@ -317,18 +299,6 @@ export default function(state: AppState, action: any) {
 			}
 			break;
 
-		case 'EDITOR_CURSOR_POSITION_SET':
-			{
-				newState = { ...state };
-				const newCursorLocations = { ...newState.lastEditorCursorLocations };
-				newCursorLocations[action.noteId] = {
-					...(newCursorLocations[action.noteId] ?? {}),
-					...action.location,
-				};
-				newState.lastEditorCursorLocations = newCursorLocations;
-			}
-			break;
-
 		case 'NOTE_DEVTOOLS_TOGGLE':
 			newState = { ...state };
 			newState.devToolsVisible = !newState.devToolsVisible;

packages/app-desktop/commands/openNoteInNewWindow.ts

@@ -2,7 +2,7 @@ import { CommandRuntime, CommandDeclaration, CommandContext } from '@joplin/lib/
 import { _ } from '@joplin/lib/locale';
 import { stateUtils } from '@joplin/lib/reducer';
 import Note from '@joplin/lib/models/Note';
-import { AppState, createAppDefaultWindowState } from '../app.reducer';
+import { createAppDefaultWindowState } from '../app.reducer';
 import Setting from '@joplin/lib/models/Setting';
 
 export const declaration: CommandDeclaration = {
@@ -25,7 +25,7 @@ export const runtime = (): CommandRuntime => {
 				folderId: note.parent_id,
 				windowId: `window-${noteId}-${idCounter++}`,
 				defaultAppWindowState: {
-					...createAppDefaultWindowState(context.state as AppState),
+					...createAppDefaultWindowState(),
 					noteVisiblePanes: Setting.value('noteVisiblePanes'),
 					editorCodeView: Setting.value('editor.codeView'),
 				},

packages/app-desktop/gui/Button/Button.tsx

@@ -225,7 +225,7 @@ const Button = React.forwardRef(({
 			animation={iconAnimation}
 			mr={iconOnly ? '0' : '6px'}
 			color={color}
-			className={`${iconName} icon`}
+			className={iconName}
 			role='img'
 		/>;
 	}

packages/app-desktop/gui/ConfigScreen/controls/plugins/PluginBox.tsx

@@ -8,7 +8,6 @@ import { PluginManifest } from '@joplin/lib/services/plugins/utils/types';
 import bridge from '../../../../services/bridge';
 import { ItemEvent, PluginItem } from '@joplin/lib/components/shared/config/plugins/types';
 import PluginService from '@joplin/lib/services/plugins/PluginService';
-import getPluginHelpUrl from '@joplin/lib/services/plugins/utils/getPluginHelpUrl';
 
 export enum InstallState {
 	NotInstalled = 1,
@@ -151,7 +150,8 @@ export default function(props: Props) {
 
 	const onNameClick = useCallback(() => {
 		const manifest = item.manifest;
-		void bridge().openExternal(getPluginHelpUrl(manifest.id));
+		if (!manifest.homepage_url) return;
+		void bridge().openExternal(manifest.homepage_url);
 	}, [item]);
 
 	const onRecommendedClick = useCallback(() => {

packages/app-desktop/gui/DialogButtonRow.tsx

@@ -7,7 +7,6 @@ import useKeyboardHandler from './DialogButtonRow/useKeyboardHandler';
 export interface ButtonSpec {
 	name: string;
 	label: string;
-	disabled?: boolean;
 }
 
 export interface ClickEvent {
@@ -52,29 +51,21 @@ export default function DialogButtonRow(props: Props) {
 		if (props.onClick) props.onClick(event);
 	}, [props.onClick]);
 
-	const okButtonShow = props.okButtonShow ?? true;
-	const cancelButtonShow = props.cancelButtonShow ?? true;
-	const canClickOk = okButtonShow && !props.okButtonDisabled;
-	const canClickCancel = cancelButtonShow && !props.cancelButtonDisabled;
-
-	const onKeyDown = useKeyboardHandler({
-		onOkButtonClick: canClickOk ? onOkButtonClick : null,
-		onCancelButtonClick: canClickCancel ? onCancelButtonClick : null,
-	});
+	const onKeyDown = useKeyboardHandler({ onOkButtonClick, onCancelButtonClick });
 
 	const buttonComps = [];
 
 	if (props.customButtons) {
 		for (const b of props.customButtons) {
 			buttonComps.push(
-				<button key={b.name} style={buttonStyle} onClick={() => onCustomButtonClick({ buttonName: b.name })} disabled={b.disabled} onKeyDown={onKeyDown}>
+				<button key={b.name} style={buttonStyle} onClick={() => onCustomButtonClick({ buttonName: b.name })} onKeyDown={onKeyDown}>
 					{b.label}
 				</button>,
 			);
 		}
 	}
 
-	if (okButtonShow) {
+	if (props.okButtonShow !== false) {
 		buttonComps.push(
 			<button disabled={props.okButtonDisabled} key="ok" style={buttonStyle} onClick={onOkButtonClick} ref={props.okButtonRef} onKeyDown={onKeyDown}>
 				{props.okButtonLabel ? props.okButtonLabel : _('OK')}
@@ -82,7 +73,7 @@ export default function DialogButtonRow(props: Props) {
 		);
 	}
 
-	if (cancelButtonShow) {
+	if (props.cancelButtonShow !== false) {
 		buttonComps.push(
 			<button disabled={props.cancelButtonDisabled} key="cancel" style={{ ...buttonStyle }} onClick={onCancelButtonClick}>
 				{props.cancelButtonLabel ? props.cancelButtonLabel : _('Cancel')}

packages/app-desktop/gui/DialogButtonRow/useKeyboardHandler.ts

@@ -2,10 +2,11 @@ import * as React from 'react';
 import { useEffect, useState, useRef, useCallback } from 'react';
 import { isInsideContainer } from '@joplin/lib/dom';
 
-type OnButtonClick = ()=> void;
 interface Props {
-	onOkButtonClick: null|OnButtonClick;
-	onCancelButtonClick: null|OnButtonClick;
+	// eslint-disable-next-line @typescript-eslint/ban-types -- Old code before rule was applied
+	onOkButtonClick: Function;
+	// eslint-disable-next-line @typescript-eslint/ban-types -- Old code before rule was applied
+	onCancelButtonClick: Function;
 }
 
 const globalKeydownHandlers: string[] = [];
@@ -47,17 +48,15 @@ export default (props: Props) => {
 
 		if (!isTopDialog() || isInSubModal(event.target)) return;
 
-		if (event.keyCode === 13 && props.onOkButtonClick) {
+		if (event.keyCode === 13) {
 			if ('nodeName' in event.target && event.target.nodeName === 'INPUT') {
 				const target = event.target as HTMLInputElement;
 
 				if (target.type !== 'button' && target.type !== 'checkbox') {
-					event.preventDefault();
 					props.onOkButtonClick();
 				}
 			}
-		} else if (event.keyCode === 27 && props.onCancelButtonClick) {
-			event.preventDefault();
+		} else if (event.keyCode === 27) {
 			props.onCancelButtonClick();
 		}
 		// eslint-disable-next-line @seiyab/react-hooks/exhaustive-deps -- Old code before rule was applied

packages/app-desktop/gui/NoteContentPropertiesDialog.tsx

@@ -172,12 +172,7 @@ export default function NoteContentPropertiesDialog(props: NoteContentProperties
 			<div style={{ ...labelCompStyle, marginTop: 10 }}>
 				{readTimeLabel}
 			</div>
-			<DialogButtonRow
-				themeId={props.themeId}
-				onClick={buttonRow_click}
-				okButtonShow={false}
-				cancelButtonLabel={_('Close')}
-			/>
+			<DialogButtonRow themeId={props.themeId} onClick={buttonRow_click} okButtonShow={false} cancelButtonLabel={_('Close')}/>
 		</Dialog>
 	);
 }

packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useEditorSearchExtension.ts

@@ -8,139 +8,6 @@ const logger = Logger.create('useEditorSearch');
 // Registers a helper CodeMirror extension to be used with
 // useEditorSearchHandler.
 
-type Mark = { clear: ()=> void };
-interface SearchHighlightState {
-	previousKeywordValue: string;
-	previousIndex: number;
-	previousSearchTimestamp: number;
-	// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Partial refactor of old code before rule was applied
-	overlayTimeoutRef: { current: any };
-	clearMarkers(): void;
-	clearOverlay(editor: CodeMirror5Emulation): void;
-	getSearchTerm(keyword: string): RegExp;
-	highlightSearch(cm: CodeMirror5Emulation, searchTerm: RegExp, index: number, scrollTo: boolean, withSelection: boolean): Mark;
-	setMarkers(marker: Mark[]): void;
-	setPreviousIndex(index: number): void;
-	setPreviousSearchTimestamp(timestamp: number): void;
-	setPreviousKeywordValue(value: string): void;
-	// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Partial refactor of old code before rule was applied
-	setScrollbarMarks(marks: any): void;
-	// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Partial refactor of old code before rule was applied
-	setOverlay(overlay: any): void;
-	setOverlayTimeout(timeout: number): void;
-}
-
-
-// Modified from codemirror/addons/search/search.js
-const searchOverlay = (query: RegExp) => {
-	// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
-	return { token: function(stream: any) {
-		query.lastIndex = stream.pos;
-		const match = query.exec(stream.string);
-		if (match && match.index === stream.pos) {
-			stream.pos += match[0].length || 1;
-			return 'search-marker';
-		} else if (match) {
-			stream.pos = match.index;
-		} else {
-			stream.skipToEnd();
-		}
-		return null;
-	} };
-};
-
-const addCodeMirrorExtension = (CodeMirror: CodeMirror5Emulation) => {
-	CodeMirror.defineOption('joplin.search-highlight-state', null, ()=>{});
-	// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
-	CodeMirror?.defineExtension('setMarkers', function(keywords: any, options: any) {
-		// Pass arguments in via options to allow the extension to work if multiple editors are open simultaneously
-		// See https://github.com/laurent22/joplin/issues/13399.
-		const state: SearchHighlightState = this.getOption('joplin.search-highlight-state');
-		if (!options) {
-			options = { selectedIndex: 0, searchTimestamp: 0 };
-		}
-
-		if (options.showEditorMarkers === false) {
-			state.clearMarkers();
-			state.clearOverlay(this);
-			return;
-		}
-
-		state.clearMarkers();
-
-		// HIGHLIGHT KEYWORDS
-		// When doing a global search it's possible to have multiple keywords
-		// This means we need to highlight each one
-		// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
-		const marks: any = [];
-		for (let i = 0; i < keywords.length; i++) {
-			const keyword = keywords[i];
-
-			if (keyword.value === '') continue;
-
-			const searchTerm = state.getSearchTerm(keyword);
-
-			// We only want to scroll the first keyword into view in the case of a multi keyword search
-			const scrollTo = i === 0 && (state.previousKeywordValue !== keyword.value || state.previousIndex !== options.selectedIndex || options.searchTimestamp !== state.previousSearchTimestamp);
-
-			try {
-				const match = state.highlightSearch(this, searchTerm, options.selectedIndex, scrollTo, !!options.withSelection);
-				if (match) marks.push(match);
-			} catch (error) {
-				if (error.name !== 'SyntaxError') {
-					throw error;
-				}
-				// An error of 'Regular expression too large' might occur in the markJs library
-				// when the input is really big, this catch is here to avoid the application crashing
-				// https://github.com/laurent22/joplin/issues/7634
-				console.error('Error while trying to highlight words from search: ', error);
-			}
-		}
-
-		state.setMarkers(marks);
-		state.setPreviousIndex(options.selectedIndex);
-		state.setPreviousSearchTimestamp(options.searchTimestamp);
-
-		// SEARCHOVERLAY
-		// We only want to highlight all matches when there is only 1 search term
-		if (keywords.length !== 1 || keywords[0].value === '') {
-			state.clearOverlay(this);
-			const prev = keywords.length > 1 ? keywords[0].value : '';
-			state.setPreviousKeywordValue(prev);
-			return 0;
-		}
-
-		const searchTerm = state.getSearchTerm(keywords[0]);
-
-		// Determine the number of matches in the source, this is passed on
-		// to the NoteEditor component
-		const regexMatches = this.getValue().match(searchTerm);
-		const nMatches = regexMatches ? regexMatches.length : 0;
-
-		// Don't bother clearing and re-calculating the overlay if the search term
-		// hasn't changed
-		if (keywords[0].value === state.previousKeywordValue) return nMatches;
-
-		state.clearOverlay(this);
-		state.setPreviousKeywordValue(keywords[0].value);
-
-		// These operations are pretty slow, so we won't add use them until the user
-		// has finished typing, 500ms is probably enough time
-		const timeout = shim.setTimeout(() => {
-			const scrollMarks = this.showMatchesOnScrollbar?.(searchTerm, true, 'cm-search-marker-scrollbar');
-			const overlay = searchOverlay(searchTerm);
-			this.addOverlay(overlay);
-			state.setOverlay(overlay);
-			state.setScrollbarMarks(scrollMarks);
-		}, 500);
-
-		state.setOverlayTimeout(timeout);
-		state.overlayTimeoutRef.current = timeout;
-
-		return nMatches;
-	});
-};
-
 export default function useEditorSearchExtension(CodeMirror: CodeMirror5Emulation) {
 
 	const [markers, setMarkers] = useState([]);
@@ -181,6 +48,23 @@ export default function useEditorSearchExtension(CodeMirror: CodeMirror5Emulatio
 		setOverlayTimeout(null);
 	}, [scrollbarMarks, overlay, overlayTimeout]);
 
+	// Modified from codemirror/addons/search/search.js
+	const searchOverlay = useCallback((query: RegExp) => {
+		// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
+		return { token: function(stream: any) {
+			query.lastIndex = stream.pos;
+			const match = query.exec(stream.string);
+			if (match && match.index === stream.pos) {
+				stream.pos += match[0].length || 1;
+				return 'search-marker';
+			} else if (match) {
+				stream.pos = match.index;
+			} else {
+				stream.skipToEnd();
+			}
+			return null;
+		} };
+	}, []);
 
 	// Highlights the currently active found work
 	// It's possible to get tricky with this functions and just use findNext/findPrev
@@ -231,25 +115,89 @@ export default function useEditorSearchExtension(CodeMirror: CodeMirror5Emulatio
 		};
 	}, []);
 
-	if (CodeMirror) {
-		const state: SearchHighlightState = {
-			previousKeywordValue,
-			previousIndex,
-			previousSearchTimestamp,
-			overlayTimeoutRef,
-			clearMarkers,
-			clearOverlay,
-			getSearchTerm,
-			highlightSearch,
-			setMarkers,
-			setPreviousIndex,
-			setPreviousSearchTimestamp,
-			setPreviousKeywordValue,
-			setScrollbarMarks,
-			setOverlay,
-			setOverlayTimeout,
-		};
-		addCodeMirrorExtension(CodeMirror);
-		CodeMirror.setOption('joplin.search-highlight-state', state);
-	}
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
+	CodeMirror?.defineExtension('setMarkers', function(keywords: any, options: any) {
+		if (!options) {
+			options = { selectedIndex: 0, searchTimestamp: 0 };
+		}
+
+		if (options.showEditorMarkers === false) {
+			clearMarkers();
+			clearOverlay(this);
+			return;
+		}
+
+		clearMarkers();
+
+		// HIGHLIGHT KEYWORDS
+		// When doing a global search it's possible to have multiple keywords
+		// This means we need to highlight each one
+		// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
+		const marks: any = [];
+		for (let i = 0; i < keywords.length; i++) {
+			const keyword = keywords[i];
+
+			if (keyword.value === '') continue;
+
+			const searchTerm = getSearchTerm(keyword);
+
+			// We only want to scroll the first keyword into view in the case of a multi keyword search
+			const scrollTo = i === 0 && (previousKeywordValue !== keyword.value || previousIndex !== options.selectedIndex || options.searchTimestamp !== previousSearchTimestamp);
+
+			try {
+				const match = highlightSearch(this, searchTerm, options.selectedIndex, scrollTo, !!options.withSelection);
+				if (match) marks.push(match);
+			} catch (error) {
+				if (error.name !== 'SyntaxError') {
+					throw error;
+				}
+				// An error of 'Regular expression too large' might occur in the markJs library
+				// when the input is really big, this catch is here to avoid the application crashing
+				// https://github.com/laurent22/joplin/issues/7634
+				console.error('Error while trying to highlight words from search: ', error);
+			}
+		}
+
+		setMarkers(marks);
+		setPreviousIndex(options.selectedIndex);
+		setPreviousSearchTimestamp(options.searchTimestamp);
+
+		// SEARCHOVERLAY
+		// We only want to highlight all matches when there is only 1 search term
+		if (keywords.length !== 1 || keywords[0].value === '') {
+			clearOverlay(this);
+			const prev = keywords.length > 1 ? keywords[0].value : '';
+			setPreviousKeywordValue(prev);
+			return 0;
+		}
+
+		const searchTerm = getSearchTerm(keywords[0]);
+
+		// Determine the number of matches in the source, this is passed on
+		// to the NoteEditor component
+		const regexMatches = this.getValue().match(searchTerm);
+		const nMatches = regexMatches ? regexMatches.length : 0;
+
+		// Don't bother clearing and re-calculating the overlay if the search term
+		// hasn't changed
+		if (keywords[0].value === previousKeywordValue) return nMatches;
+
+		clearOverlay(this);
+		setPreviousKeywordValue(keywords[0].value);
+
+		// These operations are pretty slow, so we won't add use them until the user
+		// has finished typing, 500ms is probably enough time
+		const timeout = shim.setTimeout(() => {
+			const scrollMarks = this.showMatchesOnScrollbar?.(searchTerm, true, 'cm-search-marker-scrollbar');
+			const overlay = searchOverlay(searchTerm);
+			this.addOverlay(overlay);
+			setOverlay(overlay);
+			setScrollbarMarks(scrollMarks);
+		}, 500);
+
+		setOverlayTimeout(timeout);
+		overlayTimeoutRef.current = timeout;
+
+		return nMatches;
+	});
 }

packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/v6/CodeMirror.tsx

@@ -31,7 +31,6 @@ import CommandService from '@joplin/lib/services/CommandService';
 import useRefocusOnVisiblePaneChange from './utils/useRefocusOnVisiblePaneChange';
 import { WindowIdContext } from '../../../../NewWindowOrIFrame';
 import eventManager, { EventName, ResourceChangeEvent } from '@joplin/lib/eventManager';
-import useSyncEditorValue from './utils/useSyncEditorValue';
 
 const logger = Logger.create('CodeMirror6');
 const logDebug = (message: string) => logger.debug(message);
@@ -168,8 +167,9 @@ const CodeMirror = (props: NoteBodyEditorProps, ref: ForwardedRef<NoteBodyEditor
 			},
 			scrollTo: (options: ScrollOptions) => {
 				if (options.type === ScrollOptionTypes.Hash) {
+					if (!webviewRef.current) return;
 					const hash: string = options.value;
-					webviewRef.current?.send('scrollToHash', hash);
+					webviewRef.current.send('scrollToHash', hash);
 					editorRef.current.jumpToHash(hash);
 				} else if (options.type === ScrollOptionTypes.Percent) {
 					const percent = options.value as number;
@@ -342,7 +342,6 @@ const CodeMirror = (props: NoteBodyEditorProps, ref: ForwardedRef<NoteBodyEditor
 		} else if (event.kind === EditorEventType.Change) {
 			codeMirror_change(event.value);
 		} else if (event.kind === EditorEventType.SelectionRangeChange) {
-			props.onCursorMotion({ markdown: event.from });
 			setSelectionRange({ from: event.from, to: event.to });
 		} else if (event.kind === EditorEventType.UpdateSearchDialog) {
 			if (lastSearchState.current?.searchText !== event.searchState.searchText) {
@@ -356,7 +355,7 @@ const CodeMirror = (props: NoteBodyEditorProps, ref: ForwardedRef<NoteBodyEditor
 		} else if (event.kind === EditorEventType.FollowLink) {
 			void CommandService.instance().execute('openItem', event.link);
 		}
-	}, [editor_scroll, codeMirror_change, props.setLocalSearch, props.setShowLocalSearch, props.onCursorMotion]);
+	}, [editor_scroll, codeMirror_change, props.setLocalSearch, props.setShowLocalSearch]);
 
 	const onSelectPastBeginning = useCallback(() => {
 		void CommandService.instance().execute('focusElement', 'noteTitle');
@@ -401,17 +400,15 @@ const CodeMirror = (props: NoteBodyEditorProps, ref: ForwardedRef<NoteBodyEditor
 		props.tabMovesFocus,
 	]);
 
-	const initialCursorLocationRef = useRef(0);
-	initialCursorLocationRef.current = props.initialCursorLocation.markdown ?? 0;
-
-	useSyncEditorValue({
-		content: props.content,
-		visiblePanes: props.visiblePanes,
-		onMessage: props.onMessage,
-		editorRef,
-		noteId: props.noteId,
-		initialCursorLocationRef,
-	});
+	// Update the editor's value
+	useEffect(() => {
+		// Include the noteId in the update props to give plugins access
+		// to the current note ID.
+		const updateProps = { noteId: props.noteId };
+		if (editorRef.current?.updateBody(props.content, updateProps)) {
+			editorRef.current?.clearHistory();
+		}
+	}, [props.content, props.noteId]);
 
 	const renderEditor = () => {
 		return (
@@ -419,7 +416,6 @@ const CodeMirror = (props: NoteBodyEditorProps, ref: ForwardedRef<NoteBodyEditor
 				<Editor
 					style={styles.editor}
 					initialText={props.content}
-					initialSelectionRef={initialCursorLocationRef}
 					initialNoteId={props.noteId}
 					ref={editorRef}
 					settings={editorSettings}

packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/v6/Editor.tsx

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { ForwardedRef, RefObject } from 'react';
+import { ForwardedRef } from 'react';
 import { useEffect, useState, useRef, forwardRef, useImperativeHandle } from 'react';
 import { EditorProps, LogMessageCallback, OnEventCallback, ContentScriptData } from '@joplin/editor/types';
 import createEditor from '@joplin/editor/CodeMirror/createEditor';
@@ -23,7 +23,6 @@ import getResourceBaseUrl from '../../../utils/getResourceBaseUrl';
 interface Props extends EditorProps {
 	style: React.CSSProperties;
 	pluginStates: PluginStates;
-	initialSelectionRef: RefObject<number>;
 
 	onEditorPaste: (event: Event)=> void;
 	externalSearch: SearchMarkers;
@@ -128,9 +127,6 @@ const Editor = (props: Props, ref: ForwardedRef<CodeMirrorControl>) => {
 				direction: 'unset',
 			},
 		});
-		const cursor = props.initialSelectionRef.current;
-		editor.select(cursor, cursor);
-
 		setEditor(editor);
 
 		return () => {

packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/v6/utils/useSyncEditorValue.ts

@@ -1,50 +0,0 @@
-import { useEffect, useRef, RefObject } from 'react';
-import { OnMessage } from '../../../../utils/types';
-import CodeMirrorControl from '@joplin/editor/CodeMirror/CodeMirrorControl';
-
-interface Props {
-	content: string;
-
-	visiblePanes: string[];
-	onMessage: OnMessage;
-	editorRef: RefObject<CodeMirrorControl>;
-	noteId: string;
-	initialCursorLocationRef: RefObject<number>;
-}
-
-// Updates the editor's value as necessary
-const useSyncEditorValue = ({ content, visiblePanes, onMessage, editorRef, noteId, initialCursorLocationRef }: Props) => {
-	const visiblePanesRef = useRef(visiblePanes);
-	visiblePanesRef.current = visiblePanes;
-	const onMessageRef = useRef(onMessage);
-	onMessageRef.current = onMessage;
-
-	const lastNoteIdRef = useRef(noteId);
-
-	useEffect(() => {
-		// Include the noteId in the update props to give plugins access
-		// to the current note ID.
-		const updateProps = { noteId: noteId };
-		if (editorRef.current?.updateBody(content, updateProps)) {
-			editorRef.current?.clearHistory();
-
-			// Only reset the cursor location when switching notes. If, for example,
-			// the note is updated from a secondary window, the cursor location shouldn't
-			// reset.
-			const noteChanged = lastNoteIdRef.current !== noteId;
-			if (noteChanged) {
-				const cursorLocation = initialCursorLocationRef.current;
-				editorRef.current?.select(cursorLocation, cursorLocation);
-			}
-			lastNoteIdRef.current = noteId;
-
-			// If the viewer isn't visible, the content should be considered rendered
-			// after the editor has finished updating:
-			if (!visiblePanesRef.current.includes('viewer')) {
-				onMessageRef.current({ channel: 'noteRenderComplete' });
-			}
-		}
-	}, [content, noteId, editorRef, initialCursorLocationRef]);
-};
-
-export default useSyncEditorValue;

packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/TinyMCE.tsx

@@ -23,7 +23,7 @@ import { themeStyle } from '@joplin/lib/theme';
 import { loadScript } from '../../../utils/loadScript';
 import bridge from '../../../../services/bridge';
 import { TinyMceEditorEvents } from './utils/types';
-import type { Bookmark, Editor, EditorEvent } from 'tinymce';
+import type { Editor, EditorEvent } from 'tinymce';
 import { joplinCommandToTinyMceCommands, TinyMceCommand } from './utils/joplinCommandToTinyMceCommands';
 import shouldPasteResources from './utils/shouldPasteResources';
 import lightTheme from '@joplin/lib/themes/light';
@@ -47,7 +47,6 @@ import Setting from '@joplin/lib/models/Setting';
 import useTextPatternsLookup, { TextPatternContext } from './utils/useTextPatternsLookup';
 import { toFileProtocolPath } from '@joplin/utils/path';
 import { RenderResultPluginAsset } from '@joplin/renderer/types';
-import useCursorPositioning from './utils/useCursorPositioning';
 
 const logger = Logger.create('TinyMCE');
 
@@ -1047,12 +1046,6 @@ const TinyMCE = (props: NoteBodyEditorProps, ref: Ref<NoteBodyEditorRef>) => {
 		return true;
 	}
 
-	const { onInitialContentSet } = useCursorPositioning({
-		initialCursorLocation: props.initialCursorLocation.richText as Bookmark,
-		onCursorUpdate: props.onCursorMotion,
-		editor,
-	});
-
 	const lastNoteIdRef = useRef(props.noteId);
 	useEffect(() => {
 		if (!editor) return () => {};
@@ -1143,7 +1136,6 @@ const TinyMCE = (props: NoteBodyEditorProps, ref: Ref<NoteBodyEditorRef>) => {
 			await loadDocumentAssets(props.themeId, editor, allAssets);
 
 			dispatchDidUpdate(editor);
-			onInitialContentSet();
 		};
 
 		void loadContent();
@@ -1395,7 +1387,6 @@ const TinyMCE = (props: NoteBodyEditorProps, ref: Ref<NoteBodyEditorRef>) => {
 		// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
 		async function onCopy(event: any) {
 			const copiedContent = editor.selection.getContent();
-			if (!copiedContent) return;
 			copyHtmlToClipboard(copiedContent);
 			event.preventDefault();
 		}
@@ -1404,7 +1395,6 @@ const TinyMCE = (props: NoteBodyEditorProps, ref: Ref<NoteBodyEditorRef>) => {
 		async function onCut(event: any) {
 			event.preventDefault();
 			const selectedContent = editor.selection.getContent();
-			if (!selectedContent) return;
 			copyHtmlToClipboard(selectedContent);
 			editor.insertContent('');
 			onChangeHandler();

packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/utils/useCursorPositioning.ts

@@ -1,55 +0,0 @@
-import { useCallback, useEffect, useRef } from 'react';
-import { Bookmark, Editor } from 'tinymce';
-import { OnCursorMotion } from '../../../utils/types';
-
-interface Props {
-	initialCursorLocation: Bookmark;
-	editor: Editor;
-	onCursorUpdate: OnCursorMotion;
-}
-
-const useCursorPositioning = ({ initialCursorLocation, editor, onCursorUpdate }: Props) => {
-	const initialCursorLocationRef = useRef(initialCursorLocation);
-	initialCursorLocationRef.current = initialCursorLocation;
-
-	const appliedInitialCursorLocationRef = useRef(false);
-	const onInitialContentSet = useCallback(() => {
-		if (editor) {
-			if (initialCursorLocationRef.current) {
-				editor.selection.moveToBookmark(initialCursorLocationRef.current);
-			}
-
-			appliedInitialCursorLocationRef.current = true;
-		}
-	}, [editor]);
-
-	useEffect(() => {
-		if (!editor) return () => {};
-
-		editor.on('ContentSet', onInitialContentSet);
-
-		const onSelectionChange = () => {
-			// Wait until the initial cursor position has been set. This avoids resetting
-			// the initial cursor position to zero when the editor first loads.
-			if (!appliedInitialCursorLocationRef.current) return;
-
-			// Use an offset bookmark -- the default bookmark type is not preserved after unloading
-			// and reloading the editor.
-			const offsetBookmarkId = 2;
-			onCursorUpdate({
-				richText: editor.selection.getBookmark(offsetBookmarkId, true),
-			});
-		};
-
-		editor.on('SelectionChange', onSelectionChange);
-
-		return () => {
-			editor.off('ContentSet', onInitialContentSet);
-			editor.off('SelectionChange', onSelectionChange);
-		};
-	}, [editor, onCursorUpdate, onInitialContentSet]);
-
-	return { onInitialContentSet };
-};
-
-export default useCursorPositioning;

packages/app-desktop/gui/NoteEditor/NoteEditor.tsx

@@ -18,7 +18,7 @@ import { NoteEditorProps, FormNote, OnChangeEvent, AllAssetsOptions, NoteBodyEdi
 import CommandService from '@joplin/lib/services/CommandService';
 import Button, { ButtonLevel } from '../Button/Button';
 import eventManager, { EventName } from '@joplin/lib/eventManager';
-import { AppState, EditorCursorLocations } from '../../app.reducer';
+import { AppState } from '../../app.reducer';
 import ToolbarButtonUtils, { ToolbarButtonInfo } from '@joplin/lib/services/commands/ToolbarButtonUtils';
 import { _, _n } from '@joplin/lib/locale';
 import NoteTitleBar from './NoteTitle/NoteTitleBar';
@@ -57,7 +57,6 @@ import StatusBar from './StatusBar';
 import useVisiblePluginEditorViewIds from '@joplin/lib/hooks/plugins/useVisiblePluginEditorViewIds';
 import useConnectToEditorPlugin from './utils/useConnectToEditorPlugin';
 import getResourceBaseUrl from './utils/getResourceBaseUrl';
-import useInitialCursorLocation from './utils/useInitialCursorLocation';
 
 const debounce = require('debounce');
 
@@ -330,13 +329,13 @@ function NoteEditorContent(props: NoteEditorProps) {
 		});
 	}, [formNote, setFormNote, handleProvisionalFlag, props.dispatch]);
 
-	const { scrollWhenReadyRef, clearScrollWhenReady } = useScrollWhenReadyOptions({
+	const { scrollWhenReady, clearScrollWhenReady } = useScrollWhenReadyOptions({
 		noteId: formNote.id,
 		selectedNoteHash: props.selectedNoteHash,
 		lastEditorScrollPercents: props.lastEditorScrollPercents,
 		editorRef,
 	});
-	const onMessage = useMessageHandler(scrollWhenReadyRef, clearScrollWhenReady, windowId, editorRef, setLocalSearchResultCount, props.dispatch, formNote, htmlToMarkdown, markupToHtml);
+	const onMessage = useMessageHandler(scrollWhenReady, clearScrollWhenReady, windowId, editorRef, setLocalSearchResultCount, props.dispatch, formNote, htmlToMarkdown, markupToHtml);
 
 	useResourceUnwatcher({ noteId: formNote.id, windowId });
 
@@ -410,14 +409,6 @@ function NoteEditorContent(props: NoteEditorProps) {
 		});
 	}, [props.dispatch]);
 
-	const onCursorMotion = useCallback((location: EditorCursorLocations) => {
-		props.dispatch({
-			type: 'EDITOR_CURSOR_POSITION_SET',
-			noteId: formNoteRef.current.id,
-			location,
-		});
-	}, [props.dispatch]);
-
 	function renderNoNotes(rootStyle: React.CSSProperties) {
 		const emptyDivStyle = {
 			backgroundColor: 'black',
@@ -428,9 +419,6 @@ function NoteEditorContent(props: NoteEditorProps) {
 	}
 
 	const searchMarkers = useSearchMarkers(showLocalSearch, localSearchMarkerOptions, props.searches, props.selectedSearchId, props.highlightedWords);
-	const initialCursorLocation = useInitialCursorLocation({
-		lastEditorCursorLocations: props.lastEditorCursorLocations, noteId: props.noteId,
-	});
 
 	const markupLanguage = formNote.markup_language;
 	const editorProps: NoteBodyEditorPropsAndRef = {
@@ -444,7 +432,6 @@ function NoteEditorContent(props: NoteEditorProps) {
 		content: formNote.body,
 		contentMarkupLanguage: markupLanguage,
 		contentOriginalCss: formNote.originalCss,
-		initialCursorLocation,
 		resourceInfos: resourceInfos,
 		resourceDirectory: Setting.value('resourceDir'),
 		htmlToMarkdown: htmlToMarkdown,
@@ -455,7 +442,6 @@ function NoteEditorContent(props: NoteEditorProps) {
 		dispatch: props.dispatch,
 		noteToolbar: null,
 		onScroll: onScroll,
-		onCursorMotion,
 		setLocalSearchResultCount: setLocalSearchResultCount,
 		setLocalSearch: localSearch_change,
 		setShowLocalSearch,
@@ -743,7 +729,6 @@ const mapStateToProps = (state: AppState, ownProps: ConnectProps) => {
 		notesParentType: windowState.notesParentType,
 		selectedNoteTags: windowState.selectedNoteTags,
 		lastEditorScrollPercents: state.lastEditorScrollPercents,
-		lastEditorCursorLocations: state.lastEditorCursorLocations,
 		selectedNoteHash: windowState.selectedNoteHash,
 		searches: state.searches,
 		selectedSearchId: windowState.selectedSearchId,

packages/app-desktop/gui/NoteEditor/utils/resourceHandling.ts

@@ -15,7 +15,6 @@ const joplinRendererUtils = require('@joplin/renderer').utils;
 const { clipboard } = require('electron');
 import * as mimeUtils from '@joplin/lib/mime-utils';
 import bridge from '../../../services/bridge';
-import { getCollator, getCollatorLocale } from '@joplin/lib/models/utils/getCollator';
 const md5 = require('md5');
 const path = require('path');
 
@@ -44,30 +43,22 @@ export async function commandAttachFileToBody(body: string, filePaths: string[]
 		if (!filePaths || !filePaths.length) return null;
 	}
 
-	const collatorLocale = getCollatorLocale();
-	const collator = getCollator(collatorLocale);
-	filePaths = filePaths.sort((a, b) => {
-		return collator.compare(a, b);
-	});
-
-	let pos = options.position ?? 0;
-
 	for (let i = 0; i < filePaths.length; i++) {
 		const filePath = filePaths[i];
-		const beforeLen = body.length;
 		try {
 			logger.info(`Attaching ${filePath}`);
-			const newBody = await shim.attachFileToNoteBody(body, filePath, pos, {
+			const newBody = await shim.attachFileToNoteBody(body, filePath, options.position, {
 				createFileURL: options.createFileURL,
 				resizeLargeImages: Setting.value('imageResizing'),
 				markupLanguage: options.markupLanguage,
-				resourcePrefix: i > 0 ? ' ' : '',
+				resourceSuffix: i > 0 ? ' ' : '',
 			});
+
 			if (!newBody) {
 				logger.info('File attachment was cancelled');
 				return null;
 			}
-			pos += newBody.length - beforeLen;
+
 			body = newBody;
 			logger.info('File was attached.');
 		} catch (error) {
@@ -75,6 +66,7 @@ export async function commandAttachFileToBody(body: string, filePaths: string[]
 			bridge().showErrorMessageBox(error.message);
 		}
 	}
+
 	return body;
 }
 

packages/app-desktop/gui/NoteEditor/utils/types.ts

@@ -14,7 +14,6 @@ import { ScrollbarSize } from '@joplin/lib/models/settings/builtInMetadata';
 import { RefObject, SetStateAction } from 'react';
 import * as React from 'react';
 import { ResourceEntity, ResourceLocalStateEntity } from '@joplin/lib/services/database/types';
-import { EditorCursorLocations, NoteIdToEditorCursorLocations, NoteIdToScrollPercent } from '../../../app.reducer';
 
 export interface AllAssetsOptions {
 	contentMaxWidthTarget?: string;
@@ -41,8 +40,8 @@ export interface NoteEditorProps {
 	notesParentType: string;
 	// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
 	selectedNoteTags: any[];
-	lastEditorScrollPercents: NoteIdToScrollPercent;
-	lastEditorCursorLocations: NoteIdToEditorCursorLocations;
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
+	lastEditorScrollPercents: any;
 	selectedNoteHash: string;
 	// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
 	searches: any[];
@@ -84,14 +83,6 @@ export interface NoteBodyEditorRef {
 export { MarkupToHtmlOptions };
 export type MarkupToHtmlHandler = (markupLanguage: MarkupLanguage, markup: string, options: MarkupToHtmlOptions)=> Promise<RenderResult>;
 export type HtmlToMarkdownHandler = (markupLanguage: number, html: string, originalCss: string, parseOptions?: ParseOptions)=> Promise<string>;
-export type OnCursorMotion = (event: EditorCursorLocations)=> void;
-
-export interface MessageEvent {
-	channel: string;
-	// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Partially refactored old code before rule was applied
-	args?: any[];
-}
-export type OnMessage = (event: MessageEvent)=> void;
 
 export interface NoteBodyEditorProps {
 	// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
@@ -111,13 +102,12 @@ export interface NoteBodyEditorProps {
 	contentKey: string;
 	contentMarkupLanguage: number;
 	contentOriginalCss: string;
-	initialCursorLocation: EditorCursorLocations;
 	onChange(event: OnChangeEvent): void;
 	// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
 	onWillChange(event: any): void;
-	onMessage: OnMessage;
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
+	onMessage(event: any): void;
 	onScroll(event: { percent: number }): void;
-	onCursorMotion: OnCursorMotion;
 	markupToHtml: MarkupToHtmlHandler;
 	htmlToMarkdown: HtmlToMarkdownHandler;
 	allAssets: (markupLanguage: MarkupLanguage, options: AllAssetsOptions)=> Promise<RenderResultPluginAsset[]>;

packages/app-desktop/gui/NoteEditor/utils/useInitialCursorLocation.ts

@@ -1,17 +0,0 @@
-import { useMemo } from 'react';
-import { EditorCursorLocations, NoteIdToEditorCursorLocations } from '../../../app.reducer';
-
-interface Props {
-	lastEditorCursorLocations: NoteIdToEditorCursorLocations;
-	noteId: string;
-}
-
-const useInitialCursorLocation = ({ noteId, lastEditorCursorLocations }: Props) => {
-	const lastCursorLocation = lastEditorCursorLocations[noteId];
-
-	return useMemo((): EditorCursorLocations => {
-		return lastCursorLocation ?? { };
-	}, [lastCursorLocation]);
-};
-
-export default useInitialCursorLocation;

packages/app-desktop/gui/NoteEditor/utils/useMessageHandler.ts

@@ -1,5 +1,5 @@
-import { RefObject, useCallback } from 'react';
-import { FormNote, HtmlToMarkdownHandler, MarkupToHtmlHandler, ScrollOptions, MessageEvent } from './types';
+import { useCallback } from 'react';
+import { FormNote, HtmlToMarkdownHandler, MarkupToHtmlHandler, ScrollOptions } from './types';
 import contextMenu from './contextMenu';
 import CommandService from '@joplin/lib/services/CommandService';
 import PostMessageService from '@joplin/lib/services/PostMessageService';
@@ -8,7 +8,7 @@ import { reg } from '@joplin/lib/registry';
 import bridge from '../../../services/bridge';
 
 export default function useMessageHandler(
-	scrollWhenReadyRef: RefObject<ScrollOptions|null>,
+	scrollWhenReady: ScrollOptions|null,
 	clearScrollWhenReady: ()=> void,
 	windowId: string,
 	// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
@@ -21,7 +21,8 @@ export default function useMessageHandler(
 	htmlToMd: HtmlToMarkdownHandler,
 	mdToHtml: MarkupToHtmlHandler,
 ) {
-	return useCallback(async (event: MessageEvent) => {
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
+	return useCallback(async (event: any) => {
 		const msg = event.channel ? event.channel : '';
 		const args = event.args;
 		const arg0 = args && args.length >= 1 ? args[0] : null;
@@ -34,8 +35,8 @@ export default function useMessageHandler(
 			s.splice(0, 1);
 			reg.logger().error(s.join(':'));
 		} else if (msg === 'noteRenderComplete') {
-			if (scrollWhenReadyRef.current) {
-				const options = { ...scrollWhenReadyRef.current };
+			if (scrollWhenReady) {
+				const options = { ...scrollWhenReady };
 				clearScrollWhenReady();
 				editorRef.current.scrollTo(options);
 			}
@@ -77,5 +78,5 @@ export default function useMessageHandler(
 			// bridge().showErrorMessageBox(_('Unsupported link or message: %s', msg));
 		}
 		// eslint-disable-next-line @seiyab/react-hooks/exhaustive-deps -- Old code before rule was applied
-	}, [dispatch, setLocalSearchResultCount, scrollWhenReadyRef, formNote]);
+	}, [dispatch, setLocalSearchResultCount, scrollWhenReady, formNote]);
 }

packages/app-desktop/gui/NoteEditor/utils/useScrollWhenReadyOptions.ts

@@ -1,44 +1,41 @@
-import { RefObject, useCallback, useRef } from 'react';
+import { RefObject, useCallback, useEffect, useRef, useState } from 'react';
 import { NoteBodyEditorRef, ScrollOptions, ScrollOptionTypes } from './types';
 import usePrevious from '@joplin/lib/hooks/usePrevious';
-import type { NoteIdToScrollPercent } from '../../../app.reducer';
-import useNowEffect from '@joplin/lib/hooks/useNowEffect';
+import type { EditorScrollPercents } from '../../../app.reducer';
 
 interface Props {
 	noteId: string;
 	selectedNoteHash: string;
-	lastEditorScrollPercents: NoteIdToScrollPercent;
+	lastEditorScrollPercents: EditorScrollPercents;
 	editorRef: RefObject<NoteBodyEditorRef>;
 }
 
 const useScrollWhenReadyOptions = ({ noteId, selectedNoteHash, lastEditorScrollPercents, editorRef }: Props) => {
-	const scrollWhenReadyRef = useRef<ScrollOptions|null>(null);
+	const [scrollWhenReady, setScrollWhenReady] = useState<ScrollOptions|null>(null);
 
 	const previousNoteId = usePrevious(noteId);
-	const lastScrollPercentsRef = useRef<NoteIdToScrollPercent>(null);
+	const lastScrollPercentsRef = useRef<EditorScrollPercents>(null);
 	lastScrollPercentsRef.current = lastEditorScrollPercents;
 
-	// This needs to be a nowEffect to prevent race conditions
-	useNowEffect(() => {
-		if (noteId === previousNoteId) return () => {};
+	useEffect(() => {
+		if (noteId === previousNoteId) return;
 
 		if (editorRef.current) {
 			editorRef.current.resetScroll();
 		}
 
 		const lastScrollPercent = lastScrollPercentsRef.current[noteId] || 0;
-		scrollWhenReadyRef.current = {
+		setScrollWhenReady({
 			type: selectedNoteHash ? ScrollOptionTypes.Hash : ScrollOptionTypes.Percent,
 			value: selectedNoteHash ? selectedNoteHash : lastScrollPercent,
-		};
-		return () => {};
+		});
 	}, [noteId, previousNoteId, selectedNoteHash, editorRef]);
 
 	const clearScrollWhenReady = useCallback(() => {
-		scrollWhenReadyRef.current = null;
+		setScrollWhenReady(null);
 	}, []);
 
-	return { scrollWhenReadyRef, clearScrollWhenReady };
+	return { scrollWhenReady, clearScrollWhenReady };
 };
 
 export default useScrollWhenReadyOptions;

packages/app-desktop/gui/NotePropertiesDialog.tsx

@@ -501,12 +501,7 @@ class NotePropertiesDialog extends React.Component<Props, State> {
 				<div role='table' aria-labelledby='note-properties-dialog-title'>
 					{noteComps}
 				</div>
-				<DialogButtonRow
-					themeId={this.props.themeId}
-					okButtonShow={!this.isReadOnly()}
-					okButtonRef={this.okButton}
-					onClick={this.buttonRow_click}
-				/>
+				<DialogButtonRow themeId={this.props.themeId} okButtonShow={!this.isReadOnly()} okButtonRef={this.okButton} onClick={this.buttonRow_click}/>
 			</Dialog>
 		);
 	}

packages/app-desktop/gui/Root.tsx

@@ -71,7 +71,7 @@ async function initialize() {
 		panes: Setting.value('noteVisiblePanes'),
 	});
 
-	InteropService.instance().domParser = new DOMParser();
+	InteropService.instance().document = document;
 	InteropService.instance().xmlSerializer = new XMLSerializer();
 }
 

packages/app-desktop/gui/ShareFolderDialog/ShareFolderDialog.tsx

@@ -1,9 +1,9 @@
 import * as React from 'react';
 import Dialog from '../Dialog';
-import DialogButtonRow, { ClickEvent } from '../DialogButtonRow';
+import DialogButtonRow, { ClickEvent, ButtonSpec } from '../DialogButtonRow';
 import DialogTitle from '../DialogTitle';
 import { _ } from '@joplin/lib/locale';
-import { useCallback, useEffect, useMemo, useState } from 'react';
+import { useCallback, useEffect, useState } from 'react';
 import { FolderEntity } from '@joplin/lib/services/database/types';
 import Folder from '@joplin/lib/models/Folder';
 import ShareService, { ApiShare } from '@joplin/lib/services/share/ShareService';
@@ -129,6 +129,7 @@ function ShareFolderDialog(props: Props) {
 	const [share, setShare] = useState<StateShare>(null);
 	const [shareUsers, setShareUsers] = useState<StateShareUser[]>([]);
 	const [shareState, setShareState] = useState<ShareState>(ShareState.Idle);
+	const [customButtons, setCustomButtons] = useState<ButtonSpec[]>([]);
 	const [recipientsBeingUpdated, setRecipientsBeingUpdated] = useState<Record<string, boolean>>({});
 
 	async function synchronize(event: AsyncEffectEvent = null) {
@@ -162,6 +163,13 @@ function ShareFolderDialog(props: Props) {
 		void ShareService.instance().refreshShareUsers(share.id);
 	}, [share]);
 
+	useEffect(() => {
+		setCustomButtons(share ? [{
+			name: 'unshare',
+			label: _('Unshare'),
+		}] : []);
+	}, [share]);
+
 	useEffect(() => {
 		if (!share) return;
 		const sus = props.shareUsers[share.id];
@@ -169,6 +177,10 @@ function ShareFolderDialog(props: Props) {
 		setShareUsers(sus);
 	}, [share, props.shareUsers]);
 
+	useEffect(() => {
+		void ShareService.instance().refreshShares();
+	}, [props.folderId]);
+
 	const permissionsFromString = (p: string): SharePermissions => {
 		return {
 			can_read: 1,
@@ -257,7 +269,7 @@ function ShareFolderDialog(props: Props) {
 	}, []);
 
 	function renderAddRecipient() {
-		const disabled = shareState !== ShareState.Idle && shareState !== ShareState.Synchronizing;
+		const disabled = shareState !== ShareState.Idle;
 
 		const dropdown = !props.canUseSharePermissions ? null : <Dropdown className="permission-dropdown" options={permissionOptions} value={recipientPermissions} onChange={recipientPermissions_change}/>;
 
@@ -383,17 +395,6 @@ function ShareFolderDialog(props: Props) {
 		props.onClose();
 	}
 
-	const customButtons = useMemo(() => {
-		return share ? [{
-			name: 'unshare',
-			label: _('Unshare'),
-			// Don't allow unsharing the folder during the "create" action. Doing so might
-			// be able to cause issues similar to #13518 (e.g. if the "unshare" action completes while
-			// the "share" action is still in progress).
-			disabled: shareState === ShareState.Creating || shareState === ShareState.Synchronizing,
-		}] : [];
-	}, [share, shareState]);
-
 	function renderContent() {
 		return (
 			<StyledRoot className="share-folder-dialog">

packages/app-desktop/gui/Sidebar/Sidebar.tsx

@@ -25,13 +25,14 @@ interface Props {
 const SidebarComponent = (props: Props) => {
 	const renderSynchronizeButton = (type: string) => {
 		const label = type === 'sync' ? _('Synchronise') : _('Cancel');
+		const iconAnimation = type !== 'sync' ? 'icon-infinite-rotation 1s linear infinite' : '';
 
 		return (
 			<StyledSynchronizeButton
 				level={ButtonLevel.SidebarSecondary}
-				className={`sidebar-sync-button ${type === 'sync' ? '' : '-syncing'}`}
 				iconName="icon-sync"
 				key="sync_button"
+				iconAnimation={iconAnimation}
 				title={label}
 				onClick={() => {
 					void CommandService.instance().execute('synchronize', type !== 'sync');

packages/app-desktop/gui/Sidebar/hooks/useOnRenderItem.tsx

@@ -356,7 +356,6 @@ const useOnRenderItem = (props: Props) => {
 				onClick={tagItem_click}
 				onTagDrop={onTagDrop_}
 				onContextMenu={onItemContextMenu}
-				label={item.label}
 				tag={tag}
 				itemCount={itemCount}
 				index={index}
@@ -385,7 +384,7 @@ const useOnRenderItem = (props: Props) => {
 				anchorRef={anchorRef}
 				selected={selected}
 				folderId={folder.id}
-				folderTitle={item.label}
+				folderTitle={Folder.displayTitle(folder)}
 				folderIcon={Folder.unserializeIcon(folder.icon)}
 				depth={item.depth}
 				isExpanded={isExpanded}

packages/app-desktop/gui/Sidebar/hooks/useOnSidebarKeyDownHandler.ts

@@ -49,24 +49,6 @@ const getParentOffset = (childIndex: number, listItems: ListItem[]): number|null
 	return null;
 };
 
-const findNextTypeAheadMatch = (selectedIndex: number, query: string, listItems: ListItem[]) => {
-	const matches = (item: ListItem) => {
-		return item.label.startsWith(query);
-	};
-	const indexBefore = listItems.slice(0, selectedIndex).findIndex(matches);
-	// Search in all results **after** the current. This prevents the current item from
-	// always being identified as the next match, if the user repeatedly presses the
-	// same key.
-	const startAfter = selectedIndex + 1;
-	let indexAfter = listItems.slice(startAfter).findIndex(matches);
-	if (indexAfter !== -1) {
-		indexAfter += startAfter;
-	}
-	// Prefer jumping to the next match, rather than the previous
-	const matchingIndex = indexAfter !== -1 ? indexAfter : indexBefore;
-	return matchingIndex;
-};
-
 const useOnSidebarKeyDownHandler = (props: Props) => {
 	const { updateSelectedIndex, listItems, selectedIndex, collapsedFolderIds, dispatch } = props;
 
@@ -74,8 +56,6 @@ const useOnSidebarKeyDownHandler = (props: Props) => {
 		const selectedItem = listItems[selectedIndex];
 		let indexChange = 0;
 
-		const ctrlAltOrMeta = event.ctrlKey || event.altKey || event.metaKey;
-
 		if (selectedItem && isToggleShortcut(event.code, selectedItem, collapsedFolderIds)) {
 			event.preventDefault();
 
@@ -102,22 +82,9 @@ const useOnSidebarKeyDownHandler = (props: Props) => {
 			indexChange = 1;
 		} else if ((event.ctrlKey || event.metaKey) && event.code === 'KeyA') { // ctrl+a or cmd+a
 			event.preventDefault();
-		} else if (event.code === 'Home') {
-			event.preventDefault();
-			updateSelectedIndex(0);
-			indexChange = 0;
-		} else if (event.code === 'End') {
-			event.preventDefault();
-			updateSelectedIndex(listItems.length - 1);
-			indexChange = 0;
 		} else if (event.code === 'Enter' && !event.shiftKey) {
 			event.preventDefault();
 			void CommandService.instance().execute('focusElement', 'noteList');
-		} else if (selectedIndex && selectedIndex >= 0 && event.key.length === 1 && !ctrlAltOrMeta) {
-			const nextMatch = findNextTypeAheadMatch(selectedIndex, event.key, listItems);
-			if (nextMatch !== -1) {
-				indexChange = nextMatch - selectedIndex;
-			}
 		}
 
 		if (indexChange !== 0) {

packages/app-desktop/gui/Sidebar/hooks/useSidebarListData.ts

@@ -4,8 +4,6 @@ import { FolderEntity, TagsWithNoteCountEntity } from '@joplin/lib/services/data
 import { buildFolderTree, renderFolders, renderTags } from '@joplin/lib/components/shared/side-menu-shared';
 import { _ } from '@joplin/lib/locale';
 import toggleHeader from './utils/toggleHeader';
-import Folder from '@joplin/lib/models/Folder';
-import Tag from '@joplin/lib/models/Tag';
 
 interface Props {
 	tags: TagsWithNoteCountEntity[];
@@ -20,7 +18,6 @@ const useSidebarListData = (props: Props): ListItem[] => {
 		return renderTags<ListItem>(props.tags, (tag): TagListItem => {
 			return {
 				kind: ListItemType.Tag,
-				label: Tag.displayTitle(tag),
 				tag,
 				key: tag.id,
 				depth: 1,
@@ -41,7 +38,6 @@ const useSidebarListData = (props: Props): ListItem[] => {
 		return renderFolders<ListItem>(renderProps, (folder, hasChildren, depth): FolderListItem => {
 			return {
 				kind: ListItemType.Folder,
-				label: Folder.displayTitle(folder),
 				folder,
 				hasChildren,
 				// The toplevel headers have depth 1, so the toplevel notebook needs
@@ -69,9 +65,9 @@ const useSidebarListData = (props: Props): ListItem[] => {
 			hasChildren: folderItems.items.length > 0,
 		};
 		const foldersSectionContent: ListItem[] = props.folderHeaderIsExpanded ? [
-			{ kind: ListItemType.AllNotes, label: _('All notes'), key: 'all-notes', depth: 2, hasChildren: false },
+			{ kind: ListItemType.AllNotes, key: 'all-notes', depth: 2, hasChildren: false },
 			...folderItems.items,
-			{ kind: ListItemType.Spacer, label: '', key: 'after-folders-spacer', depth: 1, hasChildren: false },
+			{ kind: ListItemType.Spacer, key: 'after-folders-spacer', depth: 1, hasChildren: false },
 		] : [];
 
 		const tagsHeader: HeaderListItem = {

packages/app-desktop/gui/Sidebar/listItemComponents/AllNotesItem.tsx

@@ -7,6 +7,7 @@ import Setting from '@joplin/lib/models/Setting';
 import MenuUtils from '@joplin/lib/services/commands/MenuUtils';
 import CommandService from '@joplin/lib/services/CommandService';
 import PerFolderSortOrderService from '../../../services/sortOrder/PerFolderSortOrderService';
+import { _ } from '@joplin/lib/locale';
 import { connect } from 'react-redux';
 import EmptyExpandLink from './EmptyExpandLink';
 import ListItemWrapper, { ListItemRef } from './ListItemWrapper';
@@ -69,7 +70,7 @@ const AllNotesItem: React.FC<Props> = props => {
 				onClick={onAllNotesClick_}
 				onContextMenu={toggleAllNotesContextMenu}
 			>
-				{props.item.label}
+				{_('All notes')}
 			</StyledListItemAnchor>
 		</ListItemWrapper>
 	);

packages/app-desktop/gui/Sidebar/listItemComponents/HeaderItem.tsx

@@ -58,9 +58,7 @@ const HeaderItem: React.FC<Props> = props => {
 			{...item.extraProps}
 			onDrop={props.onDrop}
 		>
-			<StyledHeader
-				onClick={onClick}
-			>
+			<StyledHeader onClick={onClick}>
 				<StyledHeaderIcon aria-hidden='true' role='img' className={item.iconName}/>
 				<StyledHeaderLabel>{item.label}</StyledHeaderLabel>
 			</StyledHeader>

packages/app-desktop/gui/Sidebar/listItemComponents/TagItem.tsx

@@ -5,6 +5,7 @@ import { StyledListItemAnchor, StyledSpanFix } from '../styles';
 import { TagsWithNoteCountEntity } from '@joplin/lib/services/database/types';
 import BaseModel from '@joplin/lib/BaseModel';
 import NoteCount from './NoteCount';
+import Tag from '@joplin/lib/models/Tag';
 import EmptyExpandLink from './EmptyExpandLink';
 import ListItemWrapper, { ListItemRef } from './ListItemWrapper';
 
@@ -14,7 +15,6 @@ interface Props {
 	anchorRef: ListItemRef;
 	selected: boolean;
 	tag: TagsWithNoteCountEntity;
-	label: string;
 	onTagDrop: React.DragEventHandler<HTMLElement>;
 	onContextMenu: React.MouseEventHandler<HTMLElement>;
 	onClick: (event: TagLinkClickEvent)=> void;
@@ -58,7 +58,7 @@ const TagItem = (props: Props) => {
 				onContextMenu={props.onContextMenu}
 				onClick={onClickHandler}
 			>
-				<StyledSpanFix className="tag-label">{props.label}</StyledSpanFix>
+				<StyledSpanFix className="tag-label">{Tag.displayTitle(tag)}</StyledSpanFix>
 				{noteCount}
 			</StyledListItemAnchor>
 		</ListItemWrapper>

packages/app-desktop/gui/Sidebar/style.scss

@@ -5,5 +5,4 @@
 @use 'styles/sidebar-expand-link.scss';
 @use 'styles/sidebar-header-container.scss';
 @use 'styles/sidebar-spacer-item.scss';
-@use 'styles/sidebar-header-button.scss';
-@use 'styles/sidebar-sync-button.scss';
+@use 'styles/sidebar-header-button.scss';

packages/app-desktop/gui/Sidebar/styles/index.ts

@@ -28,11 +28,6 @@ export const StyledHeader = styled.div`
 	user-select: none;
 	text-transform: uppercase;
 	//cursor: pointer;
-	cursor: default;
-	transition: background 0.2s;
-	&:hover {
-		background: ${(props: StyleProps) => props.theme.backgroundColorHover2};
-	}
 `;
 
 export const StyledHeaderIcon = styled.i`

packages/app-desktop/gui/Sidebar/styles/sidebar-sync-button.scss

@@ -1,16 +0,0 @@
-
-@keyframes icon-infinite-rotation {
-	to {
-		transform: rotate(360deg);
-	}
-}
-
-.sidebar-sync-button {
-	&.-syncing > .icon {
-		animation: icon-infinite-rotation 1s linear infinite;
-
-		@media (prefers-reduced-motion: reduce) {
-			animation: none;
-		}
-	}
-}

packages/app-desktop/gui/Sidebar/types.ts

@@ -16,8 +16,6 @@ export enum ListItemType {
 
 interface BaseListItem {
 	key: string;
-	// Used for typeahead
-	label: string;
 	depth: number;
 	hasChildren: boolean;
 }
@@ -28,6 +26,7 @@ interface ToplevelListItem extends BaseListItem {
 
 export interface HeaderListItem extends ToplevelListItem {
 	kind: ListItemType.Header;
+	label: string;
 	expanded: boolean;
 	iconName: string;
 	id: HeaderId;

packages/app-desktop/gui/utils/NoteListUtils.test.ts

@@ -38,7 +38,7 @@ describe('NoteListUtils', () => {
 		const mockStore = {
 			getState: () => {
 				return {
-					...createAppDefaultWindowState(null),
+					...createAppDefaultWindowState(),
 					settings: {},
 				};
 			},

packages/app-desktop/gui/utils/NoteListUtils.ts

@@ -143,7 +143,7 @@ export default class NoteListUtils {
 
 			menu.append(new MenuItem({ type: 'separator' }));
 
-			if ([9, 10, 11].includes(Setting.value('sync.target'))) {
+			if ([9, 10].includes(Setting.value('sync.target'))) {
 				menu.append(
 					new MenuItem(
 						// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied

packages/app-desktop/index.html

@@ -2,19 +2,11 @@
 <html>
 	<head>
 		<meta charset="UTF-8">
-		<meta
-			http-equiv="Content-Security-Policy"
-			content="
-				default-src 'self' joplin-content://* ;
-				connect-src 'self' * http://* https://* joplin-content://* blob: ;
-				style-src 'unsafe-inline' 'self' blob: joplin-content://* https://* http://* ;
-				child-src 'self' joplin-content://* ;
-				script-src 'self' 'unsafe-inline' joplin-content://* ;
-				media-src 'self' * blob: data: https://* http://* joplin-content://* ;
-				img-src 'self' blob: data: http://* https://* joplin-content://* ;
-				font-src 'self' http://* https://* blob: data: joplin-content://* ;
-			"
-		/>
+		<!--
+		No CPS because we need to allow everything due to some dependencies (eg. depd, which comes from maybe Node or Electron
+		uses 'eval'.
+		<meta http-equiv="Content-Security-Policy" content="default-src 'self' 'unsafe-inline' 'unsafe-eval'">
+		-->
 		<title>Joplin</title>
 		<!-- Note: Add new dynamic CSS imports to style.scss to allow them to be included in secondary windows. -->
 		<link rel="stylesheet" href="style.min.css">

packages/app-desktop/integration-tests/main.spec.ts

@@ -8,7 +8,6 @@ import getMainWindow from './util/getMainWindow';
 import setFilePickerResponse from './util/setFilePickerResponse';
 import setMessageBoxResponse from './util/setMessageBoxResponse';
 import getImageSourceSize from './util/getImageSourceSize';
-import setSettingValue from './util/setSettingValue';
 
 
 test.describe('main', () => {
@@ -20,13 +19,6 @@ test.describe('main', () => {
 		await mainPage.waitFor();
 	});
 
-	test('app should support French localization', async ({ mainWindow, electronApp }) => {
-		await setSettingValue(electronApp, mainWindow, 'locale', 'fr_FR');
-		// The "Notebooks" header should be localized
-		const localizedText = mainWindow.getByText('Carnets').first();
-		await expect(localizedText).toBeAttached();
-	});
-
 	test('should be able to create and edit a new note', async ({ mainWindow }) => {
 		const mainScreen = await new MainScreen(mainWindow).setup();
 		const editor = await mainScreen.createNewNote('Test note');

packages/app-desktop/integration-tests/markdownEditor.spec.ts

@@ -180,8 +180,8 @@ test.describe('markdownEditor', () => {
 		await expect(matches).toHaveCount(1);
 
 		// Should continue searching after switching to view-only mode
-		await noteEditor.toggleEditorLayout();
-		await noteEditor.toggleEditorLayout();
+		await noteEditor.toggleEditorLayoutButton.click();
+		await noteEditor.toggleEditorLayoutButton.click();
 		await expect(noteEditor.codeMirrorEditor).not.toBeVisible();
 		await expect(noteEditor.editorSearchInput).not.toBeVisible();
 		await expect(noteEditor.viewerSearchInput).toBeVisible();
@@ -194,7 +194,7 @@ test.describe('markdownEditor', () => {
 		await expect(matches).toHaveCount(0);
 
 		// After showing the viewer again, search should still be hidden
-		await noteEditor.toggleEditorLayout();
+		await noteEditor.toggleEditorLayoutButton.click();
 		await expect(noteEditor.codeMirrorEditor).toBeVisible();
 		await expect(noteEditor.editorSearchInput).not.toBeVisible();
 	});
@@ -274,57 +274,5 @@ test.describe('markdownEditor', () => {
 		expect(imageSize[0]).toBeGreaterThan(0);
 		expect(imageSize[1]).toBeGreaterThan(0);
 	});
-
-	test('ctrl-clicking on note links should open the linked note (when the viewer is hidden)', async ({ mainWindow }) => {
-		const mainScreen = await new MainScreen(mainWindow).setup();
-		await mainScreen.createNewNote('Original');
-		const noteEditor = mainScreen.noteEditor;
-		await noteEditor.hideViewer();
-
-		await noteEditor.focusCodeMirrorEditor();
-		await mainWindow.keyboard.type('# Test');
-		await mainWindow.keyboard.press('Enter');
-		await mainWindow.keyboard.type('## Test 2');
-		await mainWindow.keyboard.press('Enter');
-		await mainWindow.keyboard.type('### Test 3');
-
-		const editorContent = await noteEditor.contentLocator();
-
-		// Extract the note ID
-		const note1Locator = mainScreen.noteList.getNoteItemByTitle('Original');
-		await note1Locator.dragTo(editorContent);
-		const linkExpression = /\[[^\]]*\]\(:\/([a-z0-9]{32})\)/;
-		await noteEditor.expectToHaveText(linkExpression);
-		const targetNoteId = (await editorContent.textContent()).match(linkExpression)[1];
-
-		await mainScreen.createNewNote('Test note links');
-
-		// Create a new link to a header
-		await noteEditor.focusCodeMirrorEditor();
-		await mainWindow.keyboard.press('Enter');
-		await mainWindow.keyboard.press('Enter');
-		await mainWindow.keyboard.type('[link](:/');
-		await mainWindow.keyboard.type(targetNoteId);
-		await mainWindow.keyboard.type('#test-2');
-		await mainWindow.keyboard.type(')');
-		await mainWindow.keyboard.press('Enter');
-
-		// Clicking the link should navigate to note1
-		const link = editorContent.getByText(/\[?link\]?/);
-		await link.click({ modifiers: ['ControlOrMeta'] });
-		await expect(noteEditor.noteTitleInput).toHaveValue('Original');
-		await noteEditor.expectToHaveText(/^# Test/);
-		await expect.poll(() => editorContent.evaluate(async editor => {
-			const selection = getSelection();
-			return editor.contains(selection.anchorNode);
-		})).toBe(true);
-
-		// The cursor should be positioned on the linked-to header
-		await expect.poll(async () => {
-			await mainWindow.keyboard.type('[[cursor]]');
-			await noteEditor.expectToHaveText(/## Test 2\[\[cursor\]\]/);
-			return true;
-		}).toBe(true);
-	});
 });
 

packages/app-desktop/integration-tests/models/NoteEditorScreen.ts

@@ -65,20 +65,12 @@ export default class NoteEditorPage {
 		}
 	}
 
-	public async expectToHaveText(expected: string|RegExp) {
+	public async expectToHaveText(content: string) {
 		// expect(...).toHaveText can fail in the Rich Text Editor (perhaps due to frame locators).
 		// Using expect.poll refreshes the locator on each attempt, which seems to prevent flakiness.
-		const expectResult = expect.poll(
-			// Use .innerText: textContent doesn't handle line breaks correctly in the CodeMirror
-			// editor.
-			async () => (await this.contentLocator()).innerText(),
-		);
-		// Allow `expected` to be either an exact match (a string) or a pattern
-		if (typeof expected === 'string') {
-			await expectResult.toBe(expected);
-		} else {
-			await expectResult.toMatch(expected);
-		}
+		await expect.poll(
+			async () => (await this.contentLocator()).textContent(),
+		).toBe(content);
 	}
 
 	public getNoteViewerFrameLocator() {
@@ -125,14 +117,4 @@ export default class NoteEditorPage {
 		await expect(backButton).not.toBeDisabled();
 		await backButton.click();
 	}
-
-	public async toggleEditorLayout() {
-		await this.toggleEditorLayoutButton.click();
-	}
-
-	public async hideViewer() {
-		await expect(this.noteViewerContainer).toBeVisible();
-		await this.toggleEditorLayout();
-		await expect(this.noteViewerContainer).not.toBeVisible();
-	}
 }

packages/app-desktop/integration-tests/pluginApi.spec.ts

@@ -30,7 +30,7 @@ test.describe('pluginApi', () => {
 		await mainScreen.createNewNote('First note');
 
 		const editor = mainScreen.noteEditor;
-		await editor.expectToHaveText('\n');
+		await editor.expectToHaveText('');
 
 		await mainScreen.goToAnything.runCommand(app, 'showTestDialog');
 		// Wait for the iframe to load

packages/app-desktop/integration-tests/sidebar.spec.ts

@@ -44,28 +44,6 @@ test.describe('sidebar', () => {
 		await expect(mainWindow.locator(':focus')).toHaveText('All notes');
 	});
 
-	test('should allow changing the focused folder by pressing the first character of the title', async ({ electronApp, mainWindow }) => {
-		const mainScreen = await new MainScreen(mainWindow).setup();
-		const sidebar = mainScreen.sidebar;
-
-		const folderAHeader = await sidebar.createNewFolder('1-Test A');
-		await expect(folderAHeader).toBeVisible();
-
-		const folderBHeader = await sidebar.createNewFolder('Folder b');
-		await expect(folderBHeader).toBeVisible();
-		await folderBHeader.click();
-
-		await sidebar.forceUpdateSorting(electronApp);
-
-		await folderBHeader.click();
-		await mainWindow.keyboard.type('1');
-		await expect(mainWindow.locator(':focus')).toHaveText('1-Test A');
-		await mainWindow.keyboard.type('F');
-		await expect(mainWindow.locator(':focus')).toHaveText('Folder b');
-		await mainWindow.keyboard.type('A');
-		await expect(mainWindow.locator(':focus')).toHaveText('All notes');
-	});
-
 	test('left/right arrow keys should expand/collapse notebooks', async ({ electronApp, mainWindow }) => {
 		const mainScreen = await new MainScreen(mainWindow).setup();
 		const sidebar = mainScreen.sidebar;

packages/app-desktop/main.scss

@@ -97,6 +97,12 @@ a {
 	border-radius: 5px;
 }
 
+@keyframes icon-infinite-rotation{
+	to {
+		transform: rotate(360deg);
+	}
+}
+
 .rdtPicker {
 	min-width: 250px;
 	width: auto !important;

packages/app-desktop/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@joplin/app-desktop",
-  "version": "3.5.6",
+  "version": "3.4.11",
   "description": "Joplin for Desktop",
   "main": "main.bundle.js",
   "private": true,
@@ -16,7 +16,6 @@
     "test": "jest",
     "test-ui": "gulp before-start && playwright test",
     "test-ci": "yarn test",
-    "resolve-sourcemap": "node tools/resolveSourceMap.js",
     "modifyReleaseAssets": "node tools/modifyReleaseAssets.js"
   },
   "repository": {
@@ -47,7 +46,6 @@
     "asar": true,
     "asarUnpack": "./node_modules/node-notifier/vendor/**",
     "win": {
-      "sign": "./sign.js",
       "rfc3161TimeStampServer": "http://timestamp.digicert.com",
       "icon": "../../Assets/ImageSources/Joplin.ico",
       "target": [
@@ -138,22 +136,23 @@
     "@electron/rebuild": "3.7.2",
     "@fortawesome/fontawesome-free": "5.15.4",
     "@joeattardi/emoji-button": "4.6.4",
-    "@joplin/default-plugins": "~3.5",
-    "@joplin/editor": "~3.5",
-    "@joplin/lib": "~3.5",
-    "@joplin/renderer": "~3.5",
-    "@joplin/tools": "~3.5",
-    "@joplin/utils": "~3.5",
-    "@playwright/test": "1.53.2",
+    "@joplin/default-plugins": "~3.4",
+    "@joplin/editor": "~3.4",
+    "@joplin/lib": "~3.4",
+    "@joplin/renderer": "~3.4",
+    "@joplin/tools": "~3.4",
+    "@joplin/utils": "~3.4",
+    "@playwright/test": "1.52.0",
     "@sentry/electron": "4.24.0",
     "@testing-library/react-hooks": "8.0.1",
     "@types/jest": "29.5.14",
     "@types/mustache": "4.2.6",
-    "@types/node": "18.19.130",
+    "@types/node": "18.19.112",
     "@types/react": "18.3.23",
     "@types/react-dom": "18.3.7",
     "@types/react-redux": "7.1.33",
     "@types/styled-components": "5.1.32",
+    "@types/tesseract.js": "2.0.0",
     "async-mutex": "0.5.0",
     "axios": "^1.7.7",
     "codemirror": "5.65.9",
@@ -161,7 +160,7 @@
     "compare-versions": "6.1.1",
     "countable": "3.0.1",
     "debounce": "1.2.1",
-    "electron": "37.7.0",
+    "electron": "37.4.0",
     "electron-builder": "24.13.3",
     "electron-updater": "6.6.2",
     "electron-window-state": "5.0.3",
@@ -188,7 +187,7 @@
     "react": "18.3.1",
     "react-dom": "18.3.1",
     "react-redux": "8.1.3",
-    "react-select": "5.10.2",
+    "react-select": "5.10.1",
     "react-test-renderer": "18.3.1",
     "react-toggle-button": "2.2.0",
     "react-tooltip": "4.5.1",
@@ -200,15 +199,15 @@
     "styled-components": "5.3.11",
     "styled-system": "5.1.5",
     "taboverride": "4.0.3",
-    "tesseract.js": "6.0.1",
+    "tesseract.js": "5.1.1",
     "tinymce": "6.8.5",
-    "ts-jest": "29.3.4",
+    "ts-jest": "29.3.1",
     "ts-node": "10.9.2",
-    "typescript": "5.8.3"
+    "typescript": "5.8.2"
   },
   "dependencies": {
     "@electron/remote": "2.1.2",
-    "@joplin/onenote-converter": "~3.5",
+    "@joplin/onenote-converter": "~3.4",
     "fs-extra": "11.2.0",
     "keytar": "7.9.0",
     "node-fetch": "2.6.7",

packages/app-desktop/sign.js

@@ -1,109 +0,0 @@
-/* eslint-disable no-console */
-
-const { execSync } = require('child_process');
-const { chdir, cwd } = require('process');
-const { mkdirpSync, moveSync, pathExists } = require('fs-extra');
-const { readdirSync, writeFileSync } = require('fs');
-const { dirname } = require('path');
-
-const signToolName = 'CodeSignTool.bat';
-
-const getTempDir = () => {
-	if (process.env.RUNNER_TEMP) return process.env.RUNNER_TEMP;
-	if (process.env.GITHUB_WORKSPACE) return process.env.GITHUB_WORKSPACE;
-
-	const output = `${dirname(dirname(__dirname))}/temp`;
-	mkdirpSync(output);
-	return output;
-};
-
-const tempDir = getTempDir();
-
-const downloadSignTool = async () => {
-	const signToolUrl = 'https://www.ssl.com/download/codesigntool-for-windows/';
-	const downloadDir = `${tempDir}/signToolDownloadTemp`;
-	const extractDir = `${tempDir}/signToolExtractTemp`;
-
-	if (await pathExists(`${extractDir}/${signToolName}`)) {
-		console.info('sign.js: Sign tool has already been downloaded - skipping');
-		return extractDir;
-	}
-
-	mkdirpSync(downloadDir);
-	mkdirpSync(extractDir);
-
-	const response = await fetch(signToolUrl);
-	if (!response.ok) throw new Error(`sign.js: HTTP error ${response.status}: ${response.statusText}`);
-
-	const zipPath = `${downloadDir}/codeSignTool.zip`;
-
-	const buffer = Buffer.from(await response.arrayBuffer());
-	writeFileSync(zipPath, buffer);
-
-	console.info('sign.js: Downloaded sign tool zip:', readdirSync(downloadDir));
-
-	mkdirpSync(extractDir);
-
-	execSync(
-		`powershell -Command "Expand-Archive -Path '${zipPath}' -DestinationPath '${extractDir}' -Force"`,
-		{ stdio: 'inherit' },
-	);
-
-	console.info('sign.js: Extracted sign tool zip:', readdirSync(extractDir));
-
-	return extractDir;
-};
-
-exports.default = async (configuration) => {
-	const inputFilePath = configuration.path;
-
-	const {
-		SSL_ESIGNER_USER_NAME,
-		SSL_ESIGNER_USER_PASSWORD,
-		SSL_ESIGNER_CREDENTIAL_ID,
-		SSL_ESIGNER_USER_TOTP,
-		SIGN_APPLICATION,
-	} = process.env;
-
-	console.info('sign.js: File to sign:', inputFilePath);
-
-	console.info('sign.js: Using temp dir:', tempDir);
-
-	if (SIGN_APPLICATION !== '1') {
-		console.info('sign.js: SIGN_APPLICATION != 1 - not signing application');
-		return;
-	}
-
-	console.info('sign.js: SIGN_APPLICATION = 1 - signing application');
-
-	const signToolDir = await downloadSignTool();
-	const signToolOutDir = `${tempDir}/signedToolOutDir`;
-	mkdirpSync(signToolOutDir);
-
-	const previousDir = cwd();
-	chdir(signToolDir);
-
-	try {
-		const cmd = [
-			`${signToolName} sign`,
-			`-input_file_path="${inputFilePath}"`,
-			`-output_dir_path="${signToolOutDir}"`,
-			`-credential_id="${SSL_ESIGNER_CREDENTIAL_ID}"`,
-			`-username="${SSL_ESIGNER_USER_NAME}"`,
-			`-password="${SSL_ESIGNER_USER_PASSWORD}"`,
-			`-totp_secret="${SSL_ESIGNER_USER_TOTP}"`,
-		];
-
-		execSync(cmd.join(' '));
-
-		const createdFiles = readdirSync(signToolOutDir);
-		console.info('sign.js: Created files:', createdFiles);
-
-		moveSync(`${signToolOutDir}/${createdFiles[0]}`, inputFilePath, { overwrite: true });
-	} catch (error) {
-		console.error('sign.js: Could not sign file:', error);
-		process.exit(1);
-	} finally {
-		chdir(previousDir);
-	}
-};

packages/app-desktop/tools/bundleJs.ts

@@ -9,7 +9,7 @@ const baseNodeModules = join(baseDir, 'node_modules');
 
 // Note: Roughly based on js-draw's use of esbuild:
 // https://github.com/personalizedrefrigerator/js-draw/blob/6fe6d6821402a08a8d17f15a8f48d95e5d7b084f/packages/build-tool/src/BundledFile.ts#L64
-const makeBuildContext = (entryPoint: string, renderer: boolean, addDebugStats: boolean) => {
+const makeBuildContext = (entryPoint: string, renderer: boolean, computeFileSizeStats: boolean) => {
 	return esbuild.context({
 		entryPoints: [entryPoint],
 		outfile: `${filename(entryPoint)}.bundle.js`,
@@ -19,7 +19,7 @@ const makeBuildContext = (entryPoint: string, renderer: boolean, addDebugStats:
 		format: 'iife', // Immediately invoked function expression
 		sourcemap: true,
 		sourcesContent: false, // Do not embed full source file content in the .map file
-		metafile: addDebugStats,
+		metafile: computeFileSizeStats,
 		platform: 'node',
 		target: ['node20.0'],
 		mainFields: renderer ? ['browser', 'main'] : ['main'],
@@ -92,29 +92,26 @@ const makeBuildContext = (entryPoint: string, renderer: boolean, addDebugStats:
 			{
 				name: 'joplin--smaller-source-map-size',
 				setup: build => {
-					// Unless bundling with additional debug information, exclude 3rd-party
-					// dependencies from source maps. This significantly reduces the size of the
+					// Exclude dependencies from node_modules. This significantly reduces the size of the
 					// source map, improving startup performance.
 					//
 					// See https://github.com/evanw/esbuild/issues/1685#issuecomment-944916409
 					// and https://github.com/evanw/esbuild/issues/4130
-					if (!addDebugStats) {
-						const emptyMapData = Buffer.from(
-							JSON.stringify({ version: 3, sources: [null], mappings: 'AAAA' }),
-							'utf-8',
-						).toString('base64');
-						const emptyMapUrl = `data:application/json;base64,${emptyMapData}`;
+					const emptyMapData = Buffer.from(
+						JSON.stringify({ version: 3, sources: [null], mappings: 'AAAA' }),
+						'utf-8',
+					).toString('base64');
+					const emptyMapUrl = `data:application/json;base64,${emptyMapData}`;
 
-						build.onLoad({ filter: /node_modules.*js$/ }, args => {
-							return {
-								contents: [
-									readFileSync(args.path, 'utf8'),
-									`//# sourceMappingURL=${emptyMapUrl}`,
-								].join('\n'),
-								loader: 'default',
-							};
-						});
-					}
+					build.onLoad({ filter: /node_modules.*js$/ }, args => {
+						return {
+							contents: [
+								readFileSync(args.path, 'utf8'),
+								`//# sourceMappingURL=${emptyMapUrl}`,
+							].join('\n'),
+							loader: 'default',
+						};
+					});
 				},
 			},
 		],

packages/app-desktop/tools/resolveSourceMap.ts

@@ -1,55 +0,0 @@
-import { dirname, relative } from 'path';
-import * as yargs from 'yargs';
-const { wrapCallSite } = require('source-map-support');
-
-/* eslint-disable no-console */
-
-const resolveLine = (lineNumber: number, columnNumber: number, filePath: string) => {
-	// Note: This is an undocumented function provided by source-map-support. It
-	// may change in the future:
-	const frame = wrapCallSite({
-		getFileName: () => filePath,
-		isEval: ()=>false,
-		isNative: ()=>false,
-		getLineNumber: ()=>lineNumber,
-		getColumnNumber: ()=>columnNumber,
-	});
-
-	const baseDir = dirname(dirname(dirname(__dirname)));
-	const relativeFilePath = relative(baseDir, frame.getFileName());
-	return `${relativeFilePath}:${frame.getLineNumber()}`;
-};
-
-const resolvePosition = (position: string, sourceMap: string) => {
-	const match = /^(\d{1,10}):(\d{1,10})$/.exec(position.trim());
-	if (!match) {
-		throw new Error('Invalid format. Expected line:col');
-	}
-
-	const lineNumber = Number(match[1]);
-	const columnNumber = Number(match[2]);
-	return resolveLine(lineNumber, columnNumber, sourceMap);
-};
-
-void yargs
-	.usage('$0 [args]')
-	.command(
-		'$0 <position>',
-		'Resolves a position based on a source map. If resolving a position in a specific error message, be sure to use the source map generated by "yarn bundle" from that specific commit.',
-		(yargs) => {
-			return yargs.options({
-				'position': { type: 'string', help: 'A line:col position (e.g. 123:4567)' },
-				'sourcemap': {
-					type: 'string',
-					default: './main-html.bundle.js',
-					help: 'The path to the source map. This source map should be a source map compiled from the commit/release that created the error.',
-				},
-			});
-		},
-		async (args) => {
-			console.log(await resolvePosition(args.position, args.sourcemap));
-			process.exit(0);
-		},
-	)
-	.help()
-	.argv;

packages/app-mobile/android/app/build.gradle

@@ -90,7 +90,7 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
 		versionCode 2097780
-		versionName "3.5.0"
+		versionName "3.4.7"
         ndk {
             abiFilters "armeabi-v7a", "x86", "arm64-v8a", "x86_64"
         }

packages/app-mobile/components/CameraView/ScannedBarcodes.tsx

@@ -4,7 +4,7 @@ import { Platform, ScrollView, StyleSheet, View } from 'react-native';
 import { BarcodeScanner } from './utils/useBarcodeScanner';
 import { LinkButton, PrimaryButton } from '../buttons';
 import { _ } from '@joplin/lib/locale';
-import DismissibleDialog, { DialogVariant } from '../DismissibleDialog';
+import DismissibleDialog, { DialogSize } from '../DismissibleDialog';
 import { Chip, Text } from 'react-native-paper';
 import { isCallbackUrl, parseCallbackUrl } from '@joplin/lib/callbackUrlUtils';
 import CommandService from '@joplin/lib/services/CommandService';
@@ -84,7 +84,7 @@ const ScannedBarcodes: React.FC<Props> = props => {
 			visible={dialogVisible}
 			onDismiss={onHideDialog}
 			themeId={props.themeId}
-			size={DialogVariant.Small}
+			size={DialogSize.Small}
 		>
 			<ScrollView>
 				<Text variant='titleMedium' role='heading'>{_('Scanned code')}</Text>

packages/app-mobile/components/DismissibleDialog.tsx

@@ -6,10 +6,7 @@ import { themeStyle } from './global-style';
 import Modal from './Modal';
 import { _ } from '@joplin/lib/locale';
 
-export enum DialogVariant {
-	// Small width, auto-determined height
-	SmallResize = 'small-resize',
-
+export enum DialogSize {
 	Small = 'small',
 
 	// Ideal for panels and dialogs that should be fullscreen even on large devices
@@ -23,58 +20,34 @@ interface Props {
 	containerStyle?: ViewStyle;
 	children: React.ReactNode;
 	heading?: string;
-	scrollOverflow?: boolean;
 
-	size: DialogVariant;
+	size: DialogSize;
 }
 
-const useStyles = (themeId: number, containerStyle: ViewStyle, size: DialogVariant) => {
+const useStyles = (themeId: number, containerStyle: ViewStyle, size: DialogSize) => {
 	const windowSize = useWindowDimensions();
 
 	return useMemo(() => {
 		const theme = themeStyle(themeId);
 
-		const maxWidth = size === DialogVariant.Large ? windowSize.width : 500;
-		const maxHeight = size === DialogVariant.Large ? windowSize.height : 700;
-
-		const dialogSizing: ViewStyle = {
-			width: '100%',
-
-			...(size !== DialogVariant.SmallResize ? {
-				height: '100%',
-			} : { }),
-		};
+		const maxWidth = size === DialogSize.Large ? windowSize.width : 500;
+		const maxHeight = size === DialogSize.Large ? windowSize.height : 700;
 
 		return StyleSheet.create({
-			closeButtonRow: {
+			closeButtonContainer: {
 				flexDirection: 'row',
 				justifyContent: 'space-between',
 				alignContent: 'center',
-				marginBottom: 8,
-			},
-			closeButtonRowWithHeading: {
-				marginBottom: 16,
-			},
-			closeButton: {
-				margin: 0,
-			},
-			// Ensure that the close button is aligned with the center of the header:
-			// Make its container smaller and center it.
-			closeButtonWrapper: {
-				height: 18,
-				flexDirection: 'column',
-				justifyContent: 'center',
-				alignSelf: 'center',
 			},
 			heading: {
-			},
-			modalBackground: {
-				justifyContent: 'center',
+				alignSelf: 'center',
 			},
 			dialogContainer: {
 				maxHeight,
 				maxWidth,
-				...dialogSizing,
+				width: '100%',
+				height: '100%',
+				flexShrink: 1,
 
 				// Center
 				marginLeft: 'auto',
@@ -85,11 +58,11 @@ const useStyles = (themeId: number, containerStyle: ViewStyle, size: DialogVaria
 				...containerStyle,
 			},
 			dialogSurface: {
-				borderRadius: 24,
+				borderRadius: 12,
 				backgroundColor: theme.backgroundColor,
-				paddingHorizontal: 16,
-				paddingVertical: 24,
-				...dialogSizing,
+				padding: 10,
+				width: '100%',
+				height: '100%',
 			},
 		});
 	}, [themeId, windowSize.width, windowSize.height, containerStyle, size]);
@@ -103,16 +76,13 @@ const DismissibleDialog: React.FC<Props> = props => {
 		<Text variant='headlineSmall' role='heading' style={styles.heading}>{props.heading}</Text>
 	) : null;
 	const closeButtonRow = (
-		<View style={[styles.closeButtonRow, !!props.heading && styles.closeButtonRowWithHeading]}>
+		<View style={styles.closeButtonContainer}>
 			{heading ?? <View/>}
-			<View style={styles.closeButtonWrapper}>
-				<IconButton
-					icon='close'
-					accessibilityLabel={_('Close')}
-					onPress={props.onDismiss}
-					style={styles.closeButton}
-				/>
-			</View>
+			<IconButton
+				icon='close'
+				accessibilityLabel={_('Close')}
+				onPress={props.onDismiss}
+			/>
 		</View>
 	);
 
@@ -122,13 +92,9 @@ const DismissibleDialog: React.FC<Props> = props => {
 			onDismiss={props.onDismiss}
 			onRequestClose={props.onDismiss}
 			containerStyle={styles.dialogContainer}
-			modalBackgroundStyle={styles.modalBackground}
 			animationType='fade'
 			backgroundColor={theme.backgroundColorTransparent2}
 			transparent={true}
-			scrollOverflow={props.scrollOverflow}
-			// Allows the modal background to extend under the statusbar
-			statusBarTranslucent
 		>
 			<Surface style={styles.dialogSurface} elevation={1}>
 				{closeButtonRow}

packages/app-mobile/components/EditorToolbar/EditorToolbar.tsx

@@ -132,7 +132,6 @@ const EditorToolbar: React.FC<Props> = props => {
 			style={styles.content}
 			contentContainerStyle={styles.contentContainer}
 			onLayout={onContainerLayout}
-			keyboardShouldPersistTaps="always"
 		>
 			{buttonInfos.map(renderButton)}
 			<View style={styles.spacer}/>

packages/app-mobile/components/EditorToolbar/ToolbarEditorDialog.tsx

@@ -12,7 +12,7 @@ import { AppState } from '../../utils/types';
 import CommandService from '@joplin/lib/services/CommandService';
 import allToolbarCommandNamesFromState from './utils/allToolbarCommandNamesFromState';
 import Setting from '@joplin/lib/models/Setting';
-import DismissibleDialog, { DialogVariant } from '../DismissibleDialog';
+import DismissibleDialog, { DialogSize } from '../DismissibleDialog';
 import selectedCommandNamesFromState from './utils/selectedCommandNamesFromState';
 import stateToWhenClauseContext from '../../services/commands/stateToWhenClauseContext';
 import { DeleteButton } from '../buttons';
@@ -158,7 +158,7 @@ const ToolbarEditorScreen: React.FC<EditorDialogProps> = props => {
 
 	return (
 		<DismissibleDialog
-			size={DialogVariant.Small}
+			size={DialogSize.Small}
 			themeId={props.themeId}
 			visible={props.visible}
 			onDismiss={props.onDismiss}

packages/app-mobile/components/FeedbackBanner.test.tsx

@@ -7,7 +7,6 @@ import createMockReduxStore from '../utils/testing/createMockReduxStore';
 import setupGlobalStore from '../utils/testing/setupGlobalStore';
 import { act, fireEvent, render, screen } from '@testing-library/react-native';
 import FeedbackBanner from './FeedbackBanner';
-import { MobilePlatform } from '@joplin/lib/shim';
 
 interface WrapperProps { }
 
@@ -85,7 +84,7 @@ describe('FeedbackBanner', () => {
 		setupGlobalStore(store);
 
 		jest.useFakeTimers({ advanceTimers: true });
-		mockMobilePlatform(MobilePlatform.Web);
+		mockMobilePlatform('web');
 	});
 
 	afterEach(() => {
@@ -94,9 +93,9 @@ describe('FeedbackBanner', () => {
 	});
 
 	test.each([
-		{ platform: MobilePlatform.Android, shouldShow: false },
-		{ platform: MobilePlatform.Web, shouldShow: true },
-		{ platform: MobilePlatform.Ios, shouldShow: false },
+		{ platform: 'android', shouldShow: false },
+		{ platform: 'web', shouldShow: true },
+		{ platform: 'ios', shouldShow: false },
 	])('should correctly show/hide the feedback banner on %s', ({ platform, shouldShow }) => {
 		mockMobilePlatform(platform);
 

packages/app-mobile/components/ModalDialog.tsx

@@ -48,11 +48,6 @@ const useStyles = (themeId: number) => {
 			invisibleHeading: {
 				flexGrow: 1,
 			},
-			// Use compact mode on the button and expand the padding to match the original styling, to work around an Android issue #13120
-			buttonStyle: {
-				paddingLeft: 16,
-				paddingRight: 16,
-			},
 		});
 	}, [themeId]);
 };
@@ -60,22 +55,15 @@ const useStyles = (themeId: number) => {
 const ModalDialog: React.FC<Props> = props => {
 	const styles = useStyles(props.themeId);
 	const theme = themeStyle(props.themeId);
-	const containerStyle = !props.modalProps.containerStyle ? styles.container : {
-		...styles.container,
-		...props.modalProps.containerStyle,
-	};
-	const modalProps = {
-		...props.modalProps,
-		containerStyle,
-	} as Partial<ModalElementProps>;
 
 	return (
 		<Modal
 			transparent={true}
 			visible={true}
 			onRequestClose={null}
+			containerStyle={styles.container}
 			backgroundColor={theme.backgroundColorTransparent2}
-			{...modalProps}
+			{...props.modalProps}
 		>
 			<View style={styles.contentWrapper}>{props.children}</View>
 			<View style={styles.buttonRow}>
@@ -88,8 +76,8 @@ const ModalDialog: React.FC<Props> = props => {
 					accessible={true}
 					style={styles.invisibleHeading}
 				/>
-				<Button compact contentStyle={styles.buttonStyle} disabled={!props.buttonBarEnabled} onPress={props.onCancelPress}>{props.cancelTitle}</Button>
-				<PrimaryButton compact contentStyle={styles.buttonStyle} disabled={!props.buttonBarEnabled} onPress={props.onOkPress}>{props.okTitle}</PrimaryButton>
+				<Button disabled={!props.buttonBarEnabled} onPress={props.onCancelPress}>{props.cancelTitle}</Button>
+				<PrimaryButton disabled={!props.buttonBarEnabled} onPress={props.onOkPress}>{props.okTitle}</PrimaryButton>
 			</View>
 		</Modal>
 	);

packages/app-mobile/components/NoteBodyViewer/NoteBodyViewer.tsx

@@ -65,7 +65,7 @@ function NoteBodyViewer(props: Props) {
 		onResourceLongPress,
 	});
 
-	const { api: renderer, pageSetup, webViewEventHandlers, hasPluginScripts } = useWebViewSetup({
+	const { api: renderer, pageSetup, webViewEventHandlers } = useWebViewSetup({
 		webviewRef,
 		onBodyScroll: onScroll,
 		onPostMessage,
@@ -106,7 +106,6 @@ function NoteBodyViewer(props: Props) {
 				mixedContentMode="always"
 				onLoadEnd={onLoadEnd}
 				onMessage={webViewEventHandlers.onMessage}
-				hasPluginScripts={hasPluginScripts}
 			/>
 		</View>
 	);

packages/app-mobile/components/NoteEditor/MarkdownEditor.test.tsx

@@ -1,76 +0,0 @@
-import * as React from 'react';
-
-import { describe, it, beforeEach } from '@jest/globals';
-import { render, waitFor } from '../../utils/testing/testingLibrary';
-
-import Setting from '@joplin/lib/models/Setting';
-import { setupDatabaseAndSynchronizer, switchClient } from '@joplin/lib/testing/test-utils';
-import TestProviderStack from '../testing/TestProviderStack';
-import createMockReduxStore from '../../utils/testing/createMockReduxStore';
-import createTestEditorProps from './testing/createTestEditorProps';
-import { EditorEvent, EditorEventType } from '@joplin/editor/events';
-import { RefObject, useCallback } from 'react';
-import { EditorCommandType, EditorControl } from '@joplin/editor/types';
-import MarkdownEditor from './MarkdownEditor';
-
-
-interface WrapperProps {
-	ref?: RefObject<EditorControl>;
-	onBodyChange: (newBody: string)=> void;
-	noteBody: string;
-}
-
-const defaultEditorProps = createTestEditorProps();
-const testStore = createMockReduxStore();
-const WrappedEditor: React.FC<WrapperProps> = (
-	{
-		noteBody,
-		onBodyChange,
-		ref,
-	}: WrapperProps,
-) => {
-	const onEvent = useCallback((event: EditorEvent) => {
-		if (event.kind === EditorEventType.Change) {
-			onBodyChange(event.value);
-		}
-	}, [onBodyChange]);
-
-	return <TestProviderStack store={testStore}>
-		<MarkdownEditor
-			{...defaultEditorProps}
-			onEditorEvent={onEvent}
-			initialText={noteBody}
-			editorRef={ref ?? defaultEditorProps.editorRef}
-		/>
-	</TestProviderStack>;
-};
-
-describe('MarkdownEditor', () => {
-	beforeEach(async () => {
-		await setupDatabaseAndSynchronizer(0);
-		await switchClient(0);
-		Setting.setValue('editor.codeView', true);
-	});
-
-	// Regression test for #13193. This verifies that the editor can be reached
-	// over IPC.
-	it('should support the "textBold" command', async () => {
-		let editorBody = 'test';
-		const editorRef = React.createRef<EditorControl|null>();
-		render(<WrappedEditor
-			ref={editorRef}
-			noteBody={editorBody}
-			onBodyChange={newValue => { editorBody = newValue; }}
-		/>);
-
-		// Should mark the command as supported
-		expect(await editorRef.current.supportsCommand(EditorCommandType.ToggleBolded));
-
-		// Command should run
-		await editorRef.current.execCommand(EditorCommandType.SelectAll);
-		await editorRef.current.execCommand(EditorCommandType.ToggleBolded);
-		await waitFor(() => {
-			expect(editorBody).toBe('**test**');
-		});
-	});
-});

packages/app-mobile/components/NoteEditor/NoteEditor.tsx

@@ -90,8 +90,6 @@ function editorTheme(themeId: number) {
 	};
 }
 
-const noteEditorSearchChangeSource = 'joplin.noteEditor.setSearchState';
-
 type OnSetVisibleCallback = (visible: boolean)=> void;
 type OnSearchStateChangeCallback = (state: SearchState)=> void;
 const useEditorControl = (
@@ -106,7 +104,7 @@ const useEditorControl = (
 		};
 
 		const setSearchStateCallback = (state: SearchState) => {
-			editorRef.current.setSearchState(state, noteEditorSearchChangeSource);
+			editorRef.current.setSearchState(state);
 			setSearchState(state);
 		};
 
@@ -312,26 +310,15 @@ function NoteEditor(props: Props) {
 		case EditorEventType.FollowLink:
 			void CommandService.instance().execute('openItem', event.link);
 			break;
-		case EditorEventType.UpdateSearchDialog: {
-			const hasExternalChange = (
-				event.changeSources.length !== 1
-				|| event.changeSources[0] !== noteEditorSearchChangeSource
-			);
+		case EditorEventType.UpdateSearchDialog:
+			setSearchState(event.searchState);
 
-			// If the change to the search was done by this editor, it was already applied to the
-			// search state. Skipping the update in this case also helps avoid overwriting the
-			// search state with an older value.
-			if (hasExternalChange) {
-				setSearchState(event.searchState);
-
-				if (event.searchState.dialogVisible) {
-					editorControl.searchControl.showSearch();
-				} else {
-					editorControl.searchControl.hideSearch();
-				}
+			if (event.searchState.dialogVisible) {
+				editorControl.searchControl.showSearch();
+			} else {
+				editorControl.searchControl.hideSearch();
 			}
 			break;
-		}
 		case EditorEventType.Remove:
 		case EditorEventType.Scroll:
 			// Not handled

packages/app-mobile/components/NoteEditor/RichTextEditor.test.tsx

@@ -23,7 +23,6 @@ import { MarkupLanguage } from '@joplin/renderer';
 import { NoteEntity } from '@joplin/lib/services/database/types';
 import { EditorSettings } from './types';
 import { pregQuote } from '@joplin/lib/string-utils';
-import { join } from 'path';
 
 
 interface WrapperProps {
@@ -104,8 +103,8 @@ const mockTyping = (window: EditorWindow, text: string) => {
 	}
 };
 
-const mockSelectionMovement = (window: EditorWindow, from: number, to?: number) => {
-	getEditorControl(window).select(from, to ?? from);
+const mockSelectionMovement = (window: EditorWindow, position: number) => {
+	getEditorControl(window).select(position, position);
 };
 
 const findElement = async function<ElementType extends Element = Element>(selector: string) {
@@ -334,7 +333,7 @@ describe('RichTextEditor', () => {
 			const editorContent = body.trim();
 			if (markupLanguage === MarkupLanguage.Html) {
 				expect(editorContent).toMatch(
-					new RegExp(`^<p><img[^>]* src=":/${pregQuote(resource.id)}" alt="${pregQuote(renderedImage.alt)}"[^>]*> test</p>$`),
+					new RegExp(`^<p><img src=":/${pregQuote(resource.id)}" alt="${pregQuote(renderedImage.alt)}"[^>]*> test</p>$`),
 				);
 			} else {
 				expect(editorContent).toBe(`![${renderedImage.alt}](:/${resource.id}) test`);
@@ -342,29 +341,6 @@ describe('RichTextEditor', () => {
 		});
 	});
 
-	it('should preserve non-image attachments on edit', async () => {
-		const { note, resource } = await createNoteAndResource({ path: join(supportDir, 'sample.txt') });
-		let body = note.body;
-
-		const resources = await attachedResources(body);
-		render(<WrappedEditor
-			noteBody={note.body}
-			note={note}
-			onBodyChange={newBody => { body = newBody; }}
-			noteResources={resources}
-		/>);
-
-		const window = await getEditorWindow();
-		mockTyping(window, ' test');
-
-		await waitFor(async () => {
-			const editorContent = body.trim();
-			// TODO: At present, the resource title may be included in the final Markdown
-			// (e.g. as [sample.txt](:/id-here "sample.txt")).
-			expect(editorContent).toMatch(new RegExp(`^\\[sample\\.txt\\]\\(:/${pregQuote(resource.id)}.*\\) test$`));
-		});
-	});
-
 	it.each([
 		{ useValidSyntax: false },
 		{ useValidSyntax: true },
@@ -414,18 +390,14 @@ describe('RichTextEditor', () => {
 		});
 	});
 
-	it('should be possible to show an editor for math blocks', async () => {
+	it('should be possible show an editor for math blocks', async () => {
 		let body = 'Test:\n\n$$3^2 + 4^2 = 5^2$$';
 		render(<WrappedEditor
 			noteBody={body}
 			onBodyChange={newBody => { body = newBody; }}
 		/>);
 
-		const window = await getEditorWindow();
-		// Select the math block to show the "edit" button.
-		mockSelectionMovement(window, '<Test:>'.length, '<Test:>$'.length);
-
-		const editButton = await findElement<HTMLButtonElement>('button.edit-button');
+		const editButton = await findElement<HTMLButtonElement>('button.edit');
 		editButton.click();
 
 		const editor = await findElement('dialog .cm-editor');
@@ -481,7 +453,7 @@ describe('RichTextEditor', () => {
 		'<sup>Super</sup>script',
 		'<sub>Sub</sub>script',
 		'![image](data:image/svg+xml;utf8,test)',
-		'<img width="120" src="data:image/svg+xml;utf8,test">',
+		'<img src="data:image/svg+xml;utf8,test" width="120">',
 	])('should preserve inline markup on edit (case %#)', async (initialBody) => {
 		initialBody += 'test'; // Ensure that typing will add new content outside the formatting
 		let body = initialBody;

packages/app-mobile/components/NoteEditor/RichTextEditor.tsx

@@ -44,13 +44,6 @@ function useCss(themeId: number, editorCss: string): string {
 				font-size: 13pt;
 				font-family: ${JSON.stringify(theme.fontFamily)}, sans-serif;
 			}
-
-			.RichTextEditor {
-				/* Relatively positioning the editor container causes absolutely-positioned
-				   elements to be positioned relative to Rich Text Editor's container,
-				   rather than the body. This fixes an alignment issue involving button overlays. */
-				position: relative;
-			}
 		`;
 	}, [themeId, editorCss]);
 }

packages/app-mobile/components/NoteEditor/SearchPanel.tsx

@@ -158,7 +158,8 @@ export const SearchPanel = (props: SearchPanelProps) => {
 	const state = props.searchState;
 	const control = props.searchControl;
 
-	const updateSearchState = (changedData: Partial<SearchState>) => {
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
+	const updateSearchState = (changedData: any) => {
 		const newState = { ...state, ...changedData };
 		control.setSearchState(newState);
 	};

packages/app-mobile/components/ScreenHeader/WebBetaButton.tsx

@@ -4,8 +4,8 @@ import { Text } from 'react-native-paper';
 import IconButton from '../IconButton';
 import { _ } from '@joplin/lib/locale';
 import { useCallback, useState } from 'react';
-import DismissibleDialog, { DialogVariant } from '../DismissibleDialog';
-import { LinkButton, PrimaryButton } from '../buttons';
+import DismissibleDialog, { DialogSize } from '../DismissibleDialog';
+import { LinkButton } from '../buttons';
 import makeDiscourseDebugUrl from '@joplin/lib/makeDiscourseDebugUrl';
 import getPackageInfo from '../../utils/getPackageInfo';
 import PluginService from '@joplin/lib/services/plugins/PluginService';
@@ -30,10 +30,7 @@ const onReportBug = () => {
 const styles = StyleSheet.create({
 	feedbackContainer: {
 		flexGrow: 1,
-		flexDirection: 'row',
-		gap: 16,
 		justifyContent: 'flex-end',
-		flexWrap: 'wrap',
 	},
 	paragraph: {
 		paddingBottom: 7,
@@ -68,7 +65,7 @@ const WebBetaButton: React.FC<Props> = props => {
 			/>
 			<DismissibleDialog
 				heading={_('Beta')}
-				size={DialogVariant.SmallResize}
+				size={DialogSize.Small}
 				themeId={props.themeId}
 				visible={dialogVisible}
 				onDismiss={onHideDialog}
@@ -79,7 +76,7 @@ const WebBetaButton: React.FC<Props> = props => {
 				{renderParagraph('Feel free to use it and let us know if have any questions or notice any issues!')}
 				<View style={styles.feedbackContainer}>
 					<LinkButton onPress={onReportBug}>{'Report bug'}</LinkButton>
-					<PrimaryButton onPress={onLeaveFeedback}>{'Give feedback'}</PrimaryButton>
+					<LinkButton onPress={onLeaveFeedback}>{'Give feedback'}</LinkButton>
 				</View>
 			</DismissibleDialog>
 		</>

packages/app-mobile/components/SyncWizard/JoplinCloudIcon.tsx

@@ -1,37 +0,0 @@
-import * as React from 'react';
-import Svg, { SvgProps, G, Path, Defs, LinearGradient, Stop, ClipPath, Rect } from 'react-native-svg';
-
-const JoplinCloudIcon: React.FC<SvgProps> = props => {
-	return <Svg
-		viewBox='0 0 84 84'
-		fill='none'
-		{...props}
-	>
-		<G clipPath='url(#a)'>
-			<Path fill='url(#b)' d='M0 0h84v84H0z'/>
-			<Path
-				fill='#fff'
-				d='M73.706 49.825c0 3.732-1.534 7.148-4.007 9.592a13.714 13.714 0 0 1-9.675 3.973h-8.199v-7.065h8.2c1.818 0 3.436-.723 4.635-1.904 1.19-1.188 1.92-2.784 1.92-4.596 0-1.804-.73-3.408-1.92-4.597a6.539 6.539 0 0 0-4.636-1.903h-6.933l.386-3.882c.042-.4.059-.79.059-1.197 0-3.3-1.342-6.251-3.513-8.412a11.964 11.964 0 0 0-8.484-3.483c-3.328 0-6.304 1.33-8.484 3.483-2.18 2.16-3.513 5.112-3.513 8.412 0 .399.017.798.06 1.197l.385 3.882h-6.154c-1.819 0-3.437.723-4.636 1.903-1.19 1.189-1.92 2.785-1.92 4.597 0 1.803.73 3.408 1.92 4.596a6.539 6.539 0 0 0 4.636 1.904h9.935a8.854 8.854 0 0 0 4.82-2.452 8.705 8.705 0 0 0 2.59-6.201v-7.523h-7.217v-2.726c0-2.32 1.903-4.215 4.25-4.215h9.968v14.464c0 4.14-1.685 8.187-4.636 11.105-2.6 2.585-6.078 4.19-9.733 4.53l-.923.083h-9.062c-3.764 0-7.21-1.52-9.674-3.973a13.483 13.483 0 0 1 0-19.185 13.673 13.673 0 0 1 8.35-3.906c.452-4.464 2.48-8.487 5.507-11.488a19.154 19.154 0 0 1 13.523-5.552 19.16 19.16 0 0 1 13.522 5.552 18.842 18.842 0 0 1 5.5 11.446c3.554.141 6.782 1.613 9.129 3.948a13.428 13.428 0 0 1 4.024 9.593z'
-				strokeWidth={1.3}
-			/>
-		</G>
-		<Defs>
-			<LinearGradient
-				id='b'
-				x1={3}
-				x2={78}
-				y1={4}
-				y2={79}
-				gradientUnits='userSpaceOnUse'
-			>
-				<Stop offset={0.14} stopColor='#3873DB'/>
-				<Stop offset={0.974} stopColor='#163467'/>
-			</LinearGradient>
-			<ClipPath id='a'>
-				<Rect width={84} height={84} fill='#fff' rx={20} />
-			</ClipPath>
-		</Defs>
-	</Svg>;
-};
-
-export default JoplinCloudIcon;

packages/app-mobile/components/SyncWizard/SyncWizard.tsx

@@ -1,144 +0,0 @@
-import * as React from 'react';
-import DismissibleDialog, { DialogVariant } from '../DismissibleDialog';
-import { AppState } from '../../utils/types';
-import { connect } from 'react-redux';
-import { Dispatch } from 'redux';
-import { useCallback } from 'react';
-import { Icon, Text } from 'react-native-paper';
-import { _ } from '@joplin/lib/locale';
-import JoplinCloudIcon from './JoplinCloudIcon';
-import NavService from '@joplin/lib/services/NavService';
-import { StyleSheet, View } from 'react-native';
-import CardButton from '../buttons/CardButton';
-import Setting from '@joplin/lib/models/Setting';
-
-interface Props {
-	dispatch: Dispatch;
-	visible: boolean;
-	themeId: number;
-}
-
-const iconSize = 24;
-const styles = StyleSheet.create({
-	titleContainer: {
-		flexDirection: 'row',
-		gap: 8,
-		paddingBottom: 6,
-		alignItems: 'center',
-	},
-	subheading: {
-		marginBottom: 24,
-	},
-	cardContent: {
-		padding: 12,
-		borderRadius: 14,
-	},
-	syncProviderList: {
-		gap: 8,
-	},
-	featuresList: {
-		marginTop: 4,
-	},
-	listItem: {
-		flexDirection: 'row',
-		gap: 8,
-		marginVertical: 6,
-		verticalAlign: 'middle',
-	},
-});
-
-interface SyncProviderProps {
-	title: string;
-	icon: ()=> React.ReactNode;
-	description: string;
-	onPress: ()=> void;
-	featuresList: string[];
-	disabled: boolean;
-}
-
-const SyncProvider: React.FC<SyncProviderProps> = props => {
-	return <CardButton
-		disabled={props.disabled}
-		onPress={props.onPress}
-		testID='sync-provider-card'
-	>
-		<View style={styles.cardContent}>
-			<View style={styles.titleContainer}>
-				{props.icon()}
-				<Text variant='titleMedium'>{props.title}{props.disabled ? ' (Not supported)' : ''}</Text>
-			</View>
-			{props.description && <Text variant='bodyMedium'>{props.description}</Text>}
-			<View style={styles.featuresList}>
-				{props.featuresList.map((feature, index) => (
-					<View key={`feature-${index}`} style={styles.listItem}>
-						<Icon size={14} source='check'/><Text>{feature}</Text>
-					</View>
-				))}
-			</View>
-		</View>
-	</CardButton>;
-};
-
-const SyncWizard: React.FC<Props> = ({ themeId, visible, dispatch }) => {
-	const onDismiss = useCallback(() => {
-		dispatch({
-			type: 'SYNC_WIZARD_VISIBLE_CHANGE',
-			visible: false,
-		});
-	}, [dispatch]);
-
-	const onManualDismiss = useCallback(() => {
-		Setting.setValue('sync.wizard.autoShowOnStartup', false);
-		onDismiss();
-	}, [onDismiss]);
-
-	const onSelectJoplinCloud = useCallback(async () => {
-		onDismiss();
-		await NavService.go('JoplinCloudLogin');
-	}, [onDismiss]);
-
-	const onSelectOtherTarget = useCallback(async () => {
-		onDismiss();
-		await NavService.go('Config', { sectionName: 'sync' });
-	}, [onDismiss]);
-
-	return <DismissibleDialog
-		themeId={themeId}
-		visible={visible}
-		onDismiss={onManualDismiss}
-		size={DialogVariant.SmallResize}
-		scrollOverflow={true}
-		heading={_('Sync')}
-	>
-		<Text variant='bodyLarge' role='heading' style={styles.subheading}>{
-			_('Joplin can synchronise your notes using various providers. Select one from the list below.')
-		}</Text>
-		<View style={styles.syncProviderList}>
-			<SyncProvider
-				title={_('Joplin Cloud')}
-				description={_('Joplin\'s own sync service. Also gives access to Joplin-specific features such as publishing notes or collaborating on notebooks with others.')}
-				featuresList={[
-					_('Sync your notes'),
-					_('Publish notes to the internet'),
-					_('Collaborate on notebooks with others'),
-				]}
-				icon={() => <JoplinCloudIcon width={iconSize} height={iconSize}/>}
-				onPress={onSelectJoplinCloud}
-				disabled={false}
-			/>
-			<SyncProvider
-				title={_('Other')}
-				description={_('Select one of the other supported sync targets.')}
-				icon={() => <Icon size={iconSize} source='dots-horizontal-circle'/>}
-				featuresList={[]}
-				onPress={onSelectOtherTarget}
-				disabled={false}
-			/>
-		</View>
-	</DismissibleDialog>;
-};
-
-export default connect((state: AppState) => ({
-	visible: state.syncWizardVisible,
-	themeId: state.settings.theme,
-}))(SyncWizard);

packages/app-mobile/components/TagEditor.tsx

@@ -54,6 +54,7 @@ const useStyles = (themeId: number, headerStyle: TextStyle|undefined) => {
 			},
 			tagBoxRoot: {
 				flexDirection: 'column',
+				flexGrow: 0.5,
 				flexShrink: 1,
 			},
 			tagBoxScrollView: {
@@ -85,7 +86,6 @@ const useStyles = (themeId: number, headerStyle: TextStyle|undefined) => {
 				backgroundColor: theme.dividerColor,
 			},
 			tagSearch: {
-				flexGrow: 1,
 				flexShrink: 1,
 			},
 			noTagsLabel: {

packages/app-mobile/components/buttons/CardButton.tsx

@@ -1,81 +0,0 @@
-import * as React from 'react';
-import { Card, TouchableRipple } from 'react-native-paper';
-import { useMemo } from 'react';
-import { Platform, StyleSheet, View, ViewStyle } from 'react-native';
-
-export enum InstallState {
-	NotInstalled,
-	Installing,
-	Installed,
-}
-
-interface Props {
-	onPress: ()=> void;
-	disabled: boolean;
-	children: React.ReactNode;
-	style?: ViewStyle;
-	testID?: string;
-}
-
-const useStyles = (disabled: boolean) => {
-	return useMemo(() => {
-		// For the TouchableRipple to work on Android, the card needs a transparent background.
-		const borderRadius = 12;
-		const baseCard = { backgroundColor: 'transparent', borderRadius };
-		return StyleSheet.create({
-			cardOuterWrapper: {
-				margin: 0,
-				padding: 0,
-				borderRadius,
-				overflow: 'hidden',
-				// Accessibility: Prevent the 'overflow: hidden' from hiding the focus indicator
-				// on web. Only apply to web, as this causes the touchable ripple
-				// from being completely contained within the card on non-web platforms.
-				...(Platform.OS === 'web' ? {
-					margin: -2,
-					padding: 2,
-				} : {}),
-			},
-			cardInnerWrapper: {
-				width: '100%',
-				borderRadius,
-			},
-			card: disabled ? {
-				...baseCard,
-				opacity: 0.7,
-			} : baseCard,
-			content: {
-				gap: 5,
-			},
-		});
-	}, [disabled]);
-};
-
-
-const CardButton: React.FC<Props> = props => {
-	const containerIsButton = !!props.onPress;
-	const styles = useStyles(props.disabled);
-
-	const CardWrapper = containerIsButton ? TouchableRipple : View;
-	return (
-		<View style={[styles.cardOuterWrapper, props.style]}>
-			<CardWrapper
-				accessibilityRole={containerIsButton ? 'button' : null}
-				accessible={containerIsButton}
-				onPress={props.onPress}
-				disabled={props.disabled}
-				style={styles.cardInnerWrapper}
-				testID={props.testID}
-			>
-				<Card
-					mode='outlined'
-					style={styles.card}
-				>
-					{props.children}
-				</Card>
-			</CardWrapper>
-		</View>
-	);
-};
-
-export default CardButton;