From 45068f68db798e378f5759c74aec90cd84c12972 Mon Sep 17 00:00:00 2001
From: Leonard Kim <virtuacoplenny@gmail.com>
Date: Sun, 28 Oct 2018 19:11:10 -0700
Subject: [PATCH] ref(welcome-page): use getDerivedStateFromProps, set mounted
 after actual mount

---
 .../welcome/components/AbstractWelcomePage.js | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/react/features/welcome/components/AbstractWelcomePage.js b/react/features/welcome/components/AbstractWelcomePage.js
index b67ca3f38..02d089ca2 100644
--- a/react/features/welcome/components/AbstractWelcomePage.js
+++ b/react/features/welcome/components/AbstractWelcomePage.js
@@ -37,6 +37,17 @@ type Props = {
 export class AbstractWelcomePage extends Component<Props, *> {
     _mounted: ?boolean;
 
+    /**
+     * Implements React's {@link Component#getDerivedStateFromProps()}.
+     *
+     * @inheritdoc
+     */
+    static getDerivedStateFromProps(props: Props, state: Object) {
+        return {
+            room: props._room || state.room
+        };
+    }
+
     /**
      * Save room name into component's local state.
      *
@@ -77,26 +88,15 @@ export class AbstractWelcomePage extends Component<Props, *> {
     }
 
     /**
-     * Implements React's {@link Component#componentWillMount()}. Invoked
-     * immediately before mounting occurs.
+     * Implements React's {@link Component#componentDidMount()}. Invoked
+     * immediately after mounting occurs.
      *
      * @inheritdoc
      */
-    componentWillMount() {
+    componentDidMount() {
         this._mounted = true;
     }
 
-    /**
-     * Implements React's {@link Component#componentWillReceiveProps()}. Invoked
-     * before this mounted component receives new props.
-     *
-     * @inheritdoc
-     * @param {Props} nextProps - New props component will receive.
-     */
-    componentWillReceiveProps(nextProps: Props) {
-        this.setState({ room: nextProps._room });
-    }
-
     /**
      * Implements React's {@link Component#componentWillUnmount()}. Invoked
      * immediately before this component is unmounted and destroyed.