virtua 0.52.2 → 0.52.4

package/lib/index.js

@@ -247,11 +247,7 @@ f), b = e => $(e.t(), e.o()), k = ({l: e, i: t, u: o, $: n, h: r, p: s, t: l, m:
     t.q(r, s), i !== e.T() && e.W(5, [ i ]);
     const c = t.V(o, n, e.M() - e.u(0), l);
     null != c && e.W(9, c);
-}, A = /*#__PURE__*/ new WeakMap, W = (e, t, o, n, r, s, l) => {
-    if (t < n || $(t, r) < d(o, s + 1) || l < o) return !0;
-    for (const n of e) if (n >= t && n < o) return !0;
-    return !1;
-}, H = (e, t, o) => {
+}, A = /*#__PURE__*/ new WeakMap, W = (e, t, o, n, r, s) => e < o || $(e, n) < d(t, r + 1) || s < t, H = (e, t, o) => {
     const n = [];
     for (const r of e) r >= t && r < o && n.push(r);
     return m(n);
@@ -263,25 +259,22 @@ f), b = e => $(e.t(), e.o()), k = ({l: e, i: t, u: o, $: n, h: r, p: s, t: l, m:
         e[o] <= t ? n = o + 1 : r = o;
     }
     return n - 1;
-}, q = (e, t, o, n) => {
-    const r = P(t, o, n);
-    r >= 0 && e.push(t[r]);
-}, B = (e, t, o, n, r) => {
+}, q = (e, t, o, n, r) => {
     const s = t.length;
     for (;o < s && t[o] < n; o++) {
         const n = t[o];
         n > r && (e.push(n), r = n);
     }
     return o;
-}, D = (e, t, o, n, r, s) => {
+}, B = (e, t, o, n, r, s) => {
     const l = [];
     for (let e = 0; e < o; e++) l.push(e);
-    const i = B(l, e, 0, n, o - 1);
+    const i = q(l, e, 0, n, o - 1);
     for (let e = n; e <= r; e++) l.push(e);
-    B(l, e, i, s, r);
+    q(l, e, i, s, r);
     for (let e = s; e < t; e++) l.push(e);
     return l;
-}, V = (e, t) => d(e.rowIndex + (e.rowSpan || 1), t), X = (e, t) => d(e.colIndex + (e.colSpan || 1), t), Y = (e, t, o, n, r, s) => {
+}, D = (e, t) => d(e.rowIndex + (e.rowSpan || 1), t), V = (e, t) => d(e.colIndex + (e.colSpan || 1), t), X = (e, t, o, n, r, s) => {
     const l = t.length, i = n.length;
     let c = "[l0]", a = 0, f = 0, u = 0;
     for (;a < s; ) {
@@ -296,7 +289,7 @@ f), b = e => $(e.t(), e.o()), k = ({l: e, i: t, u: o, $: n, h: r, p: s, t: l, m:
         c += " " + h + " [l" + g + "]", a = g;
     }
     return c;
-}, j = (e, t, o, n, r) => {
+}, Y = (e, t, o, n, r) => {
     const s = {
         display: "grid",
         gridTemplateRows: "subgrid",
@@ -305,7 +298,7 @@ f), b = e => $(e.t(), e.o()), k = ({l: e, i: t, u: o, $: n, h: r, p: s, t: l, m:
         gridRow: "l" + e + "/l" + t
     };
     return null != o && (s.position = "sticky", s[n] = o + "px", s.zIndex = r), s;
-}, J = e => {
+}, j = e => {
     let t;
     return {
         X(o) {
@@ -318,7 +311,7 @@ f), b = e => $(e.t(), e.o()), k = ({l: e, i: t, u: o, $: n, h: r, p: s, t: l, m:
             t && t.disconnect();
         }
     };
-}, U = (e, t, o, n, r, s, l) => {
+}, J = (e, t, o, n, r, s, l) => {
     let i, c, a = 0, f = !1, u = !1, d = !1, $ = !1;
     const g = Date.now, h = n ? "scrollLeft" : "scrollTop", p = n ? "left" : "top", m = e => r ? -e : e, v = () => m(o[h]), z = (e, t) => {
         o.scrollTo({
@@ -387,9 +380,9 @@ f), b = e => $(e.t(), e.o()), k = ({l: e, i: t, u: o, $: n, h: r, p: s, t: l, m:
             o ? (e.W(8, t()), _(a)) : a();
         }
     };
-}, F = (e, t) => {
+}, U = (e, t) => {
     let o, n, r = v();
-    const s = /* @__PURE__ */ new WeakMap, l = J(n => {
+    const s = /* @__PURE__ */ new WeakMap, l = j(n => {
         const r = [];
         for (const {target: l, contentRect: {width: i, height: c}} of n) if (l === o) (i || c) && e.W(4, t ? i : c); else if (l.offsetParent) {
             const e = s.get(l);
@@ -399,7 +392,7 @@ f), b = e => $(e.t(), e.o()), k = ({l: e, i: t, u: o, $: n, h: r, p: s, t: l, m:
     });
     return {
         F(s, i = s.parentElement) {
-            l.X(o = i), n = U(e, i, i, t, t && "rtl" === getComputedStyle(i).direction, () => {
+            l.X(o = i), n = J(e, i, i, t, t && "rtl" === getComputedStyle(i).direction, () => {
                 const e = t ? "overflowX" : "overflowY", o = i.style, n = o[e];
                 o[e] = "hidden", w(() => {
                     o[e] = n;
@@ -420,9 +413,9 @@ f), b = e => $(e.t(), e.o()), k = ({l: e, i: t, u: o, $: n, h: r, p: s, t: l, m:
         },
         Z: e.O
     };
-}, G = (e, t) => {
+}, F = (e, t) => {
     let o, n, r, s, l, i = v();
-    const c = /* @__PURE__ */ new WeakMap, a = J(n => {
+    const c = /* @__PURE__ */ new WeakMap, a = j(n => {
         const r = [];
         for (const {target: e, contentRect: {width: s, height: i}} of n) if (e === o) l && l(); else if (e.offsetParent) {
             const o = c.get(e);
@@ -440,7 +433,7 @@ f), b = e => $(e.t(), e.o()), k = ({l: e, i: t, u: o, $: n, h: r, p: s, t: l, m:
             };
             u.addEventListener("resize", p), a.X(d), r = () => {
                 u.removeEventListener("resize", p);
-            }, n = U(e, u, d, t, $, null, h), i[1](!0);
+            }, n = J(e, u, d, t, $, null, h), i[1](!0);
         },
         v() {
             r && r(), a.j(), n && n.j(), i[1](!1), i = v();
@@ -456,9 +449,9 @@ f), b = e => $(e.t(), e.o()), k = ({l: e, i: t, u: o, $: n, h: r, p: s, t: l, m:
         },
         Z: () => s()
     };
-}, K = (e, t) => {
+}, G = (e, t) => {
     let o, n, r, s = v();
-    const l = /* @__PURE__ */ new WeakMap, i = /* @__PURE__ */ new WeakMap, c = J(n => {
+    const l = /* @__PURE__ */ new WeakMap, i = /* @__PURE__ */ new WeakMap, c = j(n => {
         const r = [], s = [];
         for (const {target: c, contentRect: {width: a, height: f}} of n) if (c === o) (a || f) && (e.W(4, f), 
         t.W(4, a)); else if (c.offsetParent) {
@@ -474,7 +467,7 @@ f), b = e => $(e.t(), e.o()), k = ({l: e, i: t, u: o, $: n, h: r, p: s, t: l, m:
         F(l) {
             const i = o = l.parentElement;
             c.X(i);
-            const a = (e, t) => U(e, i, i, t, t && "rtl" === getComputedStyle(i).direction, () => {
+            const a = (e, t) => J(e, i, i, t, t && "rtl" === getComputedStyle(i).direction, () => {
                 const e = t ? "overflowX" : "overflowY", o = i.style, n = o[e];
                 o[e] = "hidden", w(() => {
                     o[e] = n;
@@ -492,9 +485,9 @@ f), b = e => $(e.t(), e.o()), k = ({l: e, i: t, u: o, $: n, h: r, p: s, t: l, m:
             n && n.J(), r && r.J();
         }
     };
-}, N = (e, t) => {
+}, K = (e, t) => {
     e.K(() => t);
-}, Q = (e, t, o, {align: n, smooth: r, offset: s = 0} = {}) => {
+}, N = (e, t, o, {align: n, smooth: r, offset: s = 0} = {}) => {
     if (o = p(o, 0, t.T() - 1), "nearest" === n) {
         const e = t.u(o), r = t.M();
         if (e < r) n = "start"; else {
@@ -503,10 +496,10 @@ f), b = e => $(e.t(), e.o()), k = ({l: e, i: t, u: o, $: n, h: r, p: s, t: l, m:
         }
     }
     e.K(() => s + e.Z() + t.u(o) + ("end" === n ? t.$(o) - t.o() : "center" === n ? (t.$(o) - t.o()) / 2 : 0), r);
-}, Z = (e, t, o, n, r, s, l) => {
+}, Q = (e, t, o, n, r, s, l) => {
     const i = t.T(), c = o.B(), a = o.D();
     r = p(r, 0, i - 1);
-    const f = H(n, c, a), u = P(f, r, a), g = u < 0 ? -1 : f[u], h = () => o.u(c) + (g < 0 || g === r ? 0 : t.u(g + 1) - t.u(g)), m = () => o.u(i) - o.u(a);
+    const f = H(n, c, a), u = P(f, r, a), g = u < 0 ? -1 : f[u], h = () => o.u(c) + (g < 0 || g === r ? 0 : o.u(g + 1) - o.u(g)), m = () => o.u(i) - o.u(a);
     if ("nearest" === s) {
         if (r < c || r >= a) return;
         const e = h(), o = t.M() + e, n = t.o() - e - m(), l = t.$(r);
@@ -524,22 +517,22 @@ f), b = e => $(e.t(), e.o()), k = ({l: e, i: t, u: o, $: n, h: r, p: s, t: l, m:
         const e = h(), o = t.$(r) - (t.o() - e - m());
         return t.u(r) - e + ("end" === s ? o : "center" === s ? o / 2 : 0);
     });
-}, ee = z ? r : o, te = "current", oe = (e, t) => {
-    if (Array.isArray(e)) for (const o of e) oe(o, t); else null == e || "boolean" == typeof e || t.push(e);
-}, ne = (e, t) => {
+}, Z = z ? r : o, ee = "current", te = (e, t) => {
+    if (Array.isArray(e)) for (const o of e) te(o, t); else null == e || "boolean" == typeof e || t.push(e);
+}, oe = (e, t) => {
     const o = e.key;
     return null != o ? o : "_" + t;
-}, re = e => {
+}, ne = e => {
     const t = i(null);
     return t.current || (t.current = e());
-}, se = e => {
+}, re = e => {
     const t = i(e);
-    return ee(() => {
-        t[te] = e;
+    return Z(() => {
+        t[ee] = e;
     }, [ e ]), t;
-}, le = /*#__PURE__*/ t(({ee: e, te: t, oe: o, ne: n, re: r, se: l, le: a, ie: f}) => {
+}, se = /*#__PURE__*/ t(({ee: e, te: t, oe: o, ne: n, re: r, se: l, le: a, ie: f}) => {
     const u = i(null);
-    ee(() => t(u[te], o), [ o ]);
+    Z(() => t(u[ee], o), [ o ]);
     const d = s(() => {
         const e = {
             contain: "layout style",
@@ -562,23 +555,23 @@ f), b = e => $(e.t(), e.o()), k = ({l: e, i: t, u: o, $: n, h: r, p: s, t: l, m:
         index: o,
         children: e
     });
-}), ie = (e, t) => s(() => {
+}), le = (e, t) => s(() => {
     if ("function" == typeof e) return [ o => e(t[o], o), t.length ];
     const o = (e => {
         const t = [];
-        return oe(e, t), t;
+        return te(e, t), t;
     })(e);
     return [ e => o[e], o.length ];
-}, [ e, t ]), ce = /*#__PURE__*/ e(({children: e, data: t, bufferSize: o, itemSize: r, shift: s, horizontal: f, keepMounted: u, cache: d, startMargin: $ = 0, ssrCount: g, as: h = "div", item: p = "div", scrollRef: w, onScroll: S, onScrollEnd: v}, z) => {
-    const [y, I] = ie(e, t), x = i(null), R = i(!!g), T = se(S), C = se(v), [O, E, L, A] = re(() => {
+}, [ e, t ]), ie = /*#__PURE__*/ e(({children: e, data: t, bufferSize: o, itemSize: r, shift: s, horizontal: f, keepMounted: u, cache: d, startMargin: $ = 0, ssrCount: g, as: h = "div", item: p = "div", scrollRef: w, onScroll: S, onScrollEnd: v}, z) => {
+    const [y, I] = le(e, t), x = i(null), R = i(!!g), T = re(S), C = re(v), [O, E, L, A] = ne(() => {
         const e = !!f, t = M(I, r, d), o = k(t, g);
-        return [ o, t, F(o, e), e ];
+        return [ o, t, U(o, e), e ];
     });
     I !== O.T() && O.W(5, [ I, s ]), $ !== O.O() && O.W(6, $);
     const [W, H] = l(O.I, void 0, O.I), P = O.C(), q = O.t(), B = [], D = e => {
         const t = y(e);
         /* @__PURE__ */
-        return c(le, {
+        return c(se, {
             te: L.G,
             oe: e,
             ne: O.u(e),
@@ -586,24 +579,24 @@ f), b = e => $(e.t(), e.o()), k = ({l: e, i: t, u: o, $: n, h: r, p: s, t: l, m:
             se: p,
             ee: t,
             le: A,
-            ie: R[te]
-        }, ne(t, e));
+            ie: R[ee]
+        }, oe(t, e));
     };
-    if (ee(() => {
-        R[te] = !1, O.A(1, e => {
+    if (Z(() => {
+        R[ee] = !1, O.A(1, e => {
             e ? a(H) : H();
         }), O.A(4, () => {
             T.current && T.current(O.M());
         }), O.A(8, () => {
             C.current && C.current();
         });
-        const e = x[te];
+        const e = x[ee];
         return w ? _(() => {
-            w.current && L.F(e, w[te]);
+            w.current && L.F(e, w[ee]);
         }) : L.F(e), () => {
             O.v(), L.v();
         };
-    }, []), ee(() => {
+    }, []), Z(() => {
         L.N();
     }, [ W ]), n(z, () => ({
         get cache() {
@@ -621,10 +614,10 @@ f), b = e => $(e.t(), e.o()), k = ({l: e, i: t, u: o, $: n, h: r, p: s, t: l, m:
         findItemIndex: O.k,
         getItemOffset: O.u,
         getItemSize: O.$,
-        scrollToIndex: (e, t) => Q(L, O, e, t),
-        scrollTo: e => N(L, e),
+        scrollToIndex: (e, t) => N(L, O, e, t),
+        scrollTo: e => K(L, e),
         scrollBy: e => ((e, t, o) => {
-            N(e, o + t.M());
+            K(e, o + t.M());
         })(L, O, e)
     }), []), u) {
         const e = new Set(u);
@@ -647,7 +640,7 @@ f), b = e => $(e.t(), e.o()), k = ({l: e, i: t, u: o, $: n, h: r, p: s, t: l, m:
         },
         children: B
     });
-}), ae = /*#__PURE__*/ e(({children: e, data: t, bufferSize: o, itemSize: n, shift: r, horizontal: s, keepMounted: l, cache: i, ssrCount: a, item: f, onScroll: u, onScrollEnd: d, style: $, ...g}, h) => /* @__PURE__ */ c("div", {
+}), ce = /*#__PURE__*/ e(({children: e, data: t, bufferSize: o, itemSize: n, shift: r, horizontal: s, keepMounted: l, cache: i, ssrCount: a, item: f, onScroll: u, onScrollEnd: d, style: $, ...g}, h) => /* @__PURE__ */ c("div", {
     ...g,
     style: {
         display: s ? "inline-block" : "block",
@@ -657,7 +650,7 @@ f), b = e => $(e.t(), e.o()), k = ({l: e, i: t, u: o, $: n, h: r, p: s, t: l, m:
         height: "100%",
         ...$
     },
-    children: /* @__PURE__ */ c(ce, {
+    children: /* @__PURE__ */ c(ie, {
         ref: h,
         data: t,
         bufferSize: o,
@@ -672,22 +665,22 @@ f), b = e => $(e.t(), e.o()), k = ({l: e, i: t, u: o, $: n, h: r, p: s, t: l, m:
         onScrollEnd: d,
         children: e
     })
-})), fe = /*#__PURE__*/ e(({children: e, data: t, bufferSize: o, itemSize: r, shift: s, horizontal: f, cache: u, ssrCount: d, as: $ = "div", item: g = "div", onScroll: h, onScrollEnd: p}, m) => {
-    const [w, S] = ie(e, t), _ = i(null), v = se(h), z = se(p), y = i(!!d), [I, x, b, R] = re(() => {
+})), ae = /*#__PURE__*/ e(({children: e, data: t, bufferSize: o, itemSize: r, shift: s, horizontal: f, cache: u, ssrCount: d, as: $ = "div", item: g = "div", onScroll: h, onScrollEnd: p}, m) => {
+    const [w, S] = le(e, t), _ = i(null), v = re(h), z = re(p), y = i(!!d), [I, x, b, R] = ne(() => {
         const e = !!f, t = M(S, r, u), o = k(t, d);
-        return [ o, t, G(o, e), e ];
+        return [ o, t, F(o, e), e ];
     });
     S !== I.T() && I.W(5, [ S, s ]);
     const [T, C] = l(I.I, void 0, I.I), O = I.C(), E = I.t(), L = [];
-    ee(() => (y[te] = !1, I.A(1, e => {
+    Z(() => (y[ee] = !1, I.A(1, e => {
         e ? a(C) : C();
     }), I.A(4, () => {
         v.current && v.current();
     }), I.A(8, () => {
         z.current && z.current();
-    }), b.F(_[te]), () => {
+    }), b.F(_[ee]), () => {
         I.v(), b.v();
-    }), []), ee(() => {
+    }), []), Z(() => {
         b.N();
     }, [ T ]), n(m, () => ({
         get cache() {
@@ -702,11 +695,11 @@ f), b = e => $(e.t(), e.o()), k = ({l: e, i: t, u: o, $: n, h: r, p: s, t: l, m:
         findItemIndex: I.k,
         getItemOffset: I.u,
         getItemSize: I.$,
-        scrollToIndex: (e, t) => Q(b, I, e, t)
+        scrollToIndex: (e, t) => N(b, I, e, t)
     }), []);
     for (let [e, t] = I.l(o); e <= t; e++) {
         const t = w(e);
-        L.push(/* @__PURE__ */ c(le, {
+        L.push(/* @__PURE__ */ c(se, {
             te: b.G,
             oe: e,
             ne: I.u(e),
@@ -714,8 +707,8 @@ f), b = e => $(e.t(), e.o()), k = ({l: e, i: t, u: o, $: n, h: r, p: s, t: l, m:
             se: g,
             ee: t,
             le: R,
-            ie: y[te]
-        }, ne(t, e)));
+            ie: y[ee]
+        }, oe(t, e)));
     }
     /* @__PURE__ */
     return c($, {
@@ -731,10 +724,10 @@ f), b = e => $(e.t(), e.o()), k = ({l: e, i: t, u: o, $: n, h: r, p: s, t: l, m:
         },
         children: L
     });
-}), ue = /*#__PURE__*/ t(({ce: {ae: e, fe: t, ue: o, de: n, $e: r, ge: s, he: l, pe: a}, ee: f, me: u, we: d, Se: $, te: g}) => {
+}), fe = /*#__PURE__*/ t(({ce: {ae: e, fe: t, ue: o, de: n, $e: r, ge: s, he: l, pe: a}, ee: f, me: u, we: d, Se: $, te: g}) => {
     const h = i(null);
-    return ee(() => {
-        if (null != n || null != r) return g(h[te], n, r);
+    return Z(() => {
+        if (null != n || null != r) return g(h[ee], n, r);
     }, [ n, r, g ]), /* @__PURE__ */ c("div", {
         ref: h,
         role: s,
@@ -748,11 +741,11 @@ f), b = e => $(e.t(), e.o()), k = ({l: e, i: t, u: o, $: n, h: r, p: s, t: l, m:
             colIndex: e
         })
     });
-}), de = /*#__PURE__*/ t(({ce: {_e: e, ve: t, pe: o}, ee: n, me: r, ze: s, te: l}) => /* @__PURE__ */ c("div", {
+}), ue = /*#__PURE__*/ t(({ce: {_e: e, ve: t, pe: o}, ee: n, me: r, ze: s, te: l}) => /* @__PURE__ */ c("div", {
     role: "row",
     "aria-rowindex": e + 1,
     style: o,
-    children: t.map(t => /* @__PURE__ */ c(ue, {
+    children: t.map(t => /* @__PURE__ */ c(fe, {
         ce: t,
         ee: n,
         me: r,
@@ -760,183 +753,179 @@ f), b = e => $(e.t(), e.o()), k = ({l: e, i: t, u: o, $: n, h: r, p: s, t: l, m:
         Se: e,
         te: l
     }, t.ae))
-})), $e = ({ce: {ye: e, pe: t}, ee: o, Ie: n, ze: r, te: s}) => /* @__PURE__ */ c("div", {
+})), de = ({ce: {ye: e, pe: t}, ee: o, Ie: n, ze: r, te: s}) => /* @__PURE__ */ c("div", {
     role: "rowgroup",
     style: t,
-    children: e.map(e => /* @__PURE__ */ c(de, {
+    children: e.map(e => /* @__PURE__ */ c(ue, {
         ce: e,
         ee: o,
         me: O(n, e._e),
         ze: r,
         te: s
     }, e._e))
-}), ge = /*#__PURE__*/ e(({children: e, rows: t, cols: o, rowHeight: r, colWidth: s, headerRows: f, sectionRows: g, footerRows: h, headerCols: w, footerCols: S, spans: _, keepMounted: v, bufferSize: z, gap: y = 0, ariaSort: I, onVerticalScroll: x, onHorizontalScroll: R, onScrollEnd: T, style: M, ...C}, B) => {
-    const J = i(null), U = se(x), F = se(R), G = se(T), [N, Q, oe, ne, le] = re(() => {
+}), $e = /*#__PURE__*/ e(({children: e, rows: t, cols: o, rowHeight: r, colWidth: s, headerRows: f, sectionRows: g, footerRows: h, headerCols: w, footerCols: S, spans: _, keepMounted: v, bufferSize: z, gap: y = 0, ariaSort: I, onVerticalScroll: x, onHorizontalScroll: R, onScrollEnd: T, style: M, ...C}, q) => {
+    const j = i(null), J = re(x), U = re(R), F = re(T), [K, N, te, oe, se] = ne(() => {
         const e = E(t, r, y), n = E(o, s, y), l = k(e), i = k(n);
-        return [ l, i, e, n, K(l, i) ];
+        return [ l, i, e, n, G(l, i) ];
     });
-    L(N, oe, t, r, f, h), L(Q, ne, o, s, w, S);
-    const ie = () => N.I() + Q.I(), [ce, ae] = l(ie, void 0, ie), fe = N.C() || Q.C(), ue = N.u(0), ge = Q.u(0), he = N.T(), pe = Q.T(), me = ((e, t, o, n, r = u, s = u, l = u, i) => {
+    L(K, te, t, r, f, h), L(N, oe, o, s, w, S);
+    const le = () => K.I() + N.I(), [ie, ce] = l(le, void 0, le), ae = K.C() || N.C(), fe = K.u(0), $e = N.u(0), ge = K.T(), he = N.T(), pe = ((e, t, o, n, r = u, s = u, l = u, i) => {
         const c = e.m(), a = t.m(), f = e.B(), g = e.D(), h = t.B(), w = t.D(), S = p(o[0], f, g), _ = d(o[1], g - 1), v = p(n[0], h, w), z = d(n[1], w - 1), y = H(r, f, g), I = $(h - 1, 0), x = [], b = [], k = [];
         for (const e of l) e.rowIndex < c && e.colIndex < a && k.push(e);
-        const R = y.length;
-        R && (q(x, y, S, g), b.push(I));
-        let T = s, M = 0;
-        do {
-            for (;M < k.length; M++) {
-                const {rowIndex: e, colIndex: t} = k[M];
-                x.push(e), q(x, y, e, g), b.push(t);
-            }
-            const e = [];
-            for (const t of T) {
-                const o = t.rowIndex, n = t.colIndex, r = V(t, c), s = X(t, a);
-                if (o < c && n < a && (r - o > 1 || s - n > 1)) {
-                    const l = W(x, o, r, f, S, _, g);
-                    if (l && W(b, n, s, h, v, z, w)) k.push(t); else if (l) {
-                        const n = P(y, r - 1, g);
-                        (o < f || n >= 0 && y[n] >= o) && e.push(t);
-                    } else n < h && e.push(t);
+        const R = k.length, T = y.length, M = P(y, S, g), C = M < 0 ? -1 : y[M];
+        C >= 0 && x.push(C);
+        for (const e of s) {
+            const t = e.rowIndex, o = e.colIndex, n = D(e, c), r = V(e, a);
+            if (t < c && o < a && (n - t > 1 || r - o > 1)) {
+                let s = (W(t, n, f, S, _, g) || C >= t && C < n) && W(o, r, h, v, z, w);
+                for (let e = 0; !s && e < R; e++) {
+                    const {rowIndex: l, colIndex: i} = k[e];
+                    s = l >= t && l < n && i >= o && i < r;
                 }
+                s && k.push(e);
             }
-            T = e;
-        } while (M < k.length);
+        }
+        for (const {rowIndex: e, colIndex: t} of k) {
+            const o = P(y, e, g);
+            x.push(e), o >= 0 && x.push(y[o]), b.push(t);
+        }
         m(x), m(b);
-        const C = D(x, c, f, S, _, g), O = D(b, a, h, v, z, w), E = C.length, L = O.length, B = /* @__PURE__ */ new Map, J = [], U = [];
+        const O = B(x, c, f, S, _, g), E = B(b, a, h, v, z, w), L = O.length, q = E.length, j = /* @__PURE__ */ new Map, J = [], U = [];
         for (const e of k) {
-            const t = V(e, c), o = X(e, a);
+            const t = D(e, c), o = V(e, a);
             J.push(t), U.push(o);
-            const n = O.indexOf(e.colIndex);
-            for (let r = C.indexOf(e.rowIndex); r < E && C[r] < t; r++) {
-                const t = C[r] * a;
-                for (let r = n; r < L && O[r] < o; r++) B.set(t + O[r], e);
+            const n = E.indexOf(e.colIndex);
+            for (let r = O.indexOf(e.rowIndex); r < L && O[r] < t; r++) {
+                const t = O[r] * a;
+                for (let r = n; r < q && E[r] < o; r++) j.set(t + E[r], e);
             }
         }
         const F = [];
-        for (const e of O) F.push(!t.P(e) && null);
+        for (const e of E) F.push(!t.P(e) && null);
         const G = [], K = e.u(f), N = [];
         let Q = N;
         const Z = A.get(e), ee = /* @__PURE__ */ new Map;
-        for (const o of C) {
-            const n = o < f, r = o >= g, s = r || o >= S && o <= _, l = P(y, o, g), u = n ? 0 : r ? g : l < 0 ? -1 : y[l];
-            if (o === u) {
-                const e = n ? f : r ? c : l + 1 < R ? y[l + 1] : g;
+        for (const o of O) {
+            const n = o < f, r = o >= g, s = P(y, o, g), l = n ? 0 : r ? g : s < 0 ? -1 : y[s];
+            if (o === l) {
+                const e = n ? f : r ? c : s + 1 < T ? y[s + 1] : g;
                 J.push(e);
                 const t = [];
                 N.push({
-                    xe: n ? -1 : r ? -2 : -3 - u,
+                    xe: n ? -1 : r ? -2 : -3 - l,
                     ye: t,
-                    pe: j(u, e, n || r ? 0 : null, r ? "bottom" : "top", 4)
+                    pe: Y(l, e, n || r ? 0 : null, r ? "bottom" : "top", 4)
                 }), Q = t;
-            } else u < 0 && (Q = N);
-            const d = l >= 0 && o === u, p = d ? K : null, m = o * a, x = Z && Z.get(o), b = x && x.ve, k = [];
-            let T = 0, M = !e.P(o) && null, C = o + 1, E = !1;
-            for (let e = 0; e < L; e++) {
-                const r = O[e], l = r < h, f = r >= w, u = f || r >= v && r <= z, g = B.get(m + r);
-                if (g ? g.rowIndex === o && g.colIndex === r : s && u || n || d || l) {
-                    const s = g ? V(g, c) : o + 1, u = g ? X(g, a) : r + 1, h = s - o, p = u - r, m = h > 1, w = p > 1, S = m || w;
+            } else l < 0 && (Q = N);
+            const u = s >= 0 && o === l, d = n || r || o === C || o >= S && o <= _, p = u ? K : null, m = o * a, x = Z && Z.get(o), b = x && x.ve, k = [];
+            let R = 0, M = !e.P(o) && null, O = o + 1, L = !1;
+            for (let e = 0; e < q; e++) {
+                const r = E[e], s = r < h, l = r >= w, f = s || l || r >= v && r <= z, g = j.get(m + r);
+                if (g ? g.rowIndex === o && g.colIndex === r : d && f) {
+                    const f = g ? D(g, c) : o + 1, d = g ? V(g, a) : r + 1, h = f - o, p = d - r, m = h > 1, w = p > 1, S = m || w;
                     let _, v;
-                    C = $(C, s);
-                    const z = l ? t.u(r) : null, y = f ? t.t() - t.u(u - 1) - t.$(u - 1) : null;
+                    O = $(O, f);
+                    const z = s ? t.u(r) : null, y = l ? t.t() - t.u(d - 1) - t.$(d - 1) : null;
                     !1 !== M || m || (_ = o, M = !0), !1 !== F[e] || w || (v = r, F[e] = !0);
-                    const x = n ? "columnheader" : r === I && (l || d) ? "rowheader" : "cell", R = S ? h : void 0, O = S ? p : void 0, L = "cell" !== x && i && i.rowIndex === o && i.colIndex === r ? i.order : void 0;
+                    const x = n ? "columnheader" : r === I && (s || u) ? "rowheader" : "cell", T = S ? h : void 0, C = S ? p : void 0, E = "cell" !== x && i && i.rowIndex === o && i.colIndex === r ? i.order : void 0;
                     let A;
                     if (b) {
                         const e = b.length;
-                        for (;T < e && b[T].ae < r; ) T++;
-                        T < e && b[T].ae === r && (A = b[T]);
+                        for (;R < e && b[R].ae < r; ) R++;
+                        R < e && b[R].ae === r && (A = b[R]);
                     }
-                    if (!A || A.fe !== R || A.ue !== O || A.be !== z || A.ke !== y || A.de !== _ || A.$e !== v || A.ge !== x || A.he !== L) {
+                    if (!A || A.fe !== T || A.ue !== C || A.be !== z || A.ke !== y || A.de !== _ || A.$e !== v || A.ge !== x || A.he !== E) {
                         let e = "1/l" + r;
-                        S && (e += "/l" + s + "/l" + u);
+                        S && (e += "/l" + f + "/l" + d);
                         const t = {
                             contain: "layout style",
                             display: "grid",
                             gridArea: e
                         };
                         m && (t.height = "0px", t.minHeight = "100%", t.zIndex = 1), w && (t.width = "0px", 
-                        t.minWidth = "100%"), (l || f) && (t[l ? "insetInlineStart" : "insetInlineEnd"] = (l ? z : y) + "px", 
+                        t.minWidth = "100%"), (s || l) && (t[s ? "insetInlineStart" : "insetInlineEnd"] = (s ? z : y) + "px", 
                         t.position = "sticky", t.zIndex = 2), A = {
                             ae: r,
-                            fe: R,
-                            ue: O,
+                            fe: T,
+                            ue: C,
                             de: _,
                             $e: v,
                             ge: x,
-                            he: L,
+                            he: E,
                             pe: t,
                             be: z,
                             ke: y
-                        }, E = !0;
+                        }, L = !0;
                     }
                     k.push(A);
                 }
             }
             if (G.push(M), k.length) {
-                const e = x && !E && x.ve.length === k.length && x.Re === p ? x : {
+                const e = x && !L && x.ve.length === k.length && x.Re === p ? x : {
                     _e: o,
                     ve: k,
-                    pe: j(o, C, p, "top", 3),
+                    pe: Y(o, O, p, "top", 3),
                     Re: p
                 };
                 ee.set(o, e), Q.push(e);
             }
         }
         return A.set(e, ee), {
-            Te: Y(e, C, G, m(J), "max-content", c),
-            Me: Y(t, O, F, m(U), "minmax(max-content,auto)", a),
+            Te: X(e, O, G, m(J), "max-content", c),
+            Me: X(t, E, F, m(U), "minmax(max-content,auto)", a),
             Ce: N
         };
-    })(oe, ne, N.l(z), Q.l(z), g, _, v, I), we = se(e => ((e, t, o, n, r, s = u, {rowIndex: l, colIndex: i, rowAlign: c, colAlign: a}) => {
-        null != l && Z(e, t, n, s, l, c, !1), null != i && Z(e, o, r, u, i, a, !0);
-    })(le, N, Q, oe, ne, g, e));
-    return ee(() => {
+    })(te, oe, K.l(z), N.l(z), g, _, v, I), me = re(e => ((e, t, o, n, r, s = u, {rowIndex: l, colIndex: i, rowAlign: c, colAlign: a}) => {
+        null != l && Q(e, t, n, s, l, c, !1), null != i && Q(e, o, r, u, i, a, !0);
+    })(se, K, N, te, oe, g, e));
+    return Z(() => {
         const e = e => {
-            e ? a(ae) : ae();
+            e ? a(ce) : ce();
         };
-        N.A(1, e), Q.A(1, e);
+        K.A(1, e), N.A(1, e);
         let t = !1;
-        N.A(4, () => {
+        K.A(4, () => {
+            t = !0, J.current && J.current(K.M());
+        }), N.A(4, () => {
             t = !0, U.current && U.current(N.M());
-        }), Q.A(4, () => {
-            t = !0, F.current && F.current(Q.M());
         });
         const o = () => {
-            !t || N.C() || Q.C() || (t = !1, G.current && G.current());
+            !t || K.C() || N.C() || (t = !1, F.current && F.current());
         };
-        return N.A(8, o), Q.A(8, o), le.F(J[te]), () => {
-            N.v(), Q.v(), le.v();
+        return K.A(8, o), N.A(8, o), se.F(j[ee]), () => {
+            K.v(), N.v(), se.v();
         };
-    }, []), ee(() => {
-        le.N();
-    }, [ ce ]), n(B, () => ({
+    }, []), Z(() => {
+        se.N();
+    }, [ ie ]), n(q, () => ({
         get verticalScrollOffset() {
-            return N.M();
+            return K.M();
         },
         get horizontalScrollOffset() {
-            return Q.M();
+            return N.M();
         },
         get scrollHeight() {
-            return b(N);
+            return b(K);
         },
         get scrollWidth() {
-            return b(Q);
+            return b(N);
         },
         get viewportHeight() {
-            return N.o();
+            return K.o();
         },
         get viewportWidth() {
-            return Q.o();
-        },
-        findRowIndex: N.k,
-        findColIndex: Q.k,
-        getRowOffset: N.u,
-        getColOffset: Q.u,
-        getRowSize: N.$,
-        getColSize: Q.$,
-        scrollToIndex: e => we[te](e),
+            return N.o();
+        },
+        findRowIndex: K.k,
+        findColIndex: N.k,
+        getRowOffset: K.u,
+        getColOffset: N.u,
+        getRowSize: K.$,
+        getColSize: N.$,
+        scrollToIndex: e => me[ee](e),
         scrollTo: ({vertical: e, horizontal: t}) => ((e, t, o) => {
             null != t && e.K(!1, () => t), null != o && e.K(!0, () => o);
-        })(le, e, t),
+        })(se, e, t),
         scrollBy: ({vertical: e, horizontal: t}) => ((e, t, o, n, r) => {
             if (null != n) {
                 const o = n + t.M();
@@ -946,11 +935,11 @@ f), b = e => $(e.t(), e.o()), k = ({l: e, i: t, u: o, $: n, h: r, p: s, t: l, m:
                 const t = r + o.M();
                 e.K(!0, () => t);
             }
-        })(le, N, Q, e, t)
+        })(se, K, N, e, t)
     }), []), /* @__PURE__ */ c("div", {
         role: "table",
-        "aria-rowcount": he,
-        "aria-colcount": pe,
+        "aria-rowcount": ge,
+        "aria-colcount": he,
         ...C,
         style: {
             overflow: "auto",
@@ -960,36 +949,36 @@ f), b = e => $(e.t(), e.o()), k = ({l: e, i: t, u: o, $: n, h: r, p: s, t: l, m:
             ...M
         },
         children: /* @__PURE__ */ c("div", {
-            ref: J,
+            ref: j,
             style: {
                 contain: "size style",
                 overflowAnchor: "none",
                 flex: "none",
                 display: "grid",
-                gridTemplateRows: me.Te,
-                gridTemplateColumns: me.Me,
+                gridTemplateRows: pe.Te,
+                gridTemplateColumns: pe.Me,
                 gap: y,
-                marginTop: ue,
-                marginInlineStart: ge,
-                height: b(N) - ue,
-                pointerEvents: fe ? "none" : void 0
+                marginTop: fe,
+                marginInlineStart: $e,
+                height: b(K) - fe,
+                pointerEvents: ae ? "none" : void 0
             },
-            children: me.Ce.map(n => "ye" in n ? /* @__PURE__ */ c($e, {
+            children: pe.Ce.map(n => "ye" in n ? /* @__PURE__ */ c(de, {
                 ce: n,
                 ee: e,
                 Ie: t,
                 ze: o,
-                te: le.G
-            }, n.xe) : /* @__PURE__ */ c(de, {
+                te: se.G
+            }, n.xe) : /* @__PURE__ */ c(ue, {
                 ce: n,
                 ee: e,
                 me: O(t, n._e),
                 ze: o,
-                te: le.G
+                te: se.G
             }, n._e))
         })
     });
 });
 
-export { ge as VGrid, ae as VList, ce as Virtualizer, fe as WindowVirtualizer };
+export { $e as VGrid, ce as VList, ie as Virtualizer, ae as WindowVirtualizer };
 //# sourceMappingURL=index.js.map