Skip to content

replace pushState with replaceState to address navigation issues #671

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Lazy-poet wants to merge 1 commit into
base: master
Choose a base branch
from
Open

replace pushState with replaceState to address navigation issues #671

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 23 additions & 14 deletions public/js/sidebar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ export default class extends Component {
this.handleQueryIndexChange = this.handleQueryIndexChange.bind(this);
this.isElementInViewPort = this.isElementInViewPort.bind(this);
this.setVisibleQueryIndex = this.setVisibleQueryIndex.bind(this);
this.animateScroll = this.animateScroll.bind(this);
this.debounceScrolling = this.debounceScrolling.bind(this);
this.scrollListener = this.scrollListener.bind(this);
this.copyURL = this.copyURL.bind(this);
Expand Down Expand Up @@ -56,7 +57,7 @@ export default class extends Component {
this.setState({ queryIndex: index + 1 });
}
window.addEventListener('scroll', this.scrollListener);
$('a[href^="#Query_"]').on('click', this.animateAnchorElements);
$('a[href^="#Query_"]').on('click', this.animateScroll);
}
componentWillUnmount() {
window.removeEventListener('scroll', this.scrollListener);
Expand Down Expand Up @@ -99,25 +100,34 @@ export default class extends Component {
let hash = `#Query_${queryIndex}`;
// if we can guarantee that the browser can handle change in url hash without the page jumping,
// then we update the url hash after scroll. else, hash is only updated on click of next or prev button
if (window.history.pushState) {
window.history.pushState(null, null, hash);
}
this.replaceUrlHash(hash);
this.setState({ queryIndex });
}
}
animateAnchorElements(e) {
// allow normal behavior in test mode to prevent warnings or errors from jquery

replaceUrlHash(hash) {
if (window.history.replaceState) {
window.history.replaceState(null, null, hash);
} else {
window.location.hash = hash;
}
}

/**
* this method is called on the element to be brought to the top of the page and animates the scroll process
* @param {*} e target element
*/
animateScroll(e) {
// allow normal scroll behavior in test mode to prevent warnings or errors from jquery
if (isTestMode()) return;
e.preventDefault();
const hash = e.target.hash;
$('html, body').animate({
scrollTop: $(this.hash).offset().top
scrollTop: $(hash).offset().top
}, 300);
if (window.history.pushState) {
window.history.pushState(null, null, this.hash);
} else {
window.location.hash = this.hash;
}
this.replaceUrlHash(hash);
}

isElementInViewPort(elem) {
const { top, left, right, bottom } = elem.getBoundingClientRect();
return (
Expand Down Expand Up @@ -146,8 +156,7 @@ export default class extends Component {
anchorEl.setAttribute('href', '#Query_' + this.props.data.queries[nextQuery - 1].number);
anchorEl.setAttribute('hidden', true);
document.body.appendChild(anchorEl);
// add smooth scrolling animation with jquery
$(anchorEl).on('click', this.animateAnchorElements);
$(anchorEl).on('click', this.animateScroll);
anchorEl.click();
document.body.removeChild(anchorEl);
this.setState({ queryIndex: nextQuery });
Expand Down
Loading