Replace componentWillReceiveProps with componentDidUpdate to avoid de…

…precation warnings in strict mode. Partial fix for 4094.
JedWatson · Jul 4, 2020 · fa4e50b · fa4e50b
1 parent 26b7f22
commit fa4e50b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/docs/App/Header.js b/docs/App/Header.js
@@ -117,10 +117,11 @@ class Header extends Component<HeaderProps, HeaderState> {
   componentDidMount() {
     this.getStarCount();
   }
-  UNSAFE_componentWillReceiveProps({ location }: HeaderProps) {
+  componentDidUpdate(prevProps: HeaderProps) {
     const valid = ['/', '/home'];
-    const shouldCollapse = !valid.includes(this.props.location.pathname);
-    if (location.pathname !== this.props.location.pathname && shouldCollapse) {
+    const shouldCollapse = !valid.includes(prevProps.location.pathname);
+
+    if (prevProps.location.pathname !== this.props.location.pathname && shouldCollapse) {
       this.toggleCollapse();
     }
   }

diff --git a/packages/react-select/src/Async.js b/packages/react-select/src/Async.js
@@ -86,15 +86,16 @@ export const makeAsyncSelect = <C: {}>(
         });
       }
     }
-    UNSAFE_componentWillReceiveProps(nextProps: C & AsyncProps) {
+    componentDidUpdate(prevProps: C & AsyncProps) {
       // if the cacheOptions prop changes, clear the cache
-      if (nextProps.cacheOptions !== this.props.cacheOptions) {
+      if (prevProps.cacheOptions !== this.props.cacheOptions) {
         this.optionsCache = {};
       }
-      if (nextProps.defaultOptions !== this.props.defaultOptions) {
+
+      if (prevProps.defaultOptions !== this.props.defaultOptions) {
         this.setState({
-          defaultOptions: Array.isArray(nextProps.defaultOptions)
-            ? nextProps.defaultOptions
+          defaultOptions: Array.isArray(this.props.defaultOptions)
+            ? this.props.defaultOptions
             : undefined,
         });
       }