ui-core-abv 0.10.4 → 0.10.6

package/fesm2022/ui-core-abv.mjs

@@ -4175,6 +4175,24 @@ class UicFormStateService {
             this.formChangesSub = null;
         });
     }
+    /**
+     * Opciones de subcampos de repeater resueltas por ítem (optionsSource con dependsOn).
+     * Cada FormGroup de ítem guarda las suyas; el registro se reemplaza (inmutable) en cada cambio
+     * para que los consumidores puedan memoizar por referencia.
+     */
+    rowFieldOptions = new WeakMap();
+    rowFieldOptionsVersion = signal(0);
+    setRowFieldOptions(row, fieldName, state) {
+        const current = this.rowFieldOptions.get(row) ?? {};
+        this.rowFieldOptions.set(row, {
+            ...current,
+            [fieldName]: { ...current[fieldName], ...state }
+        });
+        this.rowFieldOptionsVersion.update(version => version + 1);
+    }
+    getRowFieldOptions(row) {
+        return this.rowFieldOptions.get(row);
+    }
     getFieldValue(fieldName) {
         if (!this.currentForm)
             return undefined;
@@ -4189,6 +4207,8 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.14", ngImpo
 
 class UicRepeaterComponent {
     fb = inject(FormBuilder);
+    formState = inject(UicFormStateService, { optional: true });
+    itemFieldsCache = new WeakMap();
     formArray;
     field;
     cols = 2;
@@ -4210,6 +4230,31 @@ class UicRepeaterComponent {
             }
         }
     }
+    /**
+     * Subcampos del ítem con las opciones resueltas para ese ítem (optionsSource con dependsOn).
+     * Se memoiza por referencia para no recrear los FormField en cada ciclo de detección.
+     */
+    getItemFields(control) {
+        const base = this.field.repeaterFields ?? [];
+        this.formState?.rowFieldOptionsVersion();
+        const row = control;
+        const state = this.formState?.getRowFieldOptions(row);
+        const cached = this.itemFieldsCache.get(row);
+        if (cached && cached.base === base && cached.state === state)
+            return cached.fields;
+        const fields = !state ? base : base.map(subField => {
+            const rowState = state[subField.name];
+            if (!rowState)
+                return subField;
+            return {
+                ...subField,
+                ...(rowState.options !== undefined ? { options: rowState.options } : {}),
+                ...(rowState.loading !== undefined ? { loading: rowState.loading } : {})
+            };
+        });
+        this.itemFieldsCache.set(row, { base, state, fields });
+        return fields;
+    }
     getGroup(index) {
         return this.formArray.at(index);
     }
@@ -4279,7 +4324,7 @@ class UicRepeaterComponent {
         }
     }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.14", ngImport: i0, type: UicRepeaterComponent, deps: [], target: i0.ɵɵFactoryTarget.Component });
-    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "19.2.14", type: UicRepeaterComponent, isStandalone: true, selector: "ui-repeater", inputs: { formArray: "formArray", field: "field", cols: "cols", error: "error", fileUidResolverFn: "fileUidResolverFn", selectOptionsResolver: "selectOptionsResolver", parentForm: "parentForm" }, ngImport: i0, template: "<div class=\"repeater-label\"> {{field.label}} </div>\r\n<div class=\"uic-repeater\" [class.disabled]=\"formArray.disabled\">\r\n  @for (group of formArray.controls; track $index) {\r\n    <div class=\"uic-repeater-item\">\r\n      <div class=\"uic-repeater-item-header\">\r\n        <div class=\"uic-repeater-item-title\">\r\n          {{ field.repeaterItemTitle || field.label || 'Item' }} {{ $index + 1 }}\r\n        </div>\r\n        @if (canRemove && !formArray.disabled) {\r\n          <ui-button \r\n            [icon]=\"'ri-delete-bin-line'\" \r\n            [type]=\"'bordered'\" \r\n            [color]=\"'red'\" \r\n            size=\"s\" \r\n            (click)=\"removeGroup($index)\"\r\n            [text]=\"field.repeaterRemoveLabel || 'Eliminar'\">\r\n          </ui-button>\r\n        }\r\n      </div>\r\n      <div class=\"uic-repeater-item-body\">\r\n        <ui-dynamic-form \r\n          [form]=\"getGroup($index)\" \r\n          [fields]=\"field.repeaterFields || []\" \r\n          [disabled]=\"formArray.disabled\"\r\n          [cols]=\"cols\"\r\n          [fileUidResolverFn]=\"fileUidResolverFn\"\r\n          [selectOptionsResolver]=\"selectOptionsResolver\"\r\n          [parentFormValues]=\"getParentFormValues()\"\r\n          [isSubForm]=\"true\">\r\n        </ui-dynamic-form>\r\n      </div>\r\n    </div>\r\n  }\r\n  \r\n  @if (canAdd && !formArray.disabled) {\r\n    <div class=\"uic-repeater-add-action\">\r\n      <ui-button \r\n        [icon]=\"'ri-add-line'\" \r\n        [type]=\"'bordered'\" \r\n        [color]=\"'primary'\" \r\n        (click)=\"addGroup()\"\r\n        [text]=\"field.repeaterAddLabel || 'A\u00F1adir'\">\r\n      </ui-button>\r\n    </div>\r\n  }\r\n  @if (error) {\r\n    <p class=\"uic-repeater-error\">{{ error }}</p>\r\n  }\r\n</div>\r\n", styles: [".uic-repeater{display:flex;flex-direction:column;gap:16px;width:100%}.uic-repeater.disabled{opacity:.7}.uic-repeater .uic-repeater-item{border:1px solid var(--primary-400, #e0e0e0);border-radius:8px;background-color:var(--uic-bg-color, #fff)}.uic-repeater .uic-repeater-item .uic-repeater-item-header{display:flex;justify-content:space-between;align-items:center;margin-bottom:5px;border-bottom:1px solid var(--primary-400);padding:5px 10px;min-height:34px}.uic-repeater .uic-repeater-item .uic-repeater-item-header .uic-repeater-item-title{margin:0;font-size:14px;font-weight:600;color:var(--primary-700)}.uic-repeater .uic-repeater-item .uic-repeater-item-body{width:100%;padding:0 12px}.uic-repeater .uic-repeater-add-action{margin-top:1px}.uic-repeater .uic-repeater-error{margin:4px 0 0;font-size:12px;color:var(--uic-red, #e53935)}.repeater-label{font-size:max(var(--form-ref) + 4px,14px);line-height:1.125rem;min-height:1.125rem;font-weight:400;color:var(--grey-950);margin-bottom:var(--input-label-space)}\n"], dependencies: [{ kind: "ngmodule", type: i0.forwardRef(() => CommonModule) }, { kind: "ngmodule", type: i0.forwardRef(() => ReactiveFormsModule) }, { kind: "component", type: i0.forwardRef(() => UicButtonComponent), selector: "ui-button", inputs: ["text", "icon", "rightIcon", "iconOnly", "disabled", "loading", "size", "type", "color"] }, { kind: "component", type: i0.forwardRef(() => UicDynamicFormComponent), selector: "ui-dynamic-form", inputs: ["fields", "isSubForm", "form", "disabled", "externalValidationStates", "voiceToTextSilenceMs", "cols", "iconMode", "fileUidResolverFn", "selectOptionsResolver", "parentFormValues"], outputs: ["fieldBlur"] }] });
+    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "19.2.14", type: UicRepeaterComponent, isStandalone: true, selector: "ui-repeater", inputs: { formArray: "formArray", field: "field", cols: "cols", error: "error", fileUidResolverFn: "fileUidResolverFn", selectOptionsResolver: "selectOptionsResolver", parentForm: "parentForm" }, ngImport: i0, template: "<div class=\"repeater-label\"> {{field.label}} </div>\r\n<div class=\"uic-repeater\" [class.disabled]=\"formArray.disabled\">\r\n  @for (group of formArray.controls; track $index) {\r\n    <div class=\"uic-repeater-item\">\r\n      <div class=\"uic-repeater-item-header\">\r\n        <div class=\"uic-repeater-item-title\">\r\n          {{ field.repeaterItemTitle || field.label || 'Item' }} {{ $index + 1 }}\r\n        </div>\r\n        @if (canRemove && !formArray.disabled) {\r\n          <ui-button \r\n            [icon]=\"'ri-delete-bin-line'\" \r\n            [type]=\"'bordered'\" \r\n            [color]=\"'red'\" \r\n            size=\"s\" \r\n            (click)=\"removeGroup($index)\"\r\n            [text]=\"field.repeaterRemoveLabel || 'Eliminar'\">\r\n          </ui-button>\r\n        }\r\n      </div>\r\n      <div class=\"uic-repeater-item-body\">\r\n        <ui-dynamic-form \r\n          [form]=\"getGroup($index)\" \r\n          [fields]=\"getItemFields(group)\" \r\n          [disabled]=\"formArray.disabled\"\r\n          [cols]=\"cols\"\r\n          [fileUidResolverFn]=\"fileUidResolverFn\"\r\n          [selectOptionsResolver]=\"selectOptionsResolver\"\r\n          [parentFormValues]=\"getParentFormValues()\"\r\n          [isSubForm]=\"true\">\r\n        </ui-dynamic-form>\r\n      </div>\r\n    </div>\r\n  }\r\n  \r\n  @if (canAdd && !formArray.disabled) {\r\n    <div class=\"uic-repeater-add-action\">\r\n      <ui-button \r\n        [icon]=\"'ri-add-line'\" \r\n        [type]=\"'bordered'\" \r\n        [color]=\"'primary'\" \r\n        (click)=\"addGroup()\"\r\n        [text]=\"field.repeaterAddLabel || 'A\u00F1adir'\">\r\n      </ui-button>\r\n    </div>\r\n  }\r\n  @if (error) {\r\n    <p class=\"uic-repeater-error\">{{ error }}</p>\r\n  }\r\n</div>\r\n", styles: [".uic-repeater{display:flex;flex-direction:column;gap:16px;width:100%}.uic-repeater.disabled{opacity:.7}.uic-repeater .uic-repeater-item{border:1px solid var(--primary-400, #e0e0e0);border-radius:8px;background-color:var(--uic-bg-color, #fff)}.uic-repeater .uic-repeater-item .uic-repeater-item-header{display:flex;justify-content:space-between;align-items:center;margin-bottom:5px;border-bottom:1px solid var(--primary-400);padding:5px 10px;min-height:34px}.uic-repeater .uic-repeater-item .uic-repeater-item-header .uic-repeater-item-title{margin:0;font-size:14px;font-weight:600;color:var(--primary-700)}.uic-repeater .uic-repeater-item .uic-repeater-item-body{width:100%;padding:0 12px}.uic-repeater .uic-repeater-add-action{margin-top:1px}.uic-repeater .uic-repeater-error{margin:4px 0 0;font-size:12px;color:var(--uic-red, #e53935)}.repeater-label{font-size:max(var(--form-ref) + 4px,14px);line-height:1.125rem;min-height:1.125rem;font-weight:400;color:var(--grey-950);margin-bottom:var(--input-label-space)}\n"], dependencies: [{ kind: "ngmodule", type: i0.forwardRef(() => CommonModule) }, { kind: "ngmodule", type: i0.forwardRef(() => ReactiveFormsModule) }, { kind: "component", type: i0.forwardRef(() => UicButtonComponent), selector: "ui-button", inputs: ["text", "icon", "rightIcon", "iconOnly", "disabled", "loading", "size", "type", "color"] }, { kind: "component", type: i0.forwardRef(() => UicDynamicFormComponent), selector: "ui-dynamic-form", inputs: ["fields", "isSubForm", "form", "disabled", "externalValidationStates", "voiceToTextSilenceMs", "cols", "iconMode", "fileUidResolverFn", "selectOptionsResolver", "parentFormValues"], outputs: ["fieldBlur"] }] });
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.14", ngImport: i0, type: UicRepeaterComponent, decorators: [{
             type: Component,
@@ -4288,7 +4333,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.14", ngImpo
                         ReactiveFormsModule,
                         UicButtonComponent,
                         forwardRef(() => UicDynamicFormComponent)
-                    ], template: "<div class=\"repeater-label\"> {{field.label}} </div>\r\n<div class=\"uic-repeater\" [class.disabled]=\"formArray.disabled\">\r\n  @for (group of formArray.controls; track $index) {\r\n    <div class=\"uic-repeater-item\">\r\n      <div class=\"uic-repeater-item-header\">\r\n        <div class=\"uic-repeater-item-title\">\r\n          {{ field.repeaterItemTitle || field.label || 'Item' }} {{ $index + 1 }}\r\n        </div>\r\n        @if (canRemove && !formArray.disabled) {\r\n          <ui-button \r\n            [icon]=\"'ri-delete-bin-line'\" \r\n            [type]=\"'bordered'\" \r\n            [color]=\"'red'\" \r\n            size=\"s\" \r\n            (click)=\"removeGroup($index)\"\r\n            [text]=\"field.repeaterRemoveLabel || 'Eliminar'\">\r\n          </ui-button>\r\n        }\r\n      </div>\r\n      <div class=\"uic-repeater-item-body\">\r\n        <ui-dynamic-form \r\n          [form]=\"getGroup($index)\" \r\n          [fields]=\"field.repeaterFields || []\" \r\n          [disabled]=\"formArray.disabled\"\r\n          [cols]=\"cols\"\r\n          [fileUidResolverFn]=\"fileUidResolverFn\"\r\n          [selectOptionsResolver]=\"selectOptionsResolver\"\r\n          [parentFormValues]=\"getParentFormValues()\"\r\n          [isSubForm]=\"true\">\r\n        </ui-dynamic-form>\r\n      </div>\r\n    </div>\r\n  }\r\n  \r\n  @if (canAdd && !formArray.disabled) {\r\n    <div class=\"uic-repeater-add-action\">\r\n      <ui-button \r\n        [icon]=\"'ri-add-line'\" \r\n        [type]=\"'bordered'\" \r\n        [color]=\"'primary'\" \r\n        (click)=\"addGroup()\"\r\n        [text]=\"field.repeaterAddLabel || 'A\u00F1adir'\">\r\n      </ui-button>\r\n    </div>\r\n  }\r\n  @if (error) {\r\n    <p class=\"uic-repeater-error\">{{ error }}</p>\r\n  }\r\n</div>\r\n", styles: [".uic-repeater{display:flex;flex-direction:column;gap:16px;width:100%}.uic-repeater.disabled{opacity:.7}.uic-repeater .uic-repeater-item{border:1px solid var(--primary-400, #e0e0e0);border-radius:8px;background-color:var(--uic-bg-color, #fff)}.uic-repeater .uic-repeater-item .uic-repeater-item-header{display:flex;justify-content:space-between;align-items:center;margin-bottom:5px;border-bottom:1px solid var(--primary-400);padding:5px 10px;min-height:34px}.uic-repeater .uic-repeater-item .uic-repeater-item-header .uic-repeater-item-title{margin:0;font-size:14px;font-weight:600;color:var(--primary-700)}.uic-repeater .uic-repeater-item .uic-repeater-item-body{width:100%;padding:0 12px}.uic-repeater .uic-repeater-add-action{margin-top:1px}.uic-repeater .uic-repeater-error{margin:4px 0 0;font-size:12px;color:var(--uic-red, #e53935)}.repeater-label{font-size:max(var(--form-ref) + 4px,14px);line-height:1.125rem;min-height:1.125rem;font-weight:400;color:var(--grey-950);margin-bottom:var(--input-label-space)}\n"] }]
+                    ], template: "<div class=\"repeater-label\"> {{field.label}} </div>\r\n<div class=\"uic-repeater\" [class.disabled]=\"formArray.disabled\">\r\n  @for (group of formArray.controls; track $index) {\r\n    <div class=\"uic-repeater-item\">\r\n      <div class=\"uic-repeater-item-header\">\r\n        <div class=\"uic-repeater-item-title\">\r\n          {{ field.repeaterItemTitle || field.label || 'Item' }} {{ $index + 1 }}\r\n        </div>\r\n        @if (canRemove && !formArray.disabled) {\r\n          <ui-button \r\n            [icon]=\"'ri-delete-bin-line'\" \r\n            [type]=\"'bordered'\" \r\n            [color]=\"'red'\" \r\n            size=\"s\" \r\n            (click)=\"removeGroup($index)\"\r\n            [text]=\"field.repeaterRemoveLabel || 'Eliminar'\">\r\n          </ui-button>\r\n        }\r\n      </div>\r\n      <div class=\"uic-repeater-item-body\">\r\n        <ui-dynamic-form \r\n          [form]=\"getGroup($index)\" \r\n          [fields]=\"getItemFields(group)\" \r\n          [disabled]=\"formArray.disabled\"\r\n          [cols]=\"cols\"\r\n          [fileUidResolverFn]=\"fileUidResolverFn\"\r\n          [selectOptionsResolver]=\"selectOptionsResolver\"\r\n          [parentFormValues]=\"getParentFormValues()\"\r\n          [isSubForm]=\"true\">\r\n        </ui-dynamic-form>\r\n      </div>\r\n    </div>\r\n  }\r\n  \r\n  @if (canAdd && !formArray.disabled) {\r\n    <div class=\"uic-repeater-add-action\">\r\n      <ui-button \r\n        [icon]=\"'ri-add-line'\" \r\n        [type]=\"'bordered'\" \r\n        [color]=\"'primary'\" \r\n        (click)=\"addGroup()\"\r\n        [text]=\"field.repeaterAddLabel || 'A\u00F1adir'\">\r\n      </ui-button>\r\n    </div>\r\n  }\r\n  @if (error) {\r\n    <p class=\"uic-repeater-error\">{{ error }}</p>\r\n  }\r\n</div>\r\n", styles: [".uic-repeater{display:flex;flex-direction:column;gap:16px;width:100%}.uic-repeater.disabled{opacity:.7}.uic-repeater .uic-repeater-item{border:1px solid var(--primary-400, #e0e0e0);border-radius:8px;background-color:var(--uic-bg-color, #fff)}.uic-repeater .uic-repeater-item .uic-repeater-item-header{display:flex;justify-content:space-between;align-items:center;margin-bottom:5px;border-bottom:1px solid var(--primary-400);padding:5px 10px;min-height:34px}.uic-repeater .uic-repeater-item .uic-repeater-item-header .uic-repeater-item-title{margin:0;font-size:14px;font-weight:600;color:var(--primary-700)}.uic-repeater .uic-repeater-item .uic-repeater-item-body{width:100%;padding:0 12px}.uic-repeater .uic-repeater-add-action{margin-top:1px}.uic-repeater .uic-repeater-error{margin:4px 0 0;font-size:12px;color:var(--uic-red, #e53935)}.repeater-label{font-size:max(var(--form-ref) + 4px,14px);line-height:1.125rem;min-height:1.125rem;font-weight:400;color:var(--grey-950);margin-bottom:var(--input-label-space)}\n"] }]
         }], propDecorators: { formArray: [{
                 type: Input,
                 args: [{ required: true }]
@@ -5055,6 +5100,9 @@ class UicFormWrapperComponent {
     formValueSub = null;
     optionSourceSubs = new Map();
     optionSourceDependencyValueByField = new Map();
+    rowOptionSourceSubs = new Map();
+    rowOptionSourceDependencyKeys = new WeakMap();
+    formState = inject(UicFormStateService);
     computedFieldSubs = new Map();
     computedFieldDependencySignatureByField = new Map();
     computedExternalValidationLastValue = new Map();
@@ -5366,12 +5414,106 @@ class UicFormWrapperComponent {
                 if (field.type !== 'repeater' || !field.repeaterFields?.length)
                     continue;
                 field.repeaterFields.forEach(subField => {
-                    if (this.hasUsableOptionsSource(subField)) {
+                    // Con dependsOn se resuelve por ítem (ver updateRowScopedSubFieldOptionsSources).
+                    if (this.hasUsableOptionsSource(subField) && !subField.optionsSource?.dependsOn) {
                         this.resolveRepeaterSubFieldOptionsSource(field, subField, force);
                     }
                 });
             }
         }
+        this.updateRowScopedSubFieldOptionsSources(force);
+    }
+    /**
+     * Subcampos con optionsSource.dependsOn: cada ítem resuelve sus propias opciones.
+     * La dependencia sigue la regla de ámbito "gana el hermano": primero el ítem, luego el raíz
+     * (las relaciones van de menor a mayor o igual ámbito, nunca raíz -> ítem).
+     */
+    updateRowScopedSubFieldOptionsSources(force = false) {
+        const activeRows = new Set();
+        for (const block of this.effectiveSchema?.blocks ?? []) {
+            for (const field of block.fields) {
+                if (field.type !== 'repeater' || !field.repeaterFields?.length)
+                    continue;
+                const dependentSubFields = field.repeaterFields.filter(subField => this.hasUsableOptionsSource(subField) && !!subField.optionsSource?.dependsOn);
+                if (!dependentSubFields.length)
+                    continue;
+                const formArray = this.form?.get(field.name);
+                if (!formArray)
+                    continue;
+                const rootValues = this.toNestedValues(this.form.getRawValue());
+                formArray.controls.forEach(control => {
+                    const row = control;
+                    activeRows.add(row);
+                    dependentSubFields.forEach(subField => this.resolveRowSubFieldOptionsSource(row, subField, rootValues, force));
+                });
+            }
+        }
+        for (const [row, subs] of this.rowOptionSourceSubs) {
+            if (activeRows.has(row))
+                continue;
+            subs.forEach(sub => sub.unsubscribe());
+            this.rowOptionSourceSubs.delete(row);
+        }
+    }
+    resolveRowSubFieldOptionsSource(row, subField, rootValues, force) {
+        const source = subField.optionsSource;
+        const dependsOn = source.dependsOn;
+        if (!this.selectOptionsResolver) {
+            this.formState.setRowFieldOptions(row, subField.name, { options: subField.options ?? [], loading: false });
+            return;
+        }
+        const rowValues = this.toNestedValues(row.getRawValue());
+        const dependencyValue = row.contains(dependsOn)
+            ? row.get([dependsOn])?.value
+            : this.getValueByPath(rootValues, dependsOn);
+        const dependencyKey = `${dependsOn}:${this.safeStringify(dependencyValue ?? null)}`;
+        let dependencyKeys = this.rowOptionSourceDependencyKeys.get(row);
+        if (!dependencyKeys) {
+            dependencyKeys = new Map();
+            this.rowOptionSourceDependencyKeys.set(row, dependencyKeys);
+        }
+        if (!force && dependencyKeys.get(subField.name) === dependencyKey)
+            return;
+        dependencyKeys.set(subField.name, dependencyKey);
+        let subs = this.rowOptionSourceSubs.get(row);
+        if (!subs) {
+            subs = new Map();
+            this.rowOptionSourceSubs.set(row, subs);
+        }
+        subs.get(subField.name)?.unsubscribe();
+        subs.delete(subField.name);
+        const control = row.get([subField.name]);
+        if (dependencyValue === null || dependencyValue === undefined || dependencyValue === '') {
+            if (control)
+                this.clearControlValue(control, subField);
+            this.formState.setRowFieldOptions(row, subField.name, { options: [], loading: false });
+            return;
+        }
+        this.formState.setRowFieldOptions(row, subField.name, { loading: true });
+        const values = { ...rootValues, ...rowValues };
+        let optionsResult;
+        try {
+            optionsResult = this.selectOptionsResolver(source, { field: subField, values, dependencyValue });
+        }
+        catch (error) {
+            this.handleRowOptionsSourceError(row, subField, source, error);
+            return;
+        }
+        const sub = this.toObservable(optionsResult).subscribe({
+            next: items => {
+                const options = this.mapOptionsSourceItems(items, source);
+                this.formState.setRowFieldOptions(row, subField.name, { options, loading: false });
+                if (control)
+                    this.clearInvalidControlValue(control, options);
+            },
+            error: (error) => this.handleRowOptionsSourceError(row, subField, source, error),
+            complete: () => this.formState.setRowFieldOptions(row, subField.name, { loading: false })
+        });
+        subs.set(subField.name, sub);
+    }
+    handleRowOptionsSourceError(row, subField, source, error) {
+        this.formState.setRowFieldOptions(row, subField.name, { options: [], loading: false });
+        this.optionsSourceError.emit({ field: subField, source, error });
     }
     resolveRepeaterSubFieldOptionsSource(parentField, subField, force = false) {
         const source = subField.optionsSource;
@@ -5443,17 +5585,8 @@ class UicFormWrapperComponent {
         this.updateDependentRepeaterSubFieldOptionsSources();
     }
     updateDependentRepeaterSubFieldOptionsSources() {
-        for (const block of this.effectiveSchema?.blocks ?? []) {
-            for (const field of block.fields) {
-                if (field.type !== 'repeater' || !field.repeaterFields?.length)
-                    continue;
-                field.repeaterFields.forEach(subField => {
-                    if (this.hasUsableOptionsSource(subField) && subField.optionsSource?.dependsOn) {
-                        this.resolveRepeaterSubFieldOptionsSource(field, subField, true);
-                    }
-                });
-            }
-        }
+        // Sin force: cada ítem solo vuelve a resolver si cambió el valor de su dependencia.
+        this.updateRowScopedSubFieldOptionsSources();
     }
     resolveOptionsSourceField(field, force = false) {
         const source = field.optionsSource;
@@ -5578,6 +5711,9 @@ class UicFormWrapperComponent {
         const control = this.getFieldControl(fieldName);
         if (!control)
             return;
+        this.clearInvalidControlValue(control, options);
+    }
+    clearInvalidControlValue(control, options) {
         const currentValue = control.value;
         if (currentValue === null || currentValue === undefined || currentValue === '')
             return;
@@ -5599,6 +5735,9 @@ class UicFormWrapperComponent {
         const control = this.getFieldControl(field.name);
         if (!control)
             return;
+        this.clearControlValue(control, field);
+    }
+    clearControlValue(control, field) {
         const blankValue = this.blankValue(field);
         if (control.value !== blankValue) {
             control.setValue(blankValue, { emitEvent: false });
@@ -5631,6 +5770,8 @@ class UicFormWrapperComponent {
         this.optionSourceSubs.forEach(sub => sub.unsubscribe());
         this.optionSourceSubs.clear();
         this.optionSourceDependencyValueByField.clear();
+        this.rowOptionSourceSubs.forEach(subs => subs.forEach(sub => sub.unsubscribe()));
+        this.rowOptionSourceSubs.clear();
     }
     clearComputedFieldSubs() {
         this.computedFieldSubs.forEach(sub => sub.unsubscribe());
@@ -7544,13 +7685,12 @@ function helperShowFormFromBuilder(blocks, cols, editable = false, schemaOptions
     };
 }
 function mapEditableBlocksToBlocks(blocks, editable) {
+    // Solo campos raíz: un campo raíz nunca depende de un subcampo (raíz -> ítem no existe),
+    // y los códigos sf_N se repiten entre repeaters, así que no pueden ir en un mapa global.
     const fieldCodeToName = new Map();
     blocks.forEach(block => {
         block.fields.forEach(field => {
             fieldCodeToName.set(field.code, field.fieldData.name);
-            field.repeaterSubFields?.forEach(sf => {
-                fieldCodeToName.set(sf.code, sf.fieldData.name);
-            });
         });
     });
     return blocks.map(block => ({
@@ -7569,9 +7709,9 @@ function mapEditableBlocksToBlocks(blocks, editable) {
                 }
                 : field.fieldData.optionsSource;
             const isComputedField = field.fieldData.type === 'computed';
-            // Los códigos sf_N se repiten entre repeaters: las reglas de un subcampo
-            // se resuelven primero contra los hermanos de su propio repeater.
+            // Referencias de un subcampo: gana el hermano del mismo repeater, luego el raíz.
             const siblingCodeToName = new Map((field.repeaterSubFields ?? []).map(sf => [sf.code, sf.fieldData.name]));
+            const resolveSubFieldRef = (code) => siblingCodeToName.get(code) ?? fieldCodeToName.get(code) ?? code;
             return {
                 ...field.fieldData,
                 type: isComputedField ? 'text' : field.fieldData.type,
@@ -7590,13 +7730,12 @@ function mapEditableBlocksToBlocks(blocks, editable) {
                             const sfIsComputed = sf.fieldData.type === 'computed';
                             const sfVisibilityRules = sf.fieldData.visibilityRules?.map(rule => ({
                                 ...rule,
-                                fieldName: siblingCodeToName.get(rule.fieldName) ?? fieldCodeToName.get(rule.fieldName) ?? rule.fieldName
+                                fieldName: resolveSubFieldRef(rule.fieldName)
                             }));
                             const sfOptionsSource = sf.fieldData.optionsSource?.dependsOn
                                 ? {
                                     ...sf.fieldData.optionsSource,
-                                    dependsOn: fieldCodeToName.get(sf.fieldData.optionsSource.dependsOn)
-                                        ?? sf.fieldData.optionsSource.dependsOn
+                                    dependsOn: resolveSubFieldRef(sf.fieldData.optionsSource.dependsOn)
                                 }
                                 : sf.fieldData.optionsSource;
                             return {
@@ -7609,7 +7748,7 @@ function mapEditableBlocksToBlocks(blocks, editable) {
                                     ? {
                                         computedSource: {
                                             key: sf.fieldData.computedSource.key,
-                                            dependsOn: (sf.fieldData.computedSource.dependsOn ?? []).map(code => fieldCodeToName.get(code) ?? code)
+                                            dependsOn: (sf.fieldData.computedSource.dependsOn ?? []).map(resolveSubFieldRef)
                                         }
                                     }
                                     : {})