core: fix renaming input cancel and not receiving keys from hotkeys

Author: lukasbach

.prettierignore

@@ -3,4 +3,5 @@ packages/*/lib
 packages/*/node_modules
 storybook-static
 packages/docs/.docusaurus
-packages/docs/build
+packages/docs/build
+lerna.json

lerna.json

@@ -1,7 +1,5 @@
 {
-  "packages": [
-    "packages/*"
-  ],
+  "packages": ["packages/*"],
   "npmClient": "yarn",
   "useWorkspaces": true,
   "version": "0.2.1"

packages/core/src/hotkeys/useHotkey.ts

@@ -4,10 +4,16 @@ import { KeyboardBindings } from '../types';
 import { defaultKeyboardBindings } from './defaultKeyboardBindings';
 import { useTreeEnvironment } from '../controlledEnvironment/ControlledTreeEnvironment';
 
+const elementsThatCanTakeText = [
+  'input',
+  'textarea'
+]
+
 export const useHotkey = (
   combinationName: keyof KeyboardBindings,
   onHit: (e: KeyboardEvent) => void,
   active?: boolean,
+  activatableWhileFocusingInput = false,
   deps?: any[]
 ) => {
   const environment = useTreeEnvironment();
@@ -28,6 +34,11 @@ export const useHotkey = (
         return;
       }
 
+      if ((elementsThatCanTakeText.includes((e.target as HTMLElement).tagName.toLowerCase())
+        || (e.target as HTMLElement).isContentEditable) && !activatableWhileFocusingInput) {
+        return;
+      }
+
       if (!pressedKeys.current.includes(e.key)) {
         pressedKeys.current.push(e.key);
         const pressedKeysLowercase = pressedKeys.current.map(key => key.toLowerCase());

packages/core/src/search/SearchInput.tsx

@@ -38,6 +38,7 @@ export const SearchInput: React.FC<{
       });
     },
     isActiveTree && search !== null,
+    true,
     [search, isActiveTree]
   );
 

packages/core/src/treeItem/TreeItemRenamingInput.tsx

@@ -40,7 +40,7 @@ export const TreeItemRenamingInput: React.FC<{
 
   useHotkey('abortRenameItem', () => {
     abort();
-  });
+  }, true, true);
 
   const inputProps: InputHTMLAttributes<HTMLInputElement> = {
     value: title,