@progress/kendo-react-grid 10.0.0-develop.2 → 10.0.0-develop.4

package/utils/index.mjs

@@ -5,161 +5,158 @@
  * Licensed under commercial license. See LICENSE.md in the package root for more information
  *-------------------------------------------------------------------------------------------
  */
-import * as y from "react";
+import * as w from "react";
 import { gridDefaultProps as b } from "../GridColumn.mjs";
-import { getter as u } from "@progress/kendo-data-query";
-import { findGroupExpand as A, updateLeft as E, updateRight as M, tableKeyboardNavigationTools as m } from "@progress/kendo-react-data-tools";
-import { ServerFragment as D } from "./_serverModule.mjs";
+import { getter as v } from "@progress/kendo-data-query";
+import { findGroupExpand as M, updateLeft as A, updateRight as D, tableKeyboardNavigationTools as E } from "@progress/kendo-react-data-tools";
+import { ServerFragment as m } from "./_serverModule.mjs";
 import { ClientFragment as T } from "./_clientModule.mjs";
 import { GridContextMenuItemNames as g } from "../contextMenu/enums.mjs";
-function w(e, t) {
-  const n = (e != null ? e : "").split(".");
+import { canUseDOM as B } from "@progress/kendo-react-common";
+function u(e, t) {
+  const r = (e != null ? e : "").split(".");
   let i = t;
-  return n.forEach((l) => {
-    i = i ? i[l] : void 0;
+  return r.forEach((o) => {
+    i = i ? i[o] : void 0;
   }), i;
 }
-function B(e, t, n, i, l, f, r, a, d, o, s = 0, c) {
-  var v;
-  let C = s;
-  for (let h = 0; h < t.length; h++) {
+function F(e, t, r, i, o, d, n, a, l, f, c = 0, h) {
+  var C;
+  let x = c;
+  for (let s = 0; s < t.length; s++) {
     let S;
-    if (!l || t[h].value === void 0 || t[h].items === void 0) {
+    if (!o || t[s].value === void 0 || t[s].items === void 0) {
       e[e.length] = {
         dataIndex: i.index,
-        dataItem: t[h],
+        dataItem: t[s],
         rowType: "data",
-        level: s,
-        group: c,
+        level: c,
+        group: h,
         // This is related to detail-row expansion
-        expanded: (v = f ? w(f, t[h]) : o && !!(r != null && r[u(o)(t[h])])) != null ? v : !1
+        expanded: (C = d ? u(d, t[s]) : f && !!(n != null && n[v(f)(t[s])])) != null ? C : !1
       }, i.index++;
       continue;
     } else {
-      let I;
-      c != null && c.parents ? I = [{ field: c.field, value: c.value }, ...c.parents] : c ? I = [c] : I = [], S = {
-        field: t[h].field,
-        value: t[h].value,
-        parents: I
+      let y;
+      h != null && h.parents ? y = [{ field: h.field, value: h.value }, ...h.parents] : h ? y = [h] : y = [], S = {
+        field: t[s].field,
+        value: t[s].value,
+        parents: y
       };
     }
-    C = Math.max(C, s + 1);
-    let x = !1;
-    if (f)
-      x = w(f, t[h]) !== !1;
+    x = Math.max(x, c + 1);
+    let I = !1;
+    if (d)
+      I = u(d, t[s]) !== !1;
     else {
-      const I = A(a || [], S);
-      I ? x = I.expanded !== !1 : x = d !== !1;
+      const y = M(a || [], S);
+      y ? I = y.expanded !== !1 : I = l !== !1;
     }
     e[e.length] = {
       dataIndex: -1,
-      dataItem: t[h],
-      level: s,
+      dataItem: t[s],
+      level: c,
       group: S,
       rowType: "groupHeader",
-      expanded: x
-    }, x && (S.expanded = x, C = Math.max(
-      B(
+      expanded: I
+    }, I && (S.expanded = I, x = Math.max(
+      F(
         e,
-        t[h].items,
-        n,
+        t[s].items,
+        r,
         i,
+        o,
+        d,
+        n,
+        a,
         l,
         f,
-        r,
-        a,
-        d,
-        o,
-        s + 1,
+        c + 1,
         S
       ),
-      C
-    )), (n === "always" || x && n === "visible") && (e[e.length] = {
+      x
+    )), (r === "always" || I && r === "visible") && (e[e.length] = {
       dataIndex: -1,
-      dataItem: t[h],
+      dataItem: t[s],
       rowType: "groupFooter",
-      level: s,
-      expanded: x
+      level: c,
+      expanded: I
     });
   }
-  return C;
+  return x;
 }
-const z = (e, t) => typeof e.colSpan == "function" ? e.colSpan({ dataItem: t, column: e }) : e.colSpan || 1;
-function W(e, t) {
-  const n = [[]];
+const K = (e, t) => typeof e.colSpan == "function" ? e.colSpan({ dataItem: t, column: e }) : e.colSpan || 1;
+function Q(e, t) {
+  const r = [[]];
   let i = 0;
-  for (let r = e.length - 1; r >= 0; r--)
-    i = Math.max(i, e[r].depth), e[r].headerColSpan = e[r].headerColSpan || 1, e[r].children.length > 0 && (e[r].headerColSpan = e[r].children.reduce(
-      (a, d) => d.hidden ? a : a + d.headerColSpan,
+  for (let n = e.length - 1; n >= 0; n--)
+    i = Math.max(i, e[n].depth), e[n].headerColSpan = e[n].headerColSpan || 1, e[n].children.length > 0 && (e[n].headerColSpan = e[n].children.reduce(
+      (a, l) => l.hidden ? a : a + l.headerColSpan,
       0
     ));
-  const l = [];
-  let f = 1;
-  return e.forEach((r, a) => {
-    n[r.depth] = n[r.depth] || [];
-    let d = !1;
-    n[r.depth].length === 0 && (f <= 1 ? f = 1 + (r.children.length > 0 ? 0 : i - r.depth) : (f--, d = !0)), r.rowSpan = 1 + (r.children.length > 0 ? 0 : i - r.depth), r.kFirst = d, r.index = n[r.depth].length, n[r.depth].push(a), r.ariaColumnIndex = l[r.depth] ? l[r.depth] + 1 : 1;
-    for (let o = r.depth; o < r.depth + r.rowSpan; o++)
-      l[o] = (l[o] || 0) + r.headerColSpan;
-  }), E(n, e, t), M(n, e, t), n;
+  const o = [];
+  let d = 1;
+  return e.forEach((n, a) => {
+    r[n.depth] = r[n.depth] || [];
+    let l = !1;
+    r[n.depth].length === 0 && (d <= 1 ? d = 1 + (n.children.length > 0 ? 0 : i - n.depth) : (d--, l = !0)), n.rowSpan = 1 + (n.children.length > 0 ? 0 : i - n.depth), n.kFirst = l, n.index = r[n.depth].length, r[n.depth].push(a), n.ariaColumnIndex = o[n.depth] ? o[n.depth] + 1 : 1;
+    for (let f = n.depth; f < n.depth + n.rowSpan; f++)
+      o[f] = (o[f] || 0) + n.headerColSpan;
+  }), A(r, e, t), D(r, e, t), r;
 }
-function j(e, t, n, i = 0) {
-  const l = [];
+function j(e, t, r, i = 0, o = !1) {
+  const d = [];
   if (!e)
     return [];
-  e && e.length === void 0 && (e = [e]), e.filter((a) => a && a.props ? !a.props.hidden : !a.hidden).forEach((a, d) => {
+  e && e.length === void 0 && (e = [e]), e.forEach((a, l) => {
     a = a.props ? a.props : a;
-    const o = t[d] || null, s = j(
-      a.children,
-      o && o.children || [],
-      n,
-      i + 1
-    );
-    l.push(
+    const f = a.id ? a.id : E.generateNavigatableId(`${r.prevId++}`, r.idPrefix, "column"), c = B && a.media && window.matchMedia ? !window.matchMedia(a.media).matches : !1, h = o || c || a.hidden, x = t == null ? void 0 : t.find((s) => s.id === f), C = j(a.children, (x == null ? void 0 : x.children) || [], r, i + 1, h);
+    d.push(
       Object.assign(
         { depth: i },
         b,
-        s.length ? { cell: () => null, filterCell: () => null } : {},
-        o ? { width: o.width, orderIndex: o.orderIndex } : {},
+        C.length ? { cell: () => null, filterCell: () => null } : {},
         a,
         {
-          id: a.id ? a.id : m.generateNavigatableId(`${n.prevId++}`, n.idPrefix, "column"),
-          declarationIndex: l.length,
-          children: s,
-          headerColSpan: a.headerColSpan,
+          id: f,
+          declarationIndex: d.length,
+          children: C,
+          headerColSpan: 0,
           rowSpan: 0,
           columnType: a.columnType || "data",
           colSpan: a.colSpan || 1,
           isAccessible: !0,
-          left: a.lockedColumn ? o && Math.floor(o.left) : null,
-          right: a.lockedColumn ? o && Math.floor(o.right) : null,
+          hidden: h,
+          left: null,
+          right: null,
           rowSpannable: a.rowSpannable
-        }
+        },
+        x ? { width: x.width, orderIndex: x.orderIndex } : {}
       )
     );
   });
-  const r = (a, d) => a.orderIndex === d.orderIndex ? a.declarationIndex - d.declarationIndex : (a.orderIndex || 0) - (d.orderIndex || 0);
-  if (l.sort(r), i === 0) {
-    const a = [], d = (o, s) => o.forEach((c) => {
-      c.parentIndex = s, d(c.children, a.push(c) - 1);
+  const n = (a, l) => a.orderIndex === l.orderIndex ? a.declarationIndex - l.declarationIndex : (a.orderIndex || 0) - (l.orderIndex || 0);
+  if (d.sort(n), i === 0) {
+    const a = [], l = (f, c) => f.forEach((h) => {
+      h.parentIndex = c, l(h.children, a.push(h) - 1);
     });
-    return d(l, -1), a;
+    return l(d, -1), a;
   }
-  return l;
+  return d;
 }
-const k = (e) => Array.isArray(e) ? e : e ? e.data : [];
-function J(e, t, n, i) {
-  const l = k(e), f = [];
-  if (l.length > 0) {
-    let r = l[0];
+const H = (e) => Array.isArray(e) ? e : e ? e.data : [];
+function X(e, t, r, i) {
+  const o = H(e), d = [];
+  if (o.length > 0) {
+    let n = o[0];
     if (t)
-      for (let d = 0; d < t.length; d++)
-        r = r.items && r.items[0];
-    Object.getOwnPropertyNames(r).forEach((d) => {
-      d !== n.column && f.push(
+      for (let l = 0; l < t.length; l++)
+        n = n.items && n.items[0];
+    Object.getOwnPropertyNames(n).forEach((l) => {
+      l !== r.column && d.push(
         Object.assign(
           {
-            id: m.generateNavigatableId(`${i.prevId++}`, i.idPrefix, "column"),
+            id: E.generateNavigatableId(`${i.prevId++}`, i.idPrefix, "column"),
             declarationIndex: -1,
             parentIndex: -1,
             depth: 0,
@@ -176,37 +173,49 @@ function J(e, t, n, i) {
             isAccessible: !0
           },
           b,
-          { field: d }
+          { field: l }
         )
       );
     });
   }
-  return f;
+  return d;
 }
-const p = (e, t) => {
-  let n = e[t.parentIndex];
-  for (; n; ) {
-    if (n.footerCell)
+const O = (e, t) => {
+  let r = e[t.parentIndex];
+  for (; r; ) {
+    if (r.footerCell)
       return !0;
-    n = e[n.parentIndex];
+    r = e[r.parentIndex];
   }
   return !1;
-}, K = (e) => e.filter((t) => p(e, t) ? !1 : !!t.footerCell || !(t.children && t.children.length > 0)), Q = (e) => e.width !== void 0 ? Math.floor(parseFloat(e.width.toString())) + "px" : void 0, U = (e, t) => t && t.filter((n) => n.field === e).length > 0, F = (e) => (e.sort((t, n) => t.declarationIndex - n.declarationIndex), e.map((t) => {
-  const { declarationIndex: n, parentIndex: i, depth: l, headerColSpan: f, rowSpan: r, index: a, kFirst: d, children: o, ...s } = t;
-  return o.length ? {
-    children: F(o),
-    ...s
-  } : s;
-})), R = (e) => {
-  const { filterCell: t, headerCell: n, footerCell: i, cells: l, cell: f, rowSpannable: r, ...a } = e;
+}, Y = (e) => e.filter((t) => O(e, t) ? !1 : !!t.footerCell || !(t.children && t.children.length > 0)), Z = (e) => e.width !== void 0 ? Math.floor(parseFloat(e.width.toString())) + "px" : void 0, _ = (e, t) => t && t.filter((r) => r.field === e).length > 0, R = (e) => (e.sort((t, r) => t.declarationIndex - r.declarationIndex), e.map((t) => {
+  const { declarationIndex: r, parentIndex: i, depth: o, headerColSpan: d, rowSpan: n, index: a, kFirst: l, children: f, ...c } = t;
+  return f.length ? {
+    children: R(f),
+    ...c
+  } : c;
+})), N = (e) => {
+  const { filterCell: t, headerCell: r, footerCell: i, cells: o, cell: d, rowSpannable: n, ...a } = e;
   return e.children.length ? {
     ...a,
-    children: e.children.map(R)
+    children: e.children.map(N)
   } : a;
-}, X = typeof window != "undefined" && /Firefox/.test(window.navigator.userAgent), Y = 17895697, Z = (e) => {
+}, k = (e) => ({
+  id: e.id,
+  field: e.field,
+  title: e.title,
+  width: e.width,
+  hidden: !1,
+  children: e.children ? p(e.children) : null
+}), p = (e) => e.map(k), G = (e) => {
+  const t = [], r = (i) => i == null ? void 0 : i.forEach((o) => {
+    t.push(o), r(o.children);
+  });
+  return r(e), t;
+}, P = typeof window != "undefined" && /Firefox/.test(window.navigator.userAgent), ee = 17895697, te = (e) => {
   let t = [];
   return e.sortable && (t = t.concat([g.sortAsc, g.sortDesc])), t;
-}, _ = (e) => {
+}, ne = (e) => {
   let t = [];
   return e.clipboard && (t = t.concat([
     g.copySelection,
@@ -217,7 +226,7 @@ const p = (e, t) => {
     g.edit,
     g.delete
   ])), e.selectable && (t.length && (t = t.concat([g.separator])), t = t.concat([g.select])), e.rowReorderable && (t.length && (t = t.concat([g.separator])), t = t.concat([g.reorderRow])), t;
-}, G = (e, t) => {
+}, re = (e, t) => {
   if (!(!e && !t))
     return t ? e ? {
       ...e,
@@ -239,10 +248,10 @@ const p = (e, t) => {
         ...t.edit || {}
       }
     } : t : e;
-}, P = (e) => {
-  var n;
-  return typeof e == "object" ? (n = e.enabled) != null ? n : !0 : e != null ? e : !1;
-}, ee = () => D === T, te = (e) => !!(e && e.$$typeof === Symbol.for("react.client.reference")), re = (e) => ({
+}, ae = (e) => {
+  var r;
+  return typeof e == "object" ? (r = e.enabled) != null ? r : !0 : e != null ? e : !1;
+}, ie = () => m === T, de = (e) => !!(e && e.$$typeof === Symbol.for("react.client.reference")), le = (e) => ({
   id: e.id,
   ariaColumnIndex: e.ariaColumnIndex,
   isSelected: e.isSelected,
@@ -268,40 +277,43 @@ const p = (e, t) => {
   rowDataIndex: e.rowDataIndex,
   columnPosition: e.columnPosition,
   group: e.group
-}), ne = (e) => {
-  var i, l;
-  const t = typeof e == "object" ? (i = e.enabled) != null ? i : !0 : e != null ? e : !1, n = typeof e == "object" ? (l = e.valueGetter) != null ? l : (f, r) => u(r)(f) : (f, r) => u(r)(f);
-  return { enabled: t, valueGetter: n };
-}, N = (e) => {
+}), oe = (e) => {
+  var i, o;
+  const t = typeof e == "object" ? (i = e.enabled) != null ? i : !0 : e != null ? e : !1, r = typeof e == "object" ? (o = e.valueGetter) != null ? o : (d, n) => v(n)(d) : (d, n) => v(n)(d);
+  return { enabled: t, valueGetter: r };
+}, $ = (e) => {
   var t;
-  return y.isValidElement(e) ? e : (t = y.Children.toArray(e)) == null ? void 0 : t[0];
-}, ae = (e, t) => {
-  const n = N(e);
-  return n ? y.cloneElement(n, t) : null;
+  return w.isValidElement(e) ? e : (t = w.Children.toArray(e)) == null ? void 0 : t[0];
+}, fe = (e, t) => {
+  const r = $(e);
+  return r ? w.cloneElement(r, t) : null;
 };
 export {
-  J as autoGenerateColumns,
-  R as clientColumn,
-  ae as cloneReactElement,
-  X as firefox,
-  Y as firefoxMaxHeight,
-  B as flatData,
-  K as footerColumns,
-  re as getClientCellProps,
-  z as getColSpan,
-  Q as getColumnWidth,
-  k as getDataAsArray,
-  _ as getDefaultBodyContextMenuItems,
-  Z as getDefaultHeadContextMenuItems,
-  w as getNestedValue,
-  N as getReactElement,
-  ne as getRowSpanOptions,
-  ee as isClient,
-  te as isClientReference,
-  P as isRowReorderEnabled,
-  U as isSorted,
-  W as mapColumns,
+  X as autoGenerateColumns,
+  N as clientColumn,
+  fe as cloneReactElement,
+  P as firefox,
+  ee as firefoxMaxHeight,
+  F as flatData,
+  Y as footerColumns,
+  le as getClientCellProps,
+  K as getColSpan,
+  k as getColumnState,
+  Z as getColumnWidth,
+  p as getColumnsState,
+  H as getDataAsArray,
+  ne as getDefaultBodyContextMenuItems,
+  te as getDefaultHeadContextMenuItems,
+  G as getFlatColumnsState,
+  u as getNestedValue,
+  $ as getReactElement,
+  oe as getRowSpanOptions,
+  ie as isClient,
+  de as isClientReference,
+  ae as isRowReorderEnabled,
+  _ as isSorted,
+  Q as mapColumns,
   j as readColumns,
-  G as resolveCells,
-  F as sanitizeColumns
+  re as resolveCells,
+  R as sanitizeColumns
 };

package/utils/premium.js

@@ -5,4 +5,4 @@
  * Licensed under commercial license. See LICENSE.md in the package root for more information
  *-------------------------------------------------------------------------------------------
  */
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const u=require("react"),n=require("@progress/kendo-react-data-tools"),d=require("../sortCommon.js"),c=require("../paging/GridPagerSettings.js");function s(e){const t=Object.create(null,{[Symbol.toStringTag]:{value:"Module"}});if(e){for(const l in e)if(l!=="default"){const r=Object.getOwnPropertyDescriptor(e,l);Object.defineProperty(t,l,r.get?r:{enumerable:!0,get:()=>e[l]})}}return t.default=e,Object.freeze(t)}const m=s(u),b=e=>({lockedColumn:e.some(t=>t.locked)}),g=e=>({multiColumn:e.some(t=>t.children&&t.children.length>0)}),C=e=>({columnCellTemplate:e.some(t=>t.columnType==="checkbox"?!1:t.cells||t.cell||t.headerCell||t.footerCell||t.filterCell)}),f=e=>({columnMenu:e.some(t=>t.columnMenu)}),y=e=>m.Children.toArray(e.children).some(l=>l&&l.type&&l.type.displayName==="KendoReactGridColumn"?l.props.hidden:!1),a=e=>{const t=n.getSelectionOptions(e.selectable),l=n.getEditableOptions(e.editable),r=e.sortable&&d.normalizeSortable(e.sortable),o=e.pageable&&c.normalize(e.pageable);return{cells:!!e.cells,detail:!!e.detail,cellRender:!!e.cellRender,rows:!!e.rows,rowRender:!!e.rowRender,filterCellRender:!!e.filterCellRender,headerCellRender:!!e.headerCellRender,editableInline:l.mode==="inline",selectionMultiple:t.enabled&&t.mode==="multiple",selectionDrag:t.enabled&&t.drag,columnMenu:!!e.columnMenu,filterOperators:!!e.filterOperators,groupable:!!e.groupable,group:!!e.group,groupExpand:!!e.groupExpand,pager:!!e.pager,clipboard:!!e.clipboard,contextMenu:!!e.contextMenu,serverGrid:!e.isClient,scrollableVirtual:e.scrollable==="virtual",pageableInput:!!(e.pageable&&o.type==="input"),sortableMultiple:!!(e.sortable&&r.mode==="multiple"),hiddenColumns:y(e)}},i=e=>({...b(e),...g(e),...C(e),...f(e)}),h=(e,t)=>{const l={...a(e),...i(t)};return Object.keys(l).filter(r=>l[r]===!0)};exports.gridPremiumFeatures=h;exports.isPremiumGridByColumns=i;exports.isPremiumGridByProps=a;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const u=require("react"),n=require("@progress/kendo-react-data-tools"),d=require("../sortCommon.js"),s=require("../paging/GridPagerSettings.js");function c(e){const t=Object.create(null,{[Symbol.toStringTag]:{value:"Module"}});if(e){for(const l in e)if(l!=="default"){const r=Object.getOwnPropertyDescriptor(e,l);Object.defineProperty(t,l,r.get?r:{enumerable:!0,get:()=>e[l]})}}return t.default=e,Object.freeze(t)}const m=c(u),b=e=>({lockedColumn:e.some(t=>t.locked)}),g=e=>({multiColumn:e.some(t=>t.children&&t.children.length>0)}),C=e=>({columnCellTemplate:e.some(t=>t.columnType!=="data"?!1:t.cells||t.cell||t.headerCell||t.footerCell||t.filterCell)}),f=e=>({columnMenu:e.some(t=>t.columnMenu)}),y=e=>m.Children.toArray(e.children).some(l=>l&&l.type&&l.type.displayName==="KendoReactGridColumn"?l.props.hidden:!1),a=e=>{const t=n.getSelectionOptions(e.selectable),l=n.getEditableOptions(e.editable),r=e.sortable&&d.normalizeSortable(e.sortable),o=e.pageable&&s.normalize(e.pageable);return{cells:!!e.cells,detail:!!e.detail,cellRender:!!e.cellRender,rows:!!e.rows,rowRender:!!e.rowRender,filterCellRender:!!e.filterCellRender,headerCellRender:!!e.headerCellRender,editableInline:l.mode==="inline",selectionMultiple:t.enabled&&t.mode==="multiple",selectionDrag:t.enabled&&t.drag,columnMenu:!!e.columnMenu,filterOperators:!!e.filterOperators,groupable:!!e.groupable,group:!!e.group,groupExpand:!!e.groupExpand,customPager:!!e.pager,clipboard:!!e.clipboard,contextMenu:!!e.contextMenu,serverGrid:!e.isClient,scrollableVirtual:e.scrollable==="virtual",pageableInput:!!(e.pageable&&o.type==="input"),sortableMultiple:!!(e.sortable&&r.mode==="multiple"),hiddenColumns:y(e)}},i=e=>({...b(e),...g(e),...C(e),...f(e)}),h=(e,t)=>{const l={...a(e),...i(t)};return Object.keys(l).filter(r=>l[r]===!0)};exports.gridPremiumFeatures=h;exports.isPremiumGridByColumns=i;exports.isPremiumGridByProps=a;

package/utils/premium.mjs

@@ -9,12 +9,12 @@ import * as a from "react";
 import { getSelectionOptions as i, getEditableOptions as o } from "@progress/kendo-react-data-tools";
 import { normalizeSortable as d } from "../sortCommon.mjs";
 import { normalize as u } from "../paging/GridPagerSettings.mjs";
-const c = (e) => ({
+const m = (e) => ({
   lockedColumn: e.some((l) => l.locked)
-}), m = (e) => ({
-  multiColumn: e.some((l) => l.children && l.children.length > 0)
 }), s = (e) => ({
-  columnCellTemplate: e.some((l) => l.columnType === "checkbox" ? !1 : l.cells || l.cell || l.headerCell || l.footerCell || l.filterCell)
+  multiColumn: e.some((l) => l.children && l.children.length > 0)
+}), c = (e) => ({
+  columnCellTemplate: e.some((l) => l.columnType !== "data" ? !1 : l.cells || l.cell || l.headerCell || l.footerCell || l.filterCell)
 }), b = (e) => ({
   columnMenu: e.some((l) => l.columnMenu)
 }), C = (e) => a.Children.toArray(e.children).some((t) => t && t.type && t.type.displayName === "KendoReactGridColumn" ? t.props.hidden : !1), g = (e) => {
@@ -35,7 +35,7 @@ const c = (e) => ({
     groupable: !!e.groupable,
     group: !!e.group,
     groupExpand: !!e.groupExpand,
-    pager: !!e.pager,
+    customPager: !!e.pager,
     clipboard: !!e.clipboard,
     contextMenu: !!e.contextMenu,
     serverGrid: !e.isClient,
@@ -45,9 +45,9 @@ const c = (e) => ({
     hiddenColumns: C(e)
   };
 }, h = (e) => ({
-  ...c(e),
   ...m(e),
   ...s(e),
+  ...c(e),
   ...b(e)
 }), M = (e, l) => {
   const t = {