@progress/kendo-react-grid 8.2.0-develop.4 → 8.2.0-develop.40

package/Grid.mjs

@@ -8,38 +8,38 @@
 "use client";
 import * as r from "react";
 import o from "prop-types";
-import { RowHeightService as re, dispatchEvent as Ge, canUseDOM as L, getActiveElement as Oe, memoizeOne as S, validatePackage as Ke, shouldShowValidationUI as Ve, setScrollbarWidth as ae, getter as Ue, classNames as M, kendoThemeMaps as O, WatermarkOverlay as Be } from "@progress/kendo-react-common";
-import { tableKeyboardNavigationTools as k, tableKeyboardNavigation as _, getSelectionOptions as le, mapColumns as We, ClipboardService as $e, TableKeyboardNavigationContext as U, isRtl as je, tableColumnsVirtualization as qe, Pager as Je, tableKeyboardNavigationScopeAttributes as ne, TableSelection as he, tableKeyboardNavigationBodyAttributes as pe, DropClue as de, DragClue as ce, updateLeft as Xe, updateRight as Ye, KEYBOARD_NAV_DATA_ID as Qe } from "@progress/kendo-react-data-tools";
-import { GridSelectionCell as Ze } from "./cells/GridSelectionCell.mjs";
-import { GridHierarchyCell as et } from "./cells/GridHierarchyCell.mjs";
-import { GridEditCell as tt } from "./cells/GridEditCell.mjs";
-import { Header as st } from "./header/Header.mjs";
-import { HeaderRow as it } from "./header/HeaderRow.mjs";
-import { FilterRow as ot } from "./header/FilterRow.mjs";
-import { GroupPanel as rt } from "./header/GroupPanel.mjs";
-import { Footer as at } from "./footer/Footer.mjs";
-import { provideLocalizationService as lt, registerForLocalization as nt } from "@progress/kendo-react-intl";
-import { pagerMessagesMap as ht, gridAriaLabel as ue, messages as pt } from "./messages/index.mjs";
-import { VirtualScroll as dt } from "./VirtualScroll.mjs";
+import { RowHeightService as re, getScrollbarWidth as Pe, dispatchEvent as Ge, canUseDOM as F, getActiveElement as Ke, memoizeOne as E, validatePackage as We, shouldShowValidationUI as Be, setScrollbarWidth as ae, getter as Ve, classNames as L, kendoThemeMaps as G, WatermarkOverlay as Ue } from "@progress/kendo-react-common";
+import { tableKeyboardNavigation as _, getSelectionOptions as le, mapColumns as $e, ClipboardService as je, TableKeyboardNavigationContext as B, isRtl as qe, tableKeyboardNavigationTools as x, tableColumnsVirtualization as Je, Pager as Xe, tableKeyboardNavigationScopeAttributes as ne, TableSelection as he, tableKeyboardNavigationBodyAttributes as pe, DropClue as de, DragClue as ce, updateLeft as Ye, updateRight as Qe, KEYBOARD_NAV_DATA_ID as Ze } from "@progress/kendo-react-data-tools";
+import { GridSelectionCell as et } from "./cells/GridSelectionCell.mjs";
+import { GridHierarchyCell as tt } from "./cells/GridHierarchyCell.mjs";
+import { GridEditCell as st } from "./cells/GridEditCell.mjs";
+import { Header as it } from "./header/Header.mjs";
+import { HeaderRow as ot } from "./header/HeaderRow.mjs";
+import { FilterRow as rt } from "./header/FilterRow.mjs";
+import { GroupPanel as at } from "./header/GroupPanel.mjs";
+import { Footer as lt } from "./footer/Footer.mjs";
+import { provideLocalizationService as nt, registerForLocalization as ht } from "@progress/kendo-react-intl";
+import { pagerMessagesMap as pt, gridAriaLabel as ue, messages as dt } from "./messages/index.mjs";
+import { VirtualScroll as ct } from "./VirtualScroll.mjs";
 import { VirtualScrollFixed as ge } from "./VirtualScrollFixed.mjs";
-import { ColumnResize as ct } from "./drag/ColumnResize.mjs";
-import { CommonDragLogic as ut } from "./drag/CommonDragLogic.mjs";
-import { firefox as me, firefoxMaxHeight as fe, flatData as gt, readColumns as mt, sanitizeColumns as ft, getColumnWidth as B, autoGenerateColumns as vt, getNestedValue as ve, resolveCells as bt } from "./utils/index.mjs";
-import { GridCell as Ct } from "./cells/GridCell.mjs";
-import { GridGroupCell as be } from "./cells/GridGroupCell.mjs";
-import { GridRow as Rt } from "./rows/GridRow.mjs";
+import { ColumnResize as ut } from "./drag/ColumnResize.mjs";
+import { CommonDragLogic as gt } from "./drag/CommonDragLogic.mjs";
+import { firefox as me, firefoxMaxHeight as fe, flatData as mt, readColumns as ft, sanitizeColumns as bt, getColumnWidth as V, autoGenerateColumns as vt, getNestedValue as be, resolveCells as Ct } from "./utils/index.mjs";
+import { GridCell as Rt } from "./cells/GridCell.mjs";
+import { GridGroupCell as ve } from "./cells/GridGroupCell.mjs";
+import { GridRow as wt } from "./rows/GridRow.mjs";
 import { GridHeaderSelectionCell as yt } from "./header/GridHeaderSelectionCell.mjs";
-import { GridNoRecords as wt } from "./GridNoRecords.mjs";
+import { GridNoRecords as Et } from "./GridNoRecords.mjs";
 import { operators as Ce } from "./filterCommon.mjs";
 import { FooterRow as St } from "./footer/FooterRow.mjs";
 import { normalize as It } from "./paging/GridPagerSettings.mjs";
 import { packageMetadata as Re } from "./package-metadata.mjs";
 import { GridDetailCell as kt } from "./cells/GridDetailCell.mjs";
-import { GridDetailHierarchyCell as Et } from "./cells/GridDetailHierarchyCell.mjs";
+import { GridDetailHierarchyCell as _t } from "./cells/GridDetailHierarchyCell.mjs";
 import { SAFARI_REGEX as xt } from "./constants/index.mjs";
 const z = class z extends r.Component {
   constructor(a) {
-    super(a), this._columns = [], this._columnsMap = [[]], this._columnsMutations = 0, this._resized = !1, this._focusFirst = !1, this._shouldUpdateLeftRight = !0, this.contextStateRef = { current: void 0 }, this.navigationStateRef = { current: void 0 }, this._data = [], this._slicedData = void 0, this.wrapperScrollTop = 0, this.showLicenseWatermark = !1, this.headerRef = r.createRef(), this.headerElementRef = r.createRef(), this._element = null, this.tableElement = null, this.containerRef = r.createRef(), this.tableBodyRef = r.createRef(), this._footer = null, this.forceUpdateTimeout = void 0, this.isRtl = !1, this.headTable = null, this.observer = null, this.handleIntersection = (e) => {
+    super(a), this._columns = [], this._columnsMap = [[]], this._columnsMutations = 0, this._resized = !1, this._focusFirst = !1, this._singleEditRow = !1, this._shouldUpdateLeftRight = !0, this._scrollbarWidth = void 0, this.contextStateRef = { current: void 0 }, this.navigationStateRef = { current: void 0 }, this._data = [], this._slicedData = void 0, this.wrapperScrollTop = 0, this.showLicenseWatermark = !1, this.headerRef = r.createRef(), this.headerElementRef = r.createRef(), this._element = null, this.tableElement = null, this.containerRef = r.createRef(), this.tableBodyRef = r.createRef(), this._footer = null, this.forceUpdateTimeout = void 0, this.isRtl = !1, this.headTable = null, this.rowsInEdit = [], this.observer = null, this.handleIntersection = (e) => {
       const t = { rowIndex: this.rowIndex };
       e.forEach((s) => {
         s.isIntersecting || this.setCurrentOnTop(t);
@@ -68,8 +68,8 @@ const z = class z extends r.Component {
     }, this.fitColumns = (e) => {
       this.columnResize.dblClickHandler(null, e);
     }, this.getColumnsEssentialProps = (e) => JSON.stringify(e.map((t) => ({ id: t.id, field: t.field, title: t.title, children: t.children }))), this.checkMatchMediaColumnsDifferece = () => {
-      const e = this.childrenToArray(this.props.children), t = k.getIdPrefix(this.navigationStateRef), s = this.filterHiddenColumns(e);
-      return this.getColumnsEssentialProps(this.readColumns(s, t, this._columnsMutations)) === this.getColumnsEssentialProps(this._columns);
+      const e = this.childrenToArray(this.props.children);
+      return this.getColumnsEssentialProps(e) === this.getColumnsEssentialProps(this._columns);
     }, this.onContextMenu = (e, t, s) => {
       if (this.props.onContextMenu) {
         const l = {
@@ -82,8 +82,8 @@ const z = class z extends r.Component {
         this.props.onContextMenu.call(void 0, l);
       }
     }, this.getVirtualScroll = (e) => {
-      const { rowHeight: t, detailRowHeight: s, detail: l, expandField: p, groupable: n } = e, d = this.isAllData(), f = t !== void 0 && t > 0, R = s !== void 0 && s > 0, E = n === !0 || typeof n == "object" && n.enabled !== !1;
-      return !f || E && !d || !!(l && p) && (!R || !d) ? dt : ge;
+      const { rowHeight: t, detailRowHeight: s, detail: l, expandField: h, groupable: n } = e, d = this.isAllData(), f = t !== void 0 && t > 0, R = s !== void 0 && s > 0, I = n === !0 || typeof n == "object" && n.enabled !== !1;
+      return !f || I && !d || !!(l && h) && (!R || !d) ? ct : ge;
     }, this.isAllData = () => {
       const { data: e, total: t } = this.props;
       return Array.isArray(e) ? e.length === t : e ? t === e.total : !1;
@@ -101,13 +101,13 @@ const z = class z extends r.Component {
       } else
         this.vs.containerHeight = 1533915;
       if (this.vs.containerRef = this.containerRef, this.vs.tableBodyRef = this.tableBodyRef, this.vs.table = this.tableElement, this._slicedData = void 0, this.vs instanceof ge) {
-        const { rowHeight: s = 0, detail: l, expandField: p } = this.props;
+        const { rowHeight: s = 0, detail: l, expandField: h } = this.props;
         let { detailRowHeight: n = 0 } = this.props;
-        n = l && p ? n : s, this.isAllData() ? (this.vs.total = this._data.length, this._slicedData = this._data.slice(this.vs.realSkip, this.vs.realSkip + this.vs.pageSize), this.vs.rowHeightService = this.rowHeightService(this.vs, this._data.length, s, n, this._data)) : this.vs.rowHeightService = new re(e, s, n);
+        n = l && h ? n : s, this.isAllData() ? (this.vs.total = this._data.length, this._slicedData = this._data.slice(this.vs.realSkip, this.vs.realSkip + this.vs.pageSize), this.vs.rowHeightService = this.rowHeightService(this.vs, this._data.length, s, n, this._data)) : this.vs.rowHeightService = new re(e, s, n);
         const d = this.vs.rowHeightService.totalHeight();
         this.vs.containerHeight = me ? Math.min(fe, d) : d;
       }
-    }, this.scrollHandler = (e) => {
+    }, this.getCachedScrollbarWidth = () => (this._scrollbarWidth || (this._scrollbarWidth = Pe() || void 0), this._scrollbarWidth), this.scrollHandler = (e) => {
       if (e.target !== e.currentTarget)
         return;
       clearTimeout(this.forceUpdateTimeout), this.vs.table = this.tableElement;
@@ -117,9 +117,11 @@ const z = class z extends r.Component {
       }, 0)), this._header && this._header.setScrollLeft(t), this._footer && this._footer.setScrollLeft(t), this.vs && s !== this.wrapperScrollTop && this.vs.scrollHandler(e), Ge(this.props.onScroll, e, this, void 0), this.wrapperScrollTop = s;
     }, this.onKeyDown = (e) => {
       if (_.onKeyDown(e, {
+        navigatable: this.props.navigatable || !1,
         contextStateRef: this.contextStateRef,
         navigationStateRef: this.navigationStateRef,
-        onNavigationAction: this.onNavigationAction
+        onNavigationAction: this.onNavigationAction,
+        columns: this.columns
       }), this.props.onKeyDown) {
         const { mode: t, cell: s } = le(this.props.selectable), l = {
           dataItems: this.getLeafDataItems(),
@@ -133,6 +135,7 @@ const z = class z extends r.Component {
       }
     }, this.onFocus = (e) => {
       _.onFocus(e, {
+        navigatable: !!this.props.navigatable,
         contextStateRef: this.contextStateRef
       });
     }, this.onNavigationAction = (e) => {
@@ -275,12 +278,12 @@ const z = class z extends r.Component {
         );
       }
     }, this.inActiveElement = () => {
-      var p, n, d;
-      if (!L)
+      var h, n, d;
+      if (!F)
         return !1;
-      const e = Oe(this.document), t = e ? e.matches(".k-table-td") ? e : (p = this.document) == null ? void 0 : p.body : (n = this.document) == null ? void 0 : n.body, s = t.closest(".k-grid-container"), l = t && ((d = this._element) == null ? void 0 : d.contains(t));
+      const e = Ke(this.document), t = e ? e.matches(".k-table-td") ? e : (h = this.document) == null ? void 0 : h.body : (n = this.document) == null ? void 0 : n.body, s = t.closest(".k-grid-container"), l = t && ((d = this._element) == null ? void 0 : d.contains(t));
       return !!(t && l && s);
-    }, this.onResize = (e, t, s, l, p, n) => {
+    }, this.onResize = (e, t, s, l, h, n) => {
       this.resetTableWidth(), this._shouldUpdateLeftRight = !0, this._resized = !0, this._columnsMutations++, this.props.onColumnResize && this.props.onColumnResize.call(
         void 0,
         {
@@ -290,46 +293,34 @@ const z = class z extends r.Component {
           index: e,
           newWidth: t,
           oldWidth: s,
-          end: p,
+          end: h,
           target: this
         }
       );
-    }, this.reInitVirtualization = S((e, t, s, l, p, n) => {
+    }, this.reInitVirtualization = E((e, t, s, l, h, n) => {
       this.vs.reset();
       const d = this.getVirtualScroll(this.props);
       this.vs = new d(n);
-    }), this.flatData = S((e, t, s, l, p, n, d) => {
-      const f = [], R = gt(
+    }), this.flatData = E((e, t, s, l, h, n, d) => {
+      const f = [], R = mt(
         f,
         e,
         t,
         { index: s },
         l !== void 0,
-        p
+        h
       );
       return { flattedData: f, resolvedGroupsCount: R };
-    }), this.rowHeightService = S((e, t, s, l, p) => new re(t, s, l, p)), this.childrenToArray = S((e) => r.Children.toArray(e)), this.readColumns = S(
+    }), this.rowHeightService = E((e, t, s, l, h) => new re(t, s, l, h)), this.childrenToArray = E((e) => r.Children.toArray(e)), this.readColumns = E(
       (e, t, s) => {
-        const l = e.filter((p) => p && p.type && p.type.displayName === "KendoReactGridColumn");
-        return mt(l, this.columns, { prevId: 0, idPrefix: t });
+        const l = e.filter((h) => h && h.type && h.type.displayName === "KendoReactGridColumn");
+        return ft(l, this.columns, { prevId: 0, idPrefix: t });
       }
-    ), this.mapColumns = S(
-      (e, t) => We(e, !0)
-    ), this.filterHiddenColumns = (e) => {
-      const t = (s) => {
-        const l = s;
-        return {
-          ...l,
-          props: {
-            ...l.props,
-            children: l.props.children && l.props.children.length > 0 ? this.filterHiddenColumns(l.props.children) : l.props.children
-          }
-        };
-      };
-      return [...e].filter((s) => r.isValidElement(s) && !s.props.hidden).filter((s) => L && s && r.isValidElement(s) && s.props.media ? window.matchMedia(s.props.media).matches : s).map((s) => t(s));
-    }, this.configureColumns = S((e, t, s) => {
+    ), this.mapColumns = E(
+      (e, t) => $e(e, !0)
+    ), this.filterColumnsByMediaProp = (e) => e.filter((t) => F && t && t.media ? window.matchMedia(t.media).matches : t), this.configureColumns = E((e, t, s) => {
       this.props.selectedField && e.filter((n) => n.field === this.props.selectedField).forEach((n) => {
-        n.width = n.width || "50px", n.cell = n.cell || Ze, n.headerCell = n.headerCell || yt;
+        n.width = n.width || "50px", n.cell = n.cell || et, n.headerCell = n.headerCell || yt;
       });
       const l = {
         id: "",
@@ -350,24 +341,24 @@ const z = class z extends r.Component {
         ariaColumnIndex: 0,
         isAccessible: !0
       };
-      let p = 0;
+      let h = 0;
       this.props.expandField && this.props.onExpandChange && this.props.detail && (e.unshift({
         ...l,
-        cell: et,
+        cell: tt,
         field: this.props.expandField,
         headerClassName: "k-hierarchy-cell k-header"
-      }), p++);
+      }), h++);
       for (let n = 0; n < t; n++)
         e.unshift({
           ...l,
           isAccessible: !1,
-          cell: be,
+          cell: ve,
           field: "value",
           locked: this.props.lockGroups
-        }), p++;
-      e.slice(p).forEach((n) => n.parentIndex >= 0 && (n.parentIndex += p));
-    }), this.getHeaderRow = S((e, t, s, l, p, n, d, f, R, E, D, C, A) => /* @__PURE__ */ r.createElement(
-      it,
+        }), h++;
+      e.slice(h).forEach((n) => n.parentIndex >= 0 && (n.parentIndex += h));
+    }), this.getHeaderRow = E((e, t, s, l, h, n, d, f, R, I, T, C, M) => /* @__PURE__ */ r.createElement(
+      ot,
       {
         cells: this.props.cells,
         sort: e,
@@ -376,37 +367,44 @@ const z = class z extends r.Component {
         group: s || [],
         groupable: l,
         groupChange: this.groupChange,
-        filter: p,
+        filter: h,
         filterable: n,
         filterOperators: d,
         filterChange: this.filterChange,
         columnMenu: R,
-        columnMenuIcon: E,
+        columnMenuIcon: I,
         selectionChange: this.onHeaderSelectionChange,
-        columns: D,
+        columns: T,
         columnResize: this.columnResize,
         pressHandler: this.dragLogic.pressHandler,
         dragHandler: this.dragLogic.dragHandler,
         releaseHandler: this.dragLogic.releaseHandler,
         columnsMap: C,
         cellRender: f,
-        isRtl: A,
+        isRtl: M,
         dragClue: this.dragLogic.dragClueRef,
         headerRef: this.headerElementRef,
         containerRef: this.containerRef,
-        navigatable: this.props.navigatable,
+        navigatable: !!this.props.navigatable,
         columnGroupChange: this.columnGroupChange
       }
     )), this.resolveTitle = (e) => {
       const t = this._columns.find((l) => l.field === e), s = t && (t.title || t.field);
       return s === void 0 ? e : s;
-    }, this.getLeafDataItems = () => this._data.filter((e) => e.rowType === "data").map((e) => e.dataItem), this.getSlicedLeafDataItems = () => (this._slicedData || this._data).filter((e) => e.rowType === "data").map((e) => e.dataItem), Ke(Re), this.showLicenseWatermark = Ve(Re);
-    const h = this.props.groupable === !0 || typeof this.props.groupable == "object" && this.props.groupable.enabled !== !1, c = this.getVirtualScroll(a);
-    this.vs = new c(h || a.rowHeight === void 0 || a.rowHeight === 0), this.dragLogic = new ut(
+    }, this.getLeafDataItems = () => this._data.filter((e) => e.rowType === "data").map((e) => e.dataItem), this.getSlicedLeafDataItems = () => (this._slicedData || this._data).filter((e) => e.rowType === "data").map((e) => e.dataItem), this.handleFocusInEditableRows = () => {
+      var e, t, s;
+      if (this.tableBodyRef.current && ((e = this.tableBodyRef.current) == null ? void 0 : e.getElementsByClassName("k-grid-edit-row").length) > 0) {
+        this._singleEditRow = !1, (t = document.activeElement) != null && t.closest(".k-grid-edit-row") ? this._lastActiveElement = document.activeElement : this._lastActiveElement = void 0;
+        const l = Array.from((s = this.tableBodyRef.current) == null ? void 0 : s.getElementsByClassName("k-grid-edit-row"));
+        l.length > this.rowsInEdit.length ? this._newEditableRow = l.filter((h) => !this.rowsInEdit.includes(h))[0] : l.length === 1 && (this._newEditableRow = l[0], this._singleEditRow = !0), this.rowsInEdit = l;
+      }
+    }, We(Re), this.showLicenseWatermark = Be(Re);
+    const p = this.props.groupable === !0 || typeof this.props.groupable == "object" && this.props.groupable.enabled !== !1, c = this.getVirtualScroll(a);
+    this.vs = new c(p || a.rowHeight === void 0 || a.rowHeight === 0), this.dragLogic = new gt(
       this.columnReorder.bind(this),
       this.groupReorder.bind(this),
       this.columnToGroup.bind(this)
-    ), this.columnGroupChange = this.columnGroupChange.bind(this), this.columnResize = new ct(this.onResize), this.props.clipboard && (this.clipboardService = new $e(this.onClipboard)), _.onConstructor({
+    ), this.columnGroupChange = this.columnGroupChange.bind(this), this.columnResize = new ut(this.onResize), this.props.clipboard && (this.clipboardService = new je(this.onClipboard)), _.onConstructor({
       navigatable: !!a.navigatable,
       contextStateRef: this.contextStateRef,
       navigationStateRef: this.navigationStateRef,
@@ -454,8 +452,8 @@ const z = class z extends r.Component {
    */
   // tslint:enable:max-line-length
   get columns() {
-    const a = this._columns.filter((h) => h.declarationIndex >= 0 && h.parentIndex === -1);
-    return ft(a);
+    const a = this._columns.filter((p) => p.declarationIndex >= 0 && p.parentIndex === -1);
+    return bt(a);
   }
   /**
    * Returns the HTML element of the Grid component.
@@ -464,7 +462,7 @@ const z = class z extends r.Component {
     return this._element;
   }
   get document() {
-    if (L)
+    if (F)
       return this.element && this.element.ownerDocument || document;
   }
   get _header() {
@@ -478,18 +476,18 @@ const z = class z extends r.Component {
    */
   componentDidMount() {
     var c;
-    this.props.columnVirtualization && !navigator.userAgent.match(xt) && (this.headTable && (this.headTable.style.display = "block"), this.tableElement && (this.tableElement.style.display = "block")), this.resetTableWidth(), ae();
-    const a = je(this.element);
+    this.props.columnVirtualization && !navigator.userAgent.match(xt) && (this.headTable && (this.headTable.style.display = "block"), this.tableElement && (this.tableElement.style.display = "block")), this.resetTableWidth(), ae(this.getCachedScrollbarWidth());
+    const a = qe(this.element);
     this.isRtl = a, _.onComponentDidMount({
       scope: this.element || void 0,
       contextStateRef: this.contextStateRef,
       navigationStateRef: this.navigationStateRef
     }), this.isRtl && this.forceUpdate();
-    const h = {
+    const p = {
       rootMargin: "0px",
       threshold: 0.9
     };
-    this.clipboardService && this.clipboardService.addEventListeners(this.document), this.observer = L && window.IntersectionObserver && new window.IntersectionObserver(this.handleIntersection, h) || null, this.resizeObserver = L && window.ResizeObserver && new window.ResizeObserver(this.calculateMedia.bind(this)), (c = this.document) != null && c.body && this.resizeObserver && this.resizeObserver.observe(this.document.body);
+    this.clipboardService && this.clipboardService.addEventListeners(this.document), this.observer = F && window.IntersectionObserver && new window.IntersectionObserver(this.handleIntersection, p) || null, this.resizeObserver = F && window.ResizeObserver && new window.ResizeObserver(this.calculateMedia.bind(this)), (c = this.document) != null && c.body && this.resizeObserver && this.resizeObserver.observe(this.document.body);
   }
   /**
    * @hidden
@@ -505,12 +503,16 @@ const z = class z extends r.Component {
    * @hidden
    */
   componentDidUpdate() {
-    this.resetTableWidth(), ae(), this.vs.tableTransform && this.vs.table && (this.vs.table.style.transform = this.vs.tableTransform, this.vs.tableTransform = ""), _.onComponentDidUpdate({
+    this.resetTableWidth(), ae(this.getCachedScrollbarWidth()), this.vs.tableTransform && this.vs.table && (this.vs.table.style.transform = this.vs.tableTransform, this.vs.tableTransform = ""), this.handleFocusInEditableRows(), _.onComponentDidUpdate({
       scope: this.element || void 0,
       contextStateRef: this.contextStateRef,
       navigationStateRef: this.navigationStateRef,
-      focusFirst: this._focusFirst
-    }), this._focusFirst = !1;
+      focusFirst: this._focusFirst,
+      newEditableRow: this._newEditableRow,
+      singleEditRow: this._singleEditRow,
+      lastActiveElement: this._lastActiveElement,
+      navigatable: this.props.navigatable
+    }), this._focusFirst = !1, this._newEditableRow = void 0;
   }
   /**
    * @hidden
@@ -525,10 +527,10 @@ const z = class z extends r.Component {
   render() {
     var ie;
     let a = this.props.total || 0;
-    const h = k.getIdPrefix(this.navigationStateRef), c = lt(this);
+    const p = x.getIdPrefix(this.navigationStateRef), c = nt(this);
     let e = [];
     Array.isArray(this.props.data) ? (e = this.props.data, a = a || this.props.data.length) : this.props.data && (e = this.props.data.data, a = a || this.props.data.total);
-    const t = typeof this.props.groupable == "object" && this.props.groupable.footer || "none", s = this.props.scrollable === "virtual", { resolvedGroupsCount: l, flattedData: p } = this.flatData(
+    const t = typeof this.props.groupable == "object" && this.props.groupable.footer || "none", s = this.props.scrollable === "virtual", { resolvedGroupsCount: l, flattedData: h } = this.flatData(
       e,
       t,
       this.props.skip || 0,
@@ -537,15 +539,15 @@ const z = class z extends r.Component {
       this.props.filter,
       this.props.sort
     );
-    this._data = p;
+    this._data = h;
     const n = this.props.groupable === !0 || typeof this.props.groupable == "object" && this.props.groupable.enabled !== !1;
     this.columnResize.resizable = this.props.resizable || !1, this.dragLogic.reorderable = this.props.reorderable || !1, this.dragLogic.groupable = n;
     const d = this.props.selectable && this.props.selectable.drag ? "none" : void 0;
     this.initializeVirtualization(a, n);
     const f = this.childrenToArray(this.props.children);
     this.initColumns(f, l);
-    const R = f.map((i) => i && i.type && i.type.displayName === "KendoReactGridToolbar" ? r.cloneElement(i, { ...i.props, ariaControls: this._gridId }) : null), E = f.filter((i) => i && i.type && i.type.displayName === "KendoReactGridNoRecords"), D = f.filter((i) => i && i.type && i.type.displayName === "KendoReactGridStatusBar"), C = this._columns.filter((i) => i.children.length === 0), A = n && /* @__PURE__ */ r.createElement(
-      rt,
+    const R = f.map((i) => i && i.type && i.type.displayName === "KendoReactGridToolbar" ? r.cloneElement(i, { ...i.props, ariaControls: this._gridId }) : null), I = f.filter((i) => i && i.type && i.type.displayName === "KendoReactGridNoRecords"), T = f.filter((i) => i && i.type && i.type.displayName === "KendoReactGridStatusBar"), C = this._columns.filter((i) => i.children.length === 0), M = n && /* @__PURE__ */ r.createElement(
+      at,
       {
         group: this.props.group || [],
         groupChange: this.groupChange,
@@ -557,33 +559,35 @@ const z = class z extends r.Component {
         ariaControls: this._gridId,
         onContextMenu: this.onContextMenu
       }
-    ), { sort: ye, sortable: we, group: Se, filter: Ie, filterable: ke, filterOperators: Ee = Ce, headerCellRender: xe, columnMenu: _e, columnMenuIcon: ze } = this.props, $ = /* @__PURE__ */ r.createElement(
-      st,
+    ), { sort: we, sortable: ye, group: Ee, filter: Se, filterable: Ie, filterOperators: ke = Ce, headerCellRender: _e, columnMenu: xe, columnMenuIcon: ze } = this.props, $ = /* @__PURE__ */ r.createElement(
+      it,
       {
         size: this.props.size,
         columnResize: this.columnResize,
         staticHeaders: this.props.scrollable !== "none",
         scrollableDataElement: () => this.vs.container,
+        hasScrollbarWidth: !!this.getCachedScrollbarWidth(),
         draggable: this.props.reorderable || n,
         ref: this.headerRef,
         elemRef: this.headerElementRef,
+        className: this.props.headerClassName,
         headerRow: this.getHeaderRow(
-          ye,
           we,
-          Se,
+          ye,
+          Ee,
           n,
+          Se,
           Ie,
           ke,
-          Ee,
-          xe,
           _e,
+          xe,
           ze,
           this._columns,
           this._columnsMap,
           this.isRtl
         ),
         filterRow: this.props.filterable && /* @__PURE__ */ r.createElement(
-          ot,
+          rt,
           {
             cells: this.props.cells,
             size: this.props.size,
@@ -594,6 +598,7 @@ const z = class z extends r.Component {
             sort: this.props.sort,
             cellRender: this.props.filterCellRender,
             isRtl: this.isRtl,
+            navigatable: !!this.props.navigatable,
             ariaRowIndex: this._columnsMap.length + 1
           }
         ) || void 0,
@@ -601,66 +606,66 @@ const z = class z extends r.Component {
           "col",
           {
             key: g.toString(),
-            width: B(i)
+            width: V(i)
           }
         ))
       }
-    ), De = this.vs && this.vs.container && this.vs.container.scrollLeft || 0, Te = parseFloat(((this.props.style || {}).width || "").toString()), { colSpans: He, hiddenColumns: Fe } = qe({
+    ), Te = this.vs && this.vs.container && this.vs.container.scrollLeft || 0, De = parseFloat(((this.props.style || {}).width || "").toString()), { colSpans: He, hiddenColumns: Ne } = Je({
       enabled: this.props.columnVirtualization,
       columns: C,
-      tableViewPortWidth: Te,
-      scrollLeft: De
-    }), Ne = (i, g, m) => {
-      let x = !1;
-      const I = this.props.selectedField ? ve(this.props.selectedField, i.dataItem) : void 0;
+      tableViewPortWidth: De,
+      scrollLeft: Te
+    }), Ae = (i, g, m) => {
+      let k = !1;
+      const S = this.props.selectedField ? be(this.props.selectedField, i.dataItem) : void 0;
       return {
-        row: C.map((u, v) => {
-          if (Fe[v])
+        row: C.map((u, b) => {
+          if (Ne[b])
             return null;
-          const H = u.id ? u.id : v, F = `${u.className ? u.className + " " : ""}${u.locked ? "k-grid-content-sticky" : ""}`, y = u.left !== void 0 ? this.isRtl ? { left: u.right, right: u.left } : { left: u.left, right: u.right } : {};
-          let w = !1;
+          const H = u.id ? u.id : b, N = `${u.className ? u.className + " " : ""}${u.locked ? "k-grid-content-sticky" : ""}`, w = u.left !== void 0 ? this.isRtl ? { left: u.right, right: u.left } : { left: u.left, right: u.right } : {};
+          let y = !1;
           if (u.editable && this.props.editField) {
-            const b = ve(this.props.editField, i.dataItem);
-            b && (b === !0 || b === u.field) && (x = !0, w = !0);
+            const v = be(this.props.editField, i.dataItem);
+            v && (v === !0 || v === u.field) && (k = !0, y = !0);
           }
-          const V = u.cell || w && tt || Ct, N = this.props.expandField && this.props.detail && u.field === this.props.expandField;
+          const W = u.cell || y && st || Rt, A = this.props.expandField && this.props.detail && u.field === this.props.expandField;
           return /* @__PURE__ */ r.createElement(
-            V,
+            W,
             {
               onContextMenu: this.onContextMenu,
               key: H,
               locked: this.props.lockGroups,
-              id: k.generateNavigatableId(
-                `${g}-${String(v)}`,
-                h,
-                N || i.rowType === "groupHeader" || i.rowType === "groupFooter" || u.field === "value" ? "nodata" : "cell"
+              id: x.generateNavigatableId(
+                `${g}-${String(b)}`,
+                p,
+                A || i.rowType === "groupHeader" || i.rowType === "groupFooter" || u.field === "value" ? "nodata" : "cell"
               ),
-              colSpan: He[v],
+              colSpan: He[b],
               dataItem: i.dataItem,
               field: u.field,
               editor: u.editor,
               format: u.format,
-              className: F,
+              className: N,
               render: this.props.cellRender,
-              cells: bt(this.props.cells, u.cells),
+              cells: Ct(this.props.cells, u.cells),
               onChange: this.itemChange,
-              selectionChange: this.props.onSelectionChange ? (b) => {
-                this.selectionChange({ event: b, dataItem: i.dataItem, dataIndex: m, columnIndex: v });
+              selectionChange: this.props.onSelectionChange ? (v) => {
+                this.selectionChange({ event: v, dataItem: i.dataItem, dataIndex: m, columnIndex: b });
               } : void 0,
-              columnIndex: v,
+              columnIndex: b,
               columnsCount: C.length,
               rowType: i.rowType,
               level: i.level,
               expanded: i.expanded,
               dataIndex: i.dataIndex,
-              style: y,
+              style: w,
               ariaColumnIndex: u.ariaColumnIndex,
-              isSelected: Array.isArray(I) && I.indexOf(v) > -1
+              isSelected: Array.isArray(S) && S.indexOf(b) > -1
             }
           );
         }),
-        isInEdit: x,
-        isSelected: typeof I == "boolean" && I
+        isInEdit: k,
+        isSelected: typeof S == "boolean" && S
       };
     };
     let j = 0;
@@ -674,62 +679,62 @@ const z = class z extends r.Component {
       }
     const q = (i) => i >= this._data.length - j;
     let J = this.vs.realSkip || 0;
-    const P = [];
+    const O = [];
     let K = !1;
     const X = this._columnsMap.length + (this.props.filterable ? 1 : 0) + 1;
-    let T = 0;
+    let D = 0;
     if (this._data.length) {
       let i = -1, g = 0;
-      (this._slicedData || this._data).forEach((m, x) => {
+      (this._slicedData || this._data).forEach((m, k) => {
         m.rowType === "data" && (J++, i++);
-        const I = J % 2 === 0, u = this.props.dataItemKey && Ue(this.props.dataItemKey)(m.dataItem), v = x + (this.vs.realSkip || 0), H = u || "ai" + v, F = H + "_1", y = Ne(m, H, i);
-        if (T = v + X + g, P.push(/* @__PURE__ */ r.createElement(
-          Rt,
+        const S = J % 2 === 0, u = this.props.dataItemKey && Ve(this.props.dataItemKey)(m.dataItem), b = k + (this.vs.realSkip || 0), H = u || "ai" + b, N = H + "_1", w = Ae(m, H, i);
+        if (D = b + X + g, O.push(/* @__PURE__ */ r.createElement(
+          wt,
           {
             key: H,
             dataItem: m.dataItem,
-            isAltRow: I,
-            isInEdit: y.isInEdit,
+            isAltRow: S,
+            isInEdit: w.isInEdit,
             rowType: m.rowType,
-            isHidden: q(x),
-            onClick: (w) => this.rowClick(w, m),
-            onDoubleClick: (w) => this.rowDblClick(w, m),
+            isHidden: q(k),
+            onClick: (y) => this.rowClick(y, m),
+            onDoubleClick: (y) => this.rowDblClick(y, m),
             selectedField: this.props.selectedField,
             rowHeight: this.props.rowHeight,
             render: this.props.rowRender,
-            ariaRowIndex: T,
-            absoluteRowIndex: v,
-            dataIndex: this.vs.scrollableVirtual && !this.props.groupable ? v : i,
-            isSelected: y.isSelected
+            ariaRowIndex: D,
+            absoluteRowIndex: b,
+            dataIndex: this.vs.scrollableVirtual && !this.props.groupable ? b : i,
+            isSelected: w.isSelected
           },
-          y.row
+          w.row
         )), this.props.detail && m.rowType === "data" && m.expanded) {
-          const w = C.length - (this.props.expandField ? 1 : 0) - (this.props.group ? this.props.group.length : 0) || 1;
-          g++, T = v + X + g, P.push(/* @__PURE__ */ r.createElement(
+          const y = C.length - (this.props.expandField ? 1 : 0) - (this.props.group ? this.props.group.length : 0) || 1;
+          g++, D = b + X + g, O.push(/* @__PURE__ */ r.createElement(
             "tr",
             {
-              key: F,
-              className: M(
+              key: N,
+              className: L(
                 "k-table-row",
-                I ? "k-detail-row k-table-alt-row k-alt" : "k-detail-row"
+                S ? "k-detail-row k-table-alt-row k-alt" : "k-detail-row"
               ),
-              style: { visibility: q(x) ? "hidden" : "", height: this.props.detailRowHeight },
+              style: { visibility: q(k) ? "hidden" : "", height: this.props.detailRowHeight },
               role: "row",
-              "aria-rowindex": T
+              "aria-rowindex": D
             },
-            this.props.group && this.props.group.map((V, N) => {
+            this.props.group && this.props.group.map((W, A) => {
               var oe;
-              const b = (oe = y == null ? void 0 : y.row[N]) == null ? void 0 : oe.props.style, Pe = b ? this.isRtl ? { left: b.right, right: b.left } : { left: b.left, right: b.right } : {};
+              const v = (oe = w == null ? void 0 : w.row[A]) == null ? void 0 : oe.props.style, Oe = v ? this.isRtl ? { left: v.right, right: v.left } : { left: v.left, right: v.right } : {};
               return /* @__PURE__ */ r.createElement(
-                be,
+                ve,
                 {
                   id: "",
                   dataIndex: m.dataIndex,
-                  field: V.field,
+                  field: W.field,
                   dataItem: m.dataItem,
-                  key: N,
-                  style: Pe,
-                  ariaColumnIndex: 1 + N,
+                  key: A,
+                  style: Oe,
+                  ariaColumnIndex: 1 + A,
                   isSelected: !1,
                   locked: this.props.lockGroups,
                   isRtl: this.isRtl,
@@ -738,9 +743,9 @@ const z = class z extends r.Component {
               );
             }),
             this.props.expandField && /* @__PURE__ */ r.createElement(
-              Et,
+              _t,
               {
-                id: k.generateNavigatableId(`${F}-dhcell`, h)
+                id: x.generateNavigatableId(`${N}-dhcell`, p)
               }
             ),
             /* @__PURE__ */ r.createElement(
@@ -749,10 +754,10 @@ const z = class z extends r.Component {
                 onContextMenu: this.onContextMenu,
                 dataItem: m.dataItem,
                 dataIndex: m.dataIndex,
-                colSpan: w,
+                colSpan: y,
                 ariaColIndex: 2 + (this.props.group ? this.props.group.length : 0),
                 detail: this.props.detail,
-                id: k.generateNavigatableId(`${F}-dcell`, h)
+                id: x.generateNavigatableId(`${N}-dcell`, p)
               }
             )
           ));
@@ -760,7 +765,7 @@ const z = class z extends r.Component {
       });
     } else
       K = !0;
-    const Le = () => {
+    const Fe = () => {
       const i = this._header;
       return i && i.table && i.table.clientWidth;
     }, Y = () => /* @__PURE__ */ r.createElement(
@@ -768,9 +773,9 @@ const z = class z extends r.Component {
       {
         key: "no-records",
         className: "k-grid-norecords",
-        style: { width: Le() }
+        style: { width: Fe() }
       },
-      /* @__PURE__ */ r.createElement("div", { className: "k-grid-norecords-template", [Qe]: k.generateNavigatableId("no-records", h) }, E.length ? E : /* @__PURE__ */ r.createElement(wt, null))
+      /* @__PURE__ */ r.createElement("div", { className: "k-grid-norecords-template", [Ze]: x.generateNavigatableId("no-records", p) }, I.length ? I : /* @__PURE__ */ r.createElement(Et, null))
     ), Q = {
       size: this.props.size,
       onPageChange: this.pagerPageChange,
@@ -778,14 +783,13 @@ const z = class z extends r.Component {
       dir: this.isRtl ? "rtl" : void 0,
       skip: this.vs.propsSkip || 0,
       take: (this.props.take !== void 0 ? this.props.take : this.props.pageSize) || 10,
-      messagesMap: ht,
-      navigatable: this.props.navigatable,
+      messagesMap: pt,
       ...It(this.props.pageable || {})
-    }, Z = this.props.pager ? /* @__PURE__ */ r.createElement(this.props.pager, { ...Q }) : /* @__PURE__ */ r.createElement(Je, { className: "k-grid-pager", ...Q }), Me = (i) => this.props.sort && this.props.sort.filter((g) => g.field === i).length > 0, Ae = (i, g) => /* @__PURE__ */ r.createElement(
+    }, Z = this.props.pager ? /* @__PURE__ */ r.createElement(this.props.pager, { ...Q }) : /* @__PURE__ */ r.createElement(Xe, { className: "k-grid-pager", ...Q }), Le = (i) => this.props.sort && this.props.sort.filter((g) => g.field === i).length > 0, Me = (i, g) => /* @__PURE__ */ r.createElement(
       "col",
       {
         key: g.toString(),
-        width: B(i)
+        width: V(i)
       }
     ), ee = (ie = this.props.cells) != null && ie.footerCell || this._columns.some(
       (i) => {
@@ -793,23 +797,24 @@ const z = class z extends r.Component {
         return !!(i.footerCell || (g = i.cells) != null && g.footerCell);
       }
     ) ? /* @__PURE__ */ r.createElement(
-      at,
+      lt,
       {
         size: this.props.size,
         columnResize: this.columnResize,
         staticHeaders: this.props.scrollable !== "none",
+        hasScrollbarWidth: !!this.getCachedScrollbarWidth(),
         ref: (i) => this._footer = i,
         row: /* @__PURE__ */ r.createElement(
           St,
           {
             cells: this.props.cells,
-            idPrefix: h,
+            idPrefix: p,
             columns: this._columns,
             isRtl: this.isRtl,
-            ariaRowIndex: T + 1
+            ariaRowIndex: D + 1
           }
         ),
-        cols: C.map(Ae)
+        cols: C.map(Me)
       }
     ) : null, te = /* @__PURE__ */ r.createElement(
       "colgroup",
@@ -823,23 +828,23 @@ const z = class z extends r.Component {
           "col",
           {
             key: g.toString(),
-            className: Me(i.field) ? "k-sorted" : void 0,
-            width: B(i)
+            className: Le(i.field) ? "k-sorted" : void 0,
+            width: V(i)
           }
         )
       )
     ), se = this.dragLogic.reorderable || this.dragLogic.groupable;
     if (this.props.scrollable === "none")
-      return /* @__PURE__ */ r.createElement(U.Provider, { value: this.contextStateRef.current }, /* @__PURE__ */ r.createElement(
+      return /* @__PURE__ */ r.createElement(B.Provider, { value: this.contextStateRef.current }, /* @__PURE__ */ r.createElement(
         "div",
         {
           id: this.props.id,
           style: this.props.style,
-          className: M(
+          className: L(
             "k-grid",
             {
               "k-grid-md": !this.props.size,
-              [`k-grid-${O.sizeMap[this.props.size] || this.props.size}`]: this.props.size
+              [`k-grid-${G.sizeMap[this.props.size] || this.props.size}`]: this.props.size
             },
             this.props.className
           ),
@@ -852,7 +857,7 @@ const z = class z extends r.Component {
           ...ne
         },
         R,
-        A,
+        M,
         /* @__PURE__ */ r.createElement(
           he,
           {
@@ -866,32 +871,32 @@ const z = class z extends r.Component {
             "table",
             {
               ref: (i) => this.headTable = i,
-              className: M(
+              className: L(
                 "k-table k-grid-table",
-                { [`k-table-${O.sizeMap[this.props.size] || this.props.size}`]: this.props.size }
+                { [`k-table-${G.sizeMap[this.props.size] || this.props.size}`]: this.props.size }
               ),
               style: { userSelect: d }
             },
             te,
             $,
-            /* @__PURE__ */ r.createElement("tbody", { role: "rowgroup", className: "k-table-tbody", ...pe }, P),
+            /* @__PURE__ */ r.createElement("tbody", { role: "rowgroup", className: "k-table-tbody", ...pe }, O),
             ee
           )
         ),
         K && Y(),
         se && /* @__PURE__ */ r.createElement(r.Fragment, null, /* @__PURE__ */ r.createElement(de, { ref: this.dragLogic.refDropElementClue }), /* @__PURE__ */ r.createElement(ce, { ref: this.dragLogic.refDragElementClue }))
-      ), D, this.props.pageable && Z);
-    let G = this.props.style || {};
-    return s && (G.height || (G = Object.assign({}, G, { height: "450px" }))), /* @__PURE__ */ r.createElement(U.Provider, { value: this.contextStateRef.current }, /* @__PURE__ */ r.createElement(
+      ), T, this.props.pageable && Z);
+    let P = this.props.style || {};
+    return s && (P.height || (P = Object.assign({}, P, { height: "450px" }))), /* @__PURE__ */ r.createElement(B.Provider, { value: this.contextStateRef.current }, /* @__PURE__ */ r.createElement(
       "div",
       {
         id: this.props.id,
-        style: G,
-        className: M(
+        style: P,
+        className: L(
           "k-grid",
           {
             "k-grid-md": !this.props.size,
-            [`k-grid-${O.sizeMap[this.props.size] || this.props.size}`]: this.props.size,
+            [`k-grid-${G.sizeMap[this.props.size] || this.props.size}`]: this.props.size,
             "k-grid-virtual": s
           },
           this.props.className
@@ -905,7 +910,7 @@ const z = class z extends r.Component {
         ...ne
       },
       R,
-      A,
+      M,
       /* @__PURE__ */ r.createElement(
         "div",
         {
@@ -914,7 +919,7 @@ const z = class z extends r.Component {
           "aria-colcount": C.length,
           "aria-rowcount": a,
           id: this._gridId,
-          "aria-label": c.toLanguageString(ue, pt[ue])
+          "aria-label": c.toLanguageString(ue, dt[ue])
         },
         $,
         /* @__PURE__ */ r.createElement("div", { className: "k-grid-container", role: "presentation" }, /* @__PURE__ */ r.createElement(
@@ -938,11 +943,11 @@ const z = class z extends r.Component {
               "table",
               {
                 ref: (i) => this.tableElement = i,
-                className: M(
+                className: L(
                   "k-table k-grid-table",
                   {
                     "k-table-md": !this.props.size,
-                    [`k-table-${O.sizeMap[this.props.size] || this.props.size}`]: this.props.size
+                    [`k-table-${G.sizeMap[this.props.size] || this.props.size}`]: this.props.size
                   }
                 ),
                 role: "presentation",
@@ -957,7 +962,7 @@ const z = class z extends r.Component {
                   role: "rowgroup",
                   ...pe
                 },
-                P
+                O
               )
             )
           ), K && Y()),
@@ -970,9 +975,9 @@ const z = class z extends r.Component {
         )),
         ee,
         se && /* @__PURE__ */ r.createElement(r.Fragment, null, /* @__PURE__ */ r.createElement(de, { ref: this.dragLogic.refDropElementClue }), /* @__PURE__ */ r.createElement(ce, { ref: this.dragLogic.refDragElementClue })),
-        this.showLicenseWatermark && /* @__PURE__ */ r.createElement(Be, null)
+        this.showLicenseWatermark && /* @__PURE__ */ r.createElement(Ue, null)
       ),
-      D,
+      T,
       this.props.pageable && Z
     ));
   }
@@ -981,8 +986,8 @@ const z = class z extends r.Component {
   }
   selectionChange(a) {
     if (this.props.onSelectionChange) {
-      const { event: h, dataItem: c, dataIndex: e, columnIndex: t } = a, { mode: s, cell: l } = le(this.props.selectable), p = {
-        ...this.getArguments(h.syntheticEvent),
+      const { event: p, dataItem: c, dataIndex: e, columnIndex: t } = a, { mode: s, cell: l } = le(this.props.selectable), h = {
+        ...this.getArguments(p.syntheticEvent),
         dataItem: c,
         startColIndex: t,
         endColIndex: t,
@@ -999,13 +1004,13 @@ const z = class z extends r.Component {
         componentId: this._gridId,
         selectedField: this.props.selectedField || ""
       };
-      this.props.onSelectionChange.call(void 0, p);
+      this.props.onSelectionChange.call(void 0, h);
     }
   }
-  raiseDataEvent(a, h, c, e, t) {
+  raiseDataEvent(a, p, c, e, t) {
     const s = this.props.onDataStateChange;
     if (a) {
-      const l = { ...this.getArguments(e), ...h, targetEvent: t };
+      const l = { ...this.getArguments(e), ...p, targetEvent: t };
       a.call(void 0, l);
     } else
       s && s.call(
@@ -1020,16 +1025,16 @@ const z = class z extends r.Component {
         }
       );
   }
-  columnReorder(a, h, c) {
+  columnReorder(a, p, c) {
     const e = this._columns[a], t = e.depth, s = (d) => {
       do
         d++;
       while (d < this._columns.length && this._columns[d].depth > t);
       return d;
     }, l = this._columns.splice(a, s(a) - a);
-    this._columns.splice(a < h ? s(h - l.length) : h, 0, ...l), this._columns.filter((d) => d.declarationIndex >= 0).forEach((d, f) => d.orderIndex = f), this._columnsMutations++;
-    const p = this._columns[a].locked && this._columns[h].locked;
-    Xe(this._columnsMap, this._columns, p || this._shouldUpdateLeftRight), Ye(this._columnsMap, this._columns, p || this._shouldUpdateLeftRight), this._resized && (this._shouldUpdateLeftRight = !1, this._resized = !1);
+    this._columns.splice(a < p ? s(p - l.length) : p, 0, ...l), this._columns.filter((d) => d.declarationIndex >= 0).forEach((d, f) => d.orderIndex = f), this._columnsMutations++;
+    const h = this._columns[a].locked && this._columns[p].locked;
+    Ye(this._columnsMap, this._columns, h || this._shouldUpdateLeftRight), Qe(this._columnsMap, this._columns, h || this._shouldUpdateLeftRight), this._resized && (this._shouldUpdateLeftRight = !1, this._resized = !1);
     const n = this.columns;
     if (this.forceUpdate(), this.props.onColumnReorder) {
       const d = {
@@ -1041,39 +1046,39 @@ const z = class z extends r.Component {
       this.props.onColumnReorder.call(void 0, d);
     }
   }
-  groupReorder(a, h, c) {
+  groupReorder(a, p, c) {
     if (this.props.group === void 0)
       return;
     const e = this.props.group.slice();
-    e.splice(h, 0, ...e.splice(a, 1)), this.groupChange(e, c);
+    e.splice(p, 0, ...e.splice(a, 1)), this.groupChange(e, c);
   }
-  columnToGroup(a, h, c) {
+  columnToGroup(a, p, c) {
     const e = this._columns[a].field;
     if (!e)
       return;
     const t = (this.props.group || []).slice();
-    t.splice(h, 0, { field: e }), this.groupChange(t, c);
+    t.splice(p, 0, { field: e }), this.groupChange(t, c);
   }
-  columnGroupChange(a, h) {
+  columnGroupChange(a, p) {
     const c = this.dragLogic.getCurrentGroupsLength;
-    this.columnToGroup(a, c, h);
+    this.columnToGroup(a, c, p);
   }
   resetTableWidth() {
     let a = 0;
     if (!this.columnResize.colGroupMain)
       return;
-    const h = this.columnResize.colGroupMain.children;
-    for (let c = 0; c < h.length; c++) {
-      const e = h[c].width;
+    const p = this.columnResize.colGroupMain.children;
+    for (let c = 0; c < p.length; c++) {
+      const e = p[c].width;
       if (!e)
         return;
       a += parseFloat(e.toString());
     }
     a = Math.round(a), this._header && this._header.setWidth(a), this._footer && this._footer.setWidth(a), this.tableElement && (this.tableElement.style.width = a + "px");
   }
-  initColumns(a, h) {
-    const c = k.getIdPrefix(this.navigationStateRef), e = this.filterHiddenColumns(a), t = this.readColumns(e, c, this._columnsMutations);
-    this._columns = t, this._columns.length === 0 && (this._columns = vt(this.props.data, this.props.group, this.props.expandField, { prevId: 0, idPrefix: c })), this.configureColumns(this._columns, h, c), this._columnsMap = this.mapColumns(this._columns, this._columnsMutations), this.columnResize.columns = this._columns, this.dragLogic.columns = this._columns;
+  initColumns(a, p) {
+    const c = x.getIdPrefix(this.navigationStateRef), e = this.readColumns(a, c, this._columnsMutations), t = this.filterColumnsByMediaProp(e);
+    this._columns = t, this._columns.length === 0 && (this._columns = vt(this.props.data, this.props.group, this.props.expandField, { prevId: 0, idPrefix: c })), this.configureColumns(this._columns, p, c), this._columnsMap = this.mapColumns(this._columns, this._columnsMutations), this.columnResize.columns = this._columns, this.dragLogic.columns = this._columns;
   }
   getDataState() {
     return {
@@ -1168,11 +1173,16 @@ z.displayName = "KendoReactGrid", z.defaultProps = {
   onColumnResize: o.func,
   onColumnReorder: o.func,
   dataItemKey: o.string,
-  navigatable: o.bool,
+  navigatable: o.oneOfType([
+    o.bool,
+    o.shape({
+      mode: o.oneOf(["incell", "inline", "popup"])
+    })
+  ]),
   size: o.oneOf(["small", "medium"])
-}, z.contextType = U;
-let W = z;
-nt(W);
+}, z.contextType = B;
+let U = z;
+ht(U);
 export {
-  W as Grid
+  U as Grid
 };