From 230ede74f7783cdbe67df9e6edf98564c46473ee Mon Sep 17 00:00:00 2001
From: "Joshua A. Horton" <joshua_horton@sil.org>
Date: Wed, 19 Jul 2023 12:04:30 +0700
Subject: [PATCH] fix(web): cherrypicked code generic mismatch

---
 .../src/engine/headless/gestures/matchers/pathMatcher.ts      | 4 ++--
 .../src/test/auto/headless/gestures/isolatedPathSpecs.ts      | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/common/web/gesture-recognizer/src/engine/headless/gestures/matchers/pathMatcher.ts b/common/web/gesture-recognizer/src/engine/headless/gestures/matchers/pathMatcher.ts
index e7ffc11f66..419687f8e6 100644
--- a/common/web/gesture-recognizer/src/engine/headless/gestures/matchers/pathMatcher.ts
+++ b/common/web/gesture-recognizer/src/engine/headless/gestures/matchers/pathMatcher.ts
@@ -23,7 +23,7 @@ type PathUpdateResult = PathMatchResult | PathNotFulfilled;
 
 export class PathMatcher<Type> {
   private timerPromise?: TimeoutPromise;
-  private model: ContactModel;
+  private model: ContactModel<Type>;
   private source: SimpleGestureSource<Type>;
 
   private readonly publishedPromise: ManagedPromise<PathMatchResult>
@@ -32,7 +32,7 @@ export class PathMatcher<Type> {
     return this.publishedPromise.corePromise;
   }
 
-  constructor(model: ContactModel, source: SimpleGestureSource<Type>) {
+  constructor(model: ContactModel<Type>, source: SimpleGestureSource<Type>) {
     /* c8 ignore next 3 */
     if(!model || !source) {
       throw new Error("A gesture-path source and contact-path model must be specified.");
diff --git a/common/web/gesture-recognizer/src/test/auto/headless/gestures/isolatedPathSpecs.ts b/common/web/gesture-recognizer/src/test/auto/headless/gestures/isolatedPathSpecs.ts
index 32404c54c5..2d52863ab9 100644
--- a/common/web/gesture-recognizer/src/test/auto/headless/gestures/isolatedPathSpecs.ts
+++ b/common/web/gesture-recognizer/src/test/auto/headless/gestures/isolatedPathSpecs.ts
@@ -1,6 +1,7 @@
 import { gestures } from '@keymanapp/gesture-recognizer';
 import specs = gestures.specs;
-import ContactModel = specs.ContactModel;
+
+type ContactModel = specs.ContactModel<string>;
 
 export const InstantRejectionModel: ContactModel = {
   itemPriority: 0,