A few mini-fixes for the accessibility layout inspector

Summary:
- fix mutual selection of elements in ax and non-ax tree (simplifies linkedNode logic as well)
- remove unneeded extraInfo attributes (focused, nonAXwithAXchild, & hasAXNode were not/no longer being used)
- use 50/50 fixed width view for trees when both are visible

Reviewed By: jknoxville

Differential Revision: D16390355

fbshipit-source-id: bbf9ea887f8f1035df8b4b0562ddcc4de291f004

android/src/main/java/com/facebook/flipper/plugins/inspector/InspectorFlipperPlugin.java

@@ -551,7 +551,7 @@ public class InspectorFlipperPlugin implements FlipperPlugin {
 
   private boolean hasAXNode(FlipperObject node) {
     FlipperObject extraInfo = node.getObject("extraInfo");
-    return extraInfo != null && extraInfo.getBoolean("hasAXNode");
+    return extraInfo != null && extraInfo.getBoolean("linkedNode");
   }
 
   public SearchResultNode searchTree(String query, Object obj, boolean axEnabled) throws Exception {

android/src/main/java/com/facebook/flipper/plugins/inspector/descriptors/ApplicationDescriptor.java

@@ -216,7 +216,8 @@ public class ApplicationDescriptor extends NodeDescriptor<ApplicationWrapper> {
 
   @Override
   public FlipperObject getExtraInfo(ApplicationWrapper node) {
-    return new FlipperObject.Builder().put("hasAXNode", true).build();
+    // Application node is it's own linkedNode because it shows up in both the ax and non-ax tree
+    return new FlipperObject.Builder().put("linkedNode", getId(node)).build();
   }
 
   @Override

android/src/main/java/com/facebook/flipper/plugins/inspector/descriptors/FragmentDescriptor.java

@@ -77,7 +77,7 @@ public class FragmentDescriptor extends NodeDescriptor<Fragment> {
 
   @Override
   public FlipperObject getExtraInfo(Fragment node) {
-    return new FlipperObject.Builder().put("nonAXWithAXChild", true).build();
+    return new FlipperObject.Builder().put("expandWithParent", true).build();
   }
 
   @Nullable

android/src/main/java/com/facebook/flipper/plugins/inspector/descriptors/ViewDescriptor.java

@@ -445,10 +445,9 @@ public class ViewDescriptor extends NodeDescriptor<View> {
 
   @Override
   public FlipperObject getExtraInfo(View node) {
-    return new FlipperObject.Builder()
-        .put("focused", AccessibilityUtil.isAXFocused(node))
-        .put("hasAXNode", true)
-        .build();
+    // Views of all kinds are their own linked node because they show up in both the ax and non-ax
+    // tree
+    return new FlipperObject.Builder().put("linkedNode", getId(node)).build();
   }
 
   @Nullable

android/src/main/java/com/facebook/flipper/plugins/litho/DebugComponentDescriptor.java

@@ -307,13 +307,13 @@ public class DebugComponentDescriptor extends NodeDescriptor<DebugComponent> {
 
     if (hostView != null) {
       try {
-        extraInfo.put("linkedAXNode", descriptor.getId(hostView));
+        extraInfo.put("linkedNode", descriptor.getId(hostView));
       } catch (Exception ignored) {
         // doesn't have linked node descriptor
       }
     } else if (lithoView != null) {
       try {
-        extraInfo.put("linkedAXNode", descriptor.getId(lithoView));
+        extraInfo.put("linkedNode", descriptor.getId(lithoView)).put("expandWithParent", true);
       } catch (Exception ignored) {
         // doesn't add linked node descriptor
       }

android/src/test/java/com/facebook/flipper/plugins/inspector/InspectorFlipperPluginTest.java

@@ -101,7 +101,9 @@ public class InspectorFlipperPluginTest {
                 .put("children", new FlipperArray.Builder().put("test"))
                 .put("attributes", new FlipperArray.Builder())
                 .put("decoration", (String) null)
-                .put("extraInfo", new FlipperObject.Builder().put("hasAXNode", true))
+                .put(
+                    "extraInfo",
+                    new FlipperObject.Builder().put("linkedNode", "com.facebook.flipper"))
                 .build()));
   }
 

headless-tests/__tests__/headlessIntegrationTests.js

@@ -15,7 +15,7 @@ const TEST_TIMEOUT_MS = 30 * 1000;
 const layoutPathsToExcludeFromSnapshots = [
   'id',
   'children.*',
-  'extraInfo.linkedAXNode',
+  'extraInfo.linkedNode',
   'data.View.*.value',
   'data.View.*.*.value',
   'data.View.*.*.*.value',
@@ -197,7 +197,7 @@ test('test layout snapshot stripping', () => {
     id: 2,
     children: [1, 2, 3],
     extraInfo: {
-      linkedAXNode: 55,
+      linkedNode: 55,
       somethingElse: 44,
     },
     data: {View: {bounds: {something: {value: 4}}}},
@@ -216,7 +216,7 @@ test('test layout snapshot stripping', () => {
     id: 'PLACEHOLDER',
     children: ['PLACEHOLDER', 'PLACEHOLDER', 'PLACEHOLDER'],
     extraInfo: {
-      linkedAXNode: 'PLACEHOLDER',
+      linkedNode: 'PLACEHOLDER',
       somethingElse: 44,
     },
     data: {View: {bounds: {something: {value: 'PLACEHOLDER'}}}},

src/plugins/layout/Inspector.js

@@ -147,26 +147,28 @@ export default class Inspector extends Component<Props> {
 
     if (
       ax &&
-      selectedElement !== prevProps.selectedElement &&
-      selectedElement
+      selectedElement &&
+      selectedElement !== prevProps.selectedElement
     ) {
-      // selected element changed, find linked AX element
-      const linkedAXNode: ?ElementID = this.props.persistedState.elements[
+      // selected element in non-AX tree changed, find linked element in AX tree
+      const newlySelectedElem = this.props.persistedState.elements[
         selectedElement
-      ]?.extraInfo?.linkedAXNode;
-      this.props.onSelect(linkedAXNode);
+      ];
+      if (newlySelectedElem) {
+        this.props.onSelect(newlySelectedElem.extraInfo?.linkedNode);
+      }
     } else if (
       !ax &&
-      selectedAXElement !== prevProps.selectedAXElement &&
-      selectedAXElement
+      selectedAXElement &&
+      selectedAXElement !== prevProps.selectedAXElement
     ) {
-      // selected AX element changed, find linked element
-      // $FlowFixMe Object.values retunes mixed type
-      const linkedNode: ?Element = Object.values(
-        this.props.persistedState.elements,
-        // $FlowFixMe it's an Element not mixed
-      ).find((e: Element) => e.extraInfo?.linkedAXNode === selectedAXElement);
-      this.props.onSelect(linkedNode?.id);
+      // selected element in AX tree changed, find linked element in non-AX tree
+      const newlySelectedAXElem = this.props.persistedState.AXelements[
+        selectedAXElement
+      ];
+      if (newlySelectedAXElem) {
+        this.props.onSelect(newlySelectedAXElem.extraInfo?.linkedNode);
+      }
     }
   }
 

src/plugins/layout/index.js

@@ -20,6 +20,7 @@ import {
   Toolbar,
   Sidebar,
   DetailSidebar,
+  VerticalRule,
 } from 'flipper';
 import Inspector from './Inspector';
 import ToolbarIcon from './ToolbarIcon';
@@ -168,6 +169,17 @@ export default class Layout extends FlipperPlugin<State, void, PersistedState> {
       />
     );
 
+    const axInspector = this.state.inAXMode && (
+      <Inspector
+        {...inspectorProps}
+        onSelect={selectedAXElement => this.setState({selectedAXElement})}
+        showsSidebar={true}
+        ax
+      />
+    );
+
+    const divider = this.state.inAXMode && <VerticalRule />;
+
     return (
       <FlexColumn grow={true}>
         {this.state.init && (
@@ -211,23 +223,9 @@ export default class Layout extends FlipperPlugin<State, void, PersistedState> {
             </Toolbar>
 
             <FlexRow grow={true}>
-              {this.state.inAXMode ? (
-                <>
-                  <Sidebar position="left" maxWidth={Infinity}>
               {inspector}
-                  </Sidebar>
-                  <Inspector
-                    {...inspectorProps}
-                    onSelect={selectedAXElement =>
-                      this.setState({selectedAXElement})
-                    }
-                    showsSidebar={true}
-                    ax
-                  />
-                </>
-              ) : (
-                inspector
-              )}
+              {divider}
+              {axInspector}
             </FlexRow>
             <DetailSidebar>
               <InspectorSidebar

src/ui/components/elements-inspector/ElementsInspector.js

@@ -36,9 +36,8 @@ export type ElementAttribute = {|
 |};
 
 export type ElementExtraInfo = {|
-  nonAXWithAXChild?: boolean,
-  linkedAXNode?: string,
-  focused?: boolean,
+  linkedNode?: string, // id of linked node in opposite tree
+  expandWithParent?: boolean,
 |};
 
 export type Element = {|
@@ -86,7 +85,6 @@ export default class ElementsInspector extends Component<{
     } = this.props;
 
     return (
-      <FlexRow grow={true}>
       <Elements
         onElementExpanded={onElementExpanded}
         onElementSelected={onElementSelected}
@@ -100,7 +98,6 @@ export default class ElementsInspector extends Component<{
         contextMenuExtensions={contextMenuExtensions}
         decorateRow={decorateRow}
       />
-      </FlexRow>
     );
   }
 }