Update to Electron 4.0.2 (#1172)

* Update Electron to 4.0.2

* Adapt to new makeSingleInstance API

* Remove unneeded shortcut for Search Notes

Also conflicting with the Focus Mode shortcut (⌘⇧F) here due to a change in the KeyboardEvent. (Now needs an explicit check for shiftKey)

* Fix Note List navigation shortcuts

* Fix Close Note shortcut (narrow width screens)

* Remove unneeded filter on menu array

Rendered unnecessary by electron/electron#13992

* Update electron-builder and electron-updater

# Conflicts:
#	package.json

* Fix Select All & Copy in Markdown preview

* Remove CJK crash workaround

#1171

* Try electron-builder 20.38.4

* Revert "Remove unneeded filter on menu array"

This reverts commit 90a94e7.

* Revert electron-builder to 20.28.2

* Try electron-builder 20.33.2

* Try electron-builder 20.30.0

* Try electron-builder 20.31.2

* Try electron-builder 20.32.0

* Try electron-builder 20.33.1

* Revert "Try electron-builder 20.33.1"

This reverts commit d834229.

desktop/app.js

@@ -140,21 +140,20 @@ module.exports = function main() {
     mainWindow.once('ready-to-show', mainWindow.show);
   };
 
-  const shouldQuit = app.makeSingleInstance(() => {
-    if (!mainWindow) {
-      return;
-    }
+  const gotTheLock = app.requestSingleInstanceLock();
 
-    // Focus the main window if a second instance is attempted to be created
-    if (mainWindow.isMinimized()) {
-      mainWindow.restore();
+  app.on('second-instance', () => {
+    // Someone tried to run a second instance, we should focus our window.
+    if (mainWindow) {
+      if (mainWindow.isMinimized()) {
+        mainWindow.restore();
+      }
+      mainWindow.focus();
     }
-    mainWindow.focus();
   });
 
-  if (shouldQuit) {
-    app.quit();
-    return;
+  if (!gotTheLock) {
+    return app.quit();
   }
 
   // Quit when all windows are closed.
@@ -182,4 +181,4 @@ module.exports = function main() {
   // initialization and is ready to create browser windows.
   app.on('ready', activateWindow);
   app.on('activate', activateWindow);
-};
+};

lib/app-layout/index.js

@@ -69,8 +69,10 @@ export const AppLayout = ({
             toolbar={<NoteToolbar note={note} />}
           />
           <NoteEditor
+            isSmallScreen={isSmallScreen}
             note={note}
             noteBucket={noteBucket}
+            onNoteClosed={onNoteClosed}
             onUpdateContent={onUpdateContent}
             tags={
               get(note, 'data.tags', []) /* flattened to trigger re-render */

lib/app.jsx

@@ -206,15 +206,6 @@ export const App = connect(mapStateToProps, mapDispatchToProps)(
         return false;
       }
 
-      // focus search field
-      if (cmdOrCtrl && 'f' === key) {
-        this.props.setSearchFocus();
-
-        event.stopPropagation();
-        event.preventDefault();
-        return false;
-      }
-
       return true;
     };
 

lib/note-content-editor.jsx

@@ -12,7 +12,6 @@ import {
 import { filterHasText, searchPattern } from './utils/filter-notes';
 import matchingTextDecorator from './editor/matching-text-decorator';
 import checkboxDecorator from './editor/checkbox-decorator';
-import tabDecorator from './editor/tab-decorator';
 import { removeCheckbox, shouldRemoveCheckbox } from './editor/checkbox-utils';
 import { taskRegex } from './note-detail/toggle-task/constants';
 import insertOrRemoveCheckboxes from './editor/insert-or-remove-checkboxes';
@@ -180,7 +179,6 @@ export default class NoteContentEditor extends Component {
         compact([
           filterHasText(filter) && matchingTextDecorator(searchPattern(filter)),
           checkboxDecorator(this.replaceRangeWithText),
-          tabDecorator(),
         ])
       )
     );

lib/note-detail/style.scss

@@ -113,8 +113,6 @@
 .note-detail-markdown {
   @import '../node_modules/highlight.js/styles/solarized-light.css';
 
-  user-select: text;
-
   h1,
   h2,
   h3,

lib/note-editor/index.jsx

@@ -14,11 +14,13 @@ export class NoteEditor extends Component {
     closeNote: PropTypes.func.isRequired,
     editorMode: PropTypes.oneOf(['edit', 'markdown']),
     isEditorActive: PropTypes.bool.isRequired,
+    isSmallScreen: PropTypes.bool.isRequired,
     filter: PropTypes.string.isRequired,
     markdownEnabled: PropTypes.bool.isRequired,
     note: PropTypes.object,
     noteBucket: PropTypes.object.isRequired,
     fontSize: PropTypes.number,
+    onNoteClosed: PropTypes.func.isRequired,
     onUpdateContent: PropTypes.func.isRequired,
     revision: PropTypes.object,
     setEditorMode: PropTypes.func.isRequired,
@@ -42,7 +44,7 @@ export class NoteEditor extends Component {
   }
 
   handleShortcut = event => {
-    const { ctrlKey, key, metaKey } = event;
+    const { ctrlKey, key, metaKey, shiftKey } = event;
 
     const cmdOrCtrl = ctrlKey || metaKey;
 
@@ -59,8 +61,9 @@ export class NoteEditor extends Component {
     }
 
     // open note list - shift + n
-    if (cmdOrCtrl && 'N' === key) {
+    if (this.props.isSmallScreen && cmdOrCtrl && shiftKey && 'n' === key) {
       this.props.closeNote();
+      this.props.onNoteClosed();
 
       event.stopPropagation();
       event.preventDefault();

lib/note-editor/style.scss

@@ -2,4 +2,5 @@
   display: flex;
   flex-direction: column;
   flex: 1 0 auto;
+  user-select: text;
 }

lib/note-list/index.jsx

@@ -273,15 +273,15 @@ export class NoteList extends Component {
 
     const cmdOrCtrl = ctrlKey || metaKey;
 
-    if (cmdOrCtrl && shiftKey && (key === 'ArrowUp' || key === 'K')) {
+    if (cmdOrCtrl && shiftKey && (key === 'ArrowUp' || key === 'k')) {
       this.props.onSelectNote(this.props.nextNote.id);
 
       event.stopPropagation();
       event.preventDefault();
       return false;
     }
 
-    if (cmdOrCtrl && shiftKey && (key === 'ArrowDown' || key === 'J')) {
+    if (cmdOrCtrl && shiftKey && (key === 'ArrowDown' || key === 'j')) {
       this.props.onSelectNote(this.props.prevNote.id);
 
       event.stopPropagation();

lib/tag-input/style.scss

@@ -20,6 +20,7 @@
   display: block;
   color: lighten($gray, 10%);
   background: transparent;
+  user-select: none;
 }
 
 .tag-input__entry {