fix(extract-component): incorrect handling of nested member expressio…

…ns. Fixes #62
wix-incubator · Mar 26, 2019 · 1840c64 · 1840c64
1 parent 63911e7
commit 1840c64
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/modules/extract-to-component.ts b/src/modules/extract-to-component.ts
@@ -45,8 +45,9 @@ export function wrapWithComponent(componentName, jsx): ProcessedSelection {
       }
     },
     MemberExpression(path) {
-      if (!path.node.wasVisited && t.isThisExpression(path.node.object.object)) {
+      if (!path.node.wasVisited) {
         if (
+          t.isThisExpression(path.node.object.object) && 
           (path.node.object.property.name === "props" ||
           path.node.object.property.name === "state")
         ) {
@@ -61,7 +62,10 @@ export function wrapWithComponent(componentName, jsx): ProcessedSelection {
           path.replaceWith(t.identifier(path.node.property.name));
 
         } else {
+          if(t.isThisExpression(path.node.object)){
             componentProperties.componentMembers.add(path.node.property.name);
+            path.replaceWith(t.identifier(path.node.property.name));
+          }
         }
         path.node.wasVisited = true;
         path.skip();