fix: usage of story props fixes

ccontrols · Mar 3, 2020 · 6c3516d · 6c3516d
1 parent 7fabe82
commit 6c3516d
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 2 deletions.
diff --git a/core/instrument/src/babel/control-values-in-source.ts b/core/instrument/src/babel/control-values-in-source.ts
@@ -64,12 +64,17 @@ export const extractArgumentsUsage = (story: Story, args: StoryArguments) => {
       });
     },
     JSXSpreadAttribute: (path: any) => {
-      if (path.node.argument === 'Identifier') {
+      if (path.node.argument.type === 'Identifier') {
         addArgumentUsage(story, args, path.node.argument);
       }
     },
+    JSXExpressionContainer: (path: any) => {
+      if (path.node.expression.type === 'Identifier') {
+        addArgumentUsage(story, args, path.node.expression);
+      }
+    },
     ArrowFunctionExpression: (path: any) => {
-      if (path.node.body === 'Identifier') {
+      if (path.node.body.type === 'Identifier') {
         addArgumentUsage(story, args, path.node.body);
       }
     },

diff --git a/core/instrument/test/__snapshots__/prop-usage-locations.test.js.snap b/core/instrument/test/__snapshots__/prop-usage-locations.test.js.snap
@@ -121,6 +121,20 @@ Object {
             },
           },
           "name": "props",
+          "usage": Array [
+            Object {
+              "loc": Object {
+                "end": Object {
+                  "column": 25,
+                  "line": 0,
+                },
+                "start": Object {
+                  "column": 20,
+                  "line": 0,
+                },
+              },
+            },
+          ],
           "value": "props",
         },
       ],
@@ -483,6 +497,20 @@ Object {
             },
           },
           "name": "props",
+          "usage": Array [
+            Object {
+              "loc": Object {
+                "end": Object {
+                  "column": 25,
+                  "line": 0,
+                },
+                "start": Object {
+                  "column": 20,
+                  "line": 0,
+                },
+              },
+            },
+          ],
           "value": "props",
         },
       ],
@@ -576,6 +604,20 @@ Object {
             },
           },
           "name": "props",
+          "usage": Array [
+            Object {
+              "loc": Object {
+                "end": Object {
+                  "column": 36,
+                  "line": 0,
+                },
+                "start": Object {
+                  "column": 31,
+                  "line": 0,
+                },
+              },
+            },
+          ],
           "value": "props",
         },
         Object {