Cleanup how timers work in GameMap. No need to call update.

GitOrigin-RevId: 0ab8f095609960e1e3b182583e3aa516f7b9ffdc

hera/GameMap.tsx

@@ -1273,7 +1273,7 @@ export default class GameMap extends Component<Props, State> {
         start: dateNow(),
         timer: window.setTimeout(() => {
           this._timers.delete(timerObject);
-          this._update(fn.call(null, this.state));
+          fn();
         }, delay),
       };
       timers.add(timerObject);
@@ -1294,8 +1294,7 @@ export default class GameMap extends Component<Props, State> {
   };
 
   private _scheduleTimer = async (
-    // eslint-disable-next-line @typescript-eslint/ban-types
-    fn: Function,
+    fn: () => void,
     delay: number,
   ): Promise<number> => {
     const { replayState } = this.state;
@@ -1310,12 +1309,7 @@ export default class GameMap extends Component<Props, State> {
 
     const timer = window.setTimeout(() => {
       this._timers.delete(timerObject);
-      this._update({
-        ...fn.call(null, this.state),
-        replayState: {
-          ...this.state.replayState,
-        },
-      });
+      fn();
     }, delay);
     const timerObject = {
       delay,

hera/Types.tsx

@@ -92,8 +92,7 @@ export type Props = Readonly<{
 
 export type TimerState = Readonly<{
   delay: number;
-  // eslint-disable-next-line @typescript-eslint/ban-types
-  fn: Function;
+  fn: () => void;
   start: number;
   timer: number;
 }>;
@@ -152,8 +151,7 @@ export type StateLike = Partial<State>;
 
 export type FactionNames = ReadonlyMap<PlayerID, string>;
 export type TimerID = Promise<number>;
-// eslint-disable-next-line @typescript-eslint/ban-types
-export type TimerFunction = (fn: Function, delay: number) => TimerID;
+export type TimerFunction = (fn: () => void, delay: number) => TimerID;
 export type RequestFrameFunction = (fn: (timestamp: number) => void) => void;
 export type ClearTimerFunction = (timer: number | TimerID) => void;
 export type UpdateFunction = (

hera/behavior/Base.tsx

@@ -51,15 +51,19 @@ export default class Base extends AbstractSelectBehavior {
     }
   }
 
-  private async showInfo(vector: Vector, state: State, actions: Actions) {
+  private async showInfo(
+    vector: Vector,
+    state: State,
+    { scheduleTimer, update }: Actions,
+  ) {
     const { map, selectedPosition, vision } = state;
     const unit = map.units.get(vector);
     const info = unit?.info;
     if (unit && !selectedPosition && vision.isVisible(map, vector)) {
       const showAttackRadius = !unit.isCompleted() && info?.hasAttack();
-      this.infoTimer = await actions.scheduleTimer(
-        (state: State): StateLike | null => {
-          return {
+      this.infoTimer = await scheduleTimer(
+        () =>
+          update((state) => ({
             namedPositions: [vector],
             ...(showAttackRadius && !state.radius
               ? {
@@ -72,8 +76,7 @@ export default class Base extends AbstractSelectBehavior {
                   },
                 }
               : null),
-          };
-        },
+          })),
         AnimationConfig.AnimationDuration * 2.5,
       );
     }

hera/behavior/attack/clientAttackAction.tsx

@@ -88,14 +88,15 @@ export default async function clientAttackAction(
     });
 
     return new Promise((resolve) =>
-      scheduleTimer(async (state: State) => {
+      scheduleTimer(async () => {
         const response = await remoteAction;
         if (isAttackAction(response.self?.actionResponse)) {
           actionResponse = response.self.actionResponse;
           newMap = applyActionResponse(previousMap, vision, actionResponse);
         }
         const newUnitA = isAttackAction(actionResponse) && actionResponse.unitA;
         const directions = getAttackDirection(to, from);
+        let state = await update(null);
         state = await attackActionAnimation(actions, state, {
           attackStance: unitB.info.sprite.attackStance,
           damage: unitA.health - ((newUnitA && newUnitA?.health) || 0),

hera/card/BuildingCard.tsx

@@ -123,7 +123,7 @@ export default memo(function BuildingCard({
             position={vector}
             requestFrame={requestAnimationFrame}
             scheduleTimer={(fn, delay) =>
-              Promise.resolve(setTimeout(fn, delay))
+              Promise.resolve(setTimeout(fn, delay) as unknown as number)
             }
             size={TileSize}
           />

hera/card/InlineTileList.tsx

@@ -59,7 +59,7 @@ export type SelectTileFn = (
 const vision = new Vision(1);
 const vector = vec(1, 1);
 const scheduleTimer: TimerFunction = (fn, delay) =>
-  Promise.resolve(setTimeout(fn, delay));
+  Promise.resolve(setTimeout(fn, delay) as unknown as number);
 
 export default function InlineTileList({
   biome,

hera/card/UnitCard.tsx

@@ -304,7 +304,7 @@ export default memo(function UnitCard({
             position={defaultVector}
             requestFrame={requestAnimationFrame}
             scheduleTimer={(fn, delay) =>
-              Promise.resolve(setTimeout(fn, delay))
+              Promise.resolve(setTimeout(fn, delay) as unknown as number)
             }
             size={TileSize}
             tile={previewMap.getTileInfo(defaultVector)}

hera/lib/sleep.tsx

@@ -7,7 +7,7 @@ export default async function sleep(
   duration: 'short' | 'long',
 ) {
   if (!Instant && AnimationDuration > 0) {
-    await new Promise((resolve) =>
+    await new Promise<void>((resolve) =>
       scheduleTimer(
         resolve,
         AnimationDuration * (duration === 'short' ? 0.5 : 1.8),

hera/ui/Notice.tsx

@@ -34,10 +34,7 @@ export default function Notice(
           transform: 'scale(0.9) translate3d(0, 100%, 0)',
         }}
         onAnimationComplete={() =>
-          scheduleTimer(
-            () => onComplete(),
-            animationConfig.AnimationDuration * 10,
-          )
+          scheduleTimer(onComplete, animationConfig.AnimationDuration * 10)
         }
         style={{
           ...(color