Merge pull request #37 from oumoussa98/patch-1

Patch 1

Author: oumoussa98

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "v3-infinite-loading",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "Infinite scroller component for vuejs-3",
   "homepage": "https://vue3-infinite-loading.netlify.app/",
   "repository": {

package.json

@@ -8,7 +8,6 @@ import {
   stateHandler,
   initEmitter,
   isVisible,
-  getScrollHeight,
 } from "../utils.js";
 
 const emit = defineEmits(["infinite"]);
@@ -38,12 +37,13 @@ const params = {
 
 const stateWatcher = () =>
   watch(state, async newVal => {
-    const parentEl = params.parentEl;
-    const prevHeight = getScrollHeight(parentEl);
+    const parentEl = params.parentEl || document.documentElement;
+    const prevHeight = parentEl.scrollHeight;
     await nextTick();
-    const currHeight = getScrollHeight(parentEl);
-    if (newVal == "loaded" && top) parentEl.scrollTop = currHeight - prevHeight;
-    if (newVal == "loaded" && isVisible(infiniteLoading.value, parentEl)) params.emit();
+    if (newVal == "loaded" && top)
+      parentEl.scrollTop = parentEl.scrollHeight - prevHeight;
+    if (newVal == "loaded" && isVisible(infiniteLoading.value, params.parentEl))
+      params.emit();
     if (newVal == "complete") stopObserver();
   });
 

src/components/InfiniteLoading.vue

@@ -27,10 +27,6 @@ const isVisible = (el, view) => {
   return elRect.top >= viewRect.top && elRect.bottom <= viewRect.bottom;
 };
 
-const getScrollHeight = el => {
-  return el?.scrollHeight || document.documentElement.scrollHeight;
-};
-
 let observer;
 const startObserver = params => {
   params.parentEl = document.querySelector(params.target) || null;
@@ -53,11 +49,4 @@ const stopObserver = () => {
   observer.disconnect();
 };
 
-export {
-  startObserver,
-  stopObserver,
-  stateHandler,
-  initEmitter,
-  isVisible,
-  getScrollHeight,
-};
+export { startObserver, stopObserver, stateHandler, initEmitter, isVisible };