Merge pull request alibaba-fusion#1019 from xuhong/hotfix/fix_checkbo…

…x_group_indeterminate fix(Checkbox): checkbox will update indeterminate state when in group
Lucianing · Aug 21, 2019 · 2376cc6 · 2376cc6
2 parents 1b09bed + 8b9582a
commit 2376cc6
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/src/checkbox/checkbox.jsx b/src/checkbox/checkbox.jsx
@@ -138,6 +138,7 @@ class Checkbox extends UIState {
                     ),
                 });
             }
+
             this.disabled =
                 nextProps.disabled ||
                 ('disabled' in nextContext && nextContext.disabled);
@@ -147,13 +148,14 @@ class Checkbox extends UIState {
                     checked: nextProps.checked,
                 });
             }
-            if ('indeterminate' in nextProps) {
-                this.setState({
-                    indeterminate: nextProps.indeterminate,
-                });
-            }
             this.disabled = nextProps.disabled;
         }
+
+        if ('indeterminate' in nextProps) {
+            this.setState({
+                indeterminate: nextProps.indeterminate,
+            });
+        }
     }
     shouldComponentUpdate(nextProps, nextState, nextContext) {
         const { shallowEqual } = obj;