@klippa/ngx-enhancy-forms 11.5.2 → 11.6.0
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.
- package/esm2020/lib/form/form-submit-button/form-submit-button.component.mjs +5 -5
- package/esm2020/lib/form/form.component.mjs +41 -4
- package/esm2020/lib/util/objects.mjs +38 -0
- package/fesm2015/klippa-ngx-enhancy-forms.mjs +80 -5
- package/fesm2015/klippa-ngx-enhancy-forms.mjs.map +1 -1
- package/fesm2020/klippa-ngx-enhancy-forms.mjs +79 -5
- package/fesm2020/klippa-ngx-enhancy-forms.mjs.map +1 -1
- package/lib/form/form-submit-button/form-submit-button.component.d.ts +2 -2
- package/lib/form/form.component.d.ts +2 -0
- package/lib/util/objects.d.ts +1 -0
- package/package.json +1 -1
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Component, Host, HostBinding, Input, Optional } from '@angular/core';
|
|
2
|
-
import { invalidFieldsSymbol } from
|
|
3
|
-
import { isNullOrUndefined } from
|
|
2
|
+
import { invalidFieldsSymbol } from '../form.component';
|
|
3
|
+
import { isNullOrUndefined } from '../../util/values';
|
|
4
4
|
import * as i0 from "@angular/core";
|
|
5
5
|
import * as i1 from "../form.component";
|
|
6
6
|
import * as i2 from "@angular/common";
|
|
@@ -18,9 +18,9 @@ export class FormSubmitButtonComponent {
|
|
|
18
18
|
submitForm() {
|
|
19
19
|
this.parentForm
|
|
20
20
|
.trySubmit()
|
|
21
|
-
.then((
|
|
21
|
+
.then(([renderedAndEnabledValues, renderedValues]) => {
|
|
22
22
|
this.isLoading = true;
|
|
23
|
-
const submitCallbackResult = this.submitCallback(
|
|
23
|
+
const submitCallbackResult = this.submitCallback(renderedAndEnabledValues, renderedValues);
|
|
24
24
|
if (isNullOrUndefined(submitCallbackResult)) {
|
|
25
25
|
throw new Error('No promise is returned in your submit function.');
|
|
26
26
|
}
|
|
@@ -58,4 +58,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.8", ngImpor
|
|
|
58
58
|
type: HostBinding,
|
|
59
59
|
args: ['class._fullWidth']
|
|
60
60
|
}] } });
|
|
61
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
61
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZm9ybS1zdWJtaXQtYnV0dG9uLmNvbXBvbmVudC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL2tsaXBwYS9uZ3gtZW5oYW5jeS1mb3Jtcy9zcmMvbGliL2Zvcm0vZm9ybS1zdWJtaXQtYnV0dG9uL2Zvcm0tc3VibWl0LWJ1dHRvbi5jb21wb25lbnQudHMiLCIuLi8uLi8uLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy9rbGlwcGEvbmd4LWVuaGFuY3ktZm9ybXMvc3JjL2xpYi9mb3JtL2Zvcm0tc3VibWl0LWJ1dHRvbi9mb3JtLXN1Ym1pdC1idXR0b24uY29tcG9uZW50Lmh0bWwiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFNBQVMsRUFBRSxJQUFJLEVBQUUsV0FBVyxFQUFFLEtBQUssRUFBRSxRQUFRLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFDOUUsT0FBTyxFQUFnQixtQkFBbUIsRUFBQyxNQUFNLG1CQUFtQixDQUFDO0FBQ3JFLE9BQU8sRUFBQyxpQkFBaUIsRUFBQyxNQUFNLG1CQUFtQixDQUFDOzs7OztBQU9wRCxNQUFNLE9BQU8seUJBQXlCO0lBVXJDLFlBQXdDLFVBQXlCO1FBQXpCLGVBQVUsR0FBVixVQUFVLENBQWU7UUFUakQsY0FBUyxHQUFHLEtBQUssQ0FBQztRQUN6QixjQUFTLEdBQUcsS0FBSyxDQUFDO1FBQ2xCLFlBQU8sR0FBZ0MsYUFBYSxDQUFDO0lBT00sQ0FBQztJQUpyRSxJQUFxQyxDQUFDO1FBQ3JDLE9BQU8sSUFBSSxDQUFDLFNBQVMsQ0FBQztJQUN2QixDQUFDO0lBSUQsVUFBVTtRQUNULElBQUksQ0FBQyxVQUFVO2FBQ2IsU0FBUyxFQUFFO2FBQ1gsSUFBSSxDQUFDLENBQUMsQ0FBQyx3QkFBd0IsRUFBRSxjQUFjLENBQUMsRUFBRSxFQUFFO1lBQ3BELElBQUksQ0FBQyxTQUFTLEdBQUcsSUFBSSxDQUFDO1lBQ3RCLE1BQU0sb0JBQW9CLEdBQUcsSUFBSSxDQUFDLGNBQWMsQ0FBQyx3QkFBd0IsRUFBRSxjQUFjLENBQUMsQ0FBQztZQUMzRixJQUFJLGlCQUFpQixDQUFDLG9CQUFvQixDQUFDLEVBQUU7Z0JBQzVDLE1BQU0sSUFBSSxLQUFLLENBQUMsaURBQWlELENBQUMsQ0FBQzthQUNuRTtZQUNELE9BQU8sb0JBQW9CLENBQUMsSUFBSSxDQUFDLEdBQUcsRUFBRSxDQUFDLENBQUMsSUFBSSxDQUFDLFNBQVMsR0FBRyxLQUFLLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFO2dCQUM1RSxJQUFJLENBQUMsU0FBUyxHQUFHLEtBQUssQ0FBQztnQkFDdkIsTUFBTSxDQUFDLENBQUM7WUFDVCxDQUFDLENBQUMsQ0FBQztRQUNKLENBQUMsQ0FBQzthQUNELEtBQUssQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFO1lBQ1osSUFBSSxDQUFDLEtBQUssbUJBQW1CLEVBQUU7Z0JBQzlCLE9BQU8sQ0FBQyxpRkFBaUY7YUFDekY7WUFDRCxNQUFNLENBQUMsQ0FBQztRQUNULENBQUMsQ0FBQyxDQUFDO0lBQ0wsQ0FBQzs7c0hBaENXLHlCQUF5QjswR0FBekIseUJBQXlCLHdPQ1R0QyxvU0FXQTsyRkRGYSx5QkFBeUI7a0JBTHJDLFNBQVM7K0JBQ0Msd0JBQXdCOzswQkFjckIsSUFBSTs7MEJBQUksUUFBUTs0Q0FUYixTQUFTO3NCQUF4QixLQUFLO2dCQUNHLFNBQVM7c0JBQWpCLEtBQUs7Z0JBQ0csT0FBTztzQkFBZixLQUFLO2dCQUNVLGNBQWM7c0JBQTdCLEtBQUs7Z0JBRStCLENBQUM7c0JBQXJDLFdBQVc7dUJBQUMsa0JBQWtCIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgQ29tcG9uZW50LCBIb3N0LCBIb3N0QmluZGluZywgSW5wdXQsIE9wdGlvbmFsIH0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XG5pbXBvcnQge0Zvcm1Db21wb25lbnQsIGludmFsaWRGaWVsZHNTeW1ib2x9IGZyb20gJy4uL2Zvcm0uY29tcG9uZW50JztcbmltcG9ydCB7aXNOdWxsT3JVbmRlZmluZWR9IGZyb20gJy4uLy4uL3V0aWwvdmFsdWVzJztcblxuQENvbXBvbmVudCh7XG5cdHNlbGVjdG9yOiAna2xwLWZvcm0tc3VibWl0LWJ1dHRvbicsXG5cdHRlbXBsYXRlVXJsOiAnLi9mb3JtLXN1Ym1pdC1idXR0b24uY29tcG9uZW50Lmh0bWwnLFxuXHRzdHlsZVVybHM6IFsnLi9mb3JtLXN1Ym1pdC1idXR0b24uY29tcG9uZW50LnNjc3MnXSxcbn0pXG5leHBvcnQgY2xhc3MgRm9ybVN1Ym1pdEJ1dHRvbkNvbXBvbmVudCB7XG5cdEBJbnB1dCgpIHB1YmxpYyBpc0xvYWRpbmcgPSBmYWxzZTtcblx0QElucHV0KCkgZnVsbFdpZHRoID0gZmFsc2U7XG5cdEBJbnB1dCgpIHZhcmlhbnQ6ICdncmVlbkZpbGxlZCcgfCAncmVkRmlsbGVkJyA9ICdncmVlbkZpbGxlZCc7XG5cdEBJbnB1dCgpIHB1YmxpYyBzdWJtaXRDYWxsYmFjazogKHJlbmRlcmVkQW5kRW5hYmxlZFZhbHVlczogb2JqZWN0LCByZW5kZXJlZEJ1dERpc2FibGVkVmFsdWVzOiBvYmplY3QpID0+IFByb21pc2U8YW55PjtcblxuXHRASG9zdEJpbmRpbmcoJ2NsYXNzLl9mdWxsV2lkdGgnKSBnZXQgXygpIHtcblx0XHRyZXR1cm4gdGhpcy5mdWxsV2lkdGg7XG5cdH1cblxuXHRjb25zdHJ1Y3RvcihASG9zdCgpIEBPcHRpb25hbCgpIHByaXZhdGUgcGFyZW50Rm9ybTogRm9ybUNvbXBvbmVudCkge31cblxuXHRzdWJtaXRGb3JtKCk6IHZvaWQge1xuXHRcdHRoaXMucGFyZW50Rm9ybVxuXHRcdFx0LnRyeVN1Ym1pdCgpXG5cdFx0XHQudGhlbigoW3JlbmRlcmVkQW5kRW5hYmxlZFZhbHVlcywgcmVuZGVyZWRWYWx1ZXNdKSA9PiB7XG5cdFx0XHRcdHRoaXMuaXNMb2FkaW5nID0gdHJ1ZTtcblx0XHRcdFx0Y29uc3Qgc3VibWl0Q2FsbGJhY2tSZXN1bHQgPSB0aGlzLnN1Ym1pdENhbGxiYWNrKHJlbmRlcmVkQW5kRW5hYmxlZFZhbHVlcywgcmVuZGVyZWRWYWx1ZXMpO1xuXHRcdFx0XHRpZiAoaXNOdWxsT3JVbmRlZmluZWQoc3VibWl0Q2FsbGJhY2tSZXN1bHQpKSB7XG5cdFx0XHRcdFx0dGhyb3cgbmV3IEVycm9yKCdObyBwcm9taXNlIGlzIHJldHVybmVkIGluIHlvdXIgc3VibWl0IGZ1bmN0aW9uLicpO1xuXHRcdFx0XHR9XG5cdFx0XHRcdHJldHVybiBzdWJtaXRDYWxsYmFja1Jlc3VsdC50aGVuKCgpID0+ICh0aGlzLmlzTG9hZGluZyA9IGZhbHNlKSkuY2F0Y2goKGUpID0+IHtcblx0XHRcdFx0XHR0aGlzLmlzTG9hZGluZyA9IGZhbHNlO1xuXHRcdFx0XHRcdHRocm93IGU7XG5cdFx0XHRcdH0pO1xuXHRcdFx0fSlcblx0XHRcdC5jYXRjaCgoZSkgPT4ge1xuXHRcdFx0XHRpZiAoZSA9PT0gaW52YWxpZEZpZWxkc1N5bWJvbCkge1xuXHRcdFx0XHRcdHJldHVybjsgLy8gc3dhbGxvdyB0aGUgZXJyb3IsIHRoZSBmcmFtZXdvcmsgd2lsbCBzY3JvbGwgdG8gdGhlIGZpZWxkIHRoYXQgbmVlZHMgYXR0ZW50aW9uXG5cdFx0XHRcdH1cblx0XHRcdFx0dGhyb3cgZTtcblx0XHRcdH0pO1xuXHR9XG59XG4iLCI8a2xwLWZvcm0tYnV0dG9uXG5cdFx0W3ZhcmlhbnRdPVwidmFyaWFudFwiXG5cdFx0KGNsaWNrKT1cInN1Ym1pdEZvcm0oKVwiXG5cdFx0W2Rpc2FibGVkXT1cImlzTG9hZGluZ1wiXG5cdFx0W2lzTG9hZGluZ109XCJpc0xvYWRpbmdcIlxuXHRcdFtmdWxsV2lkdGhdPVwiZnVsbFdpZHRoXCJcblx0XHR0eXBlPVwic3VibWl0XCJcblx0XHRbbmdDbGFzc109XCJmdWxsV2lkdGggPyAnZnVsbFdpZHRoJyA6ICcnXCJcblx0PlxuXHQ8bmctY29udGVudD48L25nLWNvbnRlbnQ+XG48L2tscC1mb3JtLWJ1dHRvbj5cbiJdfQ==
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { Component, Directive, Input, Optional, SkipSelf } from '@angular/core';
|
|
2
|
-
import { UntypedFormArray, UntypedFormControl, UntypedFormGroup } from '@angular/forms';
|
|
2
|
+
import { FormArray, FormControl, FormGroup, UntypedFormArray, UntypedFormControl, UntypedFormGroup } from '@angular/forms';
|
|
3
3
|
import { isValueSet } from '../util/values';
|
|
4
|
+
import { deepMerge } from '../util/objects';
|
|
4
5
|
import * as i0 from "@angular/core";
|
|
5
6
|
import * as i1 from "@angular/forms";
|
|
6
7
|
export const invalidFieldsSymbol = Symbol('Not all fields are valid');
|
|
@@ -144,10 +145,13 @@ export class FormComponent {
|
|
|
144
145
|
});
|
|
145
146
|
allControls.forEach(e => this.disableInactiveFormControl(e));
|
|
146
147
|
allControls.forEach(e => e.updateValueAndValidity());
|
|
147
|
-
const
|
|
148
|
+
const formGroupValue = this.formGroup.value;
|
|
149
|
+
const renderedAndEnabledValues = this.getRenderedFieldValuesFormGroup(this.formGroup, true);
|
|
150
|
+
const renderedButDisabledValues = this.getRenderedFieldValuesFormGroup(this.formGroup, false);
|
|
148
151
|
if (this.formGroup.valid) {
|
|
149
152
|
this.setDisabledStatesForAllControls(originalDisabledStates);
|
|
150
|
-
|
|
153
|
+
const renderedValues = deepMerge(renderedAndEnabledValues, renderedButDisabledValues);
|
|
154
|
+
return Promise.resolve([formGroupValue, renderedValues]);
|
|
151
155
|
}
|
|
152
156
|
else {
|
|
153
157
|
this.activeControls.find((e) => !e.formControl.valid)?.formElement?.scrollTo();
|
|
@@ -155,6 +159,39 @@ export class FormComponent {
|
|
|
155
159
|
return Promise.reject(invalidFieldsSymbol);
|
|
156
160
|
}
|
|
157
161
|
}
|
|
162
|
+
getRenderedFieldValuesFormGroup(formGroup, enabled, valueObject = {}) {
|
|
163
|
+
Object.entries(formGroup.controls).forEach(([name, control]) => {
|
|
164
|
+
if (control instanceof FormControl && control.enabled === enabled && this.activeControls.some(e => e.formControl === control)) {
|
|
165
|
+
valueObject[name] = control.value;
|
|
166
|
+
}
|
|
167
|
+
else if (control instanceof FormArray) {
|
|
168
|
+
valueObject[name] = [];
|
|
169
|
+
this.getRenderedFieldValuesFormArray(control, enabled, valueObject[name]);
|
|
170
|
+
}
|
|
171
|
+
else if (control instanceof FormGroup) {
|
|
172
|
+
valueObject[name] = {};
|
|
173
|
+
this.getRenderedFieldValuesFormGroup(control, enabled, valueObject[name]);
|
|
174
|
+
}
|
|
175
|
+
});
|
|
176
|
+
return valueObject;
|
|
177
|
+
}
|
|
178
|
+
getRenderedFieldValuesFormArray(formArray, enabled, valueArray) {
|
|
179
|
+
formArray.controls.forEach((control) => {
|
|
180
|
+
if (control instanceof FormControl && control.enabled === enabled && this.activeControls.some(e => e.formControl === control)) {
|
|
181
|
+
valueArray.push(control.value);
|
|
182
|
+
}
|
|
183
|
+
else if (control instanceof FormArray) {
|
|
184
|
+
const newArray = [];
|
|
185
|
+
valueArray.push(newArray);
|
|
186
|
+
this.getRenderedFieldValuesFormArray(control, enabled, newArray);
|
|
187
|
+
}
|
|
188
|
+
else if (control instanceof FormGroup) {
|
|
189
|
+
const newObject = {};
|
|
190
|
+
valueArray.push(newObject);
|
|
191
|
+
this.getRenderedFieldValuesFormGroup(control, enabled, newObject);
|
|
192
|
+
}
|
|
193
|
+
});
|
|
194
|
+
}
|
|
158
195
|
setDisabledStatesForAllControls(originalDisabledStates) {
|
|
159
196
|
originalDisabledStates.forEach((e) => {
|
|
160
197
|
if (e.disabled) {
|
|
@@ -188,4 +225,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.8", ngImpor
|
|
|
188
225
|
}], patchValueInterceptor: [{
|
|
189
226
|
type: Input
|
|
190
227
|
}] } });
|
|
191
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"form.component.js","sourceRoot":"","sources":["../../../../../../projects/klippa/ngx-enhancy-forms/src/lib/form/form.component.ts","../../../../../../projects/klippa/ngx-enhancy-forms/src/lib/form/form.component.html"],"names":[],"mappings":"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","sourcesContent":["import {Component, Directive, Input, OnChanges, OnDestroy, OnInit, Optional, SimpleChanges, SkipSelf} from '@angular/core';\nimport {AbstractControl, UntypedFormArray, UntypedFormControl, UntypedFormGroup} from '@angular/forms';\nimport {FormElementComponent} from './form-element/form-element.component';\nimport {isValueSet} from '../util/values';\n\nexport const invalidFieldsSymbol = Symbol('Not all fields are valid');\n\n@Directive({\n\t// tslint:disable-next-line:directive-selector\n\tselector: 'klp-sub-form',\n})\nexport class SubFormDirective {\n\t@Input() injectInto: UntypedFormArray | UntypedFormGroup;\n\t@Input() at: number | string;\n}\n\n@Component({\n\tselector: 'klp-form',\n\ttemplateUrl: './form.component.html',\n\tstyleUrls: ['./form.component.scss'],\n})\nexport class FormComponent implements OnInit, OnDestroy, OnChanges {\n\t@Input() public readOnly = false;\n\t@Input() public showErrorMessages = true;\n\t@Input() public errorMessageLocation: 'belowCaption' | 'rightOfCaption' = 'belowCaption';\n\t@Input() public formGroup: UntypedFormGroup;\n\t@Input() public patchValueInterceptor: (values: any) => Promise<any>;\n\n\t// we keep track of what form controls are actually rendered. Only those count when looking at form validation\n\tprivate activeControls: Array<{\n\t\tformControl: UntypedFormControl;\n\t\tformElement: FormElementComponent;\n\t}> = [];\n\n\tconstructor(@SkipSelf() @Optional() private parent: FormComponent, @Optional() private subFormPlaceholder: SubFormDirective) {\n\t}\n\n\tngOnInit(): void {\n\t\tif (isValueSet(this.parent) && isValueSet(this.subFormPlaceholder)) {\n\t\t\tconst injectInto = this.subFormPlaceholder.injectInto;\n\t\t\tconst injectAt = this.subFormPlaceholder.at;\n\t\t\tif (injectInto instanceof UntypedFormArray) {\n\t\t\t\tif (typeof injectAt !== 'number') {\n\t\t\t\t\tthrow new Error(`cannot index FormArray with ${typeof injectAt}`);\n\t\t\t\t}\n\n\t\t\t\tinjectInto.setControl(injectAt, this.formGroup);\n\t\t\t} else if (injectInto instanceof UntypedFormGroup) {\n\t\t\t\tif (typeof injectAt !== 'string') {\n\t\t\t\t\tthrow new Error(`cannot index FormGroup with ${typeof injectAt}`);\n\t\t\t\t}\n\n\t\t\t\tinjectInto.setControl(injectAt, this.formGroup);\n\t\t\t}\n\t\t}\n\t\tif (isValueSet(this.patchValueInterceptor)) {\n\t\t\tthis.addSupportForPatchValueInterceptor();\n\t\t}\n\t}\n\n\tngOnChanges(simpleChanges: SimpleChanges): void {\n\t\tif (simpleChanges.readOnly?.currentValue === true) {\n\t\t\tthis.activeControls.forEach(e => e.formControl.disable());\n\t\t}\n\t}\n\n\tngOnDestroy(): void {\n\t\tif (isValueSet(this.parent) && isValueSet(this.subFormPlaceholder)) {\n\t\t\tconst injectInto = this.subFormPlaceholder.injectInto;\n\t\t\tconst injectAt = this.subFormPlaceholder.at;\n\t\t\tif (injectInto instanceof UntypedFormArray) {\n\t\t\t\tconst idx = injectInto.controls.findIndex(e => e === this.formGroup);\n\t\t\t\tinjectInto.removeAt(idx);\n\t\t\t} else if (injectInto instanceof UntypedFormGroup) {\n\t\t\t\tif (typeof injectAt !== 'string') {\n\t\t\t\t\tthrow new Error(`cannot index FormGroup with ${typeof injectAt}`);\n\t\t\t\t}\n\t\t\t\tinjectInto.removeControl(injectAt);\n\t\t\t}\n\t\t}\n\t}\n\n\tprivate addSupportForPatchValueInterceptor(): void {\n\t\tconst fn = this.formGroup.patchValue;\n\t\tconst newFn = (\n\t\t\tvalue: {\n\t\t\t\t[key: string]: any;\n\t\t\t},\n\t\t\toptions?: {\n\t\t\t\tonlySelf?: boolean;\n\t\t\t\temitEvent?: boolean;\n\t\t\t}\n\t\t): void => {\n\t\t\tthis.patchValueInterceptor(value).then((val) => {\n\t\t\t\tsetTimeout(() => {\n\t\t\t\t\tfn.call(this.formGroup, val, options);\n\t\t\t\t});\n\t\t\t});\n\t\t};\n\t\tthis.formGroup.patchValue = newFn;\n\t}\n\n\tpublic registerControl(formControl: UntypedFormControl, formElement: FormElementComponent): void {\n\t\tthis.activeControls.push({formControl, formElement});\n\t\tif (this.parent) {\n\t\t\tthis.parent.registerControl(formControl, formElement);\n\t\t}\n\t\tif (this.readOnly) {\n\t\t\tformControl.disable();\n\t\t}\n\t}\n\n\tpublic unregisterControl(formControl: UntypedFormControl): void {\n\t\tthis.activeControls = this.activeControls.filter((e) => e.formControl !== formControl);\n\t\tif (this.parent) {\n\t\t\tthis.parent.unregisterControl(formControl);\n\t\t}\n\t}\n\n\tprivate addFormGroupControls(formGroup: UntypedFormGroup, result: Array<UntypedFormControl>): void {\n\t\tObject.values(formGroup.controls).forEach((value) => {\n\t\t\tif (value instanceof UntypedFormGroup) {\n\t\t\t\tthis.addFormGroupControls(value, result);\n\t\t\t} else if (value instanceof UntypedFormArray) {\n\t\t\t\tthis.addFormArrayControls(value, result);\n\t\t\t} else if (value instanceof UntypedFormControl) {\n\t\t\t\tthis.addFormControl(value, result);\n\t\t\t}\n\t\t});\n\t}\n\n\tprivate addFormArrayControls(formArray: UntypedFormArray, result: Array<UntypedFormControl>): void {\n\t\tformArray.controls.forEach((value) => {\n\t\t\tif (value instanceof UntypedFormGroup) {\n\t\t\t\tthis.addFormGroupControls(value, result);\n\t\t\t} else if (value instanceof UntypedFormArray) {\n\t\t\t\tthis.addFormArrayControls(value, result);\n\t\t\t} else if (value instanceof UntypedFormControl) {\n\t\t\t\tthis.addFormControl(value, result);\n\t\t\t}\n\t\t});\n\t}\n\n\tprivate getAllFormControls(): Array<UntypedFormControl> {\n\t\tconst result = [];\n\t\tthis.addFormGroupControls(this.formGroup, result);\n\t\treturn result;\n\t}\n\n\tprivate addFormControl(control: UntypedFormControl, result: Array<UntypedFormControl>): void {\n\t\tresult.push(control);\n\t}\n\n\tprivate disableInactiveFormControl(control: UntypedFormControl): void {\n\t\tif (!this.activeControls.some((e) => e.formControl === control)) {\n\t\t\tcontrol.disable();\n\t\t}\n\t}\n\n\ttrySubmit(): Promise<any> {\n\t\tthis.formGroup.markAllAsTouched();\n\t\tconst allControls: Array<UntypedFormControl> = this.getAllFormControls();\n\t\tconst originalDisabledStates = allControls.map(e => {\n\t\t\treturn {control: e, disabled: e.disabled};\n\t\t});\n\t\tallControls.forEach(e => this.disableInactiveFormControl(e));\n\t\tallControls.forEach(e => e.updateValueAndValidity());\n\t\tconst values = this.formGroup.value;\n\t\tif (this.formGroup.valid) {\n\t\t\tthis.setDisabledStatesForAllControls(originalDisabledStates);\n\t\t\treturn Promise.resolve(values);\n\t\t} else {\n\t\t\tthis.activeControls.find((e) => !e.formControl.valid)?.formElement?.scrollTo();\n\t\t\tthis.setDisabledStatesForAllControls(originalDisabledStates);\n\t\t\treturn Promise.reject(invalidFieldsSymbol);\n\t\t}\n\t}\n\n\tprivate setDisabledStatesForAllControls(originalDisabledStates: Array<{ control: AbstractControl; disabled: boolean }>): void {\n\t\toriginalDisabledStates.forEach((e) => {\n\t\t\tif (e.disabled) {\n\t\t\t\te.control.disable();\n\t\t\t} else {\n\t\t\t\te.control.enable();\n\t\t\t}\n\t\t});\n\t}\n}\n","<form>\n\t<ng-content></ng-content>\n</form>\n\n\n"]}
|
|
228
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"form.component.js","sourceRoot":"","sources":["../../../../../../projects/klippa/ngx-enhancy-forms/src/lib/form/form.component.ts","../../../../../../projects/klippa/ngx-enhancy-forms/src/lib/form/form.component.html"],"names":[],"mappings":"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","sourcesContent":["import {Component, Directive, Input, OnChanges, OnDestroy, OnInit, Optional, SimpleChanges, SkipSelf} from '@angular/core';\nimport {AbstractControl, FormArray, FormControl, FormGroup, UntypedFormArray, UntypedFormControl, UntypedFormGroup} from '@angular/forms';\nimport {FormElementComponent} from './form-element/form-element.component';\nimport {isValueSet} from '../util/values';\nimport { deepMerge } from '../util/objects';\n\nexport const invalidFieldsSymbol = Symbol('Not all fields are valid');\n\n@Directive({\n\t// tslint:disable-next-line:directive-selector\n\tselector: 'klp-sub-form',\n})\nexport class SubFormDirective {\n\t@Input() injectInto: UntypedFormArray | UntypedFormGroup;\n\t@Input() at: number | string;\n}\n\n@Component({\n\tselector: 'klp-form',\n\ttemplateUrl: './form.component.html',\n\tstyleUrls: ['./form.component.scss'],\n})\nexport class FormComponent implements OnInit, OnDestroy, OnChanges {\n\t@Input() public readOnly = false;\n\t@Input() public showErrorMessages = true;\n\t@Input() public errorMessageLocation: 'belowCaption' | 'rightOfCaption' = 'belowCaption';\n\t@Input() public formGroup: UntypedFormGroup;\n\t@Input() public patchValueInterceptor: (values: any) => Promise<any>;\n\n\t// we keep track of what form controls are actually rendered. Only those count when looking at form validation\n\tprivate activeControls: Array<{\n\t\tformControl: UntypedFormControl;\n\t\tformElement: FormElementComponent;\n\t}> = [];\n\n\tconstructor(@SkipSelf() @Optional() private parent: FormComponent, @Optional() private subFormPlaceholder: SubFormDirective) {\n\t}\n\n\tngOnInit(): void {\n\t\tif (isValueSet(this.parent) && isValueSet(this.subFormPlaceholder)) {\n\t\t\tconst injectInto = this.subFormPlaceholder.injectInto;\n\t\t\tconst injectAt = this.subFormPlaceholder.at;\n\t\t\tif (injectInto instanceof UntypedFormArray) {\n\t\t\t\tif (typeof injectAt !== 'number') {\n\t\t\t\t\tthrow new Error(`cannot index FormArray with ${typeof injectAt}`);\n\t\t\t\t}\n\n\t\t\t\tinjectInto.setControl(injectAt, this.formGroup);\n\t\t\t} else if (injectInto instanceof UntypedFormGroup) {\n\t\t\t\tif (typeof injectAt !== 'string') {\n\t\t\t\t\tthrow new Error(`cannot index FormGroup with ${typeof injectAt}`);\n\t\t\t\t}\n\n\t\t\t\tinjectInto.setControl(injectAt, this.formGroup);\n\t\t\t}\n\t\t}\n\t\tif (isValueSet(this.patchValueInterceptor)) {\n\t\t\tthis.addSupportForPatchValueInterceptor();\n\t\t}\n\t}\n\n\tngOnChanges(simpleChanges: SimpleChanges): void {\n\t\tif (simpleChanges.readOnly?.currentValue === true) {\n\t\t\tthis.activeControls.forEach(e => e.formControl.disable());\n\t\t}\n\t}\n\n\tngOnDestroy(): void {\n\t\tif (isValueSet(this.parent) && isValueSet(this.subFormPlaceholder)) {\n\t\t\tconst injectInto = this.subFormPlaceholder.injectInto;\n\t\t\tconst injectAt = this.subFormPlaceholder.at;\n\t\t\tif (injectInto instanceof UntypedFormArray) {\n\t\t\t\tconst idx = injectInto.controls.findIndex(e => e === this.formGroup);\n\t\t\t\tinjectInto.removeAt(idx);\n\t\t\t} else if (injectInto instanceof UntypedFormGroup) {\n\t\t\t\tif (typeof injectAt !== 'string') {\n\t\t\t\t\tthrow new Error(`cannot index FormGroup with ${typeof injectAt}`);\n\t\t\t\t}\n\t\t\t\tinjectInto.removeControl(injectAt);\n\t\t\t}\n\t\t}\n\t}\n\n\tprivate addSupportForPatchValueInterceptor(): void {\n\t\tconst fn = this.formGroup.patchValue;\n\t\tconst newFn = (\n\t\t\tvalue: {\n\t\t\t\t[key: string]: any;\n\t\t\t},\n\t\t\toptions?: {\n\t\t\t\tonlySelf?: boolean;\n\t\t\t\temitEvent?: boolean;\n\t\t\t}\n\t\t): void => {\n\t\t\tthis.patchValueInterceptor(value).then((val) => {\n\t\t\t\tsetTimeout(() => {\n\t\t\t\t\tfn.call(this.formGroup, val, options);\n\t\t\t\t});\n\t\t\t});\n\t\t};\n\t\tthis.formGroup.patchValue = newFn;\n\t}\n\n\tpublic registerControl(formControl: UntypedFormControl, formElement: FormElementComponent): void {\n\t\tthis.activeControls.push({formControl, formElement});\n\t\tif (this.parent) {\n\t\t\tthis.parent.registerControl(formControl, formElement);\n\t\t}\n\t\tif (this.readOnly) {\n\t\t\tformControl.disable();\n\t\t}\n\t}\n\n\tpublic unregisterControl(formControl: UntypedFormControl): void {\n\t\tthis.activeControls = this.activeControls.filter((e) => e.formControl !== formControl);\n\t\tif (this.parent) {\n\t\t\tthis.parent.unregisterControl(formControl);\n\t\t}\n\t}\n\n\tprivate addFormGroupControls(formGroup: UntypedFormGroup, result: Array<UntypedFormControl>): void {\n\t\tObject.values(formGroup.controls).forEach((value) => {\n\t\t\tif (value instanceof UntypedFormGroup) {\n\t\t\t\tthis.addFormGroupControls(value, result);\n\t\t\t} else if (value instanceof UntypedFormArray) {\n\t\t\t\tthis.addFormArrayControls(value, result);\n\t\t\t} else if (value instanceof UntypedFormControl) {\n\t\t\t\tthis.addFormControl(value, result);\n\t\t\t}\n\t\t});\n\t}\n\n\tprivate addFormArrayControls(formArray: UntypedFormArray, result: Array<UntypedFormControl>): void {\n\t\tformArray.controls.forEach((value) => {\n\t\t\tif (value instanceof UntypedFormGroup) {\n\t\t\t\tthis.addFormGroupControls(value, result);\n\t\t\t} else if (value instanceof UntypedFormArray) {\n\t\t\t\tthis.addFormArrayControls(value, result);\n\t\t\t} else if (value instanceof UntypedFormControl) {\n\t\t\t\tthis.addFormControl(value, result);\n\t\t\t}\n\t\t});\n\t}\n\n\tprivate getAllFormControls(): Array<UntypedFormControl> {\n\t\tconst result = [];\n\t\tthis.addFormGroupControls(this.formGroup, result);\n\t\treturn result;\n\t}\n\n\tprivate addFormControl(control: UntypedFormControl, result: Array<UntypedFormControl>): void {\n\t\tresult.push(control);\n\t}\n\n\tprivate disableInactiveFormControl(control: UntypedFormControl): void {\n\t\tif (!this.activeControls.some((e) => e.formControl === control)) {\n\t\t\tcontrol.disable();\n\t\t}\n\t}\n\n\ttrySubmit(): Promise<any> {\n\t\tthis.formGroup.markAllAsTouched();\n\t\tconst allControls: Array<UntypedFormControl> = this.getAllFormControls();\n\t\tconst originalDisabledStates = allControls.map(e => {\n\t\t\treturn {control: e, disabled: e.disabled};\n\t\t});\n\t\tallControls.forEach(e => this.disableInactiveFormControl(e));\n\t\tallControls.forEach(e => e.updateValueAndValidity());\n\t\tconst formGroupValue = this.formGroup.value;\n\t\tconst renderedAndEnabledValues = this.getRenderedFieldValuesFormGroup(this.formGroup, true);\n\t\tconst renderedButDisabledValues = this.getRenderedFieldValuesFormGroup(this.formGroup, false);\n\t\tif (this.formGroup.valid) {\n\t\t\tthis.setDisabledStatesForAllControls(originalDisabledStates);\n\t\t\tconst renderedValues = deepMerge(renderedAndEnabledValues, renderedButDisabledValues);\n\t\t\treturn Promise.resolve([formGroupValue, renderedValues]);\n\t\t} else {\n\t\t\tthis.activeControls.find((e) => !e.formControl.valid)?.formElement?.scrollTo();\n\t\t\tthis.setDisabledStatesForAllControls(originalDisabledStates);\n\t\t\treturn Promise.reject(invalidFieldsSymbol);\n\t\t}\n\t}\n\n\tprivate getRenderedFieldValuesFormGroup(formGroup: FormGroup, enabled: boolean, valueObject = {}): object {\n\t\tObject.entries(formGroup.controls).forEach(([name, control]) => {\n\t\t\tif (control instanceof FormControl && control.enabled === enabled && this.activeControls.some(e => e.formControl === control)) {\n\t\t\t\tvalueObject[name] = control.value;\n\t\t\t} else if (control instanceof FormArray) {\n\t\t\t\tvalueObject[name] = [];\n\t\t\t\tthis.getRenderedFieldValuesFormArray(control, enabled, valueObject[name]);\n\t\t\t} else if (control instanceof FormGroup) {\n\t\t\t\tvalueObject[name] = {};\n\t\t\t\tthis.getRenderedFieldValuesFormGroup(control, enabled, valueObject[name]);\n\t\t\t}\n\t\t});\n\t\treturn valueObject;\n\t}\n\n\tprivate getRenderedFieldValuesFormArray(formArray: FormArray, enabled: boolean, valueArray: Array<any>): void {\n\t\tformArray.controls.forEach((control: AbstractControl) => {\n\t\t\tif (control instanceof FormControl && control.enabled === enabled && this.activeControls.some(e => e.formControl === control)) {\n\t\t\t\tvalueArray.push(control.value);\n\t\t\t} else if (control instanceof FormArray) {\n\t\t\t\tconst newArray = [];\n\t\t\t\tvalueArray.push(newArray);\n\t\t\t\tthis.getRenderedFieldValuesFormArray(control, enabled, newArray);\n\t\t\t} else if (control instanceof FormGroup) {\n\t\t\t\tconst newObject = {};\n\t\t\t\tvalueArray.push(newObject);\n\t\t\t\tthis.getRenderedFieldValuesFormGroup(control, enabled, newObject);\n\t\t\t}\n\t\t});\n\t}\n\n\tprivate setDisabledStatesForAllControls(originalDisabledStates: Array<{ control: AbstractControl; disabled: boolean }>): void {\n\t\toriginalDisabledStates.forEach((e) => {\n\t\t\tif (e.disabled) {\n\t\t\t\te.control.disable();\n\t\t\t} else {\n\t\t\t\te.control.enable();\n\t\t\t}\n\t\t});\n\t}\n}\n","<form>\n\t<ng-content></ng-content>\n</form>\n\n\n"]}
|
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
function mergeArray(arrA, arrB) {
|
|
2
|
+
const arr = new Array(Math.max(arrA.length, arrB.length));
|
|
3
|
+
for (let i = 0; i < arr.length; i++) {
|
|
4
|
+
if (typeof arrA[i] === 'object' && typeof arrB[i] === 'object') {
|
|
5
|
+
arr[i] = deepMerge(arrA[i], arrB[i]);
|
|
6
|
+
}
|
|
7
|
+
else {
|
|
8
|
+
arr[i] = arrB[i] ?? arrA[i];
|
|
9
|
+
}
|
|
10
|
+
}
|
|
11
|
+
return arr;
|
|
12
|
+
}
|
|
13
|
+
export function deepMerge(objA, objB) {
|
|
14
|
+
if (Array.isArray(objA) || Array.isArray(objB)) {
|
|
15
|
+
if (Array.isArray(objA) && Array.isArray(objB)) {
|
|
16
|
+
return mergeArray(objA, objB);
|
|
17
|
+
}
|
|
18
|
+
// if a and b differ in type, prefer b.
|
|
19
|
+
return objB ?? objA;
|
|
20
|
+
}
|
|
21
|
+
const merged = {};
|
|
22
|
+
const keys = new Set([
|
|
23
|
+
...Object.keys(objA),
|
|
24
|
+
...Object.keys(objB),
|
|
25
|
+
]);
|
|
26
|
+
keys.forEach((key) => {
|
|
27
|
+
const a = objA[key];
|
|
28
|
+
const b = objB[key];
|
|
29
|
+
if (typeof a === 'object' && typeof b === 'object') {
|
|
30
|
+
merged[key] = deepMerge(a, b);
|
|
31
|
+
return;
|
|
32
|
+
}
|
|
33
|
+
// if a and b differ in type, prefer b.
|
|
34
|
+
merged[key] = (b ?? a);
|
|
35
|
+
});
|
|
36
|
+
return merged;
|
|
37
|
+
}
|
|
38
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib2JqZWN0cy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL2tsaXBwYS9uZ3gtZW5oYW5jeS1mb3Jtcy9zcmMvbGliL3V0aWwvb2JqZWN0cy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxTQUFTLFVBQVUsQ0FBQyxJQUFnQixFQUFFLElBQWdCO0lBQ3JELE1BQU0sR0FBRyxHQUFHLElBQUksS0FBSyxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLE1BQU0sRUFBRSxJQUFJLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQztJQUUxRCxLQUFLLElBQUksQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDLEdBQUcsR0FBRyxDQUFDLE1BQU0sRUFBRSxDQUFDLEVBQUUsRUFBRTtRQUNwQyxJQUFJLE9BQU8sSUFBSSxDQUFDLENBQUMsQ0FBQyxLQUFLLFFBQVEsSUFBSSxPQUFPLElBQUksQ0FBQyxDQUFDLENBQUMsS0FBSyxRQUFRLEVBQUU7WUFDL0QsR0FBRyxDQUFDLENBQUMsQ0FBQyxHQUFHLFNBQVMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLEVBQUUsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7U0FDckM7YUFBTTtZQUNOLEdBQUcsQ0FBQyxDQUFDLENBQUMsR0FBRyxJQUFJLENBQUMsQ0FBQyxDQUFDLElBQUksSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDO1NBQzVCO0tBQ0Q7SUFFRCxPQUFPLEdBQUcsQ0FBQztBQUNaLENBQUM7QUFFRCxNQUFNLFVBQVUsU0FBUyxDQUd2QixJQUFPLEVBQUUsSUFBTztJQUNqQixJQUFJLEtBQUssQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLElBQUksS0FBSyxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsRUFBRTtRQUMvQyxJQUFJLEtBQUssQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLElBQUksS0FBSyxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsRUFBRTtZQUMvQyxPQUFPLFVBQVUsQ0FBQyxJQUFJLEVBQUUsSUFBSSxDQUFVLENBQUM7U0FDdkM7UUFFRCx1Q0FBdUM7UUFDdkMsT0FBTyxJQUFJLElBQUksSUFBSSxDQUFDO0tBQ3BCO0lBRUQsTUFBTSxNQUFNLEdBQVUsRUFBVyxDQUFDO0lBRWxDLE1BQU0sSUFBSSxHQUFHLElBQUksR0FBRyxDQUFvQjtRQUN2QyxHQUFHLE1BQU0sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDO1FBQ3BCLEdBQUcsTUFBTSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUM7S0FDUSxDQUFDLENBQUM7SUFFL0IsSUFBSSxDQUFDLE9BQU8sQ0FBQyxDQUFDLEdBQUcsRUFBRSxFQUFFO1FBQ3BCLE1BQU0sQ0FBQyxHQUFHLElBQUksQ0FBQyxHQUFjLENBQUMsQ0FBQztRQUMvQixNQUFNLENBQUMsR0FBRyxJQUFJLENBQUMsR0FBYyxDQUFDLENBQUM7UUFFL0IsSUFBSSxPQUFPLENBQUMsS0FBSyxRQUFRLElBQUksT0FBTyxDQUFDLEtBQUssUUFBUSxFQUFFO1lBQ25ELE1BQU0sQ0FBQyxHQUFvQixDQUFDLEdBQUcsU0FBUyxDQUFDLENBQVEsRUFBRSxDQUFRLENBQVEsQ0FBQztZQUNwRSxPQUFPO1NBQ1A7UUFFRCx1Q0FBdUM7UUFDdkMsTUFBTSxDQUFDLEdBQW9CLENBQUMsR0FBRyxDQUFDLENBQUMsSUFBSSxDQUFDLENBQVEsQ0FBQztJQUNoRCxDQUFDLENBQUMsQ0FBQztJQUVILE9BQU8sTUFBTSxDQUFDO0FBQ2YsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImZ1bmN0aW9uIG1lcmdlQXJyYXkoYXJyQTogQXJyYXk8YW55PiwgYXJyQjogQXJyYXk8YW55Pik6IEFycmF5PGFueT4ge1xuXHRjb25zdCBhcnIgPSBuZXcgQXJyYXkoTWF0aC5tYXgoYXJyQS5sZW5ndGgsIGFyckIubGVuZ3RoKSk7XG5cblx0Zm9yIChsZXQgaSA9IDA7IGkgPCBhcnIubGVuZ3RoOyBpKyspIHtcblx0XHRpZiAodHlwZW9mIGFyckFbaV0gPT09ICdvYmplY3QnICYmIHR5cGVvZiBhcnJCW2ldID09PSAnb2JqZWN0Jykge1xuXHRcdFx0YXJyW2ldID0gZGVlcE1lcmdlKGFyckFbaV0sIGFyckJbaV0pO1xuXHRcdH0gZWxzZSB7XG5cdFx0XHRhcnJbaV0gPSBhcnJCW2ldID8/IGFyckFbaV07XG5cdFx0fVxuXHR9XG5cblx0cmV0dXJuIGFycjtcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIGRlZXBNZXJnZTxcblx0QSBleHRlbmRzIG9iamVjdCB8IEFycmF5PGFueT4sXG5cdEIgZXh0ZW5kcyBvYmplY3QgfCBBcnJheTxhbnk+XG4+KG9iakE6IEEsIG9iakI6IEIpOiBBIHwgQiB7XG5cdGlmIChBcnJheS5pc0FycmF5KG9iakEpIHx8IEFycmF5LmlzQXJyYXkob2JqQikpIHtcblx0XHRpZiAoQXJyYXkuaXNBcnJheShvYmpBKSAmJiBBcnJheS5pc0FycmF5KG9iakIpKSB7XG5cdFx0XHRyZXR1cm4gbWVyZ2VBcnJheShvYmpBLCBvYmpCKSBhcyBBIHwgQjtcblx0XHR9XG5cblx0XHQvLyBpZiBhIGFuZCBiIGRpZmZlciBpbiB0eXBlLCBwcmVmZXIgYi5cblx0XHRyZXR1cm4gb2JqQiA/PyBvYmpBO1xuXHR9XG5cblx0Y29uc3QgbWVyZ2VkOiBBIHwgQiA9IHt9IGFzIEEgfCBCO1xuXG5cdGNvbnN0IGtleXMgPSBuZXcgU2V0PGtleW9mIEEgfCBrZXlvZiBCPihbXG5cdFx0Li4uT2JqZWN0LmtleXMob2JqQSksXG5cdFx0Li4uT2JqZWN0LmtleXMob2JqQiksXG5cdF0gYXMgQXJyYXk8a2V5b2YgQSB8IGtleW9mIEI+KTtcblxuXHRrZXlzLmZvckVhY2goKGtleSkgPT4ge1xuXHRcdGNvbnN0IGEgPSBvYmpBW2tleSBhcyBrZXlvZiBBXTtcblx0XHRjb25zdCBiID0gb2JqQltrZXkgYXMga2V5b2YgQl07XG5cblx0XHRpZiAodHlwZW9mIGEgPT09ICdvYmplY3QnICYmIHR5cGVvZiBiID09PSAnb2JqZWN0Jykge1xuXHRcdFx0bWVyZ2VkW2tleSBhcyBrZXlvZiAoQSB8IEIpXSA9IGRlZXBNZXJnZShhIGFzIGFueSwgYiBhcyBhbnkpIGFzIGFueTtcblx0XHRcdHJldHVybjtcblx0XHR9XG5cblx0XHQvLyBpZiBhIGFuZCBiIGRpZmZlciBpbiB0eXBlLCBwcmVmZXIgYi5cblx0XHRtZXJnZWRba2V5IGFzIGtleW9mIChBIHwgQildID0gKGIgPz8gYSkgYXMgYW55O1xuXHR9KTtcblxuXHRyZXR1cm4gbWVyZ2VkO1xufVxuIl19
|
|
@@ -3,7 +3,7 @@ import { Directive, Input, Component, SkipSelf, Optional, InjectionToken, Host,
|
|
|
3
3
|
import * as i1 from '@angular/common';
|
|
4
4
|
import { CommonModule } from '@angular/common';
|
|
5
5
|
import * as i2 from '@angular/forms';
|
|
6
|
-
import { UntypedFormArray, UntypedFormGroup, UntypedFormControl, NG_VALUE_ACCESSOR, FormsModule } from '@angular/forms';
|
|
6
|
+
import { UntypedFormArray, UntypedFormGroup, UntypedFormControl, FormControl, FormArray, FormGroup, NG_VALUE_ACCESSOR, FormsModule } from '@angular/forms';
|
|
7
7
|
import { isString } from 'lodash-es';
|
|
8
8
|
import { isArray } from 'lodash';
|
|
9
9
|
import { __awaiter } from 'tslib';
|
|
@@ -87,6 +87,45 @@ function splitArrayByCondition(value, condition) {
|
|
|
87
87
|
}, [[]]);
|
|
88
88
|
}
|
|
89
89
|
|
|
90
|
+
function mergeArray(arrA, arrB) {
|
|
91
|
+
var _a;
|
|
92
|
+
const arr = new Array(Math.max(arrA.length, arrB.length));
|
|
93
|
+
for (let i = 0; i < arr.length; i++) {
|
|
94
|
+
if (typeof arrA[i] === 'object' && typeof arrB[i] === 'object') {
|
|
95
|
+
arr[i] = deepMerge(arrA[i], arrB[i]);
|
|
96
|
+
}
|
|
97
|
+
else {
|
|
98
|
+
arr[i] = (_a = arrB[i]) !== null && _a !== void 0 ? _a : arrA[i];
|
|
99
|
+
}
|
|
100
|
+
}
|
|
101
|
+
return arr;
|
|
102
|
+
}
|
|
103
|
+
function deepMerge(objA, objB) {
|
|
104
|
+
if (Array.isArray(objA) || Array.isArray(objB)) {
|
|
105
|
+
if (Array.isArray(objA) && Array.isArray(objB)) {
|
|
106
|
+
return mergeArray(objA, objB);
|
|
107
|
+
}
|
|
108
|
+
// if a and b differ in type, prefer b.
|
|
109
|
+
return objB !== null && objB !== void 0 ? objB : objA;
|
|
110
|
+
}
|
|
111
|
+
const merged = {};
|
|
112
|
+
const keys = new Set([
|
|
113
|
+
...Object.keys(objA),
|
|
114
|
+
...Object.keys(objB),
|
|
115
|
+
]);
|
|
116
|
+
keys.forEach((key) => {
|
|
117
|
+
const a = objA[key];
|
|
118
|
+
const b = objB[key];
|
|
119
|
+
if (typeof a === 'object' && typeof b === 'object') {
|
|
120
|
+
merged[key] = deepMerge(a, b);
|
|
121
|
+
return;
|
|
122
|
+
}
|
|
123
|
+
// if a and b differ in type, prefer b.
|
|
124
|
+
merged[key] = (b !== null && b !== void 0 ? b : a);
|
|
125
|
+
});
|
|
126
|
+
return merged;
|
|
127
|
+
}
|
|
128
|
+
|
|
90
129
|
const invalidFieldsSymbol = Symbol('Not all fields are valid');
|
|
91
130
|
class SubFormDirective {
|
|
92
131
|
}
|
|
@@ -230,10 +269,13 @@ class FormComponent {
|
|
|
230
269
|
});
|
|
231
270
|
allControls.forEach(e => this.disableInactiveFormControl(e));
|
|
232
271
|
allControls.forEach(e => e.updateValueAndValidity());
|
|
233
|
-
const
|
|
272
|
+
const formGroupValue = this.formGroup.value;
|
|
273
|
+
const renderedAndEnabledValues = this.getRenderedFieldValuesFormGroup(this.formGroup, true);
|
|
274
|
+
const renderedButDisabledValues = this.getRenderedFieldValuesFormGroup(this.formGroup, false);
|
|
234
275
|
if (this.formGroup.valid) {
|
|
235
276
|
this.setDisabledStatesForAllControls(originalDisabledStates);
|
|
236
|
-
|
|
277
|
+
const renderedValues = deepMerge(renderedAndEnabledValues, renderedButDisabledValues);
|
|
278
|
+
return Promise.resolve([formGroupValue, renderedValues]);
|
|
237
279
|
}
|
|
238
280
|
else {
|
|
239
281
|
(_b = (_a = this.activeControls.find((e) => !e.formControl.valid)) === null || _a === void 0 ? void 0 : _a.formElement) === null || _b === void 0 ? void 0 : _b.scrollTo();
|
|
@@ -241,6 +283,39 @@ class FormComponent {
|
|
|
241
283
|
return Promise.reject(invalidFieldsSymbol);
|
|
242
284
|
}
|
|
243
285
|
}
|
|
286
|
+
getRenderedFieldValuesFormGroup(formGroup, enabled, valueObject = {}) {
|
|
287
|
+
Object.entries(formGroup.controls).forEach(([name, control]) => {
|
|
288
|
+
if (control instanceof FormControl && control.enabled === enabled && this.activeControls.some(e => e.formControl === control)) {
|
|
289
|
+
valueObject[name] = control.value;
|
|
290
|
+
}
|
|
291
|
+
else if (control instanceof FormArray) {
|
|
292
|
+
valueObject[name] = [];
|
|
293
|
+
this.getRenderedFieldValuesFormArray(control, enabled, valueObject[name]);
|
|
294
|
+
}
|
|
295
|
+
else if (control instanceof FormGroup) {
|
|
296
|
+
valueObject[name] = {};
|
|
297
|
+
this.getRenderedFieldValuesFormGroup(control, enabled, valueObject[name]);
|
|
298
|
+
}
|
|
299
|
+
});
|
|
300
|
+
return valueObject;
|
|
301
|
+
}
|
|
302
|
+
getRenderedFieldValuesFormArray(formArray, enabled, valueArray) {
|
|
303
|
+
formArray.controls.forEach((control) => {
|
|
304
|
+
if (control instanceof FormControl && control.enabled === enabled && this.activeControls.some(e => e.formControl === control)) {
|
|
305
|
+
valueArray.push(control.value);
|
|
306
|
+
}
|
|
307
|
+
else if (control instanceof FormArray) {
|
|
308
|
+
const newArray = [];
|
|
309
|
+
valueArray.push(newArray);
|
|
310
|
+
this.getRenderedFieldValuesFormArray(control, enabled, newArray);
|
|
311
|
+
}
|
|
312
|
+
else if (control instanceof FormGroup) {
|
|
313
|
+
const newObject = {};
|
|
314
|
+
valueArray.push(newObject);
|
|
315
|
+
this.getRenderedFieldValuesFormGroup(control, enabled, newObject);
|
|
316
|
+
}
|
|
317
|
+
});
|
|
318
|
+
}
|
|
244
319
|
setDisabledStatesForAllControls(originalDisabledStates) {
|
|
245
320
|
originalDisabledStates.forEach((e) => {
|
|
246
321
|
if (e.disabled) {
|
|
@@ -1023,9 +1098,9 @@ class FormSubmitButtonComponent {
|
|
|
1023
1098
|
submitForm() {
|
|
1024
1099
|
this.parentForm
|
|
1025
1100
|
.trySubmit()
|
|
1026
|
-
.then((
|
|
1101
|
+
.then(([renderedAndEnabledValues, renderedValues]) => {
|
|
1027
1102
|
this.isLoading = true;
|
|
1028
|
-
const submitCallbackResult = this.submitCallback(
|
|
1103
|
+
const submitCallbackResult = this.submitCallback(renderedAndEnabledValues, renderedValues);
|
|
1029
1104
|
if (isNullOrUndefined(submitCallbackResult)) {
|
|
1030
1105
|
throw new Error('No promise is returned in your submit function.');
|
|
1031
1106
|
}
|