virtua 0.52.0 → 0.52.1

package/lib/react/VGrid.d.ts

@@ -1,5 +1,5 @@
 import { ReactElement, ReactNode, Ref } from 'react';
-import { VGridAxis, VGridCell, VGridSize, VGridSpan, VGridScrollToIndexOpts } from '../core/index.js';
+import { GridAxis, GridCell as GridCellType, GridSize, GridSpan, GridScrollToIndexOpts } from '../core/index.js';
 import { ViewportComponentAttributes } from './types.js';
 /**
  * Methods of {@link VGrid}.
@@ -61,9 +61,9 @@ export interface VGridHandle {
     getColSize(index: number): number;
     /**
      * Scroll to the cell specified by the indexes. The cell is not hidden behind the rows and the columns sticking over it.
-     * @param opts the indexes of the cell and the options. See {@link VGridScrollToIndexOpts}.
+     * @param opts the indexes of the cell and the options. See {@link GridScrollToIndexOpts}.
      */
-    scrollToIndex(opts: VGridScrollToIndexOpts): void;
+    scrollToIndex(opts: GridScrollToIndexOpts): void;
     /**
      * Scroll to the given offsets from the top/start of the scroll container.
      * @param offset the offsets. The axis whose offset is omitted is not scrolled.
@@ -91,23 +91,23 @@ export interface VGridProps<R = number, C = number> extends Omit<ViewportCompone
      * @param col the item of {@link VGridProps.cols} at the column of the cell, or the column index if {@link VGridProps.cols} is a number
      * @param cell the row index and the column index of the cell
      */
-    children: (row: R, col: C, cell: Readonly<VGridCell>) => ReactNode;
+    children: (row: R, col: C, cell: Readonly<GridCellType>) => ReactNode;
     /**
-     * The rows of the grid. See {@link VGridAxis} for the accepted values.
+     * The rows of the grid. See {@link GridAxis} for the accepted values.
      */
-    rows: VGridAxis<R>;
+    rows: GridAxis<R>;
     /**
-     * The columns of the grid. See {@link VGridAxis} for the accepted values.
+     * The columns of the grid. See {@link GridAxis} for the accepted values.
      */
-    cols: VGridAxis<C>;
+    cols: GridAxis<C>;
     /**
-     * The heights of the rows. See {@link VGridSize} for the accepted values.
+     * The heights of the rows. See {@link GridSize} for the accepted values.
      */
-    rowHeight: NoInfer<VGridSize<R>>;
+    rowHeight: GridSize<R>;
     /**
-     * The widths of the columns. See {@link VGridSize} for the accepted values.
+     * The widths of the columns. See {@link GridSize} for the accepted values.
      */
-    colWidth: NoInfer<VGridSize<C>>;
+    colWidth: GridSize<C>;
     /**
      * The number of the leading rows pinned to the start, which are the column headers (`role="columnheader"`).
      *
@@ -143,15 +143,15 @@ export interface VGridProps<R = number, C = number> extends Omit<ViewportCompone
      */
     footerCols?: number;
     /**
-     * Cells merged over multiple rows and/or columns. See {@link VGridSpan} for the accepted values.
+     * Cells merged over multiple rows and/or columns. See {@link GridSpan} for the accepted values.
      *
      * The cell at the origin is stretched over the merged area, and the other cells in it are not rendered. Spans must not overlap each other or cross the boundaries of the pinned rows/columns or the sections. A spanning cell is not measured for `"auto"` sizes on the axes it spans, and doesn't enlarge those tracks.
      */
-    spans?: readonly VGridSpan[];
+    spans?: readonly GridSpan[];
     /**
      * List of cells that should be always mounted, even when off screen.
      */
-    keepMounted?: readonly VGridCell[];
+    keepMounted?: readonly GridCellType[];
     /**
      * Extra space in pixels to render before/after the viewport. The minimum value is 0. Lower value will give better performance but you can increase to avoid showing blank cells in fast scrolling.
      * @defaultValue 200
@@ -165,7 +165,7 @@ export interface VGridProps<R = number, C = number> extends Omit<ViewportCompone
     /**
      * The header cell of the sorted column or row, and the sort order (`aria-sort`).
      */
-    ariaSort?: VGridCell & {
+    ariaSort?: GridCellType & {
         order: "ascending" | "descending" | "other";
     };
     /**

package/lib/react/index.d.ts

@@ -6,5 +6,5 @@ export { WindowVirtualizer } from './WindowVirtualizer.js';
 export type { WindowVirtualizerProps, WindowVirtualizerHandle, } from './WindowVirtualizer.js';
 export { VGrid } from './VGrid.js';
 export type { VGridProps, VGridHandle } from './VGrid.js';
-export type { VGridSize, VGridSpan } from '../core/index.js';
+export type { GridSize, GridSpan } from '../core/index.js';
 export type * from './types.js';

package/lib/solid/VGrid.d.ts

@@ -1,5 +1,5 @@
 import { JSX } from 'solid-js';
-import { VGridScrollToIndexOpts, VGridAxis, VGridCell, VGridSize, VGridSpan } from '../core/index.js';
+import { GridScrollToIndexOpts, GridAxis, GridCell as GridCellType, GridSize, GridSpan } from '../core/index.js';
 import { ViewportComponentAttributes } from './types.js';
 /**
  * Methods of {@link VGrid}.
@@ -61,9 +61,9 @@ export interface VGridHandle {
     getColSize(index: number): number;
     /**
      * Scroll to the cell specified by the indexes. The cell is not hidden behind the rows and the columns sticking over it.
-     * @param opts the indexes of the cell and the options. See {@link VGridScrollToIndexOpts}.
+     * @param opts the indexes of the cell and the options. See {@link GridScrollToIndexOpts}.
      */
-    scrollToIndex(opts: VGridScrollToIndexOpts): void;
+    scrollToIndex(opts: GridScrollToIndexOpts): void;
     /**
      * Scroll to the given offsets from the top/start of the scroll container.
      * @param offset the offsets. The axis whose offset is omitted is not scrolled.
@@ -95,23 +95,23 @@ export interface VGridProps<R = number, C = number> extends Omit<ViewportCompone
      * @param col the item of {@link VGridProps.cols} at the column of the cell, or the column index if {@link VGridProps.cols} is a number
      * @param cell the row index and the column index of the cell
      */
-    children: (row: R, col: C, cell: Readonly<VGridCell>) => JSX.Element;
+    children: (row: R, col: C, cell: Readonly<GridCellType>) => JSX.Element;
     /**
-     * The rows of the grid. See {@link VGridAxis} for the accepted values.
+     * The rows of the grid. See {@link GridAxis} for the accepted values.
      */
-    rows: VGridAxis<R>;
+    rows: GridAxis<R>;
     /**
-     * The columns of the grid. See {@link VGridAxis} for the accepted values.
+     * The columns of the grid. See {@link GridAxis} for the accepted values.
      */
-    cols: VGridAxis<C>;
+    cols: GridAxis<C>;
     /**
-     * The heights of the rows. See {@link VGridSize} for the accepted values.
+     * The heights of the rows. See {@link GridSize} for the accepted values.
      */
-    rowHeight: NoInfer<VGridSize<R>>;
+    rowHeight: GridSize<R>;
     /**
-     * The widths of the columns. See {@link VGridSize} for the accepted values.
+     * The widths of the columns. See {@link GridSize} for the accepted values.
      */
-    colWidth: NoInfer<VGridSize<C>>;
+    colWidth: GridSize<C>;
     /**
      * The number of the leading rows pinned to the start, which are the column headers (`role="columnheader"`).
      *
@@ -147,15 +147,15 @@ export interface VGridProps<R = number, C = number> extends Omit<ViewportCompone
      */
     footerCols?: number;
     /**
-     * Cells merged over multiple rows and/or columns. See {@link VGridSpan} for the accepted values.
+     * Cells merged over multiple rows and/or columns. See {@link GridSpan} for the accepted values.
      *
      * The cell at the origin is stretched over the merged area, and the other cells in it are not rendered. Spans must not overlap each other or cross the boundaries of the pinned rows/columns or the sections. A spanning cell is not measured for `"auto"` sizes on the axes it spans, and doesn't enlarge those tracks.
      */
-    spans?: readonly VGridSpan[];
+    spans?: readonly GridSpan[];
     /**
      * List of cells that should be always mounted, even when off screen.
      */
-    keepMounted?: readonly VGridCell[];
+    keepMounted?: readonly GridCellType[];
     /**
      * Extra space in pixels to render before/after the viewport. The minimum value is 0. Lower value will give better performance but you can increase to avoid showing blank cells in fast scrolling.
      * @defaultValue 200
@@ -169,7 +169,7 @@ export interface VGridProps<R = number, C = number> extends Omit<ViewportCompone
     /**
      * The header cell of the sorted column or row, and the sort order (`aria-sort`).
      */
-    ariaSort?: VGridCell & {
+    ariaSort?: GridCellType & {
         order: "ascending" | "descending" | "other";
     };
     /**

package/lib/solid/index.cjs

@@ -808,49 +808,51 @@ exports.VGrid = r => {
             let h = 0, _ = !e.D(r) && null, k = r + 1, T = !1;
             for (let e = 0; e < Z; e++) {
                 const o = Y[e], l = o < x, c = o >= z, a = c || o >= I && o <= q, g = F.get(f + o);
-                if (g ? g.rowIndex !== r || g.colIndex !== o : !(i && a || n || u || l)) continue;
-                const w = g ? C(g, v) : r + 1, S = g ? L(g, m) : o + 1, y = w - r > 1, b = S - o > 1, R = y || b, M = R ? w - r : void 0, O = R ? S - o : void 0;
-                let W, E;
-                k = s(k, w);
-                const H = l ? t.$(o) : null, j = c ? t.l() - t.$(S - 1) - t.v(S - 1) : null;
-                !1 !== _ || y || (W = r, _ = !0), !1 !== N[e] || b || (E = o, N[e] = !0);
-                const B = n ? "columnheader" : o === A && (l || u) ? "rowheader" : "cell", D = "cell" !== B && $ && $.rowIndex === r && $.colIndex === o ? $.order : void 0;
-                let P;
-                if (d) {
-                    for (;h < d.length && d[h].$e < o; ) h++;
-                    h < d.length && (P = d[h]);
-                }
-                if (!P || P.$e !== o || P.we !== M || P.Se !== O || P.Te !== H || P.Re !== j || P.fe !== W || P.ge !== E || P.me !== B || P.xe !== D) {
-                    const e = {
-                        contain: "layout style",
-                        display: "grid",
-                        gridArea: R ? "1/l" + o + "/l" + w + "/l" + S : "1/l" + o
-                    };
-                    y && (e.height = "0px", e.minHeight = "100%", e.zIndex = 1), b && (e.width = "0px", 
-                    e.minWidth = "100%"), (l || c) && (l ? e.insetInlineStart = H + "px" : e.insetInlineEnd = j + "px", 
-                    e.position = "sticky", e.zIndex = 2), P = {
-                        $e: o,
-                        we: M,
-                        Se: O,
-                        fe: W,
-                        ge: E,
-                        me: B,
-                        xe: D,
-                        ve: e,
-                        Te: H,
-                        Re: j
-                    }, T = !0;
+                if (g ? g.rowIndex === r && g.colIndex === o : i && a || n || u || l) {
+                    const i = g ? C(g, v) : r + 1, a = g ? L(g, m) : o + 1, f = i - r > 1, w = a - o > 1, S = f || w, x = S ? i - r : void 0, z = S ? a - o : void 0;
+                    let y, b;
+                    k = s(k, i);
+                    const I = l ? t.$(o) : null, R = c ? t.l() - t.$(a - 1) - t.v(a - 1) : null;
+                    !1 !== _ || f || (y = r, _ = !0), !1 !== N[e] || w || (b = o, N[e] = !0);
+                    const M = n ? "columnheader" : o === A && (l || u) ? "rowheader" : "cell", O = "cell" !== M && $ && $.rowIndex === r && $.colIndex === o ? $.order : void 0;
+                    let W;
+                    if (d) {
+                        for (;h < d.length && d[h].$e < o; ) h++;
+                        h < d.length && (W = d[h]);
+                    }
+                    if (!W || W.$e !== o || W.we !== x || W.Se !== z || W.Te !== I || W.Re !== R || W.fe !== y || W.ge !== b || W.me !== M || W.xe !== O) {
+                        const e = {
+                            contain: "layout style",
+                            display: "grid",
+                            gridArea: S ? "1/l" + o + "/l" + i + "/l" + a : "1/l" + o
+                        };
+                        f && (e.height = "0px", e.minHeight = "100%", e.zIndex = 1), w && (e.width = "0px", 
+                        e.minWidth = "100%"), (l || c) && (l ? e.insetInlineStart = I + "px" : e.insetInlineEnd = R + "px", 
+                        e.position = "sticky", e.zIndex = 2), W = {
+                            $e: o,
+                            we: x,
+                            Se: z,
+                            fe: y,
+                            ge: b,
+                            me: M,
+                            xe: O,
+                            ve: e,
+                            Te: I,
+                            Re: R
+                        }, T = !0;
+                    }
+                    p.push(W);
                 }
-                p.push(P);
             }
-            if (Q.push(_), !p.length) continue;
-            const M = g && !T && g.ze.length === p.length && g.Me === a ? g : {
-                be: r,
-                ze: p,
-                ve: E(r, k, a, "top", 3),
-                Me: a
-            };
-            oe.set(r, M), re.push(M);
+            if (Q.push(_), p.length) {
+                const e = g && !T && g.ze.length === p.length && g.Me === a ? g : {
+                    be: r,
+                    ze: p,
+                    ve: E(r, k, a, "top", 3),
+                    Me: a
+                };
+                oe.set(r, e), re.push(e);
+            }
         }
         return _.set(e, oe), {
             Oe: W(e, X, Q, u(G), "max-content", v),