From 500a5615f08f6926d12ef83466b4b642549cb756 Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Tue, 1 Apr 2025 13:18:49 +0900
Subject: enhance(frontend): 壁紙をデッキ設定の一部に
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/utility/autogen/settings-search-index.ts   | 24 +++++++++++-----------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'packages/frontend/src/utility')

diff --git a/packages/frontend/src/utility/autogen/settings-search-index.ts b/packages/frontend/src/utility/autogen/settings-search-index.ts
index 1563f19c34..08ab0d8811 100644
--- a/packages/frontend/src/utility/autogen/settings-search-index.ts
+++ b/packages/frontend/src/utility/autogen/settings-search-index.ts
@@ -37,11 +37,6 @@ export const searchIndexes: SearchIndexItem[] = [
 				label: i18n.ts.themeForDarkMode,
 				keywords: ['dark', 'theme'],
 			},
-			{
-				id: '8wcoRp76b',
-				label: i18n.ts.setWallpaper,
-				keywords: ['wallpaper'],
-			},
 		],
 		label: i18n.ts.theme,
 		keywords: ['theme'],
@@ -861,40 +856,45 @@ export const searchIndexes: SearchIndexItem[] = [
 				keywords: ['sync', 'profiles', 'devices'],
 			},
 			{
-				id: 'iEF0gqNAo',
+				id: 'wWH4pxMQN',
 				label: i18n.ts._deck.useSimpleUiForNonRootPages,
 				keywords: ['ui', 'root', 'page'],
 			},
 			{
-				id: 'BNdSeWxZn',
+				id: '3LR509BvD',
 				label: i18n.ts.defaultNavigationBehaviour,
 				keywords: ['default', 'navigation', 'behaviour', 'window'],
 			},
 			{
-				id: 'zT9pGm8DF',
+				id: 'ybU8RLXgm',
 				label: i18n.ts._deck.alwaysShowMainColumn,
 				keywords: ['always', 'show', 'main', 'column'],
 			},
 			{
-				id: '5dk2xv1vc',
+				id: 'xRasZyAVl',
 				label: i18n.ts._deck.columnAlign,
 				keywords: ['column', 'align'],
 			},
 			{
-				id: 'gtdEA4FTa',
+				id: '6qcyPd0oJ',
 				label: i18n.ts._deck.deckMenuPosition,
 				keywords: ['menu', 'position'],
 			},
 			{
-				id: 'DHVFdPBT6',
+				id: '4zk2Now4S',
 				label: i18n.ts._deck.navbarPosition,
 				keywords: ['navbar', 'position'],
 			},
 			{
-				id: '3UQ8rUssZ',
+				id: 'CGNtJ2I3n',
 				label: i18n.ts._deck.columnGap,
 				keywords: ['column', 'gap', 'margin'],
 			},
+			{
+				id: 'rxPDMo7bE',
+				label: i18n.ts.setWallpaper,
+				keywords: ['wallpaper'],
+			},
 		],
 		label: i18n.ts.deck,
 		keywords: ['deck', 'ui'],
-- 
cgit v1.2.3-freya


From 4f206eea9fd5746470f548a1e067e4546c34f950 Mon Sep 17 00:00:00 2001
From: かっこかり <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Tue, 1 Apr 2025 17:15:22 +0900
Subject: refactor(frontend): intl-stringの処理のパフォーマンス向上 (#15737)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* refactor(frontend): intl-stringの処理のパフォーマンス向上

* :v:
---
 packages/frontend/src/utility/intl-string.ts | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

(limited to 'packages/frontend/src/utility')

diff --git a/packages/frontend/src/utility/intl-string.ts b/packages/frontend/src/utility/intl-string.ts
index a5b5bbb592..4bc51e2cb0 100644
--- a/packages/frontend/src/utility/intl-string.ts
+++ b/packages/frontend/src/utility/intl-string.ts
@@ -9,9 +9,9 @@ import type { toHiragana as toHiraganaType } from 'wanakana';
 let toHiragana: typeof toHiraganaType = (str?: string) => str ?? '';
 let isWanakanaLoaded = false;
 
-/** 
+/**
  * ローマ字変換のセットアップ（日本語以外の環境で読み込まないのでlazy-loading）
- * 
+ *
  * ここの比較系関数を使う際は事前に呼び出す必要がある
  */
 export async function initIntlString(forceWanakana = false) {
@@ -82,16 +82,17 @@ export function normalizeStringWithHiragana(str: string) {
 
 /** aとbが同じかどうか */
 export function compareStringEquals(a: string, b: string) {
-	return (
-		normalizeString(a) === normalizeString(b) ||
-		normalizeStringWithHiragana(a) === normalizeStringWithHiragana(b)
-	);
+	if (a === b) return true; // まったく同じ場合はtrue。なお、ノーマライズ前後で文字数が変化することがあるため、文字数が違うからといってfalseにはできない
+	if (normalizeString(a) === normalizeString(b)) return true;
+	if (normalizeStringWithHiragana(a) === normalizeStringWithHiragana(b)) return true;
+	return false;
 }
 
 /** baseにqueryが含まれているかどうか */
 export function compareStringIncludes(base: string, query: string) {
-	return (
-		normalizeString(base).includes(normalizeString(query)) ||
-		normalizeStringWithHiragana(base).includes(normalizeStringWithHiragana(query))
-	);
+	if (base === query) return true; // まったく同じ場合は含まれていると考えてよいのでtrue
+	if (base.includes(query)) return true;
+	if (normalizeString(base).includes(normalizeString(query))) return true;
+	if (normalizeStringWithHiragana(base).includes(normalizeStringWithHiragana(query))) return true;
+	return false;
 }
-- 
cgit v1.2.3-freya