From 89e67b315089a249e2672ab5b83e3f8adbf23d24 Mon Sep 17 00:00:00 2001
From: Thomas Hintz <t@thintz.com>
Date: Tue, 31 Mar 2020 08:06:13 -0700
Subject: [PATCH] Better detection for action screen.

---
 src/components/farm/Board.jsx | 37 +++++++++++++++++++++++------------
 1 file changed, 24 insertions(+), 13 deletions(-)

diff --git a/src/components/farm/Board.jsx b/src/components/farm/Board.jsx
index 4f7a5e0..3f5ce79 100644
--- a/src/components/farm/Board.jsx
+++ b/src/components/farm/Board.jsx
@@ -1232,17 +1232,19 @@ class Action extends React.Component {
                 }
         }
         return (
-            <Row>
-                <Col width={'12'}>
-                    <div className={'action'}>
-                        {view}
-                    </div>
-                    <br />
-                    <div className={'center'}>
-                        {this.props.otherPlayersTurn ? (<Fragment />) : buttons}
-                    </div>
-                </Col>
-            </Row>
+            <div ref={x => this.props.forwardRef(x)}>
+                <Row>
+                    <Col width={'12'}>
+                        <div className={'action'}>
+                            {view}
+                        </div>
+                        <br />
+                        <div className={'center'}>
+                            {this.props.otherPlayersTurn ? (<Fragment />) : buttons}
+                        </div>
+                    </Col>
+                </Row>
+            </div>
         );
     }
 }
@@ -1447,6 +1449,13 @@ class BoardApp extends React.Component {
             card: props.ui.card
         };
         this.myRef = React.createRef();
+        this.actionRef = React.createRef();
+        this.actionRefExtra = React.createRef();
+    }
+
+    actionShowing = () => {
+        return (this.actionRef && this.actionRef.offsetParent) ||
+               (this.actionRefExtra && this.actionRefExtra.offsetParent)
     }
 
     showScreen = screen => {
@@ -1475,7 +1484,7 @@ class BoardApp extends React.Component {
         // it as handled.
         if (this.props.ui.unhandledAlert &&
             this.props.ui.unhandledAlert.type === ALERTS.beginTurn &&
-            this.state.screen === SCREENS.action) {
+            this.actionShowing()) {
             this.props.alertHandled(this.props.ui.unhandledAlert.id);
         }
     }
@@ -1567,7 +1576,7 @@ class BoardApp extends React.Component {
                     </Fragment>
                 </AlertOverlay>
             );
-        } else if (alert && this.state.screen !== SCREENS.action) {
+        } else if (alert && !this.actionShowing()) {
             switch (alert.type) {
                 case ALERTS.beginTurn:
                     alertOverlay = (
@@ -1651,6 +1660,7 @@ class BoardApp extends React.Component {
                             </div>
                             <div className={this.tabClass(SCREENS.action)}>
                                 <Action
+                                    forwardRef={x => this.actionRef = x}
                                     spaces={this.props.spaces}
                                     player={this.props.player}
                                     game={this.props.game}
@@ -1699,6 +1709,7 @@ class BoardApp extends React.Component {
                         <div className='static-tab-container show-for-large'>
                             <div className='tab show'>
                                 <Action
+                                    forwardRef={x => this.actionRefExtra = x}
                                     spaces={this.props.spaces}
                                     player={this.props.player}
                                     game={this.props.game}