@sumaris-net/ngx-components 18.22.8 → 18.22.10

package/fesm2022/sumaris-net.ngx-components.mjs

@@ -38321,7 +38321,8 @@ class AppTable {
             }
             if (this.debug)
                 console.debug('[table] Calling dataSource.watchAll()...');
-            return this._dataSource.watchAll(this.pageOffset, this.pageSize, this.sortActive, this.sortDirection, this._filter)
+            return this._dataSource
+                .watchAll(this.pageOffset, this.pageSize, this.sortActive, this.sortDirection, this._filter)
                 .pipe(takeUntil(this.onRefresh));
         }), catchError((err) => {
             if (this.debug)
@@ -38441,58 +38442,79 @@ class AppTable {
             this.applyFilter(filter, opts);
         }
     }
-    async confirmAndAdd(event, row) {
+    async confirmAndAdd(event, row, opts) {
         if (!this.confirmEditCreate(event, row)) {
+            // If pending: Wait end of validation, then loop
+            if (row.validator?.pending) {
+                return (AppFormUtils.waitWhilePending(row.validator, { stop: this.destroySubject })
+                    // Loop after validation completed
+                    .then(() => this.confirmAndAdd(event, row, opts)));
+            }
+            // Go back to focusColumn
+            if (opts?.focusColumn) {
+                this.focusColumn = opts?.focusColumn;
+                this.markForCheck();
+            }
             return false;
         }
         // Add row
-        return this.addRow(event);
+        return this.addRow(event, undefined /* insertAt: use default */, opts);
     }
-    confirmAndBackward(event, row) {
-        // Deleting edited row, if empty and not dirty
+    confirmAndBackward(event, row, opts) {
+        if (!this.inlineEdition)
+            return false;
         const previousRow = this.editedRow;
+        const focusColumn = opts?.focusColumn ?? this.lastUserColumn;
         event?.stopPropagation();
+        // Deleting edited row, if empty and not dirty
         if (previousRow) {
             // Previous row was a nex row AND invalid: delete it
             if (previousRow.id === -1 && previousRow.validator?.invalid && !previousRow.validator?.dirty) {
                 this.deleteNewRow(event, previousRow);
                 // Wait deletion is done, then edit previous row (by id, because of reloading)
-                this.waitIdle().then(() => this.editRowById(event, row.id, { focusColumn: this.lastUserColumn }));
+                this.waitIdle().then(() => this.editRowById(event, row.id, { focusColumn }));
                 return true;
             }
             // If cannot confirm previous row
             else if (!this.confirmEditCreate(event, previousRow)) {
                 // If pending: Wait end of validation, then loop
                 if (previousRow.validator?.pending) {
-                    return AppFormUtils.waitWhilePending(previousRow.validator).then(() => this.confirmAndBackward(event, row));
+                    return (AppFormUtils.waitWhilePending(previousRow.validator, { stop: this.destroySubject })
+                        // Wait end of validation and loop
+                        .then(() => this.confirmAndBackward(event, row, { focusColumn })));
                 }
                 // Go back to first column
-                this.focusColumn = this.lastUserColumn;
+                this.focusColumn = focusColumn;
                 this.markForCheck();
                 return false;
             }
         }
         // Edit row, focusing at the end
-        this.editRow(event, row, { focusColumn: this.lastUserColumn });
+        this.editRow(event, row, { focusColumn });
         return true;
     }
-    confirmAndForward(event, row) {
+    confirmAndForward(event, row, opts) {
         if (!this.inlineEdition)
             return false;
         row = row || this.editedRow;
+        const focusColumn = opts?.focusColumn ?? this.firstUserColumn;
         event?.stopPropagation();
+        // If not confirmed
         if (!this.confirmEditCreate(event, row)) {
             // If pending: Wait end of validation, then loop
             if (row.validator?.pending) {
-                return AppFormUtils.waitWhilePending(row.validator).then(() => this.confirmAndForward(event, row));
+                return (AppFormUtils.waitWhilePending(row.validator, { stop: this.destroySubject })
+                    // Wait end of validation and loop
+                    .then(() => this.confirmAndForward(event, row, { focusColumn })));
             }
             // Go back to first column
-            this.focusColumn = this.firstUserColumn;
+            this.focusColumn = focusColumn;
             this.markForCheck();
             return false;
         }
         // Edit next row
-        this.editRowById(event, row.id + 1, { focusColumn: this.firstUserColumn });
+        const nextRowId = row.id + 1;
+        this.editRowById(event, nextRowId, { focusColumn });
         return true;
     }
     /**
@@ -38527,7 +38549,9 @@ class AppTable {
             // If pending: Wait end of validation, then loop
             // TODO: remove when using async isValid() function
             if (row.validator.pending) {
-                AppFormUtils.waitWhilePending(row.validator).then(() => this.confirmEditCreate(event, row));
+                AppFormUtils.waitWhilePending(row.validator)
+                    // Wait end of validation and loop
+                    .then(() => this.confirmEditCreate(event, row));
                 return false;
             }
             // NOT confirmed = row has error
@@ -39012,7 +39036,7 @@ class AppTable {
         if (!confirmed)
             return false;
         if (!row.editing && !this.loading) {
-            this.focusColumn = (opts && opts.focusColumn) || this.focusColumn;
+            this.focusColumn = opts?.focusColumn ?? this.focusColumn;
             this._dataSource.startEdit(row);
         }
         this.editedRow = row;
@@ -41257,14 +41281,20 @@ class AppAsyncTable {
             this.applyFilter(filter, opts);
         }
     }
-    async confirmAndAdd(event, row) {
+    async confirmAndAdd(event, row, opts) {
         if (!(await this.confirmEditCreate(event, row))) {
+            // Go back to focusColumn
+            if (opts?.focusColumn) {
+                this.focusColumn = opts?.focusColumn;
+                this.markForCheck();
+            }
             return false;
         }
         // Add row
-        return this.addRow(event);
+        return this.addRow(event, undefined /* insertAt: use default */, opts);
     }
-    async confirmAndBackward(event, row) {
+    async confirmAndBackward(event, row, opts) {
+        const focusColumn = opts?.focusColumn ?? this.lastUserColumn;
         // Deleting edited row, if empty and not dirty
         if (this.dataSource.hasSomeEditingRow()) {
             for (const editingRow of this.dataSource.getEditingRows().filter((row) => row.id === -1 && row.invalid && !row.dirty)) {
@@ -41272,21 +41302,27 @@ class AppAsyncTable {
             }
             // Wait deletion is done, then edit previous row (by id, because of reloading)
             await this.waitIdle();
-            await this.editRowById(event, row.id, { focusColumn: this.lastUserColumn });
+            await this.editRowById(event, row.id, { focusColumn });
             return true;
         }
         // Edit row, focusing at the end
-        await this.editRow(event, row, { focusColumn: this.lastUserColumn });
+        await this.editRow(event, row, { focusColumn });
         return true;
     }
-    async confirmAndForward(event, row) {
+    async confirmAndForward(event, row, opts) {
         if (!this.inlineEdition)
             return false;
+        const focusColumn = opts?.focusColumn ?? this.firstUserColumn;
         const confirmed = await this.confirmEditCreate(event, row);
-        if (!confirmed)
-            return false; // Not confirmed
+        // If not confirmed
+        if (!confirmed) {
+            // Go back to first column
+            this.focusColumn = focusColumn;
+            this.markForCheck();
+            return false;
+        }
         // Edit next row
-        await this.editRowById(event, row.id + 1, { focusColumn: this.firstUserColumn });
+        await this.editRowById(event, row.id + 1, { focusColumn });
         return true;
     }
     /**
@@ -41789,7 +41825,7 @@ class AppAsyncTable {
             return false;
         }
         if (!row.editing && !this.loading) {
-            this.focusColumn = (opts && opts.focusColumn) || this.focusColumn;
+            this.focusColumn = opts?.focusColumn ?? this.focusColumn;
             await this._dataSource.startEdit(row);
         }
         this.onStartEditingRow.emit(row);