Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
99a1ca0
fix(grid-pinning): remove hide call in scrollToRow
IMinchev64 Jan 21, 2026
f43cbba
Merge branch 'master' into iminchev/fix-16493-21.1.x
mddragnev Jan 29, 2026
aa3720a
fix(grid-pinning): hide action strip menu after scrolling to row
IMinchev64 Feb 2, 2026
f6c93a5
fix(grid): improve action strip visibility logic during scrolling
IMinchev64 Feb 16, 2026
f5f04ae
Merge branch 'master' into iminchev/fix-16493-21.1.x
IMinchev64 Feb 16, 2026
4178ae7
Merge branch 'master' into iminchev/fix-16493-21.1.x
mddragnev Mar 6, 2026
61269fc
test(grid): enhance action strip visibility tests for pinned rows
IMinchev64 Mar 10, 2026
f97448b
Merge branch 'master' into iminchev/fix-16493-21.1.x
IMinchev64 Mar 10, 2026
8ca4293
fix(grid): update action strip visibility logic for pinned rows
IMinchev64 Mar 11, 2026
9521dd0
Merge branch 'iminchev/fix-16493-21.1.x' of https://github.com/Ignite…
IMinchev64 Mar 11, 2026
30be8e0
fix(grid): correct action strip visibility logic for pinned rows
IMinchev64 Mar 11, 2026
b98f208
fix(grid): update action strip logic to check for menu items presence
IMinchev64 Mar 12, 2026
e0b6cb2
Merge branch 'master' into iminchev/fix-16493-21.1.x
ChronosSF Mar 27, 2026
b19ccc7
fix(IgxGrid): add method to check for menu pinning actions in action …
IMinchev64 Apr 1, 2026
7257546
Merge branch 'master' into iminchev/fix-16493-21.1.x
IMinchev64 Apr 1, 2026
84a51fd
Merge branch 'master' into iminchev/fix-16493-21.1.x
IMinchev64 Apr 2, 2026
f9f53f9
fix(grid): Remove unnecessary type assertion hasMenuPinningActions
IMinchev64 Apr 2, 2026
6aecd3c
Potential fix for pull request finding 'Unused variable, import, func…
IMinchev64 Apr 2, 2026
def0c29
fix(grid): Simplify hasMenuPinningActions method for better readability
IMinchev64 Apr 2, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ export abstract class IgxActionStripToken {
public abstract cdr: ChangeDetectorRef
public abstract context: any;
public abstract menuOverlaySettings: OverlaySettings;
public abstract actionButtons: QueryList<IgxActionStripActionsToken>;
public abstract get hideOnRowLeave(): boolean;

public abstract show(context?: any): void;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,26 @@ describe('igxGridPinningActions #grid ', () => {
const secondToLastVisible = grid.rowList.toArray()[grid.rowList.length - 2];
expect(secondToLastVisible.key).toEqual('FAMIA');
});

it('should not hide action strip in base mode when scrollToRow is invoked', () => {
grid.pinRow('FAMIA');
fixture.detectChanges();

const pinnedRow = grid.pinnedRows[0];
actionStrip.show(pinnedRow);
fixture.detectChanges();

const pinningActions = fixture.debugElement.query(By.directive(IgxGridPinningActionsComponent))
.componentInstance as IgxGridPinningActionsComponent;
spyOn<any>(grid, 'scrollTo');

pinningActions.scrollToRow(null);
fixture.detectChanges();

expect((grid as any).scrollTo).toHaveBeenCalledWith(pinnedRow.data, 0);
expect(actionStrip.hidden).toBeFalse();
expect(actionStrip.context).toBe(pinnedRow);
Comment thread
IMinchev64 marked this conversation as resolved.
});
Comment thread
IMinchev64 marked this conversation as resolved.
});

describe('Menu ', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,10 @@ export 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();
}
}

private registerSVGIcons(): void {
Expand Down
34 changes: 30 additions & 4 deletions projects/igniteui-angular/grids/grid/src/grid-base.directive.ts
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ import { IgxGridRowComponent } from './grid-row.component';
import { IgxGridGroupByAreaComponent } from './grouping/grid-group-by-area.component';
import { IgxPaginatorToken, type IgxPaginatorComponent } from 'igniteui-angular/paginator';
import { IgxSnackbarComponent } from 'igniteui-angular/snackbar';
import { CharSeparatedValueData, DropPosition, FilterMode, getUUID, GridCellMergeMode, GridKeydownTargetType, GridPagingMode, GridSelectionMode, GridSelectionRange, GridServiceType, GridSummaryPosition, GridType, GridValidationTrigger, IActiveNode, IActiveNodeChangeEventArgs, ICellPosition, IClipboardOptions, IColumnMovingEndEventArgs, IColumnMovingEventArgs, IColumnMovingStartEventArgs, IColumnResizeEventArgs, IColumnsAutoGeneratedEventArgs, IColumnSelectionEventArgs, IColumnVisibilityChangedEventArgs, IColumnVisibilityChangingEventArgs, IFilteringEventArgs, IGridCellEventArgs, IGridClipboardEvent, IGridContextMenuEventArgs, IGridEditDoneEventArgs, IGridEditEventArgs, IGridFormGroupCreatedEventArgs, IGridKeydownEventArgs, IGridRowEventArgs, IGridScrollEventArgs, IGridToolbarExportEventArgs, IGridValidationStatusEventArgs, IGX_GRID_SERVICE_BASE, IgxAdvancedFilteringDialogComponent, IgxCell, IgxColumnComponent, IgxColumnGroupComponent, IgxColumnResizingService, IgxDragIndicatorIconDirective, IgxEditRow, IgxExcelStyleHeaderIconDirective, IgxExcelStyleLoadingValuesTemplateDirective, IgxFilteringService, IgxGridBodyDirective, IgxGridCellComponent, IgxGridColumnResizerComponent, IgxGridEmptyTemplateContext, IgxGridEmptyTemplateDirective, IgxGridExcelStyleFilteringComponent, IgxGridFilteringCellComponent, IgxGridFilteringRowComponent, IgxGridHeaderComponent, IgxGridHeaderGroupComponent, IgxGridHeaderRowComponent, IgxGridHeaderTemplateContext, IgxGridLoadingTemplateDirective, IgxGridNavigationService, IgxGridRowDragGhostContext, IgxGridRowEditActionsTemplateContext, IgxGridRowEditTemplateContext, IgxGridRowEditTextTemplateContext, IgxGridRowTemplateContext, IgxGridSelectionService, IgxGridSummaryService, IgxGridTemplateContext, IgxGridToolbarComponent, IgxGridTransaction, IgxGridValidationService, IgxHeaderCollapsedIndicatorDirective, IgxHeaderExpandedIndicatorDirective, IgxHeadSelectorDirective, IgxHeadSelectorTemplateContext, IgxRowAddTextDirective, IgxRowCollapsedIndicatorDirective, IgxRowDirective, IgxRowDragGhostDirective, IgxRowEditActionsDirective, IgxRowEditTabStopDirective, IgxRowEditTemplateDirective, IgxRowEditTextDirective, IgxRowExpandedIndicatorDirective, IgxRowSelectorDirective, IgxRowSelectorTemplateContext, IgxSortAscendingHeaderIconDirective, IgxSortDescendingHeaderIconDirective, IgxSortHeaderIconDirective, IgxSummaryRowComponent, IgxToolbarToken, IPinColumnCancellableEventArgs, IPinColumnEventArgs, IPinningConfig, IPinRowEventArgs, IRowDataCancelableEventArgs, IRowDataEventArgs, IRowDragEndEventArgs, IRowDragStartEventArgs, IRowSelectionEventArgs, IRowToggleEventArgs, ISearchInfo, ISizeInfo, ISortingEventArgs, RowEditPositionStrategy, RowPinningPosition, RowType, WatchChanges } from 'igniteui-angular/grids/core';
import { CharSeparatedValueData, DropPosition, FilterMode, getUUID, GridCellMergeMode, GridKeydownTargetType, GridPagingMode, GridSelectionMode, GridSelectionRange, GridServiceType, GridSummaryPosition, GridType, GridValidationTrigger, IActiveNode, IActiveNodeChangeEventArgs, ICellPosition, IClipboardOptions, IColumnMovingEndEventArgs, IColumnMovingEventArgs, IColumnMovingStartEventArgs, IColumnResizeEventArgs, IColumnsAutoGeneratedEventArgs, IColumnSelectionEventArgs, IColumnVisibilityChangedEventArgs, IColumnVisibilityChangingEventArgs, IFilteringEventArgs, IGridCellEventArgs, IGridClipboardEvent, IGridContextMenuEventArgs, IGridEditDoneEventArgs, IGridEditEventArgs, IGridFormGroupCreatedEventArgs, IGridKeydownEventArgs, IGridRowEventArgs, IGridScrollEventArgs, IGridToolbarExportEventArgs, IGridValidationStatusEventArgs, IGX_GRID_SERVICE_BASE, IgxAdvancedFilteringDialogComponent, IgxCell, IgxColumnComponent, IgxColumnGroupComponent, IgxColumnResizingService, IgxDragIndicatorIconDirective, IgxEditRow, IgxExcelStyleHeaderIconDirective, IgxExcelStyleLoadingValuesTemplateDirective, IgxFilteringService, IgxGridBodyDirective, IgxGridCellComponent, IgxGridColumnResizerComponent, IgxGridEmptyTemplateContext, IgxGridEmptyTemplateDirective, IgxGridExcelStyleFilteringComponent, IgxGridFilteringCellComponent, IgxGridFilteringRowComponent, IgxGridHeaderComponent, IgxGridHeaderGroupComponent, IgxGridHeaderRowComponent, IgxGridHeaderTemplateContext, IgxGridLoadingTemplateDirective, IgxGridNavigationService, IgxGridPinningActionsComponent, IgxGridRowDragGhostContext, IgxGridRowEditActionsTemplateContext, IgxGridRowEditTemplateContext, IgxGridRowEditTextTemplateContext, IgxGridRowTemplateContext, IgxGridSelectionService, IgxGridSummaryService, IgxGridTemplateContext, IgxGridToolbarComponent, IgxGridTransaction, IgxGridValidationService, IgxHeaderCollapsedIndicatorDirective, IgxHeaderExpandedIndicatorDirective, IgxHeadSelectorDirective, IgxHeadSelectorTemplateContext, IgxRowAddTextDirective, IgxRowCollapsedIndicatorDirective, IgxRowDirective, IgxRowDragGhostDirective, IgxRowEditActionsDirective, IgxRowEditTabStopDirective, IgxRowEditTemplateDirective, IgxRowEditTextDirective, IgxRowExpandedIndicatorDirective, IgxRowSelectorDirective, IgxRowSelectorTemplateContext, IgxSortAscendingHeaderIconDirective, IgxSortDescendingHeaderIconDirective, IgxSortHeaderIconDirective, IgxSummaryRowComponent, IgxToolbarToken, IPinColumnCancellableEventArgs, IPinColumnEventArgs, IPinningConfig, IPinRowEventArgs, IRowDataCancelableEventArgs, IRowDataEventArgs, IRowDragEndEventArgs, IRowDragStartEventArgs, IRowSelectionEventArgs, IRowToggleEventArgs, ISearchInfo, ISizeInfo, ISortingEventArgs, RowEditPositionStrategy, RowPinningPosition, RowType, WatchChanges } from 'igniteui-angular/grids/core';
import { getCurrentI18n, getNumberFormatter, IResourceChangeEventArgs, } from 'igniteui-i18n-core';
import { I18N_FORMATTER } from 'igniteui-angular/core';

Expand Down Expand Up @@ -7805,9 +7805,18 @@ export abstract class IgxGridBaseDirective implements GridType,
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 as HTMLElement;
const keepActionStrip =
!!context?.pinned &&
!!contextEl?.isConnected &&
!this.hasMenuPinningActions();

if (!keepActionStrip) {
if (this.actionStrip) {
this.actionStrip.hide();
this.actionStrip.context = null;
}
}
const args: IGridScrollEventArgs = {
direction: 'vertical',
Expand All @@ -7817,6 +7826,23 @@ export abstract class IgxGridBaseDirective implements GridType,
this.gridScroll.emit(args);
}

protected hasMenuPinningActions(): boolean {
const strip = this.actionStrip;
const actionButtons = strip?.actionButtons;

if (!actionButtons?.length) {
return false;
}

return actionButtons
.toArray()
.some(
(button) =>
button instanceof IgxGridPinningActionsComponent &&
button.asMenuItems
);
}

protected horizontalScrollHandler(event) {
const scrollLeft = event.target.scrollLeft;
this.headerContainer.onHScroll(scrollLeft);
Expand Down
Loading