Move resetCounter to main package

Author: danez

src/components/Tabs.js

@@ -1,9 +1,11 @@
 import PropTypes from 'prop-types';
 import React, { cloneElement, Component } from 'react';
 import cx from 'classnames';
-import uuid, { reset } from '../helpers/uuid';
+import uuid from '../helpers/uuid';
 import childrenPropType from '../helpers/childrenPropType';
 import Tab from './Tab';
+import TabList from './TabList';
+import TabPanel from './TabPanel';
 
 // Determine if a node from event.target is a Tab element
 function isTabNode(node) {
@@ -43,10 +45,6 @@ export default class Tabs extends Component {
     this.state = Tabs.copyPropsToState(this.props, this.state);
   }
 
-  static resetIDCounter() {
-    reset();
-  }
-
   getChildContext() {
     return {
       forceRenderTabPanel: this.props.forceRenderTabPanel,
@@ -148,7 +146,6 @@ export default class Tabs extends Component {
 
   getChildren() {
     let index = 0;
-    let count = 0;
     const children = this.props.children;
     const state = this.state;
     this.tabIds = this.tabIds || [];
@@ -171,10 +168,10 @@ export default class Tabs extends Component {
         return null;
       }
 
-      let result = null;
+      let result = child;
 
       // Clone TabList and Tab components to have refs
-      if (count++ === 0) {
+      if (child.type === TabList) {
         // TODO try setting the uuid in the "constructor" for `Tab`/`TabPanel`
         result = cloneElement(child, {
           children: React.Children.map(child.props.children, (tab) => {
@@ -211,7 +208,7 @@ export default class Tabs extends Component {
 
         // Reset index for panels
         index = 0;
-      } else {
+      } else if (child.type === TabPanel) {
         const id = this.panelIds[index];
         const tabId = this.tabIds[index];
         const selected = state.selectedIndex === index;

src/components/__tests__/Tabs-test.js

@@ -6,6 +6,7 @@ import Tab from '../Tab';
 import TabList from '../TabList';
 import TabPanel from '../TabPanel';
 import Tabs from '../Tabs';
+import { reset as resetIdCounter } from '../../helpers/uuid';
 
 function createTabs(props = {
   selectedIndex: 0,
@@ -113,7 +114,7 @@ describe('<Tabs />', () => {
     it('should reset ids correctly', () => {
       mount(createTabs());
 
-      Tabs.resetIDCounter();
+      resetIdCounter();
 
       const wrapper = mount(createTabs());
       const tablist = wrapper.childAt(0);

src/main.js

@@ -2,10 +2,12 @@ import Tabs from './components/Tabs';
 import TabList from './components/TabList';
 import Tab from './components/Tab';
 import TabPanel from './components/TabPanel';
+import { reset as resetIdCounter } from './helpers/uuid';
 
 export {
   Tab,
   TabList,
   TabPanel,
   Tabs,
+  resetIdCounter,
 };