Skip to content
Snippets Groups Projects
Commit 7c388331 authored by jojohoch's avatar jojohoch
Browse files

Rename event onFocusChanged

- Remove prefix 'on'
parent 2998b6bf
No related branches found
No related tags found
No related merge requests found
...@@ -32,8 +32,8 @@ import { SpellCorrectElement } from 'common/models/elements/input-elements/spell ...@@ -32,8 +32,8 @@ import { SpellCorrectElement } from 'common/models/elements/input-elements/spell
[style.text-decoration]="elementModel.styling.underline ? 'underline' : ''" [style.text-decoration]="elementModel.styling.underline ? 'underline' : ''"
[formControl]="elementFormControl" [formControl]="elementFormControl"
(keydown)="elementModel.showSoftwareKeyboard ? onKeyDown.emit(input) : null" (keydown)="elementModel.showSoftwareKeyboard ? onKeyDown.emit(input) : null"
(focus)="onFocusChanged.emit(input)" (focus)="focusChanged.emit(input)"
(blur)="onFocusChanged.emit(null)"> (blur)="focusChanged.emit(null)">
</mat-form-field> </mat-form-field>
<button #buttonElement <button #buttonElement
mat-button mat-button
...@@ -67,7 +67,7 @@ import { SpellCorrectElement } from 'common/models/elements/input-elements/spell ...@@ -67,7 +67,7 @@ import { SpellCorrectElement } from 'common/models/elements/input-elements/spell
}) })
export class SpellCorrectComponent extends FormElementComponent { export class SpellCorrectComponent extends FormElementComponent {
@Input() elementModel!: SpellCorrectElement; @Input() elementModel!: SpellCorrectElement;
@Output() onFocusChanged = new EventEmitter<HTMLElement | null>(); @Output() focusChanged = new EventEmitter<HTMLElement | null>();
@Output() onKeyDown = new EventEmitter<HTMLElement>(); @Output() onKeyDown = new EventEmitter<HTMLElement>();
@ViewChild(MatInput) inputElement!: MatInput; @ViewChild(MatInput) inputElement!: MatInput;
} }
...@@ -8,18 +8,18 @@ import { TextAreaElement } from 'common/models/elements/input-elements/text-area ...@@ -8,18 +8,18 @@ import { TextAreaElement } from 'common/models/elements/input-elements/text-area
selector: 'aspect-text-area', selector: 'aspect-text-area',
template: ` template: `
<mat-form-field <mat-form-field
[ngClass]="{ 'no-label' : !elementModel.label}" [ngClass]="{ 'no-label' : !elementModel.label}"
[style.width.%]="100" [style.width.%]="100"
[style.height.%]="100" [style.height.%]="100"
[style.min-height.%]="100" [style.min-height.%]="100"
aspectInputBackgroundColor [backgroundColor]="elementModel.styling.backgroundColor" aspectInputBackgroundColor [backgroundColor]="elementModel.styling.backgroundColor"
[style.color]="elementModel.styling.fontColor" [style.color]="elementModel.styling.fontColor"
[style.font-family]="elementModel.styling.font" [style.font-family]="elementModel.styling.font"
[style.font-size.px]="elementModel.styling.fontSize" [style.font-size.px]="elementModel.styling.fontSize"
[style.font-weight]="elementModel.styling.bold ? 'bold' : ''" [style.font-weight]="elementModel.styling.bold ? 'bold' : ''"
[style.font-style]="elementModel.styling.italic ? 'italic' : ''" [style.font-style]="elementModel.styling.italic ? 'italic' : ''"
[style.text-decoration]="elementModel.styling.underline ? 'underline' : ''" [style.text-decoration]="elementModel.styling.underline ? 'underline' : ''"
[appearance]="$any(elementModel.appearance)"> [appearance]="$any(elementModel.appearance)">
<mat-label *ngIf="elementModel.label">{{elementModel.label}}</mat-label> <mat-label *ngIf="elementModel.label">{{elementModel.label}}</mat-label>
<textarea matInput #input <textarea matInput #input
autocomplete="off" autocomplete="off"
...@@ -35,8 +35,8 @@ import { TextAreaElement } from 'common/models/elements/input-elements/text-area ...@@ -35,8 +35,8 @@ import { TextAreaElement } from 'common/models/elements/input-elements/text-area
[style.line-height.%]="elementModel.styling.lineHeight" [style.line-height.%]="elementModel.styling.lineHeight"
[style.resize]="elementModel.resizeEnabled ? 'both' : 'none'" [style.resize]="elementModel.resizeEnabled ? 'both' : 'none'"
(keydown)="elementModel.showSoftwareKeyboard ? onKeyDown.emit(input) : null" (keydown)="elementModel.showSoftwareKeyboard ? onKeyDown.emit(input) : null"
(focus)="onFocusChanged.emit(input)" (focus)="focusChanged.emit(input)"
(blur)="onFocusChanged.emit(null)"> (blur)="focusChanged.emit(null)">
</textarea> </textarea>
<mat-error *ngIf="elementFormControl.errors"> <mat-error *ngIf="elementFormControl.errors">
{{elementFormControl.errors | errorTransform: elementModel}} {{elementFormControl.errors | errorTransform: elementModel}}
...@@ -50,6 +50,6 @@ import { TextAreaElement } from 'common/models/elements/input-elements/text-area ...@@ -50,6 +50,6 @@ import { TextAreaElement } from 'common/models/elements/input-elements/text-area
}) })
export class TextAreaComponent extends FormElementComponent { export class TextAreaComponent extends FormElementComponent {
@Input() elementModel!: TextAreaElement; @Input() elementModel!: TextAreaElement;
@Output() onFocusChanged = new EventEmitter<HTMLElement | null>(); @Output() focusChanged = new EventEmitter<HTMLElement | null>();
@Output() onKeyDown = new EventEmitter<HTMLElement>(); @Output() onKeyDown = new EventEmitter<HTMLElement>();
} }
...@@ -31,8 +31,8 @@ import { TextFieldElement } from 'common/models/elements/input-elements/text-fie ...@@ -31,8 +31,8 @@ import { TextFieldElement } from 'common/models/elements/input-elements/text-fie
[pattern]="$any(elementModel.pattern)" [pattern]="$any(elementModel.pattern)"
[readonly]="elementModel.readOnly" [readonly]="elementModel.readOnly"
(keydown)="elementModel.showSoftwareKeyboard ? onKeyDown.emit(input) : null" (keydown)="elementModel.showSoftwareKeyboard ? onKeyDown.emit(input) : null"
(focus)="onFocusChanged.emit(input)" (focus)="focusChanged.emit(input)"
(blur)="onFocusChanged.emit(null)"> (blur)="focusChanged.emit(null)">
<button *ngIf="elementModel.clearable" <button *ngIf="elementModel.clearable"
type="button" type="button"
matSuffix mat-icon-button aria-label="Clear" matSuffix mat-icon-button aria-label="Clear"
...@@ -52,5 +52,5 @@ import { TextFieldElement } from 'common/models/elements/input-elements/text-fie ...@@ -52,5 +52,5 @@ import { TextFieldElement } from 'common/models/elements/input-elements/text-fie
export class TextFieldComponent extends FormElementComponent { export class TextFieldComponent extends FormElementComponent {
@Input() elementModel!: TextFieldElement; @Input() elementModel!: TextFieldElement;
@Output() onKeyDown = new EventEmitter<HTMLElement>(); @Output() onKeyDown = new EventEmitter<HTMLElement>();
@Output() onFocusChanged = new EventEmitter<HTMLElement | null>(); @Output() focusChanged = new EventEmitter<HTMLElement | null>();
} }
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
[parentForm]="form" [parentForm]="form"
[elementModel]="elementModel | cast: TextAreaElement" [elementModel]="elementModel | cast: TextAreaElement"
(onKeyDown)="detectHardwareKeyboard($event, elementComponent)" (onKeyDown)="detectHardwareKeyboard($event, elementComponent)"
(onFocusChanged)="onFocusChanged($event, elementComponent)"> (focusChanged)="onFocusChanged($event, elementComponent)">
</aspect-text-area> </aspect-text-area>
<aspect-text-field <aspect-text-field
*ngIf="elementModel.type === 'text-field'" *ngIf="elementModel.type === 'text-field'"
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
[parentForm]="form" [parentForm]="form"
[elementModel]="elementModel | cast: TextFieldElement" [elementModel]="elementModel | cast: TextFieldElement"
(onKeyDown)="detectHardwareKeyboard($event, elementComponent)" (onKeyDown)="detectHardwareKeyboard($event, elementComponent)"
(onFocusChanged)="onFocusChanged($event, elementComponent)"> (focusChanged)="onFocusChanged($event, elementComponent)">
</aspect-text-field> </aspect-text-field>
<aspect-spell-correct <aspect-spell-correct
*ngIf="elementModel.type === 'spell-correct'" *ngIf="elementModel.type === 'spell-correct'"
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
[parentForm]="form" [parentForm]="form"
[elementModel]="elementModel | cast: SpellCorrectElement" [elementModel]="elementModel | cast: SpellCorrectElement"
(onKeyDown)="detectHardwareKeyboard($event, elementComponent)" (onKeyDown)="detectHardwareKeyboard($event, elementComponent)"
(onFocusChanged)="onFocusChanged($event, elementComponent)"> (focusChanged)="onFocusChanged($event, elementComponent)">
</aspect-spell-correct> </aspect-spell-correct>
</form> </form>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment