Skip to content

Commit 71b91f8

Browse files
committed
make tab reusable
1 parent dfc1800 commit 71b91f8

File tree

19 files changed

+600
-692
lines changed

19 files changed

+600
-692
lines changed

src/client/App.js

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,8 @@ import TopNavBar from './components/TopNavBar/TopNavBar';
88
import Form from './components/Form/Form';
99
import Tab from './components/Tab/Tab';
1010
import MessageComp from './components/MessageComp/MessageComp';
11-
import SettingsBar from './components/SettingsBar/SettingsBar';
12-
import Dropdown from './components/Dropdown/Dropdown';
13-
import Version from './components/Version/Version';
11+
import TabPanel from './components/Tab/TabPanel/TabPanel';
12+
import Main from './components/Main/Main';
1413

1514
import styles from './styles/App.scss';
1615
import fade from './styles/transitions/fade.scss';
@@ -21,6 +20,7 @@ const mapStateToProps = state => {
2120
showLoadingMessage: state.toggleLoadingMessage,
2221
showErrorMessage: state.toggleErrorMessage,
2322
errorMessage: state.toggleErrorMessage,
23+
currentTabIndex: state.setActiveIndex
2424
}
2525
}
2626

@@ -43,6 +43,8 @@ class App extends React.Component {
4343
fetchRequestStatus: undefined,
4444
contracts: [],
4545
}
46+
47+
this.handleMenuItemIconClick = this.handleMenuItemIconClick.bind(this);
4648
}
4749

4850
componentDidMount() {
@@ -124,7 +126,7 @@ class App extends React.Component {
124126
render() {
125127

126128
const { fetchRequestStatus, contracts, versions } = this.state;
127-
const { children, showLoadingMessage, showErrorMessage, errorMessage } = this.props;
129+
const { showLoadingMessage, showErrorMessage, errorMessage } = this.props;
128130

129131
return (
130132
<div className={styles['app']}>
@@ -174,8 +176,22 @@ class App extends React.Component {
174176
transitionLeaveTimeout={300}
175177
>
176178
{fetchRequestStatus === 'success' && contracts.length &&
177-
<Tab data={contracts} onMenuItemIconClick={this.handleMenuItemIconClick}>
178-
{children}
179+
<Tab onMenuItemIconClick={this.handleMenuItemIconClick}>
180+
{contracts.map((item, i) => {
181+
return (
182+
<TabPanel
183+
key={`id--${item.name}--${i}`}
184+
name={item.name}
185+
>
186+
<Main
187+
name={item.name}
188+
code={item.code}
189+
path={item.path}
190+
index={i}
191+
/>
192+
</TabPanel>
193+
)
194+
})}
179195
</Tab>
180196
}
181197
</CSSTransitionGroup>

src/client/components/Dropdown/Dropdown.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
background: $color-dark-grey;
77
z-index: -3;
88
opacity: 0;
9-
padding: 20px 10px 20px 10px;
9+
padding: 10px 10px 20px 10px;
1010
transition: top 0.3s, opacity 0.4s;
1111

1212
&--settings {

src/client/components/EVMTab/EVMTab.js

Lines changed: 0 additions & 56 deletions
This file was deleted.

src/client/components/EVMTab/EVMTabPanel.js

Lines changed: 0 additions & 23 deletions
This file was deleted.

src/client/components/InnerTab/InnerTab.js

Lines changed: 0 additions & 89 deletions
This file was deleted.

src/client/components/InnerTab/InnerTabPanel/InnerTabPanel.scss

Lines changed: 0 additions & 18 deletions
This file was deleted.

0 commit comments

Comments
 (0)