virtua 0.51.1 → 0.51.3

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;
@@ -572,18 +572,18 @@ var createContainerDriver = (store, isHorizontal) => {
 	let viewportElement;
 	let scrollObserver;
 	let initialized = createPromise();
-	const sizeKey = isHorizontal ? "width" : "height";
 	const mountedIndexes = new WeakMap();
 	const resizeObserver = createResizeObserver((entries) => {
 		const resizes = [];
-		for (const { target, contentRect } of entries) {
-			if (!target.offsetParent) continue;
+		for (const { target, contentRect: { width, height } } of entries) {
 			if (target === viewportElement) {
-				store.$update(4, contentRect[sizeKey]);
-			} else {
+				if (width || height) {
+					store.$update(4, isHorizontal ? width : height);
+				}
+			} else if (target.offsetParent) {
 				const index = mountedIndexes.get(target);
 				if (index != null) {
-					resizes.push([index, contentRect[sizeKey]]);
+					resizes.push([index, isHorizontal ? width : height]);
 				}
 			}
 		}
@@ -637,19 +637,17 @@ var createWindowDriver = (store, isHorizontal) => {
 	let getBaseOffset;
 	let onViewportResize;
 	let initialized = createPromise();
-	const sizeKey = isHorizontal ? "width" : "height";
 	const mountedIndexes = new WeakMap();
 	const resizeObserver = createResizeObserver((entries) => {
 		const resizes = [];
-		for (const { target, contentRect } of entries) {
+		for (const { target, contentRect: { width, height } } of entries) {
 			if (target === viewportElement) {
 				onViewportResize && onViewportResize();
-				continue;
-			}
-			if (!target.offsetParent) continue;
-			const index = mountedIndexes.get(target);
-			if (index != null) {
-				resizes.push([index, contentRect[sizeKey]]);
+			} else if (target.offsetParent) {
+				const index = mountedIndexes.get(target);
+				if (index != null) {
+					resizes.push([index, isHorizontal ? width : height]);
+				}
 			}
 		}
 		if (resizes.length) {
@@ -689,7 +687,6 @@ var createWindowDriver = (store, isHorizontal) => {
 			cleanupOnWindowResize && cleanupOnWindowResize();
 			resizeObserver._dispose();
 			scrollObserver && scrollObserver._dispose();
-			viewportElement = undefined;
 			initialized[1](false);
 			initialized = createPromise();
 		},
@@ -728,11 +725,12 @@ var createContainerGridDriver = (rowStore, colStore) => {
 		const resizedRows = new Set();
 		const resizedCols = new Set();
 		for (const { target, contentRect: { width, height } } of entries) {
-			if (!target.offsetParent) continue;
 			if (target === viewportElement) {
-				rowStore.$update(4, height);
-				colStore.$update(4, width);
-			} else {
+				if (width || height) {
+					rowStore.$update(4, height);
+					colStore.$update(4, width);
+				}
+			} else if (target.offsetParent) {
 				const cell = mountedIndexes.get(target);
 				if (cell) {
 					const [rowIndex, colIndex] = cell;
@@ -982,35 +980,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 +1035,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 +1145,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();
 		});