From a8bb9b09416c3da097d78fd2fe46232399ab9628 Mon Sep 17 00:00:00 2001 From: Claycuy Date: Thu, 25 Jun 2026 17:15:39 +0800 Subject: [PATCH 01/12] fix: App settings ui bug --- src/settings/appSettings.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/settings/appSettings.js b/src/settings/appSettings.js index e003615c1..db72031b8 100644 --- a/src/settings/appSettings.js +++ b/src/settings/appSettings.js @@ -178,7 +178,10 @@ export default function otherSettings() { key: "quickToolsTriggerMode", text: strings["quicktools trigger mode"], value: values.quickToolsTriggerMode, - valueText: (value) => value.capitalize(), + valueText: (value) => { + if (value === appSettings.QUICKTOOLS_TRIGGER_MODE_CLICK) return strings["quicktools-trigger:click"]; + return strings["quicktools-trigger:touch"]; + } select: [ [ appSettings.QUICKTOOLS_TRIGGER_MODE_CLICK, From a5cb2732a59ebc66d09be4b6387cbbdd8dd310ca Mon Sep 17 00:00:00 2001 From: Claycuy Date: Thu, 25 Jun 2026 17:19:47 +0800 Subject: [PATCH 02/12] format linting --- src/settings/appSettings.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/settings/appSettings.js b/src/settings/appSettings.js index db72031b8..a9e6cf6a3 100644 --- a/src/settings/appSettings.js +++ b/src/settings/appSettings.js @@ -178,10 +178,11 @@ export default function otherSettings() { key: "quickToolsTriggerMode", text: strings["quicktools trigger mode"], value: values.quickToolsTriggerMode, - valueText: (value) => { - if (value === appSettings.QUICKTOOLS_TRIGGER_MODE_CLICK) return strings["quicktools-trigger:click"]; - return strings["quicktools-trigger:touch"]; - } + valueText: (value) => { + if (value === appSettings.QUICKTOOLS_TRIGGER_MODE_CLICK) + return strings["quicktools-trigger:click"]; + return strings["quicktools-trigger:touch"]; + }, select: [ [ appSettings.QUICKTOOLS_TRIGGER_MODE_CLICK, From 229442c23c045e3fb5081613307e8eeeac1b7004 Mon Sep 17 00:00:00 2001 From: Claycuy Date: Thu, 25 Jun 2026 17:31:01 +0800 Subject: [PATCH 03/12] fix: if-else to switch-case --- src/settings/appSettings.js | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/settings/appSettings.js b/src/settings/appSettings.js index a9e6cf6a3..e46ff2944 100644 --- a/src/settings/appSettings.js +++ b/src/settings/appSettings.js @@ -179,9 +179,14 @@ export default function otherSettings() { text: strings["quicktools trigger mode"], value: values.quickToolsTriggerMode, valueText: (value) => { - if (value === appSettings.QUICKTOOLS_TRIGGER_MODE_CLICK) - return strings["quicktools-trigger:click"]; - return strings["quicktools-trigger:touch"]; + switch (value) { + case appSettings.QUICKTOOLS_TRIGGER_MODE_CLICK: + return strings["quicktools-trigger:click"]; + case appSettings.QUICKTOOLS_TRIGGER_MODE_TOUCH: + return strings["quicktools-trigger:touch"]; + default: + return value.capitalize(); + } }, select: [ [ From eb7cd893d20339274b67e274be17316399b2e628 Mon Sep 17 00:00:00 2001 From: Claycuy Date: Thu, 25 Jun 2026 17:43:16 +0800 Subject: [PATCH 04/12] fix: settings/terminalSettings.js --- src/settings/terminalSettings.js | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/src/settings/terminalSettings.js b/src/settings/terminalSettings.js index dce9246f9..2aeea6450 100644 --- a/src/settings/terminalSettings.js +++ b/src/settings/terminalSettings.js @@ -72,6 +72,14 @@ export default function terminalSettings() { key: "fontWeight", text: strings["terminal:font weight"], value: terminalValues.fontWeight, + valueText: (value) => { + const tuple = [ + ["normal", strings["terminal:normal"]], + ["bold", strings["terminal:bold"]], + ].find((item) => item[0] === value); + + return tuple ? tuple[1] : value; + }, select: [ ["normal", strings["terminal:normal"]], ["bold", strings["terminal:bold"]], @@ -88,6 +96,7 @@ export default function terminalSettings() { info: strings["info-fontWeight"], category: categories.display, }, + { key: "letterSpacing", text: strings["letter spacing"], @@ -108,6 +117,14 @@ export default function terminalSettings() { key: "cursorStyle", text: strings["terminal:cursor style"], value: terminalValues.cursorStyle, + valueText: (value) => { + const option = [ + ["block", strings["terminal:block"]], + ["underline", strings["terminal:underline"]], + ["bar", strings["terminal:bar"]], + ].find((item) => item[0] === value); + return option ? option[1] : value; + }, select: [ ["block", strings["terminal:block"]], ["underline", strings["terminal:underline"]], @@ -120,6 +137,17 @@ export default function terminalSettings() { key: "cursorInactiveStyle", text: strings["terminal:cursor inactive style"], value: terminalValues.cursorInactiveStyle, + valueText: (value) => { + const options = [ + ["outline", strings["terminal:inactive outline"]], + ["block", strings["terminal:inactive block"]], + ["underline", strings["terminal:inactive underline"]], + ["bar", strings["terminal:inactive bar"]], + ["none", strings["terminal:inactive none"]], + ]; + const option = options.find((item) => item[0] === value); + return option ? option[1] : value; + }, select: [ ["outline", strings["terminal:inactive outline"]], ["block", strings["terminal:inactive block"]], @@ -130,6 +158,7 @@ export default function terminalSettings() { info: strings["info-cursorInactiveStyle"], category: categories.cursor, }, + { key: "cursorBlink", text: strings["terminal:cursor blink"], From d2653f354797de3fe1f5d72ae48602df9fcd8f88 Mon Sep 17 00:00:00 2001 From: Claycuy Date: Thu, 25 Jun 2026 17:46:30 +0800 Subject: [PATCH 05/12] fix: settings/appSettings.js --- src/settings/appSettings.js | 19 +++++++++---------- src/settings/terminalSettings.js | 1 - 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/src/settings/appSettings.js b/src/settings/appSettings.js index e46ff2944..343962d3a 100644 --- a/src/settings/appSettings.js +++ b/src/settings/appSettings.js @@ -178,16 +178,15 @@ export default function otherSettings() { key: "quickToolsTriggerMode", text: strings["quicktools trigger mode"], value: values.quickToolsTriggerMode, - valueText: (value) => { - switch (value) { - case appSettings.QUICKTOOLS_TRIGGER_MODE_CLICK: - return strings["quicktools-trigger:click"]; - case appSettings.QUICKTOOLS_TRIGGER_MODE_TOUCH: - return strings["quicktools-trigger:touch"]; - default: - return value.capitalize(); - } - }, +valueText: (value) => { + const options = { + [appSettings.QUICKTOOLS_TRIGGER_MODE_CLICK]: strings["quicktools-trigger:click"], + [appSettings.QUICKTOOLS_TRIGGER_MODE_TOUCH]: strings["quicktools-trigger:touch"], + }; + + return options[value] || value.capitalize(); +}, + select: [ [ appSettings.QUICKTOOLS_TRIGGER_MODE_CLICK, diff --git a/src/settings/terminalSettings.js b/src/settings/terminalSettings.js index 2aeea6450..62376b3f7 100644 --- a/src/settings/terminalSettings.js +++ b/src/settings/terminalSettings.js @@ -158,7 +158,6 @@ export default function terminalSettings() { info: strings["info-cursorInactiveStyle"], category: categories.cursor, }, - { key: "cursorBlink", text: strings["terminal:cursor blink"], From 8f8faa269f7be21d770c05ca22871a62b818862e Mon Sep 17 00:00:00 2001 From: Claycuy Date: Thu, 25 Jun 2026 17:46:40 +0800 Subject: [PATCH 06/12] fix: settings/appSettings.js --- src/settings/appSettings.js | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/settings/appSettings.js b/src/settings/appSettings.js index 343962d3a..8de731eef 100644 --- a/src/settings/appSettings.js +++ b/src/settings/appSettings.js @@ -178,14 +178,16 @@ export default function otherSettings() { key: "quickToolsTriggerMode", text: strings["quicktools trigger mode"], value: values.quickToolsTriggerMode, -valueText: (value) => { - const options = { - [appSettings.QUICKTOOLS_TRIGGER_MODE_CLICK]: strings["quicktools-trigger:click"], - [appSettings.QUICKTOOLS_TRIGGER_MODE_TOUCH]: strings["quicktools-trigger:touch"], - }; - - return options[value] || value.capitalize(); -}, + valueText: (value) => { + const options = { + [appSettings.QUICKTOOLS_TRIGGER_MODE_CLICK]: + strings["quicktools-trigger:click"], + [appSettings.QUICKTOOLS_TRIGGER_MODE_TOUCH]: + strings["quicktools-trigger:touch"], + }; + + return options[value] || value.capitalize(); + }, select: [ [ From 6ee121ebfe4657d074298bc0abd912940cbad21a Mon Sep 17 00:00:00 2001 From: Claycuy Date: Thu, 25 Jun 2026 17:47:12 +0800 Subject: [PATCH 07/12] fix: settings/appSettings.js --- src/settings/appSettings.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/settings/appSettings.js b/src/settings/appSettings.js index 8de731eef..dffbf58af 100644 --- a/src/settings/appSettings.js +++ b/src/settings/appSettings.js @@ -188,7 +188,6 @@ export default function otherSettings() { return options[value] || value.capitalize(); }, - select: [ [ appSettings.QUICKTOOLS_TRIGGER_MODE_CLICK, From 408653a6f9e506ba8109662a2753015a47626e3d Mon Sep 17 00:00:00 2001 From: claycuy <155298405+claycuy@users.noreply.github.com> Date: Thu, 25 Jun 2026 17:50:20 +0800 Subject: [PATCH 08/12] Update src/settings/appSettings.js Co-authored-by: greptile-apps[bot] <165735046+greptile-apps[bot]@users.noreply.github.com> --- src/settings/appSettings.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/settings/appSettings.js b/src/settings/appSettings.js index dffbf58af..cf7268458 100644 --- a/src/settings/appSettings.js +++ b/src/settings/appSettings.js @@ -186,7 +186,7 @@ export default function otherSettings() { strings["quicktools-trigger:touch"], }; - return options[value] || value.capitalize(); + return options[value] ?? (value != null ? value.capitalize() : value); }, select: [ [ From 6ef0fc76429ef32e0a831856e6c0d06c1043f607 Mon Sep 17 00:00:00 2001 From: Claycuy Date: Thu, 25 Jun 2026 18:02:40 +0800 Subject: [PATCH 09/12] fix: settings/previewSettings.js --- src/settings/previewSettings.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/settings/previewSettings.js b/src/settings/previewSettings.js index 7346ae85d..84b7047a4 100644 --- a/src/settings/previewSettings.js +++ b/src/settings/previewSettings.js @@ -43,6 +43,13 @@ export default function previewSettings() { key: "previewMode", text: strings["preview mode"], value: values.previewMode, + valueText: (value) => { + const options = { + [appSettings.PREVIEW_MODE_BROWSER]: strings.browser, + [appSettings.PREVIEW_MODE_INAPP]: strings.inapp, + }; + return options[value] || value.capitalize(); + }, select: [ [appSettings.PREVIEW_MODE_BROWSER, strings.browser], [appSettings.PREVIEW_MODE_INAPP, strings.inapp], From 336e50856e505238627a814b2f852a6a566cc8a6 Mon Sep 17 00:00:00 2001 From: Claycuy Date: Thu, 25 Jun 2026 18:07:05 +0800 Subject: [PATCH 10/12] fix: capitalize strings --- src/settings/appSettings.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/settings/appSettings.js b/src/settings/appSettings.js index cf7268458..53c08bb91 100644 --- a/src/settings/appSettings.js +++ b/src/settings/appSettings.js @@ -316,7 +316,10 @@ export default function otherSettings() { key: "console", text: strings.console, value: values.console, - select: [appSettings.CONSOLE_LEGACY, appSettings.CONSOLE_ERUDA], + select: [ + [appSettings.CONSOLE_LEGACY, "Legacy"], + [appSettings.CONSOLE_ERUDA, "Eruda"], + ], info: strings["settings-info-app-console"], category: categories.advanced, }, From 239f511a2e8c6dacc36615740a1c11857aa2e55c Mon Sep 17 00:00:00 2001 From: Claycuy Date: Thu, 25 Jun 2026 18:15:14 +0800 Subject: [PATCH 11/12] fix --- src/settings/previewSettings.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/settings/previewSettings.js b/src/settings/previewSettings.js index 84b7047a4..14b636175 100644 --- a/src/settings/previewSettings.js +++ b/src/settings/previewSettings.js @@ -48,7 +48,10 @@ export default function previewSettings() { [appSettings.PREVIEW_MODE_BROWSER]: strings.browser, [appSettings.PREVIEW_MODE_INAPP]: strings.inapp, }; - return options[value] || value.capitalize(); + + if (options[value]) return options[value]; + + return value ? value.capitalize() : ""; }, select: [ [appSettings.PREVIEW_MODE_BROWSER, strings.browser], From b62665ac724cbfe1904fc569aaff56f50e522a74 Mon Sep 17 00:00:00 2001 From: Claycuy Date: Thu, 25 Jun 2026 18:25:42 +0800 Subject: [PATCH 12/12] fix --- src/settings/appSettings.js | 7 +++++++ src/settings/previewSettings.js | 5 +---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/settings/appSettings.js b/src/settings/appSettings.js index 53c08bb91..13d21542d 100644 --- a/src/settings/appSettings.js +++ b/src/settings/appSettings.js @@ -316,6 +316,13 @@ export default function otherSettings() { key: "console", text: strings.console, value: values.console, + valueText: (value) => { + const options = { + [appSettings.CONSOLE_LEGACY]: "Legacy", + [appSettings.CONSOLE_ERUDA]: "Eruda", + }; + return options[value] ?? (value != null ? value.capitalize() : value); + }, select: [ [appSettings.CONSOLE_LEGACY, "Legacy"], [appSettings.CONSOLE_ERUDA, "Eruda"], diff --git a/src/settings/previewSettings.js b/src/settings/previewSettings.js index 14b636175..5fe49c7b1 100644 --- a/src/settings/previewSettings.js +++ b/src/settings/previewSettings.js @@ -48,10 +48,7 @@ export default function previewSettings() { [appSettings.PREVIEW_MODE_BROWSER]: strings.browser, [appSettings.PREVIEW_MODE_INAPP]: strings.inapp, }; - - if (options[value]) return options[value]; - - return value ? value.capitalize() : ""; + return options[value] ?? (value != null ? value.capitalize() : value); }, select: [ [appSettings.PREVIEW_MODE_BROWSER, strings.browser],