Merge pull request react-bootstrap#1506 from react-bootstrap/pass-pro…

…ps-to-button [changed] dropdown props are passed through to the dropdown Button
tomlelouch · Nov 16, 2015 · 8966e7c · 8966e7c
2 parents f97afcc + 21cab20
commit 8966e7c
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 19 deletions.
diff --git a/src/DropdownButton.js b/src/DropdownButton.js
@@ -1,29 +1,39 @@
 import React from 'react';
 import Dropdown from './Dropdown';
 import omit from 'lodash-compat/object/omit';
+import pick from 'lodash-compat/object/pick';
 import Button from './Button';
 
 class DropdownButton extends React.Component {
 
   render() {
-    let { title, ...props } = this.props;
+    let { bsStyle, bsSize, disabled } = this.props;
+    let { title, children, ...props } = this.props;
 
-    let toggleProps = omit(props, Dropdown.ControlledComponent.propTypes);
+    let dropdownProps = pick(props, Object.keys(Dropdown.ControlledComponent.propTypes));
+    let toggleProps = omit(props, Object.keys(Dropdown.ControlledComponent.propTypes));
 
     return (
-      <Dropdown {...props}>
-        <Dropdown.Toggle {...toggleProps}>
+      <Dropdown {...dropdownProps}
+        bsSize={bsSize}
+        bsStyle={bsStyle}
+      >
+        <Dropdown.Toggle
+          {...toggleProps}
+          disabled={disabled}
+        >
           {title}
         </Dropdown.Toggle>
         <Dropdown.Menu>
-          {this.props.children}
+          {children}
         </Dropdown.Menu>
       </Dropdown>
     );
   }
 }
 
 DropdownButton.propTypes = {
+  disabled: React.PropTypes.bool,
   bsStyle: Button.propTypes.bsStyle,
   bsSize: Button.propTypes.bsSize,
 
@@ -37,6 +47,7 @@ DropdownButton.propTypes = {
 };
 
 DropdownButton.defaultProps = {
+  disabled: false,
   pullRight: false,
   dropup: false,
   navItem: false,

diff --git a/src/SplitButton.js b/src/SplitButton.js
@@ -2,6 +2,8 @@ import React from 'react';
 import Button from './Button';
 import Dropdown from './Dropdown';
 import SplitToggle from './SplitToggle';
+import omit from 'lodash-compat/object/omit';
+import pick from 'lodash-compat/object/pick';
 
 class SplitButton extends React.Component {
 
@@ -12,30 +14,32 @@ class SplitButton extends React.Component {
       onClick,
       target,
       href,
+      bsSize,
       bsStyle,
       ...props } = this.props;
 
     let { disabled } = props;
 
-    let button = (
-      <Button
-        onClick={onClick}
-        bsStyle={bsStyle}
-        disabled={disabled}
-        target={target}
-        href={href}
-      >
-        {title}
-      </Button>
-    );
+    let dropdownProps = pick(props, Object.keys(Dropdown.ControlledComponent.propTypes));
+    let buttonProps = omit(props, Object.keys(Dropdown.ControlledComponent.propTypes));
 
     return (
-      <Dropdown {...props}>
-        {button}
-
+      <Dropdown {...dropdownProps}>
+        <Button
+          {...buttonProps}
+          onClick={onClick}
+          bsStyle={bsStyle}
+          bsSize={bsSize}
+          disabled={disabled}
+          target={target}
+          href={href}
+        >
+          {title}
+        </Button>
         <SplitToggle
           aria-label={title}
           bsStyle={bsStyle}
+          bsSize={bsSize}
           disabled={disabled}
         />
         <Dropdown.Menu>