mn-angular-lib 1.0.25 → 1.0.27

package/fesm2022/mn-angular-lib.mjs

@@ -2719,7 +2719,8 @@ class MnSelect {
         this.destroyRef.onDestroy(() => sub.unsubscribe());
     }
     writeValue(val) {
-        this.selectedValue = val ?? null;
+        // Treat empty string as null so the placeholder is shown and the control stays properly invalid
+        this.selectedValue = (val === '' || val == null) ? null : val;
     }
     registerOnChange(fn) {
         this.onChange = fn;
@@ -4393,6 +4394,8 @@ class MnFormBodyComponent {
     formErrors = {};
     /** Track which fields are currently visible (for conditional fields) */
     fieldVisibility = {};
+    /** Track which fields are currently conditionally required */
+    fieldConditionallyRequired = {};
     /** Track loading state per field for async data sources */
     fieldLoading = {};
     /** Dynamic options loaded from data sources */
@@ -4411,6 +4414,12 @@ class MnFormBodyComponent {
         return val;
     }
     hasRequiredValidator(field) {
+        // Check if conditionallyRequired is currently active
+        if (field.conditionallyRequired) {
+            const formValue = this.form?.value ?? {};
+            if (field.conditionallyRequired(formValue))
+                return true;
+        }
         const validators = field.validators;
         if (!validators)
             return false;
@@ -4635,10 +4644,11 @@ class MnFormBodyComponent {
     // Feature 1: Conditional/Dynamic Fields
     // =========================
     initializeVisibility() {
+        const formValue = this.form.value;
         this.config.fields.forEach(field => {
             const key = field.key;
             const fieldAny = field;
-            const isVisible = fieldAny.visible ? fieldAny.visible(this.form.value) : true;
+            const isVisible = fieldAny.visible ? fieldAny.visible(formValue) : true;
             this.fieldVisibility[key] = isVisible;
             // If initially hidden, clear validators so they don't block submit
             if (!isVisible) {
@@ -4648,6 +4658,19 @@ class MnFormBodyComponent {
                     control.updateValueAndValidity({ emitEvent: false });
                 }
             }
+            else if (fieldAny.conditionallyRequired) {
+                // Initialize conditionallyRequired state for visible fields
+                const isRequired = fieldAny.conditionallyRequired(formValue);
+                this.fieldConditionallyRequired[key] = isRequired;
+                if (isRequired) {
+                    const control = this.form.get(key);
+                    if (control) {
+                        const validators = this.buildValidators(fieldAny, formValue);
+                        control.setValidators(validators);
+                        control.updateValueAndValidity({ emitEvent: false });
+                    }
+                }
+            }
         });
     }
     updateVisibility() {
@@ -4666,14 +4689,54 @@ class MnFormBodyComponent {
                     control.updateValueAndValidity({ emitEvent: false });
                 }
                 else if (isVisible && !wasVisible) {
-                    // Restore validators
-                    const validators = fieldAny.validators || [];
+                    // Restore validators (including conditionallyRequired if active)
+                    const validators = this.buildValidators(fieldAny, formValue);
                     control.setValidators(validators);
                     control.updateValueAndValidity({ emitEvent: false });
                 }
+                else if (isVisible) {
+                    // Update conditionallyRequired for visible fields
+                    this.updateConditionallyRequired(fieldAny, formValue);
+                }
             }
         });
     }
+    /**
+     * Builds the full validator array for a field, including conditionallyRequired.
+     * @param fieldAny The field configuration.
+     * @param formValue The current form values.
+     * @returns Array of validators to apply.
+     */
+    buildValidators(fieldAny, formValue) {
+        const baseValidators = fieldAny.validators ? [...fieldAny.validators] : [];
+        if (fieldAny.conditionallyRequired && fieldAny.conditionallyRequired(formValue)) {
+            if (!baseValidators.includes(Validators.required)) {
+                baseValidators.push(Validators.required);
+            }
+        }
+        return baseValidators;
+    }
+    /**
+     * Updates the conditionallyRequired state for a single field and adjusts validators.
+     * @param fieldAny The field configuration.
+     * @param formValue The current form values.
+     */
+    updateConditionallyRequired(fieldAny, formValue) {
+        if (!fieldAny.conditionallyRequired)
+            return;
+        const key = fieldAny.key;
+        const wasRequired = this.fieldConditionallyRequired[key] ?? false;
+        const isRequired = fieldAny.conditionallyRequired(formValue);
+        this.fieldConditionallyRequired[key] = isRequired;
+        if (isRequired !== wasRequired) {
+            const control = this.form.get(key);
+            if (control) {
+                const validators = this.buildValidators(fieldAny, formValue);
+                control.setValidators(validators);
+                control.updateValueAndValidity({ emitEvent: false });
+            }
+        }
+    }
     isFieldVisible(field) {
         return this.fieldVisibility[field.key];
     }