From c09a40b09ce50aa9c044c4514524e6557c7c6e44 Mon Sep 17 00:00:00 2001
From: "Joshua A. Horton" <joshua_horton@sil.org>
Date: Wed, 27 Jul 2022 10:09:57 +0700
Subject: [PATCH] fix(web): post-rework-splice build issues

---
 common/web/gesture-recognizer/src/mouseEventEngine.ts | 7 +++----
 common/web/gesture-recognizer/src/touchEventEngine.ts | 6 ++----
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/common/web/gesture-recognizer/src/mouseEventEngine.ts b/common/web/gesture-recognizer/src/mouseEventEngine.ts
index 6147cbf75b..8e7cb0f99e 100644
--- a/common/web/gesture-recognizer/src/mouseEventEngine.ts
+++ b/common/web/gesture-recognizer/src/mouseEventEngine.ts
@@ -118,7 +118,7 @@ namespace com.keyman.osk {
       if(!event.buttons) {
         if(this.hasActiveClick) {
           this.hasActiveClick = false;
-          this.onInputMoveCancel(this.activeIdentifier);
+          this.onInputMoveCancel(this.activeIdentifier, sample);
         }
         return;
       }
@@ -128,7 +128,7 @@ namespace com.keyman.osk {
       if(!ZoneBoundaryChecker.inputMoveCancellationCheck(sample, this.config, this.disabledSafeBounds)) {
         this.onInputMove(this.activeIdentifier, sample);
       } else {
-        this.onInputMoveCancel(this.activeIdentifier);
+        this.onInputMoveCancel(this.activeIdentifier, sample);
       }
     }
 
@@ -141,8 +141,7 @@ namespace com.keyman.osk {
         this.hasActiveClick = false;
       }
 
-      const sample = this.buildSampleFromEvent(event);
-      this.onInputEnd(this.activeIdentifier, sample);
+      this.onInputEnd(this.activeIdentifier);
     }
   }
 }
\ No newline at end of file
diff --git a/common/web/gesture-recognizer/src/touchEventEngine.ts b/common/web/gesture-recognizer/src/touchEventEngine.ts
index a4fc91ce0e..1fbd97c08e 100644
--- a/common/web/gesture-recognizer/src/touchEventEngine.ts
+++ b/common/web/gesture-recognizer/src/touchEventEngine.ts
@@ -119,7 +119,7 @@ namespace com.keyman.osk {
         if(!ZoneBoundaryChecker.inputMoveCancellationCheck(sample, this.config, this.safeBoundMaskMap[touch.identifier])) {
           this.onInputMove(touch.identifier, sample);
         } else {
-          this.onInputMoveCancel(touch.identifier);
+          this.onInputMoveCancel(touch.identifier, sample);
         }
       }
     }
@@ -134,9 +134,7 @@ namespace com.keyman.osk {
 
         this.preventPropagation(event);
 
-        const sample = this.buildSampleFromTouch(touch);
-
-        this.onInputEnd(touch.identifier, sample);
+        this.onInputEnd(touch.identifier);
       }
     }
   }