feat(web): achieves desktop simple-tap integration

keymanapp · Oct 2, 2023 · 0006296 · 0006296
1 parent 1e06f2f
commit 0006296
Show file tree

Hide file tree

Showing 4 changed files with 409 additions and 303 deletions.
diff --git a/web/src/engine/osk/src/input/gestures/browser/subkeyPopup.ts b/web/src/engine/osk/src/input/gestures/browser/subkeyPopup.ts
@@ -7,6 +7,7 @@ import VisualKeyboard from '../../../visualKeyboard.js';
 import InputEventCoordinate from '../../../input/inputEventCoordinate.js';
 
 import { DeviceSpec, KeyEvent } from '@keymanapp/keyboard-processor';
+import { InputSample } from '@keymanapp/gesture-recognizer';
 
 /**
  * Represents a 'realized' longpress gesture's default implementation
@@ -113,7 +114,7 @@ export default class SubkeyPopup implements RealizedGesture {
     }
   }
 
-  finalize(input: InputEventCoordinate) {
+  finalize(input: InputSample<KeyElement>) {
     if(this.resolver) {
       let keyEvent: KeyEvent = null;
       if(this.currentSelection) {

diff --git a/web/src/engine/osk/src/input/gestures/specsForKeyboard.ts b/web/src/engine/osk/src/input/gestures/specsForKeyboard.ts
@@ -164,7 +164,6 @@ type GestureModel = specs.GestureModel<KeyElement>;
 export const LongpressModel: GestureModel = {
   id: 'longpress',
   resolutionPriority: 0,
-  itemPriority: 0,
   contacts: [
     {
       model: {
@@ -203,7 +202,6 @@ export const LongpressModel: GestureModel = {
 export const MultitapModel: GestureModel = {
   id: 'multitap',
   resolutionPriority: 2,
-  itemPriority: 1,
   contacts: [
     {
       model: {
@@ -245,7 +243,6 @@ export const MultitapModel: GestureModel = {
 export const SimpleTapModel: GestureModel = {
   id: 'simple-tap',
   resolutionPriority: 1,
-  itemPriority: 0,
   contacts: [
     {
       model: {
@@ -275,7 +272,6 @@ export const SimpleTapModel: GestureModel = {
 export const SubkeySelectModel: GestureModel = {
   id: 'subkey-select',
   resolutionPriority: 0,
-  itemPriority: 0,
   contacts: [
     {
       model: {
@@ -304,7 +300,6 @@ export const SubkeySelectModel: GestureModel = {
 export const ModipressStartModel: GestureModel = {
   id: 'modipress-start',
   resolutionPriority: 5,
-  itemPriority: 0,
   contacts: [
     {
       model: {
@@ -338,7 +333,6 @@ export const ModipressStartModel: GestureModel = {
 export const ModipressEndModel: GestureModel = {
   id: 'modipress-end',
   resolutionPriority: 5,
-  itemPriority: 0,
   contacts: [
     {
       model: {

diff --git a/web/src/engine/osk/src/keyboard-layout/oskLayerGroup.ts b/web/src/engine/osk/src/keyboard-layout/oskLayerGroup.ts
@@ -75,12 +75,10 @@ export default class OSKLayerGroup {
 
     // Kind of WET with VisualKeyboard.updateState, but oh well.
     let priorLayer: OSKLayer = null;
-    if(layer.element.style.display != 'block') {
+    if(layer.element.style.display == 'block') {
+      priorLayer = layer;
+    } else {
       for(let id in this.layers) {
-        if(id == layerId) {
-          continue;
-        }
-
         if(this.layers[id].element.style.display == 'block') {
           priorLayer = this.layers[id];
         }