ngx-render-material-forms 1.3.4 → 1.3.5
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/components/textarea/textarea.component.mjs +9 -3
- package/esm2020/lib/components/textfield/textfield.component.mjs +4 -1
- package/fesm2015/ngx-render-material-forms.js +11 -2
- package/fesm2015/ngx-render-material-forms.mjs.map +1 -1
- package/fesm2020/ngx-render-material-forms.js +11 -2
- package/fesm2020/ngx-render-material-forms.mjs.map +1 -1
- package/lib/components/textarea/textarea.component.d.ts +1 -0
- package/package.json +1 -1
|
@@ -16,6 +16,12 @@ export class MaterialTextareaComponent extends MaterialComponent {
|
|
|
16
16
|
// Attach the element so the wysiwyg will work.
|
|
17
17
|
this.instance.attachElement(this.textarea.nativeElement);
|
|
18
18
|
}
|
|
19
|
+
getErrorMessage() {
|
|
20
|
+
if (this.instance.parent.submission.data.submit) {
|
|
21
|
+
this.control.markAllAsTouched();
|
|
22
|
+
}
|
|
23
|
+
return this.instance.error.message;
|
|
24
|
+
}
|
|
19
25
|
getValue() {
|
|
20
26
|
return isNil(this.control.value) ? '' : this.control.value;
|
|
21
27
|
}
|
|
@@ -42,7 +48,7 @@ MaterialTextareaComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.
|
|
|
42
48
|
>
|
|
43
49
|
</textarea>
|
|
44
50
|
<span *ngIf="instance.component.suffix" matSuffix>{{ instance.component.suffix }}</span>
|
|
45
|
-
<mat-error *ngIf="instance.error">{{
|
|
51
|
+
<mat-error *ngIf="instance.error">{{ getErrorMessage() }}</mat-error>
|
|
46
52
|
</mat-form-field>
|
|
47
53
|
</ng-template>
|
|
48
54
|
`, isInline: true, styles: [".mat-input-element{min-height:16px}\n"], dependencies: [{ kind: "directive", type: i1.NgClass, selector: "[ngClass]", inputs: ["class", "ngClass"] }, { kind: "directive", type: i1.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "directive", type: i2.DefaultValueAccessor, selector: "input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]" }, { kind: "directive", type: i2.NgControlStatus, selector: "[formControlName],[ngModel],[formControl]" }, { kind: "directive", type: i2.FormControlDirective, selector: "[formControl]", inputs: ["formControl", "disabled", "ngModel"], outputs: ["ngModelChange"], exportAs: ["ngForm"] }, { kind: "directive", type: i3.MatError, selector: "mat-error", inputs: ["id"] }, { kind: "component", type: i3.MatFormField, selector: "mat-form-field", inputs: ["color", "appearance", "hideRequiredMarker", "hintLabel", "floatLabel"], exportAs: ["matFormField"] }, { kind: "directive", type: i3.MatLabel, selector: "mat-label" }, { kind: "directive", type: i3.MatPrefix, selector: "[matPrefix]" }, { kind: "directive", type: i3.MatSuffix, selector: "[matSuffix]" }, { kind: "directive", type: i4.MatInput, selector: "input[matInput], textarea[matInput], select[matNativeControl], input[matNativeControl], textarea[matNativeControl]", inputs: ["disabled", "id", "placeholder", "name", "required", "type", "errorStateMatcher", "aria-describedby", "value", "readonly"], exportAs: ["matInput"] }, { kind: "directive", type: i5.FlexFillDirective, selector: "[fxFill], [fxFlexFill]" }, { kind: "directive", type: i5.DefaultFlexAlignDirective, selector: " [fxFlexAlign], [fxFlexAlign.xs], [fxFlexAlign.sm], [fxFlexAlign.md], [fxFlexAlign.lg], [fxFlexAlign.xl], [fxFlexAlign.lt-sm], [fxFlexAlign.lt-md], [fxFlexAlign.lt-lg], [fxFlexAlign.lt-xl], [fxFlexAlign.gt-xs], [fxFlexAlign.gt-sm], [fxFlexAlign.gt-md], [fxFlexAlign.gt-lg]", inputs: ["fxFlexAlign", "fxFlexAlign.xs", "fxFlexAlign.sm", "fxFlexAlign.md", "fxFlexAlign.lg", "fxFlexAlign.xl", "fxFlexAlign.lt-sm", "fxFlexAlign.lt-md", "fxFlexAlign.lt-lg", "fxFlexAlign.lt-xl", "fxFlexAlign.gt-xs", "fxFlexAlign.gt-sm", "fxFlexAlign.gt-md", "fxFlexAlign.gt-lg"] }, { kind: "directive", type: i6.DefaultClassDirective, selector: " [ngClass], [ngClass.xs], [ngClass.sm], [ngClass.md], [ngClass.lg], [ngClass.xl], [ngClass.lt-sm], [ngClass.lt-md], [ngClass.lt-lg], [ngClass.lt-xl], [ngClass.gt-xs], [ngClass.gt-sm], [ngClass.gt-md], [ngClass.gt-lg]", inputs: ["ngClass", "ngClass.xs", "ngClass.sm", "ngClass.md", "ngClass.lg", "ngClass.xl", "ngClass.lt-sm", "ngClass.lt-md", "ngClass.lt-lg", "ngClass.lt-xl", "ngClass.gt-xs", "ngClass.gt-sm", "ngClass.gt-md", "ngClass.gt-lg"] }, { kind: "component", type: i7.FormioFormFieldComponent, selector: "mat-formio-form-field", inputs: ["labelTemplate", "renderTopLabel", "showDescription", "renderElementOnly", "instance", "componentTemplate"] }, { kind: "component", type: i8.LabelComponent, selector: "span[matFormioLabel]", inputs: ["instance"] }] });
|
|
@@ -69,7 +75,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.1.3", ngImpor
|
|
|
69
75
|
>
|
|
70
76
|
</textarea>
|
|
71
77
|
<span *ngIf="instance.component.suffix" matSuffix>{{ instance.component.suffix }}</span>
|
|
72
|
-
<mat-error *ngIf="instance.error">{{
|
|
78
|
+
<mat-error *ngIf="instance.error">{{ getErrorMessage() }}</mat-error>
|
|
73
79
|
</mat-form-field>
|
|
74
80
|
</ng-template>
|
|
75
81
|
`, styles: [".mat-input-element{min-height:16px}\n"] }]
|
|
@@ -79,4 +85,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.1.3", ngImpor
|
|
|
79
85
|
}] } });
|
|
80
86
|
TextAreaComponent.MaterialComponent = MaterialTextareaComponent;
|
|
81
87
|
export { TextAreaComponent };
|
|
82
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
88
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGV4dGFyZWEuY29tcG9uZW50LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvbmd4LXJlbmRlci1tYXRlcmlhbC1mb3Jtcy9zcmMvbGliL2NvbXBvbmVudHMvdGV4dGFyZWEvdGV4dGFyZWEuY29tcG9uZW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxTQUFTLEVBQUUsU0FBUyxFQUE2QixNQUFNLGVBQWUsQ0FBQztBQUNoRixPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUN6RCxPQUFPLGlCQUFpQixNQUFNLDBDQUEwQyxDQUFDO0FBQ3pFLE9BQU8sS0FBSyxNQUFNLGNBQWMsQ0FBQzs7Ozs7Ozs7OztBQStCakMsTUFBTSxPQUFPLHlCQUEwQixTQUFRLGlCQUFpQjtJQUc5RCxlQUFlO1FBQ2IsK0NBQStDO1FBQy9DLElBQUksQ0FBQyxRQUFRLENBQUMsYUFBYSxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsYUFBYSxDQUFDLENBQUM7SUFDM0QsQ0FBQztJQUNELGVBQWU7UUFDYixJQUFHLElBQUksQ0FBQyxRQUFRLENBQUMsTUFBTSxDQUFDLFVBQVUsQ0FBQyxJQUFJLENBQUMsTUFBTSxFQUFFO1lBQzlDLElBQUksQ0FBQyxPQUFPLENBQUMsZ0JBQWdCLEVBQUUsQ0FBQTtTQUNoQztRQUNELE9BQU8sSUFBSSxDQUFDLFFBQVEsQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDO0lBQ3JDLENBQUM7SUFFRCxRQUFRO1FBQ04sT0FBTyxLQUFLLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLEtBQUssQ0FBQztJQUM3RCxDQUFDOztzSEFoQlUseUJBQXlCOzBHQUF6Qix5QkFBeUIsd0xBMUIxQjs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0dBd0JUOzJGQUVVLHlCQUF5QjtrQkE3QnJDLFNBQVM7K0JBQ0UscUJBQXFCLFlBRXJCOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7R0F3QlQ7OEJBR3NCLFFBQVE7c0JBQTlCLFNBQVM7dUJBQUMsVUFBVTs7QUFpQnZCLGlCQUFpQixDQUFDLGlCQUFpQixHQUFHLHlCQUF5QixDQUFDO0FBQ2hFLE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgQ29tcG9uZW50LCBWaWV3Q2hpbGQsIEVsZW1lbnRSZWYsIEFmdGVyVmlld0luaXQgfSBmcm9tICdAYW5ndWxhci9jb3JlJztcclxuaW1wb3J0IHsgTWF0ZXJpYWxDb21wb25lbnQgfSBmcm9tICcuLi9NYXRlcmlhbENvbXBvbmVudCc7XHJcbmltcG9ydCBUZXh0QXJlYUNvbXBvbmVudCBmcm9tICdmb3JtaW9qcy9jb21wb25lbnRzL3RleHRhcmVhL1RleHRBcmVhLmpzJztcclxuaW1wb3J0IGlzTmlsIGZyb20gJ2xvZGFzaC9pc05pbCc7XHJcblxyXG5AQ29tcG9uZW50KHtcclxuICBzZWxlY3RvcjogJ21hdC1mb3JtaW8tdGV4dGFyZWEnLFxyXG4gIHN0eWxlVXJsczogWycuL3RleHRhcmVhLmNvbXBvbmVudC5jc3MnXSxcclxuICB0ZW1wbGF0ZTogYFxyXG4gICAgPG1hdC1mb3JtaW8tZm9ybS1maWVsZCBbaW5zdGFuY2VdPVwiaW5zdGFuY2VcIiBbY29tcG9uZW50VGVtcGxhdGVdPVwiY29tcG9uZW50VGVtcGxhdGVcIj48L21hdC1mb3JtaW8tZm9ybS1maWVsZD5cclxuICAgIDxuZy10ZW1wbGF0ZSAjY29tcG9uZW50VGVtcGxhdGUgbGV0LWhhc0xhYmVsPlxyXG4gICAgICA8bWF0LWZvcm0tZmllbGQgY2xhc3M9XCJtYXQtZm9ybWlvLXRleHRhcmVhXCJcclxuICAgICAgICAgICAgICAgICAgICAgIFtuZ0NsYXNzXT1cInsnZWRpdG9yLWVuYWJsZWQnOiAhIWluc3RhbmNlLmNvbXBvbmVudC5lZGl0b3J9XCJcclxuICAgICAgICAgICAgICAgICAgICAgIGZ4RmlsbFxyXG4gICAgICAgICAgICAgICAgICAgICAgZnhGbGV4QWxpZ249XCJjZW50ZXJcIlxyXG4gICAgICA+XHJcbiAgICAgICAgPG1hdC1sYWJlbCBmeEZpbGwgKm5nSWY9XCJoYXNMYWJlbFwiPlxyXG4gICAgICAgICAgPHNwYW4gW2luc3RhbmNlXT1cImluc3RhbmNlXCIgbWF0Rm9ybWlvTGFiZWw+PC9zcGFuPlxyXG4gICAgICAgIDwvbWF0LWxhYmVsPlxyXG4gICAgICAgIDxzcGFuICpuZ0lmPVwiaW5zdGFuY2UuY29tcG9uZW50LnByZWZpeFwiIG1hdFByZWZpeD57eyBpbnN0YW5jZS5jb21wb25lbnQucHJlZml4IH19Jm5ic3A7PC9zcGFuPlxyXG4gICAgICAgIDx0ZXh0YXJlYSBtYXRJbnB1dFxyXG4gICAgICAgICAgICAgICAgICBbcGxhY2Vob2xkZXJdPVwiaW5zdGFuY2UuY29tcG9uZW50LnBsYWNlaG9sZGVyXCJcclxuICAgICAgICAgICAgICAgICAgW2Zvcm1Db250cm9sXT1cImNvbnRyb2xcIlxyXG4gICAgICAgICAgICAgICAgICBbcm93c109XCIoaW5zdGFuY2UuY29tcG9uZW50LnJvd3MgfHwgMylcIlxyXG4gICAgICAgICAgICAgICAgICAoaW5wdXQpPVwib25DaGFuZ2UoKVwiXHJcbiAgICAgICAgICAgICAgICAgICAjdGV4dGFyZWFcclxuICAgICAgICA+XHJcbiAgICAgICAgPC90ZXh0YXJlYT5cclxuICAgICAgICA8c3BhbiAqbmdJZj1cImluc3RhbmNlLmNvbXBvbmVudC5zdWZmaXhcIiBtYXRTdWZmaXg+e3sgaW5zdGFuY2UuY29tcG9uZW50LnN1ZmZpeCB9fTwvc3Bhbj5cclxuICAgICAgICA8bWF0LWVycm9yICpuZ0lmPVwiaW5zdGFuY2UuZXJyb3JcIj57eyBnZXRFcnJvck1lc3NhZ2UoKSB9fTwvbWF0LWVycm9yPlxyXG4gICAgICA8L21hdC1mb3JtLWZpZWxkPlxyXG4gICAgPC9uZy10ZW1wbGF0ZT5cclxuICBgXHJcbn0pXHJcbmV4cG9ydCBjbGFzcyBNYXRlcmlhbFRleHRhcmVhQ29tcG9uZW50IGV4dGVuZHMgTWF0ZXJpYWxDb21wb25lbnQgaW1wbGVtZW50cyBBZnRlclZpZXdJbml0IHtcclxuICBAVmlld0NoaWxkKCd0ZXh0YXJlYScpIHRleHRhcmVhOiBFbGVtZW50UmVmO1xyXG5cclxuICBuZ0FmdGVyVmlld0luaXQoKSB7XHJcbiAgICAvLyBBdHRhY2ggdGhlIGVsZW1lbnQgc28gdGhlIHd5c2l3eWcgd2lsbCB3b3JrLlxyXG4gICAgdGhpcy5pbnN0YW5jZS5hdHRhY2hFbGVtZW50KHRoaXMudGV4dGFyZWEubmF0aXZlRWxlbWVudCk7XHJcbiAgfVxyXG4gIGdldEVycm9yTWVzc2FnZSgpIHtcclxuICAgIGlmKHRoaXMuaW5zdGFuY2UucGFyZW50LnN1Ym1pc3Npb24uZGF0YS5zdWJtaXQpIHtcclxuICAgICAgdGhpcy5jb250cm9sLm1hcmtBbGxBc1RvdWNoZWQoKVxyXG4gICAgfVxyXG4gICAgcmV0dXJuIHRoaXMuaW5zdGFuY2UuZXJyb3IubWVzc2FnZTtcclxuICB9XHJcblxyXG4gIGdldFZhbHVlKCkge1xyXG4gICAgcmV0dXJuIGlzTmlsKHRoaXMuY29udHJvbC52YWx1ZSkgPyAnJyA6IHRoaXMuY29udHJvbC52YWx1ZTtcclxuICB9XHJcbn1cclxuVGV4dEFyZWFDb21wb25lbnQuTWF0ZXJpYWxDb21wb25lbnQgPSBNYXRlcmlhbFRleHRhcmVhQ29tcG9uZW50O1xyXG5leHBvcnQgeyBUZXh0QXJlYUNvbXBvbmVudCB9O1xyXG4iXX0=
|
|
@@ -98,6 +98,9 @@ export class MaterialTextfieldComponent extends MaterialComponent {
|
|
|
98
98
|
this.controlHasError = this.control.hasError(msg.context.validator);
|
|
99
99
|
}
|
|
100
100
|
if (msg.context && this.controlHasError) {
|
|
101
|
+
if (this.instance.parent.submission.data.submit) {
|
|
102
|
+
this.control.markAllAsTouched();
|
|
103
|
+
}
|
|
101
104
|
return this.instance.error.message;
|
|
102
105
|
}
|
|
103
106
|
}
|
|
@@ -116,4 +119,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.1.3", ngImpor
|
|
|
116
119
|
}] });
|
|
117
120
|
TextFieldComponent.MaterialComponent = MaterialTextfieldComponent;
|
|
118
121
|
export { TextFieldComponent };
|
|
119
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
122
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"textfield.component.js","sourceRoot":"","sources":["../../../../../../projects/ngx-render-material-forms/src/lib/components/textfield/textfield.component.ts"],"names":[],"mappings":"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","sourcesContent":["import { Component, OnInit, AfterContentInit } from '@angular/core';\r\nimport TextFieldComponent from 'formiojs/components/textfield/TextField.js';\r\nimport { MaterialComponent } from '../MaterialComponent';\r\n\r\nexport const TEXTFIELD_TEMPLATE = `\r\n  <mat-formio-form-field [instance]=\"instance\" [componentTemplate]=\"componentTemplate\"></mat-formio-form-field>\r\n  <ng-template #componentTemplate let-hasLabel>\r\n    <mat-form-field [appearance]=\"getFormFieldAppearance()\" fxFill>\r\n\r\n      <mat-label *ngIf=\"hasLabel\">\r\n          <span [instance]=\"instance\" matFormioLabel></span>\r\n      </mat-label>\r\n\r\n      <span *ngIf=\"instance.component.prefix && instance.type !== 'currency'\"\r\n            matPrefix\r\n      >\r\n        {{ instance.component.prefix }}&nbsp;\r\n      </span>\r\n      <input matInput\r\n            type=\"{{ inputType }}\"\r\n            [formControl]=\"control\"\r\n            [placeholder]=\"instance.component.placeholder\"\r\n            (input)=\"onChange()\" #input\r\n            [ngClass]=\"{ 'show-invalid': inputType=='email' }\"\r\n      >\r\n      <span *ngIf=\"instance.component.suffix\" matSuffix>{{ instance.component.suffix }}</span>\r\n\r\n      <mat-hint *ngIf=\"instance.component.showWordCount || instance.component.showCharCount\">\r\n        {{ getHint() }}\r\n      </mat-hint>\r\n\r\n      <br/>\r\n      <mat-error *ngIf=\"isError()\" >{{ getErrorMessage() }}</mat-error>\r\n    </mat-form-field>\r\n  </ng-template>\r\n`;\r\n\r\n@Component({\r\n  selector: 'mat-formio-textfield',\r\n  template: TEXTFIELD_TEMPLATE\r\n})\r\nexport class MaterialTextfieldComponent extends MaterialComponent implements AfterContentInit {\r\n  public inputType = 'text';\r\n  controlHasError: boolean;\r\n\r\n  ngAfterContentInit() {\r\n    if (this.instance && this.control && this.instance.component.disabled) {\r\n      this.control.disable();\r\n    }\r\n  }\r\n\r\n  getHint() {\r\n    if (!this.instance || !this.control || !this.control.value) {\r\n      return '';\r\n    }\r\n\r\n    const { showWordCount, showCharCount } = this.instance.component;\r\n\r\n    if (showWordCount && showCharCount) {\r\n      return `${this.getWordsCount()} words, ${this.control.value.length} characters`;\r\n    } else if (showWordCount) {\r\n      return `${this.getWordsCount()} words`;\r\n    } else {\r\n      return `${this.control.value.length} characters`;\r\n    }\r\n  }\r\n\r\n  getWordsCount() {\r\n    const matches = this.control.value ? this.control.value.match(/[\\w\\d’'-]+/gi) : [];\r\n    return matches ? matches.length : 0;\r\n  }\r\n\r\n  getFormFieldAppearance() {\r\n    const appearances = ['legacy', 'standard', 'fill', 'outline'];\r\n    const appearance = this.instance.component.appearance ? this.instance.component.appearance.toLowerCase() : '';\r\n    return appearances.includes(appearance) ? appearance : undefined;\r\n  }\r\n\r\n  isError() {\r\n    if (this.instance.error) {\r\n      this.control.setErrors(this.instance.component.validate);\r\n      return true;\r\n    }\r\n    else {\r\n      return false;\r\n    }\r\n  }\r\n\r\n  getErrorMessage() {\r\n    if (this.instance.error && this.instance.error.messages) {\r\n      const { messages } = this.instance.error;\r\n\r\n      if (messages.length) {\r\n        for (const msg of messages) {\r\n          //this.control.hasError(msg.context.validator)\r\n          if (this.instance.type == 'phoneNumber' || this.instance.type == 'email') {\r\n            this.controlHasError = true;\r\n          } else {\r\n            this.controlHasError = this.control.hasError(msg.context.validator)\r\n          }\r\n          if (msg.context && this.controlHasError) {\r\n            if (this.instance.parent.submission.data.submit) {\r\n              this.control.markAllAsTouched()\r\n            }\r\n            return this.instance.error.message;\r\n          }\r\n\r\n        }\r\n\r\n      }\r\n    }\r\n  }\r\n}\r\nTextFieldComponent.MaterialComponent = MaterialTextfieldComponent;\r\nexport { TextFieldComponent };\r\n"]}
|
|
@@ -513,6 +513,9 @@ class MaterialTextfieldComponent extends MaterialComponent {
|
|
|
513
513
|
this.controlHasError = this.control.hasError(msg.context.validator);
|
|
514
514
|
}
|
|
515
515
|
if (msg.context && this.controlHasError) {
|
|
516
|
+
if (this.instance.parent.submission.data.submit) {
|
|
517
|
+
this.control.markAllAsTouched();
|
|
518
|
+
}
|
|
516
519
|
return this.instance.error.message;
|
|
517
520
|
}
|
|
518
521
|
}
|
|
@@ -1056,6 +1059,12 @@ class MaterialTextareaComponent extends MaterialComponent {
|
|
|
1056
1059
|
// Attach the element so the wysiwyg will work.
|
|
1057
1060
|
this.instance.attachElement(this.textarea.nativeElement);
|
|
1058
1061
|
}
|
|
1062
|
+
getErrorMessage() {
|
|
1063
|
+
if (this.instance.parent.submission.data.submit) {
|
|
1064
|
+
this.control.markAllAsTouched();
|
|
1065
|
+
}
|
|
1066
|
+
return this.instance.error.message;
|
|
1067
|
+
}
|
|
1059
1068
|
getValue() {
|
|
1060
1069
|
return isNil(this.control.value) ? '' : this.control.value;
|
|
1061
1070
|
}
|
|
@@ -1082,7 +1091,7 @@ MaterialTextareaComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.
|
|
|
1082
1091
|
>
|
|
1083
1092
|
</textarea>
|
|
1084
1093
|
<span *ngIf="instance.component.suffix" matSuffix>{{ instance.component.suffix }}</span>
|
|
1085
|
-
<mat-error *ngIf="instance.error">{{
|
|
1094
|
+
<mat-error *ngIf="instance.error">{{ getErrorMessage() }}</mat-error>
|
|
1086
1095
|
</mat-form-field>
|
|
1087
1096
|
</ng-template>
|
|
1088
1097
|
`, isInline: true, styles: [".mat-input-element{min-height:16px}\n"], dependencies: [{ kind: "directive", type: i1.NgClass, selector: "[ngClass]", inputs: ["class", "ngClass"] }, { kind: "directive", type: i1.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "directive", type: i2.DefaultValueAccessor, selector: "input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]" }, { kind: "directive", type: i2.NgControlStatus, selector: "[formControlName],[ngModel],[formControl]" }, { kind: "directive", type: i2.FormControlDirective, selector: "[formControl]", inputs: ["formControl", "disabled", "ngModel"], outputs: ["ngModelChange"], exportAs: ["ngForm"] }, { kind: "directive", type: i3.MatError, selector: "mat-error", inputs: ["id"] }, { kind: "component", type: i3.MatFormField, selector: "mat-form-field", inputs: ["color", "appearance", "hideRequiredMarker", "hintLabel", "floatLabel"], exportAs: ["matFormField"] }, { kind: "directive", type: i3.MatLabel, selector: "mat-label" }, { kind: "directive", type: i3.MatPrefix, selector: "[matPrefix]" }, { kind: "directive", type: i3.MatSuffix, selector: "[matSuffix]" }, { kind: "directive", type: i4$2.MatInput, selector: "input[matInput], textarea[matInput], select[matNativeControl], input[matNativeControl], textarea[matNativeControl]", inputs: ["disabled", "id", "placeholder", "name", "required", "type", "errorStateMatcher", "aria-describedby", "value", "readonly"], exportAs: ["matInput"] }, { kind: "directive", type: i5.FlexFillDirective, selector: "[fxFill], [fxFlexFill]" }, { kind: "directive", type: i5.DefaultFlexAlignDirective, selector: " [fxFlexAlign], [fxFlexAlign.xs], [fxFlexAlign.sm], [fxFlexAlign.md], [fxFlexAlign.lg], [fxFlexAlign.xl], [fxFlexAlign.lt-sm], [fxFlexAlign.lt-md], [fxFlexAlign.lt-lg], [fxFlexAlign.lt-xl], [fxFlexAlign.gt-xs], [fxFlexAlign.gt-sm], [fxFlexAlign.gt-md], [fxFlexAlign.gt-lg]", inputs: ["fxFlexAlign", "fxFlexAlign.xs", "fxFlexAlign.sm", "fxFlexAlign.md", "fxFlexAlign.lg", "fxFlexAlign.xl", "fxFlexAlign.lt-sm", "fxFlexAlign.lt-md", "fxFlexAlign.lt-lg", "fxFlexAlign.lt-xl", "fxFlexAlign.gt-xs", "fxFlexAlign.gt-sm", "fxFlexAlign.gt-md", "fxFlexAlign.gt-lg"] }, { kind: "directive", type: i6.DefaultClassDirective, selector: " [ngClass], [ngClass.xs], [ngClass.sm], [ngClass.md], [ngClass.lg], [ngClass.xl], [ngClass.lt-sm], [ngClass.lt-md], [ngClass.lt-lg], [ngClass.lt-xl], [ngClass.gt-xs], [ngClass.gt-sm], [ngClass.gt-md], [ngClass.gt-lg]", inputs: ["ngClass", "ngClass.xs", "ngClass.sm", "ngClass.md", "ngClass.lg", "ngClass.xl", "ngClass.lt-sm", "ngClass.lt-md", "ngClass.lt-lg", "ngClass.lt-xl", "ngClass.gt-xs", "ngClass.gt-sm", "ngClass.gt-md", "ngClass.gt-lg"] }, { kind: "component", type: FormioFormFieldComponent, selector: "mat-formio-form-field", inputs: ["labelTemplate", "renderTopLabel", "showDescription", "renderElementOnly", "instance", "componentTemplate"] }, { kind: "component", type: LabelComponent, selector: "span[matFormioLabel]", inputs: ["instance"] }] });
|
|
@@ -1109,7 +1118,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.1.3", ngImpor
|
|
|
1109
1118
|
>
|
|
1110
1119
|
</textarea>
|
|
1111
1120
|
<span *ngIf="instance.component.suffix" matSuffix>{{ instance.component.suffix }}</span>
|
|
1112
|
-
<mat-error *ngIf="instance.error">{{
|
|
1121
|
+
<mat-error *ngIf="instance.error">{{ getErrorMessage() }}</mat-error>
|
|
1113
1122
|
</mat-form-field>
|
|
1114
1123
|
</ng-template>
|
|
1115
1124
|
`, styles: [".mat-input-element{min-height:16px}\n"] }]
|