@progress/kendo-react-grid 5.10.0-dev.202301031638 → 5.10.0-dev.202301051045

package/dist/es/Grid.d.ts

@@ -106,6 +106,7 @@ export declare class Grid extends React.Component<GridProps, {}> {
     protected dragLogic: CommonDragLogic;
     private _columns;
     private _columnsMap;
+    private _columnsMutations;
     private contextStateRef;
     private navigationStateRef;
     private _data;
@@ -221,7 +222,11 @@ export declare class Grid extends React.Component<GridProps, {}> {
     private columnToGroup;
     private resetTableWidth;
     private onResize;
+    private childrenToArray;
+    private readColumns;
+    private mapColumns;
     private initColumns;
+    private getHeaderRow;
     private resolveTitle;
     private getDataState;
     private getArguments;

package/dist/es/Grid.js

@@ -35,7 +35,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
 };
 import * as React from 'react';
 import * as PropTypes from 'prop-types';
-import { dispatchEvent, classNames, getter, guid, setScrollbarWidth, canUseDOM } from '@progress/kendo-react-common';
+import { dispatchEvent, classNames, getter, guid, setScrollbarWidth, canUseDOM, memoizeOne } from '@progress/kendo-react-common';
 import { tableColumnsVirtualization, Pager, mapColumns, isRtl, tableKeyboardNavigation, TableKeyboardNavigationContext, tableKeyboardNavigationScopeAttributes, tableKeyboardNavigationTools as navigationTools, tableKeyboardNavigationBodyAttributes, getSelectionOptions, TableSelection, DropClue, DragClue } from '@progress/kendo-react-data-tools';
 import { GridSelectionCell } from './cells/GridSelectionCell';
 import { GridHierarchyCell } from './cells/GridHierarchyCell';
@@ -48,7 +48,7 @@ import { Footer } from './footer/Footer';
 import { VirtualScroll } from './VirtualScroll';
 import { ColumnResize } from './drag/ColumnResize';
 import { CommonDragLogic } from './drag/CommonDragLogic';
-import { getNestedValue, flatData, readColumns, autoGenerateColumns, sanitizeColumns } from './utils/index';
+import { getNestedValue, flatData, readColumns, autoGenerateColumns, firefox, firefoxMaxHeight, sanitizeColumns } from './utils/index';
 import { GridCell } from './cells/GridCell';
 import { GridGroupCell } from './cells/GridGroupCell';
 import { GridRow } from './rows/GridRow';
@@ -99,6 +99,7 @@ var Grid = /** @class */ (function (_super) {
         var _this = _super.call(this, props) || this;
         _this._columns = [];
         _this._columnsMap = [[]];
+        _this._columnsMutations = 0;
         _this.contextStateRef = { current: undefined };
         _this.navigationStateRef = { current: undefined };
         _this._data = [];
@@ -158,7 +159,7 @@ var Grid = /** @class */ (function (_super) {
             if (_this._footer) {
                 _this._footer.setScrollLeft(scrollLeft);
             }
-            if (_this.vs) {
+            if (_this.vs && scrollTop !== _this.wrapperScrollTop) {
                 _this.vs.scrollHandler(event);
             }
             dispatchEvent(_this.props.onScroll, event, _this, undefined);
@@ -247,6 +248,7 @@ var Grid = /** @class */ (function (_super) {
         };
         _this.onResize = function (index, newWidth, oldWidth, nativeEvent, end, targetId) {
             _this.resetTableWidth();
+            _this._columnsMutations++;
             if (_this.props.onColumnResize) {
                 _this.props.onColumnResize.call(undefined, {
                     columns: _this.columns,
@@ -260,6 +262,19 @@ var Grid = /** @class */ (function (_super) {
                 });
             }
         };
+        _this.childrenToArray = memoizeOne(function (children) {
+            return React.Children.toArray(children);
+        });
+        _this.readColumns = memoizeOne(function (children, idPrefix, _mutationsCount) {
+            var columnElements = children.filter(function (child) { return child && child.type && child.type.displayName === 'KendoReactGridColumn'; });
+            return readColumns(columnElements, _this.columns, { prevId: 0, idPrefix: idPrefix });
+        });
+        _this.mapColumns = memoizeOne(function (columns) {
+            return mapColumns(columns);
+        });
+        _this.getHeaderRow = memoizeOne(function (sort, sortable, group, groupable, filter, filterable, filterOperators, headerCellRender, columnMenu, columns, columnsMap) {
+            return (React.createElement(HeaderRow, { sort: sort, sortable: sortable, sortChange: _this.sortChange, group: group || [], groupable: groupable, groupChange: _this.groupChange, filter: filter, filterable: filterable, filterOperators: filterOperators, filterChange: _this.filterChange, columnMenu: columnMenu, selectionChange: _this.onHeaderSelectionChange, columns: columns, columnResize: _this.columnResize, pressHandler: _this.dragLogic.pressHandler, dragHandler: _this.dragLogic.dragHandler, releaseHandler: _this.dragLogic.releaseHandler, columnsMap: columnsMap, cellRender: headerCellRender, isRtl: _this.isRtl, dragClue: _this.dragLogic.dragClueRef, headerRef: _this.headerElementRef, containerRef: _this.vs.containerRef }));
+        });
         _this.resolveTitle = function (field) {
             var column = _this._columns.find(function (c) { return c.field === field; });
             var title = column && (column.title || column.field);
@@ -424,7 +439,7 @@ var Grid = /** @class */ (function (_super) {
         this.dragLogic.reorderable = this.props.reorderable || false;
         this.dragLogic.groupable = groupable;
         var tableUserSelect = this.props.selectable && this.props.selectable.drag ? 'none' : undefined;
-        if (total !== this.vs.total) {
+        if (total !== this.vs.total || (this.props.scrollable === 'virtual') !== this.vs.scrollableVirtual) {
             this.vs.reset();
             this.vs = new VirtualScroll(groupable || this.props.rowHeight === undefined || this.props.rowHeight === 0);
             this.vs.table = this.tableElement;
@@ -438,7 +453,8 @@ var Grid = /** @class */ (function (_super) {
         this.vs.propsSkip = (this.props.skip || 0) + (this.props.scrollable === 'virtual' ?
             this.vs.topCacheCount + (this.vs.attendedSkip - (this.props.skip || 0)) : 0);
         if (this.props.rowHeight !== undefined && this.props.rowHeight > 0 && !groupable) {
-            this.vs.containerHeight = Math.min(1533915, this.props.rowHeight * (total || 0));
+            var containerHeight = this.props.rowHeight * total;
+            this.vs.containerHeight = firefox ? Math.min(firefoxMaxHeight, containerHeight) : containerHeight;
         }
         else {
             this.vs.containerHeight = 1533915;
@@ -446,25 +462,25 @@ var Grid = /** @class */ (function (_super) {
         var groupingFooter = (typeof this.props.groupable === 'object') && this.props.groupable.footer || 'none';
         this._data = [];
         var resolvedGroupsCount = flatData(this._data, propsData, groupingFooter, { index: this.props.skip || 0 }, this.props.group !== undefined, this.props.expandField);
-        var children = React.Children.toArray(this.props.children);
-        this.initColumns(children.filter(function (child) { return child && child.type &&
-            child.type.displayName === 'KendoReactGridColumn'; }), resolvedGroupsCount);
+        var children = this.childrenToArray(this.props.children);
+        this.initColumns(children, resolvedGroupsCount);
         var toolbar = children.filter(function (child) { return child && child.type &&
             child.type.displayName === 'KendoReactGridToolbar'; });
         var noRecords = children.filter(function (child) { return child && child.type &&
             child.type.displayName === 'KendoReactGridNoRecords'; });
         var leafColumns = this._columns.filter(function (c) { return c.children.length === 0; });
         var groupingPanel = groupable && (React.createElement(GroupPanel, { group: this.props.group || [], groupChange: this.groupChange, pressHandler: this.dragLogic.pressHandler, dragHandler: this.dragLogic.dragHandler, releaseHandler: this.dragLogic.releaseHandler, refCallback: this.dragLogic.refGroupPanelDiv, resolveTitle: this.resolveTitle }));
-        var header = (React.createElement(Header, { columnResize: this.columnResize, staticHeaders: this.props.scrollable !== 'none', scrollableDataElement: function () { return _this.vs.container; }, draggable: this.props.reorderable || groupable, ref: this.headerRef, elemRef: this.headerElementRef, headerRow: React.createElement(HeaderRow, { sort: this.props.sort, sortable: this.props.sortable, sortChange: this.sortChange, group: this.props.group || [], groupable: groupable, groupChange: this.groupChange, filter: this.props.filter, filterable: this.props.filterable, filterOperators: this.props.filterOperators || operators, filterChange: this.filterChange, columnMenu: this.props.columnMenu, selectionChange: this.onHeaderSelectionChange, columns: this._columns, columnResize: this.columnResize, pressHandler: this.dragLogic.pressHandler, dragHandler: this.dragLogic.dragHandler, releaseHandler: this.dragLogic.releaseHandler, columnsMap: this._columnsMap, cellRender: this.props.headerCellRender, isRtl: this.isRtl, dragClue: this.dragLogic.dragClueRef, headerRef: this.headerElementRef, containerRef: this.vs.containerRef }), filterRow: this.props.filterable && React.createElement(FilterRow, { columns: this._columns, filter: this.props.filter, filterOperators: this.props.filterOperators || operators, filterChange: this.filterChange, sort: this.props.sort, cellRender: this.props.filterCellRender, isRtl: this.isRtl, ariaRowIndex: this._columnsMap.length + 1 }) || undefined, cols: leafColumns.map(function (column, index) { return (React.createElement("col", { key: index.toString(), width: column.width !== undefined ?
+        var _a = this.props, sort = _a.sort, sortable = _a.sortable, group = _a.group, filter = _a.filter, filterable = _a.filterable, _b = _a.filterOperators, filterOperators = _b === void 0 ? operators : _b, headerCellRender = _a.headerCellRender, columnMenu = _a.columnMenu;
+        var header = (React.createElement(Header, { columnResize: this.columnResize, staticHeaders: this.props.scrollable !== 'none', scrollableDataElement: function () { return _this.vs.container; }, draggable: this.props.reorderable || groupable, ref: this.headerRef, elemRef: this.headerElementRef, headerRow: this.getHeaderRow(sort, sortable, group, groupable, filter, filterable, filterOperators, headerCellRender, columnMenu, this._columns, this._columnsMap), filterRow: this.props.filterable && React.createElement(FilterRow, { columns: this._columns, filter: this.props.filter, filterOperators: this.props.filterOperators || operators, filterChange: this.filterChange, sort: this.props.sort, cellRender: this.props.filterCellRender, isRtl: this.isRtl, ariaRowIndex: this._columnsMap.length + 1 }) || undefined, cols: leafColumns.map(function (column, index) { return (React.createElement("col", { key: index.toString(), width: column.width !== undefined ?
                     Math.floor(parseFloat(column.width.toString())) + 'px' : undefined })); }) }));
         var scrollLeft = this.vs && this.vs.container && this.vs.container.scrollLeft || 0;
         var tableWidth = parseFloat(((this.props.style || {}).width || '').toString());
-        var _a = tableColumnsVirtualization({
+        var _c = tableColumnsVirtualization({
             enabled: this.props.columnVirtualization,
             columns: leafColumns,
             tableViewPortWidth: tableWidth,
             scrollLeft: scrollLeft
-        }), colSpans = _a.colSpans, isColHidden = _a.hiddenColumns;
+        }), colSpans = _c.colSpans, isColHidden = _c.hiddenColumns;
         var dataRow = function (item, rowId, rowDataIndex) {
             var isInEdit = false;
             var selectedValue = _this.props.selectedField ? getNestedValue(_this.props.selectedField, item.dataItem) : undefined;
@@ -481,29 +497,6 @@ var Grid = /** @class */ (function (_super) {
                             ? { left: column.left, right: column.right }
                             : { left: column.right, right: column.left }
                         : {};
-                    var cellProps = {
-                        id: navigationTools.generateNavigatableId("".concat(rowId, "-").concat(String(columnIndex)), idPrefix),
-                        colSpan: colSpans[columnIndex],
-                        dataItem: item.dataItem,
-                        field: column.field,
-                        editor: column.editor,
-                        format: column.format,
-                        className: className,
-                        render: _this.props.cellRender,
-                        onChange: _this.itemChange,
-                        selectionChange: (_this.props.onSelectionChange) ?
-                            (function (e) { _this.selectionChange({ event: e, dataItem: item.dataItem, dataIndex: rowDataIndex, columnIndex: columnIndex }); }) :
-                            undefined,
-                        columnIndex: columnIndex,
-                        columnsCount: leafColumns.length,
-                        rowType: item.rowType,
-                        level: item.level,
-                        expanded: item.expanded,
-                        dataIndex: item.dataIndex,
-                        style: style,
-                        ariaColumnIndex: column.ariaColumnIndex,
-                        isSelected: Array.isArray(selectedValue) && selectedValue.indexOf(columnIndex) > -1
-                    };
                     var currentColumnIsInEdit = false;
                     if (column.editable && _this.props.editField) {
                         var inEdit = getNestedValue(_this.props.editField, item.dataItem);
@@ -512,12 +505,10 @@ var Grid = /** @class */ (function (_super) {
                             currentColumnIsInEdit = true;
                         }
                     }
-                    if (column.cell) {
-                        return React.createElement(column.cell, __assign({ key: columnKey }, cellProps, { locked: _this.props.lockGroups }));
-                    }
-                    return currentColumnIsInEdit
-                        ? React.createElement(GridEditCell, __assign({ key: columnKey }, cellProps))
-                        : React.createElement(GridCell, __assign({ key: columnKey }, cellProps));
+                    var Cell = column.cell || (currentColumnIsInEdit && GridEditCell) || GridCell;
+                    return (React.createElement(Cell, { key: columnKey, locked: _this.props.lockGroups, id: navigationTools.generateNavigatableId("".concat(rowId, "-").concat(String(columnIndex)), idPrefix), colSpan: colSpans[columnIndex], dataItem: item.dataItem, field: column.field, editor: column.editor, format: column.format, className: className, render: _this.props.cellRender, onChange: _this.itemChange, selectionChange: (_this.props.onSelectionChange) ?
+                            (function (e) { _this.selectionChange({ event: e, dataItem: item.dataItem, dataIndex: rowDataIndex, columnIndex: columnIndex }); }) :
+                            undefined, columnIndex: columnIndex, columnsCount: leafColumns.length, rowType: item.rowType, level: item.level, expanded: item.expanded, dataIndex: item.dataIndex, style: style, ariaColumnIndex: column.ariaColumnIndex, isSelected: Array.isArray(selectedValue) && selectedValue.indexOf(columnIndex) > -1 }));
                 }),
                 isInEdit: isInEdit,
                 isSelected: typeof selectedValue === 'boolean' && selectedValue
@@ -569,8 +560,8 @@ var Grid = /** @class */ (function (_super) {
                     detailRowCount_1++;
                     currentAriaRowIndex = absoluteIndex + rowIndexStart + detailRowCount_1;
                     body.push((React.createElement("tr", { key: detailRowId, className: isAlt ? 'k-detail-row k-alt' : 'k-detail-row', style: { visibility: hidden(rowIndex) ? 'hidden' : '' }, role: "row", "aria-rowindex": currentAriaRowIndex },
-                        _this.props.group && _this.props.group.map(function (group, idx) {
-                            return (React.createElement(GridGroupCell, { id: '', dataIndex: item.dataIndex, field: group.field, dataItem: item.dataItem, key: idx, style: {}, ariaColumnIndex: 1 + idx, isSelected: false, locked: _this.props.lockGroups }));
+                        _this.props.group && _this.props.group.map(function (gr, idx) {
+                            return (React.createElement(GridGroupCell, { id: '', dataIndex: item.dataIndex, field: gr.field, dataItem: item.dataItem, key: idx, style: {}, ariaColumnIndex: 1 + idx, isSelected: false, locked: _this.props.lockGroups }));
                         }),
                         _this.props.expandField &&
                             React.createElement(GridDetailHierarchyCell, { id: navigationTools.generateNavigatableId("".concat(detailRowId, "-dhcell"), idPrefix) }),
@@ -634,7 +625,7 @@ var Grid = /** @class */ (function (_super) {
                 header,
                 React.createElement("div", { className: "k-grid-container", role: "presentation" },
                     React.createElement("div", { ref: this.vs.containerRef, className: "k-grid-content k-virtual-content", onScroll: this.scrollHandler, role: "presentation" },
-                        React.createElement("div", { style: { 'position': 'relative' }, role: "presentation" },
+                        React.createElement("div", { className: 'k-grid-table-wrap', role: "presentation" },
                             React.createElement(TableSelection, { selectable: this.props.selectable, onRelease: this.selectionRelease, childRef: function (table) {
                                     _this.vs.table = table;
                                     _this.tableElement = table;
@@ -684,6 +675,7 @@ var Grid = /** @class */ (function (_super) {
         var spliced = this._columns.splice(prev, end(prev) - prev);
         (_a = this._columns).splice.apply(_a, __spreadArray([prev < next ? end(next - spliced.length) : next, 0], spliced, false));
         this._columns.filter(function (q) { return q.declarationIndex >= 0; }).forEach(function (c, i) { return c.orderIndex = i; });
+        this._columnsMutations++;
         var eventColumnProps = this.columns;
         this.forceUpdate();
         if (this.props.onColumnReorder) {
@@ -735,10 +727,10 @@ var Grid = /** @class */ (function (_super) {
             this.vs.table.style.width = totalWidth + 'px';
         }
     };
-    Grid.prototype.initColumns = function (columnElements, groupCount) {
+    Grid.prototype.initColumns = function (children, groupCount) {
         var _this = this;
         var idPrefix = navigationTools.getIdPrefix(this.navigationStateRef);
-        this._columns = readColumns(columnElements, this.columns, { prevId: 0, idPrefix: idPrefix });
+        this._columns = this.readColumns(children, idPrefix, this._columnsMutations);
         if (this._columns.length === 0) {
             this._columns = autoGenerateColumns(this.props.data, this.props.group, this.props.expandField, { prevId: 0, idPrefix: idPrefix });
         }
@@ -778,7 +770,7 @@ var Grid = /** @class */ (function (_super) {
             columnIndexOffset++;
         }
         this._columns.slice(columnIndexOffset).forEach(function (c) { return c.parentIndex >= 0 && (c.parentIndex += columnIndexOffset); });
-        this._columnsMap = mapColumns(this._columns);
+        this._columnsMap = this.mapColumns(this._columns);
         this.columnResize.columns = this._columns;
         this.dragLogic.columns = this._columns;
     };

package/dist/es/VirtualScroll.d.ts

@@ -21,7 +21,6 @@ export declare class VirtualScroll {
     containerRef: React.RefObject<HTMLDivElement>;
     get container(): HTMLDivElement | null;
     private prevScrollPos;
-    private syncTimeout;
     private tableTranslate;
     private scrollSyncing;
     constructor(cached: boolean);
@@ -34,10 +33,11 @@ export declare class VirtualScroll {
     }>;
     changePage(skip: number, e: React.SyntheticEvent<HTMLDivElement>): void;
     translate(dY: number): void;
-    syncScroll(): void;
     reset(): void;
     localScrollUp(e: React.SyntheticEvent<HTMLDivElement>): void;
     localScrollDown(e: React.SyntheticEvent<HTMLDivElement>): void;
     scrollNonStrict(e: React.SyntheticEvent<HTMLDivElement>): void;
     scrollHandler(e: React.SyntheticEvent<HTMLDivElement>): void;
+    private topItems;
+    private horizontalScrollbarHeight;
 }

package/dist/es/VirtualScroll.js

@@ -4,6 +4,7 @@ import * as React from 'react';
  */
 var VirtualScroll = /** @class */ (function () {
     function VirtualScroll(cached) {
+        var _this = this;
         this.table = null;
         this.containerHeight = 0;
         this.topCacheCount = 0; // 4;
@@ -22,6 +23,25 @@ var VirtualScroll = /** @class */ (function () {
         this.prevScrollPos = 0;
         this.tableTranslate = 0;
         this.scrollSyncing = false;
+        this.topItems = function (heights, skipTopBuffer) {
+            if (!_this.container || skipTopBuffer) {
+                return { topItemsCount: 0, topItemsHeight: 0 };
+            }
+            var screenHeight = _this.container.clientHeight;
+            var itemsOnScreen = Math.ceil(screenHeight / heights[0].line);
+            var topItemsCount = Math.ceil((heights.length - itemsOnScreen) / 2);
+            var topItemsHeight = 0;
+            for (var i = 0; i < topItemsCount; i++) {
+                topItemsHeight += heights[i].line + heights[i].acc;
+            }
+            return { topItemsCount: topItemsCount, topItemsHeight: topItemsHeight };
+        };
+        this.horizontalScrollbarHeight = function () {
+            if (!_this.container) {
+                return 0;
+            }
+            return _this.container.offsetHeight - _this.container.clientHeight;
+        };
         if (cached) {
             this.topCacheCount = 4;
             this.attendedSkip = -this.topCacheCount;
@@ -79,22 +99,6 @@ var VirtualScroll = /** @class */ (function () {
             this.table.style.transform = 'translateY(' + dY + 'px)';
         }
     };
-    VirtualScroll.prototype.syncScroll = function () {
-        if (!this.scrollableVirtual || !this.container) {
-            return;
-        }
-        this.syncTimeout = null;
-        var scrollTop = this.container.scrollTop;
-        var containerHeight = this.containerHeight; // = this.container.scrollHeight;
-        var rowHeights = this.rowHeights;
-        var percentage = (scrollTop - this.tableTranslate) / rowHeights[0].line;
-        var targetFloorScrollPosition = Math.floor((containerHeight) * (this.propsSkip + percentage) / this.total);
-        if (this.container.scrollTop !== (this.prevScrollPos = targetFloorScrollPosition)) {
-            this.scrollSyncing = true;
-            this.container.scrollTop = (this.prevScrollPos = targetFloorScrollPosition);
-        }
-        this.translate(this.tableTranslate + targetFloorScrollPosition - scrollTop);
-    };
     VirtualScroll.prototype.reset = function () {
         this.scrollSyncing = true;
         if (this.fixedScroll) {
@@ -113,11 +117,12 @@ var VirtualScroll = /** @class */ (function () {
         var scrollTop = this.container.scrollTop;
         var targetTranslate = this.tableTranslate;
         var rowsCount = 0;
+        var _a = this.topItems(heights, Boolean(this.topCacheCount)), topItemsCount = _a.topItemsCount, topItemsHeight = _a.topItemsHeight;
         var additionalOnTop = scrollTop - targetTranslate;
-        if (additionalOnTop > 0) {
+        if (additionalOnTop > topItemsHeight) {
             return;
         }
-        while ((rowsCount < this.topCacheCount + this.attendedSkip - this.realSkip)
+        while ((rowsCount < this.topCacheCount + this.attendedSkip - this.realSkip + topItemsCount)
             && this.propsSkip - rowsCount > 0 &&
             !(targetTranslate + (heights[heights.length - 1 - rowsCount].line + heights[heights.length - 1 - rowsCount].acc) + additionalOnTop <= scrollTop)) {
             targetTranslate -= heights[heights.length - 1 - rowsCount].line +
@@ -143,8 +148,9 @@ var VirtualScroll = /** @class */ (function () {
             //    floor the translate to beginning of the item in absolute value
         }
         if (targetTranslate !== this.tableTranslate) {
-            this.translate(targetTranslate);
-            this.changePage(this.propsSkip - rowsCount, e);
+            this.translate(Math.max(0, targetTranslate - topItemsHeight));
+            var nextSkip = Math.max(0, this.propsSkip - rowsCount - topItemsCount);
+            this.changePage(nextSkip, e);
         }
     };
     VirtualScroll.prototype.localScrollDown = function (e) {
@@ -155,18 +161,22 @@ var VirtualScroll = /** @class */ (function () {
         var scrollTop = this.container.scrollTop;
         var targetTranslate = this.tableTranslate;
         var rowsCount = 0;
+        var _a = this.topItems(heights, Boolean(this.topCacheCount)), topItemsCount = _a.topItemsCount, topItemsHeight = _a.topItemsHeight;
         while (rowsCount < heights.length - this.topCacheCount &&
             !(targetTranslate + heights[rowsCount].line + heights[rowsCount].acc > scrollTop)) {
             targetTranslate += heights[rowsCount].line + heights[rowsCount].acc;
             rowsCount++;
         }
+        if (topItemsCount > this.propsSkip + rowsCount) {
+            return;
+        }
         if (rowsCount >= heights.length - this.topCacheCount && this.propsSkip + rowsCount >= this.total) {
-            this.translate(targetTranslate);
-            this.changePage(this.total - 1, e);
+            this.translate(targetTranslate - topItemsHeight);
+            this.changePage(this.total - 1 - topItemsCount, e);
         }
-        else if (targetTranslate !== this.tableTranslate) {
-            this.translate(targetTranslate);
-            this.changePage(this.propsSkip + rowsCount, e);
+        else if (targetTranslate !== this.tableTranslate && this.propsSkip + rowsCount - topItemsCount !== this.propsSkip) {
+            this.translate(targetTranslate - topItemsHeight);
+            this.changePage(this.propsSkip + rowsCount - topItemsCount, e);
         }
     };
     VirtualScroll.prototype.scrollNonStrict = function (e) {
@@ -185,8 +195,9 @@ var VirtualScroll = /** @class */ (function () {
         else if (rowIndexOffset === -1) {
             microAdjust = -((heights[heights.length - 1].line + heights[heights.length - 1].acc) * rowpercentage);
         }
-        this.translate(microAdjust + this.containerHeight * floatRowIndex / this.total);
-        this.changePage(rowIndex, e);
+        var _a = this.topItems(heights, Boolean(this.topCacheCount)), topItemsCount = _a.topItemsCount, topItemsHeight = _a.topItemsHeight;
+        this.translate(Math.max(0, microAdjust - topItemsHeight - this.horizontalScrollbarHeight() + this.containerHeight * floatRowIndex / this.total));
+        this.changePage(rowIndex - topItemsCount, e);
     };
     VirtualScroll.prototype.scrollHandler = function (e) {
         if (!this.scrollableVirtual) {
@@ -196,9 +207,6 @@ var VirtualScroll = /** @class */ (function () {
             this.scrollSyncing = false;
             return;
         }
-        var grid = this;
-        clearTimeout(this.syncTimeout);
-        this.syncTimeout = window.setTimeout(function () { grid.syncScroll(); }, 200);
         var scrollTop = this.container.scrollTop;
         var prev = this.prevScrollPos;
         this.prevScrollPos = scrollTop;

package/dist/es/header/HeaderRow.js

@@ -93,36 +93,27 @@ var HeaderRow = /** @class */ (function (_super) {
             } : {
                 'role': 'presentation'
             };
-            var columnMenuWrapperProps = {
-                column: {
-                    field: column.field,
-                    filter: column.filter
-                },
-                sortable: sortable && _this.props.sortable,
-                sort: _this.props.sort,
-                onSortChange: _this.props.sortChange,
-                filter: _this.props.filter,
-                filterable: _this.props.filterable && column.filterable,
-                filterOperators: _this.props.filterOperators,
-                onFilterChange: _this.props.filterChange,
-                group: _this.props.group,
-                groupable: _this.props.groupable,
-                onGroupChange: _this.props.groupChange,
-                columnMenu: columnMenu
-            };
-            var headerCellProps = {
-                field: column.field,
-                onClick: sortable && (function (e) { return _this.cellClick(e, column); }) || undefined,
-                selectionChange: _this.props.selectionChange,
-                title: column.title,
-                selectionValue: column.headerSelectionValue,
-                render: _this.props.cellRender,
-                children: _this.sortIcon(sortIndex),
-                columnMenuWrapperProps: columnMenuWrapperProps
-            };
             var key = (column.declarationIndex >= 0) ? ++_this.index : --_this.serviceIndex;
+            var HeaderCell = column.headerCell ? column.headerCell : GridHeaderCell;
+            var headerCell = (React.createElement(HeaderCell, { field: column.field, onClick: sortable && (function (e) { return _this.cellClick(e, column); }) || undefined, selectionChange: _this.props.selectionChange, title: column.title, selectionValue: column.headerSelectionValue, render: _this.props.cellRender, children: _this.sortIcon(sortIndex), columnMenuWrapperProps: {
+                    column: {
+                        field: column.field,
+                        filter: column.filter
+                    },
+                    sortable: sortable && _this.props.sortable,
+                    sort: _this.props.sort,
+                    onSortChange: _this.props.sortChange,
+                    filter: _this.props.filter,
+                    filterable: _this.props.filterable && column.filterable,
+                    filterOperators: _this.props.filterOperators,
+                    onFilterChange: _this.props.filterChange,
+                    group: _this.props.group,
+                    groupable: _this.props.groupable,
+                    onGroupChange: _this.props.groupChange,
+                    columnMenu: columnMenu
+                } }));
             return (React.createElement(HeaderThElement, __assign({}, ariaAttrs, { key: key, colSpan: column.colSpan, rowSpan: column.rowSpan, className: className, style: style, columnId: column.id, navigatable: column.navigatable, onKeyDown: sortable && (function (e) { return _this.cellKeyDown(e, column); }) || undefined, role: "columnheader" }),
-                column.headerCell ? React.createElement(column.headerCell, __assign({}, headerCellProps)) : React.createElement(GridHeaderCell, __assign({}, headerCellProps)),
+                headerCell,
                 _this.props.columnResize && _this.props.columnResize.resizable && column.resizable &&
                     React.createElement(ColumnResizer, { key: 2, resize: function (e, element, end) {
                             return _this.props.columnResize &&

package/dist/es/package-metadata.js

@@ -5,7 +5,7 @@ export var packageMetadata = {
     name: '@progress/kendo-react-grid',
     productName: 'KendoReact',
     productCodes: ['KENDOUIREACT', 'KENDOUICOMPLETE'],
-    publishDate: 1672762751,
+    publishDate: 1672914787,
     version: '',
     licensingDocsUrl: 'https://www.telerik.com/kendo-react-ui/my-license/?utm_medium=product&utm_source=kendoreact&utm_campaign=kendo-ui-react-purchase-license-keys-warning'
 };

package/dist/es/utils/index.d.ts

@@ -50,3 +50,11 @@ export declare const footerColumns: (columns: ExtendedColumnProps[]) => Extended
  * @hidden
  */
 export declare const sanitizeColumns: (columns: ExtendedColumnProps[]) => GridColumnProps[];
+/**
+ * @hidden
+ */
+export declare const firefox: boolean;
+/**
+ * @hidden
+ */
+export declare const firefoxMaxHeight = 17895697;

package/dist/es/utils/index.js

@@ -227,3 +227,12 @@ export var sanitizeColumns = function (columns) {
         return children.length ? __assign({ children: sanitizeColumns(children) }, props) : props;
     });
 };
+/**
+ * @hidden
+ */
+export var firefox = typeof window !== 'undefined' &&
+    /Firefox/.test(window.navigator.userAgent);
+/**
+ * @hidden
+ */
+export var firefoxMaxHeight = 17895697;

package/dist/npm/Grid.d.ts

@@ -106,6 +106,7 @@ export declare class Grid extends React.Component<GridProps, {}> {
     protected dragLogic: CommonDragLogic;
     private _columns;
     private _columnsMap;
+    private _columnsMutations;
     private contextStateRef;
     private navigationStateRef;
     private _data;
@@ -221,7 +222,11 @@ export declare class Grid extends React.Component<GridProps, {}> {
     private columnToGroup;
     private resetTableWidth;
     private onResize;
+    private childrenToArray;
+    private readColumns;
+    private mapColumns;
     private initColumns;
+    private getHeaderRow;
     private resolveTitle;
     private getDataState;
     private getArguments;