@revolist/revogrid 4.23.0 → 4.23.1

package/dist/cjs/{cell-renderer-DWJ9Px9f.js → cell-renderer-Dcz022q7.js}

@@ -5,7 +5,7 @@
 
 var index = require('./index-Dq8Xzj5l.js');
 var dimension_helpers = require('./dimension.helpers-B9HgANnM.js');
-var column_service = require('./column.service-f612L4ql.js');
+var column_service = require('./column.service-C1Qvcf5l.js');
 
 /**
  * Renders sorting direction and optional additive sorting rank.

package/dist/cjs/{column.drag.plugin-CaEBDG-Q.js → column.drag.plugin-DJueWxN_.js}

@@ -3,14 +3,14 @@
  */
 'use strict';
 
-var column_service = require('./column.service-f612L4ql.js');
+var column_service = require('./column.service-C1Qvcf5l.js');
 var dimension_helpers = require('./dimension.helpers-B9HgANnM.js');
 var viewport_store = require('./viewport.store-BlKQ4x9H.js');
 var index$1 = require('./index-DxaSE5uZ.js');
 var index = require('./index-Dq8Xzj5l.js');
 var filter_button = require('./filter.button-w6LWnyhi.js');
 var debounce = require('./debounce-CcpHiH2p.js');
-var headerCellRenderer = require('./header-cell-renderer-4yq9_WbM.js');
+var headerCellRenderer = require('./header-cell-renderer-QrcXXSkF.js');
 
 function calculateRealSize({ count, originItemSize, sizes, }) {
     const safeCount = Math.max(0, count);

package/dist/cjs/{column.service-f612L4ql.js → column.service-C1Qvcf5l.js}

@@ -439,6 +439,9 @@ const GROUPING_ROW_TYPE = 'rgRow';
 function getGroupValueDefault(item, prop) {
     return item[prop] || null;
 }
+function isDataRow(item) {
+    return item != null;
+}
 // get source based on proxy item collection to preserve rgRow order
 function getSource(source, items, withoutGrouping = false) {
     let index = 0;
@@ -460,6 +463,9 @@ function getSource(source, items, withoutGrouping = false) {
                 result.prevExpanded[model[PSEUDO_GROUP_ITEM_VALUE]] = true;
             }
         }
+        else if (!isDataRow(model)) {
+            return;
+        }
         else {
             result.source.push(model);
             result.oldNewIndexes[i] = index;
@@ -540,6 +546,9 @@ function flattenGroupMaps({ groupedValues, parentIds, isExpanded, itemIndex, exp
 function gatherGrouping(array, columnProps, { prevExpanded = {}, expandedAll = false, getGroupValue = getGroupValueDefault, }) {
     const groupedItems = new Map();
     array.forEach((item, originalIndex) => {
+        if (!isDataRow(item)) {
+            return;
+        }
         const groupLevelValues = columnProps.map(groupId => getGroupValue(item, groupId));
         const lastLevelValue = groupLevelValues.pop();
         let currentGroupLevel = groupedItems;

package/dist/cjs/{header-cell-renderer-4yq9_WbM.js → header-cell-renderer-QrcXXSkF.js}

@@ -4,7 +4,7 @@
 'use strict';
 
 var index = require('./index-Dq8Xzj5l.js');
-var column_service = require('./column.service-f612L4ql.js');
+var column_service = require('./column.service-C1Qvcf5l.js');
 
 /**
  * Dispatches a custom event to a specified target element.

package/dist/cjs/index.cjs.js

@@ -3,10 +3,10 @@
  */
 'use strict';
 
-var column_service = require('./column.service-f612L4ql.js');
-var column_drag_plugin = require('./column.drag.plugin-CaEBDG-Q.js');
-var headerCellRenderer = require('./header-cell-renderer-4yq9_WbM.js');
-var cellRenderer = require('./cell-renderer-DWJ9Px9f.js');
+var column_service = require('./column.service-C1Qvcf5l.js');
+var column_drag_plugin = require('./column.drag.plugin-DJueWxN_.js');
+var headerCellRenderer = require('./header-cell-renderer-QrcXXSkF.js');
+var cellRenderer = require('./cell-renderer-Dcz022q7.js');
 var index$1 = require('./index-DxaSE5uZ.js');
 var textEditor = require('./text-editor-B4W-m-r-.js');
 var edit_utils = require('./edit.utils-pKeiYFLJ.js');

package/dist/cjs/revo-grid.cjs.entry.js

@@ -4,17 +4,17 @@
 'use strict';
 
 var index = require('./index-Dq8Xzj5l.js');
-var column_service = require('./column.service-f612L4ql.js');
+var column_service = require('./column.service-C1Qvcf5l.js');
 var dimension_helpers = require('./dimension.helpers-B9HgANnM.js');
 var debounce = require('./debounce-CcpHiH2p.js');
 var viewport_helpers = require('./viewport.helpers-BND76K2j.js');
 var viewport_store = require('./viewport.store-BlKQ4x9H.js');
-var column_drag_plugin = require('./column.drag.plugin-CaEBDG-Q.js');
+var column_drag_plugin = require('./column.drag.plugin-DJueWxN_.js');
 var theme_service = require('./theme.service-BgnxGIjK.js');
 var index$1 = require('./index-DxaSE5uZ.js');
 var events = require('./events-DeLDyZlb.js');
 require('./filter.button-w6LWnyhi.js');
-require('./header-cell-renderer-4yq9_WbM.js');
+require('./header-cell-renderer-QrcXXSkF.js');
 
 class ColumnDataProvider {
     get stores() {
@@ -784,13 +784,11 @@ class SelectionStoreConnector {
         return (_a = this.focusedStore) === null || _a === void 0 ? void 0 : _a.entity.store.get('range');
     }
     registerColumn(x, type) {
+        this.updateColumnTypeMapping(x, type);
         if (this.columnStores[x]) {
             return this.columnStores[x];
         }
         this.columnStores[x] = new column_drag_plugin.SelectionStore();
-        // build cross-linking type to position
-        this.storesByType[type] = x;
-        this.storesXToType[x] = type;
         return this.columnStores[x];
     }
     registerRow(y, type) {
@@ -1011,6 +1009,31 @@ class SelectionStoreConnector {
         }
         return stores;
     }
+    /**
+     * Keep column viewport positions and types in sync across pin/unpin rerenders.
+     * Regression case: when a selected rgCol cell was pinned left, colPinStart
+     * could take over x=0 and render the stale rgCol focus store in the pinned area.
+     */
+    updateColumnTypeMapping(x, type) {
+        const previousType = this.storesXToType[x];
+        const previousX = this.storesByType[type];
+        let shouldClearFocus = false;
+        this.storesByType[type] = x;
+        this.storesXToType[x] = type;
+        if (previousType && previousType !== type) {
+            shouldClearFocus = true;
+            if (this.storesByType[previousType] === x) {
+                delete this.storesByType[previousType];
+            }
+        }
+        if (typeof previousX === 'number' && previousX !== x && this.storesXToType[previousX] === type) {
+            delete this.storesXToType[previousX];
+            shouldClearFocus = true;
+        }
+        if (shouldClearFocus) {
+            this.clearAll();
+        }
+    }
 }
 
 /**
@@ -1960,6 +1983,7 @@ const RevoGridComponent = class {
         if (!this.dimensionProvider || !this.columnProvider) {
             return;
         }
+        const focusToRestore = init ? undefined : this.getColumnFocusRestore();
         const beforeGatherEvent = this.beforecolumnsgather.emit({
             columns: [...newVal],
         });
@@ -1977,6 +2001,9 @@ const RevoGridComponent = class {
             return;
         }
         const columns = this.columnProvider.setColumns(beforeApplyEvent.detail);
+        if (focusToRestore) {
+            this.pendingColumnFocusRestore = focusToRestore;
+        }
         const order = {};
         for (const prop of Object.keys(beforeApplyEvent.detail.sort)) {
             order[prop] = beforeApplyEvent.detail.sort[prop].order;
@@ -1986,6 +2013,64 @@ const RevoGridComponent = class {
             order,
         });
     }
+    /**
+     * Capture logical focus before columns are repartitioned by pin state.
+     * Regression case: selecting a regular cell, then pinning that column left,
+     * used to let the new pinned viewport reuse the old rgCol selection store.
+     */
+    getColumnFocusRestore() {
+        var _a, _b, _c, _d;
+        const focused = (_a = this.viewport) === null || _a === void 0 ? void 0 : _a.getFocused();
+        const prevStoreX = (_c = (_b = this.selectionStoreConnector) === null || _b === void 0 ? void 0 : _b.focusedStore) === null || _c === void 0 ? void 0 : _c.position.x;
+        const prop = (_d = focused === null || focused === void 0 ? void 0 : focused.column) === null || _d === void 0 ? void 0 : _d.prop;
+        if (!focused || prop === undefined || prevStoreX === undefined) {
+            return;
+        }
+        return {
+            prop,
+            colType: focused.colType,
+            colIndex: focused.cell.x,
+            prevStoreX,
+            rowType: focused.rowType,
+            rowIndex: focused.cell.y,
+        };
+    }
+    /**
+     * Reapply focus by column prop after render, once pinning has moved the
+     * column to its new viewport and virtual index.
+     */
+    restoreColumnFocusAfterRender() {
+        var _a, _b, _c, _d;
+        const pending = this.pendingColumnFocusRestore;
+        if (!pending) {
+            return;
+        }
+        this.pendingColumnFocusRestore = undefined;
+        if (!this.viewport || !this.columnProvider) {
+            return;
+        }
+        const column = (_b = (_a = this.columnProvider.getColumnByProp(pending.prop)) === null || _a === void 0 ? void 0 : _a[0]) !== null && _b !== void 0 ? _b : column_service.getColumnByProp(this.columns, pending.prop);
+        if (!column) {
+            return;
+        }
+        const colType = column.pin || 'rgCol';
+        const columnIndex = this.columnProvider.getColumnIndexByProp(pending.prop, colType);
+        if (columnIndex < 0) {
+            return;
+        }
+        // Header-only column refreshes should not collapse an existing range.
+        // Replay focus only when pin/unpin or repartitioning moved the logical column.
+        if (colType === pending.colType &&
+            columnIndex === pending.colIndex &&
+            pending.prevStoreX === ((_d = (_c = this.selectionStoreConnector) === null || _c === void 0 ? void 0 : _c.focusedStore) === null || _d === void 0 ? void 0 : _d.position.x)) {
+            return;
+        }
+        const cell = {
+            x: columnIndex,
+            y: pending.rowIndex,
+        };
+        this.viewport.setFocus(colType, pending.rowType, cell, cell);
+    }
     disableVirtualXChanged(newVal = false, prevVal = false) {
         if (newVal === prevVal) {
             return;
@@ -2298,6 +2383,7 @@ const RevoGridComponent = class {
         return Promise.all(this.jobsBeforeRender);
     }
     componentDidRender() {
+        this.restoreColumnFocusAfterRender();
         this.aftergridrender.emit();
     }
     render() {

package/dist/cjs/revogr-attribution_7.cjs.entry.js

@@ -6,7 +6,7 @@
 var index = require('./index-Dq8Xzj5l.js');
 var dimension_helpers = require('./dimension.helpers-B9HgANnM.js');
 var events = require('./events-DeLDyZlb.js');
-var column_service = require('./column.service-f612L4ql.js');
+var column_service = require('./column.service-C1Qvcf5l.js');
 var edit_utils = require('./edit.utils-pKeiYFLJ.js');
 var index$1 = require('./index-DxaSE5uZ.js');
 var debounce = require('./debounce-CcpHiH2p.js');

package/dist/cjs/revogr-data_4.cjs.entry.js

@@ -4,11 +4,11 @@
 'use strict';
 
 var index = require('./index-Dq8Xzj5l.js');
-var column_service = require('./column.service-f612L4ql.js');
+var column_service = require('./column.service-C1Qvcf5l.js');
 var dimension_helpers = require('./dimension.helpers-B9HgANnM.js');
-var cellRenderer = require('./cell-renderer-DWJ9Px9f.js');
+var cellRenderer = require('./cell-renderer-Dcz022q7.js');
 var filter_button = require('./filter.button-w6LWnyhi.js');
-var headerCellRenderer = require('./header-cell-renderer-4yq9_WbM.js');
+var headerCellRenderer = require('./header-cell-renderer-QrcXXSkF.js');
 var throttle = require('./throttle-BCwEuJJq.js');
 var viewport_helpers = require('./viewport.helpers-BND76K2j.js');
 require('./debounce-CcpHiH2p.js');
@@ -436,22 +436,13 @@ const RevogrHeaderComponent = class {
         ];
     }
     renderGroupColumn(group, level, visibleGroupRange) {
-        var _a;
-        const groupStartIndex = (_a = group.indexes[0]) !== null && _a !== void 0 ? _a : -1;
-        if (groupStartIndex < 0) {
-            return;
-        }
-        const groupEndIndex = groupStartIndex + group.indexes.length - 1;
-        if (!visibleGroupRange ||
-            !isGroupInVisibleRange(groupStartIndex, groupEndIndex, visibleGroupRange)) {
-            return;
-        }
-        const groupStart = dimension_helpers.getItemByIndex(this.dimensionCol.state, groupStartIndex).start;
-        const groupEnd = dimension_helpers.getItemByIndex(this.dimensionCol.state, groupEndIndex).end;
+        const groupRange = this.getGroupIndexRange(group);
+        const groupBounds = this.getGroupBounds(groupRange);
         const props = {
+            level,
             providers: this.providers,
-            start: groupStart,
-            end: groupEnd,
+            start: groupBounds.start,
+            end: groupBounds.end,
             group,
             renderOffset: this.viewportCol.get('renderOffset') || 0,
             active: this.resizeHandler,
@@ -459,15 +450,57 @@ const RevogrHeaderComponent = class {
             additionalData: this.additionalData,
             onResize: e => {
                 var _a;
-                return this.onResizeGroup((_a = e.changedX) !== null && _a !== void 0 ? _a : 0, groupStartIndex, groupEndIndex);
+                return groupRange
+                    ? this.onResizeGroup((_a = e.changedX) !== null && _a !== void 0 ? _a : 0, groupRange.startIndex, groupRange.endIndex)
+                    : undefined;
             },
         };
         const event = this.beforeGroupHeaderRender.emit(props);
         if (event.defaultPrevented) {
             return;
         }
+        const renderRange = this.getGroupIndexRange(event.detail.group);
+        if (!renderRange ||
+            !visibleGroupRange ||
+            !isGroupInVisibleRange(renderRange.startIndex, renderRange.endIndex, visibleGroupRange)) {
+            return;
+        }
+        if (event.detail.onResize === props.onResize) {
+            event.detail.onResize = e => {
+                var _a;
+                return this.onResizeGroup((_a = e.changedX) !== null && _a !== void 0 ? _a : 0, renderRange.startIndex, renderRange.endIndex);
+            };
+        }
+        const renderBounds = this.getGroupBounds(renderRange);
+        if (event.detail.start === props.start) {
+            event.detail.start = renderBounds.start;
+        }
+        if (event.detail.end === props.end) {
+            event.detail.end = renderBounds.end;
+        }
         return index.h(HeaderGroupRenderer, Object.assign({ key: this.getGroupHeaderCellKey(event.detail.group, level) }, event.detail));
     }
+    getGroupIndexRange(group) {
+        var _a;
+        const startIndex = (_a = group.indexes[0]) !== null && _a !== void 0 ? _a : -1;
+        if (startIndex < 0) {
+            return;
+        }
+        const endIndex = group.indexes[group.indexes.length - 1];
+        return {
+            startIndex,
+            endIndex,
+        };
+    }
+    getGroupBounds(range) {
+        if (!range) {
+            return { start: 0, end: 0 };
+        }
+        return {
+            start: dimension_helpers.getItemByIndex(this.dimensionCol.state, range.startIndex).start,
+            end: dimension_helpers.getItemByIndex(this.dimensionCol.state, range.endIndex).end,
+        };
+    }
     getVisibleGroupRange() {
         const visibleColumns = this.viewportCol.get('items');
         if (!visibleColumns.length) {

package/dist/collection/components/header/revogr-header.js

@@ -97,22 +97,13 @@ export class RevogrHeaderComponent {
         ];
     }
     renderGroupColumn(group, level, visibleGroupRange) {
-        var _a;
-        const groupStartIndex = (_a = group.indexes[0]) !== null && _a !== void 0 ? _a : -1;
-        if (groupStartIndex < 0) {
-            return;
-        }
-        const groupEndIndex = groupStartIndex + group.indexes.length - 1;
-        if (!visibleGroupRange ||
-            !isGroupInVisibleRange(groupStartIndex, groupEndIndex, visibleGroupRange)) {
-            return;
-        }
-        const groupStart = getItemByIndex(this.dimensionCol.state, groupStartIndex).start;
-        const groupEnd = getItemByIndex(this.dimensionCol.state, groupEndIndex).end;
+        const groupRange = this.getGroupIndexRange(group);
+        const groupBounds = this.getGroupBounds(groupRange);
         const props = {
+            level,
             providers: this.providers,
-            start: groupStart,
-            end: groupEnd,
+            start: groupBounds.start,
+            end: groupBounds.end,
             group,
             renderOffset: this.viewportCol.get('renderOffset') || 0,
             active: this.resizeHandler,
@@ -120,15 +111,57 @@ export class RevogrHeaderComponent {
             additionalData: this.additionalData,
             onResize: e => {
                 var _a;
-                return this.onResizeGroup((_a = e.changedX) !== null && _a !== void 0 ? _a : 0, groupStartIndex, groupEndIndex);
+                return groupRange
+                    ? this.onResizeGroup((_a = e.changedX) !== null && _a !== void 0 ? _a : 0, groupRange.startIndex, groupRange.endIndex)
+                    : undefined;
             },
         };
         const event = this.beforeGroupHeaderRender.emit(props);
         if (event.defaultPrevented) {
             return;
         }
+        const renderRange = this.getGroupIndexRange(event.detail.group);
+        if (!renderRange ||
+            !visibleGroupRange ||
+            !isGroupInVisibleRange(renderRange.startIndex, renderRange.endIndex, visibleGroupRange)) {
+            return;
+        }
+        if (event.detail.onResize === props.onResize) {
+            event.detail.onResize = e => {
+                var _a;
+                return this.onResizeGroup((_a = e.changedX) !== null && _a !== void 0 ? _a : 0, renderRange.startIndex, renderRange.endIndex);
+            };
+        }
+        const renderBounds = this.getGroupBounds(renderRange);
+        if (event.detail.start === props.start) {
+            event.detail.start = renderBounds.start;
+        }
+        if (event.detail.end === props.end) {
+            event.detail.end = renderBounds.end;
+        }
         return h(GroupHeaderRenderer, Object.assign({ key: this.getGroupHeaderCellKey(event.detail.group, level) }, event.detail));
     }
+    getGroupIndexRange(group) {
+        var _a;
+        const startIndex = (_a = group.indexes[0]) !== null && _a !== void 0 ? _a : -1;
+        if (startIndex < 0) {
+            return;
+        }
+        const endIndex = group.indexes[group.indexes.length - 1];
+        return {
+            startIndex,
+            endIndex,
+        };
+    }
+    getGroupBounds(range) {
+        if (!range) {
+            return { start: 0, end: 0 };
+        }
+        return {
+            start: getItemByIndex(this.dimensionCol.state, range.startIndex).start,
+            end: getItemByIndex(this.dimensionCol.state, range.endIndex).end,
+        };
+    }
     getVisibleGroupRange() {
         const visibleColumns = this.viewportCol.get('items');
         if (!visibleColumns.length) {
@@ -604,7 +637,7 @@ export class RevogrHeaderComponent {
                 },
                 "complexType": {
                     "original": "HeaderGroupRendererProps",
-                    "resolved": "{ start: number; end: number; group: Group; providers: ProvidersColumns<DimensionCols | \"rowHeaders\">; additionalData: any; canResize?: boolean | undefined; renderOffset?: number | undefined; onResize?(e: ResizeEvent): void; } & Partial<Pick<ResizeProps, \"active\">>",
+                    "resolved": "{ level: number; start: number; end: number; group: Group; providers: ProvidersColumns<DimensionCols | \"rowHeaders\">; additionalData: any; canResize?: boolean | undefined; renderOffset?: number | undefined; onResize?(e: ResizeEvent): void; } & Partial<Pick<ResizeProps, \"active\">>",
                     "references": {
                         "HeaderGroupRendererProps": {
                             "location": "import",

package/dist/collection/components/revoGrid/revo-grid.js

@@ -609,6 +609,7 @@ export class RevoGridComponent {
         if (!this.dimensionProvider || !this.columnProvider) {
             return;
         }
+        const focusToRestore = init ? undefined : this.getColumnFocusRestore();
         const beforeGatherEvent = this.beforecolumnsgather.emit({
             columns: [...newVal],
         });
@@ -626,6 +627,9 @@ export class RevoGridComponent {
             return;
         }
         const columns = this.columnProvider.setColumns(beforeApplyEvent.detail);
+        if (focusToRestore) {
+            this.pendingColumnFocusRestore = focusToRestore;
+        }
         const order = {};
         for (const prop of Object.keys(beforeApplyEvent.detail.sort)) {
             order[prop] = beforeApplyEvent.detail.sort[prop].order;
@@ -635,6 +639,64 @@ export class RevoGridComponent {
             order,
         });
     }
+    /**
+     * Capture logical focus before columns are repartitioned by pin state.
+     * Regression case: selecting a regular cell, then pinning that column left,
+     * used to let the new pinned viewport reuse the old rgCol selection store.
+     */
+    getColumnFocusRestore() {
+        var _a, _b, _c, _d;
+        const focused = (_a = this.viewport) === null || _a === void 0 ? void 0 : _a.getFocused();
+        const prevStoreX = (_c = (_b = this.selectionStoreConnector) === null || _b === void 0 ? void 0 : _b.focusedStore) === null || _c === void 0 ? void 0 : _c.position.x;
+        const prop = (_d = focused === null || focused === void 0 ? void 0 : focused.column) === null || _d === void 0 ? void 0 : _d.prop;
+        if (!focused || prop === undefined || prevStoreX === undefined) {
+            return;
+        }
+        return {
+            prop,
+            colType: focused.colType,
+            colIndex: focused.cell.x,
+            prevStoreX,
+            rowType: focused.rowType,
+            rowIndex: focused.cell.y,
+        };
+    }
+    /**
+     * Reapply focus by column prop after render, once pinning has moved the
+     * column to its new viewport and virtual index.
+     */
+    restoreColumnFocusAfterRender() {
+        var _a, _b, _c, _d;
+        const pending = this.pendingColumnFocusRestore;
+        if (!pending) {
+            return;
+        }
+        this.pendingColumnFocusRestore = undefined;
+        if (!this.viewport || !this.columnProvider) {
+            return;
+        }
+        const column = (_b = (_a = this.columnProvider.getColumnByProp(pending.prop)) === null || _a === void 0 ? void 0 : _a[0]) !== null && _b !== void 0 ? _b : getColumnByProp(this.columns, pending.prop);
+        if (!column) {
+            return;
+        }
+        const colType = column.pin || 'rgCol';
+        const columnIndex = this.columnProvider.getColumnIndexByProp(pending.prop, colType);
+        if (columnIndex < 0) {
+            return;
+        }
+        // Header-only column refreshes should not collapse an existing range.
+        // Replay focus only when pin/unpin or repartitioning moved the logical column.
+        if (colType === pending.colType &&
+            columnIndex === pending.colIndex &&
+            pending.prevStoreX === ((_d = (_c = this.selectionStoreConnector) === null || _c === void 0 ? void 0 : _c.focusedStore) === null || _d === void 0 ? void 0 : _d.position.x)) {
+            return;
+        }
+        const cell = {
+            x: columnIndex,
+            y: pending.rowIndex,
+        };
+        this.viewport.setFocus(colType, pending.rowType, cell, cell);
+    }
     disableVirtualXChanged(newVal = false, prevVal = false) {
         if (newVal === prevVal) {
             return;
@@ -947,6 +1009,7 @@ export class RevoGridComponent {
         return Promise.all(this.jobsBeforeRender);
     }
     componentDidRender() {
+        this.restoreColumnFocusAfterRender();
         this.aftergridrender.emit();
     }
     render() {

package/dist/collection/plugins/groupingRow/grouping.service.js

@@ -5,6 +5,9 @@ import { GROUP_DEPTH, GROUP_EXPANDED, PSEUDO_GROUP_COLUMN, PSEUDO_GROUP_ITEM, PS
 function getGroupValueDefault(item, prop) {
     return item[prop] || null;
 }
+function isDataRow(item) {
+    return item != null;
+}
 // get source based on proxy item collection to preserve rgRow order
 export function getSource(source, items, withoutGrouping = false) {
     let index = 0;
@@ -26,6 +29,9 @@ export function getSource(source, items, withoutGrouping = false) {
                 result.prevExpanded[model[PSEUDO_GROUP_ITEM_VALUE]] = true;
             }
         }
+        else if (!isDataRow(model)) {
+            return;
+        }
         else {
             result.source.push(model);
             result.oldNewIndexes[i] = index;
@@ -106,6 +112,9 @@ function flattenGroupMaps({ groupedValues, parentIds, isExpanded, itemIndex, exp
 export function gatherGrouping(array, columnProps, { prevExpanded = {}, expandedAll = false, getGroupValue = getGroupValueDefault, }) {
     const groupedItems = new Map();
     array.forEach((item, originalIndex) => {
+        if (!isDataRow(item)) {
+            return;
+        }
         const groupLevelValues = columnProps.map(groupId => getGroupValue(item, groupId));
         const lastLevelValue = groupLevelValues.pop();
         let currentGroupLevel = groupedItems;

package/dist/collection/services/selection.store.connector.js

@@ -46,13 +46,11 @@ export class SelectionStoreConnector {
         return (_a = this.focusedStore) === null || _a === void 0 ? void 0 : _a.entity.store.get('range');
     }
     registerColumn(x, type) {
+        this.updateColumnTypeMapping(x, type);
         if (this.columnStores[x]) {
             return this.columnStores[x];
         }
         this.columnStores[x] = new SelectionStore();
-        // build cross-linking type to position
-        this.storesByType[type] = x;
-        this.storesXToType[x] = type;
         return this.columnStores[x];
     }
     registerRow(y, type) {
@@ -273,4 +271,29 @@ export class SelectionStoreConnector {
         }
         return stores;
     }
+    /**
+     * Keep column viewport positions and types in sync across pin/unpin rerenders.
+     * Regression case: when a selected rgCol cell was pinned left, colPinStart
+     * could take over x=0 and render the stale rgCol focus store in the pinned area.
+     */
+    updateColumnTypeMapping(x, type) {
+        const previousType = this.storesXToType[x];
+        const previousX = this.storesByType[type];
+        let shouldClearFocus = false;
+        this.storesByType[type] = x;
+        this.storesXToType[x] = type;
+        if (previousType && previousType !== type) {
+            shouldClearFocus = true;
+            if (this.storesByType[previousType] === x) {
+                delete this.storesByType[previousType];
+            }
+        }
+        if (typeof previousX === 'number' && previousX !== x && this.storesXToType[previousX] === type) {
+            delete this.storesXToType[previousX];
+            shouldClearFocus = true;
+        }
+        if (shouldClearFocus) {
+            this.clearAll();
+        }
+    }
 }

package/dist/esm/{cell-renderer-8UiGd-s7.js → cell-renderer-BtN-NGCk.js}

@@ -3,7 +3,7 @@
  */
 import { h, f as Build } from './index-Chp_81rd.js';
 import { n as DATA_ROW, w as DRAG_ICON_CLASS, x as DRAGGABLE_CLASS } from './dimension.helpers-CGKwSvw6.js';
-import { l as GROUP_EXPAND_BTN, m as GROUP_EXPAND_EVENT, G as GROUP_DEPTH, h as GROUP_EXPANDED, P as PSEUDO_GROUP_ITEM, O as isRowDragService, B as getCellDataParsed } from './column.service-DbpulTog.js';
+import { l as GROUP_EXPAND_BTN, m as GROUP_EXPAND_EVENT, G as GROUP_DEPTH, h as GROUP_EXPANDED, P as PSEUDO_GROUP_ITEM, O as isRowDragService, B as getCellDataParsed } from './column.service-CC_SD8W3.js';
 
 /**
  * Renders sorting direction and optional additive sorting rank.

package/dist/esm/{column.drag.plugin-BsfhsfmB.js → column.drag.plugin-DCZW62Uc.js}

@@ -1,14 +1,14 @@
 /*!
  * Built by Revolist OU ❤️
  */
-import { J as reduce, g as getRange, K as baseEach, C as getColumnType, c as columnTypes, L as toInteger, u as isGrouping, t as getGroupingName, r as rowTypes, B as getCellDataParsed, A as getCellRaw, j as GROUP_COLUMN_PROP, I as getColumnByProp, h as GROUP_EXPANDED, x as getParsedGroup, y as isSameGroup, G as GROUP_DEPTH, e as PSEUDO_GROUP_ITEM_VALUE, d as PSEUDO_GROUP_ITEM_ID, o as GROUPING_ROW_TYPE, p as getSource, f as PSEUDO_GROUP_COLUMN, s as gatherGrouping, m as GROUP_EXPAND_EVENT, v as isGroupingColumn, q as getExpanded, E as isColGrouping } from './column.service-DbpulTog.js';
+import { J as reduce, g as getRange, K as baseEach, C as getColumnType, c as columnTypes, L as toInteger, u as isGrouping, t as getGroupingName, r as rowTypes, B as getCellDataParsed, A as getCellRaw, j as GROUP_COLUMN_PROP, I as getColumnByProp, h as GROUP_EXPANDED, x as getParsedGroup, y as isSameGroup, G as GROUP_DEPTH, e as PSEUDO_GROUP_ITEM_VALUE, d as PSEUDO_GROUP_ITEM_ID, o as GROUPING_ROW_TYPE, p as getSource, f as PSEUDO_GROUP_COLUMN, s as gatherGrouping, m as GROUP_EXPAND_EVENT, v as isGroupingColumn, q as getExpanded, E as isColGrouping } from './column.service-CC_SD8W3.js';
 import { K as createStore, l as setStore, i as calculateDimensionData, L as identity, N as isArray, b as getSourceItem, g as getPhysical, e as setItems, j as getItemByPosition } from './dimension.helpers-CGKwSvw6.js';
 import { j as calculateRowHeaderSize } from './viewport.store-COAfzAyu.js';
 import { g as getScrollbarSize, t as timeout } from './index-Db3qZoW5.js';
 import { h } from './index-Chp_81rd.js';
 import { b as FILTER_PROP, i as isFilterBtn } from './filter.button-C8XTWPU2.js';
 import { d as debounce } from './debounce-PCRWZliA.js';
-import { O as ON_COLUMN_CLICK, d as dispatch } from './header-cell-renderer-DGI2FAD8.js';
+import { O as ON_COLUMN_CLICK, d as dispatch } from './header-cell-renderer-BsvUQ8GS.js';
 
 function calculateRealSize({ count, originItemSize, sizes, }) {
     const safeCount = Math.max(0, count);