From 268a7cb5b49499b89fff86401387a9b85b3f5ee4 Mon Sep 17 00:00:00 2001
From: Brian Vaughn <bvaughn@fb.com>
Date: Wed, 10 Apr 2019 10:14:21 -0700
Subject: [PATCH] Moved blur/focus up to the AutoSizer wrapper and removed an
 effect+ref

---
 src/devtools/views/Components/Tree.css |  8 +--
 src/devtools/views/Components/Tree.js  | 86 +++++++++-----------------
 2 files changed, 34 insertions(+), 60 deletions(-)

diff --git a/src/devtools/views/Components/Tree.css b/src/devtools/views/Components/Tree.css
index 777e332ba7..53b576c4cc 100644
--- a/src/devtools/views/Components/Tree.css
+++ b/src/devtools/views/Components/Tree.css
@@ -4,6 +4,7 @@
   display: flex;
   flex-direction: column;
   border-top: 1px solid var(--color-border);
+  padding: 0.25rem;
 }
 
 .SearchInput {
@@ -19,13 +20,12 @@
   overflow: auto;
   flex: 1 0 auto;
 }
+.AutoSizerWrapper:focus {
+  outline: none;
+}
 
 .List {
   font-family: var(--font-family-monospace);
   font-size: var(--font-size-monospace-normal);
   line-height: var(--line-height-data);
 }
-
-.InnerElementType:focus {
-  outline: none;
-}
diff --git a/src/devtools/views/Components/Tree.js b/src/devtools/views/Components/Tree.js
index 5ad130aad7..f26e9c7817 100644
--- a/src/devtools/views/Components/Tree.js
+++ b/src/devtools/views/Components/Tree.js
@@ -41,7 +41,9 @@ export default function Tree(props: Props) {
     ownerStack,
     selectedElementID,
     selectedElementIndex,
+    selectElementAtIndex,
     selectNextElementInTree,
+    selectOwner,
     selectParentElementInTree,
     selectPreviousElementInTree,
   } = useContext(TreeContext);
@@ -50,7 +52,6 @@ export default function Tree(props: Props) {
   // $FlowFixMe https://github.com/facebook/flow/issues/7341
   const listRef = useRef<FixedSizeList<ItemData> | null>(null);
   const treeRef = useRef<HTMLDivElement | null>(null);
-  const elementsRef = useRef<HTMLDivElement | null>(null);
 
   const [treeFocused, setTreeFocused] = useState<boolean>(false);
 
@@ -147,29 +148,31 @@ export default function Tree(props: Props) {
     store,
   ]);
 
-  useEffect(() => {
-    if (elementsRef.current === null) {
-      return () => {};
+  const handleBlur = useCallback(() => setTreeFocused(false));
+
+  const handleFocus = useCallback(() => {
+    setTreeFocused(true);
+
+    if (selectedElementIndex === null && numElements > 0) {
+      selectElementAtIndex(0);
     }
+  }, [numElements, selectedElementIndex, selectElementAtIndex]);
 
-    const handleFocusIn = () => {
-      setTreeFocused(true);
-    };
-
-    const handleFocusOut = () => {
-      setTreeFocused(false);
-    };
-
-    const elementsElement = elementsRef.current;
-
-    elementsElement.addEventListener('focusin', handleFocusIn);
-    elementsElement.addEventListener('focusout', handleFocusOut);
-
-    return () => {
-      elementsElement.removeEventListener('focusin', handleFocusIn);
-      elementsElement.removeEventListener('focusout', handleFocusOut);
-    };
-  }, []);
+  const handleKeyPress = useCallback(
+    event => {
+      switch (event.key) {
+        case 'Enter':
+        case ' ':
+          if (selectedElementID !== null) {
+            selectOwner(selectedElementID);
+          }
+          break;
+        default:
+          break;
+      }
+    },
+    [selectedElementID, selectOwner]
+  );
 
   // Let react-window know to re-render any time the underlying tree data changes.
   // This includes the owner context, since it controls a filtered view of the tree.
@@ -196,8 +199,11 @@ export default function Tree(props: Props) {
       </div>
       <div
         className={styles.AutoSizerWrapper}
+        onBlur={handleBlur}
+        onFocus={handleFocus}
+        onKeyPress={handleKeyPress}
         onMouseLeave={handleMouseLeave}
-        ref={elementsRef}
+        tabIndex={0}
       >
         <AutoSizer>
           {({ height, width }) => (
@@ -223,36 +229,7 @@ export default function Tree(props: Props) {
 }
 
 function InnerElementType({ style, ...rest }) {
-  const {
-    numElements,
-    ownerStack,
-    selectedElementID,
-    selectedElementIndex,
-    selectElementAtIndex,
-    selectOwner,
-  } = useContext(TreeContext);
-
-  const handleFocus = () => {
-    if (selectedElementIndex === null && numElements > 0) {
-      selectElementAtIndex(0);
-    }
-  };
-
-  const handleKeyPress = useCallback(
-    event => {
-      switch (event.key) {
-        case 'Enter':
-        case ' ':
-          if (selectedElementID !== null) {
-            selectOwner(selectedElementID);
-          }
-          break;
-        default:
-          break;
-      }
-    },
-    [selectedElementID, selectOwner]
-  );
+  const { ownerStack } = useContext(TreeContext);
 
   // The list may need to scroll horizontally due to deeply nested elements.
   // We don't know the maximum scroll width up front, because we're windowing.
@@ -283,8 +260,6 @@ function InnerElementType({ style, ...rest }) {
   return (
     <div
       className={styles.InnerElementType}
-      onFocus={handleFocus}
-      onKeyPress={handleKeyPress}
       style={{
         ...style,
         display: 'inline-block',
@@ -292,7 +267,6 @@ function InnerElementType({ style, ...rest }) {
         width: undefined,
       }}
       ref={divRef}
-      tabIndex={0}
       {...rest}
     />
   );