Merge branch 'master' into fix/fv/keyboards-csv

keymanapp · Dec 19, 2023 · 7f71cf7 · 7f71cf7
2 parents 28b904c + 50d5da7
commit 7f71cf7
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 5 deletions.
diff --git a/HISTORY.md b/HISTORY.md
@@ -1,5 +1,9 @@
 # Keyman Version History
 
+## 17.0.232 alpha 2023-12-18
+
+*  (#10270)
+
 ## 17.0.231 alpha 2023-12-15
 
 * chore(web): Better match directory structure for headless engine tests (#10232)

diff --git a/VERSION.md b/VERSION.md
@@ -1 +1 @@
-17.0.232
+17.0.233
diff --git a/common/web/types/src/kmx/string-list.ts b/common/web/types/src/kmx/string-list.ts
@@ -1,4 +1,4 @@
-import { OrderedStringList } from 'src/ldml-keyboard/pattern-parser.js';
+import { OrderedStringList } from '../ldml-keyboard/pattern-parser.js';
 import { DependencySections, StrsItem, StrsOptions } from './kmx-plus.js';
 
 /**

diff --git a/common/web/types/src/osk/osk.ts b/common/web/types/src/osk/osk.ts
@@ -1,4 +1,4 @@
-import { TouchLayoutFile, TouchLayoutFlick, TouchLayoutKey, TouchLayoutPlatform, TouchLayoutSubKey } from "src/keyman-touch-layout/keyman-touch-layout-file.js";
+import { TouchLayoutFile, TouchLayoutFlick, TouchLayoutKey, TouchLayoutPlatform, TouchLayoutSubKey } from "../keyman-touch-layout/keyman-touch-layout-file.js";
 import { VisualKeyboard } from "../kvk/visual-keyboard.js";
 import SchemaValidators from "../schema-validators.js";
 
@@ -106,4 +106,4 @@ export function remapTouchLayout(source: TouchLayoutFile, map: PuaMap) {
   scanPlatform(source.tablet);
 
   return dirty;
-}
+}
diff --git a/web/src/engine/osk/src/input/gestures/heldRepeater.ts b/web/src/engine/osk/src/input/gestures/heldRepeater.ts
@@ -18,13 +18,23 @@ export class HeldRepeater implements GestureHandler {
 
   constructor(source: GestureSequence<KeyElement, string>, closureToRepeat: () => void) {
     this.source = source;
-    this.repeatClosure = closureToRepeat;
+
+    const baseKey = source.stageReports[0].item;
+    baseKey.key.highlight(true);
+
+    this.repeatClosure = () => {
+      closureToRepeat();
+      // The repeat-closure may cancel key highlighting.  This restores it afterward.
+      baseKey.key.highlight(true);
+    }
+
 
     this.timerHandle = window.setTimeout(this.deleteRepeater, HeldRepeater.INITIAL_DELAY);
 
     this.source.on('complete', () => {
       window.clearTimeout(this.timerHandle);
       this.timerHandle = undefined;
+      baseKey.key.highlight(false);
     });
   }