Merge f5bdcef into 525c8f6

AUTHORS

@@ -17,3 +17,4 @@ Pete Nykänen
 Philihp Busby
 Jason Harrison
 Brendon Roberto
+Luca Vallisa

src/client/react-native.js

@@ -29,6 +29,14 @@ import { Client as RawClient } from './client';
  */
 export function Client(opts) {
   const { game, numPlayers, board, multiplayer, enhancer } = opts;
+  let { loading } = opts;
+
+  // Component that is displayed before the client has synced
+  // with the game master.
+  if (loading === undefined) {
+    const Loading = () => <></>;
+    loading = Loading;
+  }
 
   /*
    * WrappedBoard
@@ -96,6 +104,11 @@ export function Client(opts) {
       let _board = null;
 
       const state = this.client.getState();
+
+      if (state === null) {
+        return React.createElement(loading);
+      }
+
       const { matchID, playerID, ...rest } = this.props;
 
       if (board) {

src/client/react.tsx

@@ -73,7 +73,8 @@ export function Client<
   P extends BoardProps<G> = BoardProps<G>,
   ContextWithPlugins extends Ctx = Ctx
 >(opts: ReactClientOpts<G, P, ContextWithPlugins>) {
-  let { game, numPlayers, loading, board, multiplayer, enhancer, debug } = opts;
+  const { game, numPlayers, board, multiplayer, enhancer } = opts;
+  let { loading, debug } = opts;
 
   // Component that is displayed before the client has synced
   // with the game master.