@sumaris-net/ngx-components 1.23.30 → 1.23.32

package/bundles/sumaris-net.ngx-components.umd.js

@@ -4347,6 +4347,7 @@
             this.error = null;
             this.enabled = false;
             this.loading = false;
+            this.touched = false;
         }
         Object.defineProperty(AppNullForm.prototype, "disabled", {
             get: function () {
@@ -4355,6 +4356,13 @@
             enumerable: false,
             configurable: true
         });
+        Object.defineProperty(AppNullForm.prototype, "untouched", {
+            get: function () {
+                return !this.touched;
+            },
+            enumerable: false,
+            configurable: true
+        });
         AppNullForm.prototype.disable = function (opts) { };
         AppNullForm.prototype.enable = function (opts) { };
         AppNullForm.prototype.markAsPristine = function (opts) { };
@@ -4456,6 +4464,20 @@
             enumerable: false,
             configurable: true
         });
+        Object.defineProperty(AppFormProvider.prototype, "touched", {
+            get: function () {
+                return this.delegate.touched;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(AppFormProvider.prototype, "untouched", {
+            get: function () {
+                return this.delegate.untouched;
+            },
+            enumerable: false,
+            configurable: true
+        });
         AppFormProvider.prototype.ready = function () {
             return this.delegate.ready();
         };
@@ -20344,6 +20366,14 @@
             enumerable: false,
             configurable: true
         });
+        Object.defineProperty(AppForm.prototype, "touched", {
+            get: function () {
+                var _a;
+                return ((_a = this.form) === null || _a === void 0 ? void 0 : _a.touched) || false;
+            },
+            enumerable: false,
+            configurable: true
+        });
         Object.defineProperty(AppForm.prototype, "untouched", {
             get: function () {
                 return !this.form || this.form.untouched;
@@ -26573,6 +26603,7 @@
             this.readySubject = new rxjs.BehaviorSubject(false);
             this.loadingSubject = new rxjs.BehaviorSubject(true);
             this.savingSubject = new rxjs.BehaviorSubject(false);
+            this.touchedSubject = new rxjs.BehaviorSubject(false);
             this.dirtySubject = new rxjs.BehaviorSubject(false);
             this.errorSubject = new rxjs.BehaviorSubject(undefined);
             this.selection = new collections.SelectionModel(true, []);
@@ -26728,6 +26759,20 @@
             enumerable: false,
             configurable: true
         });
+        Object.defineProperty(AppTable.prototype, "touched", {
+            get: function () {
+                return this.touchedSubject.value;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(AppTable.prototype, "untouched", {
+            get: function () {
+                return !this.touchedSubject.value;
+            },
+            enumerable: false,
+            configurable: true
+        });
         AppTable.prototype.disable = function (opts) {
             if (this.sort)
                 this.sort.disabled = true;
@@ -26779,18 +26824,24 @@
         };
         AppTable.prototype.markAsUntouched = function (opts) {
             var _a;
-            if (this.dirtySubject.value !== false || (this.editedRow && this.editedRow.id !== this.previouslyEditedRowId)) {
+            var 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()
@@ -26808,11 +26859,13 @@
         };
         AppTable.prototype.markAllAsTouched = function (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();
-                }
             }
         };
         AppTable.prototype.markAsSaving = function (opts) {
@@ -28478,6 +28531,7 @@
             this.loadingSubject = new rxjs.BehaviorSubject(true);
             this.errorSubject = new rxjs.BehaviorSubject(undefined);
             this.savingSubject = new rxjs.BehaviorSubject(false);
+            this.touchedSubject = new rxjs.BehaviorSubject(false);
             this.debug = false;
             this.submitted = false;
             this.toolbar = null;
@@ -28597,6 +28651,20 @@
             enumerable: false,
             configurable: true
         });
+        Object.defineProperty(AppEditor.prototype, "touched", {
+            get: function () {
+                return this.touchedSubject.value || (this._children && this._children.findIndex(function (c) { return c.enabled && c.touched; }) !== -1) || false;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(AppEditor.prototype, "untouched", {
+            get: function () {
+                return !this.touchedSubject.value && (!this._children || this._children.findIndex(function (c) { return c.enabled && c.touched; }) === -1) || false;
+            },
+            enumerable: false,
+            configurable: true
+        });
         Object.defineProperty(AppEditor.prototype, "enabled", {
             get: function () {
                 return this._enabled;