virtua 0.51.1 → 0.51.2

package/lib/solid/index.jsx

@@ -1,5 +1,5 @@
 import { For, createComputed, createEffect, createMemo, createSignal, mergeProps, on, onCleanup, onMount, splitProps, untrack } from "solid-js";
-import { Dynamic } from "solid-js/web";
+import { Dynamic, isServer } from "solid-js/web";
 
 //#region src/core/utils.ts
 var NULL = null;
@@ -689,7 +689,6 @@ var createWindowDriver = (store, isHorizontal) => {
 			cleanupOnWindowResize && cleanupOnWindowResize();
 			resizeObserver._dispose();
 			scrollObserver && scrollObserver._dispose();
-			viewportElement = undefined;
 			initialized[1](false);
 			initialized = createPromise();
 		},
@@ -982,35 +981,34 @@ var Virtualizer = (props) => {
 	});
 	const isScrolling = createMemo(() => stateVersion() && store.$isScrolling());
 	const totalSize = createMemo(() => stateVersion() && store.$getTotalSize());
+	const ref = props.ref;
+	if (!isServer && ref) {
+		ref({
+			get cache() {
+				return layout.$snapshot();
+			},
+			get scrollOffset() {
+				return store.$getScrollOffset();
+			},
+			get scrollSize() {
+				return getScrollSize(store);
+			},
+			get viewportSize() {
+				return store.$getViewportSize();
+			},
+			findItemIndex: store.$findItemIndex,
+			getItemOffset: store.$getItemOffset,
+			getItemSize: store.$getItemSize,
+			scrollToIndex: (index, opts) => scrollToIndex(driver, store, index, opts),
+			scrollTo: (offset) => scrollTo(driver, offset),
+			scrollBy: (offset) => scrollBy(driver, store, offset)
+		});
+		onCleanup(() => ref());
+	}
 	onMount(() => {
 		setIsSSR(false);
-		if (props.ref) {
-			props.ref({
-				get cache() {
-					return layout.$snapshot();
-				},
-				get scrollOffset() {
-					return store.$getScrollOffset();
-				},
-				get scrollSize() {
-					return getScrollSize(store);
-				},
-				get viewportSize() {
-					return store.$getViewportSize();
-				},
-				findItemIndex: store.$findItemIndex,
-				getItemOffset: store.$getItemOffset,
-				getItemSize: store.$getItemSize,
-				scrollToIndex: (index, opts) => scrollToIndex(driver, store, index, opts),
-				scrollTo: (offset) => scrollTo(driver, offset),
-				scrollBy: (offset) => scrollBy(driver, store, offset)
-			});
-		}
 		driver.$observe(containerRef, props.scrollRef);
 		onCleanup(() => {
-			if (props.ref) {
-				props.ref();
-			}
 			store.$dispose();
 			driver.$dispose();
 		});
@@ -1038,8 +1036,10 @@ var Virtualizer = (props) => {
 				mounted.add(i);
 			}
 			sort([...mounted]).forEach((index) => {
-				items.push(props.data[index]);
-				indexes.push(index);
+				if (index < count) {
+					items.push(props.data[index]);
+					indexes.push(index);
+				}
 			});
 		} else {
 			for (let [i, j] = range(); i <= j; i++) {
@@ -1146,30 +1146,29 @@ var WindowVirtualizer = (props) => {
 	});
 	const isScrolling = createMemo(() => stateVersion() && store.$isScrolling());
 	const totalSize = createMemo(() => stateVersion() && store.$getTotalSize());
+	const ref = props.ref;
+	if (!isServer && ref) {
+		ref({
+			get cache() {
+				return layout.$snapshot();
+			},
+			get scrollOffset() {
+				return store.$getScrollOffset();
+			},
+			get viewportSize() {
+				return store.$getViewportSize();
+			},
+			findItemIndex: store.$findItemIndex,
+			getItemOffset: store.$getItemOffset,
+			getItemSize: store.$getItemSize,
+			scrollToIndex: (index, opts) => scrollToIndex(driver, store, index, opts)
+		});
+		onCleanup(() => ref());
+	}
 	onMount(() => {
 		setIsSSR(false);
-		if (props.ref) {
-			props.ref({
-				get cache() {
-					return layout.$snapshot();
-				},
-				get scrollOffset() {
-					return store.$getScrollOffset();
-				},
-				get viewportSize() {
-					return store.$getViewportSize();
-				},
-				findItemIndex: store.$findItemIndex,
-				getItemOffset: store.$getItemOffset,
-				getItemSize: store.$getItemSize,
-				scrollToIndex: (index, opts) => scrollToIndex(driver, store, index, opts)
-			});
-		}
 		driver.$observe(containerRef);
 		onCleanup(() => {
-			if (props.ref) {
-				props.ref();
-			}
 			store.$dispose();
 			driver.$dispose();
 		});