@gravitee/ui-particles-angular 7.16.1-fix-ps-6a2ed04 → 7.17.0

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

@@ -2979,27 +2979,8 @@ class GioFormJsonSchemaComponent {
             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
-            ?.pipe(takeUntil(this.unsubscribe$), map(() => parentControl?.touched), filter(touched => touched === true), distinctUntilChanged())
-            .subscribe(() => {
-            if (this.isDisabled) {
-                return;
-            }
-            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();
-        });
-    }
-    ngAfterViewInit() {
         // Subscribe to state changes to manage touches, status and value
-        this.stateChanges$.pipe(takeUntil(this.unsubscribe$)).subscribe(() => {
+        this.stateChanges$.pipe(takeUntil(this.unsubscribe$), debounceTime(100)).subscribe(() => {
             const { status, value, touched } = this.formGroup;
             if (this.isDisabled) {
                 return;
@@ -3022,6 +3003,25 @@ class GioFormJsonSchemaComponent {
             this.ngControl?.control?.updateValueAndValidity({ emitEvent: false });
             this.changeDetectorRef.detectChanges();
         });
+        // 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
+            ?.pipe(takeUntil(this.unsubscribe$), map(() => parentControl?.touched), filter(touched => touched === true), distinctUntilChanged())
+            .subscribe(() => {
+            if (this.isDisabled) {
+                return;
+            }
+            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$))
+            .subscribe(() => {
+            this.stateChanges$.next();
+        });
+    }
+    ngAfterViewInit() {
         this.stateChanges$.next();
     }
     ngOnDestroy() {