fix(core): disable detect local fields inside wrappers

fix #3572
ngx-formly · Oct 6, 2023 · 22b21d8 · 22b21d8
1 parent c004d03
commit 22b21d8
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/src/core/src/lib/components/formly.field.spec.ts b/src/core/src/lib/components/formly.field.spec.ts
@@ -604,6 +604,7 @@ describe('FormlyField Component', () => {
     it('should emit valueChanges on local field changes', () => {
       const { field } = renderComponent({
         type: FormlyGroupLocalControlType,
+        wrappers: ['form-field'],
         fieldGroup: [{ key: 'title' }],
       });
 

diff --git a/src/core/src/lib/components/formly.field.ts b/src/core/src/lib/components/formly.field.ts
@@ -161,6 +161,7 @@ export class FormlyField implements DoCheck, OnInit, OnChanges, AfterContentInit
 
   private triggerHook(name: keyof FormlyHookConfig, changes?: SimpleChanges) {
     if (name === 'onInit' || (name === 'onChanges' && changes.field && !changes.field.firstChange)) {
+      this.valueChangesUnsubscribe();
       this.valueChangesUnsubscribe = this.fieldChanges(this.field);
     }
 
@@ -267,7 +268,6 @@ export class FormlyField implements DoCheck, OnInit, OnChanges, AfterContentInit
   }
 
   private fieldChanges(field: FormlyFieldConfigCache | undefined) {
-    this.valueChangesUnsubscribe();
     if (!field) {
       return () => {};
     }

diff --git a/src/core/src/lib/templates/field.type.ts b/src/core/src/lib/templates/field.type.ts
@@ -1,6 +1,7 @@
 import { Input, Directive, QueryList, ViewChildren } from '@angular/core';
 import { FormControl, NgControl, FormGroup } from '@angular/forms';
 import { FormlyFieldConfig, FormlyFieldConfigCache } from '../models';
+import { FieldWrapper } from './field.wrapper';
 
 export interface FieldTypeConfig<T = FormlyFieldConfig['props']> extends FormlyFieldConfig<T> {
   formControl: FormControl;
@@ -14,7 +15,7 @@ export interface FieldGroupTypeConfig<T = FormlyFieldConfig['props']> extends Fo
 
 @Directive()
 export abstract class FieldType<F extends FormlyFieldConfig = FormlyFieldConfig> {
-  @ViewChildren(NgControl) set controls(controls: QueryList<NgControl>) {
+  @ViewChildren(NgControl) set _formlyControls(controls: QueryList<NgControl>) {
     const f = this.field as FormlyFieldConfigCache;
     f._localFields = controls
       .map((c) => (c.control as FormlyFieldConfigCache['formControl'])._fields || [])

diff --git a/src/core/src/lib/templates/field.wrapper.ts b/src/core/src/lib/templates/field.wrapper.ts
@@ -1,9 +1,11 @@
-import { ViewContainerRef, ViewChild, Directive } from '@angular/core';
+import { ViewContainerRef, ViewChild, Directive, QueryList } from '@angular/core';
 import { FieldType } from './field.type';
 import { FormlyFieldConfig } from '../models';
+import { NgControl } from '@angular/forms';
 
 @Directive()
 export abstract class FieldWrapper<F extends FormlyFieldConfig = FormlyFieldConfig> extends FieldType<F> {
+  override set _formlyControls(_: QueryList<NgControl>) {}
   @ViewChild('fieldComponent', { read: ViewContainerRef }) fieldComponent!: ViewContainerRef;
   @ViewChild('fieldComponent', { read: ViewContainerRef, static: true }) set _staticContent(content: ViewContainerRef) {
     this.fieldComponent = content;