virtua 0.52.2 → 0.52.4

package/README.md

@@ -4,7 +4,7 @@
 
 > A zero-config, fast and small virtual list and grid component for [React](https://github.com/facebook/react), [Vue](https://vuejs.org/), [Solid](https://www.solidjs.com/), [Svelte](https://svelte.dev/) and [Angular](https://angular.dev/).
 
-![example](./example.gif)
+![list example](./example.gif) ![grid example](./example2.gif)
 
 If you want to check the difference with the alternatives right away, [see comparison section](#comparison).
 

package/lib/angular/index.js

@@ -245,11 +245,7 @@ w), M = e => b(e.$getTotalSize(), e.$getViewportSize()), _ = ({$getRange: e, $fi
     t.$setPinned(r, n), l !== e.$getItemsLength() && e.$update(5, [ l ]);
     const a = t.$setAxis(i, s, e.$getScrollOffset() - e.$getItemOffset(0), o);
     null != a && e.$update(9, a);
-}, H = /*#__PURE__*/ new WeakMap, A = (e, t, i, s, r, n, o) => {
-    if (t < s || b(t, r) < $(i, n + 1) || o < i) return !0;
-    for (const s of e) if (s >= t && s < i) return !0;
-    return !1;
-}, B = (e, t, i) => {
+}, H = /*#__PURE__*/ new WeakMap, A = (e, t, i, s, r, n) => e < i || b(e, s) < $(t, r + 1) || n < t, B = (e, t, i) => {
     const s = [];
     for (const r of e) r >= t && r < i && s.push(r);
     return P(s);
@@ -261,25 +257,22 @@ w), M = e => b(e.$getTotalSize(), e.$getViewportSize()), _ = ({$getRange: e, $fi
         e[i] <= t ? s = i + 1 : r = i;
     }
     return s - 1;
-}, J = (e, t, i, s) => {
-    const r = j(t, i, s);
-    r >= 0 && e.push(t[r]);
-}, Q = (e, t, i, s, r) => {
+}, J = (e, t, i, s, r) => {
     const n = t.length;
     for (;i < n && t[i] < s; i++) {
         const s = t[i];
         s > r && (e.push(s), r = s);
     }
     return i;
-}, X = (e, t, i, s, r, n) => {
+}, Q = (e, t, i, s, r, n) => {
     const o = [];
     for (let e = 0; e < i; e++) o.push(e);
-    const l = Q(o, e, 0, s, i - 1);
+    const l = J(o, e, 0, s, i - 1);
     for (let e = s; e <= r; e++) o.push(e);
-    Q(o, e, l, n, r);
+    J(o, e, l, n, r);
     for (let e = n; e < t; e++) o.push(e);
     return o;
-}, Y = (e, t) => $(e.rowIndex + (e.rowSpan || 1), t), U = (e, t) => $(e.colIndex + (e.colSpan || 1), t), Z = (e, t, i, s, r, n) => {
+}, X = (e, t) => $(e.rowIndex + (e.rowSpan || 1), t), Y = (e, t) => $(e.colIndex + (e.colSpan || 1), t), U = (e, t, i, s, r, n) => {
     const o = t.length, l = s.length;
     let a = "[l0]", c = 0, u = 0, p = 0;
     for (;c < n; ) {
@@ -295,7 +288,7 @@ w), M = e => b(e.$getTotalSize(), e.$getViewportSize()), _ = ({$getRange: e, $fi
         a += " " + h + " [l" + d + "]", c = d;
     }
     return a;
-}, ee = (e, t, i, s, r) => {
+}, Z = (e, t, i, s, r) => {
     const n = {
         display: "grid",
         gridTemplateRows: "subgrid",
@@ -304,7 +297,7 @@ w), M = e => b(e.$getTotalSize(), e.$getViewportSize()), _ = ({$getRange: e, $fi
         gridRow: "l" + e + "/l" + t
     };
     return null != i && (n.position = "sticky", n[s] = i + "px", n.zIndex = r), n;
-}, te = e => {
+}, ee = e => {
     let t;
     return {
         i(i) {
@@ -317,7 +310,7 @@ w), M = e => b(e.$getTotalSize(), e.$getViewportSize()), _ = ({$getRange: e, $fi
             t && t.disconnect();
         }
     };
-}, ie = (e, t, i, s, r, n, o) => {
+}, te = (e, t, i, s, r, n, o) => {
     let l, a, c = 0, u = !1, p = !1, m = !1, d = !1;
     const h = Date.now, f = s ? "scrollLeft" : "scrollTop", g = s ? "left" : "top", S = e => r ? -e : e, y = () => S(i[f]), v = (e, t) => {
         i.scrollTo({
@@ -386,9 +379,9 @@ w), M = e => b(e.$getTotalSize(), e.$getViewportSize()), _ = ({$getRange: e, $fi
             i ? (e.$update(8, t()), F(c)) : c();
         }
     };
-}, se = (e, t) => {
+}, ie = (e, t) => {
     e.$scroll(() => t);
-}, re = (e, t, i, {align: s, smooth: r, offset: n = 0} = {}) => {
+}, se = (e, t, i, {align: s, smooth: r, offset: n = 0} = {}) => {
     if (i = I(i, 0, t.$getItemsLength() - 1), "nearest" === s) {
         const e = t.$getItemOffset(i), r = t.$getScrollOffset();
         if (e < r) s = "start"; else {
@@ -397,10 +390,10 @@ w), M = e => b(e.$getTotalSize(), e.$getViewportSize()), _ = ({$getRange: e, $fi
         }
     }
     e.$scroll(() => n + e.$getBaseOffset() + t.$getItemOffset(i) + ("end" === s ? t.$getItemSize(i) - t.$getViewportSize() : "center" === s ? (t.$getItemSize(i) - t.$getViewportSize()) / 2 : 0), r);
-}, ne = (e, t, i, s, r, n, o) => {
+}, re = (e, t, i, s, r, n, o) => {
     const l = t.$getItemsLength(), a = i.$getPinnedStart(), c = i.$getTrailStart();
     r = I(r, 0, l - 1);
-    const u = B(s, a, c), p = j(u, r, c), m = p < 0 ? -1 : u[p], d = () => i.$getItemOffset(a) + (m < 0 || m === r ? 0 : t.$getItemOffset(m + 1) - t.$getItemOffset(m)), h = () => i.$getItemOffset(l) - i.$getItemOffset(c);
+    const u = B(s, a, c), p = j(u, r, c), m = p < 0 ? -1 : u[p], d = () => i.$getItemOffset(a) + (m < 0 || m === r ? 0 : i.$getItemOffset(m + 1) - i.$getItemOffset(m)), h = () => i.$getItemOffset(l) - i.$getItemOffset(c);
     if ("nearest" === n) {
         if (r < a || r >= c) return;
         const e = d(), i = t.$getScrollOffset() + e, s = t.$getViewportSize() - e - h(), o = t.$getItemSize(r);
@@ -418,7 +411,7 @@ w), M = e => b(e.$getTotalSize(), e.$getViewportSize()), _ = ({$getRange: e, $fi
         const e = d(), i = t.$getItemSize(r) - (t.$getViewportSize() - e - h());
         return t.$getItemOffset(r) - e + ("end" === n ? i : "center" === n ? i / 2 : 0);
     });
-}, oe = class t {
+}, ne = class t {
     index=h.required();
     offset=h.required();
     hide=h.required();
@@ -530,9 +523,9 @@ w), M = e => b(e.$getTotalSize(), e.$getViewportSize()), _ = ({$getRange: e, $fi
         },
         ngImport: e
     });
-}, le = (e, t) => "_" + t, ae = /*#__PURE__*/ new o("virtua-item-template"), ce = class i {
+}, oe = (e, t) => "_" + t, le = /*#__PURE__*/ new o("virtua-item-template"), ae = class i {
     data=h.required();
-    getKey=h(le);
+    getKey=h(oe);
     itemProps=h();
     bufferSize=h();
     scrollRef=h();
@@ -548,7 +541,7 @@ w), M = e => b(e.$getTotalSize(), e.$getViewportSize()), _ = ({$getRange: e, $fi
     scrolled=f();
     scrollEnded=f();
     contentTemplate=p(l);
-    m=d(ae, {
+    m=d(le, {
         optional: !0
     });
     template=u(() => this.m?.() ?? this.contentTemplate());
@@ -626,7 +619,7 @@ w), M = e => b(e.$getTotalSize(), e.$getViewportSize()), _ = ({$getRange: e, $fi
         const i = this.S = L(this.data().length, e, this.cacheProp()), s = this.h = _(i, t);
         this.driver = ((e, t) => {
             let i, s, r = k();
-            const n = /* @__PURE__ */ new WeakMap, o = te(s => {
+            const n = /* @__PURE__ */ new WeakMap, o = ee(s => {
                 const r = [];
                 for (const {target: o, contentRect: {width: l, height: a}} of s) if (o === i) (l || a) && e.$update(4, t ? l : a); else if (o.offsetParent) {
                     const e = n.get(o);
@@ -636,7 +629,7 @@ w), M = e => b(e.$getTotalSize(), e.$getViewportSize()), _ = ({$getRange: e, $fi
             });
             return {
                 $observe(n, l = n.parentElement) {
-                    o.i(i = l), s = ie(e, l, l, t, t && "rtl" === getComputedStyle(l).direction, () => {
+                    o.i(i = l), s = te(e, l, l, t, t && "rtl" === getComputedStyle(l).direction, () => {
                         const e = t ? "overflowX" : "overflowY", i = l.style, s = i[e];
                         i[e] = "hidden", x(() => {
                             i[e] = s;
@@ -687,14 +680,14 @@ w), M = e => b(e.$getTotalSize(), e.$getViewportSize()), _ = ({$getRange: e, $fi
         return this.h.$getItemSize(e);
     }
     scrollToIndex(e, t) {
-        re(this.driver, this.h, e, t);
+        se(this.driver, this.h, e, t);
     }
     scrollTo(e) {
-        se(this.driver, e);
+        ie(this.driver, e);
     }
     scrollBy(e) {
         ((e, t, i) => {
-            se(e, i + t.$getScrollOffset());
+            ie(e, i + t.$getScrollOffset());
         })(this.driver, this.h, e);
     }
     static ɵfac=/*@__PURE__*/ e.ɵɵngDeclareFactory({
@@ -819,7 +812,7 @@ w), M = e => b(e.$getTotalSize(), e.$getViewportSize()), _ = ({$getRange: e, $fi
         isInline: !0,
         dependencies: [ {
             kind: "directive",
-            type: e.forwardRef(() => oe),
+            type: e.forwardRef(() => ne),
             selector: "div[virtuaListItem]",
             inputs: [ "index", "offset", "hide", "horizontal", "isSSR", "resizer", "attrs" ]
         }, {
@@ -834,9 +827,9 @@ w), M = e => b(e.$getTotalSize(), e.$getViewportSize()), _ = ({$getRange: e, $fi
 
 i.OnPush;
 
-var ue = class t {
+var ce = class t {
     data=h.required();
-    getKey=h(le);
+    getKey=h(oe);
     itemProps=h();
     bufferSize=h();
     itemSize=h();
@@ -850,7 +843,7 @@ var ue = class t {
     scrolled=f();
     scrollEnded=f();
     template=p.required(l);
-    virtualizer=y.required(ce);
+    virtualizer=y.required(ae);
     v=d(r).nativeElement;
     ngOnInit() {
         const e = this.horizontal(), t = this.v;
@@ -987,7 +980,7 @@ var ue = class t {
         viewQueries: [ {
             propertyName: "virtualizer",
             first: !0,
-            predicate: ce,
+            predicate: ae,
             emitDistinctChangesOnly: !1,
             descendants: !0,
             isSignal: !0
@@ -997,13 +990,13 @@ var ue = class t {
         isInline: !0,
         dependencies: [ {
             kind: "directive",
-            type: e.forwardRef(() => ce),
+            type: e.forwardRef(() => ae),
             selector: "virtua-virtualizer",
             inputs: [ "data", "getKey", "itemProps", "bufferSize", "scrollRef", "itemSize", "ssrCount", "shift", "horizontal", "keepMounted", "cache", "startMargin" ],
             outputs: [ "scrolled", "scrollEnded" ]
         } ],
         viewProviders: [ {
-            provide: ae,
+            provide: le,
             useFactory: () => d(t).template
         } ],
         changeDetection: e.ChangeDetectionStrategy.OnPush
@@ -1012,9 +1005,9 @@ var ue = class t {
 
 i.OnPush;
 
-var pe = class i {
+var ue = class i {
     data=h.required();
-    getKey=h(le);
+    getKey=h(oe);
     bufferSize=h();
     itemSize=h();
     ssrCount=h();
@@ -1084,7 +1077,7 @@ var pe = class i {
         const i = this.S = L(this.data().length, e, this.cacheProp()), s = this.h = _(i, t);
         this.driver = ((e, t) => {
             let i, s, r, n, o, l = k();
-            const a = /* @__PURE__ */ new WeakMap, c = te(s => {
+            const a = /* @__PURE__ */ new WeakMap, c = ee(s => {
                 const r = [];
                 for (const {target: e, contentRect: {width: n, height: l}} of s) if (e === i) o && o(); else if (e.offsetParent) {
                     const i = a.get(e);
@@ -1102,7 +1095,7 @@ var pe = class i {
                     };
                     p.addEventListener("resize", g), c.i(m), r = () => {
                         p.removeEventListener("resize", g);
-                    }, s = ie(e, p, m, t, d, null, f), l[1](!0);
+                    }, s = te(e, p, m, t, d, null, f), l[1](!0);
                 },
                 $dispose() {
                     r && r(), c.l(), s && s.l(), l[1](!1), l = k();
@@ -1145,7 +1138,7 @@ var pe = class i {
         return this.h.$getItemSize(e);
     }
     scrollToIndex(e, t) {
-        re(this.driver, this.h, e, t);
+        se(this.driver, this.h, e, t);
     }
     static ɵfac=/*@__PURE__*/ e.ɵɵngDeclareFactory({
         minVersion: "12.0.0",
@@ -1241,7 +1234,7 @@ var pe = class i {
         isInline: !0,
         dependencies: [ {
             kind: "directive",
-            type: e.forwardRef(() => oe),
+            type: e.forwardRef(() => ne),
             selector: "div[virtuaListItem]",
             inputs: [ "index", "offset", "hide", "horizontal", "isSSR", "resizer", "attrs" ]
         }, {
@@ -1256,7 +1249,7 @@ var pe = class i {
 
 i.OnPush;
 
-var me = class t {
+var pe = class t {
     state=h.required();
     resizer=h.required();
     constructor() {
@@ -1313,7 +1306,7 @@ var me = class t {
         },
         ngImport: e
     });
-}, de = class t {
+}, me = class t {
     state=h.required();
     template=h.required();
     row=h.required();
@@ -1387,7 +1380,7 @@ var me = class t {
         isInline: !0,
         dependencies: [ {
             kind: "directive",
-            type: e.forwardRef(() => me),
+            type: e.forwardRef(() => pe),
             selector: "div[virtuaGridCell]",
             inputs: [ "state", "resizer" ]
         }, {
@@ -1398,7 +1391,7 @@ var me = class t {
         } ],
         changeDetection: e.ChangeDetectionStrategy.OnPush
     });
-}, he = class t {
+}, de = class t {
     state=h.required();
     template=h.required();
     rows=h.required();
@@ -1471,13 +1464,13 @@ var me = class t {
         isInline: !0,
         dependencies: [ {
             kind: "directive",
-            type: e.forwardRef(() => de),
+            type: e.forwardRef(() => me),
             selector: "div[virtuaGridRow]",
             inputs: [ "state", "template", "row", "cols", "resizer" ]
         } ],
         changeDetection: e.ChangeDetectionStrategy.OnPush
     });
-}, fe = class i {
+}, he = class i {
     rows=h.required();
     cols=h.required();
     rowHeight=h.required();
@@ -1516,112 +1509,108 @@ var me = class t {
     plan=u(() => (this.N(), ((e, t, i, s, r = z, n = z, o = z, l) => {
         const a = e.$getLength(), c = t.$getLength(), u = e.$getPinnedStart(), p = e.$getTrailStart(), m = t.$getPinnedStart(), d = t.$getTrailStart(), h = I(i[0], u, p), f = $(i[1], p - 1), g = I(s[0], m, d), S = $(s[1], d - 1), y = B(r, u, p), v = b(m - 1, 0), w = [], N = [], R = [];
         for (const e of o) e.rowIndex < a && e.colIndex < c && R.push(e);
-        const x = y.length;
-        x && (J(w, y, h, p), N.push(v));
-        let q = n, F = 0;
-        do {
-            for (;F < R.length; F++) {
-                const {rowIndex: e, colIndex: t} = R[F];
-                w.push(e), J(w, y, e, p), N.push(t);
-            }
-            const e = [];
-            for (const t of q) {
-                const i = t.rowIndex, s = t.colIndex, r = Y(t, a), n = U(t, c);
-                if (i < a && s < c && (r - i > 1 || n - s > 1)) {
-                    const o = A(w, i, r, u, h, f, p);
-                    if (o && A(N, s, n, m, g, S, d)) R.push(t); else if (o) {
-                        const s = j(y, r - 1, p);
-                        (i < u || s >= 0 && y[s] >= i) && e.push(t);
-                    } else s < m && e.push(t);
+        const x = R.length, q = y.length, F = j(y, h, p), k = F < 0 ? -1 : y[F];
+        k >= 0 && w.push(k);
+        for (const e of n) {
+            const t = e.rowIndex, i = e.colIndex, s = X(e, a), r = Y(e, c);
+            if (t < a && i < c && (s - t > 1 || r - i > 1)) {
+                let n = (A(t, s, u, h, f, p) || k >= t && k < s) && A(i, r, m, g, S, d);
+                for (let e = 0; !n && e < x; e++) {
+                    const {rowIndex: o, colIndex: l} = R[e];
+                    n = o >= t && o < s && l >= i && l < r;
                 }
+                n && R.push(e);
             }
-            q = e;
-        } while (F < R.length);
+        }
+        for (const {rowIndex: e, colIndex: t} of R) {
+            const i = j(y, e, p);
+            w.push(e), i >= 0 && w.push(y[i]), N.push(t);
+        }
         P(w), P(N);
-        const k = X(w, a, u, h, f, p), C = X(N, c, m, g, S, d), O = k.length, T = C.length, M = /* @__PURE__ */ new Map, _ = [], V = [];
+        const C = Q(w, a, u, h, f, p), O = Q(N, c, m, g, S, d), T = C.length, M = O.length, _ = /* @__PURE__ */ new Map, V = [], E = [];
         for (const e of R) {
-            const t = Y(e, a), i = U(e, c);
-            _.push(t), V.push(i);
-            const s = C.indexOf(e.colIndex);
-            for (let r = k.indexOf(e.rowIndex); r < O && k[r] < t; r++) {
-                const t = k[r] * c;
-                for (let r = s; r < T && C[r] < i; r++) M.set(t + C[r], e);
+            const t = X(e, a), i = Y(e, c);
+            V.push(t), E.push(i);
+            const s = O.indexOf(e.colIndex);
+            for (let r = C.indexOf(e.rowIndex); r < T && C[r] < t; r++) {
+                const t = C[r] * c;
+                for (let r = s; r < M && O[r] < i; r++) _.set(t + O[r], e);
             }
         }
-        const E = [];
-        for (const e of C) E.push(!t.$isMeasurable(e) && null);
-        const L = [], D = e.$getItemOffset(u), K = [];
-        let G = K;
-        const W = H.get(e), Q = /* @__PURE__ */ new Map;
-        for (const i of k) {
-            const s = i < u, r = i >= p, n = r || i >= h && i <= f, o = j(y, i, p), w = s ? 0 : r ? p : o < 0 ? -1 : y[o];
-            if (i === w) {
-                const e = s ? u : r ? a : o + 1 < x ? y[o + 1] : p;
-                _.push(e);
+        const L = [];
+        for (const e of O) L.push(!t.$isMeasurable(e) && null);
+        const D = [], K = e.$getItemOffset(u), G = [];
+        let W = G;
+        const J = H.get(e), ee = /* @__PURE__ */ new Map;
+        for (const i of C) {
+            const s = i < u, r = i >= p, n = j(y, i, p), o = s ? 0 : r ? p : n < 0 ? -1 : y[n];
+            if (i === o) {
+                const e = s ? u : r ? a : n + 1 < q ? y[n + 1] : p;
+                V.push(e);
                 const t = [];
-                K.push({
-                    $key: s ? -1 : r ? -2 : -3 - w,
+                G.push({
+                    $key: s ? -1 : r ? -2 : -3 - o,
                     $rows: t,
-                    $style: ee(w, e, s || r ? 0 : null, r ? "bottom" : "top", 4)
-                }), G = t;
-            } else w < 0 && (G = K);
-            const z = o >= 0 && i === w, $ = z ? D : null, N = i * c, R = W && W.get(i), I = R && R.$cells, P = [];
-            let q = 0, F = !e.$isMeasurable(i) && null, k = i + 1, O = !1;
-            for (let e = 0; e < T; e++) {
-                const r = C[e], o = r < m, u = r >= d, p = u || r >= g && r <= S, h = M.get(N + r);
-                if (h ? h.rowIndex === i && h.colIndex === r : n && p || s || z || o) {
-                    const n = h ? Y(h, a) : i + 1, p = h ? U(h, c) : r + 1, m = n - i, d = p - r, f = m > 1, g = d > 1, S = f || g;
-                    let y, w;
-                    k = b(k, n);
-                    const $ = o ? t.$getItemOffset(r) : null, N = u ? t.$getTotalSize() - t.$getItemOffset(p - 1) - t.$getItemSize(p - 1) : null;
-                    !1 !== F || f || (y = i, F = !0), !1 !== E[e] || g || (w = r, E[e] = !0);
-                    const R = s ? "columnheader" : r === v && (o || z) ? "rowheader" : "cell", x = S ? m : void 0, C = S ? d : void 0, T = "cell" !== R && l && l.rowIndex === i && l.colIndex === r ? l.order : void 0;
+                    $style: Z(o, e, s || r ? 0 : null, r ? "bottom" : "top", 4)
+                }), W = t;
+            } else o < 0 && (W = G);
+            const w = n >= 0 && i === o, z = s || r || i === k || i >= h && i <= f, $ = w ? K : null, N = i * c, R = J && J.get(i), I = R && R.$cells, P = [];
+            let x = 0, F = !e.$isMeasurable(i) && null, C = i + 1, T = !1;
+            for (let e = 0; e < M; e++) {
+                const r = O[e], n = r < m, o = r >= d, u = n || o || r >= g && r <= S, p = _.get(N + r);
+                if (p ? p.rowIndex === i && p.colIndex === r : z && u) {
+                    const u = p ? X(p, a) : i + 1, m = p ? Y(p, c) : r + 1, d = u - i, h = m - r, f = d > 1, g = h > 1, S = f || g;
+                    let y, z;
+                    C = b(C, u);
+                    const $ = n ? t.$getItemOffset(r) : null, N = o ? t.$getTotalSize() - t.$getItemOffset(m - 1) - t.$getItemSize(m - 1) : null;
+                    !1 !== F || f || (y = i, F = !0), !1 !== L[e] || g || (z = r, L[e] = !0);
+                    const R = s ? "columnheader" : r === v && (n || w) ? "rowheader" : "cell", q = S ? d : void 0, k = S ? h : void 0, O = "cell" !== R && l && l.rowIndex === i && l.colIndex === r ? l.order : void 0;
                     let M;
                     if (I) {
                         const e = I.length;
-                        for (;q < e && I[q].$col < r; ) q++;
-                        q < e && I[q].$col === r && (M = I[q]);
+                        for (;x < e && I[x].$col < r; ) x++;
+                        x < e && I[x].$col === r && (M = I[x]);
                     }
-                    if (!M || M.$rowSpan !== x || M.$colSpan !== C || M.$start !== $ || M.$end !== N || M.$measureRow !== y || M.$measureCol !== w || M.$role !== R || M.$sort !== T) {
+                    if (!M || M.$rowSpan !== q || M.$colSpan !== k || M.$start !== $ || M.$end !== N || M.$measureRow !== y || M.$measureCol !== z || M.$role !== R || M.$sort !== O) {
                         let e = "1/l" + r;
-                        S && (e += "/l" + n + "/l" + p);
+                        S && (e += "/l" + u + "/l" + m);
                         const t = {
                             contain: "layout style",
                             display: "grid",
                             gridArea: e
                         };
                         f && (t.height = "0px", t.minHeight = "100%", t.zIndex = 1), g && (t.width = "0px", 
-                        t.minWidth = "100%"), (o || u) && (t[o ? "insetInlineStart" : "insetInlineEnd"] = (o ? $ : N) + "px", 
+                        t.minWidth = "100%"), (n || o) && (t[n ? "insetInlineStart" : "insetInlineEnd"] = (n ? $ : N) + "px", 
                         t.position = "sticky", t.zIndex = 2), M = {
                             $col: r,
-                            $rowSpan: x,
-                            $colSpan: C,
+                            $rowSpan: q,
+                            $colSpan: k,
                             $measureRow: y,
-                            $measureCol: w,
+                            $measureCol: z,
                             $role: R,
-                            $sort: T,
+                            $sort: O,
                             $style: t,
                             $start: $,
                             $end: N
-                        }, O = !0;
+                        }, T = !0;
                     }
                     P.push(M);
                 }
             }
-            if (L.push(F), P.length) {
-                const e = R && !O && R.$cells.length === P.length && R.$top === $ ? R : {
+            if (D.push(F), P.length) {
+                const e = R && !T && R.$cells.length === P.length && R.$top === $ ? R : {
                     $row: i,
                     $cells: P,
-                    $style: ee(i, k, $, "top", 3),
+                    $style: Z(i, C, $, "top", 3),
                     $top: $
                 };
-                Q.set(i, e), G.push(e);
+                ee.set(i, e), W.push(e);
             }
         }
-        return H.set(e, Q), {
-            $rowTemplate: Z(e, k, L, P(_), "max-content", a),
-            $colTemplate: Z(t, C, E, P(V), "minmax(max-content,auto)", c),
-            $groups: K
+        return H.set(e, ee), {
+            $rowTemplate: U(e, C, D, P(V), "max-content", a),
+            $colTemplate: U(t, O, L, P(E), "minmax(max-content,auto)", c),
+            $groups: G
         };
     })(this.q, this.F, this.I.$getRange(this.bufferSize()), this.P.$getRange(this.bufferSize()), this.sectionRows(), this.spans(), this.keepMounted(), this.ariaSort())));
     rowItem(e) {
@@ -1668,7 +1657,7 @@ var me = class t {
         const t = this.gap(), i = this.q = G(this.rows(), this.rowHeight(), t), s = this.F = G(this.cols(), this.colWidth(), t), r = this.I = _(i), n = this.P = _(s);
         this.driver = ((e, t) => {
             let i, s, r, n = k();
-            const o = /* @__PURE__ */ new WeakMap, l = /* @__PURE__ */ new WeakMap, a = te(s => {
+            const o = /* @__PURE__ */ new WeakMap, l = /* @__PURE__ */ new WeakMap, a = ee(s => {
                 const r = [], n = [];
                 for (const {target: a, contentRect: {width: c, height: u}} of s) if (a === i) (c || u) && (e.$update(4, u), 
                 t.$update(4, c)); else if (a.offsetParent) {
@@ -1684,7 +1673,7 @@ var me = class t {
                 $observe(o) {
                     const l = i = o.parentElement;
                     a.i(l);
-                    const c = (e, t) => ie(e, l, l, t, t && "rtl" === getComputedStyle(l).direction, () => {
+                    const c = (e, t) => te(e, l, l, t, t && "rtl" === getComputedStyle(l).direction, () => {
                         const e = t ? "overflowX" : "overflowY", i = l.style, s = i[e];
                         i[e] = "hidden", x(() => {
                             i[e] = s;
@@ -1757,7 +1746,7 @@ var me = class t {
     }
     scrollToIndex(e) {
         ((e, t, i, s, r, n = z, {rowIndex: o, colIndex: l, rowAlign: a, colAlign: c}) => {
-            null != o && ne(e, t, s, n, o, a, !1), null != l && ne(e, i, r, z, l, c, !0);
+            null != o && re(e, t, s, n, o, a, !1), null != l && re(e, i, r, z, l, c, !0);
         })(this.driver, this.I, this.P, this.q, this.F, this.sectionRows(), e);
     }
     scrollTo({vertical: e, horizontal: t}) {
@@ -1926,12 +1915,12 @@ var me = class t {
         isInline: !0,
         dependencies: [ {
             kind: "directive",
-            type: e.forwardRef(() => he),
+            type: e.forwardRef(() => de),
             selector: "div[virtuaGridRowGroup]",
             inputs: [ "state", "template", "rows", "cols", "resizer" ]
         }, {
             kind: "directive",
-            type: e.forwardRef(() => de),
+            type: e.forwardRef(() => me),
             selector: "div[virtuaGridRow]",
             inputs: [ "state", "template", "row", "cols", "resizer" ]
         } ],
@@ -1941,5 +1930,5 @@ var me = class t {
 
 i.OnPush, i.OnPush, i.OnPush;
 
-export { fe as VGrid, ue as VList, ce as Virtualizer, pe as WindowVirtualizer };
+export { he as VGrid, ce as VList, ae as Virtualizer, ue as WindowVirtualizer };
 //# sourceMappingURL=index.js.map