fix(web): default multitap fix + sets one layout field private

keymanapp · Apr 23, 2024 · bef2665 · bef2665
1 parent b9cfaa1
commit bef2665
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/common/web/keyboard-processor/src/keyboards/activeLayout.ts b/common/web/keyboard-processor/src/keyboards/activeLayout.ts
@@ -770,7 +770,7 @@ export class ActiveLayout implements LayoutFormFactor{
   /**
    * Facilitates mapping layer id strings to their specification objects.
    */
-  layerMap: {[layerId: string]: ActiveLayer};
+  private layerMap: {[layerId: string]: ActiveLayer};
 
   private constructor() {
 
@@ -887,8 +887,8 @@ export class ActiveLayout implements LayoutFormFactor{
         defaultShift.multitap = [{...Layouts.dfltShiftToCaps}, {...Layouts.dfltShiftToDefault}] as ActiveSubKey[];
         shiftShift.multitap   = [{...Layouts.dfltShiftToCaps}, {...Layouts.dfltShiftToShift}] as ActiveSubKey[];
 
-        defaultShift.multitap.forEach((sk, index) => defaultShift[index] = new ActiveSubKey(sk, aLayout, 'default'));
-        shiftShift  .multitap.forEach((sk, index) => shiftShift[index]   = new ActiveSubKey(sk, aLayout, 'shift'));
+        defaultShift.multitap.forEach((sk, index) => defaultShift.multitap[index] = new ActiveSubKey(sk, aLayout, 'default'));
+        shiftShift  .multitap.forEach((sk, index) => shiftShift.multitap[index]   = new ActiveSubKey(sk, aLayout, 'shift'));
       } // else no default shift -> caps multitaps.
     }
 

diff --git a/web/src/engine/osk/src/visualKeyboard.ts b/web/src/engine/osk/src/visualKeyboard.ts
@@ -385,8 +385,6 @@ export default class VisualKeyboard extends EventEmitter<EventMap> implements Ke
   }
 
   private constructGestureEngine(): GestureRecognizer<KeyElement, string> {
-    const rowCount = this.kbdLayout.layerMap['default'].row.length;
-
     const config: GestureRecognizerConfiguration<KeyElement, string> = {
       targetRoot: this.element,
       // document.body is the event root for mouse interactions b/c we need to track