tjhintz/farm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixing "your turn" notification.

Browse Source
This commit is contained in:
Thomas Hintz
2020-04-27 21:06:54 -07:00
parent 48b178327b
commit 1f5b1e1eae
1 changed files with 32 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/components/farm/Board.jsx
View File

@@ -1995,6 +1995,8 @@ class BoardApp extends React.Component {
}
actionShowing = () => {
window.actionRef = this.actionRef;
window.actionRefExtra = this.actionRefExtra;
return (this.actionRef && this.actionRef.offsetParent) ||
(this.actionRefExtra && this.actionRefExtra.offsetParent)
}
@@ -2222,22 +2224,6 @@ class BoardApp extends React.Component {
</AlertOverlay>
);
}
const actionComponent = (
<Action
currentPlayer={this.state.currentPlayer}
timerId={this.state.timerId}
setTimerId={this.setTimerId}
forwardRef={x => this.actionRef = x}
spaces={this.props.spaces}
player={this.props.player}
game={this.props.game}
movePlayer={this.props.movePlayer}
showNextAction={this.props.nextUIAction}
otherPlayersTurn={this.props.player.name !== this.props.game.currentPlayer}
screen={this.state.screen}
showScreen={screen => this.showScreen(screen)}
setMovingSkip={this.props.setMovingSkip}
ui={this.props.ui} />);
// faExchangeAlt -> trade icon, hidden for now
return (
<div className='game-container' ref={this.myRef}>
@@ -2273,7 +2259,21 @@ class BoardApp extends React.Component {
game={this.props.game} showScreen={this.showScreen} />
</div>
<div className={this.tabClass(SCREENS.action)}>
{actionComponent}
<Action
currentPlayer={this.state.currentPlayer}
timerId={this.state.timerId}
setTimerId={this.setTimerId}
forwardRef={x => this.actionRef = x}
spaces={this.props.spaces}
player={this.props.player}
game={this.props.game}
movePlayer={this.props.movePlayer}
showNextAction={this.props.nextUIAction}
otherPlayersTurn={this.props.player.name !== this.props.game.currentPlayer}
screen={this.state.screen}
showScreen={screen => this.showScreen(screen)}
setMovingSkip={this.props.setMovingSkip}
ui={this.props.ui} />
</div>
<div className={this.tabClass(SCREENS.cards)}>
<Row>
@@ -2321,7 +2321,21 @@ class BoardApp extends React.Component {
</div>
<div className='static-tab-container show-for-large'>
<div className='tab show'>
{actionComponent}
<Action
currentPlayer={this.state.currentPlayer}
timerId={this.state.timerId}
setTimerId={this.setTimerId}
forwardRef={x => this.actionRefExtra = x}
spaces={this.props.spaces}
player={this.props.player}
game={this.props.game}
movePlayer={this.props.movePlayer}
showNextAction={this.props.nextUIAction}
otherPlayersTurn={this.props.player.name !== this.props.game.currentPlayer}
screen={this.state.screen}
showScreen={screen => this.showScreen(screen)}
setMovingSkip={this.props.setMovingSkip}
ui={this.props.ui} />
</div>
</div>
</div>