virtua 0.50.2 → 0.50.3

package/lib/solid/index.jsx

@@ -8,6 +8,7 @@ var clamp = (value, minValue, maxValue) => min(maxValue, max(minValue, value));
 var sort = (arr) => {
 	return [...arr].sort((a, b) => a - b);
 };
+var timeout = setTimeout;
 var microtask = typeof queueMicrotask === "function" ? queueMicrotask : (fn) => {
 	Promise.resolve().then(fn);
 };
@@ -190,7 +191,7 @@ var createVirtualStore = (elementsCount, itemSize = 40, ssrCount = 0, cacheSnaps
 	let _prevRange = [0, isSSR ? max(ssrCount - 1, 0) : -1];
 	let _totalMeasuredSize = 0;
 	let _isViewportMeasured = false;
-	const cache = initCache(elementsCount, cacheSnapshot ? cacheSnapshot[1] : itemSize, cacheSnapshot && cacheSnapshot[0]);
+	const cache = initCache(elementsCount, cacheSnapshot && cacheSnapshot[1] || itemSize, cacheSnapshot && cacheSnapshot[0]);
 	const subscribers = new Set();
 	const getRelativeScrollOffset = () => scrollOffset - startSpacerSize;
 	const getVisibleOffset = () => getRelativeScrollOffset() + pendingJump + jump;
@@ -408,8 +409,21 @@ var createVirtualStore = (elementsCount, itemSize = 40, ssrCount = 0, cacheSnaps
 };
 
 //#endregion
-//#region src/core/scroller.ts
-var timeout = setTimeout;
+//#region src/core/observer.ts
+var createResizeObserver = (cb) => {
+	let ro;
+	return {
+		_observe(e) {
+			(ro || (ro = new (getCurrentWindow(getCurrentDocument(e))).ResizeObserver(cb))).observe(e);
+		},
+		_unobserve(e) {
+			ro.unobserve(e);
+		},
+		_dispose() {
+			ro && ro.disconnect();
+		}
+	};
+};
 var debounce = (fn, ms) => {
 	let id;
 	const cancel = () => {
@@ -499,6 +513,9 @@ var createScrollObserver = (store, viewport, isHorizontal, getScrollOffset, upda
 		}
 	};
 };
+
+//#endregion
+//#region src/core/driver.ts
 var createScrollScheduler = (store, initialized, scroll) => {
 	let cancelScroll;
 	return [async (getTargetOffset, smooth) => {
@@ -564,7 +581,7 @@ var createScrollScheduler = (store, initialized, scroll) => {
 		cancelScroll && cancelScroll();
 	}];
 };
-var createScroller = (store, isHorizontal) => {
+var createContainerDriver = (store, isHorizontal) => {
 	let viewportElement;
 	let scrollObserver;
 	let initialized = createPromise();
@@ -582,9 +599,28 @@ var createScroller = (store, isHorizontal) => {
 			viewportElement[scrollOffsetKey] = offset;
 		}
 	});
+	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;
+			if (target === viewportElement) {
+				store.$update(4, contentRect[sizeKey]);
+			} else {
+				const index = mountedIndexes.get(target);
+				if (index != null) {
+					resizes.push([index, contentRect[sizeKey]]);
+				}
+			}
+		}
+		if (resizes.length) {
+			store.$update(3, resizes);
+		}
+	});
 	return {
-		$observe(_, viewport) {
-			viewportElement = viewport;
+		$observe(containerElement, viewport = containerElement.parentElement) {
+			resizeObserver._observe(viewportElement = viewport);
 			if (isHorizontal) {
 				isNegative = getComputedStyle(viewport).direction === "rtl";
 			}
@@ -605,43 +641,32 @@ var createScroller = (store, isHorizontal) => {
 			initialized[1](true);
 		},
 		$dispose() {
+			resizeObserver._dispose();
 			scrollObserver && scrollObserver._dispose();
 			initialized[1](false);
 			initialized = createPromise();
 		},
-		$isNegative: () => isNegative,
-		$scrollTo(offset) {
-			scheduleScroll(() => offset);
-		},
-		$scrollBy(offset) {
-			offset += store.$getScrollOffset();
-			scheduleScroll(() => offset);
-		},
-		$scrollToIndex(index, { align, smooth, offset = 0 } = {}) {
-			index = clamp(index, 0, store.$getItemsLength() - 1);
-			if (align === "nearest") {
-				const itemOffset = store.$getItemOffset(index);
-				const scrollOffset = store.$getScrollOffset();
-				if (itemOffset < scrollOffset) {
-					align = "start";
-				} else if (itemOffset + store.$getItemSize(index) > scrollOffset + store.$getViewportSize()) {
-					align = "end";
-				} else {
-					return;
-				}
-			}
-			scheduleScroll(() => {
-				return offset + store.$getStartSpacerSize() + store.$getItemOffset(index) + (align === "end" ? store.$getItemSize(index) - store.$getViewportSize() : align === "center" ? (store.$getItemSize(index) - store.$getViewportSize()) / 2 : 0);
-			}, smooth);
+		$observeItem(el, index) {
+			mountedIndexes.set(el, index);
+			resizeObserver._observe(el);
+			return () => {
+				mountedIndexes.delete(el);
+				resizeObserver._unobserve(el);
+			};
 		},
-		$fixScrollJump: () => {
+		$isNegative: () => isNegative,
+		$scheduleScroll: scheduleScroll,
+		$fixScrollJump() {
 			scrollObserver && scrollObserver._fixScrollJump();
-		}
+		},
+		$getBaseOffset: store.$getStartSpacerSize,
+		$getScrollbarSize: () => 0
 	};
 };
-var createWindowScroller = (store, isHorizontal) => {
+var createWindowDriver = (store, isHorizontal) => {
 	let containerElement;
 	let scrollObserver;
+	let cleanupOnWindowResize;
 	let initialized = createPromise();
 	let isNegative = false;
 	const scrollToKey = isHorizontal ? "left" : "top";
@@ -657,6 +682,21 @@ var createWindowScroller = (store, isHorizontal) => {
 			window.scroll({ [scrollToKey]: offset });
 		}
 	});
+	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;
+			const index = mountedIndexes.get(target);
+			if (index != null) {
+				resizes.push([index, contentRect[sizeKey]]);
+			}
+		}
+		if (resizes.length) {
+			store.$update(3, resizes);
+		}
+	});
 	const calcOffsetToViewport = (node, viewport, window, isHorizontal, offset = 0) => {
 		const offsetKey = isHorizontal ? "offsetLeft" : "offsetTop";
 		const offsetSum = offset + (isHorizontal && isNegative ? window.innerWidth - node[offsetKey] - node.offsetWidth : node[offsetKey]);
@@ -672,6 +712,14 @@ var createWindowScroller = (store, isHorizontal) => {
 			const scrollOffsetKey = isHorizontal ? "scrollX" : "scrollY";
 			const document = getCurrentDocument(container);
 			const window = getCurrentWindow(document);
+			const onWindowResize = () => {
+				store.$update(4, window[isHorizontal ? "innerWidth" : "innerHeight"]);
+			};
+			window.addEventListener("resize", onWindowResize);
+			microtask(onWindowResize);
+			cleanupOnWindowResize = () => {
+				window.removeEventListener("resize", onWindowResize);
+			};
 			if (isHorizontal) {
 				isNegative = getComputedStyle(getDocumentElement(document)).direction === "rtl";
 			}
@@ -685,181 +733,56 @@ var createWindowScroller = (store, isHorizontal) => {
 			initialized[1](true);
 		},
 		$dispose() {
+			cleanupOnWindowResize && cleanupOnWindowResize();
+			resizeObserver._dispose();
 			scrollObserver && scrollObserver._dispose();
 			containerElement = undefined;
 			initialized[1](false);
 			initialized = createPromise();
 		},
+		$observeItem(el, index) {
+			mountedIndexes.set(el, index);
+			resizeObserver._observe(el);
+			return () => {
+				mountedIndexes.delete(el);
+				resizeObserver._unobserve(el);
+			};
+		},
 		$isNegative: () => isNegative,
-		$fixScrollJump: () => {
+		$scheduleScroll: scheduleScroll,
+		$fixScrollJump() {
 			scrollObserver && scrollObserver._fixScrollJump();
 		},
-		$scrollToIndex(index, { align, smooth, offset = 0 } = {}) {
-			if (!containerElement) return;
-			index = clamp(index, 0, store.$getItemsLength() - 1);
-			if (align === "nearest") {
-				const itemOffset = store.$getItemOffset(index);
-				const scrollOffset = store.$getScrollOffset();
-				if (itemOffset < scrollOffset) {
-					align = "start";
-				} else if (itemOffset + store.$getItemSize(index) > scrollOffset + store.$getViewportSize()) {
-					align = "end";
-				} else {
-					return;
-				}
-			}
+		$getBaseOffset() {
 			const document = getCurrentDocument(containerElement);
-			const window = getCurrentWindow(document);
-			const html = getDocumentElement(document);
-			const getScrollbarSize = () => store.$getViewportSize() - (isHorizontal ? html.clientWidth : html.clientHeight);
-			scheduleScroll(() => {
-				return offset + calcOffsetToViewport(containerElement, document.body, window, isHorizontal) + store.$getItemOffset(index) + (align === "end" ? store.$getItemSize(index) - (store.$getViewportSize() - getScrollbarSize()) : align === "center" ? (store.$getItemSize(index) - (store.$getViewportSize() - getScrollbarSize())) / 2 : 0);
-			}, smooth);
-		}
-	};
-};
-var createGridScroller = (rowStore, colStore) => {
-	const rowScroller = createScroller(rowStore, false);
-	const colScroller = createScroller(colStore, true);
-	return {
-		$observe(container, viewport) {
-			rowScroller.$observe(container, viewport);
-			colScroller.$observe(container, viewport);
-		},
-		$dispose() {
-			rowScroller.$dispose();
-			colScroller.$dispose();
-		},
-		$isNegative: colScroller.$isNegative,
-		$scrollTo(row, col) {
-			if (row != null) {
-				rowScroller.$scrollTo(row);
-			}
-			if (col != null) {
-				colScroller.$scrollTo(col);
-			}
-		},
-		$scrollBy(row, col) {
-			if (row != null) {
-				rowScroller.$scrollBy(row);
-			}
-			if (col != null) {
-				colScroller.$scrollBy(col);
-			}
-		},
-		$scrollToIndex(row, col) {
-			if (row != null) {
-				rowScroller.$scrollToIndex(row);
-			}
-			if (col != null) {
-				colScroller.$scrollToIndex(col);
-			}
-		},
-		$fixScrollJump() {
-			rowScroller.$fixScrollJump();
-			colScroller.$fixScrollJump();
-		}
-	};
-};
-
-//#endregion
-//#region src/core/resizer.ts
-var createResizeObserver = (cb) => {
-	let ro;
-	return {
-		_observe(e) {
-			(ro || (ro = new (getCurrentWindow(getCurrentDocument(e))).ResizeObserver(cb))).observe(e);
-		},
-		_unobserve(e) {
-			ro.unobserve(e);
+			return calcOffsetToViewport(containerElement, document.body, getCurrentWindow(document), isHorizontal);
 		},
-		_dispose() {
-			ro && ro.disconnect();
+		$getScrollbarSize() {
+			const html = getDocumentElement(getCurrentDocument(containerElement));
+			return store.$getViewportSize() - (isHorizontal ? html.clientWidth : html.clientHeight);
 		}
 	};
 };
-var createResizer = (store, isHorizontal) => {
+var createContainerGridDriver = (rowStore, colStore) => {
 	let viewportElement;
-	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;
-			if (target === viewportElement) {
-				store.$update(4, contentRect[sizeKey]);
-			} else {
-				const index = mountedIndexes.get(target);
-				if (index != null) {
-					resizes.push([index, contentRect[sizeKey]]);
-				}
-			}
-		}
-		if (resizes.length) {
-			store.$update(3, resizes);
+	let rowScrollObserver;
+	let colScrollObserver;
+	let initialized = createPromise();
+	let isNegative = false;
+	const [scheduleScrollX, cancelScrollX] = createScrollScheduler(colStore, () => initialized[0], (offset, smooth) => {
+		const opts = { left: normalizeScrollOffset(offset, isNegative) };
+		if (smooth) {
+			opts.behavior = "smooth";
 		}
+		viewportElement.scrollTo(opts);
 	});
-	return {
-		$observeRoot(viewport) {
-			resizeObserver._observe(viewportElement = viewport);
-		},
-		$observeItem: (el, i) => {
-			mountedIndexes.set(el, i);
-			resizeObserver._observe(el);
-			return () => {
-				mountedIndexes.delete(el);
-				resizeObserver._unobserve(el);
-			};
-		},
-		$dispose: resizeObserver._dispose
-	};
-};
-var createWindowResizer = (store, isHorizontal) => {
-	const sizeKey = isHorizontal ? "width" : "height";
-	const windowSizeKey = isHorizontal ? "innerWidth" : "innerHeight";
-	const mountedIndexes = new WeakMap();
-	const resizeObserver = createResizeObserver((entries) => {
-		const resizes = [];
-		for (const { target, contentRect } of entries) {
-			if (!target.offsetParent) continue;
-			const index = mountedIndexes.get(target);
-			if (index != null) {
-				resizes.push([index, contentRect[sizeKey]]);
-			}
-		}
-		if (resizes.length) {
-			store.$update(3, resizes);
+	const [scheduleScrollY, cancelScrollY] = createScrollScheduler(rowStore, () => initialized[0], (offset, smooth) => {
+		const opts = { top: offset };
+		if (smooth) {
+			opts.behavior = "smooth";
 		}
+		viewportElement.scrollTo(opts);
 	});
-	let cleanupOnWindowResize;
-	return {
-		$observeRoot(container) {
-			const window = getCurrentWindow(getCurrentDocument(container));
-			const onWindowResize = () => {
-				store.$update(4, window[windowSizeKey]);
-			};
-			window.addEventListener("resize", onWindowResize);
-			microtask(onWindowResize);
-			cleanupOnWindowResize = () => {
-				window.removeEventListener("resize", onWindowResize);
-			};
-		},
-		$observeItem: (el, i) => {
-			mountedIndexes.set(el, i);
-			resizeObserver._observe(el);
-			return () => {
-				mountedIndexes.delete(el);
-				resizeObserver._unobserve(el);
-			};
-		},
-		$dispose() {
-			cleanupOnWindowResize && cleanupOnWindowResize();
-			resizeObserver._dispose();
-		}
-	};
-};
-var createGridResizer = (rowStore, colStore) => {
-	let viewportElement;
 	const mountedIndexes = new WeakMap();
 	const maybeCachedRowIndexes = new Set();
 	const maybeCachedColIndexes = new Set();
@@ -936,9 +859,40 @@ var createGridResizer = (rowStore, colStore) => {
 			colStore.$update(3, widthResizes);
 		}
 	});
+	const observeAxisScroll = (store, isHorizontal, cancelScroll) => {
+		const viewport = viewportElement;
+		const scrollOffsetKey = isHorizontal ? "scrollLeft" : "scrollTop";
+		const overflowKey = isHorizontal ? "overflowX" : "overflowY";
+		const negative = isHorizontal && isNegative;
+		return createScrollObserver(store, viewport, isHorizontal, () => normalizeScrollOffset(viewport[scrollOffsetKey], negative), (jump, shift, isMomentumScrolling) => {
+			if (isMomentumScrolling) {
+				const style = viewport.style;
+				const prev = style[overflowKey];
+				style[overflowKey] = "hidden";
+				timeout(() => {
+					style[overflowKey] = prev;
+				});
+			}
+			viewport[scrollOffsetKey] = normalizeScrollOffset(store.$getScrollOffset() + jump, negative);
+			if (shift) {
+				cancelScroll();
+			}
+		});
+	};
 	return {
-		$observeRoot(viewport) {
+		$observe(containerElement, viewport = containerElement.parentElement) {
 			resizeObserver._observe(viewportElement = viewport);
+			isNegative = getComputedStyle(viewport).direction === "rtl";
+			rowScrollObserver = observeAxisScroll(rowStore, false, cancelScrollY);
+			colScrollObserver = observeAxisScroll(colStore, true, cancelScrollX);
+			initialized[1](true);
+		},
+		$dispose() {
+			resizeObserver._dispose();
+			rowScrollObserver && rowScrollObserver._dispose();
+			colScrollObserver && colScrollObserver._dispose();
+			initialized[1](false);
+			initialized = createPromise();
 		},
 		$observeItem(el, rowIndex, colIndex) {
 			mountedIndexes.set(el, [rowIndex, colIndex]);
@@ -950,6 +904,14 @@ var createGridResizer = (rowStore, colStore) => {
 				resizeObserver._unobserve(el);
 			};
 		},
+		$resizeRows(rows) {
+			for (const [r] of rows) {
+				for (let c = 0; c < colStore.$getItemsLength(); c++) {
+					sizeCache.delete(getKey(r, c));
+				}
+			}
+			rowStore.$update(3, rows);
+		},
 		$resizeCols(cols) {
 			for (const [c] of cols) {
 				for (let r = 0; r < rowStore.$getItemsLength(); r++) {
@@ -958,18 +920,71 @@ var createGridResizer = (rowStore, colStore) => {
 			}
 			colStore.$update(3, cols);
 		},
-		$resizeRows(rows) {
-			for (const [r] of rows) {
-				for (let c = 0; c < colStore.$getItemsLength(); c++) {
-					sizeCache.delete(getKey(r, c));
-				}
-			}
-			rowStore.$update(3, rows);
+		$isNegative: () => isNegative,
+		$scheduleScrollX: scheduleScrollX,
+		$scheduleScrollY: scheduleScrollY,
+		$fixScrollJump() {
+			rowScrollObserver && rowScrollObserver._fixScrollJump();
+			colScrollObserver && colScrollObserver._fixScrollJump();
 		},
-		$dispose: resizeObserver._dispose
+		$getBaseOffset: (isHorizontal) => (isHorizontal ? colStore : rowStore).$getStartSpacerSize()
 	};
 };
 
+//#endregion
+//#region src/core/scroll-to.ts
+var scrollTo = (driver, offset) => {
+	driver.$scheduleScroll(() => offset);
+};
+var scrollBy = (driver, store, offset) => {
+	scrollTo(driver, offset + store.$getScrollOffset());
+};
+var scrollToIndex = (driver, store, index, { align, smooth, offset = 0 } = {}) => {
+	index = clamp(index, 0, store.$getItemsLength() - 1);
+	if (align === "nearest") {
+		const itemOffset = store.$getItemOffset(index);
+		const scrollOffset = store.$getScrollOffset();
+		if (itemOffset < scrollOffset) {
+			align = "start";
+		} else if (itemOffset + store.$getItemSize(index) > scrollOffset + store.$getViewportSize()) {
+			align = "end";
+		} else {
+			return;
+		}
+	}
+	driver.$scheduleScroll(() => {
+		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);
+	}
+	if (col != null) {
+		driver.$scheduleScrollX(() => col);
+	}
+};
+var gridScrollBy = (driver, rowStore, colStore, row, col) => {
+	if (row != null) {
+		const target = row + rowStore.$getScrollOffset();
+		driver.$scheduleScrollY(() => target);
+	}
+	if (col != null) {
+		const target = col + colStore.$getScrollOffset();
+		driver.$scheduleScrollX(() => 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));
+	}
+	if (col != null) {
+		const index = clamp(col, 0, colStore.$getItemsLength() - 1);
+		driver.$scheduleScrollX(() => driver.$getBaseOffset(true) + colStore.$getItemOffset(index));
+	}
+};
+
 //#endregion
 //#region src/solid/ListItem.tsx
 var ListItem = (props) => {
@@ -1012,8 +1027,7 @@ var Virtualizer = (props) => {
 	const { itemSize, horizontal = false, cache } = props;
 	props = mergeProps({ as: "div" }, props);
 	const store = createVirtualStore(props.data.length, itemSize, undefined, cache, !itemSize);
-	const resizer = createResizer(store, horizontal);
-	const scroller = createScroller(store, horizontal);
+	const driver = createContainerDriver(store, horizontal);
 	const [stateVersion, setRerender] = createSignal(store.$getStateVersion());
 	store.$subscribe(1, () => {
 		setRerender(store.$getStateVersion());
@@ -1034,7 +1048,7 @@ var Virtualizer = (props) => {
 	});
 	const isScrolling = createMemo(() => stateVersion() && store.$isScrolling());
 	const totalSize = createMemo(() => stateVersion() && store.$getTotalSize());
-	const isNegative = createMemo(() => stateVersion() && scroller.$isNegative());
+	const isNegative = createMemo(() => stateVersion() && driver.$isNegative());
 	onMount(() => {
 		if (props.ref) {
 			props.ref({
@@ -1053,22 +1067,18 @@ var Virtualizer = (props) => {
 				findItemIndex: store.$findItemIndex,
 				getItemOffset: store.$getItemOffset,
 				getItemSize: store.$getItemSize,
-				scrollToIndex: scroller.$scrollToIndex,
-				scrollTo: scroller.$scrollTo,
-				scrollBy: scroller.$scrollBy
+				scrollToIndex: (index, opts) => scrollToIndex(driver, store, index, opts),
+				scrollTo: (offset) => scrollTo(driver, offset),
+				scrollBy: (offset) => scrollBy(driver, store, offset)
 			});
 		}
-		const container = containerRef;
-		const scrollable = props.scrollRef || container.parentElement;
-		resizer.$observeRoot(scrollable);
-		scroller.$observe(container, scrollable);
+		driver.$observe(containerRef, props.scrollRef);
 		onCleanup(() => {
 			if (props.ref) {
 				props.ref();
 			}
 			store.$dispose();
-			resizer.$dispose();
-			scroller.$dispose();
+			driver.$dispose();
 		});
 	});
 	createComputed(on(() => props.startMargin || 0, (value) => {
@@ -1077,7 +1087,7 @@ var Virtualizer = (props) => {
 		}
 	}));
 	createEffect(on(stateVersion, () => {
-		scroller.$fixScrollJump();
+		driver.$fixScrollJump();
 	}));
 	const dataSlice = createMemo(() => {
 		const count = props.data.length;
@@ -1120,7 +1130,7 @@ var Virtualizer = (props) => {
 		const children = createMemo(() => {
 			return untrack(() => props.children(data, index));
 		});
-		return <ListItem _as={props.item} _index={index()} _resizer={resizer.$observeItem} _offset={offset()} _hide={hide()} _children={children()} _isHorizontal={horizontal} />;
+		return <ListItem _as={props.item} _index={index()} _resizer={driver.$observeItem} _offset={offset()} _hide={hide()} _children={children()} _isHorizontal={horizontal} />;
 	};
 	return <Dynamic component={props.as} ref={containerRef} style={{
 		contain: "size style",
@@ -1178,8 +1188,7 @@ var WindowVirtualizer = (props) => {
 	let containerRef;
 	const { ref: _ref, data: _data, children: _children, itemSize, shift: _shift, horizontal = false, cache, onScrollEnd: _onScrollEnd } = props;
 	const store = createVirtualStore(props.data.length, itemSize, undefined, cache, !itemSize);
-	const resizer = createWindowResizer(store, horizontal);
-	const scroller = createWindowScroller(store, horizontal);
+	const driver = createWindowDriver(store, horizontal);
 	const [stateVersion, setRerender] = createSignal(store.$getStateVersion());
 	store.$subscribe(1, () => {
 		setRerender(store.$getStateVersion());
@@ -1200,7 +1209,7 @@ var WindowVirtualizer = (props) => {
 	});
 	const isScrolling = createMemo(() => stateVersion() && store.$isScrolling());
 	const totalSize = createMemo(() => stateVersion() && store.$getTotalSize());
-	const isNegative = createMemo(() => stateVersion() && scroller.$isNegative());
+	const isNegative = createMemo(() => stateVersion() && driver.$isNegative());
 	onMount(() => {
 		if (props.ref) {
 			props.ref({
@@ -1216,22 +1225,20 @@ var WindowVirtualizer = (props) => {
 				findItemIndex: store.$findItemIndex,
 				getItemOffset: store.$getItemOffset,
 				getItemSize: store.$getItemSize,
-				scrollToIndex: scroller.$scrollToIndex
+				scrollToIndex: (index, opts) => scrollToIndex(driver, store, index, opts)
 			});
 		}
-		resizer.$observeRoot(containerRef);
-		scroller.$observe(containerRef);
+		driver.$observe(containerRef);
 		onCleanup(() => {
 			if (props.ref) {
 				props.ref();
 			}
 			store.$dispose();
-			resizer.$dispose();
-			scroller.$dispose();
+			driver.$dispose();
 		});
 	});
 	createEffect(on(stateVersion, () => {
-		scroller.$fixScrollJump();
+		driver.$fixScrollJump();
 	}));
 	const dataSlice = createMemo(() => {
 		const count = props.data.length;
@@ -1269,7 +1276,7 @@ var WindowVirtualizer = (props) => {
 		const children = createMemo(() => {
 			return untrack(() => props.children(data, itemIndex));
 		});
-		return <ListItem _index={itemIndex()} _resizer={resizer.$observeItem} _offset={offset()} _hide={hide()} _children={children()} _isHorizontal={horizontal} />;
+		return <ListItem _index={itemIndex()} _resizer={driver.$observeItem} _offset={offset()} _hide={hide()} _children={children()} _isHorizontal={horizontal} />;
 	}}
       </For>
     </div>;