Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
22 changes: 11 additions & 11 deletions packages/material-ui/src/useScrollTrigger/useScrollTrigger.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import * as React from 'react';

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) {
// Get vertical scroll
store.current = target.pageYOffset !== undefined ? target.pageYOffset : target.scrollTop;
}

if (!disableHysteresis && previous !== undefined) {
if (store.current < previous) {
Expand All @@ -23,14 +23,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
5 changes: 5 additions & 0 deletions scripts/sizeSnapshot/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,11 @@ async function getSizeLimitBundles() {
webpack: true,
path: 'packages/material-ui/build/esm/useMediaQuery/index.js',
},
{
name: '@material-ui/core/useScrollTrigger',
webpack: true,
path: 'packages/material-ui/build/esm/useScrollTrigger/index.js',
},
];
}

Expand Down