virtua 0.38.2 → 0.38.3

package/lib/solid/index.jsx

@@ -5,10 +5,6 @@ import { Dynamic } from 'solid-js/web';
 const NULL = null;
 /** @internal */
 const { min, max, abs, floor } = Math;
-/** @internal */
-const values = Object.values;
-/** @internal */
-const timeout = setTimeout;
 /**
  * @internal
  */
@@ -27,26 +23,6 @@ const microtask = typeof queueMicrotask === "function"
     : (fn) => {
         Promise.resolve().then(fn);
     };
-/**
- * @internal
- */
-const debounce = (fn, ms) => {
-    let id;
-    const cancel = () => {
-        if (id != NULL) {
-            clearTimeout(id);
-        }
-    };
-    const debouncedFn = () => {
-        cancel();
-        id = timeout(() => {
-            id = NULL;
-            fn();
-        }, ms);
-    };
-    debouncedFn._cancel = cancel;
-    return debouncedFn;
-};
 /**
  * @internal
  */
@@ -61,17 +37,6 @@ const once = (fn) => {
         return cache;
     };
 };
-/**
- * @internal
- */
-const getStyleNumber = (v) => {
-    if (v) {
-        return parseFloat(v);
-    }
-    else {
-        return 0;
-    }
-};
 
 /** @internal */
 const UNCACHED = -1;
@@ -598,6 +563,24 @@ const createVirtualStore = (elementsCount, itemSize = 40, overscan = 4, ssrCount
     };
 };
 
+const timeout = setTimeout;
+const debounce = (fn, ms) => {
+    let id;
+    const cancel = () => {
+        if (id != NULL) {
+            clearTimeout(id);
+        }
+    };
+    const debouncedFn = () => {
+        cancel();
+        id = timeout(() => {
+            id = NULL;
+            fn();
+        }, ms);
+    };
+    debouncedFn._cancel = cancel;
+    return debouncedFn;
+};
 /**
  * scrollLeft is negative value in rtl direction.
  *
@@ -984,27 +967,21 @@ const createWindowScroller = (store, isHorizontal) => {
             }
             const document = getCurrentDocument(containerElement);
             const window = getCurrentWindow(document);
+            const html = document.documentElement;
+            const getScrollbarSize = () => store.$getViewportSize() -
+                (isHorizontal ? html.clientWidth : html.clientHeight);
             scheduleImperativeScroll(() => {
-                // Calculate target scroll position including container's offset from document
-                const containerOffset = calcOffsetToViewport(containerElement, document.body, window, isHorizontal);
-                // slight tech debt: this would otherwise need to be accounted for in store._getViewportSize in a way that's flexible for windowScroller
-                const scrollbarHeight = window.innerHeight - document.documentElement.clientHeight;
-                const scrollbarWidth = window.innerHeight - document.documentElement.clientWidth;
-                const viewportAdjustment = align === "end" || align === "center"
-                    ? isHorizontal
-                        ? scrollbarWidth
-                        : scrollbarHeight
-                    : 0;
                 return (offset +
-                    containerOffset +
+                    // Calculate target scroll position including container's offset from document
+                    calcOffsetToViewport(containerElement, document.body, window, isHorizontal) +
                     // store._getStartSpacerSize() +
                     store.$getItemOffset(index) +
                     (align === "end"
                         ? store.$getItemSize(index) -
-                            (store.$getViewportSize() - viewportAdjustment)
+                            (store.$getViewportSize() - getScrollbarSize())
                         : align === "center"
                             ? (store.$getItemSize(index) -
-                                (store.$getViewportSize() - viewportAdjustment)) /
+                                (store.$getViewportSize() - getScrollbarSize())) /
                                 2
                             : 0));
             }, smooth);