From 5ac7a0dce5a5496875ba7e3a74af34552fe5565f Mon Sep 17 00:00:00 2001
From: MKirova <MKirova@DEV-MKIROVA>
Date: Mon, 16 Jun 2025 11:42:00 +0300
Subject: [PATCH 1/7] fix(action-strip): Assign parent to not destroy on DOM
 move.

---
 .../igniteui-angular-elements/src/app/custom-strategy.ts   | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/projects/igniteui-angular-elements/src/app/custom-strategy.ts b/projects/igniteui-angular-elements/src/app/custom-strategy.ts
index 0784e3abf83..4981a53b6bb 100644
--- a/projects/igniteui-angular-elements/src/app/custom-strategy.ts
+++ b/projects/igniteui-angular-elements/src/app/custom-strategy.ts
@@ -119,6 +119,13 @@ class IgxCustomNgElementStrategy extends ComponentNgElementStrategy {
             // ngElementStrategy getter is protected and also has initialization logic, though that should be safe at this point
             if (parent?.ngElementStrategy) {
                 this.angularParent = parent.ngElementStrategy.angularParent;
+
+                // action strip is reused in row island child grid
+                // assign parent so it's not destroyed on detach/attach.
+                if (element.tagName.toLocaleLowerCase() === 'igc-action-strip') {
+                    this.angularParent = (parent.ngElementStrategy as any).componentRef;
+                }
+
                 this.parentElement = new WeakRef(parent);
                 let parentComponentRef = await parent?.ngElementStrategy[ComponentRefKey];
                 parentInjector = parentComponentRef?.injector;

From 01683e7f05c1f1209580ec68e25661fd688657d3 Mon Sep 17 00:00:00 2001
From: MKirova <MKirova@DEV-MKIROVA>
Date: Mon, 16 Jun 2025 12:05:54 +0300
Subject: [PATCH 2/7] chore(*): Move strip handling after parentComponentRef is
 populated.

---
 .../src/app/custom-strategy.ts                       | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/projects/igniteui-angular-elements/src/app/custom-strategy.ts b/projects/igniteui-angular-elements/src/app/custom-strategy.ts
index 4981a53b6bb..76a49dae49b 100644
--- a/projects/igniteui-angular-elements/src/app/custom-strategy.ts
+++ b/projects/igniteui-angular-elements/src/app/custom-strategy.ts
@@ -120,12 +120,6 @@ class IgxCustomNgElementStrategy extends ComponentNgElementStrategy {
             if (parent?.ngElementStrategy) {
                 this.angularParent = parent.ngElementStrategy.angularParent;
 
-                // action strip is reused in row island child grid
-                // assign parent so it's not destroyed on detach/attach.
-                if (element.tagName.toLocaleLowerCase() === 'igc-action-strip') {
-                    this.angularParent = (parent.ngElementStrategy as any).componentRef;
-                }
-
                 this.parentElement = new WeakRef(parent);
                 let parentComponentRef = await parent?.ngElementStrategy[ComponentRefKey];
                 parentInjector = parentComponentRef?.injector;
@@ -138,6 +132,12 @@ class IgxCustomNgElementStrategy extends ComponentNgElementStrategy {
                     parentComponentRef = await parent?.ngElementStrategy[ComponentRefKey];
                     parentAnchor = parentComponentRef?.instance.anchor;
                 }
+
+                // action strip is reused for all rows
+                // assign parent so it's not destroyed on detach/attach.
+                if (element.tagName.toLocaleLowerCase() === 'igc-action-strip' || configParent.selector === 'igc-action-strip') {
+                    this.angularParent = parentComponentRef;
+                }
             } else if ((parent as any)?.__componentRef) {
                 this.angularParent = (parent as any).__componentRef;
                 parentInjector = this.angularParent.injector;

From fbd17854bcd22b91507a3a9b3408b2230e0d9569 Mon Sep 17 00:00:00 2001
From: MKirova <MKirova@DEV-MKIROVA>
Date: Fri, 20 Jun 2025 15:02:24 +0300
Subject: [PATCH 3/7] fix(action-strip): Fix timing issues.

---
 .../igniteui-angular-elements/src/app/custom-strategy.ts    | 6 ------
 .../src/lib/action-strip/action-strip.component.ts          | 3 +++
 .../grid-actions/grid-editing-actions.component.ts          | 2 +-
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/projects/igniteui-angular-elements/src/app/custom-strategy.ts b/projects/igniteui-angular-elements/src/app/custom-strategy.ts
index 76a49dae49b..a80dd5094f7 100644
--- a/projects/igniteui-angular-elements/src/app/custom-strategy.ts
+++ b/projects/igniteui-angular-elements/src/app/custom-strategy.ts
@@ -119,7 +119,6 @@ class IgxCustomNgElementStrategy extends ComponentNgElementStrategy {
             // ngElementStrategy getter is protected and also has initialization logic, though that should be safe at this point
             if (parent?.ngElementStrategy) {
                 this.angularParent = parent.ngElementStrategy.angularParent;
-
                 this.parentElement = new WeakRef(parent);
                 let parentComponentRef = await parent?.ngElementStrategy[ComponentRefKey];
                 parentInjector = parentComponentRef?.injector;
@@ -133,11 +132,6 @@ class IgxCustomNgElementStrategy extends ComponentNgElementStrategy {
                     parentAnchor = parentComponentRef?.instance.anchor;
                 }
 
-                // action strip is reused for all rows
-                // assign parent so it's not destroyed on detach/attach.
-                if (element.tagName.toLocaleLowerCase() === 'igc-action-strip' || configParent.selector === 'igc-action-strip') {
-                    this.angularParent = parentComponentRef;
-                }
             } else if ((parent as any)?.__componentRef) {
                 this.angularParent = (parent as any).__componentRef;
                 parentInjector = this.angularParent.injector;
diff --git a/projects/igniteui-angular/src/lib/action-strip/action-strip.component.ts b/projects/igniteui-angular/src/lib/action-strip/action-strip.component.ts
index ff848fa4846..21e63daa469 100644
--- a/projects/igniteui-angular/src/lib/action-strip/action-strip.component.ts
+++ b/projects/igniteui-angular/src/lib/action-strip/action-strip.component.ts
@@ -279,6 +279,9 @@ export class IgxActionStripComponent implements IgxActionStripToken, AfterConten
      * ```
      */
     public show(context?: any): void {
+        if(!this._originalParent) {
+            this._originalParent = this._viewContainer.element.nativeElement?.parentElement;
+        }
         this.hidden = false;
         if (!context) {
             return;
diff --git a/projects/igniteui-angular/src/lib/action-strip/grid-actions/grid-editing-actions.component.ts b/projects/igniteui-angular/src/lib/action-strip/grid-actions/grid-editing-actions.component.ts
index e48ec8745f2..0f35205cb54 100644
--- a/projects/igniteui-angular/src/lib/action-strip/grid-actions/grid-editing-actions.component.ts
+++ b/projects/igniteui-angular/src/lib/action-strip/grid-actions/grid-editing-actions.component.ts
@@ -147,7 +147,7 @@ export class IgxGridEditingActionsComponent extends IgxGridActionsBaseDirective
         const context = this.strip.context;
         const grid = context.grid;
         grid.deleteRow(context.key);
-
+        this.grid.cdr.detectChanges();
         this.strip.hide();
     }
 

From a8642fd058bf8d5deca34266c0ee13f11696f650 Mon Sep 17 00:00:00 2001
From: MKirova <MKirova@DEV-MKIROVA>
Date: Thu, 9 Oct 2025 16:00:38 +0300
Subject: [PATCH 4/7] fix(igxGridRow): On destroy check for still shown action
 strip.

---
 .../src/lib/action-strip/action-strip.component.ts            | 3 ---
 .../grid-actions/grid-editing-actions.component.ts            | 1 -
 projects/igniteui-angular/src/lib/grids/row.directive.ts      | 4 ++++
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/projects/igniteui-angular/src/lib/action-strip/action-strip.component.ts b/projects/igniteui-angular/src/lib/action-strip/action-strip.component.ts
index 21e63daa469..ff848fa4846 100644
--- a/projects/igniteui-angular/src/lib/action-strip/action-strip.component.ts
+++ b/projects/igniteui-angular/src/lib/action-strip/action-strip.component.ts
@@ -279,9 +279,6 @@ export class IgxActionStripComponent implements IgxActionStripToken, AfterConten
      * ```
      */
     public show(context?: any): void {
-        if(!this._originalParent) {
-            this._originalParent = this._viewContainer.element.nativeElement?.parentElement;
-        }
         this.hidden = false;
         if (!context) {
             return;
diff --git a/projects/igniteui-angular/src/lib/action-strip/grid-actions/grid-editing-actions.component.ts b/projects/igniteui-angular/src/lib/action-strip/grid-actions/grid-editing-actions.component.ts
index 0f35205cb54..4207450cb45 100644
--- a/projects/igniteui-angular/src/lib/action-strip/grid-actions/grid-editing-actions.component.ts
+++ b/projects/igniteui-angular/src/lib/action-strip/grid-actions/grid-editing-actions.component.ts
@@ -147,7 +147,6 @@ export class IgxGridEditingActionsComponent extends IgxGridActionsBaseDirective
         const context = this.strip.context;
         const grid = context.grid;
         grid.deleteRow(context.key);
-        this.grid.cdr.detectChanges();
         this.strip.hide();
     }
 
diff --git a/projects/igniteui-angular/src/lib/grids/row.directive.ts b/projects/igniteui-angular/src/lib/grids/row.directive.ts
index 81a0bced344..4752e1ce936 100644
--- a/projects/igniteui-angular/src/lib/grids/row.directive.ts
+++ b/projects/igniteui-angular/src/lib/grids/row.directive.ts
@@ -492,6 +492,10 @@ export class IgxRowDirective implements DoCheck, AfterViewInit, OnDestroy {
      * @internal
      */
     public ngOnDestroy() {
+        // if action strip is shown here but row is about to be destroyed, hide it.
+        if (this.grid.actionStrip && this.grid.actionStrip.context === this) {
+            this.grid.actionStrip.hide();
+        }
         this.destroy$.next(true);
         this.destroy$.complete();
     }

From ec11d6d6ac7091b70837fec0863cebeecf1c9f68 Mon Sep 17 00:00:00 2001
From: Damyan Petev <damyanpetev@users.noreply.github.com>
Date: Fri, 10 Oct 2025 13:40:49 +0300
Subject: [PATCH 5/7] chore(action-strip,elements): minor new lines formatting

---
 projects/igniteui-angular-elements/src/app/custom-strategy.ts    | 1 -
 .../action-strip/grid-actions/grid-editing-actions.component.ts  | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/projects/igniteui-angular-elements/src/app/custom-strategy.ts b/projects/igniteui-angular-elements/src/app/custom-strategy.ts
index a80dd5094f7..0784e3abf83 100644
--- a/projects/igniteui-angular-elements/src/app/custom-strategy.ts
+++ b/projects/igniteui-angular-elements/src/app/custom-strategy.ts
@@ -131,7 +131,6 @@ class IgxCustomNgElementStrategy extends ComponentNgElementStrategy {
                     parentComponentRef = await parent?.ngElementStrategy[ComponentRefKey];
                     parentAnchor = parentComponentRef?.instance.anchor;
                 }
-
             } else if ((parent as any)?.__componentRef) {
                 this.angularParent = (parent as any).__componentRef;
                 parentInjector = this.angularParent.injector;
diff --git a/projects/igniteui-angular/src/lib/action-strip/grid-actions/grid-editing-actions.component.ts b/projects/igniteui-angular/src/lib/action-strip/grid-actions/grid-editing-actions.component.ts
index 4207450cb45..e48ec8745f2 100644
--- a/projects/igniteui-angular/src/lib/action-strip/grid-actions/grid-editing-actions.component.ts
+++ b/projects/igniteui-angular/src/lib/action-strip/grid-actions/grid-editing-actions.component.ts
@@ -147,6 +147,7 @@ export class IgxGridEditingActionsComponent extends IgxGridActionsBaseDirective
         const context = this.strip.context;
         const grid = context.grid;
         grid.deleteRow(context.key);
+
         this.strip.hide();
     }
 

From 72018413a5a78aaf6fb32eb0d30b4b6c35dd7878 Mon Sep 17 00:00:00 2001
From: MKirova <MKirova@DEV-MKIROVA>
Date: Mon, 13 Oct 2025 17:57:18 +0300
Subject: [PATCH 6/7] fix(igxGrid): On detach also check for still shown action
 strip.

---
 .../igniteui-angular/src/lib/grids/grid-base.directive.ts   | 6 ++++++
 .../igniteui-angular/src/lib/grids/grid/grid.component.html | 1 +
 .../hierarchical-grid/hierarchical-grid.component.html      | 2 +-
 .../src/lib/grids/tree-grid/tree-grid.component.html        | 1 +
 4 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/projects/igniteui-angular/src/lib/grids/grid-base.directive.ts b/projects/igniteui-angular/src/lib/grids/grid-base.directive.ts
index fdd88ba2794..7818fbbf012 100644
--- a/projects/igniteui-angular/src/lib/grids/grid-base.directive.ts
+++ b/projects/igniteui-angular/src/lib/grids/grid-base.directive.ts
@@ -6438,6 +6438,12 @@ export abstract class IgxGridBaseDirective implements GridType,
         }
     }
 
+    protected viewDetachHandler(args) {
+        if (this.actionStrip && args.view.rootNodes.find(x => x === this.actionStrip.context.element.nativeElement)) {
+            this.actionStrip.hide();
+        }
+    }
+
     /**
      * @hidden @internal
      */
diff --git a/projects/igniteui-angular/src/lib/grids/grid/grid.component.html b/projects/igniteui-angular/src/lib/grids/grid/grid.component.html
index 9631c1bd71a..95887b56f24 100644
--- a/projects/igniteui-angular/src/lib/grids/grid/grid.component.html
+++ b/projects/igniteui-angular/src/lib/grids/grid/grid.component.html
@@ -107,6 +107,7 @@
                 [igxTemplateOutletContext]="getContext(rowData, rowIndex)"
                 (cachedViewLoaded)="cachedViewLoaded($event)"
                 (viewCreated)="viewCreatedHandler($event)"
+                (beforeViewDetach)="viewDetachHandler($event)"
                 (viewMoved)="viewMovedHandler($event)">
             </ng-template>
         </ng-template>
diff --git a/projects/igniteui-angular/src/lib/grids/hierarchical-grid/hierarchical-grid.component.html b/projects/igniteui-angular/src/lib/grids/hierarchical-grid/hierarchical-grid.component.html
index 276e89cb377..95659846e36 100644
--- a/projects/igniteui-angular/src/lib/grids/hierarchical-grid/hierarchical-grid.component.html
+++ b/projects/igniteui-angular/src/lib/grids/hierarchical-grid/hierarchical-grid.component.html
@@ -83,7 +83,7 @@
             <ng-template
                 [igxTemplateOutlet]="(isHierarchicalRecord(rowData) ? hierarchical_record_template : (isChildGridRecord(rowData) ? child_record_template : hierarchical_record_template))"
                 [igxTemplateOutletContext]="getContext(rowData, rowIndex, false)" (viewCreated)="viewCreatedHandler($event)"
-                (viewMoved)="viewMovedHandler($event)" (cachedViewLoaded)="cachedViewLoaded($event)">
+                (viewMoved)="viewMovedHandler($event)" (cachedViewLoaded)="cachedViewLoaded($event)" (beforeViewDetach)="viewDetachHandler($event)">
             </ng-template>
             <!-- <ng-container *igxTemplateOutlet="(isHierarchicalRecord(rowData) ? hierarchical_record_template : (isChildGridRecord(rowData) && isExpanded(rowData) ? child_record_template : hierarchical_record_template)); context: getContext(rowData)"></ng-container> -->
         </ng-template>
diff --git a/projects/igniteui-angular/src/lib/grids/tree-grid/tree-grid.component.html b/projects/igniteui-angular/src/lib/grids/tree-grid/tree-grid.component.html
index 33c79416332..e43960b4bbb 100644
--- a/projects/igniteui-angular/src/lib/grids/tree-grid/tree-grid.component.html
+++ b/projects/igniteui-angular/src/lib/grids/tree-grid/tree-grid.component.html
@@ -88,6 +88,7 @@
             (dataChanging)="dataRebinding($event)" (dataChanged)="dataRebound($event)">
             <ng-template [igxTemplateOutlet]='isSummaryRow(rowData) ? summary_template : record_template'
                 [igxTemplateOutletContext]='getContext(rowData, rowIndex, false)'
+                (beforeViewDetach)="viewDetachHandler($event)"
                 (cachedViewLoaded)='cachedViewLoaded($event)'>
             </ng-template>
         </ng-template>

From f18b2f46fe0ea5e6525c4abea1ffd0a103618d05 Mon Sep 17 00:00:00 2001
From: MKirova <MKirova@DEV-MKIROVA>
Date: Mon, 13 Oct 2025 18:07:30 +0300
Subject: [PATCH 7/7] chore(*): Add null check.

---
 projects/igniteui-angular/src/lib/grids/grid-base.directive.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/projects/igniteui-angular/src/lib/grids/grid-base.directive.ts b/projects/igniteui-angular/src/lib/grids/grid-base.directive.ts
index 7818fbbf012..43e842cf87a 100644
--- a/projects/igniteui-angular/src/lib/grids/grid-base.directive.ts
+++ b/projects/igniteui-angular/src/lib/grids/grid-base.directive.ts
@@ -6439,7 +6439,7 @@ export abstract class IgxGridBaseDirective implements GridType,
     }
 
     protected viewDetachHandler(args) {
-        if (this.actionStrip && args.view.rootNodes.find(x => x === this.actionStrip.context.element.nativeElement)) {
+        if (this.actionStrip && args.view.rootNodes.find(x => x === this.actionStrip.context?.element.nativeElement)) {
             this.actionStrip.hide();
         }
     }