Merge branch 'master' into ListGroupItem

LiJinyao · web-flow · commit d09e81aebf7e · 2016-10-24T20:00:40.000+08:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,13 @@
+<a name="3.6.0"></a>
+# [3.6.0](https://github.com/reactstrap/reactstrap/compare/3.5.0...v3.6.0) (2016-10-23)
+
+
+### Features
+
+* **DropdownToggle:** add nav prop to enable Nav specific functionality ([#197](https://github.com/reactstrap/reactstrap/issues/197))([9b28cbc](https://github.com/reactstrap/reactstrap/commit/9b28cbc))
+
+
+
 <a name="3.5.0"></a>
 # [3.5.0](https://github.com/reactstrap/reactstrap/compare/3.4.1...v3.5.0) (2016-10-18)
 
diff --git a/docs/lib/Components/DropdownsPage.js b/docs/lib/Components/DropdownsPage.js
@@ -69,7 +69,8 @@ DropdownToggle.propTypes = {
   onClick: PropTypes.func,
   'data-toggle': PropTypes.string,
   'aria-haspopup': PropTypes.bool,
-
+  // For DropdownToggle usage inside a Nav
+  nav: PropTypes.bool,
   // Defaults to Button component
   tag: PropTypes.any
 };`}
diff --git a/docs/lib/examples/NavPills.js b/docs/lib/examples/NavPills.js
@@ -25,8 +25,8 @@ export default class Example extends React.Component {
             <NavLink href="#" active>Link</NavLink>
           </NavItem>
           <NavDropdown isOpen={this.state.dropdownOpen} toggle={this.toggle}>
-            <DropdownToggle caret>
-              <NavLink href="#">Dropdown</NavLink>
+            <DropdownToggle nav caret>
+              Dropdown
             </DropdownToggle>
             <DropdownMenu>
               <DropdownItem header>Header</DropdownItem>
diff --git a/docs/lib/examples/NavTabs.js b/docs/lib/examples/NavTabs.js
@@ -25,8 +25,8 @@ export default class Example extends React.Component {
             <NavLink href="#" active>Link</NavLink>
           </NavItem>
           <NavDropdown isOpen={this.state.dropdownOpen} toggle={this.toggle}>
-            <DropdownToggle caret>
-              <NavLink href="#">Dropdown</NavLink>
+            <DropdownToggle nav caret>
+              Dropdown
             </DropdownToggle>
             <DropdownMenu>
               <DropdownItem header>Header</DropdownItem>
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "reactstrap",
-  "version": "3.5.0",
+  "version": "3.6.0",
   "description": "React Bootstrap 4 components compatible with React 0.14.x and 15.x",
   "main": "lib/index.js",
   "scripts": {
diff --git a/src/DropdownToggle.js b/src/DropdownToggle.js
@@ -11,7 +11,8 @@ const propTypes = {
   'data-toggle': PropTypes.string,
   'aria-haspopup': PropTypes.bool,
   split: PropTypes.bool,
-  tag: PropTypes.oneOfType([PropTypes.func, PropTypes.string])
+  tag: PropTypes.oneOfType([PropTypes.func, PropTypes.string]),
+  nav: PropTypes.bool
 };
 
 const defaultProps = {
@@ -39,6 +40,10 @@ class DropdownToggle extends React.Component {
       return;
     }
 
+    if (this.props.nav) {
+      e.preventDefault();
+    }
+
     if (this.props.onClick) {
       this.props.onClick(e);
     }
@@ -47,18 +52,24 @@ class DropdownToggle extends React.Component {
   }
 
   render() {
-    const { className, caret, split, tag: Tag, ...props } = this.props;
+    const { className, caret, split, nav, tag: Tag, ...props } = this.props;
     const ariaLabel = props['aria-label'] || 'Toggle Dropdown';
     const classes = classNames(
       className,
       {
         'dropdown-toggle': caret || split,
         'dropdown-toggle-split': split,
         active: this.context.isOpen,
+        'nav-link': nav
       }
     );
     const children = props.children || <span className="sr-only">{ariaLabel}</span>;
 
+    if (nav) {
+      props.tag = 'a';
+      props.href = '#';
+    }
+
     return (
       <Tag
         {...props}
diff --git a/src/__tests__/DropdownToggle.spec.js b/src/__tests__/DropdownToggle.spec.js
@@ -153,4 +153,38 @@ describe('DropdownToggle', () => {
       expect(e.preventDefault).toHaveBeenCalled();
     });
   });
+
+  describe('nav', () => {
+    it('should add .nav-link class', () => {
+      const wrapper = mount(
+        <DropdownToggle nav>Ello world</DropdownToggle>,
+        {
+          context: {
+            isOpen: isOpen,
+            toggle: toggle
+          }
+        }
+      );
+
+      expect(wrapper.find('a').length).toBe(1);
+      expect(wrapper.find('.nav-link').length).toBe(1);
+    });
+
+    it('should preventDefault', () => {
+      const e = { preventDefault: jasmine.createSpy('preventDefault') };
+      const wrapper = mount(
+        <DropdownToggle nav>Ello world</DropdownToggle>,
+        {
+          context: {
+            isOpen: isOpen,
+            toggle: toggle
+          }
+        }
+      );
+      const instance = wrapper.instance();
+
+      instance.onClick(e);
+      expect(e.preventDefault).toHaveBeenCalled();
+    });
+  });
 });

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "reactstrap",`
`3`		`- "version": "3.5.0",`
	`3`	`+ "version": "3.6.0",`
`4`	`4`	`"description": "React Bootstrap 4 components compatible with React 0.14.x and 15.x",`
`5`	`5`	`"main": "lib/index.js",`
`6`	`6`	`"scripts": {`