fix(web): gesture-model did not check start-item conditions for first…

… source
keymanapp · Sep 22, 2023 · 4f182d8 · 4f182d8
1 parent be19674
commit 4f182d8
Showing 1 changed file with 13 additions and 16 deletions.
diff --git a/common/web/gesture-recognizer/src/engine/headless/gestures/matchers/gestureMatcher.ts b/common/web/gesture-recognizer/src/engine/headless/gestures/matchers/gestureMatcher.ts
@@ -237,7 +237,7 @@ export class GestureMatcher<Type> implements PredecessorMatch<Type> {
       return this.predecessor.primaryPath;
     }
 
-    return bestMatcher.source;
+    return bestMatcher?.source;
   }
 
   public get baseItem(): Type {
@@ -276,9 +276,19 @@ export class GestureMatcher<Type> implements PredecessorMatch<Type> {
       throw new Error(`The specified gesture model does not support more than ${existingContacts} contact points.`);
     }
 
+    this.addContactInternal(simpleSource.constructSubview(false, true));
+  }
+
+  public get result() {
+    return this._result;
+  }
+
+  private addContactInternal(simpleSource: GestureSourceSubview<Type>) {
     // The number of already-active contacts tracked for this gesture
-    const contactSpec = this.model.contacts[existingContacts];
+    const existingContacts = this.pathMatchers.length;
 
+    const contactSpec = this.model.contacts[existingContacts];
+    const contactModel = new PathMatcher(contactSpec.model, simpleSource);
     let baseItem: Type = null;
     if(existingContacts) {
       // just use the highest-priority item source's base item and call it a day.
@@ -300,26 +310,13 @@ export class GestureMatcher<Type> implements PredecessorMatch<Type> {
     }
 
     if(contactSpec.model.allowsInitialState) {
-      const initialStateCheck = contactSpec.model.allowsInitialState(simpleSource.currentSample, this.primaryPath.currentSample, baseItem);
+      const initialStateCheck = contactSpec.model.allowsInitialState(simpleSource.currentSample, this.primaryPath?.currentSample, baseItem);
 
       if(!initialStateCheck) {
         this.finalize(false, 'path');
       }
     }
 
-    this.addContactInternal(simpleSource.constructSubview(false, true));
-  }
-
-  public get result() {
-    return this._result;
-  }
-
-  private addContactInternal(simpleSource: GestureSourceSubview<Type>) {
-    const existingContacts = this.pathMatchers.length;
-
-    // The number of already-active contacts tracked for this gesture
-    const contactSpec = this.model.contacts[existingContacts];
-    const contactModel = new PathMatcher(contactSpec.model, simpleSource);
     contactModel.promise.then((resolution) => {
       this.finalize(resolution.type == 'resolve', resolution.cause);
     });