fix(addon-table): don't update direction order when updating sorter p…

…rogrammatically (#3196)
taiga-family · Dec 9, 2022 · 0197d56 · 0197d56
1 parent 2aca218
commit 0197d56
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 10 deletions.
diff --git a/projects/addon-table/components/table/directives/table.directive.ts b/projects/addon-table/components/table/directives/table.directive.ts
@@ -63,21 +63,28 @@ export class TuiTableDirective<
     @tuiDefaultProp()
     sorter: TuiComparator<T> = () => 0;
 
-    updateSorter(sorter: TuiComparator<T> | null): void {
+    updateSorterAndDirection(sorter: TuiComparator<T> | null): void {
         if (this.sorter === sorter) {
-            this.direction = this.direction === 1 ? -1 : 1;
-            this.directionChange.emit(this.direction);
+            this.updateDirection(this.direction === 1 ? -1 : 1);
         } else {
-            this.sorter = sorter || (() => 0);
-            this.sorterChange.emit(this.sorter);
-            this.direction = 1;
-            this.directionChange.emit(1);
+            this.updateSorter(sorter);
+            this.updateDirection(1);
         }
-
-        this.change$.next();
     }
 
     ngAfterViewInit(): void {
         this.changeDetectorRef.detectChanges();
     }
+
+    updateSorter(sorter: TuiComparator<T> | null): void {
+        this.sorter = sorter || (() => 0);
+        this.sorterChange.emit(this.sorter);
+        this.change$.next();
+    }
+
+    private updateDirection(direction: -1 | 1): void {
+        this.direction = direction;
+        this.directionChange.emit(this.direction);
+        this.change$.next();
+    }
 }
diff --git a/projects/addon-table/components/table/directives/test/direction-order.directive.spec.ts b/projects/addon-table/components/table/directives/test/direction-order.directive.spec.ts
@@ -65,5 +65,11 @@ describe(`TuiDirectionOrder directive`, () => {
 
             expect(testComponent.directionOrderChange).toHaveBeenCalledWith(`desc`);
         });
+
+        it(`should not emit directionChange when updating sorter programmatically`, () => {
+            testComponent.table.updateSorter(() => -1);
+
+            expect(testComponent.directionOrderChange).not.toHaveBeenCalled();
+        });
     });
 });
diff --git a/projects/addon-table/components/table/th/th.template.html b/projects/addon-table/components/table/th/th.template.html
@@ -3,7 +3,7 @@
     type="button"
     class="t-sort"
     [class.t-sort_sorted]="isCurrent"
-    (click)="table.updateSorter(sorter)"
+    (click)="table.updateSorterAndDirection(sorter)"
 >
     <ng-container [ngTemplateOutlet]="content"></ng-container>
     {{ table.change$ | async }}