From 038018650169ecbe2962898746ea39ce31f73847 Mon Sep 17 00:00:00 2001 From: Brian Vaughn Date: Fri, 8 Feb 2019 14:44:07 -0500 Subject: [PATCH] Refactored tree, search, selection, and owners contexts --- src/backend/renderer.js | 2 +- src/devtools/store.js | 14 +- src/devtools/types.js | 10 - src/devtools/views/ButtonIcon.js | 11 + src/devtools/views/Element.js | 44 +- src/devtools/views/Elements.css | 1 + src/devtools/views/Elements.js | 50 +- src/devtools/views/OwnersStack.css | 2 + src/devtools/views/OwnersStack.js | 34 +- .../views/SearchAndSelectionContext.js | 634 ----------------- src/devtools/views/SearchInput.js | 28 +- src/devtools/views/SelectedElement.js | 8 +- src/devtools/views/Tree.js | 31 +- src/devtools/views/TreeContext.js | 663 ++++++++++++++++++ src/devtools/views/context.js | 7 - 15 files changed, 772 insertions(+), 767 deletions(-) delete mode 100644 src/devtools/views/SearchAndSelectionContext.js create mode 100644 src/devtools/views/TreeContext.js diff --git a/src/backend/renderer.js b/src/backend/renderer.js index 9a5ac9da77..8aa50d474a 100644 --- a/src/backend/renderer.js +++ b/src/backend/renderer.js @@ -546,7 +546,7 @@ export function attach( const { _debugOwner } = fiber; const ownerID = - _debugOwner !== null ? getFiberID(getPrimaryFiber(_debugOwner)) : 0; + _debugOwner != null ? getFiberID(getPrimaryFiber(_debugOwner)) : 0; let encodedDisplayName = ((null: any): Uint8Array); let encodedKey = ((null: any): Uint8Array); diff --git a/src/devtools/store.js b/src/devtools/store.js index 8e3166970e..4480a17ff9 100644 --- a/src/devtools/store.js +++ b/src/devtools/store.js @@ -107,6 +107,11 @@ export default class Store extends EventEmitter { return ((currentElement: any): Element); } + getElementIDAtIndex(index: number): number | null { + const element: Element | null = this.getElementAtIndex(index); + return element === null ? null : element.id; + } + getElementByID(id: number): Element | null { const element = this._idToElement.get(id); @@ -286,9 +291,10 @@ export default class Store extends EventEmitter { this._idToElement.set(id, element); - // Track newly addewd items so search results can be updated + const oldAddedElementIDs = addedElementIDs; addedElementIDs = new Uint32Array(addedElementIDs.length + 1); - addedElementIDs[addedElementIDs.length - 1] = id; + addedElementIDs.set(oldAddedElementIDs); + addedElementIDs[oldAddedElementIDs.length] = id; weightDelta = 1; } @@ -319,8 +325,10 @@ export default class Store extends EventEmitter { } // Track removed items so search results can be updated + const oldRemovededElementIDs = removedElementIDs; removedElementIDs = new Uint32Array(removedElementIDs.length + 1); - removedElementIDs[removedElementIDs.length - 1] = id; + removedElementIDs.set(oldRemovededElementIDs); + removedElementIDs[oldRemovededElementIDs.length] = id; break; case TREE_OPERATION_RESET_CHILDREN: id = ((operations[i + 1]: any): number); diff --git a/src/devtools/types.js b/src/devtools/types.js index 047fe86919..59cddbfd10 100644 --- a/src/devtools/types.js +++ b/src/devtools/types.js @@ -1,7 +1,5 @@ // @flow -import Store from './Store'; - export const ElementTypeClassOrFunction = 1; export const ElementTypeContext = 2; export const ElementTypeForwardRef = 3; @@ -67,14 +65,6 @@ export type InspectedElement = {| // TODO: Add profiling type -// The frontend Store is mutable. -// This wrapper object is recreated whenever the store's tree is mutated. -// It is used to trigger a re-render of the virtualized Elements tree. -export type TreeMetadataType = {| - size: number, - store: Store, -|}; - export type DehydratedData = {| cleaned: Array>, data: Object, diff --git a/src/devtools/views/ButtonIcon.js b/src/devtools/views/ButtonIcon.js index c6056d72fc..47ad29523d 100644 --- a/src/devtools/views/ButtonIcon.js +++ b/src/devtools/views/ButtonIcon.js @@ -8,6 +8,7 @@ type Props = {| | 'back' | 'close' | 'down' + | 'more' | 'search' | 'up' | 'view-dom' @@ -26,6 +27,9 @@ export default function ButtonIcon({ type }: Props) { case 'down': pathData = PATH_DOWN; break; + case 'more': + pathData = PATH_MORE; + break; case 'search': pathData = PATH_SEARCH; break; @@ -68,6 +72,13 @@ const PATH_CLOSE = const PATH_DOWN = 'M7.41 8.59L12 13.17l4.59-4.58L18 10l-6 6-6-6 1.41-1.41z'; +const PATH_MORE = ` + M22 3H7c-.69 0-1.23.35-1.59.88L0 12l5.41 8.11c.36.53.97.89 1.66.89H22c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2zM9 + 13.5c-.83 0-1.5-.67-1.5-1.5s.67-1.5 1.5-1.5 1.5.67 1.5 1.5-.67 1.5-1.5 1.5zm5 0c-.83 + 0-1.5-.67-1.5-1.5s.67-1.5 1.5-1.5 1.5.67 1.5 1.5-.67 1.5-1.5 1.5zm5 0c-.83 0-1.5-.67-1.5-1.5s.67-1.5 1.5-1.5 + 1.5.67 1.5 1.5-.67 1.5-1.5 1.5z +`; + const PATH_SEARCH = ` M20.94 11c-.46-4.17-3.77-7.48-7.94-7.94V1h-2v2.06C6.83 3.52 3.52 6.83 3.06 11H1v2h2.06c.46 4.17 3.77 7.48 7.94 7.94V23h2v-2.06c4.17-.46 7.48-3.77 7.94-7.94H23v-2h-2.06zM12 19c-3.87 diff --git a/src/devtools/views/Element.js b/src/devtools/views/Element.js index 5825e812aa..e7c9401dd5 100644 --- a/src/devtools/views/Element.js +++ b/src/devtools/views/Element.js @@ -2,9 +2,8 @@ import React, { Fragment, useCallback, useContext, useMemo } from 'react'; import { ElementTypeClassOrFunction } from 'src/devtools/types'; -import { TreeContext } from './context'; import { createRegExp } from './utils'; -import { SearchAndSelectionContext } from './SearchAndSelectionContext'; +import { TreeContext } from './TreeContext'; import Icon from './Icon'; import type { Element } from '../types'; @@ -17,33 +16,30 @@ type Props = { }; export default function ElementView({ index, style }: Props) { - const { store } = useContext(TreeContext); - const { - ownerList, - pushOwnerList, + baseDepth, + getElementAtIndex, + selectOwner, selectedElementID, - selectElementWithID, - } = useContext(SearchAndSelectionContext); + selectElementByID, + } = useContext(TreeContext); - const element = - ownerList !== null - ? ((store.getElementByID(ownerList[index]): any): Element) - : ((store.getElementAtIndex(index): any): Element); - const { children, depth, displayName, id, key, type } = element; + const element = getElementAtIndex(index); + const { + children, + depth, + displayName, + id, + key, + type, + } = ((element: any): Element); - let calculatedDepth = depth; - if (ownerList !== null) { - const owner = ((store.getElementByID(ownerList[0]): any): Element); - calculatedDepth = depth - owner.depth; - } - - const handleDoubleClick = useCallback(() => pushOwnerList(id), [id]); + const handleDoubleClick = useCallback(() => selectOwner(id), [id]); // TODO Add click and key handlers for toggling element open/close state. const handleClick = useCallback( - ({ metaKey }) => selectElementWithID(metaKey ? null : id), + ({ metaKey }) => selectElementByID(metaKey ? null : id), [id] ); @@ -57,7 +53,7 @@ export default function ElementView({ index, style }: Props) { onDoubleClick={handleDoubleClick} style={{ ...style, // "style" comes from react-window - paddingLeft: `${1 + calculatedDepth}rem`, + paddingLeft: `${1 + depth - baseDepth}rem`, }} > {children.length > 0 && ( @@ -86,9 +82,7 @@ type DisplayNameProps = {| |}; function DisplayName({ displayName, id }: DisplayNameProps) { - const { searchIndex, searchResults, searchText } = useContext( - SearchAndSelectionContext - ); + const { searchIndex, searchResults, searchText } = useContext(TreeContext); const isSearchResult = useMemo(() => { return searchResults.includes(id); }, [id, searchResults]); diff --git a/src/devtools/views/Elements.css b/src/devtools/views/Elements.css index 2fe8bb63c6..b1814179a8 100644 --- a/src/devtools/views/Elements.css +++ b/src/devtools/views/Elements.css @@ -9,6 +9,7 @@ .TreeWrapper { flex: 0 0 65%; + overflow: auto; } .SelectedElementWrapper { diff --git a/src/devtools/views/Elements.js b/src/devtools/views/Elements.js index 116761969a..b79f12cc36 100644 --- a/src/devtools/views/Elements.js +++ b/src/devtools/views/Elements.js @@ -1,11 +1,11 @@ // @flow -import React, { useEffect, useMemo, useState } from 'react'; +import React, { useMemo } from 'react'; import Store from '../store'; import Tree from './Tree'; -import { BridgeContext, StoreContext, TreeContext } from './context'; +import { BridgeContext, StoreContext } from './context'; import SelectedElement from './SelectedElement'; -import { SearchAndSelectionController } from './SearchAndSelectionContext'; +import { TreeContextController } from './TreeContext'; import styles from './Elements.css'; import './root.css'; @@ -21,46 +21,20 @@ export type Props = {| export default function Elements({ bridge, browserName, themeName }: Props) { const store = useMemo(() => new Store(bridge), []); - const [treeContext, setTreeContext] = useState({ - size: store.numElements, - store, - }); - - useEffect(() => { - const handler = () => { - setTreeContext({ - size: store.numElements, - store, - }); - }; - - // Check for changes that happened between async render and passive effect. - // (We had not yet subscribed to the store so we would have missed these.) - if (treeContext.size !== store.numElements) { - handler(); - } - - store.addListener('mutated', handler); - - return () => store.removeListener('mutated', handler); - }, [store]); - // TODO Flex wrappers below should be user resizable. return ( - - -
-
- -
-
- -
+ +
+
+
- - +
+ +
+
+
); diff --git a/src/devtools/views/OwnersStack.css b/src/devtools/views/OwnersStack.css index c579c24225..822f537a88 100644 --- a/src/devtools/views/OwnersStack.css +++ b/src/devtools/views/OwnersStack.css @@ -2,6 +2,7 @@ flex: 1; display: flex; align-items: center; + overflow-x: auto; } .IconButton { @@ -29,6 +30,7 @@ color: var(--color-component-name); font-family: var(--font-family-monospace); font-size: var(--font-size-normal); + white-space: nowrap; } .Component { diff --git a/src/devtools/views/OwnersStack.js b/src/devtools/views/OwnersStack.js index 6247300a09..79a70eee1c 100644 --- a/src/devtools/views/OwnersStack.js +++ b/src/devtools/views/OwnersStack.js @@ -2,26 +2,26 @@ import React, { useCallback, useContext } from 'react'; import ButtonIcon from './ButtonIcon'; -import { SearchAndSelectionContext } from './SearchAndSelectionContext'; -import { TreeContext } from './context'; +import { TreeContext } from './TreeContext'; +import { StoreContext } from './context'; import type { Element } from '../types'; import styles from './OwnersStack.css'; export default function OwnerStack() { - const { clearOwnerList, ownerIDStack } = useContext( - SearchAndSelectionContext - ); + const { ownerStack, resetOwnerStack } = useContext(TreeContext); // $FlowFixMe "Missing type annotation for U" whatever that means - const elements = ownerIDStack.map(id => ); + const elements = ownerStack.map((id, index) => ( + + )); return (