Move from nested function to sibling

mui · Nov 8, 2019 · 4ed379a · 4ed379a
1 parent eb24625
commit 4ed379a
Showing 1 changed file with 15 additions and 12 deletions.
diff --git a/packages/material-ui-lab/src/TreeItem/TreeItem.js b/packages/material-ui-lab/src/TreeItem/TreeItem.js
@@ -133,28 +133,31 @@ const TreeItem = React.forwardRef(function TreeItem(props, ref) {
     }
   };
 
+  const printableCharacter = (event, key) => {
+    if (key === '*') {
+      expandAllSiblings(event, nodeId);
+      return true;
+    }
+
+    if (isPrintableCharacter(key)) {
+      setFocusByFirstCharacter(nodeId, key);
+      return true;
+    }
+    return false;
+  };
+
   const handleKeyDown = event => {
     let flag = false;
     const key = event.key;
 
-    const printableCharacter = e => {
-      if (key === '*') {
-        expandAllSiblings(e, nodeId);
-        flag = true;
-      } else if (isPrintableCharacter(key)) {
-        setFocusByFirstCharacter(nodeId, key);
-        flag = true;
-      }
-    };
-
     if (event.altKey || event.ctrlKey || event.metaKey) {
       return;
     }
     if (event.shift) {
       if (key === ' ' || key === 'Enter') {
         event.stopPropagation();
       } else if (isPrintableCharacter(key)) {
-        printableCharacter(event);
+        flag = printableCharacter(event, key);
       }
     } else {
       switch (key) {
@@ -197,7 +200,7 @@ const TreeItem = React.forwardRef(function TreeItem(props, ref) {
           break;
         default:
           if (isPrintableCharacter(key)) {
-            printableCharacter(event);
+            flag = printableCharacter(event, key);
           }
       }
     }