Fix whitespace trimming in search page (#1625)

* Fix whitespace trimming in search page * Rename to trimTrailingWhitespacePlusSpace * Only trimEnd for queryInput
yomidevs · Nov 27, 2024 · 22d5f41 · 22d5f41
1 parent 3c3f858
commit 22d5f41
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/ext/js/data/string-util.js b/ext/js/data/string-util.js
@@ -68,3 +68,14 @@ export function readCodePointsBackward(text, position, count) {
     }
     return result;
 }
+
+/**
+ * Trims trailing whitespace and adds a space on the end if it needed trimming.
+ * @param {string} text
+ * @returns {string}
+ */
+export function trimTrailingWhitespacePlusSpace(text) {
+    const prevTextLength = text.length;
+    const textTrimmed = text.trimEnd();
+    return prevTextLength === textTrimmed.length ? textTrimmed : textTrimmed + ' ';
+}
diff --git a/ext/js/display/query-parser.js b/ext/js/display/query-parser.js
@@ -18,6 +18,7 @@
 
 import {EventDispatcher} from '../core/event-dispatcher.js';
 import {log} from '../core/log.js';
+import {trimTrailingWhitespacePlusSpace} from '../data/string-util.js';
 import {querySelectorNotNull} from '../dom/query-selector.js';
 import {convertHiraganaToKatakana, convertKatakanaToHiragana, isStringEntirelyKana} from '../language/ja/japanese.js';
 import {TextScanner} from '../language/text-scanner.js';
@@ -304,7 +305,7 @@ export class QueryParser extends EventDispatcher {
             termNode.className = 'query-parser-term';
             termNode.dataset.offset = `${offset}`;
             for (const {text, reading} of term) {
-                const trimmedText = text.trim();
+                const trimmedText = trimTrailingWhitespacePlusSpace(text);
                 if (reading.length === 0) {
                     termNode.appendChild(document.createTextNode(trimmedText));
                 } else {

diff --git a/ext/js/display/search-display-controller.js b/ext/js/display/search-display-controller.js
@@ -237,7 +237,7 @@ export class SearchDisplayController {
         this._searchBackButton.hidden = !showBackButton;
 
         if (this._queryInput.value !== query) {
-            this._queryInput.value = query.trim();
+            this._queryInput.value = query.trimEnd();
             this._updateSearchHeight(true);
         }
         this._setIntroVisible(!valid, animate);