Small touch interaction improvements.

GitOrigin-RevId: 878914824b64cf1a74bda4e7d4f2d958abd999a3
nkzw-tech · Jan 24, 2025 · e93809e · e93809e
1 parent c74659f
commit e93809e
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 8 deletions.
diff --git a/hera/GameMap.tsx b/hera/GameMap.tsx
@@ -1658,7 +1658,9 @@ export default class GameMap extends Component<Props, State> {
     if (
       vector &&
       behavior?.type === 'move' &&
-      (vector === selectedPosition || radius?.fields.has(vector))
+      radius &&
+      !radius.locked &&
+      (vector === selectedPosition || radius.fields.has(vector))
     ) {
       event.preventDefault();
     }

diff --git a/hera/Mask.tsx b/hera/Mask.tsx
@@ -185,13 +185,16 @@ export default memo(function Mask({
   const onTouchEnd = useCallback(() => {
     if (lastVectors.current.length >= 2) {
       const lastVector = lastVectors.current.at(-1)!;
-      if (radius?.fields.has(lastVector) || attackable?.has(lastVector)) {
+      if (
+        !radius?.locked &&
+        (radius?.fields.has(lastVector) || attackable?.has(lastVector))
+      ) {
         select(lastVector);
       }
     }
 
     lastVectors.current = [];
-  }, [attackable, radius?.fields, select]);
+  }, [attackable, radius?.fields, radius?.locked, select]);
 
   return useMemo(() => {
     const defaultOffsets: Offsets = [0, 0, 0, 0, Priority.None];

diff --git a/hera/behavior/Move.tsx b/hera/behavior/Move.tsx
@@ -261,21 +261,32 @@ export default class Move {
       confirmAction,
       currentViewer,
       map,
-      radius,
       selectedPosition,
       selectedUnit,
       vision,
     } = state;
 
-    if (currentViewer && radius && selectedPosition && selectedUnit) {
+    if (currentViewer && state.radius && selectedPosition && selectedUnit) {
+      let radius = state.radius;
       if (!isPlayable(map, currentViewer, selectedUnit)) {
         return selectFallback(vector, state, actions);
       }
 
       if (confirmAction) {
-        return confirmAction.position.equals(vector)
-          ? confirmAction.onAction(state)
-          : selectFallback(vector, state, actions);
+        if (confirmAction?.position.equals(vector)) {
+          return confirmAction.onAction(state);
+        } else {
+          const enterState = this.enter(vector, {
+            ...state,
+            radius: { ...radius, locked: false },
+          });
+
+          if (enterState?.radius) {
+            radius = enterState.radius;
+          } else {
+            return selectFallback(vector, state, actions);
+          }
+        }
       }
 
       if (attackable?.has(vector)) {
@@ -346,6 +357,7 @@ export default class Move {
           ...(!selectedUnit.isCapturing()
             ? {
                 behavior: new MenuBehavior(),
+                position: vector,
                 selectedPosition,
                 selectedUnit,
               }
@@ -425,6 +437,10 @@ export default class Move {
                   position: vector,
                   showComplete,
                 },
+                // Update `navigationDirection` and `position` if `confirmAction` was previously set but
+                // a different position was selected (See `enterState` above).
+                navigationDirection: null,
+                position: vector,
                 radius: {
                   ...radius,
                   locked: true,