Disable keyboard shortcuts when a <textarea> is focused

Already applies to <input>
TurboWarp · Aug 15, 2023 · 18b542c · 18b542c
1 parent a10d2f2
commit 18b542c
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 6 deletions.
diff --git a/src/containers/paint-editor.jsx b/src/containers/paint-editor.jsx
@@ -256,7 +256,11 @@ class PaintEditor extends React.Component {
     }
     onMouseDown (event) {
         if (event.target === paper.view.element &&
-                document.activeElement instanceof HTMLInputElement) {
+            (
+                document.activeElement instanceof HTMLInputElement ||
+                document.activeElement instanceof HTMLTextAreaElement
+            )
+        ) {
             document.activeElement.blur();
         }
 

diff --git a/src/helper/selection-tools/nudge-tool.js b/src/helper/selection-tools/nudge-tool.js
@@ -21,7 +21,7 @@ class NudgeTool {
         this.boundingBoxTool.isBitmap = mode in BitmapModes;
     }
     onKeyDown (event) {
-        if (event.event.target instanceof HTMLInputElement) {
+        if (event.event.target instanceof HTMLInputElement || event.event.target instanceof HTMLTextAreaElement) {
             // Ignore nudge if a text input field is focused
             return;
         }

diff --git a/src/helper/selection-tools/reshape-tool.js b/src/helper/selection-tools/reshape-tool.js
@@ -310,7 +310,7 @@ class ReshapeTool extends paper.Tool {
         this.active = false;
     }
     handleKeyDown (event) {
-        if (event.event.target instanceof HTMLInputElement) {
+        if (event.event.target instanceof HTMLInputElement || event.event.target instanceof HTMLTextAreaElement) {
             // Ignore nudge if a text input field is focused
             return;
         }

diff --git a/src/helper/tools/text-tool.js b/src/helper/tools/text-tool.js
@@ -282,7 +282,7 @@ class TextTool extends paper.Tool {
         this.active = false;
     }
     handleKeyUp (event) {
-        if (event.event.target instanceof HTMLInputElement) {
+        if (event.event.target instanceof HTMLInputElement || event.event.target instanceof HTMLTextAreaElement) {
             // Ignore nudge if a text input field is focused
             return;
         }
@@ -292,7 +292,7 @@ class TextTool extends paper.Tool {
         }
     }
     handleKeyDown (event) {
-        if (event.event.target instanceof HTMLInputElement) {
+        if (event.event.target instanceof HTMLInputElement || event.event.target instanceof HTMLTextAreaElement) {
             // Ignore nudge if a text input field is focused
             return;
         }

diff --git a/src/hocs/keyboard-shortcuts-hoc.jsx b/src/hocs/keyboard-shortcuts-hoc.jsx
@@ -50,7 +50,7 @@ const KeyboardShortcutsHOC = function (WrappedComponent) {
             ]);
         }
         handleKeyPress (event) {
-            if (event.target instanceof HTMLInputElement) {
+            if (event.target instanceof HTMLInputElement || event.target instanceof HTMLTextAreaElement) {
                 // Ignore keyboard shortcuts if a text input field is focused
                 return;
             }