From 709c3e78bd629ee768dd27d42433fd406376d2ac Mon Sep 17 00:00:00 2001
From: Tom Moor <tom.moor@gmail.com>
Date: Mon, 7 Sep 2020 10:42:51 -0700
Subject: [PATCH] fix: Occasional render loop in editor toolbar (#1518)

* fix: CMD+S should save when editor title is focused

* fix: Bump RME, fixes various small editor issues
---
 app/scenes/Document/components/Editor.js |  7 +++++++
 package.json                             |  2 +-
 yarn.lock                                | 17 +++++++++++------
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/app/scenes/Document/components/Editor.js b/app/scenes/Document/components/Editor.js
index 893c1ea1..c05237b9 100644
--- a/app/scenes/Document/components/Editor.js
+++ b/app/scenes/Document/components/Editor.js
@@ -21,6 +21,7 @@ type Props = {
   isDraft: boolean,
   isShare: boolean,
   readOnly?: boolean,
+  onSave: () => mixed,
   innerRef: { current: any },
 };
 
@@ -58,6 +59,12 @@ class DocumentEditor extends React.Component<Props> {
     if (event.key === "Tab" || event.key === "ArrowDown") {
       event.preventDefault();
       this.focusAtStart();
+      return;
+    }
+    if (event.key === "s" && event.metaKey) {
+      event.preventDefault();
+      this.props.onSave();
+      return;
     }
   };
 
diff --git a/package.json b/package.json
index 93aa42ca..b5f37f80 100644
--- a/package.json
+++ b/package.json
@@ -138,7 +138,7 @@
     "react-portal": "^4.0.0",
     "react-router-dom": "^5.1.2",
     "react-waypoint": "^9.0.2",
-    "rich-markdown-editor": "^10.6.7",
+    "rich-markdown-editor": "^11.0.0-0",
     "semver": "^7.3.2",
     "sequelize": "^6.3.4",
     "sequelize-cli": "^6.2.0",
diff --git a/yarn.lock b/yarn.lock
index d4c45b12..48e52165 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9720,6 +9720,11 @@ require-package-name@^2.0.1:
   resolved "https://registry.yarnpkg.com/require-package-name/-/require-package-name-2.0.1.tgz#c11e97276b65b8e2923f75dabf5fb2ef0c3841b9"
   integrity sha1-wR6XJ2tluOKSP3Xav1+y7ww4Qbk=
 
+resize-observer-polyfill@^1.5.1:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz#0e9020dd3d21024458d4ebd27e23e40269810464"
+  integrity sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg==
+
 resolve-cwd@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a"
@@ -9801,10 +9806,10 @@ retry-as-promised@^3.2.0:
   dependencies:
     any-promise "^1.3.0"
 
-rich-markdown-editor@^10.6.7:
-  version "10.6.7"
-  resolved "https://registry.yarnpkg.com/rich-markdown-editor/-/rich-markdown-editor-10.6.7.tgz#d5d0367779ed3342b7aae283e57765ba69c73ae3"
-  integrity sha512-sl0UNCK4Anj4rlfPyBOtCvPVopRbUJccevKE36YIdWmvVdylLWjCAsvV7UUewmXxb2lKzofkTYkR4eR8T3C6dA==
+rich-markdown-editor@^11.0.0-0:
+  version "11.0.0-0"
+  resolved "https://registry.yarnpkg.com/rich-markdown-editor/-/rich-markdown-editor-11.0.0-0.tgz#52878d98695c709ccb7d95be060f0098d6f7238d"
+  integrity sha512-j9nSFYONL4uJwYLdLuPY2ZQVrnnptUzK399yRjVojV4NRHtuQ0mVdNS0iZ8M5tGcVjzlS1su3e/4l5mioKivwA==
   dependencies:
     copy-to-clipboard "^3.0.8"
     lodash "^4.17.11"
@@ -9828,9 +9833,9 @@ rich-markdown-editor@^10.6.7:
     react-medium-image-zoom "^3.0.16"
     react-portal "^4.2.1"
     refractor "^3.1.0"
+    resize-observer-polyfill "^1.5.1"
     slugify "^1.4.0"
     smooth-scroll-into-view-if-needed "^1.1.27"
-    styled-components "^5.1.0"
     typescript "3.7.5"
 
 rimraf@2, rimraf@^2.5.4, rimraf@^2.6.2, rimraf@^2.6.3:
@@ -10768,7 +10773,7 @@ styled-components-breakpoint@^2.1.1:
   resolved "https://registry.yarnpkg.com/styled-components-breakpoint/-/styled-components-breakpoint-2.1.1.tgz#37c1b92b0e96c1bbc5d293724d7a114daaa15fca"
   integrity sha512-PkS7p3MkPJx/v930Q3MPJU8llfFJTxk8o009jl0p+OUFmVb2AlHmVclX1MBHSXk8sZYGoVTTVIPDuZCELi7QIg==
 
-styled-components@^5.0.0, styled-components@^5.1.0:
+styled-components@^5.0.0:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/styled-components/-/styled-components-5.1.1.tgz#96dfb02a8025794960863b9e8e365e3b6be5518d"
   integrity sha512-1ps8ZAYu2Husx+Vz8D+MvXwEwvMwFv+hqqUwhNlDN5ybg6A+3xyW1ECrAgywhvXapNfXiz79jJyU0x22z0FFTg==