Made state getter member function and fixed scu edge case

web/react/components/channel_invite_modal.jsx

@@ -9,7 +9,22 @@ var utils = require('../utils/utils.jsx');
 var client = require('../utils/client.jsx');
 var AsyncClient = require('../utils/async_client.jsx');
 
-function getStateFromStores() {
+
+export default class ChannelInviteModal extends React.Component {
+    constructor() {
+        super();
+
+        this.componentDidMount = this.componentDidMount.bind(this);
+        this.componentWillUnmount = this.componentWillUnmount.bind(this);
+        this.onShow = this.onShow.bind(this);
+        this.onHide = this.onHide.bind(this);
+        this.onListenerChange = this.onListenerChange.bind(this);
+        this.handleInvite = this.handleInvite.bind(this);
+
+        this.isShown = false;
+        this.state = this.getStateFromStores();
+    }
+    getStateFromStores() {
         function getId(user) {
             return user.id;
         }
@@ -40,22 +55,6 @@ function getStateFromStores() {
             channelName: channelName,
             loading: loading
         };
-}
-
-export default class ChannelInviteModal extends React.Component {
-    constructor() {
-        super();
-
-        this.componentDidMount = this.componentDidMount.bind(this);
-        this.componentWillUnmount = this.componentWillUnmount.bind(this);
-        this.shouldComponentUpdate = this.shouldComponentUpdate.bind(this);
-        this.onShow = this.onShow.bind(this);
-        this.onHide = this.onHide.bind(this);
-        this.onListenerChange = this.onListenerChange.bind(this);
-        this.handleInvite = this.handleInvite.bind(this);
-
-        this.isShown = false;
-        this.state = getStateFromStores();
     }
     componentDidMount() {
         $(React.findDOMNode(this)).on('hidden.bs.modal', this.onHide);
@@ -70,9 +69,6 @@ export default class ChannelInviteModal extends React.Component {
         ChannelStore.removeChangeListener(this.onListenerChange);
         UserStore.removeChangeListener(this.onListenerChange);
     }
-    shouldComponentUpdate() {
-        return this.isShown;
-    }
     onShow() {
         this.isShown = true;
         this.onListenerChange();
@@ -81,8 +77,8 @@ export default class ChannelInviteModal extends React.Component {
         this.isShown = false;
     }
     onListenerChange() {
-        var newState = getStateFromStores();
+        var newState = this.getStateFromStores();
-        if (!utils.areStatesEqual(this.state, newState)) {
+        if (!utils.areStatesEqual(this.state, newState) && this.isShown) {
             this.setState(newState);
         }
     }