virtua 0.52.7 → 0.52.8

package/lib/solid/index.jsx

@@ -60,8 +60,7 @@ var UPDATE_SCROLL_END_EVENT = 8;
 var getScrollSize = (store) => {
 	return max(store.$getTotalSize(), store.$getViewportSize());
 };
-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;
+var createVirtualStore = ({ $getRange: getRange, $findIndex: findIndex, $getItemOffset: getOffset, $getItemSize: getItemSize, $isSizeEqual: isSizeEqual, $getTotalSize: getTotalSize, $getLength: getLength, $setLength: setLength, $isEstimating: isEstimating, $resize: resize, $relayout: relayout }, ssrCount = 0) => {
 	let isSSR = !!ssrCount;
 	let stateVersion = 1;
 	let viewportSize = 0;
@@ -74,7 +73,6 @@ var createVirtualStore = ({ $getRange: getRange, $findIndex: findIndex, $getItem
 	let _scrollMode = SCROLL_BY_NATIVE;
 	let _frozenRange = null;
 	let _prevRange = [0, isSSR ? max(ssrCount - 1, 0) : -1];
-	let _totalMeasuredSize = 0;
 	let _isViewportMeasured = false;
 	const subscribers = new Set();
 	const getRelativeScrollOffset = () => scrollOffset - startSpacerSize;
@@ -82,6 +80,18 @@ var createVirtualStore = ({ $getRange: getRange, $findIndex: findIndex, $getItem
 	const getItemOffset = (index) => {
 		return getOffset(index) - pendingJump;
 	};
+	const shouldKeep = (index) => {
+		if (_scrollMode === SCROLL_BY_SHIFT) {
+			return true;
+		}
+		if (_frozenRange && _scrollMode === SCROLL_BY_MANUAL_SCROLL) {
+			return index < _frozenRange[0];
+		}
+		const start = getRelativeScrollOffset();
+		const itemOffset = getItemOffset(index);
+		const itemSize = getItemSize(index);
+		return _scrollDirection !== SCROLL_DOWN && _scrollMode === SCROLL_BY_NATIVE ? itemOffset + itemSize <= start : itemOffset < start && itemOffset + itemSize < start + viewportSize;
+	};
 	const applyJump = (j) => {
 		if (j) {
 			if (isIOSWebKit() && _scrollDirection !== SCROLL_IDLE || _frozenRange && _scrollMode === SCROLL_BY_MANUAL_SCROLL) {
@@ -107,7 +117,7 @@ var createVirtualStore = ({ $getRange: getRange, $findIndex: findIndex, $getItem
 			} else {
 				let startOffset = max(0, getVisibleOffset());
 				let endOffset = startOffset + viewportSize;
-				if (!shouldAutoEstimateItemSize) {
+				if (!isEstimating()) {
 					bufferSize = max(0, bufferSize);
 					if (_scrollDirection !== SCROLL_DOWN) {
 						startOffset -= bufferSize;
@@ -191,34 +201,7 @@ var createVirtualStore = ({ $getRange: getRange, $findIndex: findIndex, $getItem
 					if (!updated.length) {
 						break;
 					}
-					applyJump(updated.reduce((acc, [index, size]) => {
-						let shouldKeep;
-						if (_scrollMode === SCROLL_BY_SHIFT) {
-							shouldKeep = true;
-						} else if (_frozenRange && _scrollMode === SCROLL_BY_MANUAL_SCROLL) {
-							shouldKeep = index < _frozenRange[0];
-						} else {
-							const start = getRelativeScrollOffset();
-							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(index);
-						}
-						return acc;
-					}, 0));
-					for (const [index, size] of updated) {
-						const prevSize = getItemSize(index);
-						const isInitialMeasurement = setItemSize(index, size);
-						if (shouldAutoEstimateItemSize) {
-							_totalMeasuredSize += isInitialMeasurement ? size : size - prevSize;
-						}
-					}
-					if (shouldAutoEstimateItemSize && viewportSize && _totalMeasuredSize > viewportSize) {
-						applyJump(estimateDefaultSize(findIndex(getVisibleOffset())));
-						shouldAutoEstimateItemSize = false;
-					}
+					applyJump(resize(updated, shouldKeep, getVisibleOffset(), viewportSize));
 					mutated = 1 + 2;
 					shouldSync = true;
 					break;
@@ -253,8 +236,11 @@ var createVirtualStore = ({ $getRange: getRange, $findIndex: findIndex, $getItem
 					break;
 				}
 				case 9: {
-					applyJump(payload);
-					mutated = 1 + 2;
+					const relayoutJump = relayout(payload, getVisibleOffset());
+					if (relayoutJump != null) {
+						applyJump(relayoutJump);
+						mutated = 1 + 2;
+					}
 					break;
 				}
 				case 8: {
@@ -309,6 +295,8 @@ var findIndex = (getOffset, length, offset, low = 0, high = length - 1) => {
 var createListLayout = (length, itemSize, snapshot) => {
 	let defaultItemSize = snapshot && snapshot[1] || itemSize || 40;
 	let computedOffsetIndex = -1;
+	let _totalMeasuredSize = 0;
+	let shouldAutoEstimateItemSize = !itemSize;
 	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);
@@ -353,13 +341,39 @@ var createListLayout = (length, itemSize, snapshot) => {
 		$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,
+		$resize: (resizes, shouldKeep, scrollOffset, viewportSize) => {
+			let jump = resizes.reduce((acc, [index, size]) => shouldKeep(index) ? acc + (size - getSize(index)) : acc, 0);
+			for (const [index, size] of resizes) {
+				_totalMeasuredSize += sizes[index] === -1 ? size : size - getSize(index);
+				sizes[index] = size;
+				computedOffsetIndex = min(index, computedOffsetIndex);
+			}
+			if (shouldAutoEstimateItemSize && viewportSize && _totalMeasuredSize > viewportSize) {
+				let measuredCountBeforeStart = 0;
+				const startIndex = findIndex(getOffset, length, scrollOffset + jump);
+				const measuredSizes = [];
+				sizes.forEach((s, i) => {
+					if (s !== -1) {
+						if (s) {
+							measuredSizes.push(s);
+						}
+						if (i < startIndex) {
+							measuredCountBeforeStart++;
+						}
+					}
+				});
+				computedOffsetIndex = -1;
+				sort(measuredSizes);
+				const len = measuredSizes.length;
+				const mid = len / 2 | 0;
+				const median = len % 2 === 0 ? (measuredSizes[mid - 1] + measuredSizes[mid]) / 2 : measuredSizes[mid];
+				const prevDefaultItemSize = defaultItemSize;
+				jump += ((defaultItemSize = median) - prevDefaultItemSize) * max(startIndex - measuredCountBeforeStart, 0);
+				shouldAutoEstimateItemSize = false;
+			}
+			return jump;
+		},
 		$getTotalSize: () => getOffset(length),
 		$getLength: () => length,
 		$setLength: (nextLength, isShift) => {
@@ -375,27 +389,7 @@ var createListLayout = (length, itemSize, snapshot) => {
 				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) {
-					if (s) {
-						measuredSizes.push(s);
-					}
-					if (i < startIndex) {
-						measuredCountBeforeStart++;
-					}
-				}
-			});
-			computedOffsetIndex = -1;
-			sort(measuredSizes);
-			const len = measuredSizes.length;
-			const mid = len / 2 | 0;
-			const median = len % 2 === 0 ? (measuredSizes[mid - 1] + measuredSizes[mid]) / 2 : measuredSizes[mid];
-			const prevDefaultItemSize = defaultItemSize;
-			return ((defaultItemSize = median) - prevDefaultItemSize) * max(startIndex - measuredCountBeforeStart, 0);
-		},
+		$isEstimating: () => shouldAutoEstimateItemSize,
 		$snapshot: () => [sizes.slice(), defaultItemSize]
 	};
 };
@@ -410,6 +404,8 @@ var createGridLayout = (axis, size, gap = 0) => {
 	const isAuto = size === "auto";
 	let defaultItemSize = (isUniform ? size : 40) + gap;
 	let computedOffsetIndex = -1;
+	let _totalMeasuredSize = 0;
+	let shouldAutoEstimateItemSize = isAuto;
 	let header = 0;
 	let footer = 0;
 	let currentSizes = null;
@@ -454,6 +450,7 @@ var createGridLayout = (axis, size, gap = 0) => {
 	const find = (offset) => sizes.length ? findIndex(getOffset, length, offset) : defaultItemSize ? clamp(floor(offset / defaultItemSize), 0, length - 1) : 0;
 	const getPinnedStart = () => min(header, length);
 	const getTrailStart = () => max(length - footer, getPinnedStart());
+	const getItemSize = (index) => (sizes.length ? getSize(index) : defaultItemSize) - gap;
 	return {
 		$getRange: (startOffset, endOffset) => {
 			const insetStart = getOffset(getPinnedStart());
@@ -463,17 +460,45 @@ var createGridLayout = (axis, size, gap = 0) => {
 		},
 		$findIndex: find,
 		$getItemOffset: getOffset,
-		$getItemSize: (index) => (sizes.length ? getSize(index) : defaultItemSize) - gap,
-		$setItemSize: (index, size) => {
-			if (!isMeasurable(index)) {
-				return false;
+		$getItemSize: getItemSize,
+		$resize: (resizes, shouldKeep, scrollOffset, viewportSize) => {
+			let jump = resizes.reduce((acc, [index, size]) => isMeasurable(index) && shouldKeep(index) ? acc + (size - getItemSize(index)) : acc, 0);
+			for (const [index, size] of resizes) {
+				if (isMeasurable(index)) {
+					materialize();
+					_totalMeasuredSize += sizes[index] === -1 ? size : size - getItemSize(index);
+					setSize(index, size + gap);
+				}
 			}
-			materialize();
-			const isInitialMeasurement = sizes[index] === -1;
-			setSize(index, size + gap);
-			return isInitialMeasurement;
+			if (shouldAutoEstimateItemSize && viewportSize && _totalMeasuredSize > viewportSize) {
+				let measuredCountBeforeStart = 0;
+				const startIndex = find(scrollOffset + jump);
+				const measuredSizes = [];
+				sizes.forEach((s, i) => {
+					if (s !== -1) {
+						if (s) {
+							measuredSizes.push(s);
+						}
+						if (i < startIndex) {
+							measuredCountBeforeStart++;
+						}
+					}
+				});
+				computedOffsetIndex = -1;
+				sort(measuredSizes);
+				const len = measuredSizes.length;
+				const mid = len / 2 | 0;
+				const median = len % 2 === 0 ? (measuredSizes[mid - 1] + measuredSizes[mid]) / 2 : measuredSizes[mid];
+				const prevDefaultItemSize = defaultItemSize;
+				jump += ((defaultItemSize = median) - prevDefaultItemSize) * max(startIndex - measuredCountBeforeStart, 0);
+				shouldAutoEstimateItemSize = false;
+			}
+			return jump;
+		},
+		$isSizeEqual: (index, size = -1) => {
+			const cachedSize = sizes.length ? sizes[index] : -1;
+			return size === -1 ? isMeasurable(index) && cachedSize === -1 : cachedSize === size + gap;
 		},
-		$isSizeEqual: (index, size) => (sizes.length ? sizes[index] : -1) === size + gap,
 		$getTotalSize: () => length ? getOffset(length) - gap : 0,
 		$getLength: () => length,
 		$setLength: (nextLength) => {
@@ -489,27 +514,7 @@ var createGridLayout = (axis, size, gap = 0) => {
 			}
 			return 0;
 		},
-		$estimateDefaultSize: isAuto ? (startIndex) => {
-			let measuredCountBeforeStart = 0;
-			const measuredSizes = [];
-			sizes.forEach((s, i) => {
-				if (s !== -1) {
-					if (s) {
-						measuredSizes.push(s);
-					}
-					if (i < startIndex) {
-						measuredCountBeforeStart++;
-					}
-				}
-			});
-			computedOffsetIndex = -1;
-			sort(measuredSizes);
-			const len = measuredSizes.length;
-			const mid = len / 2 | 0;
-			const median = len % 2 === 0 ? (measuredSizes[mid - 1] + measuredSizes[mid]) / 2 : measuredSizes[mid];
-			const prevDefaultItemSize = defaultItemSize;
-			return ((defaultItemSize = median) - prevDefaultItemSize) * max(startIndex - measuredCountBeforeStart, 0);
-		} : undefined,
+		$isEstimating: () => shouldAutoEstimateItemSize,
 		$isMeasurable: isMeasurable,
 		$setPinned: (nextHeader = 0, nextFooter = 0) => {
 			header = nextHeader;
@@ -518,7 +523,7 @@ var createGridLayout = (axis, size, gap = 0) => {
 		$getPinnedStart: getPinnedStart,
 		$getTrailStart: getTrailStart,
 		$getSizes: (nextAxis, nextSize) => typeof nextSize === "number" ? isUniform ? nextSize : null : isUniform || isAuto || nextSize === "auto" ? null : nextAxis.map((item) => item != null ? item[nextSize] : null),
-		$setAxis: (nextSizes, scrollOffset) => {
+		$relayout: (nextSizes, scrollOffset) => {
 			if (nextSizes == null) {
 				return;
 			}
@@ -562,17 +567,6 @@ var createGridLayout = (axis, size, gap = 0) => {
 
 //#endregion
 //#region src/core/grid.ts
-var updateGridAxis = (store, layout, axis, sizes, header, footer) => {
-	const length = getAxisLength(axis);
-	layout.$setPinned(header, footer);
-	if (length !== store.$getItemsLength()) {
-		store.$update(5, [length]);
-	}
-	const jump = layout.$setAxis(sizes, store.$getScrollOffset() - store.$getItemOffset(0));
-	if (jump != null) {
-		store.$update(9, jump);
-	}
-};
 var rowStatesCache = /*#__PURE__*/ new WeakMap();
 var createGridSpanIndex = (spans = EMPTY) => {
 	const index = new Map();
@@ -1008,9 +1002,11 @@ var createScrollObserver = (store, viewport, scroller, isHorizontal, isRtl, onMo
 				onMomentumJump();
 			}
 			stillMomentumScrolling = false;
-			const target = store.$getScrollOffset() + jump;
-			if (target <= 0 || target >= store.$getStartSpacerSize() + store.$getTotalSize() - store.$getViewportSize()) {
-				scrollTo(target);
+			const from = store.$getScrollOffset();
+			const to = from + jump;
+			const end = store.$getStartSpacerSize() + store.$getTotalSize() - store.$getViewportSize();
+			if (to <= 0 || to >= end || from >= end) {
+				scrollTo(to);
 			} else {
 				scroller.scrollBy({
 					[scrollToKey]: normalizeScrollOffset(jump),
@@ -1807,10 +1803,18 @@ var VGrid = (props) => {
 	rowStore.$subscribe(8, notifyScrollEnd);
 	colStore.$subscribe(8, notifyScrollEnd);
 	createComputed(() => {
-		updateGridAxis(rowStore, rowLayout, props.rows, rowSizes(), props.headerRows, props.footerRows);
-	});
-	createComputed(() => {
-		updateGridAxis(colStore, colLayout, props.cols, colSizes(), props.headerCols, props.footerCols);
+		rowLayout.$setPinned(props.headerRows, props.footerRows);
+		colLayout.$setPinned(props.headerCols, props.footerCols);
+		const rowLength = getAxisLength(props.rows);
+		const colLength = getAxisLength(props.cols);
+		if (rowLength !== rowStore.$getItemsLength()) {
+			rowStore.$update(5, [rowLength]);
+		}
+		if (colLength !== colStore.$getItemsLength()) {
+			colStore.$update(5, [colLength]);
+		}
+		rowStore.$update(9, rowSizes());
+		colStore.$update(9, colSizes());
 	});
 	const rowCount = createMemo(() => stateVersion() && rowStore.$getItemsLength());
 	const colCount = createMemo(() => stateVersion() && colStore.$getItemsLength());