@gravitee/ui-particles-angular 7.17.1 → 7.17.2-fix-ps-4c96f71

package/fesm2020/gravitee-ui-particles-angular.mjs

@@ -2974,11 +2974,6 @@ class GioFormJsonSchemaComponent {
         }
     }
     ngOnInit() {
-        // Invalid by default.
-        this.ngControl?.control?.addAsyncValidators(() => {
-            return this.isValid$.pipe(takeUntil(this.unsubscribe$), take(1), map(isValid => (isValid ? null : { invalid: true })));
-        });
-        this.ngControl?.control?.updateValueAndValidity({ emitEvent: false });
         // When the parent form is touched, mark all the sub formGroup as touched if not already touched
         const parentControl = this.ngControl?.control?.parent;
         parentControl?.statusChanges
@@ -2990,27 +2985,22 @@ class GioFormJsonSchemaComponent {
             this.formGroup.markAllAsTouched();
             this.stateChanges$.next();
         });
-        // Group all valueChanges events emit by formly in a single one
-        merge(this.formGroup.statusChanges, this.formGroup.valueChanges)
-            .pipe(takeUntil(this.unsubscribe$), debounceTime(100))
-            .subscribe(() => {
-            this.stateChanges$.next();
+        // Add async validator to the parent
+        this.ngControl?.control?.addAsyncValidators(() => {
+            return this.isValid$.pipe(takeUntil(this.unsubscribe$), take(1), map(isValid => (isValid ? null : { invalid: true })));
         });
-    }
-    ngAfterViewInit() {
         // Subscribe to state changes to manage touches, status and value
-        this.stateChanges$.pipe(takeUntil(this.unsubscribe$)).subscribe(() => {
+        this.stateChanges$
+            .pipe(tap(() => {
             const { status, value, touched } = this.formGroup;
             if (this.isDisabled) {
                 return;
             }
             if (status === 'VALID') {
                 this.isValid$.next(true);
-                this.ngControl?.control?.setErrors(null);
             }
             if (status === 'INVALID') {
                 this.isValid$.next(false);
-                this.ngControl?.control?.setErrors({ invalid: true });
             }
             if (touched && !this.touched) {
                 this._onTouched();
@@ -3019,8 +3009,21 @@ class GioFormJsonSchemaComponent {
             if (this.touched) {
                 this._onChange(value);
             }
-            this.ngControl?.control?.updateValueAndValidity({ emitEvent: false });
+        }), delay(0), 
+        // Keep at the end
+        takeUntil(this.unsubscribe$))
+            .subscribe(() => {
+            this.changeDetectorRef.markForCheck();
             this.changeDetectorRef.detectChanges();
+            this.ngControl?.control?.updateValueAndValidity();
+        });
+    }
+    ngAfterViewInit() {
+        // Group all valueChanges events emit by formly in a single one
+        merge(this.formGroup.statusChanges, this.formGroup.valueChanges)
+            .pipe(takeUntil(this.unsubscribe$), debounceTime(100))
+            .subscribe(() => {
+            this.stateChanges$.next();
         });
         this.stateChanges$.next();
     }