チャットパレットからエンターで送信時、チャットパレットの選択状態をリセット。

NanasuNANA · Oct 17, 2023 · 33fce2d · 33fce2d
1 parent 9298d5e
commit 33fce2d
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/src/app/component/chat-input/chat-input.component.ts b/src/app/component/chat-input/chat-input.component.ts
@@ -363,7 +363,12 @@ export class ChatInputComponent implements OnInit, OnDestroy {
     }
   }
 
-   sendChat(event: Partial<KeyboardEvent>) {
+  focusInput() {
+    if (!this.textAreaElementRef) return;
+    this.textAreaElementRef.nativeElement.focus();
+  } 
+
+  sendChat(event: Partial<KeyboardEvent>) {
     if (event) event.preventDefault();
     //if (!this.text.length) return;
     if (event && event.keyCode !== 13) return;

diff --git a/src/app/component/chat-palette/chat-palette.component.html b/src/app/component/chat-palette/chat-palette.component.html
@@ -16,7 +16,7 @@
     </div>
   </div>
   <div *ngIf="!isEdit" style="flex-grow: 1; height: 0; min-height: 100px;">
-    <select #chatPlette class="palette" style="overflow-y: auto;" size="5" (focus)="arrowPalette()" (keydown.arrowUp)="moveToInput($event)" (keyup.arrowUp)="arrowPalette()" (keyup.arrowDown)="arrowPalette()" (keydown.enter)="enterPalette(chatPlette.value)" (click)="clickPalette(chatPlette.value)">
+    <select #chatPlette class="palette" style="overflow-y: auto;" size="5" (focus)="arrowPalette()" (keydown.arrowUp)="moveToInput($event)" (keyup.arrowUp)="arrowPalette()" (keyup.arrowDown)="arrowPalette()" (keydown.enter)="enterPalette(chatPlette.value, $event)" (click)="clickPalette(chatPlette.value)">
       <ng-container *ngIf="palette">
         <ng-container *ngFor="let palette of palette.getPalette()">
           <option *ngIf="filter(palette)" value="{{palette}}" [style.color]="color">{{palette}}</option>

diff --git a/src/app/component/chat-palette/chat-palette.component.ts b/src/app/component/chat-palette/chat-palette.component.ts
@@ -136,10 +136,13 @@ export class ChatPaletteComponent implements OnInit, OnDestroy {
     }
   }
 
-  enterPalette(line: string) {
+  enterPalette(line: string, e: Event=null) {
     if (!this.chatPletteElementRef.nativeElement) return;
     this.text = this.palette.evaluate(line, this.character.rootDataElement);
     this.chatInputComponent.sendChat(null);
+    this.chatInputComponent.focusInput();
+    this.chatPletteElementRef.nativeElement.selectedIndex = -1;
+    if (e) e.preventDefault();
   }
 
   moveToPalette() {