Skip to content

[useScrollTrigger] Fix out of sync trigger #20678

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
oliviertassinari merged 4 commits into from
Apr 22, 2020
Merged

[useScrollTrigger] Fix out of sync trigger #20678

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
174ad61
Fix useScrollTrigger on page-reload behavior
Apr 21, 2020
65c5525
Format useScrollTrigger
Apr 21, 2020
c59ed2b
use a comment instead of a new function
oliviertassinari Apr 21, 2020
f47c001
strack bundle size
oliviertassinari Apr 21, 2020
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
Next Next commit
Fix useScrollTrigger on page-reload behavior
  • Loading branch information
oskar committed Apr 21, 2020
commit 174ad61f2746c52a67a0022ce77d40bdcdb0235d
17 changes: 10 additions & 7 deletions packages/material-ui/src/useScrollTrigger/useScrollTrigger.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,13 @@ function getScrollY(ref) {
return ref.pageYOffset !== undefined ? ref.pageYOffset : ref.scrollTop;
}

function defaultTrigger(event, store, options) {
const { disableHysteresis = false, threshold = 100 } = options;
function defaultTrigger(store, options) {
const { disableHysteresis = false, threshold = 100, target } = options;
const previous = store.current;
store.current = event ? getScrollY(event.currentTarget) : previous;

if (target) {
store.current = getScrollY(target);
}

if (!disableHysteresis && previous !== undefined) {
if (store.current < previous) {
Expand All @@ -23,14 +26,14 @@ const defaultTarget = typeof window !== 'undefined' ? window : null;
export default function useScrollTrigger(options = {}) {
const { getTrigger = defaultTrigger, target = defaultTarget, ...other } = options;
const store = React.useRef();
const [trigger, setTrigger] = React.useState(() => getTrigger(null, store, other));
const [trigger, setTrigger] = React.useState(() => getTrigger(store, other));

React.useEffect(() => {
const handleScroll = (event) => {
setTrigger(getTrigger(event, store, other));
const handleScroll = () => {
setTrigger(getTrigger(store, { target, ...other}));
};

handleScroll(null); // Re-evaluate trigger when dependencies change
handleScroll(); // Re-evaluate trigger when dependencies change
target.addEventListener('scroll', handleScroll);
return () => {
target.removeEventListener('scroll', handleScroll);
Expand Down