Skip to content

#9 implemented: new optional prop "target" which is the id of the scrollable container #32

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

Merged
bySabi merged 1 commit into from
Jul 3, 2018
Merged

#9 implemented: new optional prop "target" which is the id of the scrollable container #32

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
41 changes: 23 additions & 18 deletions src/helpers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,34 @@ export const animateScroll = (function () {
let timeoutId;
let resolvePrevious;

return function animateScroll (id, animate) {
return function animateScroll (id, targetId, animate) {
let targetElement = document.getElementById(targetId);
if (!targetElement) {
targetElement = 'scrollTop' in document.documentElement
? document.documentElement
: document.body;
}

function getScrollTop () {
// like jQuery -> $('html, body').scrollTop
return targetElement.scrollTop;
}

function setScrollTop (position) {
targetElement.scrollTop = position;
}

return new Promise((resolve, reject) => {
const element = id ? document.getElementById(id) : document.body;

if (!element) {
return reject(`Cannot find element: #${id}`);
}

function getOffsetTop () {
return element.getBoundingClientRect().top - targetElement.getBoundingClientRect().top + getScrollTop();
}

const { offset, duration, easing } = animate;
const start = getScrollTop();
const to = getOffsetTop(element) + offset;
Expand Down Expand Up @@ -39,29 +59,14 @@ export const animateScroll = (function () {
resolvePrevious = resolve;
animateFn();
});
}
};
})();

export function updateHistory (id) {
id = '#' + id;
if (history.pushState) {
history.pushState(null, null, id);
}
else {
} else {
location.hash = id;
}
}

function getScrollTop () {
// like jQuery -> $('html, body').scrollTop
return document.documentElement.scrollTop || document.body.scrollTop;
}

function setScrollTop (position) {
document.documentElement.scrollTop = document.body.scrollTop = position;
}

function getOffsetTop (element) {
const { top } = element.getBoundingClientRect();
return top + getScrollTop();
}
11 changes: 8 additions & 3 deletions src/scrollchor.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ export default class Scrollchor extends React.Component {
children: PropTypes.node
}

static _normalizeId (id) {
return (id && id.replace(/^#/, '')) || ''
}

static _stateHelper (props) {
const {
// default animate object
Expand All @@ -30,7 +34,8 @@ export default class Scrollchor extends React.Component {
easing = easeOutQuad
} = props.animate || {};
return {
to: (props.to && props.to.replace(/^#/, '')) || '',
to: Scrollchor._normalizeId(props.to),
target: Scrollchor._normalizeId(props.target),
animate: { offset, duration, easing },
beforeAnimate: props.beforeAnimate || function () {},
afterAnimate: props.afterAnimate || function () {},
Expand All @@ -41,7 +46,7 @@ export default class Scrollchor extends React.Component {
_handleClick = (event) => {
this.state.beforeAnimate(event);
event && event.preventDefault();
animateScroll(this.state.to, this.state.animate)
animateScroll(this.state.to, this.state.target, this.state.animate)
.then((id) => {
if (id) {
this.state.disableHistory || updateHistory(id);
Expand All @@ -59,7 +64,7 @@ export default class Scrollchor extends React.Component {
}

render () {
const { to, animate, beforeAnimate, afterAnimate, disableHistory, ...props } = this.props; // eslint-disable-line no-unused-vars
const { to, target, animate, beforeAnimate, afterAnimate, disableHistory, ...props } = this.props; // eslint-disable-line no-unused-vars

return !this.props.children
? null
Expand Down