Merge release/1.16 into develop (#2062)

Automattic · May 6, 2020 · 2477939 · 2477939
2 parents f8d4e12 + b08a7fc
commit 2477939
Show file tree

Hide file tree

Showing 20 changed files with 242 additions and 126 deletions.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,12 +1,16 @@
 ### Fix
-***(Required)*** Add a concise description of what you fixed.  If this is related to an issue, add a link to it.  If applicable, add screenshots, animations, or videos to help illustrate the fix.
+
+**_(Required)_** Add a concise description of what you fixed. If this is related to an issue, add a link to it. If applicable, add screenshots, animations, or videos to help illustrate the fix.
 
 ### Test
-***(Required)*** List the steps to test the behavior.  For example:
+
+**_(Required)_** List the steps to test the behavior. For example:
+
 > 1. Go to...
 > 2. Tap on...
 > 3. See error...
 
 ### Release
-***(Required)*** Add a concise statement to `RELEASE-NOTES.txt` if the changes should be included in release notes. Include details about updating the notes in this section. For example:
-`RELEASE-NOTES.txt` was updated with:
+
+**_(Required)_** Add a concise statement to `RELEASE-NOTES.md` if the changes should be included in release notes. Include details about updating the notes in this section. For example:
+`RELEASE-NOTES.md` was updated with:
diff --git a/RELEASE-NOTES.txt → RELEASE-NOTES.md b/RELEASE-NOTES.txt → RELEASE-NOTES.md
@@ -1,5 +1,34 @@
 # Changelog
 
+## [v1.16.0]
+
+### Enhancements
+
+- Added keyboard shortcuts help dialog [#1983](https://github.com/Automattic/simplenote-electron/pull/1983)
+- Improve search performance [#1941](https://github.com/Automattic/simplenote-electron/pull/1941), [#1966](https://github.com/Automattic/simplenote-electron/pull/1966), [#1979](https://github.com/Automattic/simplenote-electron/pull/1979), [#1982](https://github.com/Automattic/simplenote-electron/pull/1982)
+
+### Fixes
+
+- Highlight all search matches in Markdown previews and in note list [#1987](https://github.com/Automattic/simplenote-electron/pull/1987)
+- Fix for blurry fonts on LCD screens [#2003](https://github.com/Automattic/simplenote-electron/pull/2003)
+
+### Other Changes
+
+- Renamed RELEASE-NOTES to fix integrations broken by #1576 [#2018](https://github.com/Automattic/simplenote-electron/pull/2018)
+- Extensive refactoring to move more code into Redux state:
+  [#1920](https://github.com/Automattic/simplenote-electron/pull/1920) (tag selection),
+  [#1928](https://github.com/Automattic/simplenote-electron/pull/1928) (system tag),
+  [#1971](https://github.com/Automattic/simplenote-electron/pull/1971) (select trash and show all notes),
+  [#1981](https://github.com/Automattic/simplenote-electron/pull/1981) (dialog renderer),
+  [#1989](https://github.com/Automattic/simplenote-electron/pull/1989) (previous index),
+  [#1991](https://github.com/Automattic/simplenote-electron/pull/1991) (tagsLoaded),
+  [#1995](https://github.com/Automattic/simplenote-electron/pull/1995) (compositeNoteList),
+  [#1996](https://github.com/Automattic/simplenote-electron/pull/1996) (tag suggestions),
+  [#1999](https://github.com/Automattic/simplenote-electron/pull/1999) (load tags),
+  [#2004](https://github.com/Automattic/simplenote-electron/pull/2004) (isElectron and isMac utils),
+- Replace custom height cache with one provided by react-virtualized [#1829](https://github.com/Automattic/simplenote-electron/pull/1829)
+- Dependencies updated [#1951](https://github.com/Automattic/simplenote-electron/pull/1951), [#1993](https://github.com/Automattic/simplenote-electron/pull/1993)
+
 ## [v1.15.1]
 
 ### Other Changes
@@ -9,6 +38,7 @@
 ## [v1.15.0]
 
 ### Enhancements
+
 - Stop erasing the copy buffer if copying empty editor selections [#1847](https://github.com/Automattic/simplenote-electron/pull/1847)
 - Allow for un-selecting a tag by tab or right arrow [#1853](https://github.com/Automattic/simplenote-electron/pull/1853) @qualitymanifest
 
@@ -50,11 +80,13 @@
 ## [v1.14.0]
 
 ### Enhancements
+
 - Keep note open when transitioning to small screen in focus mode [#1763](https://github.com/Automattic/simplenote-electron/pull/1763)
 - Added GenericName (description) field for app on Linux [#1761](https://github.com/Automattic/simplenote-electron/pull/1761)
 - Allow width attribute on img tags [#1833](https://github.com/Automattic/simplenote-electron/pull/1833)
 
 ### Fixes
+
 - Makes settings scrollable on shorter smaller view ports [#1767](https://github.com/Automattic/simplenote-electron/pull/1767)
 - After selecting a revision to restore ensure that choice is sync'd [#1774](https://github.com/Automattic/simplenote-electron/pull/1774)
 - Added indication that publish url has been copied [#1743](https://github.com/Automattic/simplenote-electron/pull/1743)
@@ -104,9 +136,9 @@
 
 ### Enhancements
 
- - Updated menu icon to use the new icon set [#1694](https://github.com/Automattic/simplenote-electron/pull/1694)
- - Added script to deploy web app [#1723](https://github.com/Automattic/simplenote-electron/pull/1723)
- - Prioritize search results where title matches query [#1705](https://github.com/Automattic/simplenote-electron/pull/1705)
+- Updated menu icon to use the new icon set [#1694](https://github.com/Automattic/simplenote-electron/pull/1694)
+- Added script to deploy web app [#1723](https://github.com/Automattic/simplenote-electron/pull/1723)
+- Prioritize search results where title matches query [#1705](https://github.com/Automattic/simplenote-electron/pull/1705)
 
 ### Fixes
 
@@ -126,52 +158,52 @@
 
 ### Fixes
 
- - Fixed bug that only shows the first line of text in note list preview [#1647](https://github.com/Automattic/simplenote-electron/pull/1647)
+- Fixed bug that only shows the first line of text in note list preview [#1647](https://github.com/Automattic/simplenote-electron/pull/1647)
 
 ### Other Changes
 
 ## [v1.10.0]
 
 ### Enhancements
 
- - Add ability to select system as a theme option and make it the default
- - Added support for the unicode bullet • in list items
- - Display a notice that notes are loading when notes are loading
- - In dev mode open Chrome Dev Tools in a separate window
+- Add ability to select system as a theme option and make it the default
+- Added support for the unicode bullet • in list items
+- Display a notice that notes are loading when notes are loading
+- In dev mode open Chrome Dev Tools in a separate window
 
 ### Fixes
 
- - Rework WordPress.com signin to prevent infinite looping and login failures [#1627](https://github.com/Automattic/simplenote-electron/pull/1627)
- - Update link to release-notes in updater config: CHANGELOG -> RELEASE_NOTES
- - Stop showing that there are no notes when initially loading notes from the server. [#1680](https://github.com/Automattic/simplenote-electron/pull/1680)
+- Rework WordPress.com signin to prevent infinite looping and login failures [#1627](https://github.com/Automattic/simplenote-electron/pull/1627)
+- Update link to release-notes in updater config: CHANGELOG -> RELEASE_NOTES
+- Stop showing that there are no notes when initially loading notes from the server. [#1680](https://github.com/Automattic/simplenote-electron/pull/1680)
 
- ### Other changes
+### Other changes
 
- - Updated dependencies
+- Updated dependencies
 
 ## [v1.9.1]
 
 ### Fixes
 
- - Prevent ulimited duplication of changes after signing out and signing in [#1664](https://github.com/Automattic/simplenote-electron/pull/1664)
+- Prevent ulimited duplication of changes after signing out and signing in [#1664](https://github.com/Automattic/simplenote-electron/pull/1664)
 
 ## [v1.9.0]
 
 ### Enhancements
 
 - Open new note automatically upon creation [1582](https://github.com/Automattic/simplenote-electron/pull/1582)
 - Updated colors to use Color Studio, the color palette for Automattic products
-   - [#1565](https://github.com/Automattic/simplenote-electron/pull/1565)
-   - [#1612](https://github.com/Automattic/simplenote-electron/pull/1612)
+  - [#1565](https://github.com/Automattic/simplenote-electron/pull/1565)
+  - [#1612](https://github.com/Automattic/simplenote-electron/pull/1612)
 
 ### Fixes
 
 - Hovering over a clickable or editable UI element now show the correct cursor for its type [#1573](https://github.com/Automattic/simplenote-electron/pull/1573)
 - Fixes vertical spacing with nested markdown lists
 - Fixes sort order on revision slider when the timestamps don't match the change sequence [#1605](https://github.com/Automattic/simplenote-electron/pull/1605)
 - Prevents note corruption when receiving remote updates when local updates are pending
-   - [#1598](https://github.com/Automattic/simplenote-electron/pull/1598)
-   - [#1599](https://github.com/Automattic/simplenote-electron/pull/1599)
+  - [#1598](https://github.com/Automattic/simplenote-electron/pull/1598)
+  - [#1599](https://github.com/Automattic/simplenote-electron/pull/1599)
 
 ### Other changes
 

diff --git a/desktop/config-updater.json b/desktop/config-updater.json
@@ -1,7 +1,7 @@
 {
   "updater": {
     "downloadUrl": "https://github.com/Automattic/simplenote-electron/releases/latest",
-    "changelogUrl": "https://github.com/Automattic/simplenote-electron/blob/master/RELEASE-NOTES.txt",
+    "changelogUrl": "https://github.com/Automattic/simplenote-electron/blob/master/RELEASE-NOTES.md",
     "apiUrl": "https://api.github.com/repos/automattic/simplenote-electron/releases/latest",
     "delay": 2000,
     "interval": 600000

diff --git a/desktop/menus/view-menu.js b/desktop/menus/view-menu.js
@@ -137,7 +137,6 @@ const buildViewMenu = (settings) => {
       },
       {
         label: 'Focus Mode',
-        accelerator: 'CommandOrControl+Shift+F',
         type: 'checkbox',
         checked: settings.focusModeEnabled,
         click: appCommandSender({ action: 'toggleFocusMode' }),

diff --git a/lib/app-layout/index.tsx b/lib/app-layout/index.tsx
@@ -35,6 +35,7 @@ type OwnProps = {
 type StateProps = {
   isNoteOpen: boolean;
   keyboardShortcutsAreOpen: boolean;
+  showNoteList: boolean;
 };
 
 type DispatchProps = {
@@ -67,11 +68,15 @@ export class AppLayout extends Component<Props> {
       keyboardShortcutsAreOpen
         ? hideKeyboardShortcuts()
         : showKeyboardShortcuts();
+
+      event.stopPropagation();
+      event.preventDefault();
     }
   };
 
   render = () => {
     const {
+      showNoteList,
       isFocusMode = false,
       isNavigationOpen,
       isNoteInfoOpen,
@@ -89,6 +94,8 @@ export class AppLayout extends Component<Props> {
       'is-showing-note-info': isNoteInfoOpen,
     });
 
+    const editorVisible = !(showNoteList && isSmallScreen);
+
     const placeholder = (
       <TransitionDelayEnter delay={1000}>
         <div className="app-layout__placeholder">
@@ -104,19 +111,21 @@ export class AppLayout extends Component<Props> {
             <SearchBar noteBucket={noteBucket} />
             <NoteList noteBucket={noteBucket} isSmallScreen={isSmallScreen} />
           </div>
-          <div className="app-layout__note-column theme-color-bg theme-color-fg theme-color-border">
-            <RevisionSelector onUpdateContent={onUpdateContent} />
-            <NoteToolbarContainer
-              noteBucket={noteBucket}
-              toolbar={<NoteToolbar />}
-            />
-            <NoteEditor
-              isSmallScreen={isSmallScreen}
-              noteBucket={noteBucket}
-              onUpdateContent={onUpdateContent}
-              syncNote={syncNote}
-            />
-          </div>
+          {editorVisible && (
+            <div className="app-layout__note-column theme-color-bg theme-color-fg theme-color-border">
+              <RevisionSelector onUpdateContent={onUpdateContent} />
+              <NoteToolbarContainer
+                noteBucket={noteBucket}
+                toolbar={<NoteToolbar />}
+              />
+              <NoteEditor
+                isSmallScreen={isSmallScreen}
+                noteBucket={noteBucket}
+                onUpdateContent={onUpdateContent}
+                syncNote={syncNote}
+              />
+            </div>
+          )}
         </Suspense>
       </div>
     );
@@ -128,6 +137,7 @@ const mapStateToProps: S.MapState<StateProps> = ({
 }) => ({
   keyboardShortcutsAreOpen: dialogs.includes('KEYBINDINGS'),
   isNoteOpen: !showNoteList,
+  showNoteList,
 });
 
 const mapDispatchToProps: S.MapDispatch<DispatchProps> = {

diff --git a/lib/app.tsx b/lib/app.tsx
@@ -238,14 +238,22 @@ export const App = connect(
         return false;
       }
 
-      if (cmdOrCtrl && shiftKey && 'KeyF' === code) {
+      if (cmdOrCtrl && !shiftKey && 'KeyF' === code) {
         this.props.focusSearchField();
 
         event.stopPropagation();
         event.preventDefault();
         return false;
       }
 
+      if (cmdOrCtrl && shiftKey && 'KeyF' === code) {
+        this.props.toggleFocusMode();
+
+        event.stopPropagation();
+        event.preventDefault();
+        return false;
+      }
+
       if (cmdOrCtrl && shiftKey && 'KeyN' === code) {
         this.props.actions.newNote({
           noteBucket: this.props.noteBucket,
@@ -257,11 +265,7 @@ export const App = connect(
         return false;
       }
 
-      if (
-        this.props.ui.note &&
-        cmdOrCtrl &&
-        ('Delete' === code || 'Backspace' === code)
-      ) {
+      if (this.props.ui.note && cmdOrCtrl && 'Delete' === code) {
         this.props.actions.trashNote({
           noteBucket: this.props.noteBucket,
           note: this.props.ui.note,
@@ -275,6 +279,13 @@ export const App = connect(
         return false;
       }
 
+      // prevent default browser behavior for search
+      // will bubble up from note-detail
+      if (cmdOrCtrl && 'KeyG' === code) {
+        event.stopPropagation();
+        event.preventDefault();
+      }
+
       return true;
     };
 

diff --git a/lib/dialogs/keybindings/index.tsx b/lib/dialogs/keybindings/index.tsx
@@ -40,7 +40,6 @@ const Keys = ({
 export class AboutDialog extends Component<DispatchProps> {
   render() {
     const { closeDialog } = this.props;
-
     const CmdOrCtrl = isMac ? 'Cmd' : 'Ctrl';
 
     return (
@@ -55,11 +54,21 @@ export class AboutDialog extends Component<DispatchProps> {
                 </li>
                 <li>
                   <Keys keys={[CmdOrCtrl, 'Shift', 'F']}>
-                    Focus search field
+                    Toggle focus mode
                   </Keys>
                 </li>
                 <li>
-                  <Keys keys={[CmdOrCtrl, 'G']}>Search within note</Keys>
+                  <Keys keys={[CmdOrCtrl, 'F']}>Focus search field</Keys>
+                </li>
+                <li>
+                  <Keys keys={[CmdOrCtrl, 'G']}>
+                    Jump to next match in note
+                  </Keys>
+                </li>
+                <li>
+                  <Keys keys={[CmdOrCtrl, 'Shift', 'G']}>
+                    Jump to previous match in note
+                  </Keys>
                 </li>
                 {isElectron && (
                   <li>
@@ -99,11 +108,13 @@ export class AboutDialog extends Component<DispatchProps> {
                 </li>
                 <li>
                   <Keys keys={[CmdOrCtrl, 'Shift', 'K']}>
-                    Select previous note
+                    Open note above current one
                   </Keys>
                 </li>
                 <li>
-                  <Keys keys={[CmdOrCtrl, 'Shift', 'J']}>Select next note</Keys>
+                  <Keys keys={[CmdOrCtrl, 'Shift', 'J']}>
+                    Open note below current one
+                  </Keys>
                 </li>
                 <li>
                   <Keys keys={[CmdOrCtrl, 'T']}>
@@ -112,9 +123,7 @@ export class AboutDialog extends Component<DispatchProps> {
                 </li>
                 <li>
                   <Keys keys={[CmdOrCtrl, 'Shift', 'L']}>
-                    Show note list
-                    <br />
-                    (on narrow screens)
+                    Toggle note list (on narrow screens)
                   </Keys>
                 </li>
               </ul>
@@ -127,7 +136,15 @@ export class AboutDialog extends Component<DispatchProps> {
                   <Keys keys={[CmdOrCtrl, 'Shift', 'N']}>Create new note</Keys>
                 </li>
                 <li>
-                  <Keys keys={[CmdOrCtrl, 'Delete']}>Trash note</Keys>
+                  <Keys
+                    keys={
+                      isMac
+                        ? ['fn', CmdOrCtrl, 'Delete']
+                        : [CmdOrCtrl, 'Delete']
+                    }
+                  >
+                    Trash note
+                  </Keys>
                 </li>
                 {isElectron && (
                   <li>