@3kles/kles-material-dynamicforms 14.0.11 → 14.0.13

package/fesm2020/3kles-kles-material-dynamicforms.mjs

@@ -1006,6 +1006,7 @@ let KlesFormSelectComponent = class KlesFormSelectComponent extends KlesFieldAbs
         this.viewRef = viewRef;
         this.ref = ref;
         this.isLoading = false;
+        this.openChange$ = new Subject();
         this.compareFn = (o1, o2) => {
             if (this.field.property && o1 && o2) {
                 return o1[this.field.property] === o2[this.field.property];
@@ -1016,12 +1017,34 @@ let KlesFormSelectComponent = class KlesFormSelectComponent extends KlesFieldAbs
     ngOnInit() {
         super.ngOnInit();
         if (this.field.lazy) {
+            this.isLoading = true;
             if (this.field.value) {
                 this.options$ = new BehaviorSubject(Array.isArray(this.field.value) ? this.field.value : [this.field.value]);
+                this.isLoading = false;
             }
             else {
                 this.options$ = new BehaviorSubject([]);
             }
+            this.openChange$
+                .pipe(takeUntil(this._onDestroy), switchMap((isOpen) => {
+                if (isOpen) {
+                    if (!(this.field.options instanceof Observable)) {
+                        return of(this.field.options);
+                    }
+                    else {
+                        this.isLoading = true;
+                        return this.field.options.pipe(take(1));
+                    }
+                }
+                else {
+                    return of(this.group.controls[this.field.name].value !== undefined ? [this.group.controls[this.field.name].value] : []);
+                }
+            }))
+                .subscribe((options) => {
+                this.options$.next(options);
+                this.isLoading = false;
+                this.ref.markForCheck();
+            });
         }
         else {
             if (!(this.field.options instanceof Observable)) {
@@ -1037,19 +1060,24 @@ let KlesFormSelectComponent = class KlesFormSelectComponent extends KlesFieldAbs
     }
     openChange($event) {
         if (this.field.lazy) {
-            if ($event) {
-                if (!(this.field.options instanceof Observable)) {
-                    this.options$.next(this.field.options);
-                }
-                else {
-                    this.isLoading = true;
-                    this.field.options.pipe(take(1)).subscribe(options => {
-                        this.options$.next(options);
-                        this.isLoading = false;
-                        this.ref.markForCheck();
-                    });
-                }
-            }
+            this.openChange$.next($event);
+            // if ($event) {
+            //     if (!(this.field.options instanceof Observable)) {
+            //         (this.options$ as BehaviorSubject<any[]>).next(this.field.options);
+            //     } else {
+            //         this.isLoading = true;
+            //         this.field.options.pipe(take(1)).subscribe(options => {
+            //             (this.options$ as BehaviorSubject<any[]>).next(options);
+            //             this.isLoading = false;
+            //             this.ref.markForCheck();
+            //         });
+            //     }
+            // } else {
+            //     (this.options$ as BehaviorSubject<any[]>)
+            //         .next(this.group.controls[this.field.name].value !== undefined ? [this.group.controls[this.field.name].value] : []);
+            //     this.ref.markForCheck();
+            //     // this.isLoading = true;
+            // }
         }
         if (this.field.virtualScroll) {
             if ($event) {
@@ -2232,6 +2260,7 @@ class KlesFormSelectSearchComponent extends KlesFieldAbstract {
         this.selectAllControl = new UntypedFormControl(false);
         this.isLoading = false;
         this.optionsFiltered$ = new ReplaySubject(1);
+        this.openChange$ = new Subject();
         this.compareFn = (o1, o2) => {
             if (this.field.property && o1 && o2) {
                 return o1[this.field.property] === o2[this.field.property];
@@ -2242,12 +2271,34 @@ class KlesFormSelectSearchComponent extends KlesFieldAbstract {
     ngOnInit() {
         super.ngOnInit();
         if (this.field.lazy) {
+            this.isLoading = true;
             if (this.field.value) {
                 this.options$ = new BehaviorSubject(Array.isArray(this.field.value) ? this.field.value : [this.field.value]);
+                this.isLoading = false;
             }
             else {
                 this.options$ = new BehaviorSubject([]);
             }
+            this.openChange$
+                .pipe(takeUntil(this._onDestroy), switchMap((isOpen) => {
+                if (isOpen) {
+                    if (!(this.field.options instanceof Observable)) {
+                        return of(this.field.options);
+                    }
+                    else {
+                        this.isLoading = true;
+                        return this.field.options.pipe(take(1));
+                    }
+                }
+                else {
+                    return of(this.group.controls[this.field.name].value !== undefined ? [this.group.controls[this.field.name].value] : []);
+                }
+            }))
+                .subscribe((options) => {
+                this.options$.next(options);
+                this.isLoading = false;
+                this.ref.markForCheck();
+            });
         }
         else {
             if (!(this.field.options instanceof Observable)) {
@@ -2320,19 +2371,7 @@ class KlesFormSelectSearchComponent extends KlesFieldAbstract {
     }
     openChange($event) {
         if (this.field.lazy) {
-            if ($event) {
-                if (!(this.field.options instanceof Observable)) {
-                    this.options$.next(this.field.options);
-                }
-                else {
-                    this.isLoading = true;
-                    this.field.options.pipe(take(1)).subscribe(options => {
-                        this.options$.next(options);
-                        this.isLoading = false;
-                        this.ref.markForCheck();
-                    });
-                }
-            }
+            this.openChange$.next($event);
         }
         if (this.field.virtualScroll) {
             if ($event) {