From fb856561e4cf102f05682351a56211cadb911fae Mon Sep 17 00:00:00 2001
From: yigitfindikli <yigitfindikli@gmail.com>
Date: Tue, 19 Jan 2021 13:55:50 +0300
Subject: [PATCH] Fixed #9621 - Add frozenexpansion template to TurboTable

---
 src/app/components/table/table.ts                | 16 +++++++++++++++-
 src/app/showcase/components/table/tabledemo.html |  8 ++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/src/app/components/table/table.ts b/src/app/components/table/table.ts
index 6c3a1e2abb7..84dd885da5b 100755
--- a/src/app/components/table/table.ts
+++ b/src/app/components/table/table.ts
@@ -342,6 +342,8 @@ export class Table implements OnInit, AfterViewInit, AfterContentInit, Blockable
 
     expandedRowTemplate: TemplateRef<any>;
 
+    frozenExpandedRowTemplate: TemplateRef<any>;
+
     frozenHeaderTemplate: TemplateRef<any>;
 
     frozenBodyTemplate: TemplateRef<any>;
@@ -491,6 +493,10 @@ export class Table implements OnInit, AfterViewInit, AfterContentInit, Blockable
                     this.frozenColGroupTemplate = item.template;
                 break;
 
+                case 'frozenrowexpansion':
+                    this.frozenExpandedRowTemplate = item.template;
+                break;
+
                 case 'emptymessage':
                     this.emptyMessageTemplate = item.template;
                 break;
@@ -2222,7 +2228,7 @@ export class Table implements OnInit, AfterViewInit, AfterContentInit, Blockable
                 <ng-container *ngTemplateOutlet="rowData ? template: dt.loadingBodyTemplate; context: {$implicit: rowData, rowIndex: dt.paginator ? (dt.first + rowIndex) : rowIndex, columns: columns, editing: (dt.editMode === 'row' && dt.isRowEditing(rowData))}"></ng-container>
             </ng-template>
         </ng-container>
-        <ng-container *ngIf="dt.expandedRowTemplate">
+        <ng-container *ngIf="dt.expandedRowTemplate && !(frozen && dt.frozenExpandedRowTemplate)">
             <ng-template ngFor let-rowData let-rowIndex="index" [ngForOf]="(dt.paginator && !dt.lazy) ? ((dt.filteredValue||dt.value) | slice:dt.first:(dt.first + dt.rows)) : (dt.filteredValue||dt.value)" [ngForTrackBy]="dt.rowTrackBy">
                 <ng-container *ngTemplateOutlet="template; context: {$implicit: rowData, rowIndex: dt.paginator ? (dt.first + rowIndex) : rowIndex, columns: columns, expanded: dt.isRowExpanded(rowData), editing: (dt.editMode === 'row' && dt.isRowEditing(rowData))}"></ng-container>
                 <ng-container *ngIf="dt.isRowExpanded(rowData)">
@@ -2230,6 +2236,14 @@ export class Table implements OnInit, AfterViewInit, AfterContentInit, Blockable
                 </ng-container>
             </ng-template>
         </ng-container>
+        <ng-container *ngIf="dt.frozenExpandedRowTemplate && frozen">
+            <ng-template ngFor let-rowData let-rowIndex="index" [ngForOf]="(dt.paginator && !dt.lazy) ? ((dt.filteredValue||dt.value) | slice:dt.first:(dt.first + dt.rows)) : (dt.filteredValue||dt.value)" [ngForTrackBy]="dt.rowTrackBy">
+                <ng-container *ngTemplateOutlet="template; context: {$implicit: rowData, rowIndex: dt.paginator ? (dt.first + rowIndex) : rowIndex, columns: columns, expanded: dt.isRowExpanded(rowData), editing: (dt.editMode === 'row' && dt.isRowEditing(rowData))}"></ng-container>
+                <ng-container *ngIf="dt.isRowExpanded(rowData)">
+                    <ng-container *ngTemplateOutlet="dt.frozenExpandedRowTemplate; context: {$implicit: rowData, rowIndex: dt.paginator ? (dt.first + rowIndex) : rowIndex, columns: columns}"></ng-container>
+                </ng-container>
+            </ng-template>
+        </ng-container>
         <ng-container *ngIf="dt.loading">
             <ng-container *ngTemplateOutlet="dt.loadingBodyTemplate; context: {$implicit: columns, frozen: frozen}"></ng-container>
         </ng-container>
diff --git a/src/app/showcase/components/table/tabledemo.html b/src/app/showcase/components/table/tabledemo.html
index cd31210b40a..f27bf403f34 100755
--- a/src/app/showcase/components/table/tabledemo.html
+++ b/src/app/showcase/components/table/tabledemo.html
@@ -412,6 +412,14 @@ <h3>Templates</h3>
                             <td>$implicit: Columns</td>
                             <td>ColGroup element of the table to customize frozen columns.</td>
                         </tr>
+                        <tr>
+                            <td>frozenrowexpansion</td>
+                            <td>$implicit: Data of the row <br>
+                                rowIndex: Index of the row <br>
+                                columns: Columns collection <br>
+                            </td>
+                            <td>Content of an extended row in frozen side.</td>
+                        </tr>
                         <tr>
                             <td>emptymessage</td>
                             <td>$implicit: Columns <br />