fix(Checkbox): group didn't honor children's indeternimated state

alibaba-fusion · Jan 30, 2019 · f90a747 · f90a747
1 parent 602b267
commit f90a747
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 14 deletions.
diff --git a/src/checkbox/checkbox.jsx b/src/checkbox/checkbox.jsx
@@ -94,23 +94,21 @@ class Checkbox extends UIState {
         super(props);
 
         let checked, indeterminate;
-        if (context.__group__) {
-            indeterminate = false;
-            checked = isChecked(context.selectedValue, props.value);
-        } else {
-            if ('checked' in props) {
-                checked = props.checked;
-            } else {
-                checked = props.defaultChecked;
-            }
 
-            if ('indeterminate' in props) {
-                indeterminate = props.indeterminate;
-            } else {
-                indeterminate = props.defaultIndeterminate;
-            }
+        if ('checked' in props) {
+            checked = props.checked;
+        } else {
+            checked = props.defaultChecked;
         }
 
+        if ('indeterminate' in props) {
+            indeterminate = props.indeterminate;
+        } else {
+            indeterminate = props.defaultIndeterminate;
+        }
+        if (context.__group__) {
+            checked = isChecked(context.selectedValue, props.value);
+        }
         this.state = {
             checked,
             indeterminate

diff --git a/test/checkbox/group-spec.js b/test/checkbox/group-spec.js
@@ -142,4 +142,15 @@ describe('Checkbox.Group', () => {
             assert.deepEqual(wrapper.dive().state().value, [1]);
         });
     });
+
+    describe('should respect children\'s indeternimate state', () => {
+        it('should support value === 0', () => {
+
+            const wrapper1 = mount(<CheckboxGroup ><Checkbox defaultIndeterminate={true} >1</Checkbox></CheckboxGroup>);
+            const wrapper2 = mount(<CheckboxGroup ><Checkbox indeterminate={true} >1</Checkbox></CheckboxGroup>);
+
+            assert(wrapper1.find('.indeterminate').length === 1);
+            assert(wrapper2.find('.indeterminate').length === 1);
+        });
+    });
 });