virtua 0.52.0 → 0.52.1

package/lib/solid/index.jsx

@@ -743,92 +743,90 @@ var createGridPlan = (rowLayout, colLayout, rowRange, colRange, headerRows = 0,
 			const endPinned = colIndex >= colTrailStart;
 			const colInRangeOrPinnedToEnd = endPinned || colIndex >= colRangeStart && colIndex <= colRangeEnd;
 			const span = spanCells.get(rowKey + colIndex);
-			if (span ? span.rowIndex !== rowIndex || span.colIndex !== colIndex : !(rowInRangeOrPinnedToEnd && colInRangeOrPinnedToEnd) && !pinnedTop && !isSectionHeaderRow && !startPinned) {
-				continue;
-			}
-			const rowTo = span ? getSpanRowEnd(span, rowCount) : rowIndex + 1;
-			const colTo = span ? getSpanColEnd(span, colCount) : colIndex + 1;
-			const spansRows = rowTo - rowIndex > 1;
-			const spansCols = colTo - colIndex > 1;
-			const spanning = spansRows || spansCols;
-			const rowSpan = spanning ? rowTo - rowIndex : undefined;
-			const colSpan = spanning ? colTo - colIndex : undefined;
-			let measureRowIndex;
-			let measureColIndex;
-			rowEnd = max(rowEnd, rowTo);
-			const stickyStart = startPinned ? colLayout.$getItemOffset(colIndex) : null;
-			const stickyEnd = endPinned ? colLayout.$getTotalSize() - colLayout.$getItemOffset(colTo - 1) - colLayout.$getItemSize(colTo - 1) : null;
-			if (measuredRow === false && !spansRows) {
-				measureRowIndex = rowIndex;
-				measuredRow = true;
-			}
-			if (measuredCols[i] === false && !spansCols) {
-				measureColIndex = colIndex;
-				measuredCols[i] = true;
-			}
-			const role = pinnedTop ? "columnheader" : colIndex === rowHeaderCol && (startPinned || isSectionHeaderRow) ? "rowheader" : "cell";
-			const sortOrder = role !== "cell" && sortedCell && sortedCell.rowIndex === rowIndex && sortedCell.colIndex === colIndex ? sortedCell.order : undefined;
-			let cell;
-			if (prevCells) {
-				while (p < prevCells.length && prevCells[p].$col < colIndex) {
-					p++;
+			if (span ? span.rowIndex === rowIndex && span.colIndex === colIndex : rowInRangeOrPinnedToEnd && colInRangeOrPinnedToEnd || pinnedTop || isSectionHeaderRow || startPinned) {
+				const rowTo = span ? getSpanRowEnd(span, rowCount) : rowIndex + 1;
+				const colTo = span ? getSpanColEnd(span, colCount) : colIndex + 1;
+				const spansRows = rowTo - rowIndex > 1;
+				const spansCols = colTo - colIndex > 1;
+				const spanning = spansRows || spansCols;
+				const rowSpan = spanning ? rowTo - rowIndex : undefined;
+				const colSpan = spanning ? colTo - colIndex : undefined;
+				let measureRowIndex;
+				let measureColIndex;
+				rowEnd = max(rowEnd, rowTo);
+				const stickyStart = startPinned ? colLayout.$getItemOffset(colIndex) : null;
+				const stickyEnd = endPinned ? colLayout.$getTotalSize() - colLayout.$getItemOffset(colTo - 1) - colLayout.$getItemSize(colTo - 1) : null;
+				if (measuredRow === false && !spansRows) {
+					measureRowIndex = rowIndex;
+					measuredRow = true;
 				}
-				if (p < prevCells.length) {
-					cell = prevCells[p];
+				if (measuredCols[i] === false && !spansCols) {
+					measureColIndex = colIndex;
+					measuredCols[i] = true;
 				}
-			}
-			if (!cell || cell.$col !== colIndex || cell.$rowSpan !== rowSpan || cell.$colSpan !== colSpan || cell.$start !== stickyStart || cell.$end !== stickyEnd || cell.$measureRow !== measureRowIndex || cell.$measureCol !== measureColIndex || cell.$role !== role || cell.$sort !== sortOrder) {
-				const style = {
-					contain: "layout style",
-					display: "grid",
-					gridArea: spanning ? "1/l" + colIndex + "/l" + rowTo + "/l" + colTo : "1/l" + colIndex
-				};
-				if (spansRows) {
-					style["height"] = "0px";
-					style["minHeight"] = "100%";
-					style["zIndex"] = 1;
-				}
-				if (spansCols) {
-					style["width"] = "0px";
-					style["minWidth"] = "100%";
+				const role = pinnedTop ? "columnheader" : colIndex === rowHeaderCol && (startPinned || isSectionHeaderRow) ? "rowheader" : "cell";
+				const sortOrder = role !== "cell" && sortedCell && sortedCell.rowIndex === rowIndex && sortedCell.colIndex === colIndex ? sortedCell.order : undefined;
+				let cell;
+				if (prevCells) {
+					while (p < prevCells.length && prevCells[p].$col < colIndex) {
+						p++;
+					}
+					if (p < prevCells.length) {
+						cell = prevCells[p];
+					}
 				}
-				if (startPinned || endPinned) {
-					if (startPinned) {
-						style["insetInlineStart"] = stickyStart + "px";
-					} else {
-						style["insetInlineEnd"] = stickyEnd + "px";
+				if (!cell || cell.$col !== colIndex || cell.$rowSpan !== rowSpan || cell.$colSpan !== colSpan || cell.$start !== stickyStart || cell.$end !== stickyEnd || cell.$measureRow !== measureRowIndex || cell.$measureCol !== measureColIndex || cell.$role !== role || cell.$sort !== sortOrder) {
+					const style = {
+						contain: "layout style",
+						display: "grid",
+						gridArea: spanning ? "1/l" + colIndex + "/l" + rowTo + "/l" + colTo : "1/l" + colIndex
+					};
+					if (spansRows) {
+						style["height"] = "0px";
+						style["minHeight"] = "100%";
+						style["zIndex"] = 1;
+					}
+					if (spansCols) {
+						style["width"] = "0px";
+						style["minWidth"] = "100%";
 					}
-					style["position"] = "sticky";
-					style["zIndex"] = 2;
+					if (startPinned || endPinned) {
+						if (startPinned) {
+							style["insetInlineStart"] = stickyStart + "px";
+						} else {
+							style["insetInlineEnd"] = stickyEnd + "px";
+						}
+						style["position"] = "sticky";
+						style["zIndex"] = 2;
+					}
+					cell = {
+						$col: colIndex,
+						$rowSpan: rowSpan,
+						$colSpan: colSpan,
+						$measureRow: measureRowIndex,
+						$measureCol: measureColIndex,
+						$role: role,
+						$sort: sortOrder,
+						$style: style,
+						$start: stickyStart,
+						$end: stickyEnd
+					};
+					changed = true;
 				}
-				cell = {
-					$col: colIndex,
-					$rowSpan: rowSpan,
-					$colSpan: colSpan,
-					$measureRow: measureRowIndex,
-					$measureCol: measureColIndex,
-					$role: role,
-					$sort: sortOrder,
-					$style: style,
-					$start: stickyStart,
-					$end: stickyEnd
-				};
-				changed = true;
+				rowCells.push(cell);
 			}
-			rowCells.push(cell);
 		}
 		measuredRows.push(measuredRow);
-		if (!rowCells.length) {
-			continue;
+		if (rowCells.length) {
+			const row = prevRow && !changed && prevRow.$cells.length === rowCells.length && prevRow.$top === rowTop ? prevRow : {
+				$row: rowIndex,
+				$cells: rowCells,
+				$style: getBoxStyle(rowIndex, rowEnd, rowTop, "top", 3),
+				$top: rowTop
+			};
+			rowStates.set(rowIndex, row);
+			groupRows.push(row);
 		}
-		const row = prevRow && !changed && prevRow.$cells.length === rowCells.length && prevRow.$top === rowTop ? prevRow : {
-			$row: rowIndex,
-			$cells: rowCells,
-			$style: getBoxStyle(rowIndex, rowEnd, rowTop, "top", 3),
-			$top: rowTop
-		};
-		rowStates.set(rowIndex, row);
-		groupRows.push(row);
 	}
 	rowStatesCache.set(rowLayout, rowStates);
 	return {