getDerivedStateFromProps refactored in contacts-view and chips-input,…

… #35
panther711 · Aug 14, 2019 · d999652 · d999652
1 parent e79502b
commit d999652
Show file tree

Hide file tree

Showing 7 changed files with 88 additions and 40 deletions.
diff --git a/src/views/contacts-view.jsx b/src/views/contacts-view.jsx
@@ -20,21 +20,21 @@ export default class ContactsView extends React.Component {
 
     this.handleAction = this.handleAction.bind(this);
 
-    this.state = ContactsView.getDerivedStateFromProps(props, {});
+    this.state = ContactsView.deriveStateFromProps(props);
   }
 
-  static getDerivedStateFromProps(nextProps, prevState) {
+  static deriveStateFromProps(props) {
     const contacts = [];
     let unreadThreads = 0;
     let archivedCount = 0;
-    nextProps.chatList.map((c) => {
+    props.chatList.map((c) => {
       if (c.private && c.private.arch) {
-        if (nextProps.archive) {
+        if (props.archive) {
           contacts.push(c);
         } else {
           archivedCount ++;
         }
-      } else if (!nextProps.archive) {
+      } else if (!props.archive) {
         contacts.push(c);
         unreadThreads += c.unread > 0 ? 1 : 0;
       }
@@ -51,14 +51,22 @@ export default class ContactsView extends React.Component {
       });
     }
 
-    updateFavicon(unreadThreads);
-
     return {
       contactList: contacts,
-      archivedCount: archivedCount
+      unreadThreads: unreadThreads
     };
   }
 
+  componentDidUpdate(prevProps, prevState) {
+    if (prevProps.chatList != this.props.chatList) {
+      const newState = ContactsView.deriveStateFromProps(this.props);
+      this.setState(newState);
+      if (newState.unreadThreads != prevState.unreadThreads) {
+        updateFavicon(newState.unreadThreads);
+      }
+    }
+  }
+
   handleAction(action_ignored) {
     this.props.onShowArchive();
   }

diff --git a/src/views/tinode-web.jsx b/src/views/tinode-web.jsx
@@ -538,14 +538,14 @@ class TinodeWeb extends React.Component {
 
       // New message received
       if (document.hidden) {
-        if (this.state.messageSounds && !isArchived) {
+        if (this.state.messageSounds && !archived) {
           POP_SOUND.play();
         }
         this.resetContactList();
 
       // Skip update if the topic is currently open, otherwise the badge will annoyingly flash.
       } else if (this.state.topicSelected != cont.topic) {
-        if (this.state.messageSounds && !isArchived) {
+        if (this.state.messageSounds && !archived) {
           POP_SOUND.play();
         }
         this.resetContactList();

diff --git a/src/widgets/chip-input.jsx b/src/widgets/chip-input.jsx
@@ -9,7 +9,9 @@ export default class ChipInput extends React.Component {
   constructor(props) {
     super(props);
 
-    this.state = ChipInput.getDerivedStateFromProps(props);
+    this.state = ChipInput.deriveStateFromProps(props);
+    this.state.input = '';
+    this.state.focused = false;
 
     this.handleTextInput = this.handleTextInput.bind(this);
     this.removeChipAt = this.removeChipAt.bind(this);
@@ -19,6 +21,25 @@ export default class ChipInput extends React.Component {
     this.handleKeyDown = this.handleKeyDown.bind(this);
   }
 
+  static deriveStateFromProps(props) {
+    return {
+      placeholder: props.chips ? '' : props.prompt,
+      sortedChips: ChipInput.sortChips(props.chips, props.required),
+      chipIndex: ChipInput.indexChips(props.chips)
+    };
+  }
+
+  componentDidUpdate(prevProps, prevState) {
+    if (prevProps.chips != this.props.chips ||
+      prevProps.required != this.props.required ||
+      prevProps.prompt != this.props.prompt) {
+      this.setState(ChipInput.deriveStateFromProps(this.props));
+    }
+    if (!prevState || this.props.chips.length > prevState.sortedChips.length) {
+      this.setState({input: ''});
+    }
+  }
+  /*
   static getDerivedStateFromProps(nextProps, prevState) {
     const state = {
       placeholder: nextProps.chips ? '' : nextProps.prompt,
@@ -29,12 +50,12 @@ export default class ChipInput extends React.Component {
 
     if (!prevState || nextProps.chips.length > prevState.sortedChips.length) {
       // Chip added: clear input.
-      state.input ='';
+      state.input = '';
     }
 
     return state;
   }
-
+  */
   // Map chip index to user name
   static indexChips(chips) {
     const index = {};

diff --git a/umd/index.dev.js b/umd/index.dev.js
@@ -916,11 +916,23 @@ var ContactsView = function (_React$Component) {
 
     _this = _possibleConstructorReturn(this, _getPrototypeOf(ContactsView).call(this, props));
     _this.handleAction = _this.handleAction.bind(_assertThisInitialized(_this));
-    _this.state = ContactsView.getDerivedStateFromProps(props, {});
+    _this.state = ContactsView.deriveStateFromProps(props);
     return _this;
   }
 
   _createClass(ContactsView, [{
+    key: "componentDidUpdate",
+    value: function componentDidUpdate(prevProps, prevState) {
+      if (prevProps.chatList != this.props.chatList) {
+        var newState = ContactsView.deriveStateFromProps(this.props);
+        this.setState(newState);
+
+        if (newState.unreadThreads != prevState.unreadThreads) {
+          Object(_lib_utils_js__WEBPACK_IMPORTED_MODULE_3__["updateFavicon"])(newState.unreadThreads);
+        }
+      }
+    }
+  }, {
     key: "handleAction",
     value: function handleAction(action_ignored) {
       this.props.onShowArchive();
@@ -949,19 +961,19 @@ var ContactsView = function (_React$Component) {
       });
     }
   }], [{
-    key: "getDerivedStateFromProps",
-    value: function getDerivedStateFromProps(nextProps, prevState) {
+    key: "deriveStateFromProps",
+    value: function deriveStateFromProps(props) {
       var contacts = [];
       var unreadThreads = 0;
       var archivedCount = 0;
-      nextProps.chatList.map(function (c) {
+      props.chatList.map(function (c) {
         if (c["private"] && c["private"].arch) {
-          if (nextProps.archive) {
+          if (props.archive) {
             contacts.push(c);
           } else {
             archivedCount++;
           }
-        } else if (!nextProps.archive) {
+        } else if (!props.archive) {
           contacts.push(c);
           unreadThreads += c.unread > 0 ? 1 : 0;
         }
@@ -980,10 +992,9 @@ var ContactsView = function (_React$Component) {
         });
       }
 
-      Object(_lib_utils_js__WEBPACK_IMPORTED_MODULE_3__["updateFavicon"])(unreadThreads);
       return {
         contactList: contacts,
-        archivedCount: archivedCount
+        unreadThreads: unreadThreads
       };
     }
   }]);
@@ -4764,13 +4775,13 @@ var TinodeWeb = function (_React$Component) {
         var archived = topic && topic.isArchived();
 
         if (document.hidden) {
-          if (this.state.messageSounds && !isArchived) {
+          if (this.state.messageSounds && !archived) {
             POP_SOUND.play();
           }
 
           this.resetContactList();
         } else if (this.state.topicSelected != cont.topic) {
-          if (this.state.messageSounds && !isArchived) {
+          if (this.state.messageSounds && !archived) {
             POP_SOUND.play();
           }
 
@@ -6752,7 +6763,9 @@ var ChipInput = function (_React$Component) {
     _classCallCheck(this, ChipInput);
 
     _this = _possibleConstructorReturn(this, _getPrototypeOf(ChipInput).call(this, props));
-    _this.state = ChipInput.getDerivedStateFromProps(props);
+    _this.state = ChipInput.deriveStateFromProps(props);
+    _this.state.input = '';
+    _this.state.focused = false;
     _this.handleTextInput = _this.handleTextInput.bind(_assertThisInitialized(_this));
     _this.removeChipAt = _this.removeChipAt.bind(_assertThisInitialized(_this));
     _this.handleChipCancel = _this.handleChipCancel.bind(_assertThisInitialized(_this));
@@ -6763,6 +6776,19 @@ var ChipInput = function (_React$Component) {
   }
 
   _createClass(ChipInput, [{
+    key: "componentDidUpdate",
+    value: function componentDidUpdate(prevProps, prevState) {
+      if (prevProps.chips != this.props.chips || prevProps.required != this.props.required || prevProps.prompt != this.props.prompt) {
+        this.setState(ChipInput.deriveStateFromProps(this.props));
+      }
+
+      if (!prevState || this.props.chips.length > prevState.sortedChips.length) {
+        this.setState({
+          input: ''
+        });
+      }
+    }
+  }, {
     key: "handleTextInput",
     value: function handleTextInput(e) {
       this.setState({
@@ -6859,20 +6885,13 @@ var ChipInput = function (_React$Component) {
       }));
     }
   }], [{
-    key: "getDerivedStateFromProps",
-    value: function getDerivedStateFromProps(nextProps, prevState) {
-      var state = {
-        placeholder: nextProps.chips ? '' : nextProps.prompt,
-        sortedChips: ChipInput.sortChips(nextProps.chips, nextProps.required),
-        chipIndex: ChipInput.indexChips(nextProps.chips),
-        focused: prevState && prevState.focused
+    key: "deriveStateFromProps",
+    value: function deriveStateFromProps(props) {
+      return {
+        placeholder: props.chips ? '' : props.prompt,
+        sortedChips: ChipInput.sortChips(props.chips, props.required),
+        chipIndex: ChipInput.indexChips(props.chips)
       };
-
-      if (!prevState || nextProps.chips.length > prevState.sortedChips.length) {
-        state.input = '';
-      }
-
-      return state;
     }
   }, {
     key: "indexChips",

diff --git a/umd/index.dev.js.map b/umd/index.dev.js.map
diff --git a/umd/index.prod.js b/umd/index.prod.js
diff --git a/umd/index.prod.js.map b/umd/index.prod.js.map