virtua 0.53.1 → 0.53.2

package/lib/solid/index.jsx

@@ -60,7 +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, $isSizeEqual: isSizeEqual, $getTotalSize: getTotalSize, $getLength: getLength, $setLength: setLength, $isEstimating: isEstimating, $resize: resize, $relayout: relayout }, ssrCount = 0) => {
+var createVirtualStore = ({ $getRange: getRange, $getItemOffset: getOffset, $getItemSize: getItemSize, $isSizeEqual: isSizeEqual, $getTotalSize: getTotalSize, $getLength: getLength, $setLength: setLength, $isEstimating: isEstimating, $resize: resize }, ssrCount = 0) => {
 	let isSSR = !!ssrCount;
 	let stateVersion = 1;
 	let viewportSize = 0;
@@ -134,12 +134,12 @@ var createVirtualStore = ({ $getRange: getRange, $findIndex: findIndex, $getItem
 			}
 			return [max(startIndex, 0), min(endIndex, getLength() - 1)];
 		},
-		$findItemIndex: (offset) => findIndex(offset - startSpacerSize),
 		$isUnmeasuredItem: isSizeEqual,
 		$getItemOffset: getItemOffset,
 		$getItemSize: getItemSize,
 		$getItemsLength: getLength,
 		$getScrollOffset: () => scrollOffset,
+		$getVisibleOffset: getVisibleOffset,
 		$isScrolling: () => _scrollDirection !== SCROLL_IDLE,
 		$getViewportSize: () => viewportSize,
 		$getStartSpacerSize: () => startSpacerSize,
@@ -236,9 +236,8 @@ var createVirtualStore = ({ $getRange: getRange, $findIndex: findIndex, $getItem
 					break;
 				}
 				case 9: {
-					const relayoutJump = relayout(payload, getVisibleOffset());
-					if (relayoutJump != null) {
-						applyJump(relayoutJump);
+					if (payload != null) {
+						applyJump(payload);
 						mutated = 1 + 2;
 					}
 					break;
@@ -907,8 +906,6 @@ var getBoxStyle = (from, to, inset, edge, zIndex) => {
 //#region src/core/layouts/masonry.ts
 var createMasonryLayout = (length, lanesOpt, gap = 0, itemSize, snapshot) => {
 	let lanes = max(lanesOpt, 1);
-	let nextLanes = lanes;
-	let nextGap = gap;
 	let defaultItemSize = snapshot && snapshot[1] || itemSize || 40;
 	let computedIndex = -1;
 	let estimatingIndexes = itemSize ? undefined : new Set();
@@ -979,7 +976,6 @@ var createMasonryLayout = (length, lanesOpt, gap = 0, itemSize, snapshot) => {
 			const end = findIndex(getOffset, length, endOffset);
 			return [min(findStart(startOffset), end), end];
 		},
-		$findIndex: (offset) => findIndex(getOffset, length, offset),
 		$getItemOffset: getOffset,
 		$getItemSize: getSize,
 		$isSizeEqual: (index, size = -1) => sizes[index] === size,
@@ -1037,7 +1033,8 @@ var createMasonryLayout = (length, lanesOpt, gap = 0, itemSize, snapshot) => {
 			}
 			return 0;
 		},
-		$relayout: (_, scrollOffset) => {
+		$relayout: (nextLanes, nextGap = 0, scrollOffset) => {
+			nextLanes = max(nextLanes, 1);
 			if (nextLanes === lanes && nextGap === gap) {
 				return;
 			}
@@ -1049,10 +1046,6 @@ var createMasonryLayout = (length, lanesOpt, gap = 0, itemSize, snapshot) => {
 			estimatingIndexes = itemSize ? undefined : new Set();
 			return getOffset(startIndex) - prevStartOffset;
 		},
-		$setOptions: (lanes, gap = 0) => {
-			nextLanes = max(lanes, 1);
-			nextGap = gap;
-		},
 		$isEstimating: () => isEstimating,
 		$snapshot: () => [sizes.slice(), defaultItemSize],
 		$getLanes: () => lanes,
@@ -1627,6 +1620,9 @@ var Virtualizer = (props) => {
 	store.$subscribe(8, () => {
 		props.onScrollEnd?.();
 	});
+	store.$subscribe(2, () => {
+		props.onResize?.();
+	});
 	const range = createMemo((prev) => {
 		stateVersion();
 		const next = store.$getRange(props.bufferSize);
@@ -1652,7 +1648,7 @@ var Virtualizer = (props) => {
 			get viewportSize() {
 				return store.$getViewportSize();
 			},
-			findItemIndex: store.$findItemIndex,
+			findItemIndex: (offset) => layout.$findIndex(offset - store.$getStartSpacerSize()),
 			getItemOffset: store.$getItemOffset,
 			getItemSize: store.$getItemSize,
 			scrollToIndex: (index, opts) => scrollToIndex(driver, store, index, opts),
@@ -1757,6 +1753,7 @@ var VList = (props) => {
 		"item",
 		"onScroll",
 		"onScrollEnd",
+		"onResize",
 		"style"
 	]);
 	return <div {...others} style={{
@@ -1767,7 +1764,7 @@ var VList = (props) => {
 		height: "100%",
 		...local.style
 	}}>
-      <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}>
+      <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} onResize={local.onResize}>
         {local.children}
       </Virtualizer>
     </div>;
@@ -1792,6 +1789,9 @@ var WindowVirtualizer = (props) => {
 	store.$subscribe(8, () => {
 		props.onScrollEnd?.();
 	});
+	store.$subscribe(2, () => {
+		props.onResize?.();
+	});
 	const range = createMemo((prev) => {
 		stateVersion();
 		const next = store.$getRange(props.bufferSize);
@@ -1814,7 +1814,7 @@ var WindowVirtualizer = (props) => {
 			get viewportSize() {
 				return store.$getViewportSize();
 			},
-			findItemIndex: store.$findItemIndex,
+			findItemIndex: (offset) => layout.$findIndex(offset - store.$getStartSpacerSize()),
 			getItemOffset: store.$getItemOffset,
 			getItemSize: store.$getItemSize,
 			scrollToIndex: (index, opts) => scrollToIndex(driver, store, index, opts)
@@ -1944,6 +1944,7 @@ var VGrid = (props) => {
 		"onVerticalScroll",
 		"onHorizontalScroll",
 		"onScrollEnd",
+		"onResize",
 		"style"
 	]);
 	const rowLayout = createGridLayout(rows, rowHeight, gap);
@@ -1976,6 +1977,18 @@ var VGrid = (props) => {
 	};
 	rowStore.$subscribe(8, notifyScrollEnd);
 	colStore.$subscribe(8, notifyScrollEnd);
+	let resized;
+	const notifyResize = () => {
+		if (!resized) {
+			resized = true;
+			microtask(() => {
+				resized = false;
+				props.onResize && props.onResize();
+			});
+		}
+	};
+	rowStore.$subscribe(2, notifyResize);
+	colStore.$subscribe(2, notifyResize);
 	createComputed(() => {
 		rowLayout.$setPinned(props.headerRows, props.footerRows);
 		colLayout.$setPinned(props.headerCols, props.footerCols);
@@ -1987,8 +2000,8 @@ var VGrid = (props) => {
 		if (colLength !== colStore.$getItemsLength()) {
 			colStore.$update(5, [colLength]);
 		}
-		rowStore.$update(9, rowSizes());
-		colStore.$update(9, colSizes());
+		rowStore.$update(9, rowLayout.$relayout(rowSizes(), rowStore.$getVisibleOffset()));
+		colStore.$update(9, colLayout.$relayout(colSizes(), colStore.$getVisibleOffset()));
 	});
 	const rowCount = createMemo(() => stateVersion() && rowStore.$getItemsLength());
 	const colCount = createMemo(() => stateVersion() && colStore.$getItemsLength());
@@ -2037,8 +2050,8 @@ var VGrid = (props) => {
 			get viewportWidth() {
 				return colStore.$getViewportSize();
 			},
-			findRowIndex: rowStore.$findItemIndex,
-			findColIndex: colStore.$findItemIndex,
+			findRowIndex: rowLayout.$findIndex,
+			findColIndex: colLayout.$findIndex,
 			getRowOffset: rowStore.$getItemOffset,
 			getColOffset: colStore.$getItemOffset,
 			getRowSize: rowStore.$getItemSize,
@@ -2111,6 +2124,7 @@ var VMasonry = (props) => {
 		"cache",
 		"onScroll",
 		"onScrollEnd",
+		"onResize",
 		"style"
 	]);
 	const layout = createMasonryLayout(props.data.length, props.lanes, props.gap, itemSize, cache);
@@ -2126,9 +2140,11 @@ var VMasonry = (props) => {
 	store.$subscribe(8, () => {
 		props.onScrollEnd?.();
 	});
+	store.$subscribe(2, () => {
+		props.onResize?.();
+	});
 	createComputed(() => {
-		layout.$setOptions(props.lanes, props.gap);
-		store.$update(9, undefined);
+		store.$update(9, layout.$relayout(props.lanes, props.gap, store.$getVisibleOffset()));
 	});
 	const range = createMemo((prev) => {
 		stateVersion();