Marmelator/common-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

RED-6960 - Enter should always confirm a modal window

Browse Source
This commit is contained in:
Valentin Mihai 2023-11-13 13:23:31 +02:00
parent 63df71a6aa
commit 8ba271bb6c
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/lib/dialog/iqser-dialog-component.directive.ts
View File

@ -1,7 +1,7 @@
import { Directive, HostListener, inject } from '@angular/core'; import { Directive, HostListener, inject } from '@angular/core';
import { MAT_DIALOG_DATA, MatDialog, MatDialogRef } from '@angular/material/dialog'; import { MAT_DIALOG_DATA, MatDialog, MatDialogRef } from '@angular/material/dialog';
import { takeUntilDestroyed } from '@angular/core/rxjs-interop'; import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
import { hasFormChanged, IqserEventTarget } from '../utils'; import { hasFormChanged } from '../utils';
import { FormGroup } from '@angular/forms'; import { FormGroup } from '@angular/forms';
const DATA_TYPE_SYMBOL = Symbol.for('DATA_TYPE'); const DATA_TYPE_SYMBOL = Symbol.for('DATA_TYPE');
@ -10,7 +10,6 @@ const RETURN_TYPE_SYMBOL = Symbol.for('RETURN_TYPE');
export type DATA_TYPE = typeof DATA_TYPE_SYMBOL; export type DATA_TYPE = typeof DATA_TYPE_SYMBOL;
export type RETURN_TYPE = typeof RETURN_TYPE_SYMBOL; export type RETURN_TYPE = typeof RETURN_TYPE_SYMBOL;
const TARGET_NODE = 'mat-dialog-container';
@Directive() @Directive()
export abstract class IqserDialogComponent<ComponentType, DataType, ReturnType> { export abstract class IqserDialogComponent<ComponentType, DataType, ReturnType> {
@ -53,8 +52,7 @@ export abstract class IqserDialogComponent<ComponentType, DataType, ReturnType>
@HostListener('window:keydown.Enter', ['$event']) @HostListener('window:keydown.Enter', ['$event'])
onEnter(event: KeyboardEvent): void { onEnter(event: KeyboardEvent): void {
event?.stopImmediatePropagation(); event?.stopImmediatePropagation();
const node = (event.target as IqserEventTarget).localName?.trim()?.toLowerCase(); if (this.onEnterValidator(event)) {
if (this.onEnterValidator(event) && node === TARGET_NODE) {
this.close(); this.close();
} }
} }