@sumaris-net/ngx-components 1.23.31 → 1.23.33

package/fesm2015/sumaris-net.ngx-components.js

@@ -3851,10 +3851,14 @@ class AppNullForm {
         this.error = null;
         this.enabled = false;
         this.loading = false;
+        this.touched = false;
     }
     get disabled() {
         return !this.enabled;
     }
+    get untouched() {
+        return !this.touched;
+    }
     disable(opts) { }
     enable(opts) { }
     markAsPristine(opts) { }
@@ -3914,6 +3918,12 @@ class AppFormProvider {
     get loading() {
         return this.delegate.loading;
     }
+    get touched() {
+        return this.delegate.touched;
+    }
+    get untouched() {
+        return this.delegate.untouched;
+    }
     ready() {
         return this.delegate.ready();
     }
@@ -17732,6 +17742,10 @@ class AppForm {
     get empty() {
         return !this.form || (!this.form.dirty && !this.form.touched);
     }
+    get touched() {
+        var _a;
+        return ((_a = this.form) === null || _a === void 0 ? void 0 : _a.touched) || false;
+    }
     get untouched() {
         return !this.form || this.form.untouched;
     }
@@ -22975,6 +22989,7 @@ class AppTable {
         this.readySubject = new BehaviorSubject(false);
         this.loadingSubject = new BehaviorSubject(true);
         this.savingSubject = new BehaviorSubject(false);
+        this.touchedSubject = new BehaviorSubject(false);
         this.dirtySubject = new BehaviorSubject(false);
         this.errorSubject = new BehaviorSubject(undefined);
         this.selection = new SelectionModel(true, []);
@@ -23078,6 +23093,12 @@ class AppTable {
         var _a;
         return this.editedRow && this.editedRow.editing ? (_a = this.editedRow.validator) === null || _a === void 0 ? void 0 : _a.pending : false;
     }
+    get touched() {
+        return this.touchedSubject.value;
+    }
+    get untouched() {
+        return !this.touchedSubject.value;
+    }
     disable(opts) {
         if (this.sort)
             this.sort.disabled = true;
@@ -23121,18 +23142,24 @@ class AppTable {
     }
     markAsUntouched(opts) {
         var _a;
-        if (this.dirtySubject.value !== false || (this.editedRow && this.editedRow.id !== this.previouslyEditedRowId)) {
+        let needEmitEvent = false;
+        if (this.touchedSubject.value) {
+            this.touchedSubject.next(false);
+            needEmitEvent = true;
+        }
+        if (this.dirty || (this.editedRow && this.editedRow.id !== this.previouslyEditedRowId)) {
             // Cancel the current editing row only if editing and if it was not previously saved
-            this.dirtySubject.next(false);
             if ((_a = this.editedRow) === null || _a === void 0 ? void 0 : _a.editing) {
                 this.dataSource.cancelOrDelete(this.editedRow);
+                // Mark row as pristine
+                this.checkIfRowPristine(this.editedRow, { emitEvent: false });
             }
             this.editedRow = null;
-            if (!opts || opts.emitEvent !== false) {
-                this.markForCheck();
-            }
+            needEmitEvent = true;
         }
         this.previouslyEditedRowId = undefined;
+        if (needEmitEvent && (!opts || opts.emitEvent !== false))
+            this.markForCheck();
     }
     /**
      * @deprecated prefer to use markAllAsTouched()
@@ -23150,11 +23177,13 @@ class AppTable {
     }
     markAllAsTouched(opts) {
         var _a, _b;
+        if (this.touchedSubject.value !== true) {
+            this.touchedSubject.next(true);
+            if (!opts || opts.emitEvent !== false)
+                this.markForCheck();
+        }
         if ((_a = this.editedRow) === null || _a === void 0 ? void 0 : _a.editing) {
             (_b = this.editedRow.validator) === null || _b === void 0 ? void 0 : _b.markAllAsTouched();
-            if (!opts || opts.emitEvent !== false) {
-                this.markForCheck();
-            }
         }
     }
     markAsSaving(opts) {
@@ -24600,6 +24629,7 @@ class AppEditor {
         this.loadingSubject = new BehaviorSubject(true);
         this.errorSubject = new BehaviorSubject(undefined);
         this.savingSubject = new BehaviorSubject(false);
+        this.touchedSubject = new BehaviorSubject(false);
         this.debug = false;
         this.submitted = false;
         this.toolbar = null;
@@ -24667,6 +24697,12 @@ class AppEditor {
     get loading() {
         return this.loadingSubject.value || (this._children && this._children.findIndex(c => c.enabled && c.loading) !== -1) || false;
     }
+    get touched() {
+        return this.touchedSubject.value || (this._children && this._children.findIndex(c => c.enabled && c.touched) !== -1) || false;
+    }
+    get untouched() {
+        return !this.touchedSubject.value && (!this._children || this._children.findIndex(c => c.enabled && c.touched) === -1) || false;
+    }
     get enabled() {
         return this._enabled;
     }
@@ -24746,6 +24782,9 @@ class AppEditor {
     }
     markAsUntouched(opts) {
         var _a;
+        if (this.touchedSubject.value !== false) {
+            this.touchedSubject.next(false);
+        }
         (_a = this._children) === null || _a === void 0 ? void 0 : _a.forEach(c => c.markAsUntouched());
         if (!this.loading && (!opts || opts.emitEvent !== false))
             this.markForCheck();
@@ -24756,12 +24795,18 @@ class AppEditor {
      */
     markAsTouched(opts) {
         var _a;
+        if (!this.touchedSubject.value !== true) {
+            this.touchedSubject.next(true);
+        }
         (_a = this._children) === null || _a === void 0 ? void 0 : _a.forEach(c => c.markAsTouched(opts));
         if (!this.loading && (!opts || opts.emitEvent !== false))
             this.markForCheck();
     }
     markAllAsTouched(opts) {
         var _a;
+        if (this.touchedSubject.value !== true) {
+            this.touchedSubject.next(true);
+        }
         (_a = this._children) === null || _a === void 0 ? void 0 : _a.forEach(c => c.markAllAsTouched(opts));
         if (!this.loading && (!opts || opts.emitEvent !== false))
             this.markForCheck();