Browse Source

Moved the functional components back to the main file.

Snow 8 years ago
parent
commit
c1a66048d0
3 changed files with 25 additions and 26 deletions
  1. 6 6
      src/__test__/TabView.test.js
  2. 0 19
      src/components/Tabs/ContentView.js
  3. 19 1
      src/components/Tabs/TabView.jsx

+ 6 - 6
src/__test__/TabView.test.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import TabView from '../components/Tabs';
+import TabView from '../components/Tabs/TabView';
 import { shallow, mount } from 'enzyme';
 
 describe('<TabView />', () => {
@@ -26,26 +26,26 @@ describe('<TabView />', () => {
   });
 
   it('Default active content is correct', () => {
-    let data = {
+    const data = {
       tabs: ['one', 'two', 'thre'],
       content: ['1', '2', '3']
     };
     props = {
-      data: data
+      data
     };
     const tabContent = tabView().find('.tabContent');
     expect(tabContent.find('div').text()).toBe('1');
   });
 
   it('Click on the inactive tab activate the tab', () => {
-    let data = {
+    const data = {
       tabs: ['one', 'two', 'thre'],
       content: ['1', '2', '3']
     };
     props = {
-      data: data
+      data
     };
-    var tabViewWindow = tabView();
+    const tabViewWindow = tabView();
     const tab1 = tabViewWindow.find('.tab').at(1);
     const tab1Activated = tab1.simulate('click');
     expect(tab1Activated.hasClass('active')).toBe(true);

+ 0 - 19
src/components/Tabs/ContentView.js

@@ -1,19 +0,0 @@
-import React from 'react';
-
-const ContentView = props => <div className="tabContent">{props.content}</div>;
-
-const TabGroup = props => {
-  return (
-    <div className="tabGroup">
-      {props.tabs.map((tabName, id) =>
-        <button
-          onClick={() => props.handleClick(id)}
-          className={'tab ' + props.isActive(id)}
-          key={tabName}
-        >
-          {tabName}
-        </button>
-      )}
-    </div>
-  );
-};

+ 19 - 1
src/components/Tabs/TabView.jsx

@@ -1,6 +1,5 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import ContentView from './ContentView';
 
 const data = {
   tabs: ['One', 'Two', 'Three'],
@@ -11,6 +10,25 @@ const data = {
   ]
 };
 
+const ContentView = ({ content }) =>
+  <div className="tabContent">{content}</div>;
+
+const TabGroup = props => {
+  return (
+    <div className="tabGroup">
+      {props.tabs.map((tabName, id) =>
+        <button
+          onClick={() => props.handleClick(id)}
+          className={'tab ' + props.isActive(id)}
+          key={tabName}
+        >
+          {tabName}
+        </button>
+      )}
+    </div>
+  );
+};
+
 export default class TabView extends React.Component {
   static propTypes = {
     tabs: PropTypes.arrayOf(PropTypes.string),