Merge pull request #10434 from keymanapp/fix/web/unicode-id-preproces…

…sing fix(web): U_ key id -> text for all subkeys; is now preprocessed
keymanapp · Jan 19, 2024 · 706c60e · 706c60e
2 parents 4cbe34f + dc368c9
commit 706c60e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/common/web/keyboard-processor/src/keyboards/activeLayout.ts b/common/web/keyboard-processor/src/keyboards/activeLayout.ts
@@ -331,6 +331,10 @@ export class ActiveKeyBase {
       }
     }
 
+    if(!key.text && typeof key.id == 'string') {
+      key.text = ActiveKey.unicodeIDToText(key.id);
+    }
+
     // Ensure subkeys are also properly extended.
     if(key.sk) {
       analysisFlagObj.hasLongpresses = true;

diff --git a/web/src/engine/osk/src/keyboard-layout/oskKey.ts b/web/src/engine/osk/src/keyboard-layout/oskKey.ts
@@ -300,12 +300,8 @@ export default abstract class OSKKey {
     // Add OSK key labels
     let keyText = null;
     if(spec['text'] == null || spec['text'] == '') {
-      if(typeof spec['id'] == 'string') {
-        // If the ID's Unicode-based, just use that code.
-        keyText = ActiveKey.unicodeIDToText(spec['id']);
-      }
-
-      keyText = keyText || DEFAULT_BLANK;
+      // U_ codes are handled during keyboard pre-processing.
+      keyText = DEFAULT_BLANK;
     } else {
       keyText=spec['text'];