@@ -96,6 +96,7 @@ import {
9696import { IgcTrialWatermark } from 'igniteui-trial-watermark' ;
9797import { Subject , pipe , fromEvent , animationFrameScheduler , merge , BehaviorSubject , timer } from 'rxjs' ;
9898import { takeUntil , first , filter , throttleTime , map , shareReplay , takeWhile , throttle , take , switchMap } from 'rxjs/operators' ;
99+ import { IgxActionStripComponent } from 'igniteui-angular/action-strip' ;
99100import {
100101 IgxToggleDirective ,
101102 IForOfDataChangeEventArgs ,
@@ -108,7 +109,7 @@ import { IgxGridRowComponent } from './grid-row.component';
108109import { IgxGridGroupByAreaComponent } from './grouping/grid-group-by-area.component' ;
109110import { IgxPaginatorToken , type IgxPaginatorComponent } from 'igniteui-angular/paginator' ;
110111import { IgxSnackbarComponent } from 'igniteui-angular/snackbar' ;
111- 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' ;
112+ 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' ;
112113import { getCurrentI18n , getNumberFormatter , IResourceChangeEventArgs , } from 'igniteui-i18n-core' ;
113114import { I18N_FORMATTER } from 'igniteui-angular/core' ;
114115
@@ -7798,7 +7799,7 @@ export abstract class IgxGridBaseDirective implements GridType,
77987799 const keepActionStrip =
77997800 ! ! context ?. pinned &&
78007801 ! ! contextEl ?. isConnected &&
7801- ! ( this . actionStrip ?. menuItems ?. length > 0 ) ;
7802+ ! this . hasMenuPinningActions ( ) ;
78027803
78037804 if ( ! keepActionStrip ) {
78047805 if ( this . actionStrip ) {
@@ -7814,6 +7815,22 @@ export abstract class IgxGridBaseDirective implements GridType,
78147815 this . gridScroll . emit ( args ) ;
78157816 }
78167817
7818+ protected hasMenuPinningActions ( ) : boolean {
7819+ const strip = this . actionStrip as IgxActionStripComponent ;
7820+ if ( ! strip ?. actionButtons ?. length ) {
7821+ return false ;
7822+ }
7823+
7824+ let hasMenuPinningActions = false ;
7825+ strip . actionButtons . forEach ( ( button ) => {
7826+ if ( button instanceof IgxGridPinningActionsComponent && button . asMenuItems ) {
7827+ hasMenuPinningActions = true ;
7828+ }
7829+ } ) ;
7830+
7831+ return hasMenuPinningActions ;
7832+ }
7833+
78177834 protected horizontalScrollHandler ( event ) {
78187835 const scrollLeft = event . target . scrollLeft ;
78197836 this . headerContainer . onHScroll ( scrollLeft ) ;
0 commit comments