From bea77b08a004bfa52303746ea119b375c030e461 Mon Sep 17 00:00:00 2001
From: "DESKTOP-64JNFCF\\keyra" <nnanasu7@gmail.com>
Date: Tue, 7 Nov 2023 22:55:17 +0900
Subject: [PATCH] =?UTF-8?q?=E3=83=81=E3=83=A3=E3=83=83=E3=83=88=E3=83=91?=
 =?UTF-8?q?=E3=83=AC=E3=83=83=E3=83=88=E3=81=AE=E8=A1=8C=E6=95=B0=E3=81=8C?=
 =?UTF-8?q?=E5=A4=9A=E3=81=84=E6=99=82=E3=81=AB=E3=83=86=E3=82=AD=E3=82=B9?=
 =?UTF-8?q?=E3=83=88=E5=85=A5=E5=8A=9B=E3=81=8C=E9=87=8D=E3=81=8F=E3=81=AA?=
 =?UTF-8?q?=E3=82=8B=E4=B8=8D=E5=85=B7=E5=90=88=E3=81=AE=E8=BB=BD=E6=B8=9B?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../chat-palette/chat-palette.component.html  |  2 +-
 .../chat-palette/chat-palette.component.ts    | 32 +++++++++++++++----
 src/index.html                                |  2 +-
 3 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/src/app/component/chat-palette/chat-palette.component.html b/src/app/component/chat-palette/chat-palette.component.html
index f2cafad0..66f87f9b 100644
--- a/src/app/component/chat-palette/chat-palette.component.html
+++ b/src/app/component/chat-palette/chat-palette.component.html
@@ -18,7 +18,7 @@
   <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, $event)" (click)="clickPalette(chatPlette.value)">
       <ng-container *ngIf="palette">
-        <ng-container *ngFor="let palette of palette.getPalette()">
+        <ng-container *ngFor="let palette of filteredPaletteStrings">
           <option *ngIf="filter(palette)" value="{{palette}}" [style.color]="color">{{palette}}</option>
         </ng-container>
       </ng-container>
diff --git a/src/app/component/chat-palette/chat-palette.component.ts b/src/app/component/chat-palette/chat-palette.component.ts
index a9a76337..66d11af6 100644
--- a/src/app/component/chat-palette/chat-palette.component.ts
+++ b/src/app/component/chat-palette/chat-palette.component.ts
@@ -1,4 +1,4 @@
-import { Component, ElementRef, Input, OnDestroy, OnInit, ViewChild } from '@angular/core';
+import { Component, ElementRef, Input, NgZone, OnDestroy, OnInit, ViewChild } from '@angular/core';
 import { ChatPalette } from '@udonarium/chat-palette';
 import { ChatTab } from '@udonarium/chat-tab';
 import { ObjectStore } from '@udonarium/core/synchronize-object/object-store';
@@ -9,6 +9,7 @@ import { GameCharacter } from '@udonarium/game-character';
 import { PeerCursor } from '@udonarium/peer-cursor';
 import { ChatInputComponent } from 'component/chat-input/chat-input.component';
 import { TextViewComponent } from 'component/text-view/text-view.component';
+import { interval } from 'rxjs';
 import { ChatMessageService } from 'service/chat-message.service';
 import { PanelOption, PanelService } from 'service/panel.service';
 import { PointerDeviceService } from 'service/pointer-device.service';
@@ -24,6 +25,21 @@ export class ChatPaletteComponent implements OnInit, OnDestroy {
   @Input() character: GameCharacter = null;
 
   get palette(): ChatPalette { return this.character.chatPalette; }
+  
+  paletteCache: string[] = [];
+  paletteRenewInterval: boolean = true;
+  paletteRenewIntervalId = setInterval(() => {
+    this.paletteRenewInterval = true;
+  }, 200);
+  get filteredPaletteStrings(): string[] {
+    this.ngZone.run(() => {
+      if (this.paletteRenewInterval) {
+        this.paletteRenewInterval = false;
+        this.paletteCache = this.character.chatPalette.getPalette().filter(text => this.filter(text));
+      }
+    });
+    return this.paletteCache;
+  }
 
   get color(): string {
     return this.chatInputComponent.color;
@@ -63,7 +79,8 @@ export class ChatPaletteComponent implements OnInit, OnDestroy {
   constructor(
     public chatMessageService: ChatMessageService,
     private panelService: PanelService,
-    private pointerDeviceService: PointerDeviceService
+    private pointerDeviceService: PointerDeviceService,
+    private ngZone: NgZone
   ) { }
 
   ngOnInit() {
@@ -83,6 +100,7 @@ export class ChatPaletteComponent implements OnInit, OnDestroy {
 
   ngOnDestroy() {
     EventSystem.unregister(this);
+    clearInterval(this.paletteRenewIntervalId);
     if (this.isEdit) this.toggleEditMode();
   }
 
@@ -132,9 +150,11 @@ export class ChatPaletteComponent implements OnInit, OnDestroy {
     if (!this.chatPletteElementRef.nativeElement) return;
     this.selectedPaletteIndex = this.chatPletteElementRef.nativeElement.selectedIndex;
     if (this.selectedPaletteIndex >= 0 && this.chatPletteElementRef.nativeElement.options[this.selectedPaletteIndex]) {
-      this.text = this.palette.evaluate(this.chatPletteElementRef.nativeElement.options[this.selectedPaletteIndex].value, this.character.rootDataElement);
-      let textArea: HTMLTextAreaElement = this.chatInputComponent.textAreaElementRef.nativeElement;
-      textArea.value = this.text;
+      this.ngZone.run(() => {
+        this.text = this.palette.evaluate(this.chatPletteElementRef.nativeElement.options[this.selectedPaletteIndex].value, this.character.rootDataElement);
+        let textArea: HTMLTextAreaElement = this.chatInputComponent.textAreaElementRef.nativeElement;
+        textArea.value = this.text;
+      });
     }
   }
 
@@ -201,7 +221,7 @@ export class ChatPaletteComponent implements OnInit, OnDestroy {
     const nomarizeFilterText = StringUtil.toHalfWidth(this.filterText.replace(/[―ー—‐]/g, '-').replace(/[\u3041-\u3096]/g, m => String.fromCharCode(m.charCodeAt(0) + 0x60))).replace(/[\r\n\s]+/, ' ').toUpperCase().trim();
     const nomarizeValue = StringUtil.toHalfWidth(value.replace(/[―ー—‐]/g, '-').replace(/[\u3041-\u3096]/g, m => String.fromCharCode(m.charCodeAt(0) + 0x60))).replace(/[\r\n\s]+/, ' ').toUpperCase().trim();
     if (nomarizeValue.indexOf(nomarizeFilterText) >= 0) return true;
-    const nomarizeEvaluateValue = StringUtil.toHalfWidth(this.palette.evaluate(value, this.character.rootDataElement).replace(/[―ー—‐]/g, '-').replace(/[\u3041-\u3096]/g, m => String.fromCharCode(m.charCodeAt(0) + 0x60))).replace(/[\r\n\s]+/, ' ').toUpperCase().trim();
+    const nomarizeEvaluateValue = StringUtil.toHalfWidth(!/[{｛]/.test(value) ? value : this.palette.evaluate(value, this.character.rootDataElement).replace(/[―ー—‐]/g, '-').replace(/[\u3041-\u3096]/g, m => String.fromCharCode(m.charCodeAt(0) + 0x60))).replace(/[\r\n\s]+/, ' ').toUpperCase().trim();
     return nomarizeEvaluateValue.indexOf(nomarizeFilterText) >= 0;
   }
 
diff --git a/src/index.html b/src/index.html
index b5cd9f78..3597a53b 100644
--- a/src/index.html
+++ b/src/index.html
@@ -2,7 +2,7 @@
 <html>
 <head>
   <meta charset="utf-8">
-  <title>Udonarium with Fly 1.8.10c (Powered by Udonarium 1.15.2)</title>
+  <title>Udonarium with Fly 1.8.10d (Powered by Udonarium 1.15.2)</title>
   <base href="./">
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <meta name="mobile-web-app-capable" content="yes">