@klippa/ngx-enhancy-forms 2.2.0 → 2.3.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/bundles/klippa-ngx-enhancy-forms.umd.js +459 -412
- package/bundles/klippa-ngx-enhancy-forms.umd.js.map +1 -1
- package/bundles/klippa-ngx-enhancy-forms.umd.min.js +2 -3
- package/bundles/klippa-ngx-enhancy-forms.umd.min.js.map +1 -1
- package/esm2015/lib/form/form-element/form-element.component.js +3 -1
- package/esm2015/lib/form/form.component.js +56 -14
- package/fesm2015/klippa-ngx-enhancy-forms.js +94 -51
- package/fesm2015/klippa-ngx-enhancy-forms.js.map +1 -1
- package/klippa-ngx-enhancy-forms.metadata.json +1 -1
- package/lib/form/form.component.d.ts +15 -5
- package/package.json +1 -1
|
@@ -28,6 +28,8 @@ export class FormElementComponent {
|
|
|
28
28
|
}, message);
|
|
29
29
|
}
|
|
30
30
|
registerControl(formControl) {
|
|
31
|
+
// console.log('register');
|
|
32
|
+
// console.log(this.caption);
|
|
31
33
|
this.attachedControl = formControl;
|
|
32
34
|
this.parent.registerControl(formControl, this);
|
|
33
35
|
}
|
|
@@ -97,4 +99,4 @@ FormElementComponent.propDecorators = {
|
|
|
97
99
|
swapInputAndCaption: [{ type: Input }],
|
|
98
100
|
internalComponentRef: [{ type: ViewChild, args: ['internalComponentRef',] }]
|
|
99
101
|
};
|
|
100
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
102
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"form-element.component.js","sourceRoot":"/home/runner/work/ngx-enhancy-forms/ngx-enhancy-forms/projects/klippa/ngx-enhancy-forms/src/","sources":["lib/form/form-element/form-element.component.ts"],"names":[],"mappings":"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","sourcesContent":["import {Component, ElementRef, Host, Inject, InjectionToken, Input, OnInit, Optional, ViewChild} from '@angular/core';\nimport { AbstractControl, FormControl } from '@angular/forms';\nimport {FormComponent} from \"../form.component\";\nimport {CustomErrorMessages, FormErrorMessages} from \"../../types\";\n\nexport const FORM_ERROR_MESSAGES = new InjectionToken<CustomErrorMessages>('form.error.messages');\n\nexport const DEFAULT_ERROR_MESSAGES: FormErrorMessages = {\n\tmin: \"Use a number larger than %min%\",\n\tmax: \"Use a number smaller than %max%\",\n\trequired: \"This field is required\",\n\temail: \"Use a valid email address\",\n\tminLength: \"Has to be longer than %minLength% character(s)\",\n\tmaxLength: \"Has to be shorter than %maxLength% character(s)\",\n\tpattern: \"This input is not valid\",\n\tmatchPassword: \"Passwords must match\",\n\tdate: \"Enter a valid date\",\n}\n\n@Component({\n\tselector: 'klp-form-element',\n\ttemplateUrl: './form-element.component.html',\n\tstyleUrls: ['./form-element.component.scss'],\n})\nexport class FormElementComponent {\n\tpublic attachedControl: AbstractControl;\n\t@Input() public caption: String;\n\t@Input() public direction: 'horizontal' | 'vertical' = 'horizontal';\n\t@Input() public captionSpacing: 'percentages' | 'none' = 'percentages';\n\t@Input() public swapInputAndCaption: boolean = false;\n\t@ViewChild('internalComponentRef') public internalComponentRef: ElementRef;\n\n\tpublic captionRef: ElementRef;\n\tpublic errorMessages: FormErrorMessages = DEFAULT_ERROR_MESSAGES;\n\tpublic customErrorHandlers: Array<{ error: string; templateRef: ElementRef }> = [];\n\n\tconstructor(\n\t\t@Host() @Optional() private parent: FormComponent,\n\t\t@Inject(FORM_ERROR_MESSAGES) @Optional() private customMessages: CustomErrorMessages\n\t) {\n\t}\n\n\tpublic substituteParameters(message: string, parameters: Record<string, any>): string {\n\t\treturn Object.keys(parameters).reduce((msg, key) => {\n\t\t\treturn msg.replace(`%${key}%`, parameters[key]);\n\t\t}, message);\n\t}\n\n\tpublic registerControl(formControl: FormControl) {\n\t\t// console.log('register');\n\t\t// console.log(this.caption);\n\t\tthis.attachedControl = formControl;\n\t\tthis.parent.registerControl(formControl, this);\n\t}\n\n\tpublic unregisterControl(formControl: FormControl) {\n\t\tthis.attachedControl = null;\n\t\tthis.parent.unregisterControl(formControl);\n\t}\n\n\tpublic getAttachedControl() {\n\t\treturn this.attachedControl;\n\t}\n\n\tpublic registerErrorHandler(error: string, templateRef: ElementRef) {\n\t\tthis.customErrorHandlers.push({ error, templateRef });\n\t}\n\n\tpublic registerCaption(templateRef: ElementRef) {\n\t\tthis.captionRef = templateRef;\n\t}\n\n\tgetErrorToShow() {\n\t\tif (this.attachedControl?.touched === true && this.attachedControl?.errors) {\n\t\t\treturn Object.keys(this.attachedControl?.errors)[0];\n\t\t}\n\t\treturn null;\n\t}\n\n\tgetCustomErrorHandler(error: string) {\n\t\treturn this.customErrorHandlers.find((e) => e.error === error);\n\t}\n\n\tshowDefaultError(error: string) {\n\t\treturn this.getErrorToShow() === error && !this.customErrorHandlers.some((e) => e.error === error);\n\t}\n\n\tgetScrollableParent(node) {\n\t\tif (node == null) {\n\t\t\treturn null;\n\t\t}\n\t\tif (node.scrollHeight > node.clientHeight) {\n\t\t\treturn node;\n\t\t} else {\n\t\t\treturn this.getScrollableParent(node.parentNode);\n\t\t}\n\t}\n\n\tscrollTo() {\n\t\tthis.internalComponentRef.nativeElement.scrollIntoView(true);\n\t\t// to give some breathing room, we scroll 100px more to the top\n\t\tthis.getScrollableParent(this.internalComponentRef.nativeElement)?.scrollBy(0, -100);\n\t}\n\n\tgetErrorMessages(key: keyof FormErrorMessages) {\n\t\treturn this.customMessages?.[key]?.() ?? this.errorMessages[key];\n\t}\n}\n"]}
|
|
@@ -1,43 +1,80 @@
|
|
|
1
|
-
import { Component, Input } from '@angular/core';
|
|
2
|
-
import { FormArray, FormControl, FormGroup } from '@angular/forms';
|
|
1
|
+
import { Component, Input, Optional, SkipSelf } from '@angular/core';
|
|
2
|
+
import { FormArray, FormControl, FormGroup, FormGroupName } from '@angular/forms';
|
|
3
|
+
import { isValueSet } from '../util/values';
|
|
3
4
|
export const invalidFieldsSymbol = Symbol('Not all fields are valid');
|
|
4
|
-
|
|
5
|
+
// Only used as a 'marker' to define a property will be filled in by a sub form
|
|
6
|
+
export class SubForm extends FormGroup {
|
|
5
7
|
constructor() {
|
|
8
|
+
super({}, null);
|
|
9
|
+
}
|
|
10
|
+
}
|
|
11
|
+
export class FormComponent {
|
|
12
|
+
constructor(parent, surroundingFormGroupName) {
|
|
13
|
+
this.parent = parent;
|
|
14
|
+
this.surroundingFormGroupName = surroundingFormGroupName;
|
|
6
15
|
// we keep track of what form controls are actually rendered. Only those count when looking at form validation
|
|
7
16
|
this.activeControls = [];
|
|
8
17
|
}
|
|
18
|
+
ngOnInit() {
|
|
19
|
+
var _a;
|
|
20
|
+
if (this.parent) {
|
|
21
|
+
if (!isValueSet((_a = this.surroundingFormGroupName) === null || _a === void 0 ? void 0 : _a.name)) {
|
|
22
|
+
throw new Error('No surrounding groupname is found for a nested form');
|
|
23
|
+
}
|
|
24
|
+
const groupName = String(this.surroundingFormGroupName.name);
|
|
25
|
+
const groupToOverwrite = this.parent.formGroup.get(groupName);
|
|
26
|
+
if (!(groupToOverwrite instanceof SubForm)) {
|
|
27
|
+
throw new Error(`Surrounding groupname '${groupName}' is not a subFormSubstitute'`);
|
|
28
|
+
}
|
|
29
|
+
this.parent.formGroup.setControl(groupName, this.formGroup);
|
|
30
|
+
}
|
|
31
|
+
}
|
|
9
32
|
registerControl(formControl, formElement) {
|
|
10
33
|
this.activeControls.push({ formControl, formElement });
|
|
34
|
+
if (this.parent) {
|
|
35
|
+
this.parent.registerControl(formControl, formElement);
|
|
36
|
+
}
|
|
11
37
|
}
|
|
12
38
|
unregisterControl(formControl) {
|
|
13
39
|
this.activeControls = this.activeControls.filter((e) => e.formControl !== formControl);
|
|
40
|
+
if (this.parent) {
|
|
41
|
+
this.parent.unregisterControl(formControl);
|
|
42
|
+
}
|
|
14
43
|
}
|
|
15
|
-
|
|
44
|
+
addFormGroupControls(formGroup, result) {
|
|
16
45
|
Object.values(formGroup.controls).forEach((value) => {
|
|
17
46
|
if (value instanceof FormGroup) {
|
|
18
|
-
this.
|
|
47
|
+
this.addFormGroupControls(value, result);
|
|
19
48
|
}
|
|
20
49
|
else if (value instanceof FormArray) {
|
|
21
|
-
this.
|
|
50
|
+
this.addFormArrayControls(value, result);
|
|
22
51
|
}
|
|
23
52
|
else if (value instanceof FormControl) {
|
|
24
|
-
this.
|
|
53
|
+
this.addFormControl(value, result);
|
|
25
54
|
}
|
|
26
55
|
});
|
|
27
56
|
}
|
|
28
|
-
|
|
57
|
+
addFormArrayControls(formArray, result) {
|
|
29
58
|
formArray.controls.forEach((value) => {
|
|
30
59
|
if (value instanceof FormGroup) {
|
|
31
|
-
this.
|
|
60
|
+
this.addFormGroupControls(value, result);
|
|
32
61
|
}
|
|
33
62
|
else if (value instanceof FormArray) {
|
|
34
|
-
this.
|
|
63
|
+
this.addFormArrayControls(value, result);
|
|
35
64
|
}
|
|
36
65
|
else if (value instanceof FormControl) {
|
|
37
|
-
this.
|
|
66
|
+
this.addFormControl(value, result);
|
|
38
67
|
}
|
|
39
68
|
});
|
|
40
69
|
}
|
|
70
|
+
getAllFormControls() {
|
|
71
|
+
const result = [];
|
|
72
|
+
this.addFormGroupControls(this.formGroup, result);
|
|
73
|
+
return result;
|
|
74
|
+
}
|
|
75
|
+
addFormControl(control, result) {
|
|
76
|
+
result.push(control);
|
|
77
|
+
}
|
|
41
78
|
disableInactiveFormControl(control) {
|
|
42
79
|
if (!this.activeControls.some((e) => e.formControl === control)) {
|
|
43
80
|
control.disable();
|
|
@@ -46,10 +83,11 @@ export class FormComponent {
|
|
|
46
83
|
trySubmit() {
|
|
47
84
|
var _a, _b;
|
|
48
85
|
this.formGroup.markAllAsTouched();
|
|
49
|
-
const
|
|
86
|
+
const allControls = this.getAllFormControls();
|
|
87
|
+
const originalDisabledStates = allControls.map(e => {
|
|
50
88
|
return { control: e, disabled: e.disabled };
|
|
51
89
|
});
|
|
52
|
-
|
|
90
|
+
allControls.forEach(e => this.disableInactiveFormControl(e));
|
|
53
91
|
const values = this.formGroup.value;
|
|
54
92
|
if (this.formGroup.valid) {
|
|
55
93
|
this.setDisabledStatesForAllControls(originalDisabledStates);
|
|
@@ -79,7 +117,11 @@ FormComponent.decorators = [
|
|
|
79
117
|
styles: [":host{display:block}:host.row{display:flex}"]
|
|
80
118
|
},] }
|
|
81
119
|
];
|
|
120
|
+
FormComponent.ctorParameters = () => [
|
|
121
|
+
{ type: FormComponent, decorators: [{ type: SkipSelf }, { type: Optional }] },
|
|
122
|
+
{ type: FormGroupName, decorators: [{ type: Optional }] }
|
|
123
|
+
];
|
|
82
124
|
FormComponent.propDecorators = {
|
|
83
125
|
formGroup: [{ type: Input }]
|
|
84
126
|
};
|
|
85
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZm9ybS5jb21wb25lbnQuanMiLCJzb3VyY2VSb290IjoiL2hvbWUvcnVubmVyL3dvcmsvbmd4LWVuaGFuY3ktZm9ybXMvbmd4LWVuaGFuY3ktZm9ybXMvcHJvamVjdHMva2xpcHBhL25neC1lbmhhbmN5LWZvcm1zL3NyYy8iLCJzb3VyY2VzIjpbImxpYi9mb3JtL2Zvcm0uY29tcG9uZW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxTQUFTLEVBQUUsS0FBSyxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBQ2pELE9BQU8sRUFBa0IsU0FBUyxFQUFFLFdBQVcsRUFBRSxTQUFTLEVBQUMsTUFBTSxnQkFBZ0IsQ0FBQztBQUdsRixNQUFNLENBQUMsTUFBTSxtQkFBbUIsR0FBRyxNQUFNLENBQUMsMEJBQTBCLENBQUMsQ0FBQztBQU90RSxNQUFNLE9BQU8sYUFBYTtJQUwxQjtRQVFDLDhHQUE4RztRQUN0RyxtQkFBYyxHQUdqQixFQUFFLENBQUM7SUFnRVQsQ0FBQztJQTlETyxlQUFlLENBQUMsV0FBd0IsRUFBRSxXQUFpQztRQUNqRixJQUFJLENBQUMsY0FBYyxDQUFDLElBQUksQ0FBQyxFQUFFLFdBQVcsRUFBRSxXQUFXLEVBQUUsQ0FBQyxDQUFDO0lBQ3hELENBQUM7SUFFTSxpQkFBaUIsQ0FBQyxXQUF3QjtRQUNoRCxJQUFJLENBQUMsY0FBYyxHQUFHLElBQUksQ0FBQyxjQUFjLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQUMsV0FBVyxLQUFLLFdBQVcsQ0FBQyxDQUFDO0lBQ3hGLENBQUM7SUFFTyxnQ0FBZ0MsQ0FBQyxTQUFvQjtRQUM1RCxNQUFNLENBQUMsTUFBTSxDQUFDLFNBQVMsQ0FBQyxRQUFRLENBQUMsQ0FBQyxPQUFPLENBQUMsQ0FBQyxLQUFLLEVBQUUsRUFBRTtZQUNuRCxJQUFJLEtBQUssWUFBWSxTQUFTLEVBQUU7Z0JBQy9CLElBQUksQ0FBQyxnQ0FBZ0MsQ0FBQyxLQUFLLENB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b21wb25lbnQsIElucHV0IH0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XG5pbXBvcnQge0Fic3RyYWN0Q29udHJvbCwgRm9ybUFycmF5LCBGb3JtQ29udHJvbCwgRm9ybUdyb3VwfSBmcm9tICdAYW5ndWxhci9mb3Jtcyc7XG5pbXBvcnQge0Zvcm1FbGVtZW50Q29tcG9uZW50fSBmcm9tIFwiLi9mb3JtLWVsZW1lbnQvZm9ybS1lbGVtZW50LmNvbXBvbmVudFwiO1xuXG5leHBvcnQgY29uc3QgaW52YWxpZEZpZWxkc1N5bWJvbCA9IFN5bWJvbCgnTm90IGFsbCBmaWVsZHMgYXJlIHZhbGlkJyk7XG5cbkBDb21wb25lbnQoe1xuXHRzZWxlY3RvcjogJ2tscC1mb3JtJyxcblx0dGVtcGxhdGVVcmw6ICcuL2Zvcm0uY29tcG9uZW50Lmh0bWwnLFxuXHRzdHlsZVVybHM6IFsnLi9mb3JtLmNvbXBvbmVudC5zY3NzJ10sXG59KVxuZXhwb3J0IGNsYXNzIEZvcm1Db21wb25lbnQge1xuXHRASW5wdXQoKSBwdWJsaWMgZm9ybUdyb3VwOiBGb3JtR3JvdXA7XG5cblx0Ly8gd2Uga2VlcCB0cmFjayBvZiB3aGF0IGZvcm0gY29udHJvbHMgYXJlIGFjdHVhbGx5IHJlbmRlcmVkLiBPbmx5IHRob3NlIGNvdW50IHdoZW4gbG9va2luZyBhdCBmb3JtIHZhbGlkYXRpb25cblx0cHJpdmF0ZSBhY3RpdmVDb250cm9sczogQXJyYXk8e1xuXHRcdGZvcm1Db250cm9sOiBGb3JtQ29udHJvbDtcblx0XHRmb3JtRWxlbWVudDogRm9ybUVsZW1lbnRDb21wb25lbnQ7XG5cdH0+ID0gW107XG5cblx0cHVibGljIHJlZ2lzdGVyQ29udHJvbChmb3JtQ29udHJvbDogRm9ybUNvbnRyb2wsIGZvcm1FbGVtZW50OiBGb3JtRWxlbWVudENvbXBvbmVudCk6IHZvaWQge1xuXHRcdHRoaXMuYWN0aXZlQ29udHJvbHMucHVzaCh7IGZvcm1Db250cm9sLCBmb3JtRWxlbWVudCB9KTtcblx0fVxuXG5cdHB1YmxpYyB1bnJlZ2lzdGVyQ29udHJvbChmb3JtQ29udHJvbDogRm9ybUNvbnRyb2wpOiB2b2lkIHtcblx0XHR0aGlzLmFjdGl2ZUNvbnRyb2xzID0gdGhpcy5hY3RpdmVDb250cm9scy5maWx0ZXIoKGUpID0+IGUuZm9ybUNvbnRyb2wgIT09IGZvcm1Db250cm9sKTtcblx0fVxuXG5cdHByaXZhdGUgZGlzYWJsZUluYWN0aXZlRm9ybUdyb3VwQ29udHJvbHMoZm9ybUdyb3VwOiBGb3JtR3JvdXApOiB2b2lkIHtcblx0XHRPYmplY3QudmFsdWVzKGZvcm1Hcm91cC5jb250cm9scykuZm9yRWFjaCgodmFsdWUpID0+IHtcblx0XHRcdGlmICh2YWx1ZSBpbnN0YW5jZW9mIEZvcm1Hcm91cCkge1xuXHRcdFx0XHR0aGlzLmRpc2FibGVJbmFjdGl2ZUZvcm1Hcm91cENvbnRyb2xzKHZhbHVlKTtcblx0XHRcdH0gZWxzZSBpZiAodmFsdWUgaW5zdGFuY2VvZiBGb3JtQXJyYXkpIHtcblx0XHRcdFx0dGhpcy5kaXNhYmxlSW5hY3RpdmVGb3JtQXJyYXlDb250cm9scyh2YWx1ZSk7XG5cdFx0XHR9IGVsc2UgaWYgKHZhbHVlIGluc3RhbmNlb2YgRm9ybUNvbnRyb2wpIHtcblx0XHRcdFx0dGhpcy5kaXNhYmxlSW5hY3RpdmVGb3JtQ29udHJvbCh2YWx1ZSk7XG5cdFx0XHR9XG5cdFx0fSk7XG5cdH1cblx0cHJpdmF0ZSBkaXNhYmxlSW5hY3RpdmVGb3JtQXJyYXlDb250cm9scyhmb3JtQXJyYXk6IEZvcm1BcnJheSk6IHZvaWQge1xuXHRcdGZvcm1BcnJheS5jb250cm9scy5mb3JFYWNoKCh2YWx1ZSkgPT4ge1xuXHRcdFx0aWYgKHZhbHVlIGluc3RhbmNlb2YgRm9ybUdyb3VwKSB7XG5cdFx0XHRcdHRoaXMuZGlzYWJsZUluYWN0aXZlRm9ybUdyb3VwQ29udHJvbHModmFsdWUpO1xuXHRcdFx0fSBlbHNlIGlmICh2YWx1ZSBpbnN0YW5jZW9mIEZvcm1BcnJheSkge1xuXHRcdFx0XHR0aGlzLmRpc2FibGVJbmFjdGl2ZUZvcm1BcnJheUNvbnRyb2xzKHZhbHVlKTtcblx0XHRcdH0gZWxzZSBpZiAodmFsdWUgaW5zdGFuY2VvZiBGb3JtQ29udHJvbCkge1xuXHRcdFx0XHR0aGlzLmRpc2FibGVJbmFjdGl2ZUZvcm1Db250cm9sKHZhbHVlKTtcblx0XHRcdH1cblx0XHR9KTtcblx0fVxuXHRwcml2YXRlIGRpc2FibGVJbmFjdGl2ZUZvcm1Db250cm9sKGNvbnRyb2w6IEZvcm1Db250cm9sKTogdm9pZCB7XG5cdFx0aWYgKCF0aGlzLmFjdGl2ZUNvbnRyb2xzLnNvbWUoKGUpID0+IGUuZm9ybUNvbnRyb2wgPT09IGNvbnRyb2wpKSB7XG5cdFx0XHRjb250cm9sLmRpc2FibGUoKTtcblx0XHR9XG5cdH1cblxuXHR0cnlTdWJtaXQoKTogUHJvbWlzZTxhbnk+IHtcblx0XHR0aGlzLmZvcm1Hcm91cC5tYXJrQWxsQXNUb3VjaGVkKCk7XG5cdFx0Y29uc3Qgb3JpZ2luYWxEaXNhYmxlZFN0YXRlcyA9IE9iamVjdC52YWx1ZXModGhpcy5mb3JtR3JvdXAuY29udHJvbHMpLm1hcChlID0+IHtcblx0XHRcdHJldHVybiB7IGNvbnRyb2w6IGUsIGRpc2FibGVkOiBlLmRpc2FibGVkfTtcblx0XHR9KTtcblx0XHR0aGlzLmRpc2FibGVJbmFjdGl2ZUZvcm1Hcm91cENvbnRyb2xzKHRoaXMuZm9ybUdyb3VwKTtcblx0XHRjb25zdCB2YWx1ZXMgPSB0aGlzLmZvcm1Hcm91cC52YWx1ZTtcblx0XHRpZiAodGhpcy5mb3JtR3JvdXAudmFsaWQpIHtcblx0XHRcdHRoaXMuc2V0RGlzYWJsZWRTdGF0ZXNGb3JBbGxDb250cm9scyhvcmlnaW5hbERpc2FibGVkU3RhdGVzKTtcblx0XHRcdHJldHVybiBQcm9taXNlLnJlc29sdmUodmFsdWVzKTtcblx0XHR9IGVsc2Uge1xuXHRcdFx0dGhpcy5hY3RpdmVDb250cm9scy5maW5kKChlKSA9PiAhZS5mb3JtQ29udHJvbC52YWxpZCk/LmZvcm1FbGVtZW50Py5zY3JvbGxUbygpO1xuXHRcdFx0dGhpcy5zZXREaXNhYmxlZFN0YXRlc0ZvckFsbENvbnRyb2xzKG9yaWdpbmFsRGlzYWJsZWRTdGF0ZXMpO1xuXHRcdFx0cmV0dXJuIFByb21pc2UucmVqZWN0KGludmFsaWRGaWVsZHNTeW1ib2wpO1xuXHRcdH1cblx0fVxuXG5cdHByaXZhdGUgc2V0RGlzYWJsZWRTdGF0ZXNGb3JBbGxDb250cm9scyhvcmlnaW5hbERpc2FibGVkU3RhdGVzOiBBcnJheTx7IGNvbnRyb2w6IEFic3RyYWN0Q29udHJvbDsgZGlzYWJsZWQ6IGJvb2xlYW4gfT4pOiB2b2lkIHtcblx0XHRvcmlnaW5hbERpc2FibGVkU3RhdGVzLmZvckVhY2goKGUpID0+IHtcblx0XHRcdGlmIChlLmRpc2FibGVkKSB7XG5cdFx0XHRcdGUuY29udHJvbC5kaXNhYmxlKCk7XG5cdFx0XHR9IGVsc2Uge1xuXHRcdFx0XHRlLmNvbnRyb2wuZW5hYmxlKCk7XG5cdFx0XHR9XG5cdFx0fSk7XG5cdH1cbn1cbiJdfQ==
|
|
127
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"form.component.js","sourceRoot":"/home/runner/work/ngx-enhancy-forms/ngx-enhancy-forms/projects/klippa/ngx-enhancy-forms/src/","sources":["lib/form/form.component.ts"],"names":[],"mappings":"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","sourcesContent":["import {Component, Input, OnInit, Optional, SkipSelf} from '@angular/core';\nimport {AbstractControl, FormArray, FormControl, FormGroup, FormGroupName} 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// Only used as a 'marker' to define a property will be filled in by a sub form\nexport class SubForm extends FormGroup {\n\tconstructor() {\n\t\tsuper({}, null);\n\t}\n}\n\n@Component({\n\tselector: 'klp-form',\n\ttemplateUrl: './form.component.html',\n\tstyleUrls: ['./form.component.scss'],\n})\nexport class FormComponent implements OnInit {\n\t@Input() public formGroup: FormGroup;\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: FormControl;\n\t\tformElement: FormElementComponent;\n\t}> = [];\n\n\tconstructor(\n\t\t@SkipSelf() @Optional() private parent: FormComponent,\n\t\t@Optional() private surroundingFormGroupName: FormGroupName,\n\t) {\n\t}\n\n\tngOnInit(): void {\n\t\tif (this.parent) {\n\t\t\tif (!isValueSet(this.surroundingFormGroupName?.name)) {\n\t\t\t\tthrow new Error('No surrounding groupname is found for a nested form');\n\t\t\t}\n\t\t\tconst groupName = String(this.surroundingFormGroupName.name);\n\t\t\tconst groupToOverwrite = this.parent.formGroup.get(groupName);\n\t\t\tif (!(groupToOverwrite instanceof SubForm)) {\n\t\t\t\tthrow new Error(`Surrounding groupname '${groupName}' is not a subFormSubstitute'`);\n\t\t\t}\n\t\t\tthis.parent.formGroup.setControl(groupName, this.formGroup);\n\t\t}\n\t}\n\n\tpublic registerControl(formControl: FormControl, 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}\n\n\tpublic unregisterControl(formControl: FormControl): 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: FormGroup, result: Array<FormControl>): void {\n\t\tObject.values(formGroup.controls).forEach((value) => {\n\t\t\tif (value instanceof FormGroup) {\n\t\t\t\tthis.addFormGroupControls(value, result);\n\t\t\t} else if (value instanceof FormArray) {\n\t\t\t\tthis.addFormArrayControls(value, result);\n\t\t\t} else if (value instanceof FormControl) {\n\t\t\t\tthis.addFormControl(value, result);\n\t\t\t}\n\t\t});\n\t}\n\n\tprivate addFormArrayControls(formArray: FormArray, result: Array<FormControl>): void {\n\t\tformArray.controls.forEach((value) => {\n\t\t\tif (value instanceof FormGroup) {\n\t\t\t\tthis.addFormGroupControls(value, result);\n\t\t\t} else if (value instanceof FormArray) {\n\t\t\t\tthis.addFormArrayControls(value, result);\n\t\t\t} else if (value instanceof FormControl) {\n\t\t\t\tthis.addFormControl(value, result);\n\t\t\t}\n\t\t});\n\t}\n\n\tprivate getAllFormControls(): Array<FormControl> {\n\t\tconst result = [];\n\t\tthis.addFormGroupControls(this.formGroup, result);\n\t\treturn result;\n\t}\n\n\tprivate addFormControl(control: FormControl, result: Array<FormControl>): void {\n\t\tresult.push(control);\n\t}\n\n\tprivate disableInactiveFormControl(control: FormControl): 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<FormControl> = 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\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"]}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { Component, Input, InjectionToken, Host,
|
|
1
|
+
import { Component, SkipSelf, Optional, Input, InjectionToken, Host, Inject, ViewChild, HostBinding, EventEmitter, Output, ContentChild, TemplateRef, NgModule } from '@angular/core';
|
|
2
2
|
import { CommonModule } from '@angular/common';
|
|
3
|
-
import { FormGroup, FormArray, FormControl, ControlContainer, NG_VALUE_ACCESSOR, FormsModule } from '@angular/forms';
|
|
3
|
+
import { FormGroup, FormArray, FormControl, FormGroupName, ControlContainer, NG_VALUE_ACCESSOR, FormsModule } from '@angular/forms';
|
|
4
4
|
import { isString } from 'lodash';
|
|
5
5
|
import { SortablejsModule } from 'ngx-sortablejs';
|
|
6
6
|
import { NgSelectModule } from '@ng-select/ng-select';
|
|
@@ -10,44 +10,117 @@ import { MatFormFieldModule } from '@angular/material/form-field';
|
|
|
10
10
|
import { MatInputModule } from '@angular/material/input';
|
|
11
11
|
import { MatButtonModule } from '@angular/material/button';
|
|
12
12
|
|
|
13
|
+
function stringIsSetAndNotEmpty(s) {
|
|
14
|
+
return isString(s) && s.length > 0;
|
|
15
|
+
}
|
|
16
|
+
function isNullOrUndefined(value) {
|
|
17
|
+
return value === null || value === undefined;
|
|
18
|
+
}
|
|
19
|
+
function numberIsSet(value) {
|
|
20
|
+
return isValueSet(value) && typeof value === 'number';
|
|
21
|
+
}
|
|
22
|
+
function isValueSet(value) {
|
|
23
|
+
return value !== null && value !== undefined;
|
|
24
|
+
}
|
|
25
|
+
function stringOrArrayIsSetAndEmpty(value) {
|
|
26
|
+
return value !== null && value !== undefined && value.length === 0;
|
|
27
|
+
}
|
|
28
|
+
function useIfStringIsSet(s) {
|
|
29
|
+
if (stringIsSetAndNotEmpty(s)) {
|
|
30
|
+
return s;
|
|
31
|
+
}
|
|
32
|
+
return undefined;
|
|
33
|
+
}
|
|
34
|
+
function useIfArrayIsSetWithOneItem(a) {
|
|
35
|
+
if (!isNullOrUndefined(a) && a.length === 1) {
|
|
36
|
+
return a[0];
|
|
37
|
+
}
|
|
38
|
+
return undefined;
|
|
39
|
+
}
|
|
40
|
+
function convertParentToChild(originalClass, newClass) {
|
|
41
|
+
return Object.assign(newClass, originalClass);
|
|
42
|
+
}
|
|
43
|
+
function truncateString(s, length) {
|
|
44
|
+
if (s.length < length) {
|
|
45
|
+
return s;
|
|
46
|
+
}
|
|
47
|
+
return s.substring(0, length) + '...';
|
|
48
|
+
}
|
|
49
|
+
|
|
13
50
|
const invalidFieldsSymbol = Symbol('Not all fields are valid');
|
|
14
|
-
|
|
51
|
+
// Only used as a 'marker' to define a property will be filled in by a sub form
|
|
52
|
+
class SubForm extends FormGroup {
|
|
15
53
|
constructor() {
|
|
54
|
+
super({}, null);
|
|
55
|
+
}
|
|
56
|
+
}
|
|
57
|
+
class FormComponent {
|
|
58
|
+
constructor(parent, surroundingFormGroupName) {
|
|
59
|
+
this.parent = parent;
|
|
60
|
+
this.surroundingFormGroupName = surroundingFormGroupName;
|
|
16
61
|
// we keep track of what form controls are actually rendered. Only those count when looking at form validation
|
|
17
62
|
this.activeControls = [];
|
|
18
63
|
}
|
|
64
|
+
ngOnInit() {
|
|
65
|
+
var _a;
|
|
66
|
+
if (this.parent) {
|
|
67
|
+
if (!isValueSet((_a = this.surroundingFormGroupName) === null || _a === void 0 ? void 0 : _a.name)) {
|
|
68
|
+
throw new Error('No surrounding groupname is found for a nested form');
|
|
69
|
+
}
|
|
70
|
+
const groupName = String(this.surroundingFormGroupName.name);
|
|
71
|
+
const groupToOverwrite = this.parent.formGroup.get(groupName);
|
|
72
|
+
if (!(groupToOverwrite instanceof SubForm)) {
|
|
73
|
+
throw new Error(`Surrounding groupname '${groupName}' is not a subFormSubstitute'`);
|
|
74
|
+
}
|
|
75
|
+
this.parent.formGroup.setControl(groupName, this.formGroup);
|
|
76
|
+
}
|
|
77
|
+
}
|
|
19
78
|
registerControl(formControl, formElement) {
|
|
20
79
|
this.activeControls.push({ formControl, formElement });
|
|
80
|
+
if (this.parent) {
|
|
81
|
+
this.parent.registerControl(formControl, formElement);
|
|
82
|
+
}
|
|
21
83
|
}
|
|
22
84
|
unregisterControl(formControl) {
|
|
23
85
|
this.activeControls = this.activeControls.filter((e) => e.formControl !== formControl);
|
|
86
|
+
if (this.parent) {
|
|
87
|
+
this.parent.unregisterControl(formControl);
|
|
88
|
+
}
|
|
24
89
|
}
|
|
25
|
-
|
|
90
|
+
addFormGroupControls(formGroup, result) {
|
|
26
91
|
Object.values(formGroup.controls).forEach((value) => {
|
|
27
92
|
if (value instanceof FormGroup) {
|
|
28
|
-
this.
|
|
93
|
+
this.addFormGroupControls(value, result);
|
|
29
94
|
}
|
|
30
95
|
else if (value instanceof FormArray) {
|
|
31
|
-
this.
|
|
96
|
+
this.addFormArrayControls(value, result);
|
|
32
97
|
}
|
|
33
98
|
else if (value instanceof FormControl) {
|
|
34
|
-
this.
|
|
99
|
+
this.addFormControl(value, result);
|
|
35
100
|
}
|
|
36
101
|
});
|
|
37
102
|
}
|
|
38
|
-
|
|
103
|
+
addFormArrayControls(formArray, result) {
|
|
39
104
|
formArray.controls.forEach((value) => {
|
|
40
105
|
if (value instanceof FormGroup) {
|
|
41
|
-
this.
|
|
106
|
+
this.addFormGroupControls(value, result);
|
|
42
107
|
}
|
|
43
108
|
else if (value instanceof FormArray) {
|
|
44
|
-
this.
|
|
109
|
+
this.addFormArrayControls(value, result);
|
|
45
110
|
}
|
|
46
111
|
else if (value instanceof FormControl) {
|
|
47
|
-
this.
|
|
112
|
+
this.addFormControl(value, result);
|
|
48
113
|
}
|
|
49
114
|
});
|
|
50
115
|
}
|
|
116
|
+
getAllFormControls() {
|
|
117
|
+
const result = [];
|
|
118
|
+
this.addFormGroupControls(this.formGroup, result);
|
|
119
|
+
return result;
|
|
120
|
+
}
|
|
121
|
+
addFormControl(control, result) {
|
|
122
|
+
result.push(control);
|
|
123
|
+
}
|
|
51
124
|
disableInactiveFormControl(control) {
|
|
52
125
|
if (!this.activeControls.some((e) => e.formControl === control)) {
|
|
53
126
|
control.disable();
|
|
@@ -56,10 +129,11 @@ class FormComponent {
|
|
|
56
129
|
trySubmit() {
|
|
57
130
|
var _a, _b;
|
|
58
131
|
this.formGroup.markAllAsTouched();
|
|
59
|
-
const
|
|
132
|
+
const allControls = this.getAllFormControls();
|
|
133
|
+
const originalDisabledStates = allControls.map(e => {
|
|
60
134
|
return { control: e, disabled: e.disabled };
|
|
61
135
|
});
|
|
62
|
-
|
|
136
|
+
allControls.forEach(e => this.disableInactiveFormControl(e));
|
|
63
137
|
const values = this.formGroup.value;
|
|
64
138
|
if (this.formGroup.valid) {
|
|
65
139
|
this.setDisabledStatesForAllControls(originalDisabledStates);
|
|
@@ -89,6 +163,10 @@ FormComponent.decorators = [
|
|
|
89
163
|
styles: [":host{display:block}:host.row{display:flex}"]
|
|
90
164
|
},] }
|
|
91
165
|
];
|
|
166
|
+
FormComponent.ctorParameters = () => [
|
|
167
|
+
{ type: FormComponent, decorators: [{ type: SkipSelf }, { type: Optional }] },
|
|
168
|
+
{ type: FormGroupName, decorators: [{ type: Optional }] }
|
|
169
|
+
];
|
|
92
170
|
FormComponent.propDecorators = {
|
|
93
171
|
formGroup: [{ type: Input }]
|
|
94
172
|
};
|
|
@@ -121,6 +199,8 @@ class FormElementComponent {
|
|
|
121
199
|
}, message);
|
|
122
200
|
}
|
|
123
201
|
registerControl(formControl) {
|
|
202
|
+
// console.log('register');
|
|
203
|
+
// console.log(this.caption);
|
|
124
204
|
this.attachedControl = formControl;
|
|
125
205
|
this.parent.registerControl(formControl, this);
|
|
126
206
|
}
|
|
@@ -191,43 +271,6 @@ FormElementComponent.propDecorators = {
|
|
|
191
271
|
internalComponentRef: [{ type: ViewChild, args: ['internalComponentRef',] }]
|
|
192
272
|
};
|
|
193
273
|
|
|
194
|
-
function stringIsSetAndNotEmpty(s) {
|
|
195
|
-
return isString(s) && s.length > 0;
|
|
196
|
-
}
|
|
197
|
-
function isNullOrUndefined(value) {
|
|
198
|
-
return value === null || value === undefined;
|
|
199
|
-
}
|
|
200
|
-
function numberIsSet(value) {
|
|
201
|
-
return isValueSet(value) && typeof value === 'number';
|
|
202
|
-
}
|
|
203
|
-
function isValueSet(value) {
|
|
204
|
-
return value !== null && value !== undefined;
|
|
205
|
-
}
|
|
206
|
-
function stringOrArrayIsSetAndEmpty(value) {
|
|
207
|
-
return value !== null && value !== undefined && value.length === 0;
|
|
208
|
-
}
|
|
209
|
-
function useIfStringIsSet(s) {
|
|
210
|
-
if (stringIsSetAndNotEmpty(s)) {
|
|
211
|
-
return s;
|
|
212
|
-
}
|
|
213
|
-
return undefined;
|
|
214
|
-
}
|
|
215
|
-
function useIfArrayIsSetWithOneItem(a) {
|
|
216
|
-
if (!isNullOrUndefined(a) && a.length === 1) {
|
|
217
|
-
return a[0];
|
|
218
|
-
}
|
|
219
|
-
return undefined;
|
|
220
|
-
}
|
|
221
|
-
function convertParentToChild(originalClass, newClass) {
|
|
222
|
-
return Object.assign(newClass, originalClass);
|
|
223
|
-
}
|
|
224
|
-
function truncateString(s, length) {
|
|
225
|
-
if (s.length < length) {
|
|
226
|
-
return s;
|
|
227
|
-
}
|
|
228
|
-
return s.substring(0, length) + '...';
|
|
229
|
-
}
|
|
230
|
-
|
|
231
274
|
/**
|
|
232
275
|
* This component is a base in order to create a component that supports ngModel.
|
|
233
276
|
* Some important things to know about it:
|
|
@@ -815,5 +858,5 @@ NgxEnhancyFormsModule.decorators = [
|
|
|
815
858
|
* Generated bundle index. Do not edit.
|
|
816
859
|
*/
|
|
817
860
|
|
|
818
|
-
export { ButtonComponent, CheckboxComponent, DEFAULT_ERROR_MESSAGES, DatepickerComponent, EmailInputComponent, FORM_ERROR_MESSAGES, FormCaptionComponent, FormComponent, FormElementComponent, FormErrorComponent, FormSubmitButtonComponent, KLP_DATE_FORMATS, LoadingIndicatorComponent, NgxEnhancyFormsModule, NumberInputComponent, PasswordFieldComponent, SelectComponent, SortableItemsComponent, TextInputComponent, ToggleComponent, ValueAccessorBase, dateValidator, invalidDateKey, invalidFieldsSymbol, matDateFormatsFactory, MaterialModule as ɵa };
|
|
861
|
+
export { ButtonComponent, CheckboxComponent, DEFAULT_ERROR_MESSAGES, DatepickerComponent, EmailInputComponent, FORM_ERROR_MESSAGES, FormCaptionComponent, FormComponent, FormElementComponent, FormErrorComponent, FormSubmitButtonComponent, KLP_DATE_FORMATS, LoadingIndicatorComponent, NgxEnhancyFormsModule, NumberInputComponent, PasswordFieldComponent, SelectComponent, SortableItemsComponent, SubForm, TextInputComponent, ToggleComponent, ValueAccessorBase, dateValidator, invalidDateKey, invalidFieldsSymbol, matDateFormatsFactory, MaterialModule as ɵa };
|
|
819
862
|
//# sourceMappingURL=klippa-ngx-enhancy-forms.js.map
|