fix npe better

closedcontour · Oct 19, 2018 · ea01a97 · ea01a97
1 parent f14c982
commit ea01a97
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/projects/app/src/pages/GamePage.tsx b/projects/app/src/pages/GamePage.tsx
@@ -160,12 +160,12 @@ export class GamePage extends React.PureComponent<GamePageProps, GamePageState>
     if (this.state.loading || !this.state.leaguePlayers || !game || game.players == null) {
       return <div className="th-game">Loading...</div>;
     }
-    const handlePlayerChanged = (index: number) => (player: IPlayer | null) => {
+    const handlePlayerChanged = (index: number) => (player: IPlayer | undefined) => {
       const newGame = {
         ...game,
         players: game.players!.slice(),
       };
-      newGame.players[index] = player;
+      newGame.players[index] = player || null;
       this.setState({ game: newGame });
     };
     const choosers: JSX.Element[] = [];

diff --git a/projects/app/src/pages/components/PlayerChooser.tsx b/projects/app/src/pages/components/PlayerChooser.tsx
@@ -4,7 +4,7 @@ import * as React from "react";
 export interface PlayerChooserProps {
   players: IPlayer[];
   selectedPlayer: IPlayer | undefined | null;
-  onPlayerChanged(player: IPlayer | null): void;
+  onPlayerChanged(player: IPlayer | undefined): void;
 }
 
 export class PlayerChooser extends React.PureComponent<PlayerChooserProps, {}> {
@@ -27,6 +27,6 @@ export class PlayerChooser extends React.PureComponent<PlayerChooserProps, {}> {
   private handlePlayerChooserChange = (event: React.ChangeEvent<HTMLSelectElement>) => {
     const playerId = event.target.value;
     const player = this.props.players.find(p => p.id.toString() === playerId);
-    this.props.onPlayerChanged(playerId === "" || !player ? null : player);
+    this.props.onPlayerChanged(playerId === "" ? undefined : player);
   };
 }