virtua 0.50.3 → 0.50.4

package/lib/solid/index.jsx

@@ -30,112 +30,6 @@ var once = (fn) => {
 	};
 };
 
-//#endregion
-//#region src/core/cache.ts
-var UNCACHED = -1;
-var fill = (array, length, prepend) => {
-	const key = prepend ? "unshift" : "push";
-	for (let i = 0; i < length; i++) {
-		array[key](-1);
-	}
-	return array;
-};
-var getItemSize = (cache, index) => {
-	const size = cache._sizes[index];
-	return size === -1 ? cache._defaultItemSize : size;
-};
-var setItemSize = (cache, index, size) => {
-	const isInitialMeasurement = cache._sizes[index] === -1;
-	cache._sizes[index] = size;
-	cache._computedOffsetIndex = min(index, cache._computedOffsetIndex);
-	return isInitialMeasurement;
-};
-var getItemOffset = (cache, index) => {
-	if (!cache._length) return 0;
-	if (cache._computedOffsetIndex >= index) {
-		return cache._offsets[index];
-	}
-	if (cache._computedOffsetIndex < 0) {
-		cache._offsets[0] = 0;
-		cache._computedOffsetIndex = 0;
-	}
-	let i = cache._computedOffsetIndex;
-	let top = cache._offsets[i];
-	while (i < index) {
-		top += getItemSize(cache, i);
-		cache._offsets[++i] = top;
-	}
-	cache._computedOffsetIndex = index;
-	return top;
-};
-var findIndex = (cache, offset, low = 0, high = cache._length - 1) => {
-	let found = low;
-	while (low <= high) {
-		const mid = floor((low + high) / 2);
-		if (getItemOffset(cache, mid) <= offset) {
-			found = mid;
-			low = mid + 1;
-		} else {
-			high = mid - 1;
-		}
-	}
-	return clamp(found, 0, cache._length - 1);
-};
-var computeRange = (cache, startOffset, endOffset, prevStartIndex) => {
-	prevStartIndex = min(prevStartIndex, cache._length - 1);
-	if (getItemOffset(cache, prevStartIndex) <= startOffset) {
-		const end = findIndex(cache, endOffset, prevStartIndex);
-		return [findIndex(cache, startOffset, prevStartIndex, end), end];
-	} else {
-		const start = findIndex(cache, startOffset, undefined, prevStartIndex);
-		return [start, findIndex(cache, endOffset, start)];
-	}
-};
-var estimateDefaultItemSize = (cache, startIndex) => {
-	let measuredCountBeforeStart = 0;
-	const measuredSizes = [];
-	cache._sizes.forEach((s, i) => {
-		if (s !== -1) {
-			measuredSizes.push(s);
-			if (i < startIndex) {
-				measuredCountBeforeStart++;
-			}
-		}
-	});
-	cache._computedOffsetIndex = -1;
-	const sorted = sort(measuredSizes);
-	const len = sorted.length;
-	const mid = len / 2 | 0;
-	const median = len % 2 === 0 ? (sorted[mid - 1] + sorted[mid]) / 2 : sorted[mid];
-	const prevDefaultItemSize = cache._defaultItemSize;
-	return ((cache._defaultItemSize = median) - prevDefaultItemSize) * max(startIndex - measuredCountBeforeStart, 0);
-};
-var initCache = (length, itemSize, sizes) => {
-	return {
-		_defaultItemSize: itemSize,
-		_sizes: sizes ? fill(sizes.slice(0, min(length, sizes.length)), max(0, length - sizes.length)) : fill([], length),
-		_length: length,
-		_computedOffsetIndex: -1,
-		_offsets: fill([], length + 1)
-	};
-};
-var takeCacheSnapshot = (cache) => {
-	return [cache._sizes.slice(), cache._defaultItemSize];
-};
-var updateCacheLength = (cache, length, isShift) => {
-	const diff = length - cache._length;
-	cache._computedOffsetIndex = isShift ? -1 : min(length - 1, cache._computedOffsetIndex);
-	cache._length = length;
-	if (diff > 0) {
-		fill(cache._offsets, diff);
-		fill(cache._sizes, diff, isShift);
-		return cache._defaultItemSize * diff;
-	} else {
-		cache._offsets.splice(diff);
-		return (isShift ? cache._sizes.splice(0, -diff) : cache._sizes.splice(diff)).reduce((acc, removed) => acc - (removed === -1 ? cache._defaultItemSize : removed), 0);
-	}
-};
-
 //#endregion
 //#region src/core/environment.ts
 var isBrowser = typeof window !== "undefined";
@@ -176,7 +70,8 @@ var UPDATE_SCROLL_END_EVENT = 8;
 var getScrollSize = (store) => {
 	return max(store.$getTotalSize(), store.$getViewportSize());
 };
-var createVirtualStore = (elementsCount, itemSize = 40, ssrCount = 0, cacheSnapshot, shouldAutoEstimateItemSize = false) => {
+var createVirtualStore = ({ $getRange: getRange, $findIndex: findIndex, $getItemOffset: getOffset, $getItemSize: getItemSize, $setItemSize: setItemSize, $isSizeEqual: isSizeEqual, $getTotalSize: getTotalSize, $getLength: getLength, $setLength: setLength, $estimateDefaultSize: estimateDefaultSize }, ssrCount = 0) => {
+	let shouldAutoEstimateItemSize = !!estimateDefaultSize;
 	let isSSR = !!ssrCount;
 	let stateVersion = 1;
 	let viewportSize = 0;
@@ -191,27 +86,16 @@ 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 subscribers = new Set();
 	const getRelativeScrollOffset = () => scrollOffset - startSpacerSize;
 	const getVisibleOffset = () => getRelativeScrollOffset() + pendingJump + jump;
-	const getRange = (startOffset, endOffset) => {
-		return computeRange(cache, startOffset, endOffset, _prevRange[0]);
-	};
-	const getTotalSize = () => getItemOffset(cache, cache._length);
-	const getItemOffset$1 = (index, fromEnd) => {
-		const offset = getItemOffset(cache, index) - pendingJump;
+	const getItemOffset = (index, fromEnd) => {
+		const offset = getOffset(index) - pendingJump;
 		if (fromEnd) {
-			return getTotalSize() - offset - getItemSize$1(index);
+			return getTotalSize() - offset - getItemSize(index);
 		}
 		return offset;
 	};
-	const getItemSize$1 = (index) => {
-		return getItemSize(cache, index);
-	};
-	const isSizeEqual = (index, value = -1) => {
-		return cache._sizes[index] === value;
-	};
 	const applyJump = (j) => {
 		if (j) {
 			if (isIOSWebKit() && _scrollDirection !== SCROLL_IDLE || _frozenRange && _scrollMode === SCROLL_BY_MANUAL_SCROLL) {
@@ -226,9 +110,6 @@ var createVirtualStore = (elementsCount, itemSize = 40, ssrCount = 0, cacheSnaps
 			subscribers.clear();
 		},
 		$getStateVersion: () => stateVersion,
-		$getCacheSnapshot: () => {
-			return takeCacheSnapshot(cache);
-		},
 		$getRange: (bufferSize = 200) => {
 			if (!_isViewportMeasured || isSSR) {
 				return _prevRange;
@@ -255,13 +136,13 @@ var createVirtualStore = (elementsCount, itemSize = 40, ssrCount = 0, cacheSnaps
 					endIndex = max(endIndex, _frozenRange[1]);
 				}
 			}
-			return [max(startIndex, 0), min(endIndex, cache._length - 1)];
+			return [max(startIndex, 0), min(endIndex, getLength() - 1)];
 		},
-		$findItemIndex: (offset) => findIndex(cache, offset - startSpacerSize),
+		$findItemIndex: (offset) => findIndex(offset - startSpacerSize),
 		$isUnmeasuredItem: isSizeEqual,
-		$getItemOffset: getItemOffset$1,
-		$getItemSize: getItemSize$1,
-		$getItemsLength: () => cache._length,
+		$getItemOffset: getItemOffset,
+		$getItemSize: getItemSize,
+		$getItemsLength: getLength,
 		$getScrollOffset: () => scrollOffset,
 		$isScrolling: () => _scrollDirection !== SCROLL_IDLE,
 		$getViewportSize: () => viewportSize,
@@ -332,24 +213,24 @@ var createVirtualStore = (elementsCount, itemSize = 40, ssrCount = 0, cacheSnaps
 							shouldKeep = index < _frozenRange[0];
 						} else {
 							const start = getRelativeScrollOffset();
-							const itemOffset = getItemOffset$1(index);
-							const itemSize = getItemSize$1(index);
+							const itemOffset = getItemOffset(index);
+							const itemSize = getItemSize(index);
 							shouldKeep = _scrollDirection !== SCROLL_DOWN && _scrollMode === SCROLL_BY_NATIVE ? itemOffset + itemSize <= start : itemOffset < start && itemOffset + itemSize < start + viewportSize;
 						}
 						if (shouldKeep) {
-							acc += size - getItemSize$1(index);
+							acc += size - getItemSize(index);
 						}
 						return acc;
 					}, 0));
 					for (const [index, size] of updated) {
-						const prevSize = getItemSize$1(index);
-						const isInitialMeasurement = setItemSize(cache, index, size);
+						const prevSize = getItemSize(index);
+						const isInitialMeasurement = setItemSize(index, size);
 						if (shouldAutoEstimateItemSize) {
 							_totalMeasuredSize += isInitialMeasurement ? size : size - prevSize;
 						}
 					}
 					if (shouldAutoEstimateItemSize && viewportSize && _totalMeasuredSize > viewportSize) {
-						applyJump(estimateDefaultItemSize(cache, findIndex(cache, getVisibleOffset())));
+						applyJump(estimateDefaultSize(findIndex(getVisibleOffset())));
 						shouldAutoEstimateItemSize = false;
 					}
 					mutated = 1 + 2;
@@ -368,11 +249,11 @@ var createVirtualStore = (elementsCount, itemSize = 40, ssrCount = 0, cacheSnaps
 				}
 				case 5: {
 					if (payload[1]) {
-						applyJump(updateCacheLength(cache, payload[0], true));
+						applyJump(setLength(payload[0], true));
 						_scrollMode = SCROLL_BY_SHIFT;
 						mutated = 1;
 					} else {
-						updateCacheLength(cache, payload[0]);
+						setLength(payload[0]);
 						mutated = 1;
 					}
 					break;
@@ -408,6 +289,124 @@ var createVirtualStore = (elementsCount, itemSize = 40, ssrCount = 0, cacheSnaps
 	};
 };
 
+//#endregion
+//#region src/core/cache.ts
+var UNCACHED = -1;
+var findIndex = (getOffset, length, offset, low = 0, high = length - 1) => {
+	let found = low;
+	while (low <= high) {
+		const mid = floor((low + high) / 2);
+		if (getOffset(mid) <= offset) {
+			found = mid;
+			low = mid + 1;
+		} else {
+			high = mid - 1;
+		}
+	}
+	return clamp(found, 0, length - 1);
+};
+
+//#endregion
+//#region src/core/layouts/list.ts
+var fill = (array, length, prepend) => {
+	const key = prepend ? "unshift" : "push";
+	for (let i = 0; i < length; i++) {
+		array[key](-1);
+	}
+	return array;
+};
+var createListLayout = (length, itemSize, snapshot) => {
+	let defaultItemSize = snapshot && snapshot[1] || itemSize || 40;
+	let computedOffsetIndex = -1;
+	let prevStartIndex = 0;
+	const restoredSizes = snapshot && snapshot[0];
+	const sizes = restoredSizes ? fill(restoredSizes.slice(0, min(length, restoredSizes.length)), max(0, length - restoredSizes.length)) : fill([], length);
+	const offsets = fill([], length + 1);
+	const getSize = (index) => {
+		const size = sizes[index];
+		return size === -1 ? defaultItemSize : size;
+	};
+	const getOffset = (index) => {
+		if (!length) return 0;
+		if (computedOffsetIndex >= index) {
+			return offsets[index];
+		}
+		if (computedOffsetIndex < 0) {
+			offsets[0] = 0;
+			computedOffsetIndex = 0;
+		}
+		let i = computedOffsetIndex;
+		let top = offsets[i];
+		while (i < index) {
+			top += getSize(i);
+			offsets[++i] = top;
+		}
+		computedOffsetIndex = index;
+		return top;
+	};
+	return {
+		$getRange: (startOffset, endOffset) => {
+			prevStartIndex = min(prevStartIndex, length - 1);
+			let start;
+			let end;
+			if (getOffset(prevStartIndex) <= startOffset) {
+				end = findIndex(getOffset, length, endOffset, prevStartIndex);
+				start = findIndex(getOffset, length, startOffset, prevStartIndex, end);
+			} else {
+				start = findIndex(getOffset, length, startOffset, undefined, prevStartIndex);
+				end = findIndex(getOffset, length, endOffset, start);
+			}
+			prevStartIndex = start;
+			return [start, end];
+		},
+		$findIndex: (offset) => findIndex(getOffset, length, offset),
+		$getItemOffset: getOffset,
+		$getItemSize: getSize,
+		$setItemSize: (index, size) => {
+			const isInitialMeasurement = sizes[index] === -1;
+			sizes[index] = size;
+			computedOffsetIndex = min(index, computedOffsetIndex);
+			return isInitialMeasurement;
+		},
+		$isSizeEqual: (index, size = -1) => sizes[index] === size,
+		$getTotalSize: () => getOffset(length),
+		$getLength: () => length,
+		$setLength: (nextLength, isShift) => {
+			const diff = nextLength - length;
+			computedOffsetIndex = isShift ? -1 : min(nextLength - 1, computedOffsetIndex);
+			length = nextLength;
+			if (diff > 0) {
+				fill(offsets, diff);
+				fill(sizes, diff, isShift);
+				return defaultItemSize * diff;
+			} else {
+				offsets.splice(diff);
+				return (isShift ? sizes.splice(0, -diff) : sizes.splice(diff)).reduce((acc, removed) => acc - (removed === -1 ? defaultItemSize : removed), 0);
+			}
+		},
+		$estimateDefaultSize: itemSize ? undefined : (startIndex) => {
+			let measuredCountBeforeStart = 0;
+			const measuredSizes = [];
+			sizes.forEach((s, i) => {
+				if (s !== -1) {
+					measuredSizes.push(s);
+					if (i < startIndex) {
+						measuredCountBeforeStart++;
+					}
+				}
+			});
+			computedOffsetIndex = -1;
+			const sorted = sort(measuredSizes);
+			const len = sorted.length;
+			const mid = len / 2 | 0;
+			const median = len % 2 === 0 ? (sorted[mid - 1] + sorted[mid]) / 2 : sorted[mid];
+			const prevDefaultItemSize = defaultItemSize;
+			return ((defaultItemSize = median) - prevDefaultItemSize) * max(startIndex - measuredCountBeforeStart, 0);
+		},
+		$snapshot: () => [sizes.slice(), defaultItemSize]
+	};
+};
+
 //#endregion
 //#region src/core/observer.ts
 var createResizeObserver = (cb) => {
@@ -996,13 +995,15 @@ var ListItem = (props) => {
 	});
 	const style = createMemo(() => {
 		const isHorizontal = props._isHorizontal;
+		const hide = props._hide;
+		const isSSR = props._isSSR;
 		const style = {
 			contain: "layout style",
-			position: "absolute",
+			position: hide && isSSR ? undefined : "absolute",
 			[isHorizontal ? "height" : "width"]: "100%",
 			[isHorizontal ? "top" : "left"]: "0px",
 			[isHorizontal ? "left" : "top"]: props._offset + "px",
-			visibility: props._hide ? "hidden" : undefined
+			visibility: !hide || isSSR ? undefined : "hidden"
 		};
 		if (isHorizontal) {
 			style.display = "inline-flex";
@@ -1024,9 +1025,11 @@ var isSameRange = (prev, next) => {
 //#region src/solid/Virtualizer.tsx
 var Virtualizer = (props) => {
 	let containerRef;
-	const { itemSize, horizontal = false, cache } = props;
+	const { itemSize, horizontal = false, cache, ssrCount } = props;
 	props = mergeProps({ as: "div" }, props);
-	const store = createVirtualStore(props.data.length, itemSize, undefined, cache, !itemSize);
+	const [isSSR, setIsSSR] = createSignal(!!ssrCount);
+	const layout = createListLayout(props.data.length, itemSize, cache);
+	const store = createVirtualStore(layout, ssrCount);
 	const driver = createContainerDriver(store, horizontal);
 	const [stateVersion, setRerender] = createSignal(store.$getStateVersion());
 	store.$subscribe(1, () => {
@@ -1050,10 +1053,11 @@ var Virtualizer = (props) => {
 	const totalSize = createMemo(() => stateVersion() && store.$getTotalSize());
 	const isNegative = createMemo(() => stateVersion() && driver.$isNegative());
 	onMount(() => {
+		setIsSSR(false);
 		if (props.ref) {
 			props.ref({
 				get cache() {
-					return store.$getCacheSnapshot();
+					return layout.$snapshot();
 				},
 				get scrollOffset() {
 					return store.$getScrollOffset();
@@ -1130,7 +1134,7 @@ var Virtualizer = (props) => {
 		const children = createMemo(() => {
 			return untrack(() => props.children(data, index));
 		});
-		return <ListItem _as={props.item} _index={index()} _resizer={driver.$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} _isSSR={isSSR()} />;
 	};
 	return <Dynamic component={props.as} ref={containerRef} style={{
 		contain: "size style",
@@ -1159,6 +1163,7 @@ var VList = (props) => {
 		"children",
 		"bufferSize",
 		"itemSize",
+		"ssrCount",
 		"shift",
 		"horizontal",
 		"keepMounted",
@@ -1176,7 +1181,7 @@ var VList = (props) => {
 		height: "100%",
 		...local.style
 	}}>
-      <Virtualizer ref={local.ref} data={local.data} bufferSize={local.bufferSize} itemSize={local.itemSize} shift={local.shift} horizontal={local.horizontal} keepMounted={local.keepMounted} cache={local.cache} item={local.item} onScroll={local.onScroll} onScrollEnd={local.onScrollEnd}>
+      <Virtualizer ref={local.ref} data={local.data} bufferSize={local.bufferSize} itemSize={local.itemSize} ssrCount={local.ssrCount} shift={local.shift} horizontal={local.horizontal} keepMounted={local.keepMounted} cache={local.cache} item={local.item} onScroll={local.onScroll} onScrollEnd={local.onScrollEnd}>
         {local.children}
       </Virtualizer>
     </div>;
@@ -1186,8 +1191,10 @@ var VList = (props) => {
 //#region src/solid/WindowVirtualizer.tsx
 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 { ref: _ref, data: _data, children: _children, itemSize, ssrCount, shift: _shift, horizontal = false, cache, onScrollEnd: _onScrollEnd } = props;
+	const [isSSR, setIsSSR] = createSignal(!!ssrCount);
+	const layout = createListLayout(props.data.length, itemSize, cache);
+	const store = createVirtualStore(layout, ssrCount);
 	const driver = createWindowDriver(store, horizontal);
 	const [stateVersion, setRerender] = createSignal(store.$getStateVersion());
 	store.$subscribe(1, () => {
@@ -1211,10 +1218,11 @@ var WindowVirtualizer = (props) => {
 	const totalSize = createMemo(() => stateVersion() && store.$getTotalSize());
 	const isNegative = createMemo(() => stateVersion() && driver.$isNegative());
 	onMount(() => {
+		setIsSSR(false);
 		if (props.ref) {
 			props.ref({
 				get cache() {
-					return store.$getCacheSnapshot();
+					return layout.$snapshot();
 				},
 				get scrollOffset() {
 					return store.$getScrollOffset();
@@ -1276,7 +1284,7 @@ var WindowVirtualizer = (props) => {
 		const children = createMemo(() => {
 			return untrack(() => props.children(data, itemIndex));
 		});
-		return <ListItem _index={itemIndex()} _resizer={driver.$observeItem} _offset={offset()} _hide={hide()} _children={children()} _isHorizontal={horizontal} />;
+		return <ListItem _index={itemIndex()} _resizer={driver.$observeItem} _offset={offset()} _hide={hide()} _children={children()} _isHorizontal={horizontal} _isSSR={isSSR()} />;
 	}}
       </For>
     </div>;