Fixing "main menu" buttons

GoogleChromeLabs · Aug 7, 2019 · 3c7b11c · 3c7b11c
1 parent 9a5a4c5
commit 3c7b11c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/src/main/services/preact-canvas/components/game/index.tsx b/src/main/services/preact-canvas/components/game/index.tsx
@@ -51,6 +51,7 @@ export interface Props {
   useMotion: boolean;
   bestTime?: number;
   useVibration: boolean;
+  onBack: () => void;
 }
 
 interface State {
@@ -97,7 +98,8 @@ export default class Game extends Component<Props, State> {
       gameChangeUnsubscribe,
       toRevealTotal,
       useMotion,
-      bestTime: previousBestTime
+      bestTime: previousBestTime,
+      onBack
     }: Props,
     { playMode, toReveal, animator, renderer, completeTime, bestTime }: State
   ) {
@@ -116,7 +118,7 @@ export default class Game extends Component<Props, State> {
         />
         {playMode === PlayMode.Won ? (
           <Win
-            onMainMenu={this.onReset}
+            onMainMenu={onBack}
             onRestart={this.onRestart}
             time={completeTime}
             bestTime={bestTime}
@@ -153,7 +155,7 @@ export default class Game extends Component<Props, State> {
                     )}{" "}
                     {strTryAgain}
                   </button>
-                  <button class={mainButton} onClick={this.onReset}>
+                  <button class={mainButton} onClick={onBack}>
                     {isFeaturePhone ? <span class={shortcutKey}>*</span> : ""}{" "}
                     {strMainMenu}
                   </button>
@@ -236,15 +238,10 @@ export default class Game extends Component<Props, State> {
         this.onRestart();
       }
     } else if (event.key === "*") {
-      this.onReset();
+      this.props.onBack();
     }
   }
 
-  @bind
-  private onReset() {
-    this.props.stateService.reset();
-  }
-
   @bind
   private onRestart() {
     this.props.stateService.restart();

diff --git a/src/main/services/preact-canvas/index.tsx b/src/main/services/preact-canvas/index.tsx
@@ -320,6 +320,7 @@ export default class Root extends Component<Props, State> {
               useMotion={motionPreference}
               bestTime={bestTime}
               useVibration={vibrationPreference}
+              onBack={this._onBackClick}
             />
           )}
         />