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.

Sign up for GitHub

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(core): handle IME input correctly to prevent accidental deletion of characters #12339

Closed
wants to merge 1 commit into from
+20 −3
Closed

fix(core): handle IME input correctly to prevent accidental deletion of characters #12339

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 20 additions & 3 deletions libs/cdk/utils/directives/auto-complete/auto-complete.directive.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { Directive, ElementRef, EventEmitter, Input, NgZone, Output, inject } fr
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
import { fromEvent, map, switchMap } from 'rxjs';
import { first } from 'rxjs/operators';
import { KeyUtil } from '../../functions/key-util';
import { KeyUtil } from '../../functions';

export interface AutoCompleteEvent {
term: string;
Expand Down Expand Up @@ -57,6 +57,9 @@ export class AutoCompleteDirective {
/** @hidden */
private lastKeyUpEvent: KeyboardEvent;

/** @hidden */
private isComposing = false;

/** @hidden */
private readonly _elementRef = inject(ElementRef);

Expand All @@ -72,6 +75,12 @@ export class AutoCompleteDirective {
*/
this._zone.runOutsideAngular(() => {
const keyupEvent = fromEvent<KeyboardEvent>(this._elementRef.nativeElement, 'keyup');
const compositionStartEvent = fromEvent<CompositionEvent>(
this._elementRef.nativeElement,
'compositionstart'
);
const compositionEndEvent = fromEvent<CompositionEvent>(this._elementRef.nativeElement, 'compositionend');

keyupEvent
.pipe(
switchMap((evt) =>
Expand All @@ -83,6 +92,15 @@ export class AutoCompleteDirective {
takeUntilDestroyed()
)
.subscribe((evt) => this._handleKeyboardEvent(evt));

compositionStartEvent.pipe(takeUntilDestroyed()).subscribe(() => {
this.isComposing = true;
});

compositionEndEvent.pipe(takeUntilDestroyed()).subscribe(() => {
this.isComposing = false;
this.inputText = this._elementRef.nativeElement.value;
});
});
}

Expand All @@ -92,7 +110,7 @@ export class AutoCompleteDirective {

/** @hidden */
_handleKeyboardEvent(event: KeyboardEvent): void {
if (this.enable) {
if (this.enable && !this.isComposing) {
if (KeyUtil.isKeyCode(event, this._stopKeys)) {
this._elementRef.nativeElement.value = this.inputText;
} else if (KeyUtil.isKeyCode(event, this._completeKeys)) {
Expand All @@ -101,7 +119,6 @@ export class AutoCompleteDirective {
} else if (KeyUtil.isKeyCode(event, this._fillKeys)) {
this._sendCompleteEvent(false);
} else if (!this._isControlKey(event) && this.inputText) {
/** Prevention from triggering typeahead, when having crtl/cmd + keys */
if (!this._triggerTypeAhead()) {
return;
}
Expand Down
Loading