fix(Radio): only add tabIndex to Radio instead of all child of Group

alibaba-fusion · Jun 12, 2019 · d2054f1 · d2054f1
1 parent 499f581
commit d2054f1
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 10 deletions.
diff --git a/docs/radio/demo/useWithGrid.md b/docs/radio/demo/useWithGrid.md
@@ -69,6 +69,7 @@ class ControlApp extends React.Component {
                             <Radio value="strawberry" onClick={this.onClick} >Strawberry</Radio>
                         </Col>
                     </Row>
+                    <Row>Just simple context</Row>
                 </RadioGroup>
             </div>
         );

diff --git a/src/radio/radio-group.jsx b/src/radio/radio-group.jsx
@@ -188,16 +188,20 @@ class RadioGroup extends Component {
                         (index === 0 && !this.state.value) || checked ? 0 : -1;
                     const childrtl =
                         child.props.rtl === undefined ? rtl : child.props.rtl;
-                    return React.cloneElement(
-                        child,
-                        child.props.tabIndex === undefined
-                            ? {
-                                  checked,
-                                  tabIndex,
-                                  rtl: childrtl,
-                              }
-                            : { checked, rtl: childrtl }
-                    );
+                    if (
+                        child.type &&
+                        child.type.displayName === 'Config(Radio)'
+                    ) {
+                        return React.cloneElement(child, {
+                            checked,
+                            tabIndex,
+                            rtl: childrtl,
+                        });
+                    }
+                    return React.cloneElement(child, {
+                        checked,
+                        rtl: childrtl,
+                    });
                 }
             );
         } else {