Merge pull request #978 from devtools-html/set-expanded

Guard isRoot on node value truthiness

Author: codehag

packages/devtools-reps/src/object-inspector/component.js

@@ -177,7 +177,7 @@ class ObjectInspector extends Component {
     if (expand === true) {
       const gripItem = getClosestGripNode(item);
       const value = getValue(gripItem);
-      const isRoot = roots.some(root => {
+      const isRoot = value && roots.some(root => {
         const rootValue = getValue(root);
         return rootValue && rootValue.actor === value.actor;
       });

packages/devtools-reps/src/object-inspector/tests/component/__snapshots__/expand.js.snap

@@ -10,6 +10,18 @@ exports[`ObjectInspector - state does not expand if the user selected some text
 ▶︎ Proxy { <target>: {…}, <handler>: (3) […] }"
 `;
 
+exports[`ObjectInspector - state does not throw when expanding a block node 1`] = `
+"▶︎ ☲ Block
+▶︎ Proxy: Proxy { <target>: {…}, <handler>: (3) […] }"
+`;
+
+exports[`ObjectInspector - state does not throw when expanding a block node 2`] = `
+"▼ ☲ Block
+|    a: 30
+|    b: 32
+▶︎ Proxy: Proxy { <target>: {…}, <handler>: (3) […] }"
+`;
+
 exports[`ObjectInspector - state has the expected expandedPaths state when clicking nodes 1`] = `
 "▶︎ Object { p0: \\"0\\", p1: \\"1\\", p2: \\"2\\", p3: \\"3\\", p4: \\"4\\", p5: \\"5\\", p6: \\"6\\", p7: \\"7\\", p8: \\"8\\", p9: \\"9\\", … }
 ▶︎ Proxy { <target>: {…}, <handler>: (3) […] }"

packages/devtools-reps/src/object-inspector/tests/component/expand.js

@@ -15,6 +15,10 @@ const {
   formatObjectInspector,
   waitForDispatch,
 } = require("../test-utils");
+const {
+  createNode,
+  NODE_TYPES,
+} = require("../../utils/node");
 
 function generateDefaults(overrides) {
   return Object.assign({
@@ -207,4 +211,44 @@ describe("ObjectInspector - state", () => {
     // Clear the selection for other tests.
     getSelection().setMockSelection();
   });
+
+  it("does not throw when expanding a block node", async () => {
+    const blockNode = createNode(
+      null,
+      "Block",
+      "root-1",
+      [{
+        name: "a",
+        contents: {
+          value: 30,
+        }
+      }, {
+        name: "b",
+        contents: {
+          value: 32,
+        }
+      }],
+      NODE_TYPES.BLOCK
+    );
+    const proxyNode = createNode(
+      null,
+      "Proxy",
+      "root-2",
+      {
+        value: gripRepStubs.get("testProxy")
+      }
+    );
+
+    const wrapper = mount(ObjectInspector(generateDefaults({
+      roots: [blockNode, proxyNode],
+    })));
+
+    expect(formatObjectInspector(wrapper)).toMatchSnapshot();
+
+    let nodes = wrapper.find(".node");
+    const root = nodes.at(0);
+    root.simulate("click");
+
+    expect(formatObjectInspector(wrapper)).toMatchSnapshot();
+  });
 });