Fix code readability, use PureComponent over Component

feature/default_network_editable
Alexander Tseung 6 years ago
parent 01c0c98501
commit d7d141cea5
  1. 2
      ui/app/components/page-container/page-container-header/page-container-header.component.js
  2. 39
      ui/app/components/page-container/page-container.component.js
  3. 9
      ui/app/components/tabs/tab/tab.component.js

@ -47,7 +47,7 @@ export default class PageContainerHeader extends Component {
<div className={ <div className={
classnames( classnames(
'page-container__header', 'page-container__header',
tabs && 'page-container__header--no-padding-bottom' { 'page-container__header--no-padding-bottom': Boolean(tabs) }
) )
}> }>

@ -1,10 +1,10 @@
import React, { Component } from 'react' import React, { PureComponent } from 'react'
import PropTypes from 'prop-types' import PropTypes from 'prop-types'
import PageContainerHeader from './page-container-header' import PageContainerHeader from './page-container-header'
import PageContainerFooter from './page-container-footer' import PageContainerFooter from './page-container-footer'
export default class PageContainer extends Component { export default class PageContainer extends PureComponent {
static propTypes = { static propTypes = {
// PageContainerHeader props // PageContainerHeader props
backButtonString: PropTypes.string, backButtonString: PropTypes.string,
@ -28,25 +28,11 @@ export default class PageContainer extends Component {
} }
state = { state = {
activeTabIndex: 0, activeTabIndex: this.props.defaultActiveTabIndex || 0,
} }
componentDidMount () { handleTabClick (activeTabIndex) {
const { defaultActiveTabIndex } = this.props this.setState({ activeTabIndex })
if (defaultActiveTabIndex) {
this.setState({ activeTabIndex: defaultActiveTabIndex })
}
}
handleTabClick (tabIndex) {
const { activeTabIndex } = this.state
if (tabIndex !== activeTabIndex) {
this.setState({
activeTabIndex: tabIndex,
})
}
} }
renderTabs () { renderTabs () {
@ -58,12 +44,12 @@ export default class PageContainer extends Component {
const numberOfTabs = React.Children.count(tabsComponent.props.children) const numberOfTabs = React.Children.count(tabsComponent.props.children)
return React.Children.map(tabsComponent.props.children, (child, index) => { return React.Children.map(tabsComponent.props.children, (child, tabIndex) => {
return child && React.cloneElement(child, { return child && React.cloneElement(child, {
onClick: index => this.handleTabClick(index), onClick: index => this.handleTabClick(index),
tabIndex: index, tabIndex,
isActive: numberOfTabs > 1 && index === this.state.activeTabIndex, isActive: numberOfTabs > 1 && tabIndex === this.state.activeTabIndex,
key: index, key: tabIndex,
className: 'page-container__tab', className: 'page-container__tab',
activeClassName: 'page-container__tab--selected', activeClassName: 'page-container__tab--selected',
}) })
@ -83,12 +69,11 @@ export default class PageContainer extends Component {
renderContent () { renderContent () {
const { contentComponent, tabsComponent } = this.props const { contentComponent, tabsComponent } = this.props
switch (true) { if (contentComponent) {
case Boolean(contentComponent):
return contentComponent return contentComponent
case Boolean(tabsComponent): } else if (tabsComponent) {
return this.renderActiveTabContent() return this.renderActiveTabContent()
default: } else {
return null return null
} }
} }

@ -8,8 +8,8 @@ const Tab = props => {
return ( return (
<li <li
className={classnames( className={classnames(
className || 'tab', className,
isActive && (activeClassName || 'tab--active'), { [activeClassName]: isActive },
)} )}
onClick={event => { onClick={event => {
event.preventDefault() event.preventDefault()
@ -30,4 +30,9 @@ Tab.propTypes = {
activeClassName: PropTypes.string, activeClassName: PropTypes.string,
} }
Tab.defaultProps = {
className: 'tab',
activeClassName: 'tab--active',
}
export default Tab export default Tab

Loading…
Cancel
Save