Fix no-direct-mutation-state detection with nested components (fixes #…

…1382)
jsx-eslint · Aug 20, 2017 · 9805f70 · 9805f70
1 parent 6af4bca
commit 9805f70
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 11 deletions.
diff --git a/lib/rules/no-direct-mutation-state.js b/lib/rules/no-direct-mutation-state.js
@@ -48,23 +48,25 @@ module.exports = {
     // --------------------------------------------------------------------------
     // Public
     // --------------------------------------------------------------------------
-    let inConstructor = false;
-    let inCallExpression = false;
-
     return {
       MethodDefinition(node) {
         if (node.kind === 'constructor') {
-          inConstructor = true;
+          components.set(node, {
+            inConstructor: true
+          });
         }
       },
 
-      CallExpression: function() {
-        inCallExpression = true;
+      CallExpression: function(node) {
+        components.set(node, {
+          inCallExpression: true
+        });
       },
 
       AssignmentExpression(node) {
         let item;
-        if ((inConstructor && !inCallExpression) || !node.left || !node.left.object) {
+        const component = components.get(utils.getParentComponent());
+        if (!component || (component.inConstructor && !component.inCallExpression) || !node.left || !node.left.object) {
           return;
         }
         item = node.left;
@@ -75,7 +77,6 @@ module.exports = {
           item.object.type === 'ThisExpression' &&
           item.property.name === 'state'
         ) {
-          const component = components.get(utils.getParentComponent());
           const mutations = (component && component.mutations) || [];
           mutations.push(node.left.object);
           components.set(node, {
@@ -85,13 +86,17 @@ module.exports = {
         }
       },
 
-      'CallExpression:exit': function() {
-        inCallExpression = false;
+      'CallExpression:exit': function(node) {
+        components.set(node, {
+          inCallExpression: false
+        });
       },
 
       'MethodDefinition:exit': function (node) {
         if (node.kind === 'constructor') {
-          inConstructor = false;
+          components.set(node, {
+            inConstructor: false
+          });
         }
       },
 

diff --git a/tests/lib/rules/no-direct-mutation-state.js b/tests/lib/rules/no-direct-mutation-state.js
@@ -69,6 +69,20 @@ ruleTester.run('no-direct-mutation-state', rule, {
       '  }',
       '}'
     ].join('\n')
+  }, {
+    code: `
+      class OneComponent extends Component {
+        constructor() {
+          super();
+          class AnotherComponent extends Component {
+            constructor() {
+              super();
+            }
+          }
+          this.state = {};
+        }
+      }
+    `
   }],
 
   invalid: [{