virtua 0.50.4 → 0.50.6

package/lib/solid/index.jsx

@@ -9,6 +9,7 @@ var sort = (arr) => {
 	return [...arr].sort((a, b) => a - b);
 };
 var timeout = setTimeout;
+var cancelTimeout = clearTimeout;
 var microtask = typeof queueMicrotask === "function" ? queueMicrotask : (fn) => {
 	Promise.resolve().then(fn);
 };
@@ -389,7 +390,9 @@ var createListLayout = (length, itemSize, snapshot) => {
 			const measuredSizes = [];
 			sizes.forEach((s, i) => {
 				if (s !== -1) {
-					measuredSizes.push(s);
+					if (s) {
+						measuredSizes.push(s);
+					}
 					if (i < startIndex) {
 						measuredCountBeforeStart++;
 					}
@@ -423,42 +426,30 @@ var createResizeObserver = (cb) => {
 		}
 	};
 };
-var 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;
-};
 var normalizeScrollOffset = (offset, isNegative) => {
 	return isNegative ? -offset : offset;
 };
 var createScrollObserver = (store, viewport, isHorizontal, getScrollOffset, updateScrollOffset, getStartOffset) => {
-	const now = Date.now;
 	let lastScrollTime = 0;
 	let wheeling = false;
 	let touching = false;
 	let justTouchEnded = false;
 	let stillMomentumScrolling = false;
-	const onScrollEnd = debounce(() => {
+	let scrollEndTimer;
+	const now = Date.now;
+	const onScrollEnd = () => {
 		if (wheeling || touching) {
 			wheeling = false;
-			onScrollEnd();
+			scheduleScrollEnd();
 			return;
 		}
 		justTouchEnded = false;
 		store.$update(2);
-	}, 150);
+	};
+	const scheduleScrollEnd = () => {
+		cancelTimeout(scrollEndTimer);
+		scrollEndTimer = timeout(onScrollEnd, 150);
+	};
 	const onScroll = () => {
 		lastScrollTime = now();
 		if (justTouchEnded) {
@@ -468,7 +459,7 @@ var createScrollObserver = (store, viewport, isHorizontal, getScrollOffset, upda
 			store.$update(6, getStartOffset());
 		}
 		store.$update(1, getScrollOffset());
-		onScrollEnd();
+		scheduleScrollEnd();
 	};
 	const onWheel = ((e) => {
 		if (wheeling || !store.$isScrolling() || e.ctrlKey) {
@@ -499,7 +490,7 @@ var createScrollObserver = (store, viewport, isHorizontal, getScrollOffset, upda
 			viewport.removeEventListener("wheel", onWheel);
 			viewport.removeEventListener("touchstart", onTouchStart);
 			viewport.removeEventListener("touchend", onTouchEnd);
-			onScrollEnd._cancel();
+			cancelTimeout(scrollEndTimer);
 		},
 		_fixScrollJump: () => {
 			const [jump, shift] = store._flushJump();
@@ -524,57 +515,56 @@ var createScrollScheduler = (store, initialized, scroll) => {
 		if (cancelScroll) {
 			cancelScroll();
 		}
-		const waitForMeasurement = () => {
-			const [promise, resolve] = createPromise();
-			cancelScroll = () => {
-				resolve(false);
-			};
+		let stopped;
+		let timerId;
+		let unsubscribe;
+		const isSmooth = smooth && isSmoothScrollSupported();
+		const stop = cancelScroll = () => {
+			stopped = true;
+			cancelTimeout(timerId);
+			unsubscribe && unsubscribe();
+		};
+		const onMeasured = () => {
+			if (stopped) {
+				return;
+			}
 			if (store.$getViewportSize()) {
-				timeout(cancelScroll, 150);
+				cancelTimeout(timerId);
+				timerId = timeout(stop, 150);
 			}
-			return [promise, store.$subscribe(2, () => {
-				resolve(true);
-			})];
-		};
-		if (smooth && isSmoothScrollSupported()) {
-			store.$update(8, getTargetOffset());
-			microtask(async () => {
-				while (true) {
-					let done = true;
-					for (let [i, end] = store.$getRange(); i <= end; i++) {
-						if (store.$isUnmeasuredItem(i)) {
-							done = false;
-							break;
-						}
-					}
-					if (done) {
-						break;
-					}
-					const [promise, unsubscribe] = waitForMeasurement();
-					try {
-						if (!await promise) {
-							return;
-						}
-					} finally {
-						unsubscribe();
-					}
-				}
-				store.$update(7);
-				scroll(getTargetOffset(), smooth);
-			});
-		} else {
-			while (true) {
-				const [promise, unsubscribe] = waitForMeasurement();
-				try {
-					store.$update(7);
-					scroll(getTargetOffset());
-					if (!await promise) {
+			if (isSmooth) {
+				for (let [i, end] = store.$getRange(0); i <= end; i++) {
+					if (store.$isUnmeasuredItem(i)) {
 						return;
 					}
-				} finally {
-					unsubscribe();
 				}
+				stop();
+			}
+			store.$update(7);
+			scroll(getTargetOffset(), isSmooth);
+		};
+		const start = () => {
+			if (stopped) {
+				return;
 			}
+			let queued;
+			unsubscribe = store.$subscribe(2, () => {
+				if (queued) {
+					return;
+				}
+				queued = true;
+				microtask(() => {
+					queued = false;
+					onMeasured();
+				});
+			});
+			onMeasured();
+		};
+		if (isSmooth) {
+			store.$update(8, getTargetOffset());
+			microtask(start);
+		} else {
+			start();
 		}
 	}, () => {
 		cancelScroll && cancelScroll();
@@ -654,8 +644,8 @@ var createContainerDriver = (store, isHorizontal) => {
 			};
 		},
 		$isNegative: () => isNegative,
-		$scheduleScroll: scheduleScroll,
-		$fixScrollJump() {
+		$scroll: scheduleScroll,
+		$effect() {
 			scrollObserver && scrollObserver._fixScrollJump();
 		},
 		$getBaseOffset: store.$getStartSpacerSize,
@@ -748,8 +738,8 @@ var createWindowDriver = (store, isHorizontal) => {
 			};
 		},
 		$isNegative: () => isNegative,
-		$scheduleScroll: scheduleScroll,
-		$fixScrollJump() {
+		$scroll: scheduleScroll,
+		$effect() {
 			scrollObserver && scrollObserver._fixScrollJump();
 		},
 		$getBaseOffset() {
@@ -920,20 +910,19 @@ var createContainerGridDriver = (rowStore, colStore) => {
 			colStore.$update(3, cols);
 		},
 		$isNegative: () => isNegative,
-		$scheduleScrollX: scheduleScrollX,
-		$scheduleScrollY: scheduleScrollY,
-		$fixScrollJump() {
+		$scrollX: scheduleScrollX,
+		$scrollY: scheduleScrollY,
+		$effect() {
 			rowScrollObserver && rowScrollObserver._fixScrollJump();
 			colScrollObserver && colScrollObserver._fixScrollJump();
-		},
-		$getBaseOffset: (isHorizontal) => (isHorizontal ? colStore : rowStore).$getStartSpacerSize()
+		}
 	};
 };
 
 //#endregion
 //#region src/core/scroll-to.ts
 var scrollTo = (driver, offset) => {
-	driver.$scheduleScroll(() => offset);
+	driver.$scroll(() => offset);
 };
 var scrollBy = (driver, store, offset) => {
 	scrollTo(driver, offset + store.$getScrollOffset());
@@ -951,36 +940,36 @@ var scrollToIndex = (driver, store, index, { align, smooth, offset = 0 } = {}) =
 			return;
 		}
 	}
-	driver.$scheduleScroll(() => {
+	driver.$scroll(() => {
 		return offset + driver.$getBaseOffset() + store.$getItemOffset(index) + (align === "end" ? store.$getItemSize(index) - (store.$getViewportSize() - driver.$getScrollbarSize()) : align === "center" ? (store.$getItemSize(index) - (store.$getViewportSize() - driver.$getScrollbarSize())) / 2 : 0);
 	}, smooth);
 };
 var gridScrollTo = (driver, row, col) => {
 	if (row != null) {
-		driver.$scheduleScrollY(() => row);
+		driver.$scrollY(() => row);
 	}
 	if (col != null) {
-		driver.$scheduleScrollX(() => col);
+		driver.$scrollX(() => col);
 	}
 };
 var gridScrollBy = (driver, rowStore, colStore, row, col) => {
 	if (row != null) {
 		const target = row + rowStore.$getScrollOffset();
-		driver.$scheduleScrollY(() => target);
+		driver.$scrollY(() => target);
 	}
 	if (col != null) {
 		const target = col + colStore.$getScrollOffset();
-		driver.$scheduleScrollX(() => target);
+		driver.$scrollX(() => target);
 	}
 };
 var gridScrollToIndex = (driver, rowStore, colStore, row, col) => {
 	if (row != null) {
 		const index = clamp(row, 0, rowStore.$getItemsLength() - 1);
-		driver.$scheduleScrollY(() => driver.$getBaseOffset(false) + rowStore.$getItemOffset(index));
+		driver.$scrollY(() => rowStore.$getItemOffset(index));
 	}
 	if (col != null) {
 		const index = clamp(col, 0, colStore.$getItemsLength() - 1);
-		driver.$scheduleScrollX(() => driver.$getBaseOffset(true) + colStore.$getItemOffset(index));
+		driver.$scrollX(() => colStore.$getItemOffset(index));
 	}
 };
 
@@ -1091,7 +1080,7 @@ var Virtualizer = (props) => {
 		}
 	}));
 	createEffect(on(stateVersion, () => {
-		driver.$fixScrollJump();
+		driver.$effect();
 	}));
 	const dataSlice = createMemo(() => {
 		const count = props.data.length;
@@ -1246,7 +1235,7 @@ var WindowVirtualizer = (props) => {
 		});
 	});
 	createEffect(on(stateVersion, () => {
-		driver.$fixScrollJump();
+		driver.$effect();
 	}));
 	const dataSlice = createMemo(() => {
 		const count = props.data.length;