@sumaris-net/ngx-components 0.27.3 → 0.27.7

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

@@ -19032,8 +19032,8 @@
             var _this = this;
             this.error = null;
             this._enable = false;
+            this._$ready = new rxjs.BehaviorSubject(false);
             this._loading = true;
-            this._ready = true;
             this.i18nFieldPrefix = null;
             this._subscription = new rxjs.Subscription();
             this.debug = false;
@@ -19154,6 +19154,7 @@
             this.onCancel.unsubscribe();
             this.onSubmit.complete();
             this.onSubmit.unsubscribe();
+            this._$ready.complete();
         };
         AppForm.prototype.cancel = function () {
             this.onCancel.emit();
@@ -19245,10 +19246,12 @@
             }
         };
         AppForm.prototype.markAsReady = function (opts) {
-            if (!this._ready) {
-                this._ready = true;
-                if (!opts || opts.emitEvent !== false)
-                    this.markForCheck();
+            if (!this._$ready.value) {
+                this._$ready.next(true);
+                // If subclasses implements OnReady
+                if (typeof this['ngOnReady'] === 'function') {
+                    this.ngOnReady();
+                }
             }
         };
         /**
@@ -19256,8 +19259,7 @@
          * @param opts
          */
         AppForm.prototype.ready = function (opts) {
-            var _this = this;
-            return waitFor(function () { return _this._ready; }, opts);
+            return firstTruePromise(this._$ready);
         };
         /**
          * Wait form is idle (not loading)
@@ -25498,8 +25500,6 @@
             var _a;
             (_a = this._children) === null || _a === void 0 ? void 0 : _a.forEach(function (c) { return c.markAsReady(opts); });
             this._$ready.next(true);
-            if (!this.loading && (!opts || opts.emitEvent !== false))
-                this.markForCheck();
         };
         AppEditor.prototype.ready = function (opts) {
             return firstTruePromise(this._$ready);
@@ -26188,13 +26188,16 @@
                             opts = Object.assign({ updateRoute: this._autoUpdateRoute && idChanged && !this.loading, openTabIndex: this._autoOpenNextTab && idChanged && isNil(this.previousDataId) && this.computeNextTabIndex() }, opts);
                             this.data = data;
                             this.previousDataId = data.id || null;
-                            promiseOrVoid = this.setValue(data);
-                            if (!promiseOrVoid) return [3 /*break*/, 2];
-                            return [4 /*yield*/, promiseOrVoid];
+                            return [4 /*yield*/, this.ready()];
                         case 1:
                             _b.sent();
-                            _b.label = 2;
+                            promiseOrVoid = this.setValue(data);
+                            if (!promiseOrVoid) return [3 /*break*/, 3];
+                            return [4 /*yield*/, promiseOrVoid];
                         case 2:
+                            _b.sent();
+                            _b.label = 3;
+                        case 3:
                             if (!opts || opts.emitEvent !== false) {
                                 this.markAsPristine();
                                 this.markAsUntouched();