From a46ac121cc4813e2e477f2af49c972fcdc6c0442 Mon Sep 17 00:00:00 2001
From: Luciano Graziani <lgraziani2712@gmail.com>
Date: Thu, 22 Jun 2017 17:38:50 -0300
Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=80=20Update=20`containers/MazeGameCon?=
 =?UTF-8?q?tainer`=20to=20v1.2.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 🚀 [2017-06-22] `containers/MazeGameContainer`: update to v1.2.0.
  - 🚀 Wait until background image is loaded before render the app.
---
 CHANGELOG.md                                 |  2 +
 src/containers/MazeGameContainer.jsx         | 72 +++++++++++++-------
 src/containers/MazeGameContainer.stories.jsx |  9 ++-
 3 files changed, 58 insertions(+), 25 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a62bf52..fcdbcd8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,7 @@
 ## HEAD
 
+- 🚀 [2017-06-22] `containers/MazeGameContainer`: update to v1.2.0.
+  - 🚀 Wait until background image is loaded before render the app.
 - 🚀 [2017-06-16] `containers/GameViewer`: update to v1.2.0.
   - 🚀 To match new `routes` version.
 - 🚀 [2017-06-16] `containers/gameLoader`: update v1.1.0.
diff --git a/src/containers/MazeGameContainer.jsx b/src/containers/MazeGameContainer.jsx
index 7649be8..727a79d 100644
--- a/src/containers/MazeGameContainer.jsx
+++ b/src/containers/MazeGameContainer.jsx
@@ -22,6 +22,7 @@ import { type NumericLineData } from 'engine/components/numericLineGenerator';
 import { type MazeError } from 'engine/helpers/errors';
 import { getRandomInt } from 'helpers/randomizers';
 import { game } from 'constants/localize/es';
+import Loading from 'components/pages/Loading';
 
 import BlocklyApp, { type BlocklyData } from './BlocklyApp';
 
@@ -50,9 +51,14 @@ export type GameMetadata = {|
 type Props = {|
   blocklyData: BlocklyData,
   gameMetadata: GameMetadata,
+  shadowBlocklyButtons?: boolean,
+|};
+type State = {|
+  finishLoading: boolean,
 |};
 export default class MazeGameContainer extends React.Component {
   props: Props;
+  state: State;
 
   app: Application;
   engine: Engine;
@@ -62,6 +68,10 @@ export default class MazeGameContainer extends React.Component {
   constructor(props: Props) {
     super(props);
 
+    this.state = {
+      finishLoading: false,
+    };
+
     // $FlowDoNotDisturb @see https://github.com/facebook/flow/issues/2405
     const mazeData: MazeData = {
       ...props.gameMetadata.mazeData,
@@ -72,8 +82,29 @@ export default class MazeGameContainer extends React.Component {
     this.engine = mazeEngineGenerator(mazeData, numericLineData, difficulty);
     this.image = images[getRandomInt(ZERO, images.length)];
   }
-
-  componentDidMount() {
+  componentWillMount() {
+    fetch(this.image)
+        .then(this.handleImageLoad)
+        .then(this.handleFinishLoading)
+        .catch(this.handleImageLoad)
+        .then(this.handleFinishLoading);
+  }
+  // TODO destroy app? reset on new props
+  componentWillUnmount() {
+    this.app.stop();
+    this.app.destroy(true);
+  }
+  handleSetOfInstructions = (instructions: Instructions): Promise<void> => (
+    this.engine.excecuteSetOfInstructions(instructions)
+        .then(() => (swal(game.success).catch(swal.noop)))
+        .catch(({ name, ...error }: MazeError) => (swal(error).catch(swal.noop)))
+  )
+  handleImageLoad = () => {
+    this.setState(() => ({
+      finishLoading: true,
+    }));
+  }
+  handleFinishLoading = () => {
     const { canvas } = this.props.gameMetadata.mazeData;
 
     this.app = new Application(canvas.width, canvas.height, {
@@ -87,28 +118,21 @@ export default class MazeGameContainer extends React.Component {
     this.engine.view.x = canvas.width / HALF;
     this.engine.view.y = canvas.height / HALF;
   }
-  // TODO destroy app? reset on new props
-  componentWillUnmount() {
-    this.app.stop();
-    this.app.destroy(true);
-  }
-  handleSetOfInstructions = (instructions: Instructions): Promise<void> => (
-    this.engine.excecuteSetOfInstructions(instructions)
-        .then(() => (swal(game.success).catch(swal.noop)))
-        .catch(({ name, ...error }: MazeError) => (swal(error).catch(swal.noop)))
-  )
   render() {
-    return (
-      <GameContainer image={this.image}>
-        <TwoColumns>
-          <canvas ref={(view: HTMLCanvasElement) => this.view = view} />
-          <BlocklyApp
-            blocklyData={this.props.blocklyData}
-            handleResetGame={this.engine.handleResetGame}
-            handleSetOfInstructions={this.handleSetOfInstructions}
-          />
-        </TwoColumns>
-      </GameContainer>
-    );
+    return !this.state.finishLoading
+      ? <Loading />
+      : (
+        <GameContainer image={this.image}>
+          <TwoColumns>
+            <canvas ref={(view: HTMLCanvasElement) => this.view = view} />
+            <BlocklyApp
+              blocklyData={this.props.blocklyData}
+              shadowActionBarButtons={this.props.shadowBlocklyButtons}
+              handleResetGame={this.engine.handleResetGame}
+              handleSetOfInstructions={this.handleSetOfInstructions}
+            />
+          </TwoColumns>
+        </GameContainer>
+      );
   }
 }
diff --git a/src/containers/MazeGameContainer.stories.jsx b/src/containers/MazeGameContainer.stories.jsx
index 1492911..7fb84b0 100644
--- a/src/containers/MazeGameContainer.stories.jsx
+++ b/src/containers/MazeGameContainer.stories.jsx
@@ -13,9 +13,16 @@ import gameMetadata, { blocklyData } from 'test/gameMetadata';
 import MazeGameContainer from './MazeGameContainer';
 
 storiesOf('containers.MazeGameContainer', module)
-    .add('first game', () => (
+    .add('simple game', () => (
       <MazeGameContainer blocklyData={blocklyData} gameMetadata={gameMetadata} />
     ))
+    .add('game with shadowed buttons', () => (
+      <MazeGameContainer
+        blocklyData={blocklyData}
+        gameMetadata={gameMetadata}
+        shadowBlocklyButtons={true}
+      />
+    ))
     .add('multiple exits game', () => {
       const newGameMetadata = {
         ...gameMetadata,