virtua 0.52.2 → 0.52.3

package/lib/solid/index.jsx

@@ -526,17 +526,7 @@ var updateGridAxis = (store, layout, axis, size, header, footer, mutable) => {
 	}
 };
 var rowStatesCache = /*#__PURE__*/ new WeakMap();
-var hasTrackIn = (extras, from, to, pinnedStart, start, end, trailStart) => {
-	if (from < pinnedStart || max(from, start) < min(to, end + 1) || trailStart < to) {
-		return true;
-	}
-	for (const i of extras) {
-		if (i >= from && i < to) {
-			return true;
-		}
-	}
-	return false;
-};
+var hasVisibleTrack = (from, to, pinnedStart, start, end, trailStart) => from < pinnedStart || max(from, start) < min(to, end + 1) || trailStart < to;
 var getSectionStarts = (sectionRows, pinnedStart, trailStart) => {
 	const starts = [];
 	for (const rowIndex of sectionRows) {
@@ -562,12 +552,6 @@ var getSectionIndex = (starts, rowIndex, trailStart) => {
 	}
 	return lo - 1;
 };
-var addSectionHeader = (extras, sectionStarts, rowIndex, trailStart) => {
-	const section = getSectionIndex(sectionStarts, rowIndex, trailStart);
-	if (section >= 0) {
-		extras.push(sectionStarts[section]);
-	}
-};
 var addExtras = (indexes, extras, e, bound, lastRendered) => {
 	const extrasLength = extras.length;
 	for (; e < extrasLength && extras[e] < bound; e++) {
@@ -652,42 +636,37 @@ var createGridPlan = (rowLayout, colLayout, rowRange, colRange, sectionRows = EM
 			extraCells.push(cell);
 		}
 	}
+	const keptLength = extraCells.length;
 	const sectionLength = sectionStarts.length;
-	if (sectionLength) {
-		addSectionHeader(extraRows, sectionStarts, rowRangeStart, rowTrailStart);
-		extraCols.push(rowHeaderCol);
+	const firstSection = getSectionIndex(sectionStarts, rowRangeStart, rowTrailStart);
+	const firstSectionStart = firstSection < 0 ? -1 : sectionStarts[firstSection];
+	if (firstSectionStart >= 0) {
+		extraRows.push(firstSectionStart);
 	}
-	let waiting = spans;
-	let l = 0;
-	do {
-		for (; l < extraCells.length; l++) {
-			const { rowIndex, colIndex } = extraCells[l];
-			extraRows.push(rowIndex);
-			addSectionHeader(extraRows, sectionStarts, rowIndex, rowTrailStart);
-			extraCols.push(colIndex);
-		}
-		const rest = [];
-		for (const span of waiting) {
-			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)) {
-				const hasRenderedRow = hasTrackIn(extraRows, row, rowTo, rowPinnedStart, rowRangeStart, rowRangeEnd, rowTrailStart);
-				if (hasRenderedRow && hasTrackIn(extraCols, col, colTo, colPinnedStart, colRangeStart, colRangeEnd, colTrailStart)) {
-					extraCells.push(span);
-				} else if (hasRenderedRow) {
-					const section = getSectionIndex(sectionStarts, rowTo - 1, rowTrailStart);
-					if (row < rowPinnedStart || section >= 0 && sectionStarts[section] >= row) {
-						rest.push(span);
-					}
-				} else if (col < colPinnedStart) {
-					rest.push(span);
-				}
+	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);
 			}
 		}
-		waiting = rest;
-	} while (l < extraCells.length);
+	}
+	for (const { rowIndex, colIndex } of extraCells) {
+		const section = getSectionIndex(sectionStarts, rowIndex, rowTrailStart);
+		extraRows.push(rowIndex);
+		if (section >= 0) {
+			extraRows.push(sectionStarts[section]);
+		}
+		extraCols.push(colIndex);
+	}
 	sort(extraRows);
 	sort(extraCols);
 	const rows = getTrackIndexes(extraRows, totalRowCount, rowPinnedStart, rowRangeStart, rowRangeEnd, rowTrailStart);
@@ -723,7 +702,6 @@ var createGridPlan = (rowLayout, colLayout, rowRange, colRange, sectionRows = EM
 	for (const rowIndex of rows) {
 		const isRowPinnedStart = rowIndex < rowPinnedStart;
 		const isRowPinnedEnd = rowIndex >= rowTrailStart;
-		const isRowInRangeOrPinnedToEnd = isRowPinnedEnd || rowIndex >= rowRangeStart && rowIndex <= rowRangeEnd;
 		const section = getSectionIndex(sectionStarts, rowIndex, rowTrailStart);
 		const groupStart = isRowPinnedStart ? 0 : isRowPinnedEnd ? rowTrailStart : section < 0 ? -1 : sectionStarts[section];
 		if (rowIndex === groupStart) {
@@ -740,6 +718,7 @@ var createGridPlan = (rowLayout, colLayout, rowRange, colRange, sectionRows = EM
 			groupRows = groups;
 		}
 		const isSectionHeaderRow = section >= 0 && rowIndex === groupStart;
+		const isRowVisible = isRowPinnedStart || isRowPinnedEnd || rowIndex === firstSectionStart || rowIndex >= rowRangeStart && rowIndex <= rowRangeEnd;
 		const rowTop = isSectionHeaderRow ? sectionHeaderTop : null;
 		const rowKey = rowIndex * totalColCount;
 		const prevRow = prev && prev.get(rowIndex);
@@ -753,9 +732,9 @@ var createGridPlan = (rowLayout, colLayout, rowRange, colRange, sectionRows = EM
 			const colIndex = cols[i];
 			const isColPinnedStart = colIndex < colPinnedStart;
 			const isColPinnedEnd = colIndex >= colTrailStart;
-			const isColInRangeOrPinnedToEnd = isColPinnedEnd || colIndex >= colRangeStart && colIndex <= colRangeEnd;
+			const isColVisible = isColPinnedStart || isColPinnedEnd || colIndex >= colRangeStart && colIndex <= colRangeEnd;
 			const span = spanCells.get(rowKey + colIndex);
-			if (span ? span.rowIndex === rowIndex && span.colIndex === colIndex : isRowInRangeOrPinnedToEnd && isColInRangeOrPinnedToEnd || isRowPinnedStart || isSectionHeaderRow || isColPinnedStart) {
+			if (span ? span.rowIndex === rowIndex && span.colIndex === colIndex : isRowVisible && isColVisible) {
 				const rowTo = span ? getSpanRowEnd(span, totalRowCount) : rowIndex + 1;
 				const colTo = span ? getSpanColEnd(span, totalColCount) : colIndex + 1;
 				const rowSpan = rowTo - rowIndex;
@@ -1319,7 +1298,7 @@ var scrollGridAxisToIndex = (driver, store, layout, sections, index, align, isHo
 	const starts = getSectionStarts(sections, pinnedStart, trailStart);
 	const section = getSectionIndex(starts, index, trailStart);
 	const sectionHeader = section < 0 ? -1 : starts[section];
-	const getInsetStart = () => layout.$getItemOffset(pinnedStart) + (sectionHeader < 0 || sectionHeader === index ? 0 : store.$getItemOffset(sectionHeader + 1) - store.$getItemOffset(sectionHeader));
+	const getInsetStart = () => layout.$getItemOffset(pinnedStart) + (sectionHeader < 0 || sectionHeader === index ? 0 : layout.$getItemOffset(sectionHeader + 1) - layout.$getItemOffset(sectionHeader));
 	const getInsetEnd = () => layout.$getItemOffset(count) - layout.$getItemOffset(trailStart);
 	if (align === "nearest") {
 		if (index < pinnedStart || index >= trailStart) {