random-mirrors/gab-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
• Updated:
- PillItem, TabBarItem to check if isCurrent on component mount, update
This commit is contained in:
mgabdev 2020-07-24 20:18:07 -05:00
parent 05d26a0efc
commit 6faa9eb48a
2 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/javascript/gabsocial/components/pill_item.js
View File

@ -19,15 +19,23 @@ class PillItem extends PureComponent {
isCurrent: false, isCurrent: false,
} }
componentDidMount() {
this.checkIfCurrent()
}
componentDidUpdate(prevProps) { componentDidUpdate(prevProps) {
if (prevProps.location !== this.props.location) {
this.checkIfCurrent()
}
}
checkIfCurrent() {
// If user navigates to different page, ensure tab bar item // If user navigates to different page, ensure tab bar item
// with this.props.to that is on location is set to active. // 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) { if (this.state.isCurrent !== isCurrent) {
this.setState({ isCurrent }) this.setState({ isCurrent })
}
} }
} }

18
app/javascript/gabsocial/components/tab_bar_item.js
View File

@ -27,15 +27,23 @@ class TabBarItem extends PureComponent {
isCurrent: false, isCurrent: false,
} }
componentDidMount() {
this.checkIfCurrent()
}
componentDidUpdate(prevProps) { componentDidUpdate(prevProps) {
if (prevProps.location !== this.props.location) {
this.checkIfCurrent()
}
}
checkIfCurrent() {
// If user navigates to different page, ensure tab bar item // If user navigates to different page, ensure tab bar item
// with this.props.to that is on location is set to active. // 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) { if (this.state.isCurrent !== isCurrent) {
this.setState({ isCurrent }) this.setState({ isCurrent })
}
} }
} }