@ngx-formly/core 6.3.10 → 6.3.11
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -94,16 +94,15 @@ export class FormlyForm {
|
|
|
94
94
|
}
|
|
95
95
|
});
|
|
96
96
|
}
|
|
97
|
-
let fieldChangesDetection = [
|
|
97
|
+
let fieldChangesDetection = [
|
|
98
|
+
observeDeep(this.field.options, ['formState'], () => this.field.options.detectChanges(this.field)),
|
|
99
|
+
];
|
|
98
100
|
const valueChanges = this.field.options.fieldChanges
|
|
99
101
|
.pipe(filter(({ field, type }) => hasKey(field) && type === 'valueChanges'), switchMap(() => (isNoopNgZone(this.ngZone) ? of(null) : this.ngZone.onStable.asObservable().pipe(take(1)))))
|
|
100
102
|
.subscribe(() => this.ngZone.runGuarded(() => {
|
|
101
103
|
// runGuarded is used to keep in sync the expression changes
|
|
102
104
|
// https://github.com/ngx-formly/ngx-formly/issues/2095
|
|
103
105
|
this.checkExpressionChange();
|
|
104
|
-
if (this.field.options) {
|
|
105
|
-
fieldChangesDetection.push(observeDeep(this.field.options, ['formState'], () => this.field.options.detectChanges(this.field)));
|
|
106
|
-
}
|
|
107
106
|
this.modelChange.emit((this._modelChangeValue = clone(this.model)));
|
|
108
107
|
}));
|
|
109
108
|
return () => {
|
|
@@ -145,4 +144,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.12", ngImpo
|
|
|
145
144
|
type: ContentChildren,
|
|
146
145
|
args: [FormlyTemplate]
|
|
147
146
|
}] } });
|
|
148
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"formly.form.js","sourceRoot":"","sources":["../../../../../../src/core/src/lib/components/formly.form.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,EACT,uBAAuB,EAGvB,KAAK,EAEL,YAAY,EACZ,MAAM,EAGN,eAAe,GAEhB,MAAM,eAAe,CAAC;AAGvB,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAE/D,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,YAAY,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AACtF,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAC;AACzD,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAC9D,OAAO,EAAE,oBAAoB,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACzE,OAAO,EAAE,EAAE,EAAgB,MAAM,MAAM,CAAC;;;;;;AAExC;;;;GAIG;AAOH,MAAM,OAAO,UAAU;IAmDrB,YACU,OAA0B,EAC1B,MAAoB,EACpB,MAAc,EACd,cAAoC;QAHpC,YAAO,GAAP,OAAO,CAAmB;QAC1B,WAAM,GAAN,MAAM,CAAc;QACpB,WAAM,GAAN,MAAM,CAAQ;QACd,mBAAc,GAAd,cAAc,CAAsB;QAd9C,4DAA4D;QAClD,gBAAW,GAAG,IAAI,YAAY,EAAO,CAAC;QAKhD,UAAK,GAA2B,EAAE,IAAI,EAAE,cAAc,EAAE,CAAC;QACjD,sBAAiB,GAAQ,EAAE,CAAC;QAC5B,4BAAuB,GAAG,GAAG,EAAE,GAAE,CAAC,CAAC;IAOxC,CAAC;IAvDJ,gFAAgF;IAChF,IACI,IAAI,CAAC,IAA2B;QAClC,IAAI,CAAC,KAAK,CAAC,IAAI,GAAG,IAAI,CAAC;IACzB,CAAC;IACD,IAAI,IAAI;QACN,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;IACzB,CAAC;IAED,+CAA+C;IAC/C,IACI,KAAK,CAAC,KAAU;QAClB,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,IAAI,IAAI,CAAC,iBAAiB,KAAK,KAAK,EAAE;YACpE,OAAO;SACR;QAED,IAAI,CAAC,QAAQ,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;IAC3B,CAAC;IACD,IAAI,KAAK;QACP,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC;IAC1B,CAAC;IAED,sDAAsD;IACtD,IACI,MAAM,CAAC,UAA+B;QACxC,IAAI,CAAC,QAAQ,CAAC,EAAE,UAAU,EAAE,CAAC,CAAC;IAChC,CAAC;IACD,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC;IAC/B,CAAC;IAED,4BAA4B;IAC5B,IACI,OAAO,CAAC,OAA0B;QACpC,IAAI,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;IAC7B,CAAC;IACD,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC;IAC5B,CAAC;IAID,IAAqC,SAAS,CAAC,SAAoC;QACjF,IAAI,CAAC,cAAc,CAAC,SAAS,GAAG,SAAS,CAAC;IAC5C,CAAC;IAaD,SAAS;QACP,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,iBAAiB,KAAK,sBAAsB,EAAE;YACnE,IAAI,CAAC,qBAAqB,EAAE,CAAC;SAC9B;IACH,CAAC;IAED,WAAW,CAAC,OAAsB;QAChC,IAAI,OAAO,CAAC,MAAM,IAAI,IAAI,CAAC,IAAI,EAAE;YAC/B,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SACzB;QAED,IAAI,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,KAAK,IAAI,IAAI,CAAC,iBAAiB,KAAK,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,EAAE;YAC9G,IAAI,CAAC,uBAAuB,EAAE,CAAC;YAC/B,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAC/B,IAAI,CAAC,uBAAuB,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;SACpD;IACH,CAAC;IAED,WAAW;QACT,IAAI,CAAC,uBAAuB,EAAE,CAAC;IACjC,CAAC;IAEO,qBAAqB;QAC3B,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,gBAAgB,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACpD,CAAC;IAEO,YAAY;QAClB,IAAI,CAAC,uBAAuB,EAAE,CAAC;QAE/B,IAAI,UAAU,GAAwB,IAAI,CAAC;QAC3C,IAAI,gBAAgB,EAAE,EAAE;YACtB,IAAI,SAAS,GAAG,IAAI,CAAC,OAAO,EAAE,UAAU,EAAE,SAAS,CAAC;YACpD,UAAU,GAAI,IAAI,CAAC,IAAY,CAAC,MAAM,CAAC,SAAS,CAAC,GAAG,EAAE;gBACpD,IAAI,SAAS,KAAK,IAAI,CAAC,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE;oBACrD,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;oBACvC,SAAS,GAAG,IAAI,CAAC,OAAO,EAAE,UAAU,EAAE,SAAS,CAAC;iBACjD;YACH,CAAC,CAAC,CAAC;SACJ;QAED,IAAI,qBAAqB,GAAU,EAAE,CAAC;QACtC,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,YAAY;aACjD,IAAI,CACH,MAAM,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,IAAI,KAAK,cAAc,CAAC,EACrE,SAAS,CAAC,GAAG,EAAE,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,YAAY,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAC5G;aACA,SAAS,CAAC,GAAG,EAAE,CACd,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE;YAC1B,4DAA4D;YAC5D,uDAAuD;YACvD,IAAI,CAAC,qBAAqB,EAAE,CAAC;YAC7B,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE;gBACtB,qBAAqB,CAAC,IAAI,CACxB,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,WAAW,CAAC,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CACnG,CAAC;aACH;YACD,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,iBAAiB,GAAG,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACtE,CAAC,CAAC,CACH,CAAC;QAEJ,OAAO,GAAG,EAAE;YACV,qBAAqB,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC;YAC9C,UAAU,EAAE,WAAW,EAAE,CAAC;YAC1B,YAAY,CAAC,WAAW,EAAE,CAAC;QAC7B,CAAC,CAAC;IACJ,CAAC;IAEO,QAAQ,CAAC,KAA6B;QAC5C,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,EAAE;YAChC,IAAI,CAAC,KAAK,GAAG,EAAE,GAAG,IAAI,CAAC,KAAK,EAAE,GAAG,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC;SACjD;aAAM;YACL,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAE,IAAI,CAAC,KAAa,CAAC,CAAC,CAAC,GAAI,KAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;SACjF;IACH,CAAC;;wGAnIU,UAAU;4FAAV,UAAU,+JAHV,CAAC,iBAAiB,EAAE,oBAAoB,CAAC,oDA8CnC,cAAc,kDA/CrB,+CAA+C;4FAI9C,UAAU;kBANtB,SAAS;mBAAC;oBACT,QAAQ,EAAE,aAAa;oBACvB,QAAQ,EAAE,+CAA+C;oBACzD,SAAS,EAAE,CAAC,iBAAiB,EAAE,oBAAoB,CAAC;oBACpD,eAAe,EAAE,uBAAuB,CAAC,MAAM;iBAChD;2LAIK,IAAI;sBADP,KAAK;gBAUF,KAAK;sBADR,KAAK;gBAcF,MAAM;sBADT,KAAK;gBAUF,OAAO;sBADV,KAAK;gBASI,WAAW;sBAApB,MAAM;gBAC8B,SAAS;sBAA7C,eAAe;uBAAC,cAAc","sourcesContent":["import {\n  Component,\n  ChangeDetectionStrategy,\n  DoCheck,\n  OnChanges,\n  Input,\n  SimpleChanges,\n  EventEmitter,\n  Output,\n  OnDestroy,\n  NgZone,\n  ContentChildren,\n  QueryList,\n} from '@angular/core';\nimport { FormGroup, FormArray } from '@angular/forms';\nimport { FormlyFieldConfig, FormlyFormOptions, FormlyFieldConfigCache } from '../models';\nimport { FormlyFormBuilder } from '../services/formly.builder';\nimport { FormlyConfig } from '../services/formly.config';\nimport { clone, hasKey, isNoopNgZone, isSignalRequired, observeDeep } from '../utils';\nimport { switchMap, filter, take } from 'rxjs/operators';\nimport { clearControl } from '../extensions/field-form/utils';\nimport { FormlyFieldTemplates, FormlyTemplate } from './formly.template';\nimport { of, Subscription } from 'rxjs';\n\n/**\n * The `<form-form>` component is the main container of the form,\n * which takes care of managing the form state\n * and delegates the rendering of each field to `<formly-field>` component.\n */\n@Component({\n  selector: 'formly-form',\n  template: '<formly-field [field]=\"field\"></formly-field>',\n  providers: [FormlyFormBuilder, FormlyFieldTemplates],\n  changeDetection: ChangeDetectionStrategy.OnPush,\n})\nexport class FormlyForm implements DoCheck, OnChanges, OnDestroy {\n  /** The form instance which allow to track model value and validation status. */\n  @Input()\n  set form(form: FormGroup | FormArray) {\n    this.field.form = form;\n  }\n  get form(): FormGroup | FormArray {\n    return this.field.form;\n  }\n\n  /** The model to be represented by the form. */\n  @Input()\n  set model(model: any) {\n    if (this.config.extras.immutable && this._modelChangeValue === model) {\n      return;\n    }\n\n    this.setField({ model });\n  }\n  get model(): any {\n    return this.field.model;\n  }\n\n  /** The field configurations for building the form. */\n  @Input()\n  set fields(fieldGroup: FormlyFieldConfig[]) {\n    this.setField({ fieldGroup });\n  }\n  get fields(): FormlyFieldConfig[] {\n    return this.field.fieldGroup;\n  }\n\n  /** Options for the form. */\n  @Input()\n  set options(options: FormlyFormOptions) {\n    this.setField({ options });\n  }\n  get options(): FormlyFormOptions {\n    return this.field.options;\n  }\n\n  /** Event that is emitted when the model value is changed */\n  @Output() modelChange = new EventEmitter<any>();\n  @ContentChildren(FormlyTemplate) set templates(templates: QueryList<FormlyTemplate>) {\n    this.fieldTemplates.templates = templates;\n  }\n\n  field: FormlyFieldConfigCache = { type: 'formly-group' };\n  private _modelChangeValue: any = {};\n  private valueChangesUnsubscribe = () => {};\n\n  constructor(\n    private builder: FormlyFormBuilder,\n    private config: FormlyConfig,\n    private ngZone: NgZone,\n    private fieldTemplates: FormlyFieldTemplates,\n  ) {}\n\n  ngDoCheck() {\n    if (this.config.extras.checkExpressionOn === 'changeDetectionCheck') {\n      this.checkExpressionChange();\n    }\n  }\n\n  ngOnChanges(changes: SimpleChanges) {\n    if (changes.fields && this.form) {\n      clearControl(this.form);\n    }\n\n    if (changes.fields || changes.form || (changes.model && this._modelChangeValue !== changes.model.currentValue)) {\n      this.valueChangesUnsubscribe();\n      this.builder.build(this.field);\n      this.valueChangesUnsubscribe = this.valueChanges();\n    }\n  }\n\n  ngOnDestroy() {\n    this.valueChangesUnsubscribe();\n  }\n\n  private checkExpressionChange() {\n    this.field.options.checkExpressions?.(this.field);\n  }\n\n  private valueChanges() {\n    this.valueChangesUnsubscribe();\n\n    let formEvents: Subscription | null = null;\n    if (isSignalRequired()) {\n      let submitted = this.options?.parentForm?.submitted;\n      formEvents = (this.form as any).events.subscribe(() => {\n        if (submitted !== this.options?.parentForm?.submitted) {\n          this.options.detectChanges(this.field);\n          submitted = this.options?.parentForm?.submitted;\n        }\n      });\n    }\n\n    let fieldChangesDetection: any[] = [];\n    const valueChanges = this.field.options.fieldChanges\n      .pipe(\n        filter(({ field, type }) => hasKey(field) && type === 'valueChanges'),\n        switchMap(() => (isNoopNgZone(this.ngZone) ? of(null) : this.ngZone.onStable.asObservable().pipe(take(1)))),\n      )\n      .subscribe(() =>\n        this.ngZone.runGuarded(() => {\n          // runGuarded is used to keep in sync the expression changes\n          // https://github.com/ngx-formly/ngx-formly/issues/2095\n          this.checkExpressionChange();\n          if (this.field.options) {\n            fieldChangesDetection.push(\n              observeDeep(this.field.options, ['formState'], () => this.field.options.detectChanges(this.field)),\n            );\n          }\n          this.modelChange.emit((this._modelChangeValue = clone(this.model)));\n        }),\n      );\n\n    return () => {\n      fieldChangesDetection.forEach((fnc) => fnc());\n      formEvents?.unsubscribe();\n      valueChanges.unsubscribe();\n    };\n  }\n\n  private setField(field: FormlyFieldConfigCache) {\n    if (this.config.extras.immutable) {\n      this.field = { ...this.field, ...clone(field) };\n    } else {\n      Object.keys(field).forEach((p) => ((this.field as any)[p] = (field as any)[p]));\n    }\n  }\n}\n"]}
|
|
147
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"formly.form.js","sourceRoot":"","sources":["../../../../../../src/core/src/lib/components/formly.form.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  Component,\n  ChangeDetectionStrategy,\n  DoCheck,\n  OnChanges,\n  Input,\n  SimpleChanges,\n  EventEmitter,\n  Output,\n  OnDestroy,\n  NgZone,\n  ContentChildren,\n  QueryList,\n} from '@angular/core';\nimport { FormGroup, FormArray } from '@angular/forms';\nimport { FormlyFieldConfig, FormlyFormOptions, FormlyFieldConfigCache } from '../models';\nimport { FormlyFormBuilder } from '../services/formly.builder';\nimport { FormlyConfig } from '../services/formly.config';\nimport { clone, hasKey, isNoopNgZone, isSignalRequired, observeDeep } from '../utils';\nimport { switchMap, filter, take } from 'rxjs/operators';\nimport { clearControl } from '../extensions/field-form/utils';\nimport { FormlyFieldTemplates, FormlyTemplate } from './formly.template';\nimport { of, Subscription } from 'rxjs';\n\n/**\n * The `<form-form>` component is the main container of the form,\n * which takes care of managing the form state\n * and delegates the rendering of each field to `<formly-field>` component.\n */\n@Component({\n  selector: 'formly-form',\n  template: '<formly-field [field]=\"field\"></formly-field>',\n  providers: [FormlyFormBuilder, FormlyFieldTemplates],\n  changeDetection: ChangeDetectionStrategy.OnPush,\n})\nexport class FormlyForm implements DoCheck, OnChanges, OnDestroy {\n  /** The form instance which allow to track model value and validation status. */\n  @Input()\n  set form(form: FormGroup | FormArray) {\n    this.field.form = form;\n  }\n  get form(): FormGroup | FormArray {\n    return this.field.form;\n  }\n\n  /** The model to be represented by the form. */\n  @Input()\n  set model(model: any) {\n    if (this.config.extras.immutable && this._modelChangeValue === model) {\n      return;\n    }\n\n    this.setField({ model });\n  }\n  get model(): any {\n    return this.field.model;\n  }\n\n  /** The field configurations for building the form. */\n  @Input()\n  set fields(fieldGroup: FormlyFieldConfig[]) {\n    this.setField({ fieldGroup });\n  }\n  get fields(): FormlyFieldConfig[] {\n    return this.field.fieldGroup;\n  }\n\n  /** Options for the form. */\n  @Input()\n  set options(options: FormlyFormOptions) {\n    this.setField({ options });\n  }\n  get options(): FormlyFormOptions {\n    return this.field.options;\n  }\n\n  /** Event that is emitted when the model value is changed */\n  @Output() modelChange = new EventEmitter<any>();\n  @ContentChildren(FormlyTemplate) set templates(templates: QueryList<FormlyTemplate>) {\n    this.fieldTemplates.templates = templates;\n  }\n\n  field: FormlyFieldConfigCache = { type: 'formly-group' };\n  private _modelChangeValue: any = {};\n  private valueChangesUnsubscribe = () => {};\n\n  constructor(\n    private builder: FormlyFormBuilder,\n    private config: FormlyConfig,\n    private ngZone: NgZone,\n    private fieldTemplates: FormlyFieldTemplates,\n  ) {}\n\n  ngDoCheck() {\n    if (this.config.extras.checkExpressionOn === 'changeDetectionCheck') {\n      this.checkExpressionChange();\n    }\n  }\n\n  ngOnChanges(changes: SimpleChanges) {\n    if (changes.fields && this.form) {\n      clearControl(this.form);\n    }\n\n    if (changes.fields || changes.form || (changes.model && this._modelChangeValue !== changes.model.currentValue)) {\n      this.valueChangesUnsubscribe();\n      this.builder.build(this.field);\n      this.valueChangesUnsubscribe = this.valueChanges();\n    }\n  }\n\n  ngOnDestroy() {\n    this.valueChangesUnsubscribe();\n  }\n\n  private checkExpressionChange() {\n    this.field.options.checkExpressions?.(this.field);\n  }\n\n  private valueChanges() {\n    this.valueChangesUnsubscribe();\n\n    let formEvents: Subscription | null = null;\n    if (isSignalRequired()) {\n      let submitted = this.options?.parentForm?.submitted;\n      formEvents = (this.form as any).events.subscribe(() => {\n        if (submitted !== this.options?.parentForm?.submitted) {\n          this.options.detectChanges(this.field);\n          submitted = this.options?.parentForm?.submitted;\n        }\n      });\n    }\n\n    let fieldChangesDetection: any[] = [\n      observeDeep(this.field.options, ['formState'], () => this.field.options.detectChanges(this.field)),\n    ];\n    const valueChanges = this.field.options.fieldChanges\n      .pipe(\n        filter(({ field, type }) => hasKey(field) && type === 'valueChanges'),\n        switchMap(() => (isNoopNgZone(this.ngZone) ? of(null) : this.ngZone.onStable.asObservable().pipe(take(1)))),\n      )\n      .subscribe(() =>\n        this.ngZone.runGuarded(() => {\n          // runGuarded is used to keep in sync the expression changes\n          // https://github.com/ngx-formly/ngx-formly/issues/2095\n          this.checkExpressionChange();\n          this.modelChange.emit((this._modelChangeValue = clone(this.model)));\n        }),\n      );\n\n    return () => {\n      fieldChangesDetection.forEach((fnc) => fnc());\n      formEvents?.unsubscribe();\n      valueChanges.unsubscribe();\n    };\n  }\n\n  private setField(field: FormlyFieldConfigCache) {\n    if (this.config.extras.immutable) {\n      this.field = { ...this.field, ...clone(field) };\n    } else {\n      Object.keys(field).forEach((p) => ((this.field as any)[p] = (field as any)[p]));\n    }\n  }\n}\n"]}
|
|
@@ -1128,16 +1128,15 @@ class FormlyForm {
|
|
|
1128
1128
|
}
|
|
1129
1129
|
});
|
|
1130
1130
|
}
|
|
1131
|
-
let fieldChangesDetection = [
|
|
1131
|
+
let fieldChangesDetection = [
|
|
1132
|
+
observeDeep(this.field.options, ['formState'], () => this.field.options.detectChanges(this.field)),
|
|
1133
|
+
];
|
|
1132
1134
|
const valueChanges = this.field.options.fieldChanges
|
|
1133
1135
|
.pipe(filter(({ field, type }) => hasKey(field) && type === 'valueChanges'), switchMap(() => (isNoopNgZone(this.ngZone) ? of(null) : this.ngZone.onStable.asObservable().pipe(take(1)))))
|
|
1134
1136
|
.subscribe(() => this.ngZone.runGuarded(() => {
|
|
1135
1137
|
// runGuarded is used to keep in sync the expression changes
|
|
1136
1138
|
// https://github.com/ngx-formly/ngx-formly/issues/2095
|
|
1137
1139
|
this.checkExpressionChange();
|
|
1138
|
-
if (this.field.options) {
|
|
1139
|
-
fieldChangesDetection.push(observeDeep(this.field.options, ['formState'], () => this.field.options.detectChanges(this.field)));
|
|
1140
|
-
}
|
|
1141
1140
|
this.modelChange.emit((this._modelChangeValue = clone(this.model)));
|
|
1142
1141
|
}));
|
|
1143
1142
|
return () => {
|