@progress/kendo-react-grid 12.2.0-develop.5 → 12.2.0-develop.7

package/GridComponent.mjs

@@ -6,9 +6,9 @@
  *-------------------------------------------------------------------------------------------
  */
 import * as a from "react";
-import { uGrid as Tt, hasValidLicense as Kt, getLicenseMessage as Pt, validatePackage as At, getter as S, classNames as f, WatermarkOverlay as Ue } from "@progress/kendo-react-common";
-import { process as Bt } from "@progress/kendo-data-query";
-import { combineFilters as Lt, getDetailExpandableOptions as Mt, getGroupExpandableOptions as Ft, getSelectionOptions as Ot, tableKeyboardNavigationTools as O, Pager as _t, tableKeyboardNavigationBodyAttributes as zt, tableKeyboardNavigationScopeAttributes as qe } from "@progress/kendo-react-data-tools";
+import { uGrid as Tt, hasValidLicense as Pt, getLicenseMessage as Kt, validatePackage as At, getter as v, classNames as f, WatermarkOverlay as Ue } from "@progress/kendo-react-common";
+import { process as Mt } from "@progress/kendo-data-query";
+import { combineFilters as Bt, getDetailExpandableOptions as Lt, getGroupExpandableOptions as Ft, getSelectionOptions as zt, tableKeyboardNavigationTools as z, Pager as Ot, tableKeyboardNavigationBodyAttributes as _t, tableKeyboardNavigationScopeAttributes as qe } from "@progress/kendo-react-data-tools";
 import { GridHierarchyCell as Vt } from "./cells/hierarchycell/GridHierarchyCell.mjs";
 import { GridEditCell as Wt } from "./cells/editcell/GridEditCell.mjs";
 import { Header as $t } from "./header/Header.mjs";
@@ -16,7 +16,7 @@ import { HeaderRow as jt } from "./header/HeaderRow.mjs";
 import { FilterRow as Ut } from "./header/FilterRow.mjs";
 import { GroupPanel as qt } from "./header/GroupPanel.mjs";
 import { Footer as Jt } from "./footer/Footer.mjs";
-import { isRowReorderEnabled as Qt, getRowSpanOptions as Je, getColumnWidth as le, isSorted as Qe, flatData as Xt, autoGenerateColumns as Yt, mapColumns as Zt, clientColumn as pt, getFlatColumnsState as el, getColumnState as ae, getColSpan as tl, resolveCells as ll, readColumns as al } from "./utils/index.mjs";
+import { isRowReorderEnabled as Qt, getRowSpanOptions as Je, getColumnWidth as re, isSorted as Qe, flatData as Xt, autoGenerateColumns as Yt, mapColumns as Zt, clientColumn as pt, getFlatColumnsState as el, getColumnState as ne, getColSpan as tl, resolveCells as ll, readColumns as al } from "./utils/index.mjs";
 import { GridCell as rl } from "./cells/datacell/GridCell.mjs";
 import { GridGroupCell as Xe } from "./cells/groupcell/GridGroupCell.mjs";
 import { GridRow as nl } from "./rows/GridRow.mjs";
@@ -25,7 +25,7 @@ import { GridNoRecords as Ye } from "./components/noRecords/GridNoRecords.mjs";
 import { operators as Ze } from "./filterCommon.mjs";
 import { FooterRow as ol } from "./footer/FooterRow.mjs";
 import { normalize as dl } from "./paging/GridPagerSettings.mjs";
-import { packageMetadata as re } from "./package-metadata.mjs";
+import { packageMetadata as ie } from "./package-metadata.mjs";
 import { GridDetailCell as cl } from "./cells/detailcell/GridDetailCell.mjs";
 import { GridDetailHierarchyCell as ml } from "./cells/GridDetailHierarchyCell.mjs";
 import { GridNoRecordsContainer as pe } from "./components/noRecords/GridNoRecordsContainer.mjs";
@@ -46,7 +46,7 @@ import { GridRowReorderCell as wl } from "./cells/rowreordercell/GridRowReorderC
 import { GridHeaderRowReorderCell as El } from "./header/client/GridHeaderRowReorderCell.mjs";
 import { GridLoader as it } from "./components/GridLoader.mjs";
 import { gridPremiumFeatures as Il } from "./utils/premium.mjs";
-import { LocalizationService as vl, IntlService as Sl } from "@progress/kendo-react-intl";
+import { LocalizationService as Sl, IntlService as vl } from "@progress/kendo-react-intl";
 import { getVirtualCellsToRender as Rl } from "./utils/virtualColumns.mjs";
 import { GridEditDialog as Gl } from "./components/GridEditDialog.mjs";
 import { GridCellServer as xl } from "./cells/datacell/GridCellServer.mjs";
@@ -55,72 +55,72 @@ import { GridSelectionCellServer as Nl } from "./cells/selectioncell/GridSelecti
 import { GridSelectionCell as Dl } from "./cells/selectioncell/GridSelectionCell.mjs";
 import { GridHierarchyCellServer as Hl } from "./cells/hierarchycell/GridHierarchyCellServer.mjs";
 import { GridRowReorderCellServer as Tl } from "./cells/rowreordercell/GridRowReorderCellServer.mjs";
-import { GridDetailCellServer as Kl } from "./cells/detailcell/GridDetailCellServer.mjs";
-import { GridGroupCellServer as Pl } from "./cells/groupcell/GridGroupCellServer.mjs";
+import { GridDetailCellServer as Pl } from "./cells/detailcell/GridDetailCellServer.mjs";
+import { GridGroupCellServer as Kl } from "./cells/groupcell/GridGroupCellServer.mjs";
 const Al = a.forwardRef((e, ot) => {
-  var Te, Ke, Pe, Ae, Be, Le, Me, Fe, Oe, _e, ze, Ve;
+  var Te, Pe, Ke, Ae, Me, Be, Le, Fe, ze, Oe, _e, Ve;
   const T = e.id + "-role-element-id", x = e.navigatable ? T : "";
   let R = e.columnsState || [];
-  const dt = (t, i, n, d, o, l, c) => {
-    const s = [], b = Xt(
+  const dt = (t, n, i, d, o, l, c) => {
+    const s = [], h = Xt(
       s,
       t,
-      i,
-      { index: n },
+      n,
+      { index: i },
       d !== void 0,
       o,
       l,
-      vt.defaultExpand,
+      St.defaultExpand,
       c
     );
-    return { flattedData: s, resolvedGroupsCount: b };
+    return { flattedData: s, resolvedGroupsCount: h };
   }, ct = (t) => {
-    const i = t.filter(
-      (n) => n && n.type && n.type.displayName === "KendoReactGridColumn"
+    const n = t.filter(
+      (i) => i && i.type && i.type.displayName === "KendoReactGridColumn"
     );
-    return al(i, R, { prevId: 0, idPrefix: x });
+    return al(n, R, { prevId: 0, idPrefix: x });
   }, mt = () => {
-    const t = [], i = (n, d) => n == null ? void 0 : n.forEach((o) => {
+    const t = [], n = (i, d) => i == null ? void 0 : i.forEach((o) => {
       const l = o.hidden || d;
       t.push({
         ...o,
         hidden: l
-      }), i(o.children, l);
+      }), n(o.children, l);
     });
-    return i(R, !1), t;
+    return n(R, !1), t;
   }, st = (t) => {
-    const i = mt();
-    return t.filter((n) => {
+    const n = mt();
+    return t.filter((i) => {
       var d;
-      return !n.hidden && !((d = i.find((o) => o.id === n.id)) != null && d.hidden);
+      return !i.hidden && !((d = n.find((o) => o.id === i.id)) != null && d.hidden);
     });
-  }, ut = (t, i) => {
-    m = ct(t), m.filter((n) => !n.hidden).length === 0 && (m = Yt(
+  }, ut = (t, n) => {
+    m = ct(t), m.filter((i) => !i.hidden).length === 0 && (m = Yt(
       C,
       e.group,
       {
-        column: P.column
+        column: K.column
       },
       {
         prevId: 0,
         idPrefix: x
       }
-    )), gt(m, i), m = st(m), K = Zt(m, !0), de = m.map(pt);
-  }, ft = (t, i) => {
-    const n = (d) => {
+    )), gt(m, n), m = st(m), P = Zt(m, !0), ce = m.map(pt);
+  }, ft = (t, n) => {
+    const i = (d) => {
       var l;
-      const o = i.find((c) => c.id === d.id);
-      return o ? (o.children = (l = d.children) == null ? void 0 : l.map(n), o) : ae(d);
+      const o = n.find((c) => c.id === d.id);
+      return o ? (o.children = (l = d.children) == null ? void 0 : l.map(i), o) : ne(d);
     };
-    R = t.filter((d) => d.parentIndex === -1).map(n);
-  }, gt = (t, i) => {
+    R = t.filter((d) => d.parentIndex === -1).map(i);
+  }, gt = (t, n) => {
     t.filter((l) => l.columnType === "checkbox").forEach((l) => {
       l.width = l.width || "50px", l.defaultCell = e.isClient ? Dl : Nl, l.defaultHeaderCell = il, l._type = "edit";
     }), N !== void 0 && t.filter((l) => l.columnType === "reorder").forEach((l) => {
       l.width = l.width || "50px", l.defaultCell = e.isClient ? wl : Tl, l.defaultHeaderCell = El, l.sortable = !1, l.filterable = !1, l.editable = !1;
     });
-    const n = el(R);
-    ft(t, n);
+    const i = el(R);
+    ft(t, i);
     const d = {
       id: "",
       resizable: !0,
@@ -142,71 +142,71 @@ const Al = a.forwardRef((e, ot) => {
       isAccessible: !0
     };
     let o = 0;
-    if (P.enabled && e.detail) {
+    if (K.enabled && e.detail) {
       const l = {
         ...d,
         _type: "expand",
-        id: O.generateNavigatableId(`${o++}`, "expand", "column"),
+        id: z.generateNavigatableId(`${o++}`, "expand", "column"),
         defaultCell: e.isClient ? Vt : Hl,
-        field: P.column,
+        field: K.column,
         headerClassName: f(u.hierarchyCell({}))
       };
-      t.unshift(l), R.unshift(n.find((c) => c.id === l.id) || ae(l));
+      t.unshift(l), R.unshift(i.find((c) => c.id === l.id) || ne(l));
     }
-    for (let l = 0; l < i; l++) {
+    for (let l = 0; l < n; l++) {
       const c = {
         ...d,
         isAccessible: !1,
-        defaultCell: e.isClient ? Xe : Pl,
-        id: O.generateNavigatableId(`${o++}`, "group", "column"),
+        defaultCell: e.isClient ? Xe : Kl,
+        id: z.generateNavigatableId(`${o++}`, "group", "column"),
         field: "value",
         locked: e.lockGroups
       };
-      t.unshift(c), R.unshift(n.find((s) => s.id === c.id) || ae(c));
+      t.unshift(c), R.unshift(i.find((s) => s.id === c.id) || ne(c));
     }
     t.slice(o).forEach((l) => {
       l.parentIndex >= 0 && (l.parentIndex += o), l.rowSpannable = l.rowSpannable !== void 0 ? Je(l.rowSpannable) : ge;
     });
-  }, ne = () => e.isClient ? m : de, ie = (t) => {
-    const i = [];
-    let n = null, d = 0;
-    if (g.forEach((o, l) => {
+  }, oe = () => e.isClient ? m : ce, de = (t) => {
+    const n = [];
+    let i = null, d = 0;
+    if (b.forEach((o, l) => {
       const c = parseFloat((o.width || "").toString()) || 10;
       if (d) {
-        d--, n && (n.width += c);
+        d--, i && (i.width += c);
         return;
       }
-      const s = Math.min(tl(o, t), g.length - l);
-      d = s - 1, n = {
+      const s = Math.min(tl(o, t), b.length - l);
+      d = s - 1, i = {
         width: c,
         colSpan: s,
         columnIndex: l
-      }, i.push(n);
+      }, n.push(i);
     }), e.columnVirtualization) {
       const o = ht.current || 0, l = yt.current || parseFloat(((e.style || {}).width || "").toString());
       return Rl({
-        cellModels: i,
-        columns: g,
+        cellModels: n,
+        columns: b,
         tableViewPortWidth: l,
         scrollLeft: o
       });
     }
-    return i;
+    return n;
   }, bt = () => {
-    const { pageable: t, take: i, pageSize: n } = e;
+    const { pageable: t, take: n, pageSize: i } = e;
     if (!E)
       return 0;
     if (!t) {
-      if (i)
-        return i;
       if (n)
         return n;
+      if (i)
+        return i;
     }
     const d = e.rowHeight || wt.current, o = Ct.current;
     return o && d ? Math.ceil(o / d * 1.5) : 0;
   };
-  let h = [], oe, m = [], de = [], K = [[]];
-  const ht = e.scrollLeftRef || { current: 0 }, yt = e.widthRef || { current: 0 }, Ct = e.containerHeightRef || { current: 0 }, wt = e.minRowHeightRef || { current: 0 }, _ = e.localization || new vl(e.language), Et = e.intl || new Sl((Te = e.locale) != null ? Te : "en"), k = e.unstyled, u = k && k.uGrid ? k.uGrid : Tt, N = Qt(e.rowReorderable), E = e.scrollable === "virtual" || e.scrollable === void 0 && e.isClient && Kt(re) || !1, ce = Pt(re), D = e.autoProcessData === !0 ? {
+  let g = [], j, m = [], ce = [], P = [[]];
+  const ht = e.scrollLeftRef || { current: 0 }, yt = e.widthRef || { current: 0 }, Ct = e.containerHeightRef || { current: 0 }, wt = e.minRowHeightRef || { current: 0 }, O = e.localization || new Sl(e.language), Et = e.intl || new vl((Te = e.locale) != null ? Te : "en"), k = e.unstyled, u = k && k.uGrid ? k.uGrid : Tt, N = Qt(e.rowReorderable), E = e.scrollable === "virtual" || e.scrollable === void 0 && e.isClient && Pt(ie) || !1, me = Kt(ie), D = e.autoProcessData === !0 ? {
     group: !0,
     sort: !0,
     filter: !0,
@@ -214,11 +214,11 @@ const Al = a.forwardRef((e, ot) => {
     page: !0
   } : e.autoProcessData;
   let C, G;
-  if (Array.isArray(e.data) ? (C = e.data, G = (Ke = e.total) != null ? Ke : C.length) : (C = ((Pe = e.data) == null ? void 0 : Pe.data) || [], G = (Le = (Be = e.total) != null ? Be : (Ae = e.data) == null ? void 0 : Ae.total) != null ? Le : C.length), D) {
-    const t = D.page && !(E && !e.pageable), { data: i, total: n } = Bt(C, {
+  if (Array.isArray(e.data) ? (C = e.data, G = (Pe = e.total) != null ? Pe : C.length) : (C = ((Ke = e.data) == null ? void 0 : Ke.data) || [], G = (Be = (Me = e.total) != null ? Me : (Ae = e.data) == null ? void 0 : Ae.total) != null ? Be : C.length), D) {
+    const t = D.page && !(E && !e.pageable), { data: n, total: i } = Mt(C, {
       group: D.group ? e.group : void 0,
       sort: D.sort ? e.sort : void 0,
-      filter: Lt(
+      filter: Bt(
         D.filter ? e.filter : void 0,
         D.search ? e.search : void 0
       ),
@@ -227,37 +227,42 @@ const Al = a.forwardRef((e, ot) => {
         skip: e.skip || 0
       } : {}
     });
-    C = i, G = (Me = e.total) != null ? Me : n;
+    C = n, G = (Le = e.total) != null ? Le : i;
   }
-  const z = C.length === G, { size: I = "medium" } = e, It = typeof e.groupable == "object" && e.groupable.footer || "none", V = e.groupable === !0 || typeof e.groupable == "object" && e.groupable.enabled !== !1, P = Mt(!!e.detail), vt = Ft(
+  const _ = C.length === G, { size: I = "medium" } = e, It = typeof e.groupable == "object" && e.groupable.footer || "none", V = e.groupable === !0 || typeof e.groupable == "object" && e.groupable.enabled !== !1, K = Lt(!!e.detail), St = Ft(
     typeof e.groupable == "object" && e.groupable.enabled !== !1 ? e.groupable.expandable : e.groupable
-  ), me = !!((Fe = e.group) != null && Fe.length), { resolvedGroupsCount: St, flattedData: Rt } = dt(
+  ), se = !!((Fe = e.group) != null && Fe.length), { resolvedGroupsCount: vt, flattedData: Rt } = dt(
     C,
     It,
-    z ? 0 : e.skip || 0,
+    _ ? 0 : e.skip || 0,
     e.group,
     e.detailExpand,
     e.groupExpand,
     e.dataItemKey
   );
-  h = Rt;
-  const se = bt(), j = ((Oe = e.virtualSkipRef) == null ? void 0 : Oe.current) || 0;
+  g = Rt;
+  const U = bt(), q = ((ze = e.virtualSkipRef) == null ? void 0 : ze.current) || 0;
   let ue = G;
   if (E) {
     let t = e.skip || 0;
-    (me || e.pageable) && (t = j, ue = h.length), (z || me || e.pageable) && (oe = h.slice(t, t + se));
+    if ((se || e.pageable) && (t = q, ue = g.length), _ || se || e.pageable)
+      if (U === 0) {
+        const n = Math.min(e.take || e.pageSize || 20, g.length);
+        j = g.slice(t, t + n);
+      } else
+        j = g.slice(t, t + U);
   }
-  const fe = Ot(e.selectable), ge = Je(e.rowSpannable), Gt = fe && fe.drag ? "none" : void 0, W = a.useMemo(() => a.Children.toArray(e.children), [e.children]);
-  ut(W, St);
-  const U = a.useMemo(() => {
+  const fe = zt(e.selectable), ge = Je(e.rowSpannable), Gt = fe && fe.drag ? "none" : void 0, W = a.useMemo(() => a.Children.toArray(e.children), [e.children]);
+  ut(W, vt);
+  const J = a.useMemo(() => {
     const t = Il(e, m);
     return {
       premium: t.length > 0,
       features: t
     };
-  }, [e, m]), be = a.useMemo(() => U.premium ? !At(re, { component: "Grid", features: U.features }) : !1, [U.premium]), he = W.map((t) => t && t.type && t.type.displayName === "KendoReactGridToolbar" ? a.cloneElement(t, { ...t.props, _ariaControls: T, ariaLabel: "Top toolbar" }) : null), $ = W.filter((t) => t && t.type && t.type.displayName === "KendoReactGridNoRecords"), ye = W.filter(
+  }, [e, m]), be = a.useMemo(() => J.premium ? !At(ie, { component: "Grid", features: J.features }) : !1, [J.premium]), he = W.map((t) => t && t.type && t.type.displayName === "KendoReactGridToolbar" ? a.cloneElement(t, { ...t.props, _ariaControls: T, ariaLabel: "Top toolbar" }) : null), $ = W.filter((t) => t && t.type && t.type.displayName === "KendoReactGridNoRecords"), ye = W.filter(
     (t) => t && t.type && t.type.displayName === "KendoReactGridStatusBar"
-  ), g = m.filter((t) => t.children.length === 0), Ce = V && /* @__PURE__ */ a.createElement(qt, { columns: ne(), group: e.group || [], ariaControls: T }), we = /* @__PURE__ */ a.createElement(
+  ), b = m.filter((t) => t.children.length === 0), Ce = V && /* @__PURE__ */ a.createElement(qt, { columns: oe(), group: e.group || [], ariaControls: T }), we = /* @__PURE__ */ a.createElement(
     $t,
     {
       size: I,
@@ -277,12 +282,12 @@ const Al = a.forwardRef((e, ot) => {
           columnMenu: e.columnMenu,
           columnMenuIcon: e.columnMenuIcon,
           columns: m,
-          columnsMap: K,
+          columnsMap: P,
           navigatable: !!e.navigatable,
-          localization: _,
+          localization: O,
           unstyled: k,
-          headerSelectionValue: !!(e.select && h.filter((t) => t.rowType === "data").every(
-            (t) => e.select && e.dataItemKey && S(e.dataItemKey)(t.dataItem) !== void 0 ? e.select[S(e.dataItemKey)(t.dataItem)] : void 0
+          headerSelectionValue: !!(e.select && g.filter((t) => t.rowType === "data").every(
+            (t) => e.select && e.dataItemKey && v(e.dataItemKey)(t.dataItem) !== void 0 ? e.select[v(e.dataItemKey)(t.dataItem)] : void 0
           ))
         }
       ),
@@ -296,39 +301,39 @@ const Al = a.forwardRef((e, ot) => {
           filterOperators: e.filterOperators || Ze,
           sort: e.sort,
           navigatable: !!e.navigatable,
-          ariaRowIndex: K.length + 1,
-          localization: _
+          ariaRowIndex: P.length + 1,
+          localization: O
         }
       ) || void 0,
-      cols: g.map((t, i) => /* @__PURE__ */ a.createElement("col", { key: i.toString(), width: le(t) }))
+      cols: b.map((t, n) => /* @__PURE__ */ a.createElement("col", { key: n.toString(), width: re(t) }))
     }
-  ), Ee = g.findIndex((t) => typeof t.colSpan == "function") > -1;
-  let q;
-  Ee || (q = ie(null));
-  const J = ((_e = e.editable) == null ? void 0 : _e.mode) === "dialog", xt = (ze = e.editable) == null ? void 0 : ze.enabled, kt = (t, i, n, d, o) => {
+  ), Ee = b.findIndex((t) => typeof t.colSpan == "function") > -1;
+  let Q;
+  Ee || (Q = de(null));
+  const X = ((Oe = e.editable) == null ? void 0 : Oe.mode) === "dialog", xt = (_e = e.editable) == null ? void 0 : _e.enabled, kt = (t, n, i, d, o) => {
     let l = !1;
-    const c = e.select && e.dataItemKey && S(e.dataItemKey)(t.dataItem) !== void 0 ? e.select[S(e.dataItemKey)(t.dataItem)] : void 0, s = e.highlight && e.dataItemKey && S(e.dataItemKey)(t.dataItem) !== void 0 ? e.highlight[S(e.dataItemKey)(t.dataItem)] : void 0;
-    return Ee && (q = ie(t.dataItem)), {
-      row: q.map(({ columnIndex: b, colSpan: H }) => {
+    const c = e.select && e.dataItemKey && v(e.dataItemKey)(t.dataItem) !== void 0 ? e.select[v(e.dataItemKey)(t.dataItem)] : void 0, s = e.highlight && e.dataItemKey && v(e.dataItemKey)(t.dataItem) !== void 0 ? e.highlight[v(e.dataItemKey)(t.dataItem)] : void 0;
+    return Ee && (Q = de(t.dataItem)), {
+      row: Q.map(({ columnIndex: h, colSpan: H }) => {
         var F, We, $e, je;
-        const r = g[b];
+        const r = b[h];
         let w;
         if ((F = r.rowSpannable) != null && F.enabled && t.rowType === "data" && r.field && o) {
-          const v = r.field ? ($e = (We = r.rowSpannable).valueGetter) == null ? void 0 : $e.call(We, t.dataItem, r.field) : null;
-          w = { value: v, count: 1 }, o[r.field] && ((je = o[r.field]) == null ? void 0 : je.value) === v && o[r.field] !== null ? (o[r.field].count++, w.count = null) : o[r.field] = w;
+          const S = r.field ? ($e = (We = r.rowSpannable).valueGetter) == null ? void 0 : $e.call(We, t.dataItem, r.field) : null;
+          w = { value: S, count: 1 }, o[r.field] && ((je = o[r.field]) == null ? void 0 : je.value) === S && o[r.field] !== null ? (o[r.field].count++, w.count = null) : o[r.field] = w;
         }
-        const y = r.id ? r.id : b, Z = f(u.contentSticky({ locked: r.locked }), r.className), p = r.left !== void 0 ? { left: r.left, right: r.right } : {};
-        let B = !1;
+        const y = r.id ? r.id : h, ee = f(u.contentSticky({ locked: r.locked }), r.className), te = r.left !== void 0 ? { left: r.left, right: r.right } : {};
+        let M = !1;
         if (r.editable && e.editable) {
-          const v = e.edit && e.dataItemKey ? e.edit[S(e.dataItemKey)(t.dataItem)] : void 0, te = typeof v == "boolean" ? v : Array.isArray(v) ? r.field && v.indexOf(r.field) > -1 : r.field !== void 0 && v === r.field;
-          te && r.columnType === "data" && (te === !0 || te === r.field) && (l = !0, J || (B = !0));
+          const S = e.edit && e.dataItemKey ? e.edit[v(e.dataItemKey)(t.dataItem)] : void 0, ae = typeof S == "boolean" ? S : Array.isArray(S) ? r.field && S.indexOf(r.field) > -1 : r.field !== void 0 && S === r.field;
+          ae && r.columnType === "data" && (ae === !0 || ae === r.field) && (l = !0, X || (M = !0));
         }
-        const L = r._type === "expand", M = {
+        const B = r._type === "expand", L = {
           locked: e.lockGroups,
-          id: O.generateNavigatableId(
-            `${i}-${String(b)}`,
+          id: z.generateNavigatableId(
+            `${n}-${String(h)}`,
             x,
-            L || t.rowType === "groupHeader" || t.rowType === "groupFooter" || r.field === "value" ? "nodata" : "cell"
+            B || t.rowType === "groupHeader" || t.rowType === "groupFooter" || r.field === "value" ? "nodata" : "cell"
           ),
           colSpan: H,
           dataItem: t.dataItem,
@@ -337,61 +342,61 @@ const Al = a.forwardRef((e, ot) => {
           format: r.format,
           columnType: r.columnType,
           rowReorderable: N,
-          className: Z,
+          className: ee,
           cells: ll(e.cells, r.cells),
-          columnIndex: b,
-          columnsCount: g.length,
+          columnIndex: h,
+          columnsCount: b.length,
           rowType: t.rowType,
           level: t.level,
           expanded: t.expanded,
           dataIndex: t.dataIndex,
-          rowDataIndex: n,
-          columnPosition: p,
+          rowDataIndex: i,
+          columnPosition: te,
           style: {},
           ariaColumnIndex: r.ariaColumnIndex,
-          isSelected: !!((r == null ? void 0 : r._type) === "edit" ? c : Array.isArray(c) && c.indexOf(b) > -1),
-          isHighlighted: !!((r == null ? void 0 : r._type) === "edit" ? s : Array.isArray(s) && s.indexOf(b) > -1),
+          isSelected: !!((r == null ? void 0 : r._type) === "edit" ? c : Array.isArray(c) && c.indexOf(h) > -1),
+          isHighlighted: !!((r == null ? void 0 : r._type) === "edit" ? s : Array.isArray(s) && s.indexOf(h) > -1),
           isSorted: !!Qe(r.field, e.sort),
-          isInEdit: B,
+          isInEdit: M,
           isAlt: d,
           unstyled: k,
           group: t.group,
-          localization: _,
+          localization: O,
           intl: Et,
           _rowSpan: w
-        }, ee = r.defaultCell || B && (e.isClient ? Wt : kl) || (e.isClient ? rl : xl);
-        return /* @__PURE__ */ a.createElement(ee, { key: y, cellProps: M });
+        }, le = r.defaultCell || M && (e.isClient ? Wt : kl) || (e.isClient ? rl : xl);
+        return /* @__PURE__ */ a.createElement(le, { key: y, cellProps: L });
       }),
       isInEdit: l,
       isSelected: typeof c == "boolean" && c,
       isHighlighted: typeof s == "boolean" && s
     };
   };
-  let Nt = 0, Q = null;
-  const Ie = (t) => t >= h.length - Nt, X = [], ve = !h.length;
+  let Nt = 0, Y = null;
+  const Ie = (t) => t >= g.length - Nt, Z = [], Se = !g.length;
   let A = 0;
-  if (h.length) {
-    const t = K.length + (e.filterable ? 1 : 0) + 1;
-    let i = e.skip || 0, n = -1, d = 0;
+  if (g.length) {
+    const t = P.length + (e.filterable ? 1 : 0) + 1;
+    let n = e.skip || 0, i = -1, d = 0;
     const o = ge.enabled ? {} : void 0;
     if (E) {
-      if (j > 0) {
-        const l = h.slice(0, j).filter((c) => c.rowType === "data").length;
-        n += l, i += l;
+      if (q > 0) {
+        const l = g.slice(0, q).filter((c) => c.rowType === "data").length;
+        i += l, n += l;
       }
-      !e.pageable && z && (n += e.skip || 0);
+      !e.pageable && _ && (i += e.skip || 0);
     }
-    (oe || h).forEach((l, c) => {
-      l.rowType === "data" && n++;
-      const s = l.dataIndex % 2 !== 0, b = e.dataItemKey && S(e.dataItemKey)(l.dataItem), H = c + i, r = b || "ai" + H, w = r + "_1", y = kt(l, r, n, s, o);
-      if (A = H + t + d, J && xt && y.isInEdit && (Q = l.dataItem), X.push(
+    (j || g).forEach((l, c) => {
+      l.rowType === "data" && i++;
+      const s = l.dataIndex % 2 !== 0, h = e.dataItemKey && v(e.dataItemKey)(l.dataItem), H = c + n, r = h || "ai" + H, w = r + "_1", y = kt(l, r, i, s, o);
+      if (A = H + t + d, X && xt && y.isInEdit && (Y = l.dataItem), Z.push(
         /* @__PURE__ */ a.createElement(
           nl,
           {
             key: r,
             dataItem: l.dataItem,
             isAltRow: s,
-            isInEdit: y.isInEdit && !J,
+            isInEdit: y.isInEdit && !X,
             rowType: l.rowType,
             isRowReorderable: N,
             isHidden: Ie(c),
@@ -400,7 +405,7 @@ const Al = a.forwardRef((e, ot) => {
             rowHeight: e.rowHeight,
             ariaRowIndex: A,
             absoluteRowIndex: H,
-            dataIndex: n,
+            dataIndex: i,
             isSelected: y.isSelected,
             isHighlighted: y.isHighlighted,
             rows: e.rows
@@ -408,10 +413,10 @@ const Al = a.forwardRef((e, ot) => {
           y.row
         )
       ), e.detail && l.rowType === "data" && l.expanded) {
-        const Z = g.length - (P.enabled ? 1 : 0) - (e.group ? e.group.length : 0) || 1;
+        const ee = b.length - (K.enabled ? 1 : 0) - (e.group ? e.group.length : 0) || 1;
         d++, A = H + t + d;
-        const p = e.isClient ? cl : Kl;
-        X.push(
+        const te = e.isClient ? cl : Pl;
+        Z.push(
           /* @__PURE__ */ a.createElement(
             "tr",
             {
@@ -424,21 +429,21 @@ const Al = a.forwardRef((e, ot) => {
               role: "row",
               "aria-rowindex": A
             },
-            e.group && e.group.map((B, L) => {
+            e.group && e.group.map((M, B) => {
               var F;
-              const M = (F = y == null ? void 0 : y.row[L]) == null ? void 0 : F.props.style, ee = M ? { left: M.left, right: M.right } : {};
+              const L = (F = y == null ? void 0 : y.row[B]) == null ? void 0 : F.props.style, le = L ? { left: L.left, right: L.right } : {};
               return /* @__PURE__ */ a.createElement(
                 Xe,
                 {
-                  key: L,
+                  key: B,
                   cellProps: {
                     id: "",
                     dataItem: l.dataItem,
-                    field: B.field,
+                    field: M.field,
                     dataIndex: l.dataIndex,
-                    columnPosition: ee,
+                    columnPosition: le,
                     style: {},
-                    ariaColumnIndex: 1 + L,
+                    ariaColumnIndex: 1 + B,
                     isSelected: !1,
                     locked: e.lockGroups,
                     cells: e.cells,
@@ -447,22 +452,22 @@ const Al = a.forwardRef((e, ot) => {
                 }
               );
             }),
-            P.enabled && /* @__PURE__ */ a.createElement(
+            K.enabled && /* @__PURE__ */ a.createElement(
               ml,
               {
                 unstyled: k,
-                id: O.generateNavigatableId(`${w}-dhcell`, x)
+                id: z.generateNavigatableId(`${w}-dhcell`, x)
               }
             ),
             /* @__PURE__ */ a.createElement(
-              p,
+              te,
               {
                 dataItem: l.dataItem,
                 dataIndex: l.dataIndex,
-                colSpan: Z,
+                colSpan: ee,
                 ariaColIndex: 2 + (e.group ? e.group.length : 0),
                 detail: e.detail,
-                id: O.generateNavigatableId(`${w}-dcell`, x)
+                id: z.generateNavigatableId(`${w}-dcell`, x)
               }
             )
           )
@@ -470,15 +475,15 @@ const Al = a.forwardRef((e, ot) => {
       }
     });
   }
-  const Se = {
+  const ve = {
     size: I,
     total: G,
     skip: e.skip || 0,
     take: (e.take !== void 0 ? e.take : e.pageSize) || 10,
     ...dl(e.pageable || {})
-  }, Re = /* @__PURE__ */ a.createElement(fl, null, e.pager ? /* @__PURE__ */ a.createElement(e.pager, { ...Se }) : /* @__PURE__ */ a.createElement(_t, { className: f(u.pager({})), ...Se })), Dt = (t, i) => /* @__PURE__ */ a.createElement("col", { key: i.toString(), width: le(t) }), Ge = (Ve = e.cells) != null && Ve.footerCell || m.some((t) => {
-    var i;
-    return !!((i = t.cells) != null && i.footerCell);
+  }, Re = /* @__PURE__ */ a.createElement(fl, null, e.pager ? /* @__PURE__ */ a.createElement(e.pager, { ...ve }) : /* @__PURE__ */ a.createElement(Ot, { className: f(u.pager({})), ...ve })), Dt = (t, n) => /* @__PURE__ */ a.createElement("col", { key: n.toString(), width: re(t) }), Ge = (Ve = e.cells) != null && Ve.footerCell || m.some((t) => {
+    var n;
+    return !!((n = t.cells) != null && n.footerCell);
   }) ? /* @__PURE__ */ a.createElement(
     Jt,
     {
@@ -493,26 +498,26 @@ const Al = a.forwardRef((e, ot) => {
           ariaRowIndex: A + 1
         }
       ),
-      cols: g.map(Dt)
+      cols: b.map(Dt)
     }
-  ) : null, xe = /* @__PURE__ */ a.createElement(sl, null, g.map((t, i) => /* @__PURE__ */ a.createElement(
+  ) : null, xe = /* @__PURE__ */ a.createElement(sl, null, b.map((t, n) => /* @__PURE__ */ a.createElement(
     "col",
     {
-      key: i.toString(),
+      key: n.toString(),
       className: Qe(t.field, e.sort) ? f(u.sorted({})) : void 0,
-      width: le(t)
+      width: re(t)
     }
-  ))), ke = e.reorderable || V, { detail: Bl, cells: Ll, rows: Ml, ...Ht } = e, Ne = /* @__PURE__ */ a.createElement(
+  ))), ke = e.reorderable || V, { detail: Ml, cells: Bl, rows: Ll, ...Ht } = e, Ne = /* @__PURE__ */ a.createElement(
     "tbody",
     {
       role: "rowgroup",
       className: f(u.tbody({})),
-      ...zt
+      ..._t
     },
-    X
-  ), De = Q ? /* @__PURE__ */ a.createElement(Gl, { columns: g, customEditDialog: e.editDialog, dataItem: Q }) : null;
-  let Y = Ne;
-  N && (Y = /* @__PURE__ */ a.createElement(
+    Z
+  ), De = Y ? /* @__PURE__ */ a.createElement(Gl, { columns: b, customEditDialog: e.editDialog, dataItem: Y }) : null;
+  let p = Ne;
+  N && (p = /* @__PURE__ */ a.createElement(
     Cl,
     {
       unstyled: u,
@@ -525,14 +530,14 @@ const Al = a.forwardRef((e, ot) => {
     gridRef: ot,
     innerGrid: e.innerGrid,
     gridProps: Ht,
-    columnsRef: ne(),
-    columnsMapRef: K,
+    columnsRef: oe(),
+    columnsMapRef: P,
     columnsState: R,
-    dataRef: h,
+    dataRef: g,
     id: T,
     virtualTotal: ue,
-    isAllData: z,
-    virtualPageSize: se,
+    isAllData: _,
+    virtualPageSize: U,
     isVirtualScroll: E,
     detailExpandable: !!e.detail
   };
@@ -554,12 +559,12 @@ const Al = a.forwardRef((e, ot) => {
       },
       xe,
       we,
-      /* @__PURE__ */ a.createElement(at, { rowReorderable: N }, Y),
+      /* @__PURE__ */ a.createElement(at, { rowReorderable: N }, p),
       Ge
     ),
-    ve && /* @__PURE__ */ a.createElement(pe, null, $.length ? $ : /* @__PURE__ */ a.createElement(Ye, null)),
+    Se && /* @__PURE__ */ a.createElement(pe, null, $.length ? $ : /* @__PURE__ */ a.createElement(Ye, null)),
     ke && /* @__PURE__ */ a.createElement(a.Fragment, null, /* @__PURE__ */ a.createElement(tt, null), /* @__PURE__ */ a.createElement(lt, null))
-  )), ye, e.pageable && Re, /* @__PURE__ */ a.createElement(it, { loader: e.loader, showLoader: e.showLoader }), De, be && /* @__PURE__ */ a.createElement(Ue, { message: ce })) : /* @__PURE__ */ a.createElement(et, { ...He }, /* @__PURE__ */ a.createElement(rt, null, /* @__PURE__ */ a.createElement(
+  )), ye, e.pageable && Re, /* @__PURE__ */ a.createElement(it, { loader: e.loader, showLoader: e.showLoader }), De, be && /* @__PURE__ */ a.createElement(Ue, { message: me })) : /* @__PURE__ */ a.createElement(et, { ...He }, /* @__PURE__ */ a.createElement(rt, null, /* @__PURE__ */ a.createElement(
     "div",
     {
       id: e.id,
@@ -580,10 +585,10 @@ const Al = a.forwardRef((e, ot) => {
       {
         className: f(u.ariaRoot({})),
         role: "grid",
-        "aria-colcount": g.length,
+        "aria-colcount": b.length,
         "aria-rowcount": G,
         id: T,
-        "aria-label": _.toLanguageString(nt, yl[nt])
+        "aria-label": O.toLanguageString(nt, yl[nt])
       },
       we,
       /* @__PURE__ */ a.createElement("div", { className: f(u.container({})), role: "presentation" }, /* @__PURE__ */ a.createElement(bl, null, /* @__PURE__ */ a.createElement("div", { className: f(u.content({})), role: "presentation" }, /* @__PURE__ */ a.createElement("div", { className: f(u.tableWrap({})), role: "presentation" }, /* @__PURE__ */ a.createElement(
@@ -598,8 +603,8 @@ const Al = a.forwardRef((e, ot) => {
           tableStyle: { userSelect: Gt }
         },
         xe,
-        /* @__PURE__ */ a.createElement(at, { rowReorderable: N }, Y)
-      ), ve && /* @__PURE__ */ a.createElement(pe, null, $.length ? $ : /* @__PURE__ */ a.createElement(Ye, null))), E && /* @__PURE__ */ a.createElement(
+        /* @__PURE__ */ a.createElement(at, { rowReorderable: N }, p)
+      ), Se && /* @__PURE__ */ a.createElement(pe, null, $.length ? $ : /* @__PURE__ */ a.createElement(Ye, null))), E && /* @__PURE__ */ a.createElement(
         "div",
         {
           className: f(u.heightContainer({})),
@@ -609,7 +614,7 @@ const Al = a.forwardRef((e, ot) => {
       )))),
       Ge,
       ke && /* @__PURE__ */ a.createElement(a.Fragment, null, /* @__PURE__ */ a.createElement(tt, null), /* @__PURE__ */ a.createElement(lt, null)),
-      be && /* @__PURE__ */ a.createElement(Ue, { message: ce })
+      be && /* @__PURE__ */ a.createElement(Ue, { message: me })
     ),
     ye,
     e.pageable && Re,