CLI v1.2.3

with app to create multiple instance of app and break settings.

Revert "Mobile: Add startup screen to show progress of db migration"

This reverts commit 569355a318.

.eslintignore

@@ -62,20 +62,31 @@ Modules/TinyMCE/langs/
 
 # AUTO-GENERATED - EXCLUDED TYPESCRIPT BUILD
 CliClient/app/LinkSelector.js
+CliClient/build/LinkSelector.js
 CliClient/tests/synchronizer_LockHandler.js
 CliClient/tests/synchronizer_MigrationHandler.js
 ElectronClient/commands/focusElement.js
 ElectronClient/commands/startExternalEditing.js
 ElectronClient/commands/stopExternalEditing.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/Header/commands/focusSearch.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/newNotebook.js
 ElectronClient/gui/MainScreen/commands/newTodo.js
 ElectronClient/gui/MainScreen/commands/print.js
 ElectronClient/gui/MainScreen/commands/renameFolder.js
@@ -87,9 +98,11 @@ 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/MultiNoteActions.js
 ElectronClient/gui/NoteContentPropertiesDialog.js
 ElectronClient/gui/NoteEditor/commands/editorCommandDeclarations.js
@@ -97,12 +110,6 @@ 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/AceEditor/AceEditor.js
-ElectronClient/gui/NoteEditor/NoteBody/AceEditor/styles/index.js
-ElectronClient/gui/NoteEditor/NoteBody/AceEditor/Toolbar.js
-ElectronClient/gui/NoteEditor/NoteBody/AceEditor/utils/index.js
-ElectronClient/gui/NoteEditor/NoteBody/AceEditor/utils/types.js
-ElectronClient/gui/NoteEditor/NoteBody/AceEditor/utils/useListIdent.js
 ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.js
 ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/Editor.js
 ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/styles/index.js
@@ -112,9 +119,11 @@ 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
@@ -124,19 +133,42 @@ 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/useNoteToolbarButtons.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/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
 ReactNativeClient/lib/AsyncActionQueue.js
 ReactNativeClient/lib/checkPermissions.js
 ReactNativeClient/lib/commands/historyBackward.js
@@ -146,12 +178,15 @@ ReactNativeClient/lib/components/screens/UpgradeSyncTargetScreen.js
 ReactNativeClient/lib/hooks/useEffectDebugger.js
 ReactNativeClient/lib/hooks/useImperativeHandlerDebugger.js
 ReactNativeClient/lib/hooks/usePrevious.js
+ReactNativeClient/lib/hooks/usePropsDebugger.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/ntpDate.js
 ReactNativeClient/lib/services/CommandService.js
+ReactNativeClient/lib/services/debug/populateDatabase.js
 ReactNativeClient/lib/services/keychain/KeychainService.js
 ReactNativeClient/lib/services/keychain/KeychainServiceDriver.dummy.js
 ReactNativeClient/lib/services/keychain/KeychainServiceDriver.mobile.js
@@ -174,6 +209,16 @@ ReactNativeClient/lib/services/synchronizer/utils/types.js
 ReactNativeClient/lib/services/UndoRedoService.js
 ReactNativeClient/lib/ShareExtension.js
 ReactNativeClient/lib/shareHandler.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/versionInfo.js
 ReactNativeClient/PluginAssetsLoader.js
 ReactNativeClient/setUpQuickActions.js

.gitignore

@@ -50,23 +50,36 @@ joplin-webclipper-source.zip
 Tools/commit_hook.txt
 .vscode/*
 *.map
+ReactNativeClient/lib/sql-extensions/spellfix.so
+ReactNativeClient/lib/sql-extensions/spellfix.dylib
 
 # AUTO-GENERATED - EXCLUDED TYPESCRIPT BUILD
 CliClient/app/LinkSelector.js
+CliClient/build/LinkSelector.js
 CliClient/tests/synchronizer_LockHandler.js
 CliClient/tests/synchronizer_MigrationHandler.js
 ElectronClient/commands/focusElement.js
 ElectronClient/commands/startExternalEditing.js
 ElectronClient/commands/stopExternalEditing.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/Header/commands/focusSearch.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/newNotebook.js
 ElectronClient/gui/MainScreen/commands/newTodo.js
 ElectronClient/gui/MainScreen/commands/print.js
 ElectronClient/gui/MainScreen/commands/renameFolder.js
@@ -78,9 +91,11 @@ 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/MultiNoteActions.js
 ElectronClient/gui/NoteContentPropertiesDialog.js
 ElectronClient/gui/NoteEditor/commands/editorCommandDeclarations.js
@@ -88,12 +103,6 @@ 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/AceEditor/AceEditor.js
-ElectronClient/gui/NoteEditor/NoteBody/AceEditor/styles/index.js
-ElectronClient/gui/NoteEditor/NoteBody/AceEditor/Toolbar.js
-ElectronClient/gui/NoteEditor/NoteBody/AceEditor/utils/index.js
-ElectronClient/gui/NoteEditor/NoteBody/AceEditor/utils/types.js
-ElectronClient/gui/NoteEditor/NoteBody/AceEditor/utils/useListIdent.js
 ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.js
 ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/Editor.js
 ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/styles/index.js
@@ -103,9 +112,11 @@ 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
@@ -115,19 +126,42 @@ 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/useNoteToolbarButtons.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/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
 ReactNativeClient/lib/AsyncActionQueue.js
 ReactNativeClient/lib/checkPermissions.js
 ReactNativeClient/lib/commands/historyBackward.js
@@ -137,12 +171,15 @@ ReactNativeClient/lib/components/screens/UpgradeSyncTargetScreen.js
 ReactNativeClient/lib/hooks/useEffectDebugger.js
 ReactNativeClient/lib/hooks/useImperativeHandlerDebugger.js
 ReactNativeClient/lib/hooks/usePrevious.js
+ReactNativeClient/lib/hooks/usePropsDebugger.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/ntpDate.js
 ReactNativeClient/lib/services/CommandService.js
+ReactNativeClient/lib/services/debug/populateDatabase.js
 ReactNativeClient/lib/services/keychain/KeychainService.js
 ReactNativeClient/lib/services/keychain/KeychainServiceDriver.dummy.js
 ReactNativeClient/lib/services/keychain/KeychainServiceDriver.mobile.js
@@ -165,6 +202,16 @@ ReactNativeClient/lib/services/synchronizer/utils/types.js
 ReactNativeClient/lib/services/UndoRedoService.js
 ReactNativeClient/lib/ShareExtension.js
 ReactNativeClient/lib/shareHandler.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/versionInfo.js
 ReactNativeClient/PluginAssetsLoader.js
 ReactNativeClient/setUpQuickActions.js

BUILD.md

@@ -11,6 +11,7 @@ Note that all the applications share the same library, which, for historical rea
 - macOS, Linux: Install rsync - https://nodejs.org/en/
 - macOS: Install Cocoapods - `brew install cocoapods`
 - Windows: Install Windows Build Tools - `npm install -g windows-build-tools`
+- Linux: Install dependencies - `sudo apt install libnss3 libsecret-1-dev`
 
 ## Building
 
@@ -25,6 +26,8 @@ Then you can test the various applications:
 	cd ElectronClient
 	npm start
 
+You can also run it under WSL 2. To do so, [follow these instructions](https://www.beekeeperstudio.io/blog/building-electron-windows-ubuntu-wsl2) to setup your environment.
+
 ## Testing the Terminal application
 
 	cd CliClient
@@ -87,6 +90,10 @@ It still requires you to quit the application each time you want it to rebuild,
 2. Switch to the Electron app and <kbd>cmd</kbd>+<kbd>Q</kbd> to quit it.
 3. `watchman` immediately restarts the app for you (whereas usually you'd have to switch back to the terminal, type `"npm start"`, and hit enter).
 
+# Updating Markdown renderer packages
+
+The Markdown renderer is located under ReactNativeClient/lib/joplin-renderer. Whenever updating one of its dependencies, such as Mermaid or Katex, please run `npm run buildAssets` to make sure all assets such as fonts or CSS files are deployed correctly.
+
 # Troubleshooting
 
 Please read for the [Build Troubleshooting Document](https://github.com/laurent22/joplin/blob/master/readme/build_troubleshooting.md) for various tips on how to get the build working.

CliClient/gulpfile.js

@@ -2,6 +2,9 @@ const gulp = require('gulp');
 const fs = require('fs-extra');
 const utils = require('../Tools/gulp/utils');
 const tasks = {
+	compileExtensions: {
+		fn: require('../Tools/gulp/tasks/compileExtensions.js'),
+	},
 	copyLib: require('../Tools/gulp/tasks/copyLib'),
 	tsc: require('../Tools/gulp/tasks/tsc'),
 	updateIgnoredTypeScriptBuild: require('../Tools/gulp/tasks/updateIgnoredTypeScriptBuild'),
@@ -53,10 +56,12 @@ utils.registerGulpTasks(gulp, tasks);
 
 gulp.task('build', gulp.series([
 	'prepareBuild',
+	'compileExtensions',
 	'copyLib',
 ]));
 
 gulp.task('buildTests', gulp.series([
 	'prepareTestBuild',
+	'compileExtensions',
 	'copyLib',
 ]));

CliClient/locales-build/index.js

@@ -38,42 +38,42 @@ locales['tr_TR'] = require('./tr_TR.json');
 locales['vi'] = require('./vi.json');
 locales['zh_CN'] = require('./zh_CN.json');
 locales['zh_TW'] = require('./zh_TW.json');
-stats['ar'] = {"percentDone":82};
-stats['eu'] = {"percentDone":35};
-stats['bs_BA'] = {"percentDone":85};
-stats['bg_BG'] = {"percentDone":68};
-stats['ca'] = {"percentDone":54};
+stats['ar'] = {"percentDone":80};
+stats['eu'] = {"percentDone":34};
+stats['bs_BA'] = {"percentDone":83};
+stats['bg_BG'] = {"percentDone":66};
+stats['ca'] = {"percentDone":53};
 stats['hr_HR'] = {"percentDone":28};
-stats['cs_CZ'] = {"percentDone":84};
-stats['da_DK'] = {"percentDone":76};
-stats['de_DE'] = {"percentDone":99};
-stats['et_EE'] = {"percentDone":68};
+stats['cs_CZ'] = {"percentDone":82};
+stats['da_DK'] = {"percentDone":74};
+stats['de_DE'] = {"percentDone":95};
+stats['et_EE'] = {"percentDone":66};
 stats['en_GB'] = {"percentDone":100};
 stats['en_US'] = {"percentDone":100};
-stats['es_ES'] = {"percentDone":91};
-stats['eo'] = {"percentDone":39};
-stats['fr_FR'] = {"percentDone":97};
-stats['gl_ES'] = {"percentDone":44};
-stats['id_ID'] = {"percentDone":95};
-stats['it_IT'] = {"percentDone":93};
-stats['nl_NL'] = {"percentDone":99};
-stats['nl_BE'] = {"percentDone":35};
-stats['nb_NO'] = {"percentDone":91};
-stats['fa'] = {"percentDone":34};
-stats['pl_PL'] = {"percentDone":87};
-stats['pt_PT'] = {"percentDone":91};
-stats['pt_BR'] = {"percentDone":98};
-stats['ro'] = {"percentDone":35};
-stats['sl_SI'] = {"percentDone":44};
-stats['sv'] = {"percentDone":73};
-stats['th_TH'] = {"percentDone":54};
-stats['vi'] = {"percentDone":88};
-stats['tr_TR'] = {"percentDone":99};
-stats['el_GR'] = {"percentDone":93};
-stats['ru_RU'] = {"percentDone":90};
-stats['sr_RS'] = {"percentDone":74};
-stats['zh_CN'] = {"percentDone":99};
-stats['zh_TW'] = {"percentDone":98};
-stats['ja_JP'] = {"percentDone":99};
-stats['ko'] = {"percentDone":89};
+stats['es_ES'] = {"percentDone":95};
+stats['eo'] = {"percentDone":38};
+stats['fr_FR'] = {"percentDone":94};
+stats['gl_ES'] = {"percentDone":43};
+stats['id_ID'] = {"percentDone":93};
+stats['it_IT'] = {"percentDone":91};
+stats['nl_NL'] = {"percentDone":96};
+stats['nl_BE'] = {"percentDone":34};
+stats['nb_NO'] = {"percentDone":88};
+stats['fa'] = {"percentDone":80};
+stats['pl_PL'] = {"percentDone":96};
+stats['pt_PT'] = {"percentDone":89};
+stats['pt_BR'] = {"percentDone":96};
+stats['ro'] = {"percentDone":78};
+stats['sl_SI'] = {"percentDone":42};
+stats['sv'] = {"percentDone":71};
+stats['th_TH'] = {"percentDone":52};
+stats['vi'] = {"percentDone":85};
+stats['tr_TR'] = {"percentDone":96};
+stats['el_GR'] = {"percentDone":96};
+stats['ru_RU'] = {"percentDone":95};
+stats['sr_RS'] = {"percentDone":72};
+stats['zh_CN'] = {"percentDone":96};
+stats['zh_TW'] = {"percentDone":95};
+stats['ja_JP'] = {"percentDone":96};
+stats['ko'] = {"percentDone":86};
 module.exports = { locales: locales, stats: stats };

CliClient/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "joplin",
-  "version": "1.0.166",
+  "version": "1.2.3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -5880,6 +5880,11 @@
         "is-fullwidth-code-point": "^2.0.0"
       }
     },
+    "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",
@@ -6742,11 +6747,6 @@
       "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",
@@ -6849,14 +6849,6 @@
       "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
       "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ=="
     },
-    "uslug": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/uslug/-/uslug-1.0.4.tgz",
-      "integrity": "sha1-uaIvCRTgqGFAYz2swwLl9PpFBnc=",
-      "requires": {
-        "unorm": ">= 1.0.0"
-      }
-    },
     "util-deprecate": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",

CliClient/package.json

@@ -28,7 +28,7 @@
     ],
     "owner": "Laurent Cozic"
   },
-  "version": "1.0.166",
+  "version": "1.2.3",
   "bin": {
     "joplin": "./main.js"
   },
@@ -109,7 +109,7 @@
     "terminal-kit": "^1.30.0",
     "tkwidgets": "^0.5.26",
     "url-parse": "^1.4.7",
-    "uslug": "^1.0.4",
+    "slug": "^3.3.4",
     "uuid": "^3.0.1",
     "valid-url": "^1.0.9",
     "word-wrap": "^1.2.3",

CliClient/tests/filterParser.js

@@ -4,7 +4,12 @@ require('app-module-path').addPath(__dirname);
 const filterParser = require('lib/services/searchengine/filterParser.js').default;
 // import filterParser from 'lib/services/searchengine/filterParser.js';
 
-const makeTerm = (name, value, negated) => { return { name, value, negated }; };
+const makeTerm = (name, value, negated, quoted = false, wildcard = false) => {
+	if (name === 'text') { return { name, value, negated, quoted, wildcard }; }
+	if (name === 'title' | name === 'body') { return { name, value, negated, wildcard }; }
+	return { name, value, negated };
+};
+
 describe('filterParser should be correct filter for keyword', () => {
 	it('title', () => {
 		const searchString = 'title: something';
@@ -65,7 +70,7 @@ describe('filterParser should be correct filter for keyword', () => {
 
 	it('phrase text search', () => {
 		const searchString = '"scott joplin"';
-		expect(filterParser(searchString)).toContain(makeTerm('text', '"scott joplin"', false));
+		expect(filterParser(searchString)).toContain(makeTerm('text', '"scott joplin"', false, true));
 	});
 
 	it('multi word body', () => {
@@ -105,6 +110,9 @@ describe('filterParser should be correct filter for keyword', () => {
 
 		searchString = 'tag:bl*sphemy';
 		expect(filterParser(searchString)).toContain(makeTerm('tag', 'bl%sphemy', false));
+
+		searchString = 'tag:"space travel"';
+		expect(filterParser(searchString)).toContain(makeTerm('tag', 'space travel', false));
 	});
 
 	it('wildcard notebooks', () => {

CliClient/tests/pathUtils.js

@@ -24,7 +24,7 @@ describe('pathUtils', function() {
 			['no space at the end ', 'no space at the end'],
 			['nor dots...', 'nor dots'],
 			['  no space before either', 'no space before either'],
-			['thatsreallylongthatsreallylongthatsreallylongthatsreallylongthatsreallylongthatsreallylongthatsreallylongthatsreallylongthatsreallylongthatsreallylongthatsreallylongthatsreallylongthatsreallylongthatsreallylongthatsreallylongthatsreallylongthatsreallylongthatsreallylong', 'thatsreallylongthatsreallylongthatsreallylongthatsreallylongthatsreallylongthatsreallylongthatsreallylongthatsreallylongthatsreallylongthatsreallylongthatsreallylongthatsreallylongthatsreallylongthatsreallylongthatsreallylongthatsreallylongthatsreallylong'],
+			['thatsreallylongthatsreallylongthatsreallylongthatsreallylongthatsreallylongthatsreallylongthatsreallylongthatsreallylongthatsreallylongthatsreallylongthatsreallylongthatsreallylongthatsreallylongthatsreallylongthatsreallylongthatsreallylongthatsreallylongthatsreallylong', 'thatsreallylongthatsreallylongthatsreallylongthats'],
 		];
 
 		for (let i = 0; i < testCases.length; i++) {

CliClient/tests/services_InteropService.js

@@ -3,7 +3,7 @@
 require('app-module-path').addPath(__dirname);
 
 const { time } = require('lib/time-utils.js');
-const { asyncTest, fileContentEqual, setupDatabase, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync } = require('test-utils.js');
+const { asyncTest, fileContentEqual, expectNotThrow, setupDatabase, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync } = require('test-utils.js');
 const InteropService = require('lib/services/InteropService.js');
 const Folder = require('lib/models/Folder.js');
 const Note = require('lib/models/Note.js');
@@ -442,4 +442,26 @@ describe('services_InteropService', function() {
 		expect(await shim.fsDriver().exists(`${exportDir()}/testexportfolder/textexportnote2.md`)).toBe(true);
 	}));
 
+	it('should not try to export folders with a non-existing parent', asyncTest(async () => {
+		// Handles and edge case where user has a folder but this folder with a parent
+		// that doesn't exist. Can happen for example in this case:
+		//
+		// - folder1/folder2
+		// - Client 1 sync folder2, but not folder1
+		// - Client 2 sync and get folder2 only
+		// - Client 2 export data
+		// => Crash if we don't handle this case
+
+		await Folder.save({ title: 'orphan', parent_id: '0c5bbd8a1b5a48189484a412a7e534cc' });
+
+		const service = new InteropService();
+
+		const result = await service.export({
+			path: exportDir(),
+			format: 'md',
+		});
+
+		expect(result.warnings.length).toBe(0);
+	}));
+
 });

CliClient/tests/services_KeymapService.js

@@ -115,6 +115,7 @@ describe('services_KeymapService', () => {
 				{ command: 'focusElementNoteTitle', accelerator: 'Option+Shift+Cmd+T' },
 				{ command: 'focusElementNoteBody', accelerator: 'Ctrl+Option+Shift+Cmd+B' },
 			];
+
 			testCases_Darwin.forEach(({ command, accelerator }) => {
 				keymapService.setAccelerator(command, accelerator);
 				expect(keymapService.getAccelerator(command)).toEqual(accelerator);
@@ -131,6 +132,7 @@ describe('services_KeymapService', () => {
 				{ command: 'focusElementNoteTitle', accelerator: 'Ctrl+Alt+Shift+T' },
 				{ command: 'focusElementNoteBody', accelerator: 'Ctrl+Alt+Shift+B' },
 			];
+
 			testCases_Linux.forEach(({ command, accelerator }) => {
 				keymapService.setAccelerator(command, accelerator);
 				expect(keymapService.getAccelerator(command)).toEqual(accelerator);
@@ -138,10 +140,10 @@ describe('services_KeymapService', () => {
 		});
 	});
 
-	describe('resetAccelerator', () => {
+	describe('getDefaultAccelerator', () => {
 		beforeEach(() => keymapService.initialize());
 
-		it('should reset the Accelerator', () => {
+		it('should return the default accelerator', () => {
 			const testCases = [
 				{ command: 'newNote', accelerator: 'Ctrl+Alt+Shift+N' },
 				{ command: 'synchronize', accelerator: null /* Disabled */ },
@@ -154,28 +156,24 @@ describe('services_KeymapService', () => {
 			];
 
 			testCases.forEach(({ command, accelerator }) => {
-				// Remember the default Accelerator value
-				const prevAccelerator = keymapService.getAccelerator(command);
+				// Remember the real default Accelerator value
+				const defaultAccelerator = keymapService.getAccelerator(command);
 
-				// Update the Accelerator,
+				// Update the Accelerator and then retrieve the default accelerator
 				keymapService.setAccelerator(command, accelerator);
-				expect(keymapService.getAccelerator(command)).toEqual(accelerator);
-
-				// and then reset it..
-				keymapService.resetAccelerator(command);
-				expect(keymapService.getAccelerator(command)).toEqual(prevAccelerator);
+				expect(keymapService.getDefaultAccelerator(command)).toEqual(defaultAccelerator);
 			});
 		});
 	});
 
-	describe('setKeymap', () => {
+	describe('overrideKeymap', () => {
 		beforeEach(() => keymapService.initialize());
 
 		it('should update the keymap', () => {
 			keymapService.initialize('darwin');
-			const customKeymap_Darwin = [
+			const customKeymapItems_Darwin = [
 				{ command: 'newNote', accelerator: 'Option+Shift+Cmd+N' },
-				{ command: 'synchronize', accelerator: 'F11' },
+				{ command: 'synchronize', accelerator: 'Ctrl+F11' },
 				{ command: 'textBold', accelerator: 'Shift+F5' },
 				{ command: 'showLocalSearch', accelerator: 'Ctrl+Option+S' },
 				{ command: 'gotoAnything', accelerator: 'Ctrl+Shift+G' },
@@ -187,16 +185,16 @@ describe('services_KeymapService', () => {
 				{ command: 'focusElementNoteList', accelerator: 'Shift+Cmd+S' /* Default of focusElementSideBar */ },
 			];
 
-			expect(() => keymapService.setKeymap(customKeymap_Darwin)).not.toThrow();
-			customKeymap_Darwin.forEach(({ command, accelerator }) => {
+			expect(() => keymapService.overrideKeymap(customKeymapItems_Darwin)).not.toThrow();
+			customKeymapItems_Darwin.forEach(({ command, accelerator }) => {
 				// Also check if keymap is updated or not
 				expect(keymapService.getAccelerator(command)).toEqual(accelerator);
 			});
 
 			keymapService.initialize('win32');
-			const customKeymap_Win32 = [
+			const customKeymapItems_Win32 = [
 				{ command: 'newNote', accelerator: 'Ctrl+Alt+Shift+N' },
-				{ command: 'synchronize', accelerator: 'F11' },
+				{ command: 'synchronize', accelerator: 'Ctrl+F11' },
 				{ command: 'textBold', accelerator: 'Shift+F5' },
 				{ command: 'showLocalSearch', accelerator: 'Ctrl+Alt+S' },
 				{ command: 'gotoAnything', accelerator: 'Ctrl+Shift+G' },
@@ -208,8 +206,8 @@ describe('services_KeymapService', () => {
 				{ command: 'focusElementNoteList', accelerator: 'Ctrl+Shift+S' /* Default of focusElementSideBar */ },
 			];
 
-			expect(() => keymapService.setKeymap(customKeymap_Win32)).not.toThrow();
-			customKeymap_Win32.forEach(({ command, accelerator }) => {
+			expect(() => keymapService.overrideKeymap(customKeymapItems_Win32)).not.toThrow();
+			customKeymapItems_Win32.forEach(({ command, accelerator }) => {
 				// Also check if keymap is updated or not
 				expect(keymapService.getAccelerator(command)).toEqual(accelerator);
 			});
@@ -240,30 +238,30 @@ describe('services_KeymapService', () => {
 			];
 
 			for (let i = 0; i < customKeymaps.length; i++) {
-				const customKeymap = customKeymaps[i];
-				expect(() => keymapService.setKeymap(customKeymap)).toThrow();
+				const customKeymapItems = customKeymaps[i];
+				expect(() => keymapService.overrideKeymap(customKeymapItems)).toThrow();
 			}
 		});
 
 		it('should throw when the provided Accelerators are invalid', () => {
 			// Only one test case is provided since KeymapService.validateAccelerator() is already tested
-			const customKeymap = [
+			const customKeymapItems = [
 				{ command: 'gotoAnything', accelerator: 'Ctrl+Shift+G' },
 				{ command: 'print', accelerator: 'Alt+P' },
 				{ command: 'focusElementNoteTitle', accelerator: 'Ctrl+Alt+Shift+J+O+P+L+I+N' },
 			];
 
-			expect(() => keymapService.setKeymap(customKeymap)).toThrow();
+			expect(() => keymapService.overrideKeymap(customKeymapItems)).toThrow();
 		});
 
 		it('should throw when the provided commands are invalid', () => {
-			const customKeymap = [
+			const customKeymapItems = [
 				{ command: 'totallyInvalidCommand', accelerator: 'Ctrl+Shift+G' },
 				{ command: 'print', accelerator: 'Alt+P' },
 				{ command: 'focusElementNoteTitle', accelerator: 'Ctrl+Alt+Shift+J' },
 			];
 
-			expect(() => keymapService.setKeymap(customKeymap)).toThrow();
+			expect(() => keymapService.overrideKeymap(customKeymapItems)).toThrow();
 		});
 
 		it('should throw when duplicate accelerators are provided', () => {
@@ -281,14 +279,8 @@ describe('services_KeymapService', () => {
 			];
 
 			for (let i = 0; i < customKeymaps_Darwin.length; i++) {
-				const customKeymap = customKeymaps_Darwin[i];
-				const defaultAccelerators = customKeymap.map(({ command }) => keymapService.getAccelerator(command));
-
-				expect(() => keymapService.setKeymap(customKeymap)).toThrow();
-				// All items should be reset to default values
-				for (let j = 0; j < customKeymap.length; j++) {
-					expect(keymapService.getAccelerator(customKeymap[j].command)).toEqual(defaultAccelerators[j]);
-				}
+				const customKeymapItems = customKeymaps_Darwin[i];
+				expect(() => keymapService.overrideKeymap(customKeymapItems)).toThrow();
 			}
 
 			const customKeymaps_Linux = [
@@ -305,14 +297,8 @@ describe('services_KeymapService', () => {
 			];
 
 			for (let i = 0; i < customKeymaps_Linux.length; i++) {
-				const customKeymap = customKeymaps_Linux[i];
-				const defaultAccelerators = customKeymap.map(({ command }) => keymapService.getAccelerator(command));
-
-				expect(() => keymapService.setKeymap(customKeymap)).toThrow();
-
-				for (let j = 0; j < customKeymap.length; j++) {
-					expect(keymapService.getAccelerator(customKeymap[j].command)).toEqual(defaultAccelerators[j]);
-				}
+				const customKeymapItems = customKeymaps_Linux[i];
+				expect(() => keymapService.overrideKeymap(customKeymapItems)).toThrow();
 			}
 		});
 	});

CliClient/tests/services_SearchEngine.js

@@ -426,7 +426,7 @@ describe('services_SearchEngine', function() {
 			const t = testCases[i];
 			const input = t[0];
 			const expected = t[1];
-			const actual = engine.parseQuery(input);
+			const actual = await engine.parseQuery(input);
 
 			const _Values = actual.terms._ ? actual.terms._.map(v => v.value) : undefined;
 			const titleValues = actual.terms.title ? actual.terms.title.map(v => v.value) : undefined;

CliClient/tests/services_SearchFilter.js

@@ -268,7 +268,7 @@ describe('services_SearchFilter', function() {
 
 		await Tag.setNoteTagsByTitles(n1.id, ['tag1', 'tag2']);
 		await Tag.setNoteTagsByTitles(n2.id, ['tag2', 'tag3']);
-		await Tag.setNoteTagsByTitles(n3.id, ['tag3', 'tag4']);
+		await Tag.setNoteTagsByTitles(n3.id, ['tag3', 'tag4', 'space travel']);
 
 		await engine.syncTables();
 
@@ -304,6 +304,10 @@ describe('services_SearchFilter', function() {
 		expect(rows.length).toBe(2);
 		expect(ids(rows)).toContain(n1.id);
 		expect(ids(rows)).toContain(n3.id);
+
+		rows = await engine.search('tag:"space travel"');
+		expect(rows.length).toBe(1);
+		expect(ids(rows)).toContain(n3.id);
 	}));
 
 	it('should support filtering by notebook', asyncTest(async () => {

CliClient/tests/services_SearchFuzzy.js

@@ -0,0 +1,163 @@
+/* eslint-disable no-unused-vars */
+/* eslint prefer-const: 0*/
+
+// require('app-module-path').addPath(__dirname);
+
+// const { time } = require('lib/time-utils.js');
+// const { fileContentEqual, setupDatabase, setupDatabaseAndSynchronizer, asyncTest, db, synchronizer, fileApi, sleep, createNTestNotes, switchClient, createNTestFolders } = require('test-utils.js');
+// const SearchEngine = require('lib/services/searchengine/SearchEngine');
+// const Note = require('lib/models/Note');
+// const Folder = require('lib/models/Folder');
+// const Tag = require('lib/models/Tag');
+// const ItemChange = require('lib/models/ItemChange');
+// const Setting = require('lib/models/Setting');
+// const Resource = require('lib/models/Resource.js');
+// const { shim } = require('lib/shim');
+// const ResourceService = require('lib/services/ResourceService.js');
+
+
+// process.on('unhandledRejection', (reason, p) => {
+// 	console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);
+// });
+
+// let engine = null;
+
+// const ids = (array) => array.map(a => a.id);
+
+// describe('services_SearchFuzzy', function() {
+// 	beforeEach(async (done) => {
+// 		await setupDatabaseAndSynchronizer(1);
+// 		await switchClient(1);
+
+// 		engine = new SearchEngine();
+// 		engine.setDb(db());
+
+// 		Setting.setValue('db.fuzzySearchEnabled', 1);
+// 		done();
+// 	});
+
+
+// 	it('should return note almost matching title', asyncTest(async () => {
+// 		let rows;
+// 		const n1 = await Note.save({ title: 'If It Ain\'t Baroque, Don\'t Fix It' });
+// 		const n2 = await Note.save({ title: 'Important note' });
+
+// 		await engine.syncTables();
+// 		rows = await engine.search('Broke', { fuzzy: false });
+// 		expect(rows.length).toBe(0);
+
+// 		rows = await engine.search('Broke', { fuzzy: true });
+// 		expect(rows.length).toBe(1);
+// 		expect(rows[0].id).toBe(n1.id);
+
+
+// 		rows = await engine.search('title:Broke', { fuzzy: true });
+// 		expect(rows.length).toBe(1);
+// 		expect(rows[0].id).toBe(n1.id);
+
+// 		rows = await engine.search('title:"Broke"', { fuzzy: true });
+// 		expect(rows.length).toBe(1);
+// 		expect(rows[0].id).toBe(n1.id);
+
+// 		rows = await engine.search('Imprtant', { fuzzy: true });
+// 		expect(rows.length).toBe(1);
+// 		expect(rows[0].id).toBe(n2.id);
+// 	}));
+
+
+// 	it('should order results by min fuzziness', asyncTest(async () => {
+// 		let rows;
+// 		const n1 = await Note.save({ title: 'I demand you take me to him' });
+// 		const n2 = await Note.save({ title: 'He demanded an answer' });
+// 		const n3 = await Note.save({ title: 'Don\'t you make demands of me' });
+// 		const n4 = await Note.save({ title: 'No drama for me' });
+// 		const n5 = await Note.save({ title: 'Just minding my own business' });
+
+// 		await engine.syncTables();
+// 		rows = await engine.search('demand', { fuzzy: false });
+// 		expect(rows.length).toBe(1);
+// 		expect(rows[0].id).toBe(n1.id);
+
+
+// 		rows = await engine.search('demand', { fuzzy: true });
+// 		expect(rows.length).toBe(3);
+// 		expect(rows[0].id).toBe(n1.id);
+// 		expect(rows[1].id).toBe(n3.id);
+// 		expect(rows[2].id).toBe(n2.id);
+// 	}));
+
+// 	it('should consider any:1', asyncTest(async () => {
+// 		let rows;
+// 		const n1 = await Note.save({ title: 'cat' });
+// 		const n2 = await Note.save({ title: 'cats' });
+// 		const n3 = await Note.save({ title: 'cot' });
+
+// 		const n4 = await Note.save({ title: 'defenestrate' });
+// 		const n5 = await Note.save({ title: 'defenstrate' });
+// 		const n6 = await Note.save({ title: 'defenestrated' });
+
+// 		const n7 = await Note.save({ title: 'he defenestrated the cat' });
+
+// 		await engine.syncTables();
+
+// 		rows = await engine.search('defenestrated cat', { fuzzy: true });
+// 		expect(rows.length).toBe(1);
+
+// 		rows = await engine.search('any:1 defenestrated cat', { fuzzy: true });
+// 		expect(rows.length).toBe(7);
+// 	}));
+
+// 	it('should leave phrase searches alone', asyncTest(async () => {
+// 		let rows;
+// 		const n1 = await Note.save({ title: 'abc def' });
+// 		const n2 = await Note.save({ title: 'def ghi' });
+// 		const n3 = await Note.save({ title: 'ghi jkl' });
+// 		const n4 = await Note.save({ title: 'def abc' });
+// 		const n5 = await Note.save({ title: 'mno pqr ghi jkl' });
+
+// 		await engine.syncTables();
+
+// 		rows = await engine.search('abc def', { fuzzy: true });
+// 		expect(rows.length).toBe(2);
+// 		expect(rows.map(r=>r.id)).toContain(n1.id);
+// 		expect(rows.map(r=>r.id)).toContain(n4.id);
+
+// 		rows = await engine.search('"abc def"', { fuzzy: true });
+// 		expect(rows.length).toBe(1);
+// 		expect(rows.map(r=>r.id)).toContain(n1.id);
+
+// 		rows = await engine.search('"ghi jkl"', { fuzzy: true });
+// 		expect(rows.length).toBe(2);
+// 		expect(rows.map(r=>r.id)).toContain(n3.id);
+// 		expect(rows.map(r=>r.id)).toContain(n5.id);
+
+// 		rows = await engine.search('"ghi jkl" mno', { fuzzy: true });
+// 		expect(rows.length).toBe(1);
+// 		expect(rows.map(r=>r.id)).toContain(n5.id);
+
+// 		rows = await engine.search('any:1 "ghi jkl" mno', { fuzzy: true });
+// 		expect(rows.length).toBe(2);
+// 		expect(rows.map(r=>r.id)).toContain(n3.id);
+// 		expect(rows.map(r=>r.id)).toContain(n5.id);
+// 	}));
+
+// 	it('should leave wild card searches alone', asyncTest(async () => {
+// 		let rows;
+// 		const n1 = await Note.save({ title: 'abc def' });
+// 		const n2 = await Note.save({ title: 'abcc ghi' });
+// 		const n3 = await Note.save({ title: 'abccc ghi' });
+// 		const n4 = await Note.save({ title: 'abcccc ghi' });
+// 		const n5 = await Note.save({ title: 'wxy zzz' });
+
+// 		await engine.syncTables();
+
+// 		rows = await engine.search('abc*', { fuzzy: true });
+
+// 		expect(rows.length).toBe(4);
+// 		expect(rows.map(r=>r.id)).toContain(n1.id);
+// 		expect(rows.map(r=>r.id)).toContain(n2.id);
+// 		expect(rows.map(r=>r.id)).toContain(n3.id);
+// 		expect(rows.map(r=>r.id)).toContain(n4.id);
+// 	}));
+
+// });

CliClient/tests/synchronizer_MigrationHandler.ts

@@ -1,5 +1,6 @@
 import LockHandler from 'lib/services/synchronizer/LockHandler';
 import MigrationHandler from 'lib/services/synchronizer/MigrationHandler';
+import { Dirnames } from 'lib/services/synchronizer/utils/types';
 
 // To create a sync target snapshot for the current syncVersion:
 // - In test-utils, set syncTargetName_ to "filesystem"
@@ -70,6 +71,14 @@ describe('synchronizer_MigrationHandler', function() {
 		done();
 	});
 
+	it('should init a new sync target', asyncTest(async () => {
+		// Check that basic folders "locks" and "temp" are created for new sync targets.
+		await migrationHandler().upgrade(1);
+		const result = await fileApi().list();
+		expect(result.items.filter((i:any) => i.path === Dirnames.Locks).length).toBe(1);
+		expect(result.items.filter((i:any) => i.path === Dirnames.Temp).length).toBe(1);
+	}), specTimeout);
+
 	it('should not allow syncing if the sync target is out-dated', asyncTest(async () => {
 		await synchronizer().start();
 		await fileApi().put('info.json', `{"version":${Setting.value('syncVersion') - 1}}`);

CliClient/tests/test-utils.js

@@ -50,6 +50,7 @@ const KeychainServiceDriver = require('lib/services/keychain/KeychainServiceDriv
 const KeychainServiceDriverDummy = require('lib/services/keychain/KeychainServiceDriver.dummy').default;
 const md5 = require('md5');
 const S3 = require('aws-sdk/clients/s3');
+const { Dirnames } = require('lib/services/synchronizer/utils/types');
 
 const databases_ = [];
 let synchronizers_ = [];
@@ -438,6 +439,7 @@ async function initFileApi() {
 
 	fileApi.setLogger(logger);
 	fileApi.setSyncTargetId(syncTargetId_);
+	fileApi.setTempDirName(Dirnames.Temp);
 	fileApi.requestRepeatCount_ = isNetworkSyncTarget_ ? 1 : 0;
 
 	fileApis_[syncTargetId_] = fileApi;

CliClient/tests/timeUtils.js

@@ -26,10 +26,11 @@ describe('timeUtils', function() {
 		startDate =  new Date('3 Aug 2020 07:30:20');
 		expect(time.goBackInTime(startDate, 1, 'day')).toBe(endDate.getTime().toString());
 
+		// Note: this test randomly fails - https://github.com/laurent22/joplin/issues/3722
 
-		startDate = new Date('11 Aug 2020');
-		endDate = new Date('9 Aug 2020'); // week start;
-		expect(time.goBackInTime(startDate, 0, 'week')).toBe(endDate.getTime().toString());
+		// startDate = new Date('11 Aug 2020');
+		// endDate = new Date('9 Aug 2020'); // week start;
+		// expect(time.goBackInTime(startDate, 0, 'week')).toBe(endDate.getTime().toString());
 
 		startDate = new Date('02 Feb 2020');
 		endDate = new Date('01 Jan 2020');
@@ -50,9 +51,9 @@ describe('timeUtils', function() {
 		expect(time.goForwardInTime(startDate, 1, 'day')).toBe(endDate.getTime().toString());
 
 
-		startDate = new Date('9 Aug 2020');
-		endDate = new Date('9 Aug 2020'); // week start;
-		expect(time.goForwardInTime(startDate, 0, 'week')).toBe(endDate.getTime().toString());
+		// startDate = new Date('9 Aug 2020');
+		// endDate = new Date('9 Aug 2020'); // week start;
+		// expect(time.goForwardInTime(startDate, 0, 'week')).toBe(endDate.getTime().toString());
 
 		startDate = new Date('02 Jan 2020');
 		endDate = new Date('01 Feb 2020');

Clipper/manifest.json

@@ -1,7 +1,7 @@
 {
     "manifest_version": 2,
     "name": "Joplin Web Clipper [DEV]",
-    "version": "1.0.25",
+    "version": "1.2.0",
     "description": "Capture and save web pages and screenshots from your browser to Joplin.",
     "homepage_url": "https://joplinapp.org",
     "content_security_policy": "script-src 'self'; object-src 'self'",

ElectronClient/ElectronAppWrapper.js

@@ -105,7 +105,17 @@ class ElectronAppWrapper {
 		// Waiting for one of the ready events might work but they might not be triggered if there's an error, so
 		// the easiest is to use a timeout. Keep in mind that if you get a white window on Windows it might be due
 		// to this line though.
-		if (debugEarlyBugs) setTimeout(() => this.win_.webContents.openDevTools(), 3000);
+		if (debugEarlyBugs) {
+			setTimeout(() => {
+				try {
+					this.win_.webContents.openDevTools();
+				} catch (error) {
+				// This will throw an exception "Object has been destroyed" if the app is closed
+				// in less that the timeout interval. It can be ignored.
+					console.warn('Error opening dev tools', error);
+				}
+			}, 3000);
+		}
 
 		this.win_.on('close', (event) => {
 			// If it's on macOS, the app is completely closed only if the user chooses to close the app (willQuitApp_ will be true)

ElectronClient/app.js

@@ -30,20 +30,21 @@ const PluginManager = require('lib/services/PluginManager');
 const RevisionService = require('lib/services/RevisionService');
 const MigrationService = require('lib/services/MigrationService');
 const CommandService = require('lib/services/CommandService').default;
-const KeymapService = require('lib/services/KeymapService.js').default;
+const KeymapService = require('lib/services/KeymapService').default;
 const TemplateUtils = require('lib/TemplateUtils');
 const CssUtils = require('lib/CssUtils');
 const resourceEditWatcherReducer = require('lib/services/ResourceEditWatcher/reducer').default;
+// const populateDatabase = require('lib/services/debug/populateDatabase').default;
 const versionInfo = require('lib/versionInfo').default;
 
 const commands = [
-	require('./gui/Header/commands/focusSearch'),
+	require('./gui/NoteListControls/commands/focusSearch'),
 	require('./gui/MainScreen/commands/editAlarm'),
 	require('./gui/MainScreen/commands/exportPdf'),
 	require('./gui/MainScreen/commands/hideModalMessage'),
 	require('./gui/MainScreen/commands/moveToFolder'),
 	require('./gui/MainScreen/commands/newNote'),
-	require('./gui/MainScreen/commands/newNotebook'),
+	require('./gui/MainScreen/commands/newFolder'),
 	require('./gui/MainScreen/commands/newTodo'),
 	require('./gui/MainScreen/commands/print'),
 	require('./gui/MainScreen/commands/renameFolder'),
@@ -58,6 +59,7 @@ const commands = [
 	require('./gui/MainScreen/commands/toggleNoteList'),
 	require('./gui/MainScreen/commands/toggleSidebar'),
 	require('./gui/MainScreen/commands/toggleVisiblePanes'),
+	require('./gui/MainScreen/commands/toggleEditors'),
 	require('./gui/NoteEditor/commands/focusElementNoteBody'),
 	require('./gui/NoteEditor/commands/focusElementNoteTitle'),
 	require('./gui/NoteEditor/commands/showLocalSearch'),
@@ -98,6 +100,8 @@ const appDefaultState = Object.assign({}, defaultState, {
 	watchedNoteFiles: [],
 	lastEditorScrollPercents: {},
 	devToolsVisible: false,
+	visibleDialogs: {}, // empty object if no dialog is visible. Otherwise contains the list of visible dialogs.
+	focusedField: null,
 });
 
 class Application extends BaseApplication {
@@ -110,6 +114,8 @@ class Application extends BaseApplication {
 
 		this.commandService_commandsEnabledStateChange = this.commandService_commandsEnabledStateChange.bind(this);
 		CommandService.instance().on('commandsEnabledStateChange', this.commandService_commandsEnabledStateChange);
+
+		KeymapService.instance().on('keymapChange', this.refreshMenu.bind(this));
 	}
 
 	commandService_commandsEnabledStateChange() {
@@ -277,6 +283,31 @@ class Application extends BaseApplication {
 				newState.devToolsVisible = action.value;
 				break;
 
+			case 'VISIBLE_DIALOGS_ADD':
+				newState = Object.assign({}, state);
+				newState.visibleDialogs[state.name] = true;
+				break;
+
+			case 'VISIBLE_DIALOGS_REMOVE':
+				newState = Object.assign({}, state);
+				delete newState.visibleDialogs[state.name];
+				break;
+
+			case 'FOCUS_SET':
+
+				newState = Object.assign({}, state);
+				newState.focusedField = action.field;
+				break;
+
+			case 'FOCUS_CLEAR':
+
+				// A field can only clear its own state
+				if (action.field === state.focusedField) {
+					newState = Object.assign({}, state);
+					newState.focusedField = null;
+				}
+				break;
+
 			}
 		} catch (error) {
 			error.message = `In reducer: ${error.message} Action: ${JSON.stringify(action)}`;
@@ -284,10 +315,11 @@ class Application extends BaseApplication {
 		}
 
 		newState = resourceEditWatcherReducer(newState, action);
+		newState = super.reducer(newState, action);
 
 		CommandService.instance().scheduleMapStateToProps(newState);
 
-		return super.reducer(newState, action);
+		return newState;
 	}
 
 	toggleDevTools(visible) {
@@ -373,7 +405,7 @@ class Application extends BaseApplication {
 		await this.updateMenu(screen);
 	}
 
-	async updateMenu(screen) {
+	async updateMenu(screen, updateStates = true) {
 		if (this.lastMenuScreen_ === screen) return;
 
 		const cmdService = CommandService.instance();
@@ -517,7 +549,7 @@ class Application extends BaseApplication {
 
 		const newNoteItem = cmdService.commandToMenuItem('newNote');
 		const newTodoItem = cmdService.commandToMenuItem('newTodo');
-		const newNotebookItem = cmdService.commandToMenuItem('newNotebook');
+		const newFolderItem = cmdService.commandToMenuItem('newFolder');
 		const printItem = cmdService.commandToMenuItem('print');
 
 		toolsItemsFirst.push(syncStatusItem, {
@@ -569,7 +601,7 @@ class Application extends BaseApplication {
 		const toolsItemsWindowsLinux = toolsItemsFirst.concat([{
 			label: _('Options'),
 			visible: !shim.isMac(),
-			accelerator: shim.isMac() ? null : keymapService.getAccelerator('config'),
+			accelerator: !shim.isMac() && keymapService.getAccelerator('config'),
 			click: () => {
 				this.dispatch({
 					type: 'NAV_GO',
@@ -631,7 +663,7 @@ class Application extends BaseApplication {
 			}, {
 				label: _('Preferences...'),
 				visible: shim.isMac() ? true : false,
-				accelerator: shim.isMac() ? keymapService.getAccelerator('config') : null,
+				accelerator: shim.isMac() && keymapService.getAccelerator('config'),
 				click: () => {
 					this.dispatch({
 						type: 'NAV_GO',
@@ -648,7 +680,7 @@ class Application extends BaseApplication {
 			},
 			shim.isMac() ? noItem : newNoteItem,
 			shim.isMac() ? noItem : newTodoItem,
-			shim.isMac() ? noItem : newNotebookItem, {
+			shim.isMac() ? noItem : newFolderItem, {
 				type: 'separator',
 				visible: shim.isMac() ? false : true,
 			}, {
@@ -663,7 +695,7 @@ class Application extends BaseApplication {
 				visible: shim.isMac() ? false : true,
 				submenu: importItems,
 			}, {
-				label: _('Export'),
+				label: _('Export all'),
 				visible: shim.isMac() ? false : true,
 				submenu: exportItems,
 			}, {
@@ -680,7 +712,7 @@ class Application extends BaseApplication {
 			}, {
 				label: _('Hide %s', 'Joplin'),
 				platforms: ['darwin'],
-				accelerator: shim.isMac() ? keymapService.getAccelerator('hideApp') : null,
+				accelerator: shim.isMac() && keymapService.getAccelerator('hideApp'),
 				click: () => { bridge().electronApp().hide(); },
 			}, {
 				type: 'separator',
@@ -697,10 +729,10 @@ class Application extends BaseApplication {
 			submenu: [
 				newNoteItem,
 				newTodoItem,
-				newNotebookItem, {
+				newFolderItem, {
 					label: _('Close Window'),
 					platforms: ['darwin'],
-					accelerator: shim.isMac() ? keymapService.getAccelerator('closeWindow') : null,
+					accelerator: shim.isMac() && keymapService.getAccelerator('closeWindow'),
 					selector: 'performClose:',
 				}, {
 					type: 'separator',
@@ -736,7 +768,6 @@ class Application extends BaseApplication {
 		const separator = () => {
 			return {
 				type: 'separator',
-				screens: ['Main'],
 			};
 		};
 
@@ -984,6 +1015,8 @@ class Application extends BaseApplication {
 		Menu.setApplicationMenu(menu);
 
 		this.lastMenuScreen_ = screen;
+
+		if (updateStates) await this.updateMenuItemStates();
 	}
 
 	async updateMenuItemStates(state = null) {
@@ -1040,11 +1073,9 @@ class Application extends BaseApplication {
 		// https://github.com/laurent22/joplin/issues/155
 
 		const css = `.CodeMirror * { font-family: ${fontFamilies.join(', ')} !important; }`;
-		const ace_css = `.ace_editor * { font-family: ${fontFamilies.join(', ')} !important; }`;
 		const styleTag = document.createElement('style');
 		styleTag.type = 'text/css';
 		styleTag.appendChild(document.createTextNode(css));
-		styleTag.appendChild(document.createTextNode(ace_css));
 		document.head.appendChild(styleTag);
 	}
 
@@ -1074,6 +1105,8 @@ class Application extends BaseApplication {
 
 		argv = await super.start(argv);
 
+		await this.applySettingsSideEffects();
+
 		if (Setting.value('sync.upgradeState') === Setting.SYNC_UPGRADE_STATE_MUST_DO) {
 			reg.logger().info('app.start: doing upgradeSyncTarget action');
 			bridge().window().show();
@@ -1091,9 +1124,9 @@ class Application extends BaseApplication {
 		const keymapService = KeymapService.instance();
 
 		try {
-			await KeymapService.instance().loadKeymap(`${dir}/keymap-desktop.json`);
+			await keymapService.loadCustomKeymap(`${dir}/keymap-desktop.json`);
 		} catch (err) {
-			bridge().showErrorMessageBox(err.message);
+			reg.logger().error(err.message);
 		}
 
 		AlarmService.setDriver(new AlarmServiceDriverNode({ appName: packageInfo.build.appId }));
@@ -1126,7 +1159,7 @@ class Application extends BaseApplication {
 			CommandService.instance().registerDeclaration(declaration);
 		}
 
-		this.updateMenu('Main');
+		this.updateMenu('Main', false);
 
 		// Since the settings need to be loaded before the store is created, it will never
 		// receive the SETTING_UPDATE_ALL even, which mean state.settings will not be
@@ -1210,7 +1243,7 @@ class Application extends BaseApplication {
 		if (Setting.value('env') === 'dev') {
 			AlarmService.updateAllNotifications();
 		} else {
-			reg.scheduleSync().then(() => {
+			reg.scheduleSync(1000).then(() => {
 				// Wait for the first sync before updating the notifications, since synchronisation
 				// might change the notifications.
 				AlarmService.updateAllNotifications();
@@ -1251,6 +1284,8 @@ class Application extends BaseApplication {
 		};
 
 		bridge().addEventListener('nativeThemeUpdated', this.bridge_nativeThemeUpdated);
+
+		// await populateDatabase(reg.db());
 	}
 
 }

ElectronClient/commands/startExternalEditing.ts

@@ -11,7 +11,7 @@ interface Props {
 export const declaration:CommandDeclaration = {
 	name: 'startExternalEditing',
 	label: () => _('Edit in external editor'),
-	iconName: 'fa-share-square',
+	iconName: 'icon-share',
 };
 
 export const runtime = ():CommandRuntime => {
@@ -27,10 +27,14 @@ export const runtime = ():CommandRuntime => {
 			// await comp.saveNoteAndWait(comp.formNote);
 		},
 		isEnabled: (props:any) => {
+			if (props.routeName !== 'Main') return false;
 			return !!props.noteId;
 		},
 		mapStateToProps: (state:any) => {
-			return { noteId: state.selectedNoteIds.length === 1 ? state.selectedNoteIds[0] : null };
+			return {
+				noteId: state.selectedNoteIds.length === 1 ? state.selectedNoteIds[0] : null,
+				routeName: state.route.routeName,
+			};
 		},
 	};
 };

ElectronClient/commands/stopExternalEditing.ts

@@ -18,10 +18,11 @@ export const runtime = ():CommandRuntime => {
 			ExternalEditWatcher.instance().stopWatching(props.noteId);
 		},
 		isEnabled: (props:any) => {
+			if (props.routeName !== 'Main') return false;
 			return !!props.noteId;
 		},
 		mapStateToProps: (state:any) => {
-			return { noteId: state.selectedNoteIds.length === 1 ? state.selectedNoteIds[0] : null };
+			return { noteId: state.selectedNoteIds.length === 1 ? state.selectedNoteIds[0] : null, routeName: state.route.routeName };
 		},
 	};
 };

ElectronClient/gui/Button/Button.tsx

@@ -0,0 +1,195 @@
+import * as React from 'react';
+const styled = require('styled-components').default;
+const { space } = require('styled-system');
+
+export enum ButtonLevel {
+	Primary = 'primary',
+	Secondary = 'secondary',
+	Tertiary = 'tertiary',
+	SideBarSecondary = 'sideBarSecondary',
+}
+
+interface Props {
+	title?: string,
+	iconName?: string,
+	level?: ButtonLevel,
+	className?:string,
+	onClick:Function,
+	color?: string,
+	iconAnimation?: string,
+	tooltip?: string,
+	disabled?: boolean,
+	style?:any,
+}
+
+const StyledTitle = styled.span`
+
+`;
+
+const StyledButtonBase = styled.button`
+	display: flex;
+	align-items: center;
+	flex-direction: row;
+	height: ${(props:any) => `${props.theme.toolbarHeight}px`};
+	min-height: ${(props:any) => `${props.theme.toolbarHeight}px`};
+	max-height: ${(props:any) => `${props.theme.toolbarHeight}px`};
+	width: ${(props:any) => props.iconOnly ? `${props.theme.toolbarHeight}px` : 'auto'};
+	${(props:any) => props.iconOnly ? `min-width: ${props.theme.toolbarHeight}px;` : ''}
+	${(props:any) => !props.iconOnly ? 'min-width: 100px;' : ''}
+	${(props:any) => props.iconOnly ? `max-width: ${props.theme.toolbarHeight}px;` : ''}
+	box-sizing: border-box;
+	border-radius: 3px;
+	border-style: solid;
+	border-width: 1px;
+	font-size: ${(props:any) => props.theme.fontSize}px;
+	padding: 0 ${(props:any) => props.iconOnly ? 4 : 8}px;
+	justify-content: center;
+	opacity: ${(props:any) => props.disabled ? 0.5 : 1};
+	user-select: none;
+`;
+
+const StyledIcon = styled(styled.span(space))`
+	font-size: ${(props:any) => props.theme.toolbarIconSize}px;
+	${(props:any) => props.animation ? `animation: ${props.animation}` : ''};
+`;
+
+const StyledButtonPrimary = styled(StyledButtonBase)`
+	border: none;
+	background-color: ${(props:any) => props.theme.backgroundColor5};
+
+	&:hover {
+		background-color: ${(props:any) => props.theme.backgroundColorHover5};
+	}
+
+	&:active {
+		background-color: ${(props:any) => props.theme.backgroundColorActive5};
+	}
+
+	${StyledIcon} {
+		color: ${(props:any) => props.theme.color5};
+	}
+
+	${StyledTitle} {
+		color: ${(props:any) => props.theme.color5};
+	}
+`;
+
+const StyledButtonSecondary = styled(StyledButtonBase)`
+	border: 1px solid ${(props:any) => props.theme.borderColor4};
+	background-color: ${(props:any) => props.theme.backgroundColor4};
+
+	&:hover {
+		background-color: ${(props:any) => props.theme.backgroundColorHover4};
+	}
+
+	&:active {
+		background-color: ${(props:any) => props.theme.backgroundColorActive4};
+	}
+
+	${StyledIcon} {
+		color: ${(props:any) => props.theme.color4};
+	}
+
+	${StyledTitle} {
+		color: ${(props:any) => props.theme.color4};
+	}
+`;
+
+const StyledButtonTertiary = styled(StyledButtonBase)`
+	border: 1px solid ${(props:any) => props.theme.color3};
+	background-color: ${(props:any) => props.theme.backgroundColor3};
+
+	&:hover {
+		background-color: ${(props:any) => props.theme.backgroundColorHoverDim3};
+	}
+
+	&:active {
+		background-color: ${(props:any) => props.theme.backgroundColorActive3};
+	}
+
+	${StyledIcon} {
+		color: ${(props:any) => props.theme.color};
+	}
+
+	${StyledTitle} {
+		color: ${(props:any) => props.theme.color};
+		opacity: 0.9;
+	}
+`;
+
+const StyledButtonSideBarSecondary = styled(StyledButtonBase)`
+	background: none;
+	border-color: ${(props:any) => props.theme.color2};
+	color: ${(props:any) => props.theme.color2};
+
+	&:hover {
+		color: ${(props:any) => props.theme.colorHover2};
+		border-color: ${(props:any) => props.theme.colorHover2};
+		background: none;
+
+		${StyledTitle} {
+			color: ${(props:any) => props.theme.colorHover2};
+		}
+
+		${StyledIcon} {
+			color: ${(props:any) => props.theme.colorHover2};
+		}
+	}
+
+	&:active {
+		color: ${(props:any) => props.theme.colorActive2};
+		border-color: ${(props:any) => props.theme.colorActive2};
+		background: none;
+
+		${StyledTitle} {
+			color: ${(props:any) => props.theme.colorActive2};
+		}
+
+		${StyledIcon} {
+			color: ${(props:any) => props.theme.colorActive2};
+		}
+	}
+
+	${StyledTitle} {
+		color: ${(props:any) => props.theme.color2};
+	}
+
+	${StyledIcon} {
+		color: ${(props:any) => props.theme.color2};
+	}
+`;
+
+function buttonClass(level:ButtonLevel) {
+	if (level === ButtonLevel.Primary) return StyledButtonPrimary;
+	if (level === ButtonLevel.Tertiary) return StyledButtonTertiary;
+	if (level === ButtonLevel.SideBarSecondary) return StyledButtonSideBarSecondary;
+	return StyledButtonSecondary;
+}
+
+export default function Button(props:Props) {
+	const iconOnly = props.iconName && !props.title;
+
+	const StyledButton = buttonClass(props.level);
+
+	function renderIcon() {
+		if (!props.iconName) return null;
+		return <StyledIcon animation={props.iconAnimation} mr={iconOnly ? '0' : '6px'} color={props.color} className={props.iconName}/>;
+	}
+
+	function renderTitle() {
+		if (!props.title) return null;
+		return  <StyledTitle color={props.color}>{props.title}</StyledTitle>;
+	}
+
+	function onClick() {
+		if (props.disabled) return;
+		props.onClick();
+	}
+
+	return (
+		<StyledButton style={props.style} disabled={props.disabled} title={props.tooltip} className={props.className} iconOnly={iconOnly} onClick={onClick}>
+			{renderIcon()}
+			{renderTitle()}
+		</StyledButton>
+	);
+}