igniteui-angular 20.1.25 → 20.1.26

package/fesm2022/igniteui-angular.mjs

@@ -1291,7 +1291,7 @@ class DefaultMergeStrategy {
                 index++;
                 continue;
             }
-            const recToUpdateData = recData ?? { recordRef: grid.isGhostRecord(rec) ? rec.recordRef : rec, cellMergeMeta: new Map(), ghostRecord: rec.ghostRecord };
+            const recToUpdateData = recData ?? { recordRef: grid.isGhostRecord(rec) ? rec.recordRef : rec, cellMergeMeta: new Map(), ghostRecord: rec.ghostRecord, index: index };
             recToUpdateData.cellMergeMeta.set(field, { rowSpan: 1, childRecords: [] });
             if (prev && comparer.call(this, prev.recordRef, recToUpdateData.recordRef, field, isDate, isTime) && prev.ghostRecord === recToUpdateData.ghostRecord) {
                 const root = prev.cellMergeMeta.get(field)?.root ?? prev;
@@ -16499,6 +16499,9 @@ class IgxForOfDirective extends IgxForOfToken {
         this._sizesCache = [];
         this._differ = null;
         this.individualSizeCache = [];
+        /**
+         * @hidden
+         */
         /** Internal track for scroll top that is being virtualized */
         this._virtScrollPosition = 0;
         /** If the next onScroll event is triggered due to internal setting of scrollTop */
@@ -16931,7 +16934,7 @@ class IgxForOfDirective extends IgxForOfToken {
                 const maxVirtScrollTop = this._virtSize - containerSize;
                 this._bScrollInternal = true;
                 this._virtScrollPosition = maxVirtScrollTop;
-                this.scrollPosition = maxVirtScrollTop;
+                this.scrollPosition = maxVirtScrollTop / this._virtRatio;
                 return;
             }
             if (this._adjustToIndex) {
@@ -17491,11 +17494,13 @@ class IgxForOfDirective extends IgxForOfToken {
         let currentScroll = this.scrollPosition;
         if (this._virtRatio !== 1) {
             this._calcVirtualScrollPosition(this.scrollPosition);
-            currentScroll = this._virtScrollPosition;
+            scrollOffset = this.fixedUpdateAllElements(this._virtScrollPosition);
+        }
+        else {
+            const scroll = this.scrollComponent.nativeElement;
+            scrollOffset = scroll && this.scrollComponent.size ?
+                currentScroll - this.sizesCache[this.state.startIndex] : 0;
         }
-        const scroll = this.scrollComponent.nativeElement;
-        scrollOffset = scroll && this.scrollComponent.size ?
-            currentScroll - this.sizesCache[this.state.startIndex] : 0;
         const dir = this.igxForScrollOrientation === 'horizontal' ? 'left' : 'top';
         this.dc.instance._viewContainer.element.nativeElement.style[dir] = -(scrollOffset) + 'px';
     }
@@ -29916,7 +29921,9 @@ class IgxGridPinningActionsComponent extends IgxGridActionsBaseDirective {
         const context = this.strip.context;
         const grid = context.grid;
         grid.scrollTo(context.data, 0);
-        this.strip.hide();
+        if (this.asMenuItems) {
+            this.strip.hide();
+        }
     }
     registerSVGIcons() {
         if (!this.isRow(this.strip.context)) {
@@ -64954,10 +64961,15 @@ class IgxGridNavigationService {
             this.grid.selectionService.keyboardStateOnKeydown(this.activeNode, shift, shift && key === 'tab');
         }
         const position = this.getNextPosition(this.activeNode.row, this.activeNode.column, key, shift, ctrl, event);
+        const shouldNotifyVirtualizedKeyboardSelection = ctrl && (key === 'arrowup' || key === 'up' || key === 'arrowdown' || key === 'down') &&
+            this.shouldPerformVerticalScroll(position.rowIndex, position.colIndex);
         if (NAVIGATION_KEYS.has(key)) {
             event.preventDefault();
             this.navigateInBody(position.rowIndex, position.colIndex, (obj) => {
                 obj.target.activate(event);
+                if (shouldNotifyVirtualizedKeyboardSelection) {
+                    this.grid.notifyChanges();
+                }
             });
         }
     }
@@ -68547,7 +68559,7 @@ class IgxGridBaseDirective {
     }
     getMergeCellOffset(rowData) {
         const index = rowData.dataIndex;
-        let offset = this.verticalScrollContainer.scrollPosition - this.verticalScrollContainer.getScrollForIndex(index);
+        let offset = this.verticalScrollContainer._virtScrollPosition - this.verticalScrollContainer.getScrollForIndex(index);
         if (this.hasPinnedRecords && this.isRowPinningToTop) {
             offset -= this.pinnedRowHeight;
         }
@@ -68703,7 +68715,7 @@ class IgxGridBaseDirective {
             this.cdr.detectChanges();
         });
         this.verticalScrollContainer.contentSizeChange.pipe(filter(() => !this._init), throttleTime(30), destructor).subscribe(() => {
-            this.notifyChanges(true);
+            this.onContentSizeChange();
         });
         this.verticalScrollContainer.chunkPreload.pipe(filter(() => !this._init), destructor).subscribe(() => {
             this.updateMergedData();
@@ -68873,6 +68885,11 @@ class IgxGridBaseDirective {
         this.paginationComponents.changes.pipe(takeUntil(this.destroy$)).subscribe(() => {
             this.setUpPaginator();
         });
+        this.actionStripComponents.changes.pipe(takeUntil(this.destroy$)).subscribe(() => {
+            if (this.actionStrip) {
+                this.actionStrip.menuOverlaySettings.outlet = this.outlet;
+            }
+        });
         if (this.actionStrip) {
             this.actionStrip.menuOverlaySettings.outlet = this.outlet;
         }
@@ -71740,18 +71757,21 @@ class IgxGridBaseDirective {
         if (!this._height) {
             return null;
         }
+        const styles = this.document.defaultView.getComputedStyle(this.nativeElement);
         const actualTheadRow = this.getTheadRowHeight();
         const footerHeight = this.getFooterHeight();
         const toolbarHeight = this.getToolbarHeight();
         const pagingHeight = this.getPagingFooterHeight();
         const groupAreaHeight = this.getGroupAreaHeight();
         const scrHeight = this.getComputedHeight(this.scr.nativeElement);
+        const borderTop = parseFloat(styles.getPropertyValue('border-top-width')) || 0;
+        const borderBottom = parseFloat(styles.getPropertyValue('border-bottom-width')) || 0;
         const renderedHeight = toolbarHeight + actualTheadRow +
             footerHeight + pagingHeight + groupAreaHeight +
-            scrHeight;
+            scrHeight + borderTop + borderBottom;
         let gridHeight = 0;
         if (this.isPercentHeight) {
-            const computed = this.document.defaultView.getComputedStyle(this.nativeElement).getPropertyValue('height');
+            const computed = styles.getPropertyValue('height');
             const autoSize = this._shouldAutoSize(renderedHeight);
             if (autoSize || computed.indexOf('%') !== -1) {
                 const bodyHeight = this.getDataBasedBodyHeight();
@@ -72264,9 +72284,16 @@ class IgxGridBaseDirective {
         });
         this.disableTransitions = false;
         this.hideOverlays();
-        this.actionStrip?.hide();
-        if (this.actionStrip) {
-            this.actionStrip.context = null;
+        const context = this.actionStrip?.context;
+        const contextEl = context?.element?.nativeElement;
+        const keepActionStrip = !!context?.pinned &&
+            !!contextEl?.isConnected &&
+            !this.hasMenuPinningActions();
+        if (!keepActionStrip) {
+            if (this.actionStrip) {
+                this.actionStrip.hide();
+                this.actionStrip.context = null;
+            }
         }
         const args = {
             direction: 'vertical',
@@ -72275,6 +72302,17 @@ class IgxGridBaseDirective {
         };
         this.gridScroll.emit(args);
     }
+    hasMenuPinningActions() {
+        const strip = this.actionStrip;
+        const actionButtons = strip?.actionButtons;
+        if (!actionButtons?.length) {
+            return false;
+        }
+        return actionButtons
+            .toArray()
+            .some((button) => button instanceof IgxGridPinningActionsComponent &&
+            button.asMenuItems);
+    }
     horizontalScrollHandler(event) {
         const scrollLeft = event.target.scrollLeft;
         this.headerContainer.onHScroll(scrollLeft);
@@ -72617,6 +72655,9 @@ class IgxGridBaseDirective {
             return false;
         return Object.keys(oldData[0]).join() !== Object.keys(newData[0]).join();
     }
+    onContentSizeChange() {
+        this.notifyChanges(true);
+    }
     /**
      * Clears the current navigation service active node
      */
@@ -72650,16 +72691,15 @@ class IgxGridBaseDirective {
         // recalc merged data
         if (this.columnsToMerge.length > 0) {
             const startIndex = this.verticalScrollContainer.state.startIndex;
-            const prevDataView = this.verticalScrollContainer.igxForOf?.slice(0, startIndex);
             const data = [];
-            for (let index = 0; index < startIndex; index++) {
-                const rec = prevDataView[index];
-                if (rec.cellMergeMeta &&
-                    // index + maxRowSpan is within view
-                    startIndex < (index + Math.max(...rec.cellMergeMeta.values().toArray().map(x => x.rowSpan)))) {
-                    const visibleIndex = this.isRowPinningToTop ? index + this.pinnedRecordsCount : index;
-                    data.push({ record: rec, index: visibleIndex, dataIndex: index });
-                }
+            const rec = this.verticalScrollContainer.igxForOf[startIndex];
+            if (rec && rec.cellMergeMeta) {
+                this.columnsToMerge.forEach((col) => {
+                    const root = rec.cellMergeMeta?.get(col.field)?.root;
+                    if (root) {
+                        data.push({ record: root, index: root.index, dataIndex: root.index });
+                    }
+                });
             }
             this._mergedDataInView = data;
             this.notifyChanges();
@@ -74783,7 +74823,7 @@ class IgxGridUnmergeActivePipe {
         }
         let result = cloneArray(collection);
         uniqueRoots.forEach(x => {
-            const index = collection.indexOf(x);
+            const index = x.index;
             const colKeys = [...x.cellMergeMeta.keys()];
             const cols = colsToMerge.filter(col => colKeys.indexOf(col.field) !== -1);
             for (const col of cols) {
@@ -81785,6 +81825,10 @@ class IgxPivotGridComponent extends IgxGridBaseDirective {
     buildDataView(data) {
         this._dataView = data;
     }
+    onContentSizeChange() {
+        super.onContentSizeChange();
+        this.updateDefaultRowHeight();
+    }
     /**
      * @hidden @internal
      */
@@ -89254,9 +89298,11 @@ class IgxHierarchicalGridComponent extends IgxHierarchicalGridBaseDirective {
     get actionStrip() {
         return this.parentIsland ? this.parentIsland.actionStrip : super.actionStrip;
     }
+    /** @hidden @internal */
     get advancedFilteringExpressionsTree() {
         return super.advancedFilteringExpressionsTree;
     }
+    /** @hidden @internal */
     set advancedFilteringExpressionsTree(value) {
         if (!this._hGridSchema) {
             this._hGridSchema = this.generateSchema();