shirkasoft-ui-components 1.0.10 → 1.0.11

package/fesm2022/shirkasoft-ui-components.mjs

@@ -1095,7 +1095,7 @@ class ModalService {
     modalStack = computed(() => this.stackSignal(), ...(ngDevMode ? [{ debugName: "modalStack" }] : /* istanbul ignore next */ []));
     currentModal = computed(() => {
         const stack = this.stackSignal();
-        return stack.length > 0 ? stack[stack.length - 0] : null;
+        return stack.length > 0 ? stack[stack.length - 1] : null;
     }, ...(ngDevMode ? [{ debugName: "currentModal" }] : /* istanbul ignore next */ []));
     closeRequest = computed(() => this.closeRequestSignal(), ...(ngDevMode ? [{ debugName: "closeRequest" }] : /* istanbul ignore next */ []));
     open(config) {
@@ -1136,6 +1136,7 @@ class ModalComponent {
     destroyRef = inject(DestroyRef);
     modalSrv = inject(ModalService);
     transloco = inject(TranslocoService);
+    cdr = inject(ChangeDetectorRef);
     container = viewChild('dynamicContent', { ...(ngDevMode ? { debugName: "container" } : /* istanbul ignore next */ {}), read: ViewContainerRef });
     currentConfig = signal(null, ...(ngDevMode ? [{ debugName: "currentConfig" }] : /* istanbul ignore next */ []));
     title = signal('', ...(ngDevMode ? [{ debugName: "title" }] : /* istanbul ignore next */ []));
@@ -1161,15 +1162,17 @@ class ModalComponent {
                 this.title.set(config.title);
                 this.isExpanded.set(false);
                 this.visible.set(true);
+                this.isProcessing.set(false);
+                this.loading.set(false);
+                this.cdr.markForCheck();
                 setTimeout(() => {
                     untracked(() => this.loadComponent(config));
                 });
-                this.isProcessing.set(false);
-                this.loading.set(false);
             }
             else {
                 this.visible.set(false);
                 this.currentConfig.set(null);
+                this.cdr.markForCheck();
             }
         });
         this.destroyRef.onDestroy(() => this.cleanup());
@@ -1179,6 +1182,7 @@ class ModalComponent {
         if (!show) {
             this.closeModal();
         }
+        this.cdr.markForCheck();
     }
     loadComponent(config) {
         const containerRef = this.container();
@@ -1193,10 +1197,14 @@ class ModalComponent {
             });
         }
         const instance = this.componentRef.instance;
-        this.subscribeToOutput(instance.formValid, (valid) => this.isFormValid.set(valid));
+        this.subscribeToOutput(instance.formValid, (valid) => {
+            this.isFormValid.set(valid);
+            this.cdr.markForCheck();
+        });
         this.subscribeToOutput(instance.submitSuccess, () => this.handleSubmit(true));
         this.subscribeToOutput(instance.submitError, () => this.handleSubmit(false));
         this.componentRef.changeDetectorRef.markForCheck();
+        this.cdr.markForCheck();
     }
     subscribeToOutput(output, callback) {
         if (output?.subscribe) {
@@ -1206,6 +1214,7 @@ class ModalComponent {
     handleSubmit(success) {
         this.isProcessing.set(false);
         this.loading.set(false);
+        this.cdr.markForCheck();
         if (success) {
             untracked(() => this.modalSrv.accept());
         }
@@ -1223,6 +1232,7 @@ class ModalComponent {
         if (this.isExpanded()) {
             this.isExpanded.set(false);
         }
+        this.cdr.markForCheck();
         setTimeout(() => {
             this.cleanup();
             this.modalSrv.close();
@@ -1230,6 +1240,7 @@ class ModalComponent {
     }
     toggleExpand() {
         this.isExpanded.update((v) => !v);
+        this.cdr.markForCheck();
     }
     onAccept() {
         if (!this.componentRef || !this.isDynamicComponent(this.componentRef.instance))
@@ -1241,6 +1252,7 @@ class ModalComponent {
         if (form) {
             this.markAllAsTouched(form);
             this.componentRef.changeDetectorRef.markForCheck();
+            this.cdr.markForCheck();
             if (this.hasRealErrors(form)) {
                 this.notificationSrv.addNotification(this.transloco.translate('modal.formInvalid'), 'warning');
                 return;
@@ -1248,6 +1260,7 @@ class ModalComponent {
         }
         this.isProcessing.set(true);
         this.loading.set(true);
+        this.cdr.markForCheck();
         instance.onSubmit();
     }
     getForm(instance) {