Exclude from search commands without a label

commit 2fb6cee901
Merge: 4e303be85f db509955f6
Author: Laurent Cozic <laurent@cozic.net>
Date:   Fri Oct 16 16:24:07 2020 +0100

    Merge branch 'dev' into rn_63

commit 4e303be85f
Author: Laurent Cozic <laurent@cozic.net>
Date:   Fri Oct 16 16:14:39 2020 +0100

    Clean up

commit e3a37ec2d6
Author: Laurent Cozic <laurent@cozic.net>
Date:   Fri Oct 16 15:57:55 2020 +0100

    Use different script for pre-commit and manual start

commit bd236648fc
Author: Laurent Cozic <laurent@cozic.net>
Date:   Fri Oct 16 15:56:45 2020 +0100

    Removed RN eslint config

commit e7feda41c9
Author: Laurent Cozic <laurent@cozic.net>
Date:   Fri Oct 16 15:27:08 2020 +0100

    Revert "Disable git hook for now"

    This reverts commit 89263ac742.

commit cfd63fe46f
Author: Laurent Cozic <laurent@cozic.net>
Date:   Fri Oct 16 13:02:32 2020 +0100

    Ask permission to use geo-location

commit 66059939a3
Author: Laurent Cozic <laurent@cozic.net>
Date:   Fri Oct 16 12:26:20 2020 +0100

    Fixed WebView race condition

commit 1e0d2b7b86
Author: Laurent Cozic <laurent@cozic.net>
Date:   Fri Oct 16 11:56:21 2020 +0100

    Fixed webview issues

commit f537d22d7f
Author: Laurent Cozic <laurent@cozic.net>
Date:   Fri Oct 16 11:08:29 2020 +0100

    Improve resource file watching

commit eec32cf70a
Author: Laurent Cozic <laurent@cozic.net>
Date:   Thu Oct 15 18:40:13 2020 +0100

    Removed cache package dependency and implemented one more suitable for React Native

commit efa346fea4
Author: Laurent Cozic <laurent@cozic.net>
Date:   Thu Oct 15 14:57:21 2020 +0100

    iOS: Added fonts to Info.plist although it was working without it

commit 572b647bc0
Author: Laurent Cozic <laurent@cozic.net>
Date:   Thu Oct 15 14:56:49 2020 +0100

    Specify content-type header for OneDrive to prevent network error

commit bcedf6c7f0
Author: Laurent Cozic <laurent@cozic.net>
Date:   Thu Oct 15 12:45:01 2020 +0100

    iOS: Disable long press menu since it is already built-in

commit 7359dd61d1
Author: Laurent Cozic <laurent@cozic.net>
Date:   Thu Oct 15 12:37:40 2020 +0100

    Removed unused react-native-device-info

commit 2d63ab36d3
Author: Laurent Cozic <laurent@cozic.net>
Date:   Thu Oct 15 12:35:54 2020 +0100

    iOS: Fixed taking a picture

commit 8e2875a91c
Author: Laurent Cozic <laurent@cozic.net>
Date:   Thu Oct 15 12:11:13 2020 +0100

    iOS: Restored camera roll functionality

commit 75f5edf2ad
Author: Laurent Cozic <laurent@cozic.net>
Date:   Thu Oct 15 11:40:13 2020 +0100

    iOS: Fixed build settings

commit b220c98419
Author: Laurent Cozic <laurent@cozic.net>
Date:   Thu Oct 15 11:40:03 2020 +0100

    iOS: Got images to work with WebKit

commit c34b43e841
Author: Laurent Cozic <laurent@cozic.net>
Date:   Thu Oct 15 10:24:52 2020 +0100

    iOS: Restore more settings

commit 32997611e6
Author: Laurent Cozic <laurent@cozic.net>
Date:   Thu Oct 15 10:15:14 2020 +0100

    iOS: Added back icons and other properties

commit b5811d7f7c
Author: Laurent Cozic <laurent@cozic.net>
Date:   Wed Oct 14 23:53:14 2020 +0100

    Got iOS build to work

commit dc6d7c00e0
Author: Laurent Cozic <laurent@cozic.net>
Date:   Wed Oct 14 18:40:06 2020 +0100

    Imported old settings in gradle build

commit dff59f5603
Author: Laurent Cozic <laurent@cozic.net>
Date:   Wed Oct 14 18:20:00 2020 +0100

    Restored sharing

commit 0bdb449e72
Author: Laurent Cozic <laurent@cozic.net>
Date:   Wed Oct 14 17:25:40 2020 +0100

    Updated NoteBodyViewer

commit 0c0d228815
Author: Laurent Cozic <laurent@cozic.net>
Date:   Wed Oct 14 16:54:42 2020 +0100

    Fixed networking

commit 6ff45ce485
Author: Laurent Cozic <laurent@cozic.net>
Date:   Wed Oct 14 13:11:00 2020 +0100

    Fixed document picker

commit cc889182b6
Author: Laurent Cozic <laurent@cozic.net>
Date:   Wed Oct 14 12:56:27 2020 +0100

    Added back support for alarms

commit 040261abfa
Author: Laurent Cozic <laurent@cozic.net>
Date:   Tue Oct 13 22:04:49 2020 +0100

    Fixed Clipboard and remove image-picker package

commit 1077ad8f16
Author: Laurent Cozic <laurent@cozic.net>
Date:   Tue Oct 13 21:54:52 2020 +0100

    Fixed Select Alarm dialog and PoorManIntervals class

commit 8296676fd5
Author: Laurent Cozic <laurent@cozic.net>
Date:   Tue Oct 13 21:32:52 2020 +0100

    Fixed icons and warnings

commit 3b0e3f6f43
Author: Laurent Cozic <laurent@cozic.net>
Date:   Tue Oct 13 17:02:59 2020 +0100

    Got app to build again

commit 89263ac742
Author: Laurent Cozic <laurent@cozic.net>
Date:   Tue Oct 13 15:41:17 2020 +0100

    Disable git hook for now

commit d6da162f67
Author: Laurent Cozic <laurent@cozic.net>
Date:   Tue Oct 13 15:39:12 2020 +0100

    Restored back all RN packages

commit 7f8ce3732c
Author: Laurent Cozic <laurent@cozic.net>
Date:   Tue Oct 13 15:13:12 2020 +0100

    Restored base packages

commit ea59726eb3
Author: Laurent Cozic <laurent@cozic.net>
Date:   Tue Oct 13 15:05:17 2020 +0100

    Started over from scratch

.eslintignore

@@ -64,11 +64,13 @@ CliClient/build/
 # AUTO-GENERATED - EXCLUDED TYPESCRIPT BUILD
 CliClient/app/LinkSelector.js
 CliClient/app/services/plugins/PluginRunner.js
+CliClient/tests/InMemoryCache.js
 CliClient/tests/models_Setting.js
 CliClient/tests/services_CommandService.js
 CliClient/tests/services_InteropService.js
 CliClient/tests/services_PluginService.js
 CliClient/tests/services_rest_Api.js
+CliClient/tests/services/plugins/api/JoplinSetting.js
 CliClient/tests/services/plugins/sandboxProxy.js
 CliClient/tests/synchronizer_LockHandler.js
 CliClient/tests/synchronizer_MigrationHandler.js
@@ -112,7 +114,7 @@ ElectronClient/gui/MainScreen/commands/showNoteProperties.js
 ElectronClient/gui/MainScreen/commands/showShareNoteDialog.js
 ElectronClient/gui/MainScreen/commands/toggleEditors.js
 ElectronClient/gui/MainScreen/commands/toggleNoteList.js
-ElectronClient/gui/MainScreen/commands/toggleSidebar.js
+ElectronClient/gui/MainScreen/commands/toggleSideBar.js
 ElectronClient/gui/MainScreen/commands/toggleVisiblePanes.js
 ElectronClient/gui/MainScreen/MainScreen.js
 ElectronClient/gui/MenuBar.js
@@ -185,7 +187,9 @@ ElectronClient/gui/ToolbarButton/styles/index.js
 ElectronClient/gui/ToolbarButton/ToolbarButton.js
 ElectronClient/gui/utils/NoteListUtils.js
 ElectronClient/InteropServiceHelper.js
+ElectronClient/plugins/GotoAnything.js
 ElectronClient/services/bridge.js
+ElectronClient/services/commands/types.js
 ElectronClient/services/plugins/hooks/useThemeCss.js
 ElectronClient/services/plugins/hooks/useViewIsReady.js
 ElectronClient/services/plugins/PlatformImplementation.js
@@ -200,13 +204,21 @@ ReactNativeClient/lib/commands/historyBackward.js
 ReactNativeClient/lib/commands/historyForward.js
 ReactNativeClient/lib/commands/synchronize.js
 ReactNativeClient/lib/components/BackButtonDialogBox.js
+ReactNativeClient/lib/components/CameraView.js
+ReactNativeClient/lib/components/NoteBodyViewer/hooks/useOnMessage.js
+ReactNativeClient/lib/components/NoteBodyViewer/hooks/useOnResourceLongPress.js
+ReactNativeClient/lib/components/NoteBodyViewer/hooks/useSource.js
+ReactNativeClient/lib/components/NoteBodyViewer/NoteBodyViewer.js
+ReactNativeClient/lib/components/screens/Note.js
 ReactNativeClient/lib/components/screens/UpgradeSyncTargetScreen.js
+ReactNativeClient/lib/components/SelectDateTimeDialog.js
 ReactNativeClient/lib/errorUtils.js
 ReactNativeClient/lib/eventManager.js
 ReactNativeClient/lib/hooks/useEffectDebugger.js
 ReactNativeClient/lib/hooks/useImperativeHandlerDebugger.js
 ReactNativeClient/lib/hooks/usePrevious.js
 ReactNativeClient/lib/hooks/usePropsDebugger.js
+ReactNativeClient/lib/InMemoryCache.js
 ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/checkbox.js
 ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/fence.js
 ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/mermaid.js
@@ -218,15 +230,17 @@ ReactNativeClient/lib/markdownUtils.js
 ReactNativeClient/lib/models/Alarm.js
 ReactNativeClient/lib/models/Setting.js
 ReactNativeClient/lib/ntpDate.js
+ReactNativeClient/lib/PoorManIntervals.js
 ReactNativeClient/lib/reducer.js
 ReactNativeClient/lib/services/AlarmService.js
 ReactNativeClient/lib/services/AlarmServiceDriver.android.js
 ReactNativeClient/lib/services/AlarmServiceDriver.ios.js
 ReactNativeClient/lib/services/AlarmServiceDriverNode.js
 ReactNativeClient/lib/services/BaseService.js
-ReactNativeClient/lib/services/BooleanExpression.js
+ReactNativeClient/lib/services/commands/commandsToMarkdownTable.js
 ReactNativeClient/lib/services/commands/MenuUtils.js
 ReactNativeClient/lib/services/commands/propsHaveChanged.js
+ReactNativeClient/lib/services/commands/stateToWhenClauseContext.js
 ReactNativeClient/lib/services/commands/ToolbarButtonUtils.js
 ReactNativeClient/lib/services/CommandService.js
 ReactNativeClient/lib/services/contextkey/contextkey.js
@@ -263,11 +277,13 @@ ReactNativeClient/lib/services/plugins/api/JoplinSettings.js
 ReactNativeClient/lib/services/plugins/api/JoplinViews.js
 ReactNativeClient/lib/services/plugins/api/JoplinViewsDialogs.js
 ReactNativeClient/lib/services/plugins/api/JoplinViewsMenuItems.js
+ReactNativeClient/lib/services/plugins/api/JoplinViewsMenus.js
 ReactNativeClient/lib/services/plugins/api/JoplinViewsPanels.js
 ReactNativeClient/lib/services/plugins/api/JoplinViewsToolbarButtons.js
 ReactNativeClient/lib/services/plugins/api/JoplinWorkspace.js
 ReactNativeClient/lib/services/plugins/api/types.js
 ReactNativeClient/lib/services/plugins/BasePluginRunner.js
+ReactNativeClient/lib/services/plugins/MenuController.js
 ReactNativeClient/lib/services/plugins/MenuItemController.js
 ReactNativeClient/lib/services/plugins/Plugin.js
 ReactNativeClient/lib/services/plugins/PluginService.js
@@ -296,6 +312,7 @@ ReactNativeClient/lib/services/synchronizer/migrations/1.js
 ReactNativeClient/lib/services/synchronizer/migrations/2.js
 ReactNativeClient/lib/services/synchronizer/utils/types.js
 ReactNativeClient/lib/services/UndoRedoService.js
+ReactNativeClient/lib/services/WhenClause.js
 ReactNativeClient/lib/ShareExtension.js
 ReactNativeClient/lib/shareHandler.js
 ReactNativeClient/lib/shim.js

.gitignore

@@ -58,11 +58,13 @@ plugin_types/
 # AUTO-GENERATED - EXCLUDED TYPESCRIPT BUILD
 CliClient/app/LinkSelector.js
 CliClient/app/services/plugins/PluginRunner.js
+CliClient/tests/InMemoryCache.js
 CliClient/tests/models_Setting.js
 CliClient/tests/services_CommandService.js
 CliClient/tests/services_InteropService.js
 CliClient/tests/services_PluginService.js
 CliClient/tests/services_rest_Api.js
+CliClient/tests/services/plugins/api/JoplinSetting.js
 CliClient/tests/services/plugins/sandboxProxy.js
 CliClient/tests/synchronizer_LockHandler.js
 CliClient/tests/synchronizer_MigrationHandler.js
@@ -106,7 +108,7 @@ ElectronClient/gui/MainScreen/commands/showNoteProperties.js
 ElectronClient/gui/MainScreen/commands/showShareNoteDialog.js
 ElectronClient/gui/MainScreen/commands/toggleEditors.js
 ElectronClient/gui/MainScreen/commands/toggleNoteList.js
-ElectronClient/gui/MainScreen/commands/toggleSidebar.js
+ElectronClient/gui/MainScreen/commands/toggleSideBar.js
 ElectronClient/gui/MainScreen/commands/toggleVisiblePanes.js
 ElectronClient/gui/MainScreen/MainScreen.js
 ElectronClient/gui/MenuBar.js
@@ -179,7 +181,9 @@ ElectronClient/gui/ToolbarButton/styles/index.js
 ElectronClient/gui/ToolbarButton/ToolbarButton.js
 ElectronClient/gui/utils/NoteListUtils.js
 ElectronClient/InteropServiceHelper.js
+ElectronClient/plugins/GotoAnything.js
 ElectronClient/services/bridge.js
+ElectronClient/services/commands/types.js
 ElectronClient/services/plugins/hooks/useThemeCss.js
 ElectronClient/services/plugins/hooks/useViewIsReady.js
 ElectronClient/services/plugins/PlatformImplementation.js
@@ -194,13 +198,21 @@ ReactNativeClient/lib/commands/historyBackward.js
 ReactNativeClient/lib/commands/historyForward.js
 ReactNativeClient/lib/commands/synchronize.js
 ReactNativeClient/lib/components/BackButtonDialogBox.js
+ReactNativeClient/lib/components/CameraView.js
+ReactNativeClient/lib/components/NoteBodyViewer/hooks/useOnMessage.js
+ReactNativeClient/lib/components/NoteBodyViewer/hooks/useOnResourceLongPress.js
+ReactNativeClient/lib/components/NoteBodyViewer/hooks/useSource.js
+ReactNativeClient/lib/components/NoteBodyViewer/NoteBodyViewer.js
+ReactNativeClient/lib/components/screens/Note.js
 ReactNativeClient/lib/components/screens/UpgradeSyncTargetScreen.js
+ReactNativeClient/lib/components/SelectDateTimeDialog.js
 ReactNativeClient/lib/errorUtils.js
 ReactNativeClient/lib/eventManager.js
 ReactNativeClient/lib/hooks/useEffectDebugger.js
 ReactNativeClient/lib/hooks/useImperativeHandlerDebugger.js
 ReactNativeClient/lib/hooks/usePrevious.js
 ReactNativeClient/lib/hooks/usePropsDebugger.js
+ReactNativeClient/lib/InMemoryCache.js
 ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/checkbox.js
 ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/fence.js
 ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/mermaid.js
@@ -212,15 +224,17 @@ ReactNativeClient/lib/markdownUtils.js
 ReactNativeClient/lib/models/Alarm.js
 ReactNativeClient/lib/models/Setting.js
 ReactNativeClient/lib/ntpDate.js
+ReactNativeClient/lib/PoorManIntervals.js
 ReactNativeClient/lib/reducer.js
 ReactNativeClient/lib/services/AlarmService.js
 ReactNativeClient/lib/services/AlarmServiceDriver.android.js
 ReactNativeClient/lib/services/AlarmServiceDriver.ios.js
 ReactNativeClient/lib/services/AlarmServiceDriverNode.js
 ReactNativeClient/lib/services/BaseService.js
-ReactNativeClient/lib/services/BooleanExpression.js
+ReactNativeClient/lib/services/commands/commandsToMarkdownTable.js
 ReactNativeClient/lib/services/commands/MenuUtils.js
 ReactNativeClient/lib/services/commands/propsHaveChanged.js
+ReactNativeClient/lib/services/commands/stateToWhenClauseContext.js
 ReactNativeClient/lib/services/commands/ToolbarButtonUtils.js
 ReactNativeClient/lib/services/CommandService.js
 ReactNativeClient/lib/services/contextkey/contextkey.js
@@ -257,11 +271,13 @@ ReactNativeClient/lib/services/plugins/api/JoplinSettings.js
 ReactNativeClient/lib/services/plugins/api/JoplinViews.js
 ReactNativeClient/lib/services/plugins/api/JoplinViewsDialogs.js
 ReactNativeClient/lib/services/plugins/api/JoplinViewsMenuItems.js
+ReactNativeClient/lib/services/plugins/api/JoplinViewsMenus.js
 ReactNativeClient/lib/services/plugins/api/JoplinViewsPanels.js
 ReactNativeClient/lib/services/plugins/api/JoplinViewsToolbarButtons.js
 ReactNativeClient/lib/services/plugins/api/JoplinWorkspace.js
 ReactNativeClient/lib/services/plugins/api/types.js
 ReactNativeClient/lib/services/plugins/BasePluginRunner.js
+ReactNativeClient/lib/services/plugins/MenuController.js
 ReactNativeClient/lib/services/plugins/MenuItemController.js
 ReactNativeClient/lib/services/plugins/Plugin.js
 ReactNativeClient/lib/services/plugins/PluginService.js
@@ -290,6 +306,7 @@ ReactNativeClient/lib/services/synchronizer/migrations/1.js
 ReactNativeClient/lib/services/synchronizer/migrations/2.js
 ReactNativeClient/lib/services/synchronizer/utils/types.js
 ReactNativeClient/lib/services/UndoRedoService.js
+ReactNativeClient/lib/services/WhenClause.js
 ReactNativeClient/lib/ShareExtension.js
 ReactNativeClient/lib/shareHandler.js
 ReactNativeClient/lib/shim.js

.ignore

@@ -0,0 +1,277 @@
+# This is used by VSCode to ignore patterns during search.
+# Before they were in joplin.code-workspace, under the `files.exclude` key
+# but it eventually reached the limit with ENAMETOOLONG error.
+#
+# https://github.com/microsoft/vscode/issues/94718
+
+# AUTO-GENERATED - EXCLUDED TYPESCRIPT BUILD
+CliClient/app/LinkSelector.js
+CliClient/app/services/plugins/PluginRunner.js
+CliClient/tests/InMemoryCache.js
+CliClient/tests/models_Setting.js
+CliClient/tests/services_CommandService.js
+CliClient/tests/services_InteropService.js
+CliClient/tests/services_PluginService.js
+CliClient/tests/services_rest_Api.js
+CliClient/tests/services/plugins/api/JoplinSetting.js
+CliClient/tests/services/plugins/sandboxProxy.js
+CliClient/tests/synchronizer_LockHandler.js
+CliClient/tests/synchronizer_MigrationHandler.js
+ElectronClient/app.js
+ElectronClient/bridge.js
+ElectronClient/commands/copyDevCommand.js
+ElectronClient/commands/focusElement.js
+ElectronClient/commands/startExternalEditing.js
+ElectronClient/commands/stopExternalEditing.js
+ElectronClient/commands/toggleExternalEditing.js
+ElectronClient/ElectronAppWrapper.js
+ElectronClient/global.d.js
+ElectronClient/gui/Button/Button.js
+ElectronClient/gui/ConfigScreen/ButtonBar.js
+ElectronClient/gui/ConfigScreen/ConfigScreen.js
+ElectronClient/gui/ConfigScreen/SideBar.js
+ElectronClient/gui/DropboxLoginScreen.js
+ElectronClient/gui/ErrorBoundary.js
+ElectronClient/gui/KeymapConfig/KeymapConfigScreen.js
+ElectronClient/gui/KeymapConfig/ShortcutRecorder.js
+ElectronClient/gui/KeymapConfig/styles/index.js
+ElectronClient/gui/KeymapConfig/utils/getLabel.js
+ElectronClient/gui/KeymapConfig/utils/useCommandStatus.js
+ElectronClient/gui/KeymapConfig/utils/useKeymap.js
+ElectronClient/gui/MainScreen/commands/editAlarm.js
+ElectronClient/gui/MainScreen/commands/exportPdf.js
+ElectronClient/gui/MainScreen/commands/hideModalMessage.js
+ElectronClient/gui/MainScreen/commands/moveToFolder.js
+ElectronClient/gui/MainScreen/commands/newFolder.js
+ElectronClient/gui/MainScreen/commands/newNote.js
+ElectronClient/gui/MainScreen/commands/newTodo.js
+ElectronClient/gui/MainScreen/commands/print.js
+ElectronClient/gui/MainScreen/commands/renameFolder.js
+ElectronClient/gui/MainScreen/commands/renameTag.js
+ElectronClient/gui/MainScreen/commands/search.js
+ElectronClient/gui/MainScreen/commands/selectTemplate.js
+ElectronClient/gui/MainScreen/commands/setTags.js
+ElectronClient/gui/MainScreen/commands/showModalMessage.js
+ElectronClient/gui/MainScreen/commands/showNoteContentProperties.js
+ElectronClient/gui/MainScreen/commands/showNoteProperties.js
+ElectronClient/gui/MainScreen/commands/showShareNoteDialog.js
+ElectronClient/gui/MainScreen/commands/toggleEditors.js
+ElectronClient/gui/MainScreen/commands/toggleNoteList.js
+ElectronClient/gui/MainScreen/commands/toggleSideBar.js
+ElectronClient/gui/MainScreen/commands/toggleVisiblePanes.js
+ElectronClient/gui/MainScreen/MainScreen.js
+ElectronClient/gui/MenuBar.js
+ElectronClient/gui/MultiNoteActions.js
+ElectronClient/gui/NoteContentPropertiesDialog.js
+ElectronClient/gui/NoteEditor/commands/editorCommandDeclarations.js
+ElectronClient/gui/NoteEditor/commands/focusElementNoteBody.js
+ElectronClient/gui/NoteEditor/commands/focusElementNoteTitle.js
+ElectronClient/gui/NoteEditor/commands/showLocalSearch.js
+ElectronClient/gui/NoteEditor/commands/showRevisions.js
+ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.js
+ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/Editor.js
+ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/styles/index.js
+ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/Toolbar.js
+ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/utils/index.js
+ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/utils/types.js
+ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/utils/useCursorUtils.js
+ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/utils/useEditorSearch.js
+ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/utils/useJoplinMode.js
+ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/utils/useKeymap.js
+ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/utils/useLineSorting.js
+ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/utils/useListIdent.js
+ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/utils/useScrollUtils.js
+ElectronClient/gui/NoteEditor/NoteBody/TinyMCE/styles/index.js
+ElectronClient/gui/NoteEditor/NoteBody/TinyMCE/TinyMCE.js
+ElectronClient/gui/NoteEditor/NoteBody/TinyMCE/utils/useScroll.js
+ElectronClient/gui/NoteEditor/NoteEditor.js
+ElectronClient/gui/NoteEditor/styles/index.js
+ElectronClient/gui/NoteEditor/utils/contextMenu.js
+ElectronClient/gui/NoteEditor/utils/index.js
+ElectronClient/gui/NoteEditor/utils/resourceHandling.js
+ElectronClient/gui/NoteEditor/utils/types.js
+ElectronClient/gui/NoteEditor/utils/useDropHandler.js
+ElectronClient/gui/NoteEditor/utils/useFolder.js
+ElectronClient/gui/NoteEditor/utils/useFormNote.js
+ElectronClient/gui/NoteEditor/utils/useMarkupToHtml.js
+ElectronClient/gui/NoteEditor/utils/useMessageHandler.js
+ElectronClient/gui/NoteEditor/utils/useNoteSearchBar.js
+ElectronClient/gui/NoteEditor/utils/usePluginServiceRegistration.js
+ElectronClient/gui/NoteEditor/utils/useSearchMarkers.js
+ElectronClient/gui/NoteEditor/utils/useWindowCommandHandler.js
+ElectronClient/gui/NoteList/commands/focusElementNoteList.js
+ElectronClient/gui/NoteList/NoteList.js
+ElectronClient/gui/NoteListControls/commands/focusSearch.js
+ElectronClient/gui/NoteListControls/NoteListControls.js
+ElectronClient/gui/NoteListItem.js
+ElectronClient/gui/NoteTextViewer.js
+ElectronClient/gui/NoteToolbar/NoteToolbar.js
+ElectronClient/gui/OneDriveLoginScreen.js
+ElectronClient/gui/ResizableLayout/hooks/useLayoutItemSizes.js
+ElectronClient/gui/ResizableLayout/hooks/useWindowResizeEvent.js
+ElectronClient/gui/ResizableLayout/ResizableLayout.js
+ElectronClient/gui/ResourceScreen.js
+ElectronClient/gui/Root_UpgradeSyncTarget.js
+ElectronClient/gui/Root.js
+ElectronClient/gui/SearchBar/hooks/useSearch.js
+ElectronClient/gui/SearchBar/SearchBar.js
+ElectronClient/gui/SearchBar/styles/index.js
+ElectronClient/gui/ShareNoteDialog.js
+ElectronClient/gui/SideBar/commands/focusElementSideBar.js
+ElectronClient/gui/SideBar/SideBar.js
+ElectronClient/gui/SideBar/styles/index.js
+ElectronClient/gui/StatusScreen/StatusScreen.js
+ElectronClient/gui/style/StyledInput.js
+ElectronClient/gui/style/StyledTextInput.js
+ElectronClient/gui/ToggleEditorsButton/styles/index.js
+ElectronClient/gui/ToggleEditorsButton/ToggleEditorsButton.js
+ElectronClient/gui/ToolbarBase.js
+ElectronClient/gui/ToolbarButton/styles/index.js
+ElectronClient/gui/ToolbarButton/ToolbarButton.js
+ElectronClient/gui/utils/NoteListUtils.js
+ElectronClient/InteropServiceHelper.js
+ElectronClient/plugins/GotoAnything.js
+ElectronClient/services/bridge.js
+ElectronClient/services/commands/types.js
+ElectronClient/services/plugins/hooks/useThemeCss.js
+ElectronClient/services/plugins/hooks/useViewIsReady.js
+ElectronClient/services/plugins/PlatformImplementation.js
+ElectronClient/services/plugins/PluginRunner.js
+ElectronClient/services/plugins/UserWebview.js
+ElectronClient/services/plugins/UserWebviewDialog.js
+ElectronClient/services/plugins/UserWebviewDialogButtonBar.js
+ReactNativeClient/lib/AsyncActionQueue.js
+ReactNativeClient/lib/BaseApplication.js
+ReactNativeClient/lib/checkPermissions.js
+ReactNativeClient/lib/commands/historyBackward.js
+ReactNativeClient/lib/commands/historyForward.js
+ReactNativeClient/lib/commands/synchronize.js
+ReactNativeClient/lib/components/BackButtonDialogBox.js
+ReactNativeClient/lib/components/CameraView.js
+ReactNativeClient/lib/components/NoteBodyViewer/hooks/useOnMessage.js
+ReactNativeClient/lib/components/NoteBodyViewer/hooks/useOnResourceLongPress.js
+ReactNativeClient/lib/components/NoteBodyViewer/hooks/useSource.js
+ReactNativeClient/lib/components/NoteBodyViewer/NoteBodyViewer.js
+ReactNativeClient/lib/components/screens/Note.js
+ReactNativeClient/lib/components/screens/UpgradeSyncTargetScreen.js
+ReactNativeClient/lib/components/SelectDateTimeDialog.js
+ReactNativeClient/lib/errorUtils.js
+ReactNativeClient/lib/eventManager.js
+ReactNativeClient/lib/hooks/useEffectDebugger.js
+ReactNativeClient/lib/hooks/useImperativeHandlerDebugger.js
+ReactNativeClient/lib/hooks/usePrevious.js
+ReactNativeClient/lib/hooks/usePropsDebugger.js
+ReactNativeClient/lib/InMemoryCache.js
+ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/checkbox.js
+ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/fence.js
+ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/mermaid.js
+ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/sanitize_html.js
+ReactNativeClient/lib/JoplinServerApi.js
+ReactNativeClient/lib/locale.js
+ReactNativeClient/lib/Logger.js
+ReactNativeClient/lib/markdownUtils.js
+ReactNativeClient/lib/models/Alarm.js
+ReactNativeClient/lib/models/Setting.js
+ReactNativeClient/lib/ntpDate.js
+ReactNativeClient/lib/PoorManIntervals.js
+ReactNativeClient/lib/reducer.js
+ReactNativeClient/lib/services/AlarmService.js
+ReactNativeClient/lib/services/AlarmServiceDriver.android.js
+ReactNativeClient/lib/services/AlarmServiceDriver.ios.js
+ReactNativeClient/lib/services/AlarmServiceDriverNode.js
+ReactNativeClient/lib/services/BaseService.js
+ReactNativeClient/lib/services/commands/commandsToMarkdownTable.js
+ReactNativeClient/lib/services/commands/MenuUtils.js
+ReactNativeClient/lib/services/commands/propsHaveChanged.js
+ReactNativeClient/lib/services/commands/stateToWhenClauseContext.js
+ReactNativeClient/lib/services/commands/ToolbarButtonUtils.js
+ReactNativeClient/lib/services/CommandService.js
+ReactNativeClient/lib/services/contextkey/contextkey.js
+ReactNativeClient/lib/services/debug/populateDatabase.js
+ReactNativeClient/lib/services/interop/InteropService_Exporter_Base.js
+ReactNativeClient/lib/services/interop/InteropService_Exporter_Custom.js
+ReactNativeClient/lib/services/interop/InteropService_Exporter_Html.js
+ReactNativeClient/lib/services/interop/InteropService_Exporter_Jex.js
+ReactNativeClient/lib/services/interop/InteropService_Exporter_Md.js
+ReactNativeClient/lib/services/interop/InteropService_Exporter_Raw.js
+ReactNativeClient/lib/services/interop/InteropService_Importer_Base.js
+ReactNativeClient/lib/services/interop/InteropService_Importer_Custom.js
+ReactNativeClient/lib/services/interop/InteropService_Importer_EnexToHtml.js
+ReactNativeClient/lib/services/interop/InteropService_Importer_EnexToMd.js
+ReactNativeClient/lib/services/interop/InteropService_Importer_Jex.js
+ReactNativeClient/lib/services/interop/InteropService_Importer_Md.js
+ReactNativeClient/lib/services/interop/InteropService_Importer_Raw.js
+ReactNativeClient/lib/services/interop/InteropService.js
+ReactNativeClient/lib/services/interop/types.js
+ReactNativeClient/lib/services/keychain/KeychainService.js
+ReactNativeClient/lib/services/keychain/KeychainServiceDriver.dummy.js
+ReactNativeClient/lib/services/keychain/KeychainServiceDriver.mobile.js
+ReactNativeClient/lib/services/keychain/KeychainServiceDriver.node.js
+ReactNativeClient/lib/services/keychain/KeychainServiceDriverBase.js
+ReactNativeClient/lib/services/KeymapService.js
+ReactNativeClient/lib/services/plugins/api/Global.js
+ReactNativeClient/lib/services/plugins/api/Joplin.js
+ReactNativeClient/lib/services/plugins/api/JoplinCommands.js
+ReactNativeClient/lib/services/plugins/api/JoplinData.js
+ReactNativeClient/lib/services/plugins/api/JoplinFilters.js
+ReactNativeClient/lib/services/plugins/api/JoplinInterop.js
+ReactNativeClient/lib/services/plugins/api/JoplinPlugins.js
+ReactNativeClient/lib/services/plugins/api/JoplinSettings.js
+ReactNativeClient/lib/services/plugins/api/JoplinViews.js
+ReactNativeClient/lib/services/plugins/api/JoplinViewsDialogs.js
+ReactNativeClient/lib/services/plugins/api/JoplinViewsMenuItems.js
+ReactNativeClient/lib/services/plugins/api/JoplinViewsMenus.js
+ReactNativeClient/lib/services/plugins/api/JoplinViewsPanels.js
+ReactNativeClient/lib/services/plugins/api/JoplinViewsToolbarButtons.js
+ReactNativeClient/lib/services/plugins/api/JoplinWorkspace.js
+ReactNativeClient/lib/services/plugins/api/types.js
+ReactNativeClient/lib/services/plugins/BasePluginRunner.js
+ReactNativeClient/lib/services/plugins/MenuController.js
+ReactNativeClient/lib/services/plugins/MenuItemController.js
+ReactNativeClient/lib/services/plugins/Plugin.js
+ReactNativeClient/lib/services/plugins/PluginService.js
+ReactNativeClient/lib/services/plugins/reducer.js
+ReactNativeClient/lib/services/plugins/sandboxProxy.js
+ReactNativeClient/lib/services/plugins/ToolbarButtonController.js
+ReactNativeClient/lib/services/plugins/utils/createViewHandle.js
+ReactNativeClient/lib/services/plugins/utils/executeSandboxCall.js
+ReactNativeClient/lib/services/plugins/utils/manifestFromObject.js
+ReactNativeClient/lib/services/plugins/utils/mapEventHandlersToIds.js
+ReactNativeClient/lib/services/plugins/utils/types.js
+ReactNativeClient/lib/services/plugins/ViewController.js
+ReactNativeClient/lib/services/plugins/WebviewController.js
+ReactNativeClient/lib/services/ResourceEditWatcher/index.js
+ReactNativeClient/lib/services/ResourceEditWatcher/reducer.js
+ReactNativeClient/lib/services/rest/actionApi.desktop.js
+ReactNativeClient/lib/services/rest/Api.js
+ReactNativeClient/lib/services/rest/errors.js
+ReactNativeClient/lib/services/searchengine/filterParser.js
+ReactNativeClient/lib/services/searchengine/queryBuilder.js
+ReactNativeClient/lib/services/SettingUtils.js
+ReactNativeClient/lib/services/synchronizer/gui/useSyncTargetUpgrade.js
+ReactNativeClient/lib/services/synchronizer/LockHandler.js
+ReactNativeClient/lib/services/synchronizer/MigrationHandler.js
+ReactNativeClient/lib/services/synchronizer/migrations/1.js
+ReactNativeClient/lib/services/synchronizer/migrations/2.js
+ReactNativeClient/lib/services/synchronizer/utils/types.js
+ReactNativeClient/lib/services/UndoRedoService.js
+ReactNativeClient/lib/services/WhenClause.js
+ReactNativeClient/lib/ShareExtension.js
+ReactNativeClient/lib/shareHandler.js
+ReactNativeClient/lib/shim.js
+ReactNativeClient/lib/Synchronizer.js
+ReactNativeClient/lib/theme.js
+ReactNativeClient/lib/themes/aritimDark.js
+ReactNativeClient/lib/themes/dark.js
+ReactNativeClient/lib/themes/dracula.js
+ReactNativeClient/lib/themes/light.js
+ReactNativeClient/lib/themes/nord.js
+ReactNativeClient/lib/themes/oledDark.js
+ReactNativeClient/lib/themes/solarizedDark.js
+ReactNativeClient/lib/themes/solarizedLight.js
+ReactNativeClient/lib/themes/type.js
+ReactNativeClient/lib/uuid.js
+ReactNativeClient/lib/versionInfo.js
+ReactNativeClient/PluginAssetsLoader.js
+ReactNativeClient/setUpQuickActions.js
+# AUTO-GENERATED - EXCLUDED TYPESCRIPT BUILD

CliClient/package-lock.json

@@ -4199,11 +4199,6 @@
       "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz",
       "integrity": "sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4="
     },
-    "memory-cache": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/memory-cache/-/memory-cache-0.2.0.tgz",
-      "integrity": "sha1-eJCwHVLADI68nVM+H46xfjA0hxo="
-    },
     "micromatch": {
       "version": "3.1.10",
       "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
@@ -5900,11 +5895,6 @@
         "is-fullwidth-code-point": "^2.0.0"
       }
     },
-    "slug": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/slug/-/slug-3.5.0.tgz",
-      "integrity": "sha512-+pZLDhMtmAc+ZcojQSMlUKDZBYmvhZiZmK8Ffx/D3Q/MIMHPDBAMbWvWN8vJb9xl2MfbDdRWxFzrdOhBiyVpow=="
-    },
     "snapdragon": {
       "version": "0.8.2",
       "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
@@ -6767,6 +6757,11 @@
       "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.1.tgz",
       "integrity": "sha1-+nG63UQ3r0wUiEHjs7Fl+enlkLc="
     },
+    "unorm": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/unorm/-/unorm-1.6.0.tgz",
+      "integrity": "sha512-b2/KCUlYZUeA7JFUuRJZPUtr4gZvBh7tavtv4fvk4+KV9pfGiR6CQAQAWl49ZpR3ts2dk4FYkP7EIgDJoiOLDA=="
+    },
     "unpack-string": {
       "version": "0.0.2",
       "resolved": "https://registry.npmjs.org/unpack-string/-/unpack-string-0.0.2.tgz",
@@ -6869,6 +6864,24 @@
       "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
       "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ=="
     },
+    "uslug": {
+      "version": "git+https://github.com/laurent22/uslug.git#ba2834d79beb0435318709958b2f5e817d96674d",
+      "from": "git+https://github.com/laurent22/uslug.git#emoji-support",
+      "requires": {
+        "node-emoji": "^1.10.0",
+        "unorm": ">= 1.0.0"
+      },
+      "dependencies": {
+        "node-emoji": {
+          "version": "1.10.0",
+          "resolved": "https://registry.npmjs.org/node-emoji/-/node-emoji-1.10.0.tgz",
+          "integrity": "sha512-Yt3384If5H6BYGVHiHwTL+99OzJKHhgp82S8/dktEK73T26BazdgZ4JZh92xSVtGNJvz9UbXdNAc5hcrXV42vw==",
+          "requires": {
+            "lodash.toarray": "^4.4.0"
+          }
+        }
+      }
+    },
     "util-deprecate": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",

CliClient/package.json

@@ -6,7 +6,7 @@
   "scripts": {
     "test": "gulp buildTests -L && node node_modules/jasmine/bin/jasmine.js --fail-fast=true --config=tests/support/jasmine.json",
     "test-ci": "gulp buildTests -L && node node_modules/jasmine/bin/jasmine.js --config=tests/support/jasmine.json",
-    "postinstall": "npm run build && patch-package --patch-dir ../patches",
+    "postinstall": "npm run build && patch-package --patch-dir ../patches/shared && patch-package --patch-dir ../patches/node",
     "build": "gulp build",
     "start": "gulp build -L && node 'build/main.js' --stack-trace-enabled --log-level debug --env dev"
   },
@@ -80,7 +80,6 @@
     "markdown-it-toc-done-right": "^4.1.0",
     "md5": "^2.2.1",
     "md5-file": "^4.0.0",
-    "memory-cache": "^0.2.0",
     "mime": "^2.0.3",
     "moment": "^2.24.0",
     "multiparty": "^4.2.1",
@@ -102,7 +101,6 @@
     "sax": "^1.2.4",
     "server-destroy": "^1.0.1",
     "sharp": "^0.23.2",
-    "slug": "^3.5.0",
     "sprintf-js": "^1.1.1",
     "sqlite3": "^4.1.1",
     "string-padding": "^1.0.2",
@@ -114,6 +112,7 @@
     "terminal-kit": "^1.30.0",
     "tkwidgets": "^0.5.26",
     "url-parse": "^1.4.7",
+    "uslug": "git+https://github.com/laurent22/uslug.git#emoji-support",
     "uuid": "^3.0.1",
     "valid-url": "^1.0.9",
     "word-wrap": "^1.2.3",

CliClient/tests/InMemoryCache.ts

@@ -0,0 +1,59 @@
+import InMemoryCache from 'lib/InMemoryCache';
+const { time } = require('lib/time-utils.js');
+
+describe('InMemoryCache', function() {
+
+	it('should get and set values', () => {
+		const cache = new InMemoryCache();
+
+		expect(cache.value('test')).toBe(undefined);
+		expect(cache.value('test', 'default')).toBe('default');
+
+		cache.setValue('test', 'something');
+		expect(cache.value('test')).toBe('something');
+
+		// Check we get the exact same object back (cache should not copy)
+		const someObj = { abcd: '123' };
+		cache.setValue('someObj', someObj);
+		expect(cache.value('someObj')).toBe(someObj);
+	});
+
+	it('should expire values', async () => {
+		const cache = new InMemoryCache();
+
+		// Check that the value is udefined once the cache has expired
+		cache.setValue('test', 'something', 500);
+		expect(cache.value('test')).toBe('something');
+		await time.msleep(510);
+		expect(cache.value('test')).toBe(undefined);
+
+		// Check that the TTL is reset every time setValue is called
+		cache.setValue('test', 'something', 300);
+		await time.msleep(100);
+		cache.setValue('test', 'something', 300);
+		await time.msleep(100);
+		cache.setValue('test', 'something', 300);
+		await time.msleep(100);
+		cache.setValue('test', 'something', 300);
+		await time.msleep(100);
+
+		expect(cache.value('test')).toBe('something');
+	});
+
+	it('should delete old records', async () => {
+		const cache = new InMemoryCache(5);
+
+		cache.setValue('1', '1');
+		cache.setValue('2', '2');
+		cache.setValue('3', '3');
+		cache.setValue('4', '4');
+		cache.setValue('5', '5');
+
+		expect(cache.value('1')).toBe('1');
+
+		cache.setValue('6', '6');
+
+		expect(cache.value('1')).toBe(undefined);
+	});
+
+});

CliClient/tests/services/plugins/api/JoplinSetting.ts

@@ -0,0 +1,16 @@
+// import Setting from 'lib/models/Setting';
+
+// const { asyncTest, setupDatabaseAndSynchronizer, switchClient, expectThrow, expectNotThrow } = require('../test-utils.js');
+
+// describe('plugin_api_JoplinSetting', function() {
+
+// 	beforeEach(async (done) => {
+// 		await setupDatabaseAndSynchronizer(1);
+// 		await switchClient(1);
+// 		done();
+// 	});
+
+// 	it('should get and set plugin-specific values', asyncTest(async () => {
+// 		await
+// 	}));
+// });

CliClient/tests/services_CommandService.ts

@@ -2,7 +2,7 @@ import MenuUtils from 'lib/services/commands/MenuUtils';
 import ToolbarButtonUtils from 'lib/services/commands/ToolbarButtonUtils';
 import CommandService, { CommandDeclaration, CommandRuntime } from 'lib/services/CommandService';
 
-const { asyncTest, setupDatabaseAndSynchronizer, switchClient } = require('test-utils.js');
+const { asyncTest, setupDatabaseAndSynchronizer, switchClient, expectThrow, expectNotThrow } = require('test-utils.js');
 
 interface TestCommand {
 	declaration: CommandDeclaration,
@@ -11,7 +11,12 @@ interface TestCommand {
 
 function newService():CommandService {
 	const service = new CommandService();
-	service.initialize({});
+	const mockStore = {
+		getState: () => {
+			return {};
+		},
+	};
+	service.initialize(mockStore, true);
 	return service;
 }
 
@@ -24,8 +29,7 @@ function createCommand(name:string, options:any):TestCommand {
 		execute: options.execute,
 	};
 
-	if (options.mapStateToProps) runtime.mapStateToProps = options.mapStateToProps;
-	if (options.isEnabled) runtime.isEnabled = options.isEnabled;
+	if (options.enabledCondition) runtime.enabledCondition = options.enabledCondition;
 
 	return { declaration, runtime };
 }
@@ -61,7 +65,7 @@ describe('services_CommandService', function() {
 			},
 		}));
 
-		const toolbarInfos = toolbarButtonUtils.commandsToToolbarButtons({}, ['test1', 'test2']);
+		const toolbarInfos = toolbarButtonUtils.commandsToToolbarButtons(['test1', 'test2'], {});
 
 		await toolbarInfos[0].onClick();
 		await toolbarInfos[1].onClick();
@@ -77,98 +81,78 @@ describe('services_CommandService', function() {
 
 		registerCommand(service, createCommand('test1', {
 			execute: () => {},
-			mapStateToProps: (state:any) => {
-				return {
-					selectedNoteId: state.selectedNoteId,
-					selectedFolderId: state.selectedFolderId,
-				};
-			},
-			isEnabled: (props:any) => {
-				return props.selectedNoteId === 'abc';
-			},
+			enabledCondition: 'oneNoteSelected',
 		}));
 
 		registerCommand(service, createCommand('test2', {
 			execute: () => {},
-			mapStateToProps: (state:any) => {
-				return {
-					selectedNoteId: state.selectedNoteId,
-					selectedFolderId: state.selectedFolderId,
-				};
-			},
-			isEnabled: (props:any) => {
-				return props.selectedNoteId === '123';
-			},
+			enabledCondition: 'multipleNotesSelected',
 		}));
 
-		const toolbarInfos = toolbarButtonUtils.commandsToToolbarButtons({
-			selectedNoteId: '123',
-			selectedFolderId: 'aaa',
-		}, ['test1', 'test2']);
+		const toolbarInfos = toolbarButtonUtils.commandsToToolbarButtons(['test1', 'test2'], {
+			oneNoteSelected: false,
+			multipleNotesSelected: true,
+		});
 
 		expect(toolbarInfos[0].enabled).toBe(false);
 		expect(toolbarInfos[1].enabled).toBe(true);
 	}));
 
+	it('should enable commands by default', asyncTest(async () => {
+		const service = newService();
+
+		registerCommand(service, createCommand('test1', {
+			execute: () => {},
+		}));
+
+		expect(service.isEnabled('test1', {})).toBe(true);
+	}));
+
 	it('should return the same toolbarButtons array if nothing has changed', asyncTest(async () => {
 		const service = newService();
 		const toolbarButtonUtils = new ToolbarButtonUtils(service);
 
 		registerCommand(service, createCommand('test1', {
 			execute: () => {},
-			mapStateToProps: (state:any) => {
-				return {
-					selectedNoteId: state.selectedNoteId,
-				};
-			},
-			isEnabled: (props:any) => {
-				return props.selectedNoteId === 'ok';
-			},
+			enabledCondition: 'cond1',
 		}));
 
 		registerCommand(service, createCommand('test2', {
 			execute: () => {},
-			mapStateToProps: (state:any) => {
-				return {
-					selectedFolderId: state.selectedFolderId,
-				};
-			},
-			isEnabled: (props:any) => {
-				return props.selectedFolderId === 'ok';
-			},
+			enabledCondition: 'cond2',
 		}));
 
-		const toolbarInfos1 = toolbarButtonUtils.commandsToToolbarButtons({
-			selectedNoteId: 'ok',
-			selectedFolderId: 'notok',
-		}, ['test1', 'test2']);
+		const toolbarInfos1 = toolbarButtonUtils.commandsToToolbarButtons(['test1', 'test2'], {
+			cond1: true,
+			cond2: false,
+		});
 
-		const toolbarInfos2 = toolbarButtonUtils.commandsToToolbarButtons({
-			selectedNoteId: 'ok',
-			selectedFolderId: 'notok',
-		}, ['test1', 'test2']);
+		const toolbarInfos2 = toolbarButtonUtils.commandsToToolbarButtons(['test1', 'test2'], {
+			cond1: true,
+			cond2: false,
+		});
 
 		expect(toolbarInfos1).toBe(toolbarInfos2);
 		expect(toolbarInfos1[0] === toolbarInfos2[0]).toBe(true);
 		expect(toolbarInfos1[1] === toolbarInfos2[1]).toBe(true);
 
-		const toolbarInfos3 = toolbarButtonUtils.commandsToToolbarButtons({
-			selectedNoteId: 'ok',
-			selectedFolderId: 'ok',
-		}, ['test1', 'test2']);
+		const toolbarInfos3 =  toolbarButtonUtils.commandsToToolbarButtons(['test1', 'test2'], {
+			cond1: true,
+			cond2: true,
+		});
 
 		expect(toolbarInfos2 === toolbarInfos3).toBe(false);
 		expect(toolbarInfos2[0] === toolbarInfos3[0]).toBe(true);
 		expect(toolbarInfos2[1] === toolbarInfos3[1]).toBe(false);
 
 		{
-			expect(toolbarButtonUtils.commandsToToolbarButtons({
-				selectedNoteId: 'ok',
-				selectedFolderId: 'notok',
-			}, ['test1', '-', 'test2'])).toBe(toolbarButtonUtils.commandsToToolbarButtons({
-				selectedNoteId: 'ok',
-				selectedFolderId: 'notok',
-			}, ['test1', '-', 'test2']));
+			expect(toolbarButtonUtils.commandsToToolbarButtons(['test1', '-', 'test2'], {
+				cond1: true,
+				cond2: false,
+			})).toBe(toolbarButtonUtils.commandsToToolbarButtons(['test1', '-', 'test2'], {
+				cond1: true,
+				cond2: false,
+			}));
 		}
 	}));
 
@@ -206,50 +190,37 @@ describe('services_CommandService', function() {
 		const utils = new MenuUtils(service);
 
 		registerCommand(service, createCommand('test1', {
-			mapStateToProps: (state:any) => {
-				return {
-					isOk: state.test1 === 'ok',
-				};
-			},
 			execute: () => {},
+			enabledCondition: 'cond1',
 		}));
 
 		registerCommand(service, createCommand('test2', {
-			mapStateToProps: (state:any) => {
-				return {
-					isOk: state.test2 === 'ok',
-				};
-			},
 			execute: () => {},
+			enabledCondition: 'cond2',
 		}));
 
 		{
-			const menuItemProps = utils.commandsToMenuItemProps({
-				test1: 'ok',
-				test2: 'notok',
-			}, ['test1', 'test2']);
+			const menuItemProps = utils.commandsToMenuItemProps(['test1', 'test2'], {
+				cond1: true,
+				cond2: false,
+			});
 
-			expect(menuItemProps.test1.isOk).toBe(true);
-			expect(menuItemProps.test2.isOk).toBe(false);
+			expect(menuItemProps.test1.enabled).toBe(true);
+			expect(menuItemProps.test2.enabled).toBe(false);
 		}
 
 		{
-			const menuItemProps = utils.commandsToMenuItemProps({
-				test1: 'ok',
-				test2: 'ok',
-			}, ['test1', 'test2']);
+			const menuItemProps = utils.commandsToMenuItemProps(['test1', 'test2'], {
+				cond1: true,
+				cond2: true,
+			});
 
-			expect(menuItemProps.test1.isOk).toBe(true);
-			expect(menuItemProps.test2.isOk).toBe(true);
+			expect(menuItemProps.test1.enabled).toBe(true);
+			expect(menuItemProps.test2.enabled).toBe(true);
 		}
 
-		expect(utils.commandsToMenuItemProps({
-			test1: 'ok',
-			test2: 'ok',
-		}, ['test1', 'test2'])).toBe(utils.commandsToMenuItemProps({
-			test1: 'ok',
-			test2: 'ok',
-		}, ['test1', 'test2']));
+		expect(utils.commandsToMenuItemProps(['test1', 'test2'], { cond1: true, cond2: true }))
+			.toBe(utils.commandsToMenuItemProps(['test1', 'test2'], { cond1: true, cond2: true }));
 	}));
 
 	it('should create stateful menu items', asyncTest(async () => {
@@ -259,20 +230,30 @@ describe('services_CommandService', function() {
 		let propValue = null;
 
 		registerCommand(service, createCommand('test1', {
-			mapStateToProps: (state:any) => {
-				return {
-					isOk: state.test1 === 'ok',
-				};
-			},
-			execute: (props:any) => {
-				propValue = props.isOk;
+			execute: (_context:any, greeting:string) => {
+				propValue = greeting;
 			},
 		}));
 
-		const menuItem = utils.commandToStatefulMenuItem('test1', { isOk: 'hello' });
+		const menuItem = utils.commandToStatefulMenuItem('test1', 'hello');
 		menuItem.click();
 
 		expect(propValue).toBe('hello');
 	}));
 
+	it('should throw an error for invalid when clause keys in dev mode', asyncTest(async () => {
+		const service = newService();
+
+		registerCommand(service, createCommand('test1', {
+			execute: () => {},
+			enabledCondition: 'cond1 && cond2',
+		}));
+
+		await expectThrow(async () => service.isEnabled('test1', {}));
+		await expectThrow(async () => service.isEnabled('test1', { cond1: true }));
+		await expectNotThrow(async () => service.isEnabled('test1', { cond1: true, cond2: true }));
+		await expectNotThrow(async () => service.isEnabled('test1', { cond1: true, cond2: false }));
+	}));
+
+
 });

CliClient/tests/services_PluginService.ts

@@ -2,7 +2,7 @@ import PluginRunner from '../app/services/plugins/PluginRunner';
 import PluginService from 'lib/services/plugins/PluginService';
 
 require('app-module-path').addPath(__dirname);
-const { asyncTest, setupDatabaseAndSynchronizer, switchClient } = require('test-utils.js');
+const { asyncTest, setupDatabaseAndSynchronizer, switchClient, expectThrow } = require('test-utils.js');
 const Note = require('lib/models/Note');
 const Folder = require('lib/models/Folder');
 
@@ -40,8 +40,7 @@ describe('services_PluginService', function() {
 
 	it('should load and run a simple plugin', asyncTest(async () => {
 		const service = newPluginService();
-		const plugin = await service.loadPlugin(`${testPluginDir}/simple`);
-		await service.runPlugin(plugin);
+		await service.loadAndRunPlugins([`${testPluginDir}/simple`]);
 
 		const allFolders = await Folder.all();
 		expect(allFolders.length).toBe(1);
@@ -55,9 +54,9 @@ describe('services_PluginService', function() {
 
 	it('should load and run a plugin that uses external packages', asyncTest(async () => {
 		const service = newPluginService();
-		const plugin = await service.loadPlugin(`${testPluginDir}/withExternalModules`);
+		await service.loadAndRunPlugins([`${testPluginDir}/withExternalModules`]);
+		const plugin = service.pluginById('withexternalmodules');
 		expect(plugin.id).toBe('withexternalmodules');
-		await service.runPlugin(plugin);
 
 		const allFolders = await Folder.all();
 		expect(allFolders.length).toBe(1);
@@ -78,4 +77,75 @@ describe('services_PluginService', function() {
 		expect(allFolders.map((f:any) => f.title).sort().join(', ')).toBe('multi - simple1, multi - simple2');
 	}));
 
+	it('should load plugins from JS bundles', asyncTest(async () => {
+		const service = newPluginService();
+
+		const plugin = await service.loadPluginFromString('example', '/tmp', `
+			/* joplin-manifest:
+			{
+				"manifest_version": 1,
+				"name": "JS Bundle test",
+				"description": "JS Bundle Test plugin",
+				"version": "1.0.0",
+				"author": "Laurent Cozic",
+				"homepage_url": "https://joplinapp.org"
+			}
+			*/
+			
+			joplin.plugins.register({
+				onStart: async function() {
+					await joplin.data.post(['folders'], null, { title: "my plugin folder" });
+				},
+			});
+		`);
+
+		await service.runPlugin(plugin);
+
+		expect(plugin.manifest.manifest_version).toBe(1);
+		expect(plugin.manifest.name).toBe('JS Bundle test');
+
+		const allFolders = await Folder.all();
+		expect(allFolders.length).toBe(1);
+	}));
+
+	it('should load plugins from JS bundle files', asyncTest(async () => {
+		const service = newPluginService();
+		await service.loadAndRunPlugins(`${testPluginDir}/jsbundles`);
+		expect(!!service.pluginById('example')).toBe(true);
+		expect((await Folder.all()).length).toBe(1);
+	}));
+
+	it('should validate JS bundles', asyncTest(async () => {
+		const invalidJsBundles = [
+			`
+				/* joplin-manifest:
+				{
+					"not_a_valid_manifest_at_all": 1
+				}
+				*/
+				
+				joplin.plugins.register({
+					onStart: async function() {},
+				});
+			`, `
+				/* joplin-manifest:
+				*/
+				
+				joplin.plugins.register({
+					onStart: async function() {},
+				});
+			`, `
+				joplin.plugins.register({
+					onStart: async function() {},
+				});
+			`, '',
+		];
+
+		const service = newPluginService();
+
+		for (const jsBundle of invalidJsBundles) {
+			await expectThrow(async () => await service.loadPluginFromString('example', '/tmp', jsBundle));
+		}
+	}));
+
 });

CliClient/tests/services_rest_Api.ts

@@ -146,7 +146,7 @@ describe('services_rest_Api', function() {
 		}));
 
 		const noteId = response.id;
-		
+
 		{
 			const note = await Note.load(noteId);
 			expect(note.latitude).toBe('48.73207100');
@@ -154,7 +154,7 @@ describe('services_rest_Api', function() {
 			expect(note.altitude).toBe('21.0000');
 		}
 
-		await api.route('PUT', 'notes/' + noteId, null, JSON.stringify({
+		await api.route('PUT', `notes/${noteId}`, null, JSON.stringify({
 			latitude: '49',
 			longitude: '-3',
 			altitude: '22',

CliClient/tests/support/jasmine.json

@@ -3,6 +3,7 @@
   "spec_files": [
     "*.js",
     "services/plugins/*.js",
+    "services/plugins/api/*.js",
     "!test-utils.js"
   ],
   "stopSpecOnExpectationFailure": false,

CliClient/tests/support/plugins/jsbundles/example.js

@@ -0,0 +1,16 @@
+/* joplin-manifest:
+{
+	"manifest_version": 1,
+	"name": "JS Bundle test",
+	"description": "JS Bundle Test plugin",
+	"version": "1.0.0",
+	"author": "Laurent Cozic",
+	"homepage_url": "https://joplinapp.org"
+}
+*/
+
+joplin.plugins.register({
+	onStart: async function() {
+		await joplin.data.post(['folders'], null, { title: "my plugin folder" });
+	},
+});

CliClient/tests/support/plugins/menu/.gitignore

@@ -0,0 +1,2 @@
+dist/*
+node_modules/

CliClient/tests/support/plugins/menu/README.md

@@ -0,0 +1,14 @@
+# Joplin Plugin
+
+This is a template to create a new Joplin plugin.
+
+The main two files you will want to look at are:
+
+- `/src/index.ts`, which contains the entry point for the plugin source code.
+- `/src/manifest.json`, which is the plugin manifest. It contains information such as the plugin a name, version, etc.
+
+The plugin is built using webpack, which create the compiled code in `/dist`. The project is setup to use TypeScript, although you can change the configuration to use plain JavaScript.
+
+## Building the plugin
+
+To build the plugin, simply run `npm run dist`.

CliClient/tests/support/plugins/menu/api/Global.d.ts

@@ -0,0 +1,15 @@
+import Plugin from '../Plugin';
+import Joplin from './Joplin';
+import Logger from 'lib/Logger';
+/**
+ * @ignore
+ */
+export default class Global {
+    private joplin_;
+    private requireWhiteList_;
+    constructor(logger: Logger, implementation: any, plugin: Plugin, store: any);
+    get joplin(): Joplin;
+    private requireWhiteList;
+    require(filePath: string): any;
+    get process(): any;
+}

CliClient/tests/support/plugins/menu/api/Joplin.d.ts

@@ -0,0 +1,38 @@
+import Plugin from '../Plugin';
+import JoplinData from './JoplinData';
+import JoplinPlugins from './JoplinPlugins';
+import JoplinWorkspace from './JoplinWorkspace';
+import JoplinFilters from './JoplinFilters';
+import JoplinCommands from './JoplinCommands';
+import JoplinViews from './JoplinViews';
+import JoplinInterop from './JoplinInterop';
+import JoplinSettings from './JoplinSettings';
+import Logger from 'lib/Logger';
+/**
+ * This is the main entry point to the Joplin API. You can access various services using the provided accessors.
+ */
+export default class Joplin {
+    private data_;
+    private plugins_;
+    private workspace_;
+    private filters_;
+    private commands_;
+    private views_;
+    private interop_;
+    private settings_;
+    constructor(logger: Logger, implementation: any, plugin: Plugin, store: any);
+    get data(): JoplinData;
+    get plugins(): JoplinPlugins;
+    get workspace(): JoplinWorkspace;
+    /**
+     * @ignore
+     *
+     * Not sure if it's the best way to hook into the app
+     * so for now disable filters.
+     */
+    get filters(): JoplinFilters;
+    get commands(): JoplinCommands;
+    get views(): JoplinViews;
+    get interop(): JoplinInterop;
+    get settings(): JoplinSettings;
+}

CliClient/tests/support/plugins/menu/api/JoplinCommands.d.ts

@@ -0,0 +1,51 @@
+import { Command } from './types';
+/**
+ * This class allows executing or registering new Joplin commands. Commands can be executed or associated with
+ * {@link JoplinViewsToolbarButtons | toolbar buttons} or {@link JoplinViewsMenuItems | menu items}.
+ *
+ * [View the demo plugin](https://github.com/laurent22/joplin/tree/dev/CliClient/tests/support/plugins/register_command)
+ *
+ * ## Executing Joplin's internal commands
+ *
+ * It is also possible to execute internal Joplin's commands which, as of now, are not well documented.
+ * You can find the list directly on GitHub though at the following locations:
+ *
+ * https://github.com/laurent22/joplin/tree/dev/ElectronClient/gui/MainScreen/commands
+ * https://github.com/laurent22/joplin/tree/dev/ElectronClient/commands
+ * https://github.com/laurent22/joplin/tree/dev/ElectronClient/gui/NoteEditor/commands/editorCommandDeclarations.ts
+ *
+ * To view what arguments are supported, you can open any of these files and look at the `execute()` command.
+ */
+export default class JoplinCommands {
+    /**
+     * <span class="platform-desktop">desktop</span> Executes the given command.
+     * The `props` are the arguments passed to the command, and they vary based on the command
+     *
+     * ```typescript
+     * // Create a new note in the current notebook:
+     * await joplin.commands.execute('newNote');
+     *
+     * // Create a new sub-notebook under the provided notebook
+     * // Note: internally, notebooks are called "folders".
+     * await joplin.commands.execute('newFolder', { parent_id: "SOME_FOLDER_ID" });
+     * ```
+     */
+    execute(commandName: string, props?: any): Promise<any>;
+    /**
+     * <span class="platform-desktop">desktop</span> Registers a new command.
+     *
+     * ```typescript
+     * // Register a new commmand called "testCommand1"
+     *
+     * await joplin.commands.register({
+     *     name: 'testCommand1',
+     *     label: 'My Test Command 1',
+     *     iconName: 'fas fa-music',
+     *     execute: () => {
+     *         alert('Testing plugin command 1');
+     *     },
+     * });
+     * ```
+     */
+    register(command: Command): Promise<void>;
+}

CliClient/tests/support/plugins/menu/api/JoplinData.d.ts

@@ -0,0 +1,47 @@
+import { Path } from './types';
+/**
+ * This module provides access to the Joplin data API: https://joplinapp.org/api/references/rest_api/
+ * This is the main way to retrieve data, such as notes, notebooks, tags, etc.
+ * or to update them or delete them.
+ *
+ * This is also what you would use to search notes, via the `search` endpoint.
+ *
+ * [View the demo plugin](https://github.com/laurent22/joplin/tree/dev/CliClient/tests/support/plugins/simple)
+ *
+ * In general you would use the methods in this class as if you were using a REST API. There are four methods that map to GET, POST, PUT and DELETE calls.
+ * And each method takes these parameters:
+ *
+ * * `path`: This is an array that represents the path to the resource in the form `["resouceName", "resourceId", "resourceLink"]` (eg. ["tags", ":id", "notes"]). The "resources" segment is the name of the resources you want to access (eg. "notes", "folders", etc.). If not followed by anything, it will refer to all the resources in that collection. The optional "resourceId" points to a particular resources within the collection. Finally, an optional "link" can be present, which links the resource to a collection of resources. This can be used in the API for example to retrieve all the notes associated with a tag.
+ * * `query`: (Optional) The query parameters. In a URL, this is the part after the question mark "?". In this case, it should be an object with key/value pairs.
+ * * `data`: (Optional) Applies to PUT and POST calls only. The request body contains the data you want to create or modify, for example the content of a note or folder.
+ * * `files`: (Optional) Used to create new resources and associate them with files.
+ *
+ * Please refer to the [Joplin API documentation](https://joplinapp.org/api/references/rest_api/) for complete details about each call. As the plugin runs within the Joplin application **you do not need an authorisation token** to use this API.
+ *
+ * For example:
+ *
+ * ```typescript
+ * // Get a note ID, title and body
+ * const noteId = 'some_note_id';
+ * const note = await joplin.data.get(['notes', noteId], { fields: ['id', 'title', 'body'] });
+ *
+ * // Get all folders
+ * const folders = await joplin.data.get(['folders']);
+ *
+ * // Set the note body
+ * await joplin.data.put(['notes', noteId], null, { body: "New note body" });
+ *
+ * // Create a new note under one of the folders
+ * await joplin.data.post(['notes'], null, { body: "my new note", title: "some title", parent_id: folders[0].id });
+ * ```
+ */
+export default class JoplinData {
+    private api_;
+    private pathSegmentRegex_;
+    private serializeApiBody;
+    private pathToString;
+    get(path: Path, query?: any): Promise<any>;
+    post(path: Path, query?: any, body?: any, files?: any[]): Promise<any>;
+    put(path: Path, query?: any, body?: any, files?: any[]): Promise<any>;
+    delete(path: Path, query?: any): Promise<any>;
+}

CliClient/tests/support/plugins/menu/api/JoplinFilters.d.ts

@@ -0,0 +1,10 @@
+/**
+ * @ignore
+ *
+ * Not sure if it's the best way to hook into the app
+ * so for now disable filters.
+ */
+export default class JoplinFilters {
+    on(name: string, callback: Function): Promise<void>;
+    off(name: string, callback: Function): Promise<void>;
+}

CliClient/tests/support/plugins/menu/api/JoplinInterop.d.ts

@@ -0,0 +1,17 @@
+import { ExportModule, ImportModule } from './types';
+/**
+ * Provides a way to create modules to import external data into Joplin or to export notes into any arbitrary format.
+ *
+ * [View the demo plugin](https://github.com/laurent22/joplin/tree/dev/CliClient/tests/support/plugins/json_export)
+ *
+ * To implement an import or export module, you would simply define an object with various event handlers that are called
+ * by the application during the import/export process.
+ *
+ * See the documentation of the [[ExportModule]] and [[ImportModule]] for more information.
+ *
+ * You may also want to refer to the Joplin API documentation to see the list of properties for each item (note, notebook, etc.) - https://joplinapp.org/api/references/rest_api/
+ */
+export default class JoplinInterop {
+    registerExportModule(module: ExportModule): Promise<void>;
+    registerImportModule(module: ImportModule): Promise<void>;
+}

CliClient/tests/support/plugins/menu/api/JoplinPlugins.d.ts

@@ -0,0 +1,24 @@
+import Plugin from '../Plugin';
+import Logger from 'lib/Logger';
+import { Script } from './types';
+/**
+ * This class provides access to plugin-related features.
+ */
+export default class JoplinPlugins {
+    private logger;
+    private plugin;
+    constructor(logger: Logger, plugin: Plugin);
+    /**
+     * Registers a new plugin. This is the entry point when creating a plugin. You should pass a simple object with an `onStart` method to it.
+     * That `onStart` method will be executed as soon as the plugin is loaded.
+     *
+     * ```typescript
+     * joplin.plugins.register({
+     *     onStart: async function() {
+     *         // Run your plugin code here
+     *     }
+     * });
+     * ```
+     */
+    register(script: Script): Promise<void>;
+}

CliClient/tests/support/plugins/menu/api/JoplinSettings.d.ts

@@ -0,0 +1,43 @@
+import Plugin from '../Plugin';
+import { SettingItem, SettingSection } from './types';
+/**
+ * This API allows registering new settings and setting sections, as well as getting and setting settings. Once a setting has been registered it will appear in the config screen and be editable by the user.
+ *
+ * Settings are essentially key/value pairs.
+ *
+ * Note: Currently this API does **not** provide access to Joplin's built-in settings. This is by design as plugins that modify user settings could give unexpected results
+ *
+ * [View the demo plugin](https://github.com/laurent22/joplin/tree/dev/CliClient/tests/support/plugins/settings)
+ */
+export default class JoplinSettings {
+    private plugin_;
+    constructor(plugin: Plugin);
+    private namespacedKey;
+    /**
+     * Registers a new setting. Note that registering a setting item is dynamic and will be gone next time Joplin starts.
+     * What it means is that you need to register the setting every time the plugin starts (for example in the onStart event).
+     * The setting value however will be preserved from one launch to the next so there is no risk that it will be lost even if for some
+     * reason the plugin fails to start at some point.
+     */
+    registerSetting(key: string, settingItem: SettingItem): Promise<void>;
+    /**
+     * Registers a new setting section. Like for registerSetting, it is dynamic and needs to be done every time the plugin starts.
+     */
+    registerSection(name: string, section: SettingSection): Promise<void>;
+    /**
+     * Gets a setting value (only applies to setting you registered from your plugin)
+     */
+    value(key: string): Promise<any>;
+    /**
+     * Sets a setting value (only applies to setting you registered from your plugin)
+     */
+    setValue(key: string, value: any): Promise<void>;
+    /**
+     * Gets a global setting value, including app-specific settings and those set by other plugins.
+     *
+     * The list of available settings is not documented yet, but can be found by looking at the source code:
+     *
+     * https://github.com/laurent22/joplin/blob/3539a452a359162c461d2849829d2d42973eab50/ReactNativeClient/lib/models/Setting.ts#L142
+     */
+    globalValue(key: string): Promise<any>;
+}

CliClient/tests/support/plugins/menu/api/JoplinViews.d.ts

@@ -0,0 +1,28 @@
+import Plugin from '../Plugin';
+import JoplinViewsDialogs from './JoplinViewsDialogs';
+import JoplinViewsMenuItems from './JoplinViewsMenuItems';
+import JoplinViewsMenus from './JoplinViewsMenus';
+import JoplinViewsToolbarButtons from './JoplinViewsToolbarButtons';
+import JoplinViewsPanels from './JoplinViewsPanels';
+/**
+ * This namespace provides access to view-related services.
+ *
+ * All view services provide a `create()` method which you would use to create the view object, whether it's a dialog, a toolbar button or a menu item.
+ * In some cases, the `create()` method will return a [[ViewHandle]], which you would use to act on the view, for example to set certain properties or call some methods.
+ */
+export default class JoplinViews {
+    private store;
+    private plugin;
+    private dialogs_;
+    private panels_;
+    private menuItems_;
+    private menus_;
+    private toolbarButtons_;
+    private implementation_;
+    constructor(implementation: any, plugin: Plugin, store: any);
+    get dialogs(): JoplinViewsDialogs;
+    get panels(): JoplinViewsPanels;
+    get menuItems(): JoplinViewsMenuItems;
+    get menus(): JoplinViewsMenus;
+    get toolbarButtons(): JoplinViewsToolbarButtons;
+}

CliClient/tests/support/plugins/menu/api/JoplinViewsDialogs.d.ts

@@ -0,0 +1,36 @@
+import Plugin from '../Plugin';
+import { ButtonSpec, ViewHandle, ButtonId } from './types';
+/**
+ * Allows creating and managing dialogs. A dialog is modal window that contains a webview and a row of buttons. You can update the update the webview using the `setHtml` method.
+ * Dialogs are hidden by default and you need to call `open()` to open them. Once the user clicks on a button, the `open` call will return and provide the button ID that was
+ * clicked on. There is currently no "close" method since the dialog should be thought as a modal one and thus can only be closed by clicking on one of the buttons.
+ *
+ * [View the demo plugin](https://github.com/laurent22/joplin/tree/dev/CliClient/tests/support/plugins/dialog)
+ */
+export default class JoplinViewsDialogs {
+    private store;
+    private plugin;
+    private implementation_;
+    constructor(implementation: any, plugin: Plugin, store: any);
+    private controller;
+    /**
+     * Creates a new dialog
+     */
+    create(): Promise<ViewHandle>;
+    /**
+     * Displays a message box with OK/Cancel buttons. Returns the button index that was clicked - "0" for OK and "1" for "Cancel"
+     */
+    showMessageBox(message: string): Promise<number>;
+    /**
+     * Sets the dialog HTML content
+     */
+    setHtml(handle: ViewHandle, html: string): Promise<string>;
+    /**
+     * Sets the dialog buttons.
+     */
+    setButtons(handle: ViewHandle, buttons: ButtonSpec[]): Promise<ButtonSpec[]>;
+    /**
+     * Opens the dialog
+     */
+    open(handle: ViewHandle): Promise<ButtonId>;
+}

CliClient/tests/support/plugins/menu/api/JoplinViewsMenuItems.d.ts

@@ -0,0 +1,16 @@
+import { CreateMenuItemOptions, MenuItemLocation } from './types';
+import Plugin from '../Plugin';
+/**
+ * Allows creating and managing menu items.
+ *
+ * [View the demo plugin](https://github.com/laurent22/joplin/tree/dev/CliClient/tests/support/plugins/register_command)
+ */
+export default class JoplinViewsMenuItems {
+    private store;
+    private plugin;
+    constructor(plugin: Plugin, store: any);
+    /**
+     * Creates a new menu item and associate it with the given command. You can specify under which menu the item should appear using the `location` parameter.
+     */
+    create(commandName: string, location?: MenuItemLocation, options?: CreateMenuItemOptions): Promise<void>;
+}

CliClient/tests/support/plugins/menu/api/JoplinViewsMenus.d.ts

@@ -0,0 +1,18 @@
+import { MenuItem, MenuItemLocation } from './types';
+import Plugin from '../Plugin';
+/**
+ * Allows creating menus.
+ *
+ * [View the demo plugin](https://github.com/laurent22/joplin/tree/dev/CliClient/tests/support/plugins/menu)
+ */
+export default class JoplinViewsMenus {
+    private store;
+    private plugin;
+    constructor(plugin: Plugin, store: any);
+    private registerCommandAccelerators;
+    /**
+     * Creates a new menu from the provided menu items and place it at the given location. As of now, it is only possible to place the
+     * menu as a sub-menu of the application build-in menus.
+     */
+    create(label: string, menuItems: MenuItem[], location?: MenuItemLocation): Promise<void>;
+}

CliClient/tests/support/plugins/menu/api/JoplinViewsPanels.d.ts

@@ -0,0 +1,30 @@
+import Plugin from '../Plugin';
+import { ViewHandle } from './types';
+/**
+ * Allows creating and managing view panels. View panels currently are displayed at the right of the sidebar and allows displaying any HTML content (within a webview) and update it in real-time. For example
+ * it could be used to display a table of content for the active note, or display various metadata or graph.
+ *
+ * [View the demo plugin](https://github.com/laurent22/joplin/tree/dev/CliClient/tests/support/plugins/toc)
+ */
+export default class JoplinViewsPanels {
+    private store;
+    private plugin;
+    constructor(plugin: Plugin, store: any);
+    private controller;
+    /**
+     * Creates a new panel
+     */
+    create(): Promise<ViewHandle>;
+    /**
+     * Sets the panel webview HTML
+     */
+    setHtml(handle: ViewHandle, html: string): Promise<string>;
+    /**
+     * Adds and loads a new JS or CSS files into the panel.
+     */
+    addScript(handle: ViewHandle, scriptPath: string): Promise<void>;
+    /**
+     * Called when a message is sent from the webview (using postMessage).
+     */
+    onMessage(handle: ViewHandle, callback: Function): Promise<void>;
+}

CliClient/tests/support/plugins/menu/api/JoplinViewsToolbarButtons.d.ts

@@ -0,0 +1,16 @@
+import { ToolbarButtonLocation } from './types';
+import Plugin from '../Plugin';
+/**
+ * Allows creating and managing toolbar buttons.
+ *
+ * [View the demo plugin](https://github.com/laurent22/joplin/tree/dev/CliClient/tests/support/plugins/register_command)
+ */
+export default class JoplinViewsToolbarButtons {
+    private store;
+    private plugin;
+    constructor(plugin: Plugin, store: any);
+    /**
+     * Creates a new toolbar button and associate it with the given command.
+     */
+    create(commandName: string, location: ToolbarButtonLocation): Promise<void>;
+}

CliClient/tests/support/plugins/menu/api/JoplinWorkspace.d.ts

@@ -0,0 +1,34 @@
+/**
+ * The workspace service provides access to all the parts of Joplin that are being worked on - i.e. the currently selected notes or notebooks as well
+ * as various related events, such as when a new note is selected, or when the note content changes.
+ *
+ * [View the demo plugin](https://github.com/laurent22/joplin/tree/dev/CliClient/tests/support/plugins)
+ */
+export default class JoplinWorkspace {
+    private store;
+    constructor(_implementation: any, store: any);
+    /**
+     * Called when a new note or notes are selected.
+     */
+    onNoteSelectionChange(callback: Function): Promise<void>;
+    /**
+     * Called when the content of a note changes.
+     */
+    onNoteContentChange(callback: Function): Promise<void>;
+    /**
+     * Called when an alarm associated with a to-do is triggered.
+     */
+    onNoteAlarmTrigger(callback: Function): Promise<void>;
+    /**
+     * Called when the synchronisation process has finished.
+     */
+    onSyncComplete(callback: Function): Promise<void>;
+    /**
+     * Gets the currently selected note
+     */
+    selectedNote(): Promise<any>;
+    /**
+     * Gets the IDs of the selected notes (can be zero, one, or many). Use the data API to retrieve information about these notes.
+     */
+    selectedNoteIds(): Promise<string[]>;
+}

CliClient/tests/support/plugins/menu/api/index.ts

@@ -0,0 +1,5 @@
+import type Joplin from './Joplin';
+
+declare const joplin:Joplin;
+
+export default joplin; 

CliClient/tests/support/plugins/menu/api/types.ts

@@ -0,0 +1,263 @@
+// =================================================================
+// Command API types
+// =================================================================
+
+export interface Command {
+	name: string
+	label: string
+	iconName?: string,
+	execute(props:any):Promise<any>
+	isEnabled?(props:any):boolean
+	mapStateToProps?(state:any):any
+}
+
+// =================================================================
+// Interop API types
+// =================================================================
+
+export enum FileSystemItem {
+	File = 'file',
+	Directory = 'directory',
+}
+
+export enum ImportModuleOutputFormat {
+	Markdown = 'md',
+	Html = 'html',
+}
+
+/**
+ * Used to implement a module to export data from Joplin. [View the demo plugin](https://github.com/laurent22/joplin/tree/dev/CliClient/tests/support/plugins/json_export) for an example.
+ *
+ * In general, all the event handlers you'll need to implement take a `context` object as a first argument. This object will contain the export or import path as well as various optional properties, such as which notes or notebooks need to be exported.
+ *
+ * To get a better sense of what it will contain it can be useful to print it using `console.info(context)`.
+ */
+export interface ExportModule {
+	/**
+	 * The format to be exported, eg "enex", "jex", "json", etc.
+	 */
+	format: string,
+
+	/**
+	 * The description that will appear in the UI, for example in the menu item.
+	 */
+	description: string,
+
+	/**
+	 * Whether the module will export a single file or multiple files in a directory. It affects the open dialog that will be presented to the user when using your exporter.
+	 */
+	target: FileSystemItem,
+
+	/**
+	 * Only applies to single file exporters or importers
+	 * It tells whether the format can package multiple notes into one file.
+	 * For example JEX or ENEX can, but HTML cannot.
+	 */
+	isNoteArchive: boolean,
+
+	/**
+	 * The extensions of the files exported by your module. For example, it is `["htm", "html"]` for the HTML module, and just `["jex"]` for the JEX module.
+	 */
+	fileExtensions?: string[],
+
+	/**
+	 * Called when the export process starts.
+	 */
+	onInit(context:ExportContext): Promise<void>;
+
+	/**
+	 * Called when an item needs to be processed. An "item" can be any Joplin object, such as a note, a folder, a notebook, etc.
+	 */
+	onProcessItem(context:ExportContext, itemType:number, item:any):Promise<void>;
+
+	/**
+	 * Called when a resource file needs to be exported.
+	 */
+	onProcessResource(context:ExportContext, resource:any, filePath:string):Promise<void>;
+
+	/**
+	 * Called when the export process is done.
+	 */
+	onClose(context:ExportContext):Promise<void>;
+}
+
+export interface ImportModule {
+	/**
+	 * The format to be exported, eg "enex", "jex", "json", etc.
+	 */
+	format: string,
+
+	/**
+	 * The description that will appear in the UI, for example in the menu item.
+	 */
+	description: string,
+
+	/**
+	 * Only applies to single file exporters or importers
+	 * It tells whether the format can package multiple notes into one file.
+	 * For example JEX or ENEX can, but HTML cannot.
+	 */
+	isNoteArchive: boolean,
+
+	/**
+	 * The type of sources that are supported by the module. Tells whether the module can import files or directories or both.
+	 */
+	sources: FileSystemItem[],
+
+	/**
+	 * Tells the file extensions of the exported files.
+	 */
+	fileExtensions?: string[],
+
+	/**
+	 * Tells the type of notes that will be generated, either HTML or Markdown (default).
+	 */
+	outputFormat?: ImportModuleOutputFormat,
+
+	/**
+	 * Called when the import process starts. There is only one event handler within which you should import the complete data.
+	 */
+	onExec(context:ImportContext): Promise<void>;
+}
+
+export interface ExportOptions {
+	format?: string,
+	path?:string,
+	sourceFolderIds?: string[],
+	sourceNoteIds?: string[],
+	modulePath?:string,
+	target?:FileSystemItem,
+}
+
+export interface ExportContext {
+	destPath: string,
+	options: ExportOptions,
+
+	/**
+	 * You can attach your own custom data using this propery - it will then be passed to each event handler, allowing you to keep state from one event to the next.
+	 */
+	userData?: any,
+}
+
+export interface ImportContext {
+	sourcePath: string,
+	options: any,
+	warnings: string[],
+}
+
+// =================================================================
+// Misc types
+// =================================================================
+
+export interface Script {
+	onStart?(event:any):Promise<void>,
+}
+
+// =================================================================
+// Menu types
+// =================================================================
+
+export interface CreateMenuItemOptions {
+	accelerator: string,
+}
+
+export enum MenuItemLocation {
+	File = 'file',
+	Edit = 'edit',
+	View = 'view',
+	Note = 'note',
+	Tools = 'tools',
+	Help = 'help',
+	Context = 'context',
+}
+
+export interface MenuItem {
+	commandName?: string,
+	accelerator?: string,
+	submenu?: MenuItem[],
+	label?: string,
+}
+
+// =================================================================
+// View API types
+// =================================================================
+
+export interface ButtonSpec {
+	id: ButtonId,
+	title?: string,
+	onClick?():void,
+}
+
+export type ButtonId = string;
+
+export enum ToolbarButtonLocation {
+	/**
+	 * This toolbar in the top right corner of the application. It applies to the note as a whole, including its metadata.
+	 */
+	NoteToolbar = 'noteToolbar',
+
+	/**
+	 * This toolbar is right above the text editor. It applies to the note body only.
+	 */
+	EditorToolbar = 'editorToolbar',
+}
+
+export type ViewHandle = string;
+
+export interface EditorCommand {
+	name: string;
+	value?: any;
+}
+
+// =================================================================
+// Settings types
+// =================================================================
+
+export enum SettingItemType {
+	Int = 1,
+	String = 2,
+	Bool = 3,
+	Array = 4,
+	Object = 5,
+	Button = 6,
+}
+
+// Redefine a simplified interface to mask internal details
+// and to remove function calls as they would have to be async.
+export interface SettingItem {
+	value: any,
+	type: SettingItemType,
+	public: boolean,
+	label:string,
+
+	description?:string,
+	isEnum?: boolean,
+	section?: string,
+	options?:any,
+	appTypes?:string[],
+	secure?: boolean,
+	advanced?: boolean,
+	minimum?: number,
+	maximum?: number,
+	step?: number,
+}
+
+export interface SettingSection {
+	label: string,
+	iconName?: string,
+	description?: string,
+	name?: string,
+}
+
+// =================================================================
+// Data API types
+// =================================================================
+
+/**
+ * An array of at least one element and at most three elements.
+ *
+ * [0]: Resource name (eg. "notes", "folders", "tags", etc.)
+ * [1]: (Optional) Resource ID.
+ * [2]: (Optional) Resource link.
+ */
+export type Path = string[];

CliClient/tests/support/plugins/menu/package.json

@@ -0,0 +1,20 @@
+{
+  "name": "joplin_plugin",
+  "version": "1.0.0",
+  "description": "",
+  "scripts": {
+    "dist": "webpack",
+    "postinstall": "npm run dist"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "MIT",
+  "devDependencies": {
+    "@types/node": "^14.0.14",
+    "copy-webpack-plugin": "^6.1.0",
+    "ts-loader": "^7.0.5",
+    "typescript": "^3.9.3",
+    "webpack": "^4.43.0",
+    "webpack-cli": "^3.3.11"
+  }
+}

CliClient/tests/support/plugins/menu/src/index.ts

@@ -0,0 +1,25 @@
+import joplin from 'api';
+
+joplin.plugins.register({
+	onStart: async function() {
+		await joplin.views.menus.create('My Menu', [
+			{
+				commandName: "newNote",
+			},
+			{
+				commandName: "newFolder",
+			},
+			{
+				label: 'My sub-menu',
+				submenu: [
+					{
+						commandName: 'print',
+					},
+					{
+						commandName: 'setTags',
+					},
+				],
+			},
+		]);
+	},
+});

CliClient/tests/support/plugins/menu/src/manifest.json

@@ -0,0 +1,8 @@
+{
+	"manifest_version": 1,
+	"name": "Menu Test",
+	"description": "",
+	"version": "1.0.0",
+	"author": "",
+	"homepage_url": ""
+}

CliClient/tests/support/plugins/menu/tsconfig.json

@@ -0,0 +1,10 @@
+{
+	"compilerOptions": {
+		"outDir": "./dist/",
+		"module": "commonjs",
+		"target": "es2015",
+		"jsx": "react",
+		"allowJs": true,
+		"baseUrl": "."
+	}
+}

CliClient/tests/support/plugins/menu/webpack.config.js

@@ -0,0 +1,44 @@
+const path = require('path');
+const CopyPlugin = require('copy-webpack-plugin');
+
+module.exports = {
+	mode: 'production',
+	entry: './src/index.ts',
+	target: 'node',
+	module: {
+		rules: [
+			{
+				test: /\.tsx?$/,
+				use: 'ts-loader',
+				exclude: /node_modules/,
+			},
+		],
+	},
+	resolve: {
+		alias: {
+			api: path.resolve(__dirname, 'api')
+		},
+		extensions: [ '.tsx', '.ts', '.js' ],
+	},
+	output: {
+		filename: 'index.js',
+		path: path.resolve(__dirname, 'dist'),
+	},
+	plugins: [
+		new CopyPlugin({
+			patterns: [
+				{
+					from: "**/*",
+					context: path.resolve(__dirname, 'src'),
+					to: path.resolve(__dirname, 'dist'),
+					globOptions: {
+						ignore: [
+							'**/*.ts',
+							'**/*.tsx',
+						],
+					},
+				},
+			],
+		}),
+	],
+};

CliClient/tests/support/plugins/selected_text/src/index.ts

@@ -45,7 +45,7 @@ joplin.plugins.register({
 					newLines.push(newCells.join(' | '));
 				}
 
-				await joplin.commands.execute('replaceSelection', { value: newLines.join('\n') });
+				await joplin.commands.execute('replaceSelection', newLines.join('\n'));
 			},
 		});
 		

CliClient/tests/support/plugins/toc/package-lock.json

@@ -2420,6 +2420,11 @@
         "path-exists": "^3.0.0"
       }
     },
+    "lodash.toarray": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/lodash.toarray/-/lodash.toarray-4.4.0.tgz",
+      "integrity": "sha1-JMS/zWsvuji/0FlNsRedjptlZWE="
+    },
     "lru-cache": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
@@ -2741,6 +2746,14 @@
       "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
       "dev": true
     },
+    "node-emoji": {
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/node-emoji/-/node-emoji-1.10.0.tgz",
+      "integrity": "sha512-Yt3384If5H6BYGVHiHwTL+99OzJKHhgp82S8/dktEK73T26BazdgZ4JZh92xSVtGNJvz9UbXdNAc5hcrXV42vw==",
+      "requires": {
+        "lodash.toarray": "^4.4.0"
+      }
+    },
     "node-libs-browser": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.2.1.tgz",
@@ -3429,11 +3442,6 @@
       "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
       "dev": true
     },
-    "slug": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/slug/-/slug-3.3.4.tgz",
-      "integrity": "sha512-VpHbtRCEWmgaZsrZcTsVl/Dhw98lcrOYDO17DNmJCNpppI6s3qJvnNu2Q3D4L84/2bi6vkW40mjNQI9oGQsflg=="
-    },
     "snapdragon": {
       "version": "0.8.2",
       "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
@@ -3981,6 +3989,11 @@
         "imurmurhash": "^0.1.4"
       }
     },
+    "unorm": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/unorm/-/unorm-1.6.0.tgz",
+      "integrity": "sha512-b2/KCUlYZUeA7JFUuRJZPUtr4gZvBh7tavtv4fvk4+KV9pfGiR6CQAQAWl49ZpR3ts2dk4FYkP7EIgDJoiOLDA=="
+    },
     "unset-value": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
@@ -4067,6 +4080,14 @@
       "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
       "dev": true
     },
+    "uslug": {
+      "version": "git+https://github.com/laurent22/uslug.git#ba2834d79beb0435318709958b2f5e817d96674d",
+      "from": "git+https://github.com/laurent22/uslug.git#emoji-support",
+      "requires": {
+        "node-emoji": "^1.10.0",
+        "unorm": ">= 1.0.0"
+      }
+    },
     "util": {
       "version": "0.11.1",
       "resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz",

CliClient/tests/support/plugins/toc/package.json

@@ -20,6 +20,6 @@
     "webpack-cli": "^3.3.11"
   },
   "dependencies": {
-    "slug": "^3.3.4"
+    "uslug": "git+https://github.com/laurent22/uslug.git#emoji-support"
   }
 }

CliClient/tests/support/plugins/toc/src/index.ts

@@ -1,6 +1,6 @@
 import joplin from 'api';
 
-const nodeSlug = require('slug');
+const uslug = require('uslug');
 
 // From https://stackoverflow.com/a/6234804/561309
 function escapeHtml(unsafe:string) {
@@ -29,7 +29,7 @@ function noteHeaders(noteBody:string) {
 let slugs:any = {};
 
 function headerSlug(headerText:string) {
-	const s = nodeSlug(headerText);
+	const s = uslug(headerText);
 	let num = slugs[s] ? slugs[s] : 1;
 	const output = [s];
 	if (num > 1) output.push(num);
@@ -49,9 +49,7 @@ joplin.plugins.register({
 
 		panels.onMessage(view, (message:any) => {
 			if (message.name === 'scrollToHash') {
-				joplin.commands.execute('scrollToHash', {
-					hash: message.hash,
-				})
+				joplin.commands.execute('scrollToHash', message.hash)
 			}
 		});
 

ElectronClient/InteropServiceHelper.ts

@@ -155,7 +155,7 @@ export default class InteropServiceHelper {
 
 		if (Array.isArray(path)) path = path[0];
 
-		CommandService.instance().execute('showModalMessage', { message: _('Exporting to "%s" as "%s" format. Please wait...', path, module.format) });
+		CommandService.instance().execute('showModalMessage', _('Exporting to "%s" as "%s" format. Please wait...', path, module.format));
 
 		const exportOptions:ExportOptions = {};
 		exportOptions.path = path;

ElectronClient/app.ts

@@ -58,7 +58,7 @@ const commands = [
 	require('./gui/MainScreen/commands/showNoteProperties'),
 	require('./gui/MainScreen/commands/showShareNoteDialog'),
 	require('./gui/MainScreen/commands/toggleNoteList'),
-	require('./gui/MainScreen/commands/toggleSidebar'),
+	require('./gui/MainScreen/commands/toggleSideBar'),
 	require('./gui/MainScreen/commands/toggleVisiblePanes'),
 	require('./gui/MainScreen/commands/toggleEditors'),
 	require('./gui/NoteEditor/commands/focusElementNoteBody'),
@@ -85,7 +85,7 @@ const globalCommands = [
 const editorCommandDeclarations = require('./gui/NoteEditor/commands/editorCommandDeclarations').default;
 
 const pluginClasses = [
-	require('./plugins/GotoAnything.min'),
+	require('./plugins/GotoAnything').default,
 ];
 
 interface AppStateRoute {
@@ -466,14 +466,14 @@ class Application extends BaseApplication {
 	async start(argv:string[]):Promise<any> {
 		const electronIsDev = require('electron-is-dev');
 
-		await fs.mkdirp(Setting.value('templateDir'), 0o755);
-
 		// If running inside a package, the command line, instead of being "node.exe <path> <flags>" is "joplin.exe <flags>" so
 		// insert an extra argument so that they can be processed in a consistent way everywhere.
 		if (!electronIsDev) argv.splice(1, 0, '.');
 
 		argv = await super.start(argv);
 
+		await fs.mkdirp(Setting.value('templateDir'), 0o755);
+
 		await this.applySettingsSideEffects();
 
 		if (Setting.value('sync.upgradeState') === Setting.SYNC_UPGRADE_STATE_MUST_DO) {
@@ -513,7 +513,7 @@ class Application extends BaseApplication {
 
 		this.initRedux();
 
-		CommandService.instance().initialize(this.store());
+		CommandService.instance().initialize(this.store(), Setting.value('env') == 'dev');
 
 		for (const command of commands) {
 			CommandService.instance().registerDeclaration(command.declaration);

ElectronClient/commands/focusElement.ts

@@ -6,7 +6,7 @@ export const declaration:CommandDeclaration = {
 
 export const runtime = ():CommandRuntime => {
 	return {
-		execute: async ({ target }:any) => {
+		execute: async (_context:any, target:string) => {
 			if (target === 'noteBody') return CommandService.instance().execute('focusElementNoteBody');
 			if (target === 'noteList') return CommandService.instance().execute('focusElementNoteList');
 			if (target === 'sideBar') return CommandService.instance().execute('focusElementSideBar');

ElectronClient/commands/startExternalEditing.ts

@@ -1,13 +1,10 @@
-import { CommandRuntime, CommandDeclaration } from '../lib/services/CommandService';
+import { CommandRuntime, CommandDeclaration, CommandContext } from 'lib/services/CommandService';
 import { _ } from 'lib/locale';
+import { stateUtils } from 'lib/reducer';
 const Note = require('lib/models/Note');
 const ExternalEditWatcher = require('lib/services/ExternalEditWatcher');
 const bridge = require('electron').remote.require('./bridge').default;
 
-interface Props {
-	noteId: string
-}
-
 export const declaration:CommandDeclaration = {
 	name: 'startExternalEditing',
 	label: () => _('Edit in external editor'),
@@ -16,21 +13,16 @@ export const declaration:CommandDeclaration = {
 
 export const runtime = ():CommandRuntime => {
 	return {
-		execute: async (props:Props) => {
+		execute: async (context:CommandContext, noteId:string = null) => {
+			noteId = noteId || stateUtils.selectedNoteId(context.state);
+
 			try {
-				const note = await Note.load(props.noteId);
+				const note = await Note.load(noteId);
 				ExternalEditWatcher.instance().openAndWatch(note);
 			} catch (error) {
 				bridge().showErrorMessageBox(_('Error opening note in editor: %s', error.message));
 			}
 		},
-		isEnabled: (props:any) => {
-			return !!props.noteId;
-		},
-		mapStateToProps: (state:any) => {
-			return {
-				noteId: state.selectedNoteIds.length === 1 ? state.selectedNoteIds[0] : null,
-			};
-		},
+		enabledCondition: 'oneNoteSelected',
 	};
 };

ElectronClient/commands/stopExternalEditing.ts

@@ -1,11 +1,8 @@
-import { CommandRuntime, CommandDeclaration } from '../lib/services/CommandService';
+import { CommandRuntime, CommandDeclaration, CommandContext } from 'lib/services/CommandService';
 import { _ } from 'lib/locale';
+import { stateUtils } from 'lib/reducer';
 const ExternalEditWatcher = require('lib/services/ExternalEditWatcher');
 
-interface Props {
-	noteId: string
-}
-
 export const declaration:CommandDeclaration = {
 	name: 'stopExternalEditing',
 	label: () => _('Stop external editing'),
@@ -14,14 +11,10 @@ export const declaration:CommandDeclaration = {
 
 export const runtime = ():CommandRuntime => {
 	return {
-		execute: async (props:Props) => {
-			ExternalEditWatcher.instance().stopWatching(props.noteId);
-		},
-		isEnabled: (props:any) => {
-			return !!props.noteId;
-		},
-		mapStateToProps: (state:any) => {
-			return { noteId: state.selectedNoteIds.length === 1 ? state.selectedNoteIds[0] : null };
+		execute: async (context:CommandContext, noteId:string = null) => {
+			noteId = noteId || stateUtils.selectedNoteId(context.state);
+			ExternalEditWatcher.instance().stopWatching(noteId);
 		},
+		enabledCondition: 'oneNoteSelected',
 	};
 };

ElectronClient/commands/toggleExternalEditing.ts

@@ -1,12 +1,7 @@
-import { CommandRuntime, CommandDeclaration } from '../lib/services/CommandService';
+import CommandService, { CommandRuntime, CommandDeclaration } from 'lib/services/CommandService';
 import { _ } from 'lib/locale';
-import { AppState } from '../app';
-import CommandService from 'lib/services/CommandService';
-
-interface Props {
-	noteId: string
-	noteIsBeingWatched: boolean
-}
+import { stateUtils } from 'lib/reducer';
+import { DesktopCommandContext } from '../services/commands/types';
 
 export const declaration:CommandDeclaration = {
 	name: 'toggleExternalEditing',
@@ -16,27 +11,21 @@ export const declaration:CommandDeclaration = {
 
 export const runtime = ():CommandRuntime => {
 	return {
-		execute: async (props:Props) => {
-			if (!props.noteId) return;
+		execute: async (context:DesktopCommandContext, noteId:string = null) => {
+			noteId = noteId || stateUtils.selectedNoteId(context.state);
 
-			if (props.noteIsBeingWatched) {
-				CommandService.instance().execute('stopExternalEditing', { noteId: props.noteId });
+			if (!noteId) return;
+
+			if (context.state.watchedNoteFiles.includes(noteId)) {
+				CommandService.instance().execute('stopExternalEditing', noteId);
 			} else {
-				CommandService.instance().execute('startExternalEditing', { noteId: props.noteId });
+				CommandService.instance().execute('startExternalEditing', noteId);
 			}
 		},
-		isEnabled: (props:Props) => {
-			return !!props.noteId;
-		},
-		mapStateToProps: (state:AppState):Props => {
-			const noteId = state.selectedNoteIds.length === 1 ? state.selectedNoteIds[0] : null;
-			return {
-				noteId: noteId,
-				noteIsBeingWatched: noteId ? state.watchedNoteFiles.includes(noteId) : false,
-			};
-		},
-		title: (props:Props) => {
-			return props.noteIsBeingWatched ? _('Stop') : '';
+		enabledCondition: 'oneNoteSelected',
+		mapStateToTitle: (state:any) => {
+			const noteId = stateUtils.selectedNoteId(state);
+			return state.watchedNoteFiles.includes(noteId) ? _('Stop') : '';
 		},
 	};
 };

ElectronClient/gui/KeymapConfig/utils/getLabel.ts

@@ -26,6 +26,8 @@ const getLabel = (commandName: string) => {
 		return _('Hide Joplin');
 	case 'closeWindow':
 		return _('Close Window');
+	case 'commandPalette':
+		return _('Command palette');
 	case 'config':
 		return shim.isMac() ? _('Preferences') : _('Options');
 	default:

ElectronClient/gui/MainScreen/MainScreen.tsx

@@ -61,7 +61,7 @@ const commands = [
 	require('./commands/showShareNoteDialog'),
 	require('./commands/toggleEditors'),
 	require('./commands/toggleNoteList'),
-	require('./commands/toggleSidebar'),
+	require('./commands/toggleSideBar'),
 	require('./commands/toggleVisiblePanes'),
 ];
 
@@ -320,7 +320,7 @@ class MainScreenComponent extends React.Component<any, any> {
 		window.removeEventListener('resize', this.window_resize);
 	}
 
-	toggleSidebar() {
+	toggleSideBar() {
 		this.props.dispatch({
 			type: 'SIDEBAR_VISIBILITY_TOGGLE',
 		});

ElectronClient/gui/MainScreen/commands/editAlarm.ts

@@ -1,8 +1,8 @@
-import { CommandRuntime, CommandDeclaration } from '../../../lib/services/CommandService';
+import { CommandRuntime, CommandDeclaration, CommandContext } from 'lib/services/CommandService';
 import eventManager from 'lib/eventManager';
 import { _ } from 'lib/locale';
+import { stateUtils } from 'lib/reducer';
 const Note = require('lib/models/Note');
-const BaseModel = require('lib/BaseModel');
 const { time } = require('lib/time-utils');
 
 export const declaration:CommandDeclaration = {
@@ -13,7 +13,9 @@ export const declaration:CommandDeclaration = {
 
 export const runtime = (comp:any):CommandRuntime => {
 	return {
-		execute: async ({ noteId }:any) => {
+		execute: async (context:CommandContext, noteId:string = null) => {
+			noteId = noteId || stateUtils.selectedNoteId(context.state);
+
 			const note = await Note.load(noteId);
 
 			const defaultDate = new Date(Date.now() + 2 * 3600 * 1000);
@@ -51,25 +53,12 @@ export const runtime = (comp:any):CommandRuntime => {
 				},
 			});
 		},
-		title: (props:any):string => {
-			if (!props.noteId) return null;
-			if (!props.noteTodoDue) return null;
-			return time.formatMsToLocal(props.noteTodoDue);
-		},
-		isEnabled: (props:any):boolean => {
-			if (!props.noteId) return false;
-			return !!props.noteIsTodo && !props.noteTodoCompleted;
-		},
-		mapStateToProps: (state:any):any => {
-			const noteId = state.selectedNoteIds.length === 1 ? state.selectedNoteIds[0] : null;
-			const note = noteId ? BaseModel.byId(state.notes, noteId) : null;
 
-			return {
-				noteId: note ? noteId : null,
-				noteIsTodo: note ? note.is_todo : false,
-				noteTodoCompleted: note ? note.todo_completed : false,
-				noteTodoDue: note ? note.todo_due : null,
-			};
+		enabledCondition: 'oneNoteSelected && noteIsTodo && !noteTodoCompleted',
+
+		mapStateToTitle: (state:any) => {
+			const note = stateUtils.selectedNote(state);
+			return note && note.todo_due ? time.formatMsToLocal(note.todo_due) : null;
 		},
 	};
 };

ElectronClient/gui/MainScreen/commands/exportPdf.ts

@@ -1,4 +1,4 @@
-import { CommandRuntime, CommandDeclaration } from '../../../lib/services/CommandService';
+import { CommandRuntime, CommandDeclaration, CommandContext } from 'lib/services/CommandService';
 import shim from 'lib/shim';
 import InteropServiceHelper from '../../../InteropServiceHelper';
 import { _ } from 'lib/locale';
@@ -12,8 +12,10 @@ export const declaration:CommandDeclaration = {
 
 export const runtime = (comp:any):CommandRuntime => {
 	return {
-		execute: async ({ noteIds }:any) => {
+		execute: async (context:CommandContext, noteIds:string[] = null) => {
 			try {
+				noteIds = noteIds || context.state.selectedNoteIds;
+
 				if (!noteIds.length) throw new Error('No notes selected for pdf export');
 
 				let path = null;
@@ -22,7 +24,6 @@ export const runtime = (comp:any):CommandRuntime => {
 						filters: [{ name: _('PDF File'), extensions: ['pdf'] }],
 						defaultPath: await InteropServiceHelper.defaultFilename(noteIds[0], 'pdf'),
 					});
-
 				} else {
 					path = bridge().showOpenDialog({
 						properties: ['openDirectory', 'createDirectory'],
@@ -50,13 +51,7 @@ export const runtime = (comp:any):CommandRuntime => {
 				bridge().showErrorMessageBox(error.message);
 			}
 		},
-		isEnabled: (props:any):boolean => {
-			return !!props.noteIds.length;
-		},
-		mapStateToProps: (state:any):any => {
-			return {
-				noteIds: state.selectedNoteIds,
-			};
-		},
+
+		enabledCondition: 'someNotesSelected',
 	};
 };

ElectronClient/gui/MainScreen/commands/hideModalMessage.ts

@@ -1,4 +1,4 @@
-import { CommandDeclaration, CommandRuntime } from '../../../lib/services/CommandService';
+import { CommandDeclaration, CommandRuntime } from 'lib/services/CommandService';
 
 export const declaration:CommandDeclaration = {
 	name: 'hideModalMessage',

ElectronClient/gui/MainScreen/commands/moveToFolder.ts

@@ -1,4 +1,4 @@
-import { CommandRuntime, CommandDeclaration } from '../../../lib/services/CommandService';
+import { CommandRuntime, CommandDeclaration, CommandContext } from 'lib/services/CommandService';
 import { _ } from 'lib/locale';
 const Folder = require('lib/models/Folder');
 const Note = require('lib/models/Note');
@@ -10,7 +10,9 @@ export const declaration:CommandDeclaration = {
 
 export const runtime = (comp:any):CommandRuntime => {
 	return {
-		execute: async ({ noteIds }:any) => {
+		execute: async (context:CommandContext, noteIds:string[] = null) => {
+			noteIds = noteIds || context.state.selectedNoteIds;
+
 			const folders:any[] = await Folder.sortFolderTree();
 			const startFolders:any[] = [];
 			const maxDepth = 15;
@@ -42,13 +44,6 @@ export const runtime = (comp:any):CommandRuntime => {
 				},
 			});
 		},
-		isEnabled: (props:any):boolean => {
-			return !!props.noteIds.length;
-		},
-		mapStateToProps: (state:any):any => {
-			return {
-				noteIds: state.selectedNoteIds,
-			};
-		},
+		enabledCondition: 'someNotesSelected',
 	};
 };

ElectronClient/gui/MainScreen/commands/newFolder.ts

@@ -1,4 +1,4 @@
-import { CommandDeclaration, CommandRuntime } from '../../../lib/services/CommandService';
+import { CommandContext, CommandDeclaration, CommandRuntime } from 'lib/services/CommandService';
 import { _ } from 'lib/locale';
 const Folder = require('lib/models/Folder');
 const bridge = require('electron').remote.require('./bridge').default;
@@ -11,7 +11,7 @@ export const declaration:CommandDeclaration = {
 
 export const runtime = (comp:any):CommandRuntime => {
 	return {
-		execute: async ({ parentId }:any) => {
+		execute: async (_context:CommandContext, parentId:string = null) => {
 			comp.setState({
 				promptOptions: {
 					label: _('Notebook title:'),
@@ -39,8 +39,5 @@ export const runtime = (comp:any):CommandRuntime => {
 				},
 			});
 		},
-		title: () => {
-			return _('New notebook');
-		},
 	};
 };

ElectronClient/gui/MainScreen/commands/newNote.ts

@@ -1,8 +1,7 @@
-import { utils, CommandRuntime, CommandDeclaration } from '../../../lib/services/CommandService';
+import { utils, CommandRuntime, CommandDeclaration, CommandContext } from 'lib/services/CommandService';
 import { _ } from 'lib/locale';
 const Setting = require('lib/models/Setting').default;
 const Note = require('lib/models/Note');
-const Folder = require('lib/models/Folder');
 const TemplateUtils = require('lib/TemplateUtils');
 
 export const declaration:CommandDeclaration = {
@@ -13,7 +12,7 @@ export const declaration:CommandDeclaration = {
 
 export const runtime = ():CommandRuntime => {
 	return {
-		execute: async ({ template, isTodo }:any) => {
+		execute: async (_context:CommandContext, template:string = null, isTodo:boolean = false) => {
 			const folderId = Setting.value('activeFolderId');
 			if (!folderId) return;
 
@@ -34,12 +33,6 @@ export const runtime = ():CommandRuntime => {
 				id: newNote.id,
 			});
 		},
-		isEnabled: () => {
-			const { folders, selectedFolderId } = utils.store.getState();
-			return !!folders.length && selectedFolderId !== Folder.conflictFolderId();
-		},
-		title: () => {
-			return _('New note');
-		},
+		enabledCondition: 'oneFolderSelected && !inConflictFolder',
 	};
 };

ElectronClient/gui/MainScreen/commands/newTodo.ts

@@ -1,4 +1,4 @@
-import CommandService, { CommandDeclaration, CommandRuntime } from '../../../lib/services/CommandService';
+import CommandService, { CommandContext, CommandDeclaration, CommandRuntime } from 'lib/services/CommandService';
 import { _ } from 'lib/locale';
 
 export const declaration:CommandDeclaration = {
@@ -9,14 +9,9 @@ export const declaration:CommandDeclaration = {
 
 export const runtime = ():CommandRuntime => {
 	return {
-		execute: async ({ template }:any) => {
-			return CommandService.instance().execute('newNote', { template: template, isTodo: true });
-		},
-		isEnabled: () => {
-			return CommandService.instance().isEnabled('newNote', {});
-		},
-		title: () => {
-			return _('New to-do');
+		execute: async (_context:CommandContext, template:string = null) => {
+			return CommandService.instance().execute('newNote', template, true);
 		},
+		enabledCondition: 'oneFolderSelected && !inConflictFolder',
 	};
 };

ElectronClient/gui/MainScreen/commands/print.ts

@@ -1,4 +1,4 @@
-import { CommandRuntime, CommandDeclaration } from '../../../lib/services/CommandService';
+import { CommandRuntime, CommandDeclaration, CommandContext } from 'lib/services/CommandService';
 import { _ } from 'lib/locale';
 const bridge = require('electron').remote.require('./bridge').default;
 
@@ -10,8 +10,9 @@ export const declaration:CommandDeclaration = {
 
 export const runtime = (comp:any):CommandRuntime => {
 	return {
-		execute: async ({ noteIds }:any) => {
-			// TODO: test
+		execute: async (context:CommandContext, noteIds:string[] = null) => {
+			noteIds = noteIds || context.state.selectedNoteIds;
+
 			try {
 				if (noteIds.length !== 1) throw new Error(_('Only one note can be printed at a time.'));
 				await comp.printTo_('printer', { noteId: noteIds[0] });
@@ -19,13 +20,6 @@ export const runtime = (comp:any):CommandRuntime => {
 				bridge().showErrorMessageBox(error.message);
 			}
 		},
-		isEnabled: (props:any):boolean => {
-			return !!props.noteIds.length;
-		},
-		mapStateToProps: (state:any):any => {
-			return {
-				noteIds: state.selectedNoteIds,
-			};
-		},
+		enabledCondition: 'someNotesSelected',
 	};
 };

ElectronClient/gui/MainScreen/commands/renameFolder.ts

@@ -1,4 +1,4 @@
-import { CommandRuntime, CommandDeclaration } from '../../../lib/services/CommandService';
+import { CommandRuntime, CommandDeclaration, CommandContext } from 'lib/services/CommandService';
 import { _ } from 'lib/locale';
 const Folder = require('lib/models/Folder');
 const bridge = require('electron').remote.require('./bridge').default;
@@ -10,7 +10,9 @@ export const declaration:CommandDeclaration = {
 
 export const runtime = (comp:any):CommandRuntime => {
 	return {
-		execute: async ({ folderId }:any) => {
+		execute: async (context:CommandContext, folderId:string = null) => {
+			folderId = folderId || context.state.selectedFolderId;
+
 			const folder = await Folder.load(folderId);
 
 			if (folder) {

ElectronClient/gui/MainScreen/commands/renameTag.ts

@@ -1,4 +1,4 @@
-import { CommandRuntime, CommandDeclaration } from '../../../lib/services/CommandService';
+import { CommandRuntime, CommandDeclaration, CommandContext } from 'lib/services/CommandService';
 import { _ } from 'lib/locale';
 const Tag = require('lib/models/Tag');
 const bridge = require('electron').remote.require('./bridge').default;
@@ -10,7 +10,10 @@ export const declaration:CommandDeclaration = {
 
 export const runtime = (comp:any):CommandRuntime => {
 	return {
-		execute: async ({ tagId }:any) => {
+		execute: async (context:CommandContext, tagId:string = null) => {
+			tagId = tagId || context.state.selectedTagId;
+			if (!tagId) return;
+
 			const tag = await Tag.load(tagId);
 			if (tag) {
 				comp.setState({

ElectronClient/gui/MainScreen/commands/search.ts

@@ -1,4 +1,4 @@
-import { CommandRuntime, CommandDeclaration } from '../../../lib/services/CommandService';
+import { CommandRuntime, CommandDeclaration, CommandContext } from 'lib/services/CommandService';
 const BaseModel = require('lib/BaseModel');
 const uuid = require('lib/uuid').default;
 
@@ -9,7 +9,7 @@ export const declaration:CommandDeclaration = {
 
 export const runtime = (comp:any):CommandRuntime => {
 	return {
-		execute: async ({ query }:any) => {
+		execute: async (_context:CommandContext, query:string) => {
 			if (!comp.searchId_) comp.searchId_ = uuid.create();
 
 			comp.props.dispatch({

ElectronClient/gui/MainScreen/commands/selectTemplate.ts

@@ -1,4 +1,4 @@
-import CommandService, { CommandRuntime, CommandDeclaration } from '../../../lib/services/CommandService';
+import CommandService, { CommandRuntime, CommandDeclaration, CommandContext } from 'lib/services/CommandService';
 import { _ } from 'lib/locale';
 const TemplateUtils = require('lib/TemplateUtils');
 
@@ -8,7 +8,7 @@ export const declaration:CommandDeclaration = {
 
 export const runtime = (comp:any):CommandRuntime => {
 	return {
-		execute: async ({ noteType }:any) => {
+		execute: async (_context:CommandContext, noteType:string) => {
 			comp.setState({
 				promptOptions: {
 					label: _('Template file:'),
@@ -18,9 +18,9 @@ export const runtime = (comp:any):CommandRuntime => {
 					onClose: async (answer:any) => {
 						if (answer) {
 							if (noteType === 'note' || noteType === 'todo') {
-								CommandService.instance().execute('newNote', { template: answer.value, isTodo: noteType === 'todo' });
+								CommandService.instance().execute('newNote', answer.value, noteType === 'todo');
 							} else {
-								CommandService.instance().execute('insertText', { value: TemplateUtils.render(answer.value) });
+								CommandService.instance().execute('insertText', TemplateUtils.render(answer.value));
 							}
 						}
 

ElectronClient/gui/MainScreen/commands/setTags.ts

@@ -1,4 +1,4 @@
-import { CommandRuntime, CommandDeclaration } from '../../../lib/services/CommandService';
+import { CommandRuntime, CommandDeclaration, CommandContext } from 'lib/services/CommandService';
 import { _ } from 'lib/locale';
 const Tag = require('lib/models/Tag');
 
@@ -10,7 +10,9 @@ export const declaration:CommandDeclaration = {
 
 export const runtime = (comp:any):CommandRuntime => {
 	return {
-		execute: async ({ noteIds }:any) => {
+		execute: async (context:CommandContext, noteIds:string[] = null) => {
+			noteIds = noteIds || context.state.selectedNoteIds;
+
 			const tags = await Tag.commonTagsByNoteIds(noteIds);
 			const startTags = tags
 				.map((a:any) => {
@@ -64,11 +66,6 @@ export const runtime = (comp:any):CommandRuntime => {
 				},
 			});
 		},
-		isEnabled: (props:any) => {
-			return !!props.noteIds.length;
-		},
-		mapStateToProps: (state:any) => {
-			return { noteIds: state.selectedNoteIds };
-		},
+		enabledCondition: 'someNotesSelected',
 	};
 };

ElectronClient/gui/MainScreen/commands/showModalMessage.tsx

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { CommandDeclaration, CommandRuntime } from '../../../lib/services/CommandService';
+import { CommandDeclaration, CommandRuntime, CommandContext } from 'lib/services/CommandService';
 
 export const declaration:CommandDeclaration = {
 	name: 'showModalMessage',
@@ -7,7 +7,7 @@ export const declaration:CommandDeclaration = {
 
 export const runtime = (comp:any):CommandRuntime => {
 	return {
-		execute: async ({ message }:any) => {
+		execute: async (_context:CommandContext, message:string) => {
 			comp.setState({
 				modalLayer: {
 					visible: true,

ElectronClient/gui/MainScreen/commands/showNoteContentProperties.ts

@@ -1,5 +1,6 @@
-import { CommandRuntime, CommandDeclaration } from '../../../lib/services/CommandService';
+import { CommandRuntime, CommandDeclaration, CommandContext } from 'lib/services/CommandService';
 import { _ } from 'lib/locale';
+import { stateUtils } from 'lib/reducer';
 const Note = require('lib/models/Note');
 
 export const declaration:CommandDeclaration = {
@@ -9,7 +10,9 @@ export const declaration:CommandDeclaration = {
 
 export const runtime = (comp:any):CommandRuntime => {
 	return {
-		execute: async ({ noteId }:any) => {
+		execute: async (context:CommandContext, noteId:string = null) => {
+			noteId = noteId || stateUtils.selectedNoteId(context.state);
+
 			const note = await Note.load(noteId);
 			if (note) {
 				comp.setState({
@@ -21,11 +24,7 @@ export const runtime = (comp:any):CommandRuntime => {
 				});
 			}
 		},
-		isEnabled: (props:any) => {
-			return !!props.noteId;
-		},
-		mapStateToProps: (state:any) => {
-			return { noteId: state.selectedNoteIds.length === 1 ? state.selectedNoteIds[0] : null };
-		},
+
+		enabledCondition: 'oneNoteSelected',
 	};
 };

ElectronClient/gui/MainScreen/commands/showNoteProperties.ts

@@ -1,5 +1,6 @@
-import CommandService, { CommandRuntime, CommandDeclaration } from '../../../lib/services/CommandService';
+import CommandService, { CommandRuntime, CommandDeclaration, CommandContext } from 'lib/services/CommandService';
 import { _ } from 'lib/locale';
+import { stateUtils } from 'lib/reducer';
 
 export const declaration:CommandDeclaration = {
 	name: 'showNoteProperties',
@@ -9,7 +10,9 @@ export const declaration:CommandDeclaration = {
 
 export const runtime = (comp:any):CommandRuntime => {
 	return {
-		execute: async ({ noteId }:any) => {
+		execute: async (context:CommandContext, noteId:string = null) => {
+			noteId = noteId || stateUtils.selectedNoteId(context.state);
+
 			comp.setState({
 				notePropertiesDialogOptions: {
 					noteId: noteId,
@@ -20,11 +23,6 @@ export const runtime = (comp:any):CommandRuntime => {
 				},
 			});
 		},
-		isEnabled: (props:any) => {
-			return !!props.noteId;
-		},
-		mapStateToProps: (state:any) => {
-			return { noteId: state.selectedNoteIds.length === 1 ? state.selectedNoteIds[0] : null };
-		},
+		enabledCondition: 'oneNoteSelected',
 	};
 };

ElectronClient/gui/MainScreen/commands/showShareNoteDialog.ts

@@ -1,4 +1,4 @@
-import { CommandRuntime, CommandDeclaration } from '../../../lib/services/CommandService';
+import { CommandRuntime, CommandDeclaration, CommandContext } from 'lib/services/CommandService';
 import { _ } from 'lib/locale';
 
 export const declaration:CommandDeclaration = {
@@ -8,7 +8,9 @@ export const declaration:CommandDeclaration = {
 
 export const runtime = (comp:any):CommandRuntime => {
 	return {
-		execute: async ({ noteIds }:any) => {
+		execute: async (context:CommandContext, noteIds:string[] = null) => {
+			noteIds = noteIds || context.state.selectedNoteIds;
+
 			comp.setState({
 				shareNoteDialogOptions: {
 					noteIds: noteIds,

ElectronClient/gui/MainScreen/commands/toggleEditors.ts

@@ -1,4 +1,4 @@
-import { CommandDeclaration, CommandRuntime } from '../../../lib/services/CommandService';
+import { CommandDeclaration, CommandRuntime, CommandContext } from 'lib/services/CommandService';
 import Setting from 'lib/models/Setting';
 import { stateUtils } from 'lib/reducer';
 import { _ } from 'lib/locale';
@@ -11,22 +11,14 @@ export const declaration:CommandDeclaration = {
 
 export const runtime = ():CommandRuntime => {
 	return {
-		execute: async (props:any) => {
+		execute: async (context:CommandContext) => {
 			// A bit of a hack, but for now don't allow changing code view
 			// while a note is being saved as it will cause a problem with
 			// TinyMCE because it won't have time to send its content before
 			// being switch to Ace Editor.
-			if (props.hasNotesBeingSaved) return;
+			if (stateUtils.hasNotesBeingSaved(context.state)) return;
 			Setting.toggle('editor.codeView');
 		},
-		isEnabled: (props:any):boolean => {
-			return !props.hasNotesBeingSaved && props.hasOneSelectedNote;
-		},
-		mapStateToProps: (state:any):any => {
-			return {
-				hasNotesBeingSaved: stateUtils.hasNotesBeingSaved(state),
-				hasOneSelectedNote: state.selectedNoteIds.length === 1,
-			};
-		},
+		enabledCondition: '!notesAreBeingSaved && oneNoteSelected',
 	};
 };

ElectronClient/gui/MainScreen/commands/toggleNoteList.ts

@@ -1,10 +1,10 @@
-import { CommandDeclaration, CommandRuntime } from '../../../lib/services/CommandService';
+import { CommandDeclaration, CommandRuntime } from 'lib/services/CommandService';
 import { _ } from 'lib/locale';
 
 export const declaration:CommandDeclaration = {
 	name: 'toggleNoteList',
 	label: () => _('Toggle note list'),
-	iconName: 'fa-align-justify',
+	iconName: 'fas fa-align-justify',
 };
 
 export const runtime = (comp:any):CommandRuntime => {
@@ -14,8 +14,5 @@ export const runtime = (comp:any):CommandRuntime => {
 				type: 'NOTELIST_VISIBILITY_TOGGLE',
 			});
 		},
-		title: () => {
-			return _('Toggle note list');
-		},
 	};
 };

ElectronClient/gui/MainScreen/commands/toggleSideBar.ts

@@ -1,10 +1,10 @@
-import { CommandDeclaration, CommandRuntime } from '../../../lib/services/CommandService';
+import { CommandDeclaration, CommandRuntime } from 'lib/services/CommandService';
 import { _ } from 'lib/locale';
 
 export const declaration:CommandDeclaration = {
-	name: 'toggleSidebar',
+	name: 'toggleSideBar',
 	label: () => _('Toggle sidebar'),
-	iconName: 'fa-bars',
+	iconName: 'fas fa-bars',
 };
 
 export const runtime = (comp:any):CommandRuntime => {
@@ -14,8 +14,5 @@ export const runtime = (comp:any):CommandRuntime => {
 				type: 'SIDEBAR_VISIBILITY_TOGGLE',
 			});
 		},
-		title: () => {
-			return _('Toggle sidebar');
-		},
 	};
 };

ElectronClient/gui/MainScreen/commands/toggleVisiblePanes.ts

@@ -1,4 +1,4 @@
-import { CommandDeclaration, CommandRuntime } from '../../../lib/services/CommandService';
+import { CommandDeclaration, CommandRuntime } from 'lib/services/CommandService';
 import { _ } from 'lib/locale';
 
 export const declaration:CommandDeclaration = {
@@ -14,14 +14,7 @@ export const runtime = (comp:any):CommandRuntime => {
 				type: 'NOTE_VISIBLE_PANES_TOGGLE',
 			});
 		},
-		isEnabled: (props:any):boolean => {
-			return props.settingEditorCodeView && props.selectedNoteIds.length === 1;
-		},
-		mapStateToProps: (state:any):any => {
-			return {
-				selectedNoteIds: state.selectedNoteIds,
-				settingEditorCodeView: state.settings['editor.codeView'],
-			};
-		},
+
+		enabledCondition: 'markdownEditorVisible && oneNoteSelected',
 	};
 };

ElectronClient/gui/MenuBar.tsx

@@ -5,14 +5,15 @@ import { stateUtils } from 'lib/reducer';
 import CommandService from 'lib/services/CommandService';
 import MenuUtils from 'lib/services/commands/MenuUtils';
 import KeymapService from 'lib/services/KeymapService';
-import { utils as pluginUtils, ViewInfo } from 'lib/services/plugins/reducer';
+import { PluginStates, utils as pluginUtils } from 'lib/services/plugins/reducer';
 import shim from 'lib/shim';
 import Setting from 'lib/models/Setting';
 import versionInfo from 'lib/versionInfo';
 import { Module } from 'lib/services/interop/types';
 import InteropServiceHelper from '../InteropServiceHelper';
 import { _ } from 'lib/locale';
-import { MenuItemLocation } from 'lib/services/plugins/api/types';
+import { MenuItem, MenuItemLocation } from 'lib/services/plugins/api/types';
+import stateToWhenClauseContext from 'lib/services/commands/stateToWhenClauseContext';
 
 const { connect } = require('react-redux');
 const { reg } = require('lib/registry.js');
@@ -23,6 +24,51 @@ const Menu = bridge().Menu;
 const PluginManager = require('lib/services/PluginManager');
 const TemplateUtils = require('lib/TemplateUtils');
 
+const menuUtils = new MenuUtils(CommandService.instance());
+
+function pluginMenuItemsCommandNames(menuItems:MenuItem[]):string[] {
+	let output:string[] = [];
+	for (const menuItem of menuItems) {
+		if (menuItem.submenu) {
+			output = output.concat(pluginMenuItemsCommandNames(menuItem.submenu));
+		} else {
+			if (menuItem.commandName) output.push(menuItem.commandName);
+		}
+	}
+	return output;
+}
+
+function pluginCommandNames(plugins:PluginStates):string[] {
+	let output:string[] = [];
+
+	for (const view of pluginUtils.viewsByType(plugins, 'menu')) {
+		output = output.concat(pluginMenuItemsCommandNames(view.menuItems));
+	}
+
+	for (const view of pluginUtils.viewsByType(plugins, 'menuItem')) {
+		if (view.commandName) output.push(view.commandName);
+	}
+
+	return output;
+}
+
+function createPluginMenuTree(label:string, menuItems:MenuItem[], onMenuItemClick:Function) {
+	const output:any = {
+		label: label,
+		submenu: [],
+	};
+
+	for (const menuItem of menuItems) {
+		if (menuItem.submenu) {
+			output.submenu.push(createPluginMenuTree(menuItem.label, menuItem.submenu, onMenuItemClick));
+		} else {
+			output.submenu.push(menuUtils.commandToMenuItem(menuItem.commandName, onMenuItemClick));
+		}
+	}
+
+	return output;
+}
+
 interface Props {
 	dispatch: Function,
 	menuItemProps: any,
@@ -36,7 +82,8 @@ interface Props {
 	showNoteCounts: boolean,
 	uncompletedTodosOnTop: boolean,
 	showCompletedTodos: boolean,
-	pluginMenuItemInfos: ViewInfo[],
+	pluginMenuItems: any[],
+	pluginMenus: any[],
 }
 
 const commandNames:string[] = [
@@ -62,7 +109,7 @@ const commandNames:string[] = [
 	'attachFile',
 	'focusSearch',
 	'showLocalSearch',
-	'toggleSidebar',
+	'toggleSideBar',
 	'toggleNoteList',
 	'toggleVisiblePanes',
 	'toggleExternalEditing',
@@ -85,8 +132,6 @@ function menuItemSetEnabled(id:string, enabled:boolean) {
 	menuItem.enabled = enabled;
 }
 
-const menuUtils = new MenuUtils(CommandService.instance());
-
 function useMenu(props:Props) {
 	const [menu, setMenu] = useState(null);
 	const [keymapLastChangeTime, setKeymapLastChangeTime] = useState(Date.now());
@@ -113,12 +158,12 @@ function useMenu(props:Props) {
 
 		if (Array.isArray(path)) path = path[0];
 
-		CommandService.instance().execute('showModalMessage', { message: _('Importing from "%s" as "%s" format. Please wait...', path, module.format) });
+		CommandService.instance().execute('showModalMessage', _('Importing from "%s" as "%s" format. Please wait...', path, module.format));
 
 		const importOptions = {
 			path,
 			format: module.format,
-			modulePath: module.path,
+			outputFormat: module.outputFormat,
 			onError: console.warn,
 			destinationFolderId: !module.isNoteArchive && moduleSource === 'file' ? props.selectedFolderId : null,
 		};
@@ -143,7 +188,7 @@ function useMenu(props:Props) {
 	useEffect(() => {
 		const keymapService = KeymapService.instance();
 
-		const pluginCommandNames = props.pluginMenuItemInfos.map((viewInfo:ViewInfo) => viewInfo.view.commandName);
+		const pluginCommandNames = props.pluginMenuItems.map((view:any) => view.commandName);
 		const menuItemDic = menuUtils.commandsToMenuItems(commandNames.concat(pluginCommandNames), (commandName:string) => onMenuItemClickRef.current(commandName));
 
 		const quitMenuItem = {
@@ -207,7 +252,7 @@ function useMenu(props:Props) {
 					exportItems.push({
 						label: module.fullLabel(),
 						click: async () => {
-							await InteropServiceHelper.export(props.dispatch.bind(this), module);
+							await InteropServiceHelper.export((action:any) => props.dispatch(action), module);
 						},
 					});
 				}
@@ -255,12 +300,12 @@ function useMenu(props:Props) {
 		templateItems.push({
 			label: _('Create note from template'),
 			click: () => {
-				CommandService.instance().execute('selectTemplate', { noteType: 'note' });
+				CommandService.instance().execute('selectTemplate', 'note');
 			},
 		}, {
 			label: _('Create to-do from template'),
 			click: () => {
-				CommandService.instance().execute('selectTemplate', { noteType: 'todo' });
+				CommandService.instance().execute('selectTemplate', 'todo');
 			},
 		}, {
 			label: _('Insert template'),
@@ -278,7 +323,7 @@ function useMenu(props:Props) {
 			click: async () => {
 				const templates = await TemplateUtils.loadTemplates(Setting.value('templateDir'));
 
-				this.store().dispatch({
+				props.dispatch({
 					type: 'TEMPLATE_UPDATE_ALL',
 					templates: templates,
 				});
@@ -314,8 +359,8 @@ function useMenu(props:Props) {
 		}
 		toolsItems = toolsItems.concat(toolsItemsAll);
 
-		function _checkForUpdates(ctx:any) {
-			bridge().checkForUpdates(false, bridge().window(), ctx.checkForUpdateLoggerPath(), { includePreReleases: Setting.value('autoUpdate.includePreReleases') });
+		function _checkForUpdates() {
+			bridge().checkForUpdates(false, bridge().window(), `${Setting.value('profileDir')}/log-autoupdater.txt`, { includePreReleases: Setting.value('autoUpdate.includePreReleases') });
 		}
 
 		function _showAbout() {
@@ -361,7 +406,7 @@ function useMenu(props:Props) {
 			}, {
 				label: _('Check for updates...'),
 				visible: shim.isMac() ? true : false,
-				click: () => _checkForUpdates(this),
+				click: () => _checkForUpdates(),
 			}, {
 				type: 'separator',
 				visible: shim.isMac() ? true : false,
@@ -397,12 +442,16 @@ function useMenu(props:Props) {
 			}, shim.isMac() ? noItem : printItem, {
 				type: 'separator',
 				platforms: ['darwin'],
-			}, {
+			},
+
+			shim.isMac() ? {
 				label: _('Hide %s', 'Joplin'),
 				platforms: ['darwin'],
 				accelerator: shim.isMac() && keymapService.getAccelerator('hideApp'),
 				click: () => { bridge().electronApp().hide(); },
-			}, {
+			} : noItem,
+
+			{
 				type: 'separator',
 			},
 			quitMenuItem],
@@ -484,7 +533,7 @@ function useMenu(props:Props) {
 			view: {
 				label: _('&View'),
 				submenu: [
-					menuItemDic.toggleSidebar,
+					menuItemDic.toggleSideBar,
 					menuItemDic.toggleNoteList,
 					menuItemDic.toggleVisiblePanes,
 					{
@@ -502,7 +551,6 @@ function useMenu(props:Props) {
 						id: 'showNoteCounts',
 						label: Setting.settingMetadata('showNoteCounts').label(),
 						type: 'checkbox',
-						// checked: Setting.value('showNoteCounts'),
 						click: () => {
 							Setting.setValue('showNoteCounts', !Setting.value('showNoteCounts'));
 						},
@@ -510,7 +558,6 @@ function useMenu(props:Props) {
 						id: 'uncompletedTodosOnTop',
 						label: Setting.settingMetadata('uncompletedTodosOnTop').label(),
 						type: 'checkbox',
-						// checked: Setting.value('uncompletedTodosOnTop'),
 						click: () => {
 							Setting.setValue('uncompletedTodosOnTop', !Setting.value('uncompletedTodosOnTop'));
 						},
@@ -518,7 +565,6 @@ function useMenu(props:Props) {
 						id: 'showCompletedTodos',
 						label: Setting.settingMetadata('showCompletedTodos').label(),
 						type: 'checkbox',
-						// checked: Setting.value('showCompletedTodos'),
 						click: () => {
 							Setting.setValue('showCompletedTodos', !Setting.value('showCompletedTodos'));
 						},
@@ -590,7 +636,7 @@ function useMenu(props:Props) {
 				}, {
 					label: _('Check for updates...'),
 					visible: shim.isMac() ? false : true,
-					click: () => _checkForUpdates(this),
+					click: () => _checkForUpdates(),
 				},
 				separator(),
 				{
@@ -641,26 +687,36 @@ function useMenu(props:Props) {
 			rootMenus[key].submenu = cleanUpSeparators(rootMenus[key].submenu);
 		}
 
-		const pluginMenuItems = PluginManager.instance().menuItems();
-		for (const item of pluginMenuItems) {
-			const itemParent = rootMenus[item.parent] ? rootMenus[item.parent] : 'tools';
-			itemParent.submenu.push(item);
+		{
+			// This is for GotoAnything only - should be refactored since this plugin manager is not used otherwise
+			const pluginMenuItems = PluginManager.instance().menuItems();
+			for (const item of pluginMenuItems) {
+				const itemParent = rootMenus[item.parent] ? rootMenus[item.parent] : 'tools';
+				itemParent.submenu.push(item);
+			}
 		}
 
-		// TODO: test
-
-		const pluginViewInfos = props.pluginMenuItemInfos;
-
-		for (const info of pluginViewInfos) {
-			const location:MenuItemLocation = info.view.location;
+		for (const view of props.pluginMenuItems) {
+			const location:MenuItemLocation = view.location;
 			if (location === MenuItemLocation.Context) continue;
 
 			const itemParent = rootMenus[location];
 
 			if (!itemParent) {
-				reg.logger().error('Menu item location does not exist: ', location, info);
+				reg.logger().error('Menu item location does not exist: ', location, view);
 			} else {
-				itemParent.submenu.push(menuItemDic[info.view.commandName]);
+				itemParent.submenu.push(menuItemDic[view.commandName]);
+			}
+		}
+
+		for (const view of props.pluginMenus) {
+			if (view.location === MenuItemLocation.Context) continue;
+			const itemParent = rootMenus[view.location];
+
+			if (!itemParent) {
+				reg.logger().error('Menu location does not exist: ', location, view);
+			} else {
+				itemParent.submenu.push(createPluginMenuTree(view.label, view.menuItems, (commandName:string) => onMenuItemClickRef.current(commandName)));
 			}
 		}
 
@@ -725,17 +781,21 @@ function useMenu(props:Props) {
 		} else {
 			setMenu(Menu.buildFromTemplate(template));
 		}
-	}, [props.routeName, props.pluginMenuItemInfos, keymapLastChangeTime, modulesLastChangeTime]);
+	}, [props.routeName, props.pluginMenuItems, props.pluginMenus, keymapLastChangeTime, modulesLastChangeTime]);
 
 	useEffect(() => {
+		const whenClauseContext = CommandService.instance().currentWhenClauseContext();
+
 		for (const commandName in props.menuItemProps) {
-			if (!props.menuItemProps[commandName]) continue;
-			menuItemSetEnabled(commandName, CommandService.instance().isEnabled(commandName, props.menuItemProps[commandName]));
+			const p = props.menuItemProps[commandName];
+			if (!p) continue;
+			const enabled = 'enabled' in p ? p.enabled : CommandService.instance().isEnabled(commandName, whenClauseContext);
+			menuItemSetEnabled(commandName, enabled);
 		}
 
 		const layoutButtonSequenceOptions = Setting.enumOptions('layoutButtonSequence');
 		for (const value in layoutButtonSequenceOptions) {
-			menuItemSetEnabled(`layoutButtonSequence_${value}`, props.layoutButtonSequence === Number(value));
+			menuItemSetChecked(`layoutButtonSequence_${value}`, props.layoutButtonSequence === Number(value));
 		}
 
 		function applySortItemCheckState(type:string) {
@@ -800,8 +860,10 @@ function MenuBar(props:Props):JSX.Element {
 }
 
 const mapStateToProps = (state:AppState) => {
+	const whenClauseContext = stateToWhenClauseContext(state);
+
 	return {
-		menuItemProps: menuUtils.commandsToMenuItemProps(state, commandNames),
+		menuItemProps: menuUtils.commandsToMenuItemProps(commandNames.concat(pluginCommandNames(state.pluginService.plugins)), whenClauseContext),
 		routeName: state.route.routeName,
 		selectedFolderId: state.selectedFolderId,
 		layoutButtonSequence: state.settings.layoutButtonSequence,
@@ -812,7 +874,8 @@ const mapStateToProps = (state:AppState) => {
 		showNoteCounts: state.settings.showNoteCounts,
 		uncompletedTodosOnTop: state.settings.uncompletedTodosOnTop,
 		showCompletedTodos: state.settings.showCompletedTodos,
-		pluginMenuItemInfos: stateUtils.selectArrayShallow({ array: pluginUtils.viewInfosByType(state.pluginService.plugins, 'menuItem') }, 'menuBar.pluginMenuItemInfos'),
+		pluginMenuItems: stateUtils.selectArrayShallow({ array: pluginUtils.viewsByType(state.pluginService.plugins, 'menuItem') }, 'menuBar.pluginMenuItems'),
+		pluginMenus: stateUtils.selectArrayShallow({ array: pluginUtils.viewsByType(state.pluginService.plugins, 'menu') }, 'menuBar.pluginMenus'),
 	};
 };
 

ElectronClient/gui/NoteContentPropertiesDialog.tsx

@@ -46,8 +46,6 @@ function formatReadTime(readTimeMinutes: number) {
 }
 
 export default function NoteContentPropertiesDialog(props:NoteContentPropertiesDialogProps) {
-
-	console.info('MMMMMMMMMMMM', props.markupLanguage);
 	const theme = themeStyle(props.themeId);
 	const tableBodyComps: JSX.Element[] = [];
 	// For the source Markdown

ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/Toolbar.tsx

@@ -5,6 +5,7 @@ import { utils as pluginUtils } from 'lib/services/plugins/reducer';
 import { connect } from 'react-redux';
 import { AppState } from '../../../../app';
 import ToolbarButtonUtils, { ToolbarButtonInfo } from 'lib/services/commands/ToolbarButtonUtils';
+import stateToWhenClauseContext from 'lib/services/commands/stateToWhenClauseContext';
 const { buildStyle } = require('lib/theme');
 
 interface ToolbarProps {
@@ -31,6 +32,8 @@ function Toolbar(props:ToolbarProps) {
 }
 
 const mapStateToProps = (state: AppState) => {
+	const whenClauseContext = stateToWhenClauseContext(state);
+
 	const commandNames = [
 		'historyBackward',
 		'historyForward',
@@ -53,7 +56,7 @@ const mapStateToProps = (state: AppState) => {
 	].concat(pluginUtils.commandNamesFromViews(state.pluginService.plugins, 'editorToolbar'));
 
 	return {
-		toolbarButtonInfos: toolbarButtonUtils.commandsToToolbarButtons(state, commandNames),
+		toolbarButtonInfos: toolbarButtonUtils.commandsToToolbarButtons(commandNames, whenClauseContext),
 	};
 };
 

ElectronClient/gui/NoteEditor/NoteEditor.tsx

@@ -25,6 +25,7 @@ import eventManager from 'lib/eventManager';
 import { AppState } from '../../app';
 import ToolbarButtonUtils from 'lib/services/commands/ToolbarButtonUtils';
 import { _ } from 'lib/locale';
+import stateToWhenClauseContext from 'lib/services/commands/stateToWhenClauseContext';
 
 const { themeStyle } = require('lib/theme');
 const { substrWithEllipsis } = require('lib/string-utils');
@@ -247,9 +248,9 @@ function NoteEditor(props: NoteEditorProps) {
 			event.preventDefault();
 
 			if (event.shiftKey) {
-				CommandService.instance().execute('focusElement', { target: 'noteList' });
+				CommandService.instance().execute('focusElement', 'noteList');
 			} else {
-				CommandService.instance().execute('focusElement', { target: 'noteBody' });
+				CommandService.instance().execute('focusElement', 'noteBody');
 			}
 		}
 	}, [props.dispatch]);
@@ -364,7 +365,7 @@ function NoteEditor(props: NoteEditorProps) {
 	function renderTagBar() {
 		const theme = themeStyle(props.themeId);
 		const noteIds = [formNote.id];
-		const instructions = <span onClick={() => { CommandService.instance().execute('setTags', { noteIds }); }} style={{ ...theme.clickableTextStyle, whiteSpace: 'nowrap' }}>Click to add tags...</span>;
+		const instructions = <span onClick={() => { CommandService.instance().execute('setTags', noteIds); }} style={{ ...theme.clickableTextStyle, whiteSpace: 'nowrap' }}>Click to add tags...</span>;
 		const tagList = props.selectedNoteTags.length ? <TagList items={props.selectedNoteTags} /> : null;
 
 		return (
@@ -435,7 +436,7 @@ function NoteEditor(props: NoteEditorProps) {
 
 	const wysiwygBanner = props.bodyEditor !== 'TinyMCE' ? null : (
 		<div style={{ ...styles.warningBanner }}>
-			This is an experimental WYSIWYG editor for evaluation only. Please do not use with important notes as you may lose some data! See the <a style={styles.urlColor} onClick={introductionPostLinkClick} href="#">introduction post</a> for more information. TO SWITCH TO THE MARKDOWN EDITOR PLEASE PRESS "Code View".
+			This is an experimental Rich Text editor for evaluation only. Please do not use with important notes as you may lose some data! See the <a style={styles.urlColor} onClick={introductionPostLinkClick} href="#">introduction post</a> for more information. To switch to the Markdown Editor please press the "Toggle editors" in the top right-hand corner.
 		</div>
 	);
 
@@ -565,6 +566,7 @@ export {
 
 const mapStateToProps = (state: AppState) => {
 	const noteId = state.selectedNoteIds.length === 1 ? state.selectedNoteIds[0] : null;
+	const whenClauseContext = stateToWhenClauseContext(state);
 
 	return {
 		noteId: noteId,
@@ -587,15 +589,15 @@ const mapStateToProps = (state: AppState) => {
 		watchedResources: state.watchedResources,
 		highlightedWords: state.highlightedWords,
 		plugins: state.pluginService.plugins,
-		toolbarButtonInfos: toolbarButtonUtils.commandsToToolbarButtons(state, [
+		toolbarButtonInfos: toolbarButtonUtils.commandsToToolbarButtons([
 			'historyBackward',
 			'historyForward',
 			'toggleEditors',
 			'toggleExternalEditing',
-		]),
-		setTagsToolbarButtonInfo: toolbarButtonUtils.commandsToToolbarButtons(state, [
+		], whenClauseContext),
+		setTagsToolbarButtonInfo: toolbarButtonUtils.commandsToToolbarButtons([
 			'setTags',
-		])[0],
+		], whenClauseContext)[0],
 	};
 };
 

ElectronClient/gui/NoteEditor/commands/focusElementNoteBody.ts

@@ -1,4 +1,4 @@
-import { CommandRuntime, CommandDeclaration } from '../../../lib/services/CommandService';
+import { CommandRuntime, CommandDeclaration } from 'lib/services/CommandService';
 import { _ } from 'lib/locale';
 
 export const declaration:CommandDeclaration = {
@@ -12,13 +12,6 @@ export const runtime = (comp:any):CommandRuntime => {
 		execute: async () => {
 			comp.editorRef.current.execCommand({ name: 'focus' });
 		},
-		isEnabled: (props:any):boolean => {
-			return props.hasOneNoteSelected;
-		},
-		mapStateToProps: (state:any):any => {
-			return {
-				hasOneNoteSelected: state.selectedNoteIds.length === 1,
-			};
-		},
+		enabledCondition: 'oneNoteSelected',
 	};
 };

ElectronClient/gui/NoteEditor/commands/focusElementNoteTitle.ts

@@ -1,4 +1,4 @@
-import { CommandRuntime, CommandDeclaration } from '../../../lib/services/CommandService';
+import { CommandRuntime, CommandDeclaration } from 'lib/services/CommandService';
 import { _ } from 'lib/locale';
 
 export const declaration:CommandDeclaration = {
@@ -13,14 +13,6 @@ export const runtime = (comp:any):CommandRuntime => {
 			if (!comp.titleInputRef.current) return;
 			comp.titleInputRef.current.focus();
 		},
-		isEnabled: (props:any):boolean => {
-			return props.hasOneNoteSelected;
-		},
-		mapStateToProps: (state:any):any => {
-			return {
-				hasOneNoteSelected: state.selectedNoteIds.length === 1,
-			};
-		},
-
+		enabledCondition: 'oneNoteSelected',
 	};
 };

ElectronClient/gui/NoteEditor/commands/showLocalSearch.ts

@@ -1,4 +1,4 @@
-import { CommandRuntime, CommandDeclaration } from '../../../lib/services/CommandService';
+import { CommandRuntime, CommandDeclaration } from 'lib/services/CommandService';
 import { _ } from 'lib/locale';
 
 export const declaration:CommandDeclaration = {
@@ -16,11 +16,6 @@ export const runtime = (comp:any):CommandRuntime => {
 				if (comp.noteSearchBarRef.current) comp.noteSearchBarRef.current.wrappedInstance.focus();
 			}
 		},
-		isEnabled: (props:any) => {
-			return !!props.noteId;
-		},
-		mapStateToProps: (state:any) => {
-			return { noteId: state.selectedNoteIds.length === 1 ? state.selectedNoteIds[0] : null };
-		},
+		enabledCondition: 'oneNoteSelected',
 	};
 };

ElectronClient/gui/NoteEditor/commands/showRevisions.ts

@@ -1,4 +1,4 @@
-import { CommandRuntime, CommandDeclaration } from '../../../lib/services/CommandService';
+import { CommandRuntime, CommandDeclaration } from 'lib/services/CommandService';
 
 export const declaration:CommandDeclaration = {
 	name: 'showRevisions',

ElectronClient/gui/NoteEditor/utils/useWindowCommandHandler.ts

@@ -1,11 +1,9 @@
 import { useEffect } from 'react';
 import { FormNote, ScrollOptionTypes } from './types';
 import editorCommandDeclarations from '../commands/editorCommandDeclarations';
-import CommandService, { CommandDeclaration,  CommandRuntime } from '../../../lib/services/CommandService';
+import CommandService, { CommandDeclaration,  CommandRuntime, CommandContext } from 'lib/services/CommandService';
 const { time } = require('lib/time-utils.js');
-const BaseModel = require('lib/BaseModel');
 const { reg } = require('lib/registry.js');
-const { MarkupToHtml } = require('lib/joplin-renderer');
 
 const commandsWithDependencies = [
 	require('../commands/showLocalSearch'),
@@ -25,49 +23,30 @@ interface HookDependencies {
 
 function editorCommandRuntime(declaration:CommandDeclaration, editorRef:any):CommandRuntime {
 	return {
-		execute: async (props:any) => {
-			// console.info('Running editor command:', declaration.name, props);
+		execute: async (_context:CommandContext, ...args:any[]) => {
 			if (!editorRef.current.execCommand) {
 				reg.logger().warn('Received command, but editor cannot execute commands', declaration.name);
+				return;
+			}
+
+			if (declaration.name === 'insertDateTime') {
+				return editorRef.current.execCommand({
+					name: 'insertText',
+					value: time.formatMsToLocal(new Date().getTime()),
+				});
+			} else if (declaration.name === 'scrollToHash') {
+				return editorRef.current.scrollTo({
+					type: ScrollOptionTypes.Hash,
+					value: args[0],
+				});
 			} else {
-				if (declaration.name === 'insertDateTime') {
-					return editorRef.current.execCommand({
-						name: 'insertText',
-						value: time.formatMsToLocal(new Date().getTime()),
-					});
-				} else if (declaration.name === 'scrollToHash') {
-					return editorRef.current.scrollTo({
-						type: ScrollOptionTypes.Hash,
-						value: props.hash,
-					});
-				} else {
-					return editorRef.current.execCommand({
-						name: declaration.name,
-						value: props.value,
-					});
-				}
+				return editorRef.current.execCommand({
+					name: declaration.name,
+					value: args[0],
+				});
 			}
 		},
-		isEnabled: (props:any) => {
-			if (props.isDialogVisible) return false;
-			if (props.markdownEditorViewerOnly) return false;
-			if (!props.hasSelectedNote) return false;
-			return props.isMarkdownNote;
-		},
-		mapStateToProps: (state:any) => {
-			const noteId = state.selectedNoteIds.length === 1 ? state.selectedNoteIds[0] : null;
-			const note = noteId ? BaseModel.byId(state.notes, noteId) : null;
-			const isMarkdownNote = note ? note.markup_language === MarkupToHtml.MARKUP_LANGUAGE_MARKDOWN : false;
-
-			return {
-				// True when the Markdown editor is active, and only the viewer pane is visible
-				// In this case, all editor-related shortcuts are disabled.
-				markdownEditorViewerOnly: state.settings['editor.codeView'] && state.noteVisiblePanes.length === 1 && state.noteVisiblePanes[0] === 'viewer',
-				hasSelectedNote: !!note,
-				isDialogVisible: !!Object.keys(state.visibleDialogs).length,
-				isMarkdownNote: isMarkdownNote,
-			};
-		},
+		enabledCondition: '!modalDialogVisible && markdownEditorPaneVisible && oneNoteSelected && noteIsMarkdown',
 	};
 }
 

ElectronClient/gui/NoteList/NoteList.tsx

@@ -24,7 +24,7 @@ const StyledRoot = styled.div`
 	width: 100%;
 	height: 100%;
 	background-color: ${(props:any) => props.theme.backgroundColor3};
-	border-right: 1px solid ${(props:any) => props.theme.dividerColor},
+	border-right: 1px solid ${(props:any) => props.theme.dividerColor};
 `;
 
 class NoteListComponent extends React.Component {
@@ -386,9 +386,9 @@ class NoteListComponent extends React.Component {
 			event.preventDefault();
 
 			if (event.shiftKey) {
-				CommandService.instance().execute('focusElement', { target: 'sideBar' });
+				CommandService.instance().execute('focusElement', 'sideBar');
 			} else {
-				CommandService.instance().execute('focusElement', { target: 'noteTitle' });
+				CommandService.instance().execute('focusElement', 'noteTitle');
 			}
 		}
 

ElectronClient/gui/NoteList/commands/focusElementNoteList.ts

@@ -1,5 +1,6 @@
-import { CommandRuntime, CommandDeclaration } from 'lib/services/CommandService';
+import { CommandRuntime, CommandDeclaration, CommandContext } from 'lib/services/CommandService';
 import { _ } from 'lib/locale';
+import { stateUtils } from 'lib/reducer';
 
 export const declaration:CommandDeclaration = {
 	name: 'focusElementNoteList',
@@ -9,19 +10,14 @@ export const declaration:CommandDeclaration = {
 
 export const runtime = (comp:any):CommandRuntime => {
 	return {
-		execute: async ({ noteId }:any) => {
+		execute: async (context:CommandContext, noteId:string = null) => {
+			noteId = noteId || stateUtils.selectedNoteId(context.state);
+
 			if (noteId) {
 				const ref = comp.itemAnchorRef(noteId);
 				if (ref) ref.focus();
 			}
 		},
-		isEnabled: (props:any):boolean => {
-			return !!props.noteId;
-		},
-		mapStateToProps: (state:any):any => {
-			return {
-				noteId: state.selectedNoteIds.length ? state.selectedNoteIds[0] : null,
-			};
-		},
+		enabledCondition: 'noteListHasNotes',
 	};
 };

ElectronClient/gui/NoteListControls/NoteListControls.tsx

@@ -52,13 +52,13 @@ export default function NoteListControls(props:Props) {
 		return (
 			<ButtonContainer>
 				<StyledButton
-					tooltip={CommandService.instance().title('newTodo', {})}
+					tooltip={CommandService.instance().label('newTodo')}
 					iconName="far fa-check-square"
 					level={ButtonLevel.Primary}
 					onClick={onNewTodoButtonClick}
 				/>
 				<StyledButton
-					tooltip={CommandService.instance().title('newNote', {})}
+					tooltip={CommandService.instance().label('newNote')}
 					iconName="icon-note"
 					level={ButtonLevel.Primary}
 					onClick={onNewNoteButtonClick}

ElectronClient/gui/NoteListControls/commands/focusSearch.ts

@@ -1,4 +1,4 @@
-import { CommandRuntime, CommandDeclaration } from '../../../lib/services/CommandService';
+import { CommandRuntime, CommandDeclaration } from 'lib/services/CommandService';
 import { _ } from 'lib/locale';
 
 export const declaration:CommandDeclaration = {

ElectronClient/gui/NoteToolbar/NoteToolbar.tsx

@@ -3,6 +3,7 @@ import CommandService from 'lib/services/CommandService';
 import ToolbarBase from '../ToolbarBase';
 import { utils as pluginUtils } from 'lib/services/plugins/reducer';
 import ToolbarButtonUtils, { ToolbarButtonInfo } from 'lib/services/commands/ToolbarButtonUtils';
+import stateToWhenClauseContext from 'lib/services/commands/stateToWhenClauseContext';
 const { connect } = require('react-redux');
 const { buildStyle } = require('lib/theme');
 
@@ -32,12 +33,14 @@ function NoteToolbar(props:NoteToolbarProps) {
 const toolbarButtonUtils = new ToolbarButtonUtils(CommandService.instance());
 
 const mapStateToProps = (state:any) => {
+	const whenClauseContext = stateToWhenClauseContext(state);
+
 	return {
-		toolbarButtonInfos: toolbarButtonUtils.commandsToToolbarButtons(state, [
+		toolbarButtonInfos: toolbarButtonUtils.commandsToToolbarButtons([
 			'editAlarm',
 			'toggleVisiblePanes',
 			'showNoteProperties',
-		].concat(pluginUtils.commandNamesFromViews(state.pluginService.plugins, 'noteToolbar'))),
+		].concat(pluginUtils.commandNamesFromViews(state.pluginService.plugins, 'noteToolbar')), whenClauseContext),
 	};
 };
 

ElectronClient/gui/SearchBar/hooks/useSearch.ts

@@ -5,7 +5,7 @@ const debounce = require('debounce');
 export default function useSearch(query:string) {
 	useEffect(() => {
 		const search = debounce((query:string) => {
-			CommandService.instance().execute('search', { query });
+			CommandService.instance().execute('search', query);
 		}, 500);
 
 		search(query);

ElectronClient/gui/SideBar/SideBar.tsx

@@ -230,7 +230,7 @@ class SideBarComponent extends React.Component<Props, State> {
 
 		if (itemType === BaseModel.TYPE_FOLDER && !item.encryption_applied) {
 			menu.append(
-				new MenuItem(menuUtils.commandToStatefulMenuItem('newFolder', { parentId: itemId }))
+				new MenuItem(menuUtils.commandToStatefulMenuItem('newFolder', itemId))
 			);
 		}
 
@@ -259,7 +259,7 @@ class SideBarComponent extends React.Component<Props, State> {
 		);
 
 		if (itemType === BaseModel.TYPE_FOLDER && !item.encryption_applied) {
-			menu.append(new MenuItem(menuUtils.commandToStatefulMenuItem('renameFolder', { folderId: itemId })));
+			menu.append(new MenuItem(menuUtils.commandToStatefulMenuItem('renameFolder', itemId)));
 
 			menu.append(new MenuItem({ type: 'separator' }));
 
@@ -290,7 +290,7 @@ class SideBarComponent extends React.Component<Props, State> {
 
 		if (itemType === BaseModel.TYPE_TAG) {
 			menu.append(new MenuItem(
-				menuUtils.commandToStatefulMenuItem('renameTag', { tagId: itemId })
+				menuUtils.commandToStatefulMenuItem('renameTag', itemId)
 			));
 		}
 
@@ -510,9 +510,9 @@ class SideBarComponent extends React.Component<Props, State> {
 			event.preventDefault();
 
 			if (event.shiftKey) {
-				CommandService.instance().execute('focusElement', { target: 'noteBody' });
+				CommandService.instance().execute('focusElement', 'noteBody');
 			} else {
-				CommandService.instance().execute('focusElement', { target: 'noteList' });
+				CommandService.instance().execute('focusElement', 'noteList');
 			}
 		}
 
@@ -559,7 +559,7 @@ class SideBarComponent extends React.Component<Props, State> {
 				iconAnimation={iconAnimation}
 				title={label}
 				onClick={() => {
-					CommandService.instance().execute('synchronize', { syncStarted: type !== 'sync' });
+					CommandService.instance().execute('synchronize', type !== 'sync');
 				}}
 			/>
 		);

ElectronClient/gui/SideBar/commands/focusElementSideBar.ts

@@ -1,5 +1,6 @@
-import { CommandRuntime, CommandDeclaration } from '../../../lib/services/CommandService';
+import { CommandRuntime, CommandDeclaration } from 'lib/services/CommandService';
 import { _ } from 'lib/locale';
+import { DesktopCommandContext } from 'ElectronClient/services/commands/types';
 
 export const declaration:CommandDeclaration = {
 	name: 'focusElementSideBar',
@@ -9,8 +10,10 @@ export const declaration:CommandDeclaration = {
 
 export const runtime = (comp:any):CommandRuntime => {
 	return {
-		execute: async ({ sidebarVisibility }:any) => {
-			if (sidebarVisibility) {
+		execute: async (context:DesktopCommandContext) => {
+			const sideBarVisible = !!context.state.sidebarVisibility;
+
+			if (sideBarVisible) {
 				const item = comp.selectedItem();
 				if (item) {
 					const anchorRef = comp.anchorItemRefs[item.type][item.id];
@@ -21,13 +24,7 @@ export const runtime = (comp:any):CommandRuntime => {
 				}
 			}
 		},
-		isEnabled: (props:any):boolean => {
-			return props.sidebarVisibility;
-		},
-		mapStateToProps: (state:any):any => {
-			return {
-				sidebarVisibility: state.sidebarVisibility,
-			};
-		},
+
+		enabledCondition: 'sideBarVisible',
 	};
 };

ElectronClient/gui/SideBar/styles/index.ts

@@ -68,7 +68,7 @@ function listItemTextColor(props:any) {
 
 export const StyledListItemAnchor = styled.a`
 	font-size: ${(props:any) => Math.round(props.theme.fontSize * 1.0833333)}px;
-	font-weight: 500;
+	// font-weight: 500;
 	text-decoration: none;
 	color: ${(props:any) => listItemTextColor(props)};
 	cursor: default;

ElectronClient/gui/ToggleEditorsButton/ToggleEditorsButton.tsx

@@ -17,7 +17,7 @@ export default function ToggleEditorsButton(props:Props) {
 	const style = styles_(props);
 
 	return (
-		<button style={style.button} disabled={!props.toolbarButtonInfo.enabled} aria-label={props.toolbarButtonInfo.title} title={props.toolbarButtonInfo.title} type="button" className="tox-tbtn" aria-pressed="false" onClick={props.toolbarButtonInfo.onClick}>
+		<button style={style.button} disabled={!props.toolbarButtonInfo.enabled} aria-label={props.toolbarButtonInfo.tooltip} title={props.toolbarButtonInfo.tooltip} type="button" className="tox-tbtn" aria-pressed="false" onClick={props.toolbarButtonInfo.onClick}>
 			<div style={style.leftInnerButton}>
 				<i style={style.leftIcon} className="fab fa-markdown"></i>
 			</div>

ElectronClient/gui/ToggleEditorsButton/styles/index.ts

@@ -5,7 +5,7 @@ export default function styles(props:Props) {
 	return buildStyle(['ToggleEditorsButton', props.value], props.themeId, (theme: any) => {
 		const iconSize = 15;
 		const mdIconWidth = iconSize * 1.25;
-		const buttonHeight = theme.toolbarHeight - 8;
+		const buttonHeight = theme.toolbarHeight - 7;
 		const mdIconPadding = Math.round((buttonHeight - iconSize) / 2) + 3;
 
 		const innerButton:any = {
@@ -41,14 +41,14 @@ export default function styles(props:Props) {
 			leftIcon: {
 				fontSize: iconSize,
 				position: 'relative',
-				top: 1,
+				top: 2,
 				color: theme.color3,
 			},
 			rightIcon: {
 				fontSize: iconSize - 1,
 				borderLeft: 'none',
 				position: 'relative',
-				top: 1,
+				top: 2,
 				color: theme.color3,
 			},
 		};

ElectronClient/gui/utils/NoteListUtils.ts

@@ -40,11 +40,11 @@ export default class NoteListUtils {
 
 		if (!hasEncrypted) {
 			menu.append(
-				new MenuItem(menuUtils.commandToStatefulMenuItem('setTags', { noteIds }))
+				new MenuItem(menuUtils.commandToStatefulMenuItem('setTags', noteIds))
 			);
 
 			menu.append(
-				new MenuItem(menuUtils.commandToStatefulMenuItem('moveToFolder'))
+				new MenuItem(menuUtils.commandToStatefulMenuItem('moveToFolder', noteIds))
 			);
 
 			menu.append(
@@ -63,7 +63,7 @@ export default class NoteListUtils {
 
 			if (singleNoteId) {
 				const cmd = props.watchedNoteFiles.includes(singleNoteId) ? 'stopExternalEditing' : 'startExternalEditing';
-				menu.append(new MenuItem(menuUtils.commandToStatefulMenuItem(cmd, { noteId: singleNoteId })));
+				menu.append(new MenuItem(menuUtils.commandToStatefulMenuItem(cmd, singleNoteId)));
 			}
 
 			if (noteIds.length <= 1) {
@@ -132,7 +132,7 @@ export default class NoteListUtils {
 
 			menu.append(
 				new MenuItem(
-					menuUtils.commandToStatefulMenuItem('showShareNoteDialog', { noteIds: noteIds.slice() })
+					menuUtils.commandToStatefulMenuItem('showShareNoteDialog', noteIds.slice())
 				)
 			);
 
@@ -157,7 +157,7 @@ export default class NoteListUtils {
 
 			exportMenu.append(
 				new MenuItem(
-					menuUtils.commandToStatefulMenuItem('exportPdf', { noteIds: noteIds })
+					menuUtils.commandToStatefulMenuItem('exportPdf', noteIds)
 				)
 			);
 

ElectronClient/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "Joplin",
-  "version": "1.3.1",
+  "version": "1.3.5",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -5924,9 +5924,7 @@
             "minimist": {
               "version": "0.0.8",
               "resolved": false,
-              "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
-              "dev": true,
-              "optional": true
+              "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
             },
             "minipass": {
               "version": "2.9.0",
@@ -5950,13 +5948,22 @@
               }
             },
             "mkdirp": {
-              "version": "0.5.1",
-              "resolved": false,
-              "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+              "version": "0.5.5",
+              "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
+              "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
               "dev": true,
               "optional": true,
               "requires": {
-                "minimist": "0.0.8"
+                "minimist": "^1.2.5"
+              },
+              "dependencies": {
+                "minimist": {
+                  "version": "1.2.5",
+                  "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+                  "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
+                  "dev": true,
+                  "optional": true
+                }
               }
             },
             "ms": {
@@ -7773,6 +7780,11 @@
       "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz",
       "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg="
     },
+    "lodash.toarray": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/lodash.toarray/-/lodash.toarray-4.4.0.tgz",
+      "integrity": "sha1-JMS/zWsvuji/0FlNsRedjptlZWE="
+    },
     "log-symbols": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz",
@@ -8072,11 +8084,6 @@
       "resolved": "https://registry.npmjs.org/memoize-one/-/memoize-one-5.0.4.tgz",
       "integrity": "sha512-P0z5IeAH6qHHGkJIXWw0xC2HNEgkx/9uWWBQw64FJj3/ol14VYdfVGWWr0fXfjhhv3TKVIqUq65os6O4GUNksA=="
     },
-    "memory-cache": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/memory-cache/-/memory-cache-0.2.0.tgz",
-      "integrity": "sha1-eJCwHVLADI68nVM+H46xfjA0hxo="
-    },
     "mermaid": {
       "version": "8.8.1",
       "resolved": "https://registry.npmjs.org/mermaid/-/mermaid-8.8.1.tgz",
@@ -8506,6 +8513,14 @@
         "semver": "^5.4.1"
       }
     },
+    "node-emoji": {
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/node-emoji/-/node-emoji-1.10.0.tgz",
+      "integrity": "sha512-Yt3384If5H6BYGVHiHwTL+99OzJKHhgp82S8/dktEK73T26BazdgZ4JZh92xSVtGNJvz9UbXdNAc5hcrXV42vw==",
+      "requires": {
+        "lodash.toarray": "^4.4.0"
+      }
+    },
     "node-fetch": {
       "version": "1.7.3",
       "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.3.tgz",
@@ -10684,11 +10699,6 @@
         }
       }
     },
-    "slug": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/slug/-/slug-3.5.0.tgz",
-      "integrity": "sha512-+pZLDhMtmAc+ZcojQSMlUKDZBYmvhZiZmK8Ffx/D3Q/MIMHPDBAMbWvWN8vJb9xl2MfbDdRWxFzrdOhBiyVpow=="
-    },
     "smalltalk": {
       "version": "2.5.1",
       "resolved": "https://registry.npmjs.org/smalltalk/-/smalltalk-2.5.1.tgz",
@@ -11751,6 +11761,11 @@
       "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.1.tgz",
       "integrity": "sha1-+nG63UQ3r0wUiEHjs7Fl+enlkLc="
     },
+    "unorm": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/unorm/-/unorm-1.6.0.tgz",
+      "integrity": "sha512-b2/KCUlYZUeA7JFUuRJZPUtr4gZvBh7tavtv4fvk4+KV9pfGiR6CQAQAWl49ZpR3ts2dk4FYkP7EIgDJoiOLDA=="
+    },
     "unset-value": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
@@ -11942,6 +11957,14 @@
       "integrity": "sha1-K1viOjK2Onyd640PKNSFcko98ZA=",
       "dev": true
     },
+    "uslug": {
+      "version": "git+https://github.com/laurent22/uslug.git#ba2834d79beb0435318709958b2f5e817d96674d",
+      "from": "git+https://github.com/laurent22/uslug.git#emoji-support",
+      "requires": {
+        "node-emoji": "^1.10.0",
+        "unorm": ">= 1.0.0"
+      }
+    },
     "utf8-byte-length": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/utf8-byte-length/-/utf8-byte-length-1.0.4.tgz",

ElectronClient/package.json

@@ -1,11 +1,11 @@
 {
   "name": "Joplin",
-  "version": "1.3.1",
+  "version": "1.3.5",
   "description": "Joplin for Desktop",
   "main": "main.js",
   "scripts": {
     "dist": "node_modules/.bin/electron-builder",
-    "build": "patch-package --patch-dir ../patches && gulp build",
+    "build": "patch-package --patch-dir ../patches/shared && patch-package --patch-dir ../patches/node && gulp build",
     "postinstall": "npm run build && gulp electronRebuild",
     "start": "gulp build && electron . --env dev --log-level debug --no-welcome --open-dev-tools"
   },
@@ -169,7 +169,6 @@
     "markdown-it-toc-done-right": "^4.1.0",
     "md5": "^2.2.1",
     "md5-file": "^4.0.0",
-    "memory-cache": "^0.2.0",
     "mermaid": "^8.8.1",
     "moment": "^2.22.2",
     "multiparty": "^4.2.1",
@@ -196,7 +195,6 @@
     "roboto-fontface": "^0.10.0",
     "sax": "^1.2.4",
     "server-destroy": "^1.0.1",
-    "slug": "^3.5.0",
     "smalltalk": "^2.5.1",
     "sprintf-js": "^1.1.1",
     "sqlite3": "^4.1.1",
@@ -212,6 +210,7 @@
     "tinymce": "^5.2.0",
     "uglifycss": "0.0.29",
     "url-parse": "^1.4.3",
+    "uslug": "git+https://github.com/laurent22/uslug.git#emoji-support",
     "uuid": "^3.2.1",
     "valid-url": "^1.0.9",
     "xml2js": "^0.4.19"

ElectronClient/plugins/GotoAnything.tsx

@@ -1,8 +1,12 @@
-const React = require('react');
+import * as React from 'react';
+import { AppState } from '../app';
+import CommandService, { SearchResult as CommandSearchResult } from 'lib/services/CommandService';
+import KeymapService from 'lib/services/KeymapService';
+import shim from 'lib/shim';
+
 const { connect } = require('react-redux');
 const { _ } = require('lib/locale');
 const { themeStyle } = require('lib/theme');
-const CommandService = require('lib/services/CommandService').default;
 const SearchEngine = require('lib/services/searchengine/SearchEngine');
 const BaseModel = require('lib/BaseModel');
 const Tag = require('lib/models/Tag');
@@ -12,32 +16,73 @@ const { ItemList } = require('../gui/ItemList.min');
 const HelpButton = require('../gui/HelpButton.min');
 const { surroundKeywords, nextWhitespaceIndex, removeDiacritics } = require('lib/string-utils.js');
 const { mergeOverlappingIntervals } = require('lib/ArrayUtils.js');
-const PLUGIN_NAME = 'gotoAnything';
 const markupLanguageUtils = require('lib/markupLanguageUtils');
-const KeymapService = require('lib/services/KeymapService.js').default;
-const shim = require('lib/shim').default;
+
+const PLUGIN_NAME = 'gotoAnything';
+
+interface SearchResult {
+	id: string,
+	title: string,
+	parent_id: string,
+	fields: string[],
+	fragments?: string,
+	path?: string,
+	type?: number,
+}
+
+interface Props {
+	themeId: number,
+	dispatch: Function,
+	folders: any[],
+	showCompletedTodos: boolean,
+	userData: any,
+}
+
+interface State {
+	query: string,
+	results: SearchResult[],
+	selectedItemId: string,
+	keywords: string[],
+	listType: number,
+	showHelp: boolean,
+	resultsInBody: boolean,
+}
 
 class GotoAnything {
 
-	onTrigger() {
+	public dispatch:Function;
+	public static Dialog:any;
+	public static manifest:any;
+
+	onTrigger(event:any) {
 		this.dispatch({
 			type: 'PLUGINLEGACY_DIALOG_SET',
 			open: true,
 			pluginName: PLUGIN_NAME,
+			userData: event.userData,
 		});
 	}
 
 }
 
-class Dialog extends React.PureComponent {
+class Dialog extends React.PureComponent<Props, State> {
 
-	constructor() {
-		super();
+	private fuzzy_:boolean;
+	private styles_:any;
+	private inputRef:any;
+	private itemListRef:any;
+	private listUpdateIID_:any;
+	private markupToHtml_:any;
+
+	constructor(props:Props) {
+		super(props);
 
 		this.fuzzy_ = false;
 
+		const startString = props?.userData?.startString ? props?.userData?.startString : '';
+
 		this.state = {
-			query: '',
+			query: startString,
 			results: [],
 			selectedItemId: null,
 			keywords: [],
@@ -55,19 +100,25 @@ class Dialog extends React.PureComponent {
 		this.input_onChange = this.input_onChange.bind(this);
 		this.input_onKeyDown = this.input_onKeyDown.bind(this);
 		this.modalLayer_onClick = this.modalLayer_onClick.bind(this);
-		this.listItemRenderer = this.listItemRenderer.bind(this);
+		this.renderItem = this.renderItem.bind(this);
 		this.listItem_onClick = this.listItem_onClick.bind(this);
 		this.helpButton_onClick = this.helpButton_onClick.bind(this);
+
+		if (startString) this.scheduleListUpdate();
 	}
 
 	style() {
-		const styleKey = [this.props.themeId, this.state.resultsInBody ? '1' : '0'].join('-');
+		const styleKey = [this.props.themeId, this.state.listType, this.state.resultsInBody ? '1' : '0'].join('-');
 
 		if (this.styles_[styleKey]) return this.styles_[styleKey];
 
 		const theme = themeStyle(this.props.themeId);
 
-		const itemHeight = this.state.resultsInBody ? 84 : 64;
+		let itemHeight = this.state.resultsInBody ? 84 : 64;
+
+		if (this.state.listType === BaseModel.TYPE_COMMAND) {
+			itemHeight = 40;
+		}
 
 		this.styles_[styleKey] = {
 			dialogBox: Object.assign({}, theme.dialogBox, { minWidth: '50%', maxWidth: '50%' }),
@@ -138,7 +189,7 @@ class Dialog extends React.PureComponent {
 		});
 	}
 
-	onKeyDown(event) {
+	onKeyDown(event:any) {
 		if (event.keyCode === 27) { // ESCAPE
 			this.props.dispatch({
 				pluginName: PLUGIN_NAME,
@@ -148,7 +199,7 @@ class Dialog extends React.PureComponent {
 		}
 	}
 
-	modalLayer_onClick(event) {
+	modalLayer_onClick(event:any) {
 		if (event.currentTarget == event.target) {
 			this.props.dispatch({
 				pluginName: PLUGIN_NAME,
@@ -162,7 +213,7 @@ class Dialog extends React.PureComponent {
 		this.setState({ showHelp: !this.state.showHelp });
 	}
 
-	input_onChange(event) {
+	input_onChange(event:any) {
 		this.setState({ query: event.target.value });
 
 		this.scheduleListUpdate();
@@ -177,7 +228,7 @@ class Dialog extends React.PureComponent {
 		}, 100);
 	}
 
-	makeSearchQuery(query) {
+	makeSearchQuery(query:string) {
 		const output = [];
 		const splitted = query.split(' ');
 
@@ -190,7 +241,7 @@ class Dialog extends React.PureComponent {
 		return output.join(' ');
 	}
 
-	async keywords(searchQuery) {
+	async keywords(searchQuery:string) {
 		const parsedQuery = await SearchEngine.instance().parseQuery(searchQuery, this.fuzzy_);
 		return SearchEngine.instance().allParsedQueryTerms(parsedQuery);
 	}
@@ -207,11 +258,28 @@ class Dialog extends React.PureComponent {
 		if (!this.state.query) {
 			this.setState({ results: [], keywords: [] });
 		} else {
-			let results = [];
+			let results:SearchResult[] = [];
 			let listType = null;
 			let searchQuery = '';
+			let keywords = null;
 
-			if (this.state.query.indexOf('#') === 0) { // TAGS
+			if (this.state.query.indexOf(':') === 0) { // COMMANDS
+				const query = this.state.query.substr(1);
+				listType = BaseModel.TYPE_COMMAND;
+				keywords = [query];
+
+				const commandResults = CommandService.instance().searchCommands(query, true);
+
+				results = commandResults.map((result:CommandSearchResult) => {
+					return {
+						id: result.commandName,
+						title: result.title,
+						parent_id: null,
+						fields: [],
+						type: BaseModel.TYPE_COMMAND,
+					};
+				});
+			} else if (this.state.query.indexOf('#') === 0) { // TAGS
 				listType = BaseModel.TYPE_TAG;
 				searchQuery = `*${this.state.query.split(' ')[0].substr(1).trim()}*`;
 				results = await Tag.searchAllWithNotes({ titlePattern: searchQuery });
@@ -230,7 +298,7 @@ class Dialog extends React.PureComponent {
 				searchQuery = this.makeSearchQuery(this.state.query);
 				results = await SearchEngine.instance().search(searchQuery, { fuzzy: this.fuzzy_ });
 
-				resultsInBody = !!results.find(row => row.fields.includes('body'));
+				resultsInBody = !!results.find((row:any) => row.fields.includes('body'));
 
 				if (!resultsInBody || this.state.query.length <= 1) {
 					for (let i = 0; i < results.length; i++) {
@@ -241,7 +309,9 @@ class Dialog extends React.PureComponent {
 				} else {
 					const limit = 20;
 					const searchKeywords = await this.keywords(searchQuery);
-					const notes = await Note.byIds(results.map(result => result.id).slice(0, limit), { fields: ['id', 'body', 'markup_language', 'is_todo', 'todo_completed'] });
+					const notes = await Note.byIds(results.map((result:any) => result.id).slice(0, limit), { fields: ['id', 'body', 'markup_language', 'is_todo', 'todo_completed'] });
+					// Can't make any sense of this code so...
+					// @ts-ignore
 					const notesById = notes.reduce((obj, { id, body, markup_language }) => ((obj[[id]] = { id, body, markup_language }), obj), {});
 
 					for (let i = 0; i < results.length; i++) {
@@ -272,7 +342,7 @@ class Dialog extends React.PureComponent {
 								// e.g. 'Joplin is a free, open source' and 'open source note taking application'
 								// will result in 'Joplin is a free, open source note taking application'
 								const mergedIndices = mergeOverlappingIntervals(indices, 3);
-								fragments = mergedIndices.map(f => body.slice(f[0], f[1])).join(' ... ');
+								fragments = mergedIndices.map((f:any) => body.slice(f[0], f[1])).join(' ... ');
 								// Add trailing ellipsis if the final fragment doesn't end where the note is ending
 								if (mergedIndices.length && mergedIndices[mergedIndices.length - 1][1] !== body.length) fragments += ' ...';
 
@@ -285,7 +355,7 @@ class Dialog extends React.PureComponent {
 					}
 
 					if (!this.props.showCompletedTodos) {
-						results = results.filter((row) => !row.is_todo || !row.todo_completed);
+						results = results.filter((row:any) => !row.is_todo || !row.todo_completed);
 					}
 				}
 			}
@@ -296,20 +366,25 @@ class Dialog extends React.PureComponent {
 			this.setState({
 				listType: listType,
 				results: results,
-				keywords: await this.keywords(searchQuery),
+				keywords: keywords ? keywords : await this.keywords(searchQuery),
 				selectedItemId: results.length === 0 ? null : results[0].id,
 				resultsInBody: resultsInBody,
 			});
 		}
 	}
 
-	async gotoItem(item) {
+	async gotoItem(item:any) {
 		this.props.dispatch({
 			pluginName: PLUGIN_NAME,
 			type: 'PLUGINLEGACY_DIALOG_SET',
 			open: false,
 		});
 
+		if (item.type === BaseModel.TYPE_COMMAND) {
+			CommandService.instance().execute(item.id);
+			return;
+		}
+
 		if (this.state.listType === BaseModel.TYPE_NOTE || this.state.listType === BaseModel.TYPE_FOLDER) {
 			const folderPath = await Folder.folderPath(this.props.folders, item.parent_id);
 
@@ -329,7 +404,7 @@ class Dialog extends React.PureComponent {
 				noteId: item.id,
 			});
 
-			CommandService.instance().scheduleExecute('focusElement', { target: 'noteBody' });
+			CommandService.instance().scheduleExecute('focusElement', 'noteBody');
 		} else if (this.state.listType === BaseModel.TYPE_TAG) {
 			this.props.dispatch({
 				type: 'TAG_SELECT',
@@ -343,17 +418,19 @@ class Dialog extends React.PureComponent {
 		}
 	}
 
-	listItem_onClick(event) {
+	listItem_onClick(event:any) {
 		const itemId = event.currentTarget.getAttribute('data-id');
 		const parentId = event.currentTarget.getAttribute('data-parent-id');
+		const itemType = event.currentTarget.getAttribute('data-type');
 
 		this.gotoItem({
 			id: itemId,
 			parent_id: parentId,
+			type: itemType,
 		});
 	}
 
-	listItemRenderer(item) {
+	renderItem(item:SearchResult) {
 		const theme = themeStyle(this.props.themeId);
 		const style = this.style();
 		const rowStyle = item.id === this.state.selectedItemId ? style.rowSelected : style.row;
@@ -368,7 +445,7 @@ class Dialog extends React.PureComponent {
 		const fragmentComp = !fragmentsHtml ? null : <div style={style.rowFragments} dangerouslySetInnerHTML={{ __html: (fragmentsHtml) }}></div>;
 
 		return (
-			<div key={item.id} style={rowStyle} onClick={this.listItem_onClick} data-id={item.id} data-parent-id={item.parent_id}>
+			<div key={item.id} style={rowStyle} onClick={this.listItem_onClick} data-id={item.id} data-parent-id={item.parent_id} data-type={item.type}>
 				<div style={style.rowTitle} dangerouslySetInnerHTML={{ __html: titleHtml }}></div>
 				{fragmentComp}
 				{pathComp}
@@ -376,7 +453,7 @@ class Dialog extends React.PureComponent {
 		);
 	}
 
-	selectedItemIndex(results, itemId) {
+	selectedItemIndex(results:any[] = undefined, itemId:string = undefined) {
 		if (typeof results === 'undefined') results = this.state.results;
 		if (typeof itemId === 'undefined') itemId = this.state.selectedItemId;
 		for (let i = 0; i < results.length; i++) {
@@ -392,7 +469,7 @@ class Dialog extends React.PureComponent {
 		return this.state.results[index];
 	}
 
-	input_onKeyDown(event) {
+	input_onKeyDown(event:any) {
 		const keyCode = event.keyCode;
 
 		if (this.state.results.length > 0 && (keyCode === 40 || keyCode === 38)) { // DOWN / UP
@@ -428,7 +505,7 @@ class Dialog extends React.PureComponent {
 
 		const itemListStyle = {
 			marginTop: 5,
-			height: Math.min(style.itemHeight * this.state.results.length, 7 * style.itemHeight),
+			height: Math.min(style.itemHeight * this.state.results.length, 10 * style.itemHeight),
 		};
 
 		return (
@@ -437,7 +514,7 @@ class Dialog extends React.PureComponent {
 				itemHeight={style.itemHeight}
 				items={this.state.results}
 				style={itemListStyle}
-				itemRenderer={this.listItemRenderer}
+				itemRenderer={this.renderItem}
 			/>
 		);
 	}
@@ -445,7 +522,7 @@ class Dialog extends React.PureComponent {
 	render() {
 		const theme = themeStyle(this.props.themeId);
 		const style = this.style();
-		const helpComp = !this.state.showHelp ? null : <div style={style.help}>{_('Type a note title or part of its content to jump to it. Or type # followed by a tag name, or @ followed by a notebook name.')}</div>;
+		const helpComp = !this.state.showHelp ? null : <div style={style.help}>{_('Type a note title or part of its content to jump to it. Or type # followed by a tag name, or @ followed by a notebook name. Or type : to search for commands.')}</div>;
 
 		return (
 			<div onClick={this.modalLayer_onClick} style={theme.dialogModalLayer}>
@@ -463,7 +540,7 @@ class Dialog extends React.PureComponent {
 
 }
 
-const mapStateToProps = (state) => {
+const mapStateToProps = (state:AppState) => {
 	return {
 		folders: state.folders,
 		themeId: state.settings.theme,
@@ -485,8 +562,18 @@ GotoAnything.manifest = {
 			accelerator: () => KeymapService.instance().getAccelerator('gotoAnything'),
 			screens: ['Main'],
 		},
+		{
+			name: 'main',
+			parent: 'tools',
+			label: _('Command palette'),
+			accelerator: () => KeymapService.instance().getAccelerator('commandPalette'),
+			screens: ['Main'],
+			userData: {
+				startString: ':',
+			},
+		},
 	],
 
 };
 
-module.exports = GotoAnything;
+export default GotoAnything;

ElectronClient/services/commands/types.ts

@@ -0,0 +1,5 @@
+import { AppState } from '../../app';
+
+export interface DesktopCommandContext {
+	state: AppState,
+}

Joplin_install_and_update.sh

@@ -1,4 +1,5 @@
-#!/bin/bash
+#!/usr/bin/env bash
+
 set -e
 
 #-----------------------------------------------------

README.md

@@ -100,7 +100,7 @@ The Web Clipper is a browser extension that allows you to save web pages and scr
 	- [Note History spec](https://github.com/laurent22/joplin/blob/dev/readme/spec/history.md)
 	- [Sync Lock spec](https://github.com/laurent22/joplin/blob/dev/readme/spec/sync_lock.md)
 	- [Plugin Architecture spec](https://github.com/laurent22/joplin/blob/dev/readme/spec/plugins.md)
-  - [Search Sorting spec](https://github.com/laurent22/joplin/blob/dev/readme/spec/search_sorting.md)
+	- [Search Sorting spec](https://github.com/laurent22/joplin/blob/dev/readme/spec/search_sorting.md)
 
 - Google Summer of Code 2020
 

ReactNativeClient/.flowconfig

@@ -21,7 +21,7 @@ node_modules/warning/.*
 [include]
 
 [libs]
-node_modules/react-native/Libraries/react-native/react-native-interface.js
+node_modules/react-native/interface.js
 node_modules/react-native/flow/
 
 [options]
@@ -36,9 +36,8 @@ module.file_ext=.ios.js
 
 munge_underscores=true
 
-module.name_mapper='^react-native$' -> '<PROJECT_ROOT>/node_modules/react-native/Libraries/react-native/react-native-implementation'
 module.name_mapper='^react-native/\(.*\)$' -> '<PROJECT_ROOT>/node_modules/react-native/\1'
-module.name_mapper='^[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|webp\|m4v\|mov\|mp4\|mpeg\|mpg\|webm\|aac\|aiff\|caf\|m4a\|mp3\|wav\|html\|pdf\)$' -> '<PROJECT_ROOT>/node_modules/react-native/Libraries/Image/RelativeImageStub'
+module.name_mapper='^@?[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|webp\|m4v\|mov\|mp4\|mpeg\|mpg\|webm\|aac\|aiff\|caf\|m4a\|mp3\|wav\|html\|pdf\)$' -> '<PROJECT_ROOT>/node_modules/react-native/Libraries/Image/RelativeImageStub'
 
 suppress_type=$FlowIssue
 suppress_type=$FlowFixMe
@@ -57,7 +56,6 @@ untyped-type-import=warn
 nonstrict-import=warn
 deprecated-type=warn
 unsafe-getters-setters=warn
-inexact-spread=warn
 unnecessary-invariant=warn
 signature-verification-failure=warn
 deprecated-utility=error
@@ -72,4 +70,4 @@ untyped-import
 untyped-type-import
 
 [version]
-^0.105.0
+^0.122.0

ReactNativeClient/.gitignore

@@ -20,7 +20,6 @@ DerivedData
 *.hmap
 *.ipa
 *.xcuserstate
-project.xcworkspace
 
 # Android/IntelliJ
 #
@@ -42,29 +41,19 @@ buck-out/
 *.keystore
 !debug.keystore
 
-# CocoaPods
-ios/Pods/
-
 # fastlane
 #
 # It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
 # screenshots whenever they are needed.
 # For more information about the recommended setup visit:
-# https://github.com/fastlane/fastlane/blob/master/fastlane/docs/Gitignore.md
+# https://docs.fastlane.tools/best-practices/source-control/
 
-fastlane/report.xml
-fastlane/Preview.html
-fastlane/screenshots
+*/fastlane/report.xml
+*/fastlane/Preview.html
+*/fastlane/screenshots
 
-# This is generated:
-android/build*
-android/app/build*
+# Bundle artifact
+*.jsbundle
 
-android/.project
-android/.settings/
-android/app/.classpath
-android/app/.project
-android/app/.settings/
-android/app/src/debug/res/
-
-pluginAssets/
+# CocoaPods
+/ios/Pods/

ReactNativeClient/.prettierrc.js

@@ -0,0 +1,6 @@
+module.exports = {
+  bracketSpacing: false,
+  jsxBracketSameLine: true,
+  singleQuote: true,
+  trailingComma: 'all',
+};