virtua 0.52.4 → 0.52.6

package/lib/solid/index.jsx

@@ -425,7 +425,7 @@ var createGridLayout = (axis, size, gap = 0) => {
 		const findIndex = (offset) => itemSize + gap ? clamp(floor(offset / (itemSize + gap)), 0, length - 1) : 0;
 		const getItemOffset = (index) => index * (itemSize + gap);
 		const findRange = (startOffset, endOffset) => [findIndex(startOffset), findIndex(endOffset)];
-		return {
+		const layout = {
 			$getRange: (startOffset, endOffset) => pinRange(findRange, getItemOffset, length, startOffset, endOffset),
 			$findIndex: findIndex,
 			$getItemOffset: getItemOffset,
@@ -442,8 +442,9 @@ var createGridLayout = (axis, size, gap = 0) => {
 			$setPinned: setPinned,
 			$getPinnedStart: () => getPinnedStart(length),
 			$getTrailStart: () => getTrailStart(length),
-			$setAxis: (_axis, nextSize, scrollOffset) => {
-				if (typeof nextSize !== "number" || nextSize === itemSize) {
+			$getSizes: (_axis, nextSize) => typeof nextSize === "number" ? nextSize : null,
+			$setAxis: (nextSize, scrollOffset) => {
+				if (nextSize == null || nextSize === itemSize) {
 					return;
 				}
 				const jump = findIndex(scrollOffset) * (nextSize - itemSize);
@@ -451,13 +452,12 @@ var createGridLayout = (axis, size, gap = 0) => {
 				return jump;
 			}
 		};
+		return layout;
 	}
 	const isAuto = size === "auto";
-	let currentAxis;
-	let currentSize = size;
-	const length = getAxisLength(axis);
+	let currentSizes = null;
 	const autos = [];
-	const inner = createListLayout(length, undefined, [[], 40 + gap]);
+	const inner = createListLayout(getAxisLength(axis), undefined, [[], 40 + gap]);
 	const isMeasurable = (index) => isAuto || !!autos[index];
 	const layout = {
 		$getRange: (startOffset, endOffset) => pinRange(inner.$getRange, inner.$getItemOffset, inner.$getLength(), startOffset, endOffset),
@@ -474,24 +474,22 @@ var createGridLayout = (axis, size, gap = 0) => {
 		$setPinned: setPinned,
 		$getPinnedStart: () => getPinnedStart(inner.$getLength()),
 		$getTrailStart: () => getTrailStart(inner.$getLength()),
-		$setAxis: (nextAxis, requestedSize, scrollOffset, mutable) => {
-			if (isAuto) {
+		$getSizes: (nextAxis, nextSize) => isAuto || typeof nextSize !== "string" || nextSize === "auto" ? null : nextAxis.map((item) => item != null ? item[nextSize] : null),
+		$setAxis: (nextSizes, scrollOffset) => {
+			if (!nextSizes) {
 				return;
 			}
-			const nextSize = typeof requestedSize === "number" || requestedSize === "auto" ? currentSize : requestedSize;
 			const length = inner.$getLength();
-			if (!mutable && nextAxis === currentAxis && nextSize === currentSize && length === autos.length) {
+			if (nextSizes === currentSizes && length === autos.length) {
 				return;
 			}
-			currentAxis = nextAxis;
-			currentSize = nextSize;
+			currentSizes = nextSizes;
 			autos.length = length;
 			const anchorIndex = inner.$findIndex(scrollOffset);
 			const prevOffset = inner.$getItemOffset(anchorIndex);
 			let changed;
 			for (let i = 0; i < length; i++) {
-				const item = nextAxis[i];
-				const itemSize = item !== null && typeof item === "object" ? item[nextSize] : null;
+				const itemSize = nextSizes[i];
 				const isAutoItem = typeof itemSize !== "number";
 				if (!isAutoItem || !autos[i]) {
 					autos[i] = isAutoItem;
@@ -508,25 +506,38 @@ var createGridLayout = (axis, size, gap = 0) => {
 			return inner.$getItemOffset(anchorIndex) - prevOffset;
 		}
 	};
-	layout.$setAxis(axis, size, 0);
 	return layout;
 };
 
 //#endregion
 //#region src/core/grid.ts
-var updateGridAxis = (store, layout, axis, size, header, footer, mutable) => {
+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(axis, size, store.$getScrollOffset() - store.$getItemOffset(0), mutable);
+	const jump = layout.$setAxis(sizes, store.$getScrollOffset() - store.$getItemOffset(0));
 	if (jump != null) {
 		store.$update(9, jump);
 	}
 };
 var rowStatesCache = /*#__PURE__*/ new WeakMap();
-var hasVisibleTrack = (from, to, pinnedStart, start, end, trailStart) => from < pinnedStart || max(from, start) < min(to, end + 1) || trailStart < to;
+var createGridSpanIndex = (spans = EMPTY) => {
+	const index = new Map();
+	for (const span of spans) {
+		const rowTo = span.rowIndex + (span.rowSpan || 1);
+		for (let rowIndex = span.rowIndex; rowIndex < rowTo; rowIndex++) {
+			const rowSpans = index.get(rowIndex);
+			if (rowSpans) {
+				rowSpans.push(span);
+			} else {
+				index.set(rowIndex, [span]);
+			}
+		}
+	}
+	return index;
+};
 var getSectionStarts = (sectionRows, pinnedStart, trailStart) => {
 	const starts = [];
 	for (const rowIndex of sectionRows) {
@@ -615,17 +626,17 @@ var gridStyleToString = (style) => {
 	}
 	return css;
 };
-var createGridPlan = (rowLayout, colLayout, rowRange, colRange, sectionRows = EMPTY, spans = EMPTY, kept = EMPTY, sortedCell) => {
+var createGridPlan = (rowLayout, colLayout, [rowRangeStart, rowRangeEnd], [colRangeStart, colRangeEnd], spanIndex, sectionRows = EMPTY, kept = EMPTY, sortedCell) => {
 	const totalRowCount = rowLayout.$getLength();
 	const totalColCount = colLayout.$getLength();
 	const rowPinnedStart = rowLayout.$getPinnedStart();
 	const rowTrailStart = rowLayout.$getTrailStart();
 	const colPinnedStart = colLayout.$getPinnedStart();
 	const colTrailStart = colLayout.$getTrailStart();
-	const rowRangeStart = clamp(rowRange[0], rowPinnedStart, rowTrailStart);
-	const rowRangeEnd = min(rowRange[1], rowTrailStart - 1);
-	const colRangeStart = clamp(colRange[0], colPinnedStart, colTrailStart);
-	const colRangeEnd = min(colRange[1], colTrailStart - 1);
+	rowRangeStart = clamp(rowRangeStart, rowPinnedStart, rowTrailStart);
+	rowRangeEnd = min(rowRangeEnd, rowTrailStart - 1);
+	colRangeStart = clamp(colRangeStart, colPinnedStart, colTrailStart);
+	colRangeEnd = min(colRangeEnd, colTrailStart - 1);
 	const sectionStarts = getSectionStarts(sectionRows, rowPinnedStart, rowTrailStart);
 	const rowHeaderCol = max(colPinnedStart - 1, 0);
 	const extraRows = [];
@@ -634,28 +645,30 @@ var createGridPlan = (rowLayout, colLayout, rowRange, colRange, sectionRows = EM
 	for (const cell of kept) {
 		if (cell.rowIndex < totalRowCount && cell.colIndex < totalColCount) {
 			extraCells.push(cell);
+			extraRows.push(cell.rowIndex);
 		}
 	}
 	const keptLength = extraCells.length;
-	const sectionLength = sectionStarts.length;
 	const firstSection = getSectionIndex(sectionStarts, rowRangeStart, rowTrailStart);
 	const firstSectionStart = firstSection < 0 ? -1 : sectionStarts[firstSection];
 	if (firstSectionStart >= 0) {
 		extraRows.push(firstSectionStart);
 	}
-	for (const span of spans) {
-		const row = span.rowIndex;
-		const col = span.colIndex;
-		const rowTo = getSpanRowEnd(span, totalRowCount);
-		const colTo = getSpanColEnd(span, totalColCount);
-		if (row < totalRowCount && col < totalColCount && (rowTo - row > 1 || colTo - col > 1)) {
-			let isLaid = (hasVisibleTrack(row, rowTo, rowPinnedStart, rowRangeStart, rowRangeEnd, rowTrailStart) || firstSectionStart >= row && firstSectionStart < rowTo) && hasVisibleTrack(col, colTo, colPinnedStart, colRangeStart, colRangeEnd, colTrailStart);
-			for (let k = 0; !isLaid && k < keptLength; k++) {
-				const { rowIndex, colIndex } = extraCells[k];
-				isLaid = rowIndex >= row && rowIndex < rowTo && colIndex >= col && colIndex < colTo;
-			}
-			if (isLaid) {
-				extraCells.push(span);
+	const seenRows = getTrackIndexes(sort(extraRows), totalRowCount, rowPinnedStart, rowRangeStart, rowRangeEnd, rowTrailStart);
+	for (let s = 0; s < seenRows.length; s++) {
+		for (const span of spanIndex.get(seenRows[s]) || EMPTY) {
+			const { rowIndex, colIndex } = span;
+			const rowTo = getSpanRowEnd(span, totalRowCount);
+			const colTo = getSpanColEnd(span, totalColCount);
+			if ((s < 1 || seenRows[s - 1] < rowIndex) && colIndex < totalColCount && (rowTo - rowIndex > 1 || colTo - colIndex > 1)) {
+				let isLaid = (rowIndex < rowPinnedStart || max(rowIndex, rowRangeStart) < min(rowTo, rowRangeEnd + 1) || rowTrailStart < rowTo || firstSectionStart >= rowIndex && firstSectionStart < rowTo) && (colIndex < colPinnedStart || max(colIndex, colRangeStart) < min(colTo, colRangeEnd + 1) || colTrailStart < colTo);
+				for (let k = 0; !isLaid && k < keptLength; k++) {
+					const cell = extraCells[k];
+					isLaid = cell.rowIndex >= rowIndex && cell.rowIndex < rowTo && cell.colIndex >= colIndex && cell.colIndex < colTo;
+				}
+				if (isLaid) {
+					extraCells.push(span);
+				}
 			}
 		}
 	}
@@ -705,7 +718,7 @@ var createGridPlan = (rowLayout, colLayout, rowRange, colRange, sectionRows = EM
 		const section = getSectionIndex(sectionStarts, rowIndex, rowTrailStart);
 		const groupStart = isRowPinnedStart ? 0 : isRowPinnedEnd ? rowTrailStart : section < 0 ? -1 : sectionStarts[section];
 		if (rowIndex === groupStart) {
-			const groupEnd = isRowPinnedStart ? rowPinnedStart : isRowPinnedEnd ? totalRowCount : section + 1 < sectionLength ? sectionStarts[section + 1] : rowTrailStart;
+			const groupEnd = isRowPinnedStart ? rowPinnedStart : isRowPinnedEnd ? totalRowCount : section + 1 < sectionStarts.length ? sectionStarts[section + 1] : rowTrailStart;
 			rowCuts.push(groupEnd);
 			const groupedRows = [];
 			groups.push({
@@ -746,7 +759,7 @@ var createGridPlan = (rowLayout, colLayout, rowRange, colRange, sectionRows = EM
 				let measureColIndex;
 				rowEnd = max(rowEnd, rowTo);
 				const stickyStart = isColPinnedStart ? colLayout.$getItemOffset(colIndex) : null;
-				const stickyEnd = isColPinnedEnd ? colLayout.$getTotalSize() - colLayout.$getItemOffset(colTo - 1) - colLayout.$getItemSize(colTo - 1) : null;
+				const stickyEnd = isColPinnedEnd ? colLayout.$getItemOffset(totalColCount) - colLayout.$getItemOffset(colTo) : null;
 				if (measuredRow === false && !isSpanningRows) {
 					measureRowIndex = rowIndex;
 					measuredRow = true;
@@ -1714,6 +1727,9 @@ var VGrid = (props) => {
 	]);
 	const rowLayout = createGridLayout(rows, rowHeight, gap);
 	const colLayout = createGridLayout(cols, colWidth, gap);
+	const rowSizes = createMemo(() => rowLayout.$getSizes(props.rows, props.rowHeight));
+	const colSizes = createMemo(() => colLayout.$getSizes(props.cols, props.colWidth));
+	const spanIndex = createMemo(() => createGridSpanIndex(props.spans));
 	const rowStore = createVirtualStore(rowLayout);
 	const colStore = createVirtualStore(colLayout);
 	const driver = createContainerGridDriver(rowStore, colStore);
@@ -1740,16 +1756,16 @@ var VGrid = (props) => {
 	rowStore.$subscribe(8, notifyScrollEnd);
 	colStore.$subscribe(8, notifyScrollEnd);
 	createComputed(() => {
-		updateGridAxis(rowStore, rowLayout, props.rows, props.rowHeight, props.headerRows, props.footerRows, true);
+		updateGridAxis(rowStore, rowLayout, props.rows, rowSizes(), props.headerRows, props.footerRows);
 	});
 	createComputed(() => {
-		updateGridAxis(colStore, colLayout, props.cols, props.colWidth, props.headerCols, props.footerCols, true);
+		updateGridAxis(colStore, colLayout, props.cols, colSizes(), props.headerCols, props.footerCols);
 	});
 	const rowCount = createMemo(() => stateVersion() && rowStore.$getItemsLength());
 	const colCount = createMemo(() => stateVersion() && colStore.$getItemsLength());
 	const plan = createMemo(() => {
 		stateVersion();
-		return createGridPlan(rowLayout, colLayout, rowStore.$getRange(props.bufferSize), colStore.$getRange(props.bufferSize), props.sectionRows, props.spans, props.keepMounted, props.ariaSort);
+		return createGridPlan(rowLayout, colLayout, rowStore.$getRange(props.bufferSize), colStore.$getRange(props.bufferSize), spanIndex(), props.sectionRows, props.keepMounted, props.ariaSort);
 	});
 	const keys = createMemo(() => plan().$groups.map((state) => "$rows" in state ? state.$key : state.$row));
 	const isScrolling = createMemo(() => stateVersion() && (rowStore.$isScrolling() || colStore.$isScrolling()));