+ );
+}
+
function Square(props) {
let className = "square";
@@ -155,6 +335,10 @@ function Square(props) {
className += " open";
}
+ if (props.last_move) {
+ className += " last-move";
+ }
+
const onClick = props.active ? props.onClick : null;
return (
@@ -168,17 +352,36 @@ function Square(props) {
function MiniGrid(props) {
function grid_square(j) {
const value = props.squares[j];
+ const last_move = props.last_moves.includes(j);
+
+ /* Even if the grid is active, the square is only active if
+ * unoccupied. */
+ const square_active = (props.active && (value === null));
+
return (
props.onClick(j)}
/>
);
}
+ /* Even if my parent thinks I'm active because of the last move, I
+ * might not _really_ be active if I'm full. */
+ let occupied = 0;
+ props.squares.forEach(element => {
+ if (element)
+ occupied++;
+ });
+
+ let class_name = "mini-grid";
+ if (props.active && occupied < 9)
+ class_name += " active";
+
return (
-
+
{grid_square(0)}
{grid_square(1)}
{grid_square(2)}
@@ -194,11 +397,54 @@ function MiniGrid(props) {
class Board extends React.Component {
mini_grid(i) {
+ /* This mini grid is active only if both:
+ *
+ * 1. It is our turn (this.props.active === true)
+ *
+ * 2. One of the following conditions is met:
+ *
+ * a. This is this players first turn (last_two_moves[0] === null)
+ * b. This mini grid corresponds to this players last turn
+ * c. The mini grid that corresponds to the players last turn is full
+ */
+ let grid_active = false;
+ if (this.props.active) {
+ grid_active = true;
+ if (this.props.last_two_moves.length > 1) {
+ /* First index (0) gives us our last move, (that is, of the
+ * last two moves, it's the first one, so two moves ago).
+ *
+ * Second index (1) gives us the second number from that move,
+ * (that is, the index within the mini-grid that we last
+ * played).
+ */
+ const target = this.props.last_two_moves[0][1];
+ let occupied = 0;
+ this.props.squares[target].forEach(element => {
+ if (element)
+ occupied++;
+ });
+ /* If the target mini-grid isn't full then this grid is
+ * only active if it is that target. */
+ if (occupied < 9)
+ grid_active = (i === target);
+ }
+ }
+
+ /* We want to highlight each of the last two moves (both "+" and
+ * "o"). So we filter the last two moves that have a first index
+ * that matches this mini_grid and pass down their second index
+ * be highlighted.
+ */
+ const last_moves = this.props.last_two_moves.filter(move => move[0] === i)
+ .map(move => move[1]);
+
const squares = this.props.squares[i];
return (
this.props.onClick(i,j)}
/>
);
@@ -249,9 +495,9 @@ class Game extends React.Component {
game_info: {},
player_info: {},
other_players: [],
- squares: Array(9).fill(null).map(() => Array(9).fill(null)),
- moves: 0,
- next_to_play: "+"
+ squares: [...Array(9)].map(() => Array(9).fill(null)),
+ moves: [],
+ next_to_play: "+",
};
}
@@ -287,12 +533,13 @@ class Game extends React.Component {
}
receive_move(move) {
- if (this.state.moves === 81) {
+ if (this.state.moves.length === 81) {
return;
}
const symbol = team_symbol(this.state.next_to_play);
const new_squares = this.state.squares.map(arr => arr.slice());
new_squares[move[0]][move[1]] = symbol;
+ const new_moves = [...this.state.moves, move];
let next_to_play;
if (this.state.next_to_play === "+")
next_to_play = "o";
@@ -300,7 +547,7 @@ class Game extends React.Component {
next_to_play = "+";
this.setState({
squares: new_squares,
- moves: this.state.moves + 1,
+ moves: new_moves,
next_to_play: next_to_play
});
}
@@ -328,7 +575,7 @@ class Game extends React.Component {
render() {
const state = this.state;
- const first_move = state.moves === 0;
+ const first_move = state.moves.length === 0;
const my_team = state.player_info.team;
var board_active;
@@ -393,9 +640,23 @@ class Game extends React.Component {
this.handle_click(i, j, first_move)}
/>