Skip to content
Closed
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
13 changes: 10 additions & 3 deletions packages/infinite-scroll/src/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -84,13 +84,20 @@ const getScrollOptions = (el, vm) => {
}, {});
};

const getElementTop = el => el.getBoundingClientRect().top;
const getElementTop = el => getElementContainer(el).getBoundingClientRect().top;

const getElementContainer = el => el === window ? window.document.body : el;

const isElementVisible = el => {
let rect = getElementContainer(el).getBoundingClientRect();
return rect.width > 0 && rect.height > 0;
};

const handleScroll = function(cb) {
const { el, vm, container, observer } = this[scope];
const { distance, disabled } = getScrollOptions(el, vm);

if (disabled) return;
if (disabled || !isElementVisible(el)) return;

let shouldTrigger = false;

Expand Down Expand Up @@ -132,7 +139,7 @@ export default {

if (immediate) {
const observer = el[scope].observer = new MutationObserver(onScroll);
observer.observe(container, { childList: true, subtree: true });
observer.observe(getElementContainer(container), { childList: true, subtree: true });
onScroll();
}
}
Expand Down