diff --git a/projects/common/components/input-elements/spell-correct.component.ts b/projects/common/components/input-elements/spell-correct.component.ts index cdd7c03625e777f75679f84944a7f4c2a5b340cf..af015d60bfcf51c6b033adf2b7780ec2aebd34ff 100644 --- a/projects/common/components/input-elements/spell-correct.component.ts +++ b/projects/common/components/input-elements/spell-correct.component.ts @@ -32,8 +32,8 @@ import { SpellCorrectElement } from 'common/models/elements/input-elements/spell [style.text-decoration]="elementModel.styling.underline ? 'underline' : ''" [formControl]="elementFormControl" (keydown)="elementModel.showSoftwareKeyboard ? onKeyDown.emit(input) : null" - (focus)="onFocusChanged.emit(input)" - (blur)="onFocusChanged.emit(null)"> + (focus)="focusChanged.emit(input)" + (blur)="focusChanged.emit(null)"> </mat-form-field> <button #buttonElement mat-button @@ -67,7 +67,7 @@ import { SpellCorrectElement } from 'common/models/elements/input-elements/spell }) export class SpellCorrectComponent extends FormElementComponent { @Input() elementModel!: SpellCorrectElement; - @Output() onFocusChanged = new EventEmitter<HTMLElement | null>(); + @Output() focusChanged = new EventEmitter<HTMLElement | null>(); @Output() onKeyDown = new EventEmitter<HTMLElement>(); @ViewChild(MatInput) inputElement!: MatInput; } diff --git a/projects/common/components/input-elements/text-area.component.ts b/projects/common/components/input-elements/text-area.component.ts index a785827b72c81539a9a5ecf88a90c0840e8a0849..e158b60b5133d3c608891d9597c8a57ccfb236ee 100644 --- a/projects/common/components/input-elements/text-area.component.ts +++ b/projects/common/components/input-elements/text-area.component.ts @@ -8,18 +8,18 @@ import { TextAreaElement } from 'common/models/elements/input-elements/text-area selector: 'aspect-text-area', template: ` <mat-form-field - [ngClass]="{ 'no-label' : !elementModel.label}" - [style.width.%]="100" - [style.height.%]="100" - [style.min-height.%]="100" - aspectInputBackgroundColor [backgroundColor]="elementModel.styling.backgroundColor" - [style.color]="elementModel.styling.fontColor" - [style.font-family]="elementModel.styling.font" - [style.font-size.px]="elementModel.styling.fontSize" - [style.font-weight]="elementModel.styling.bold ? 'bold' : ''" - [style.font-style]="elementModel.styling.italic ? 'italic' : ''" - [style.text-decoration]="elementModel.styling.underline ? 'underline' : ''" - [appearance]="$any(elementModel.appearance)"> + [ngClass]="{ 'no-label' : !elementModel.label}" + [style.width.%]="100" + [style.height.%]="100" + [style.min-height.%]="100" + aspectInputBackgroundColor [backgroundColor]="elementModel.styling.backgroundColor" + [style.color]="elementModel.styling.fontColor" + [style.font-family]="elementModel.styling.font" + [style.font-size.px]="elementModel.styling.fontSize" + [style.font-weight]="elementModel.styling.bold ? 'bold' : ''" + [style.font-style]="elementModel.styling.italic ? 'italic' : ''" + [style.text-decoration]="elementModel.styling.underline ? 'underline' : ''" + [appearance]="$any(elementModel.appearance)"> <mat-label *ngIf="elementModel.label">{{elementModel.label}}</mat-label> <textarea matInput #input autocomplete="off" @@ -35,8 +35,8 @@ import { TextAreaElement } from 'common/models/elements/input-elements/text-area [style.line-height.%]="elementModel.styling.lineHeight" [style.resize]="elementModel.resizeEnabled ? 'both' : 'none'" (keydown)="elementModel.showSoftwareKeyboard ? onKeyDown.emit(input) : null" - (focus)="onFocusChanged.emit(input)" - (blur)="onFocusChanged.emit(null)"> + (focus)="focusChanged.emit(input)" + (blur)="focusChanged.emit(null)"> </textarea> <mat-error *ngIf="elementFormControl.errors"> {{elementFormControl.errors | errorTransform: elementModel}} @@ -50,6 +50,6 @@ import { TextAreaElement } from 'common/models/elements/input-elements/text-area }) export class TextAreaComponent extends FormElementComponent { @Input() elementModel!: TextAreaElement; - @Output() onFocusChanged = new EventEmitter<HTMLElement | null>(); + @Output() focusChanged = new EventEmitter<HTMLElement | null>(); @Output() onKeyDown = new EventEmitter<HTMLElement>(); } diff --git a/projects/common/components/input-elements/text-field.component.ts b/projects/common/components/input-elements/text-field.component.ts index 28a3432869d51eb9c288dd21df542b81c50553da..8d5110b8e25ac2ce678f44b4fa74860699b1ae8c 100644 --- a/projects/common/components/input-elements/text-field.component.ts +++ b/projects/common/components/input-elements/text-field.component.ts @@ -31,8 +31,8 @@ import { TextFieldElement } from 'common/models/elements/input-elements/text-fie [pattern]="$any(elementModel.pattern)" [readonly]="elementModel.readOnly" (keydown)="elementModel.showSoftwareKeyboard ? onKeyDown.emit(input) : null" - (focus)="onFocusChanged.emit(input)" - (blur)="onFocusChanged.emit(null)"> + (focus)="focusChanged.emit(input)" + (blur)="focusChanged.emit(null)"> <button *ngIf="elementModel.clearable" type="button" matSuffix mat-icon-button aria-label="Clear" @@ -52,5 +52,5 @@ import { TextFieldElement } from 'common/models/elements/input-elements/text-fie export class TextFieldComponent extends FormElementComponent { @Input() elementModel!: TextFieldElement; @Output() onKeyDown = new EventEmitter<HTMLElement>(); - @Output() onFocusChanged = new EventEmitter<HTMLElement | null>(); + @Output() focusChanged = new EventEmitter<HTMLElement | null>(); } diff --git a/projects/player/src/app/components/elements/text-input-group-element/text-input-group-element.component.html b/projects/player/src/app/components/elements/text-input-group-element/text-input-group-element.component.html index f50e5cb4545decf683bae1c2ba8807fc4a0913d8..8fc6ec45be67292d443c1d58656eab93b90d426a 100644 --- a/projects/player/src/app/components/elements/text-input-group-element/text-input-group-element.component.html +++ b/projects/player/src/app/components/elements/text-input-group-element/text-input-group-element.component.html @@ -6,7 +6,7 @@ [parentForm]="form" [elementModel]="elementModel | cast: TextAreaElement" (onKeyDown)="detectHardwareKeyboard($event, elementComponent)" - (onFocusChanged)="onFocusChanged($event, elementComponent)"> + (focusChanged)="onFocusChanged($event, elementComponent)"> </aspect-text-area> <aspect-text-field *ngIf="elementModel.type === 'text-field'" @@ -14,7 +14,7 @@ [parentForm]="form" [elementModel]="elementModel | cast: TextFieldElement" (onKeyDown)="detectHardwareKeyboard($event, elementComponent)" - (onFocusChanged)="onFocusChanged($event, elementComponent)"> + (focusChanged)="onFocusChanged($event, elementComponent)"> </aspect-text-field> <aspect-spell-correct *ngIf="elementModel.type === 'spell-correct'" @@ -22,7 +22,7 @@ [parentForm]="form" [elementModel]="elementModel | cast: SpellCorrectElement" (onKeyDown)="detectHardwareKeyboard($event, elementComponent)" - (onFocusChanged)="onFocusChanged($event, elementComponent)"> + (focusChanged)="onFocusChanged($event, elementComponent)"> </aspect-spell-correct> </form>