Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(dynamic-forms): make sure hints and errors dont overlap #1222

Merged
merged 1 commit into from
Aug 15, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -538,6 +538,13 @@ <h3 class="mat-title">Custom Dynamic Elements</h3>
<mat-tab>
<ng-template matTabLabel>Demo</ng-template>
<td-dynamic-forms [elements]="customElements">
<ng-template let-element ngFor [ngForOf]="customElements">
<ng-template let-control="control" [tdDynamicFormsError]="element.name">
<span *ngIf="control.touched || !control.pristine">
<span *ngIf="control.hasError('invalidChips')">No more than 2 chips</span>
</span>
</ng-template>
</ng-template>
</td-dynamic-forms>
</mat-tab>
<mat-tab>
Expand All @@ -546,12 +553,20 @@ <h4>Setup</h4>
<p>Custom Component:</p>
<td-highlight lang="typescript">
<![CDATA[
import { Component } from '@angular/core';
import { Component, TemplateRef } from '@angular/core';
import { FormControl } from '@angular/forms';

@Component({
selector: 'td-dynamic-input-test',
template: `<td-chips [items]="selections" [formControl]="control"></td-chips>`,
template: `<td-chips [items]="selections" [formControl]="control"></td-chips>
<div *ngIf="errorMessageTemplate && control?.errors"
class="tc-red-600"
[style.font-size.%]="'70'">
<ng-template
[ngTemplateOutlet]="errorMessageTemplate"
[ngTemplateOutletContext]="{control: control, errors: control?.errors}">
</ng-template>
</div>`,
})
export class TdTestDynamicComponent {

Expand All @@ -561,6 +576,9 @@ <h4>Setup</h4>
/* map any of the properties you passed in the config */
selections: string[] = [];

/* map the error message template and use it anywhere you need to */
errorMessageTemplate: TemplateRef<any>;

}
]]>
</td-highlight>
Expand Down Expand Up @@ -590,6 +608,13 @@ <h4>Usage:</h4>
<td-highlight lang="html">
<![CDATA[
<td-dynamic-forms [elements]="customElements">
<ng-template let-element ngFor [ngForOf]="customElements">
<ng-template let-control="control" [tdDynamicFormsError]="element.name">
<span *ngIf="control.touched || !control.pristine">
<span *ngIf="control.hasError('invalidChips')">No more than 2 chips</span>
</span>
</ng-template>
</ng-template>
</td-dynamic-forms>
]]>
</td-highlight>
Expand All @@ -602,6 +627,12 @@ <h4>Usage:</h4>
default: ['list1'],
selections: ['list1', 'list2', 'list3'],
flex: 100,
validators: [{
validator: (control: AbstractControl) => {
let isValid: boolean = control.value.length <= 2;
return !isValid ? {invalidChips: true} : undefined;
},
}],
}];
]]>
</td-highlight>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Component, HostBinding } from '@angular/core';
import { Component, HostBinding, TemplateRef } from '@angular/core';
import { AbstractControl, Validators } from '@angular/forms';
import { TdCollapseAnimation } from '@covalent/core/common';
import { slideInDownAnimation } from '../../../app.animations';
Expand All @@ -15,12 +15,21 @@ import { FormControl } from '@angular/forms';

@Component({
selector: 'td-dynamic-input-test',
template: `<td-chips [items]="selections" [formControl]="control"></td-chips>`,
template: `<td-chips [items]="selections" [formControl]="control"></td-chips>
<div *ngIf="errorMessageTemplate && control?.errors"
class="tc-red-600"
[style.font-size.%]="'70'">
<ng-template
[ngTemplateOutlet]="errorMessageTemplate"
[ngTemplateOutletContext]="{control: control, errors: control?.errors}">
</ng-template>
</div>`,
})
export class TdTestDynamicComponent {

control: FormControl;
selections: string[] = [];
errorMessageTemplate: TemplateRef<any>;

}

Expand Down Expand Up @@ -80,6 +89,7 @@ export class DynamicFormsDemoComponent {
name: 'number',
label: 'Number',
type: TdDynamicType.Number,
hint: 'this is an input hint',
required: true,
min: 18,
max: 70,
Expand Down Expand Up @@ -160,6 +170,12 @@ export class DynamicFormsDemoComponent {
default: ['list1'],
selections: ['list1', 'list2', 'list3'],
flex: 100,
validators: [{
validator: (control: AbstractControl) => {
let isValid: boolean = control.value.length <= 2;
return !isValid ? {invalidChips: true} : undefined;
},
}],
}];

elementOptions: any[] = [
Expand Down
18 changes: 17 additions & 1 deletion src/platform/dynamic-forms/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -90,11 +90,26 @@ Example for HTML usage:
import { ITdDynamicElementConfig, TdDynamicElement, TdDynamicType } from '@covalent/dynamic-forms';
...
/* CUSTOM TYPE */
template: '<label>{{label}}</label><input [formControl]="control">',
template: `<label>{{label}}</label>
<input [formControl]="control">
<div *ngIf="errorMessageTemplate && control?.errors"
class="tc-red-600"
[style.font-size.%]="'70'">
<ng-template
[ngTemplateOutlet]="errorMessageTemplate"
[ngTemplateOutletContext]="{control: control, errors: control?.errors}">
</ng-template>
</div>`,
})
export class DynamicCustomComponent {
/* control property needed to properly bind the underlying element */
control: FormControl;

/* map any of the properties you passed in the config */
label: string;

/* map the error message template and use it anywhere you need to */
errorMessageTemplate: TemplateRef<any>;
}
...
})
Expand Down Expand Up @@ -142,6 +157,7 @@ export class Demo {
name: 'custom',
label: 'Custom',
type: DynamicCustomComponent,
required: true,
}];
}
```
Expand Down
6 changes: 6 additions & 0 deletions src/platform/dynamic-forms/dynamic-element.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,11 @@ export class TdDynamicElementComponent extends _TdDynamicElementMixinBase
*/
@Input() selections: any[] = undefined;

/**
* Sets error message template so it can be injected into dynamic components.
*/
@Input() errorMessageTemplate: TemplateRef<any> = undefined;

@ViewChild(TdDynamicElementDirective) childElement: TdDynamicElementDirective;

@HostBinding('attr.max')
Expand Down Expand Up @@ -132,6 +137,7 @@ export class TdDynamicElementComponent extends _TdDynamicElementMixinBase
this._instance.minLength = this.minLength;
this._instance.maxLength = this.maxLength;
this._instance.selections = this.selections;
this._instance.errorMessageTemplate = this.errorMessageTemplate;
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,12 @@
[min]="min"
[max]="max"/>
<mat-hint>{{hint}}</mat-hint>
<mat-error>
<ng-template
[ngTemplateOutlet]="errorMessageTemplate"
[ngTemplateOutletContext]="{control: control, errors: control?.errors}">
</ng-template>
</mat-error>
<mat-datepicker-toggle matSuffix [for]="dynamicDatePicker"></mat-datepicker-toggle>
<mat-datepicker #dynamicDatePicker></mat-datepicker>
</mat-form-field>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Component } from '@angular/core';
import { Component, TemplateRef } from '@angular/core';
import { FormControl } from '@angular/forms';

@Component({
Expand All @@ -22,4 +22,6 @@ export class TdDynamicDatepickerComponent {

max: number = undefined;

errorMessageTemplate: TemplateRef<any> = undefined;

}
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,12 @@
[placeholder]="label"
readonly/>
<mat-hint>{{hint}}</mat-hint>
<mat-error>
<ng-template
[ngTemplateOutlet]="errorMessageTemplate"
[ngTemplateOutletContext]="{control: control, errors: control?.errors}">
</ng-template>
</mat-error>
</mat-form-field>
<button mat-icon-button *ngIf="control.value" (click)="fileInput.clear()" (keyup.enter)="fileInput.clear()">
<mat-icon>cancel</mat-icon>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Component } from '@angular/core';
import { Component, TemplateRef } from '@angular/core';
import { FormControl } from '@angular/forms';

@Component({
Expand All @@ -16,6 +16,8 @@ export class TdDynamicFileInputComponent {

hint: string = '';

errorMessageTemplate: TemplateRef<any> = undefined;

_handlefileDrop(value: File): void {
this.control.setValue(value);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,11 @@
[attr.minLength]="minLength"
[attr.maxLength]="maxLength"/>
<mat-hint>{{hint}}</mat-hint>
<mat-error>
<ng-template
[ngTemplateOutlet]="errorMessageTemplate"
[ngTemplateOutletContext]="{control: control, errors: control?.errors}">
</ng-template>
</mat-error>
</mat-form-field>
</div>
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Component } from '@angular/core';
import { Component, TemplateRef } from '@angular/core';
import { FormControl } from '@angular/forms';

@Component({
Expand Down Expand Up @@ -26,4 +26,6 @@ export class TdDynamicInputComponent {

maxLength: number = undefined;

errorMessageTemplate: TemplateRef<any> = undefined;

}
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,11 @@
<mat-option *ngFor="let selection of selections" [value]="selection.value || selection">{{selection.label || selection}}</mat-option>
</mat-select>
<mat-hint>{{hint}}</mat-hint>
<mat-error>
<ng-template
[ngTemplateOutlet]="errorMessageTemplate"
[ngTemplateOutletContext]="{control: control, errors: control?.errors}">
</ng-template>
</mat-error>
</mat-form-field>
</div>
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Component } from '@angular/core';
import { Component, TemplateRef } from '@angular/core';
import { FormControl } from '@angular/forms';

@Component({
Expand All @@ -18,4 +18,6 @@ export class TdDynamicSelectComponent {

selections: any[] = undefined;

errorMessageTemplate: TemplateRef<any> = undefined;

}
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,11 @@
rows="4">
</textarea>
<mat-hint>{{hint}}</mat-hint>
<mat-error>
<ng-template
[ngTemplateOutlet]="errorMessageTemplate"
[ngTemplateOutletContext]="{control: control, errors: control?.errors}">
</ng-template>
</mat-error>
</mat-form-field>
</div>
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Component } from '@angular/core';
import { Component, TemplateRef } from '@angular/core';
import { FormControl } from '@angular/forms';

@Component({
Expand All @@ -16,4 +16,6 @@ export class TdDynamicTextareaComponent {

required: boolean = undefined;

errorMessageTemplate: TemplateRef<any> = undefined;

}
13 changes: 2 additions & 11 deletions src/platform/dynamic-forms/dynamic-forms.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,9 @@
[max]="element.max"
[minLength]="element.minLength"
[maxLength]="element.maxLength"
[selections]="element.selections">
[selections]="element.selections"
[errorMessageTemplate]="getErrorTemplateRef(element.name)">
</td-dynamic-element>
<div class="tc-red-600"
[style.font-size.%]="'70'"
[style.position]="'absolute'"
[style.bottom.px]="'10'"
*ngIf="getErrorTemplateRef(element.name) && dynamicForm.controls[element.name]?.errors">
<ng-template
[ngTemplateOutlet]="getErrorTemplateRef(element.name)"
[ngTemplateOutletContext]="{control: dynamicForm.controls[element.name], errors: dynamicForm.controls[element.name]?.errors}">
</ng-template>
</div>
</div>
</ng-template>
</div>
Expand Down