Commit 6faa9eb4 authored by mgabdev's avatar mgabdev

Updated PillItem, TabBarItem to check if isCurrent on component mount, update

• Updated:
- PillItem, TabBarItem to check if isCurrent on component mount, update
parent 05d26a0e
......@@ -19,15 +19,23 @@ class PillItem extends PureComponent {
isCurrent: false,
}
componentDidMount() {
this.checkIfCurrent()
}
componentDidUpdate(prevProps) {
if (prevProps.location !== this.props.location) {
this.checkIfCurrent()
}
}
checkIfCurrent() {
// If user navigates to different page, ensure tab bar item
// with this.props.to that is on location is set to active.
if (this.props.location !== prevProps.location) {
const isCurrent = this.props.to === this.props.location.pathname && !this.props.location.search
const isCurrent = this.props.to === this.props.location.pathname && !this.props.location.search
if (this.state.isCurrent !== isCurrent) {
this.setState({ isCurrent })
}
if (this.state.isCurrent !== isCurrent) {
this.setState({ isCurrent })
}
}
......
......@@ -27,15 +27,23 @@ class TabBarItem extends PureComponent {
isCurrent: false,
}
componentDidMount() {
this.checkIfCurrent()
}
componentDidUpdate(prevProps) {
if (prevProps.location !== this.props.location) {
this.checkIfCurrent()
}
}
checkIfCurrent() {
// If user navigates to different page, ensure tab bar item
// with this.props.to that is on location is set to active.
if (this.props.location !== prevProps.location) {
const isCurrent = this.props.to === this.props.location.pathname && !this.props.location.search
const isCurrent = this.props.to === this.props.location.pathname && !this.props.location.search
if (this.state.isCurrent !== isCurrent) {
this.setState({ isCurrent })
}
if (this.state.isCurrent !== isCurrent) {
this.setState({ isCurrent })
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment