CustomKeyboardView - remove unsafe methods (UNSAFE_componentWillReceiveProps) (#1160)

M-i-k-e-l · web-flow · commit 70f14a450255 · 2021-01-28T09:55:38.000+02:00
diff --git a/lib/components/Keyboard/KeyboardInput/CustomKeyboardView.android.js b/lib/components/Keyboard/KeyboardInput/CustomKeyboardView.android.js
@@ -15,14 +15,14 @@ export default class CustomKeyboardView extends CustomKeyboardViewBase {
     onItemSelected: PropTypes.func
   };
 
-  async UNSAFE_componentWillReceiveProps(nextProps) {
-    const {component} = nextProps;
+  async componentDidUpdate(prevProps) {
+    const {component} = this.props;
 
-    if (this.props.component !== component && !component) {
+    if (prevProps.component !== component && !component) {
       await TextInputKeyboardManager.reset();
     }
 
-    await super.UNSAFE_componentWillReceiveProps(nextProps);
+    super.componentDidUpdate(prevProps);
   }
 
   render() {
diff --git a/lib/components/Keyboard/KeyboardInput/CustomKeyboardView.ios.js b/lib/components/Keyboard/KeyboardInput/CustomKeyboardView.ios.js
@@ -47,9 +47,9 @@ export default class CustomKeyboardView extends CustomKeyboardViewBase {
     super.componentWillUnmount();
   }
 
-  async UNSAFE_componentWillReceiveProps(nextProps) {
-    const {inputRef: nextInputRef, component: nextComponent, initialProps: nextInitialProps, useSafeArea} = nextProps;
-    const {component} = this.props;
+  componentDidUpdate(prevProps) {
+    const {inputRef: nextInputRef, component: nextComponent, initialProps: nextInitialProps, useSafeArea} = this.props;
+    const {component} = prevProps;
 
     if (nextInputRef && nextComponent !== component) {
       if (nextComponent) {
@@ -63,7 +63,7 @@ export default class CustomKeyboardView extends CustomKeyboardViewBase {
       }
     }
 
-    await super.UNSAFE_componentWillReceiveProps(nextProps);
+    super.componentDidUpdate(prevProps);
   }
 
   render() {
diff --git a/lib/components/Keyboard/KeyboardInput/CustomKeyboardViewBase.js b/lib/components/Keyboard/KeyboardInput/CustomKeyboardViewBase.js
@@ -51,8 +51,8 @@ export default class CustomKeyboardViewBase extends Component {
     }
   }
 
-  async UNSAFE_componentWillReceiveProps(nextProps) {
-    const {onRequestShowKeyboard} = nextProps;
+  componentDidUpdate(prevProps) {
+    const {onRequestShowKeyboard} = this.props;
 
     if (onRequestShowKeyboard && !this.registeredRequestShowKeyboard) {
       this.registeredRequestShowKeyboard = true;
@@ -61,7 +61,7 @@ export default class CustomKeyboardViewBase extends Component {
       });
     }
 
-    this.registerListener(this.props, nextProps);
+    this.registerListener(prevProps, this.props);
   }
 
   registerListener(props, nextProps) {

Original file line number	Diff line number	Diff line change
`@@ -47,9 +47,9 @@ export default class CustomKeyboardView extends CustomKeyboardViewBase {`
`47`	`47`	`super.componentWillUnmount();`
`48`	`48`	`}`
`49`	`49`
`50`		`- async UNSAFE_componentWillReceiveProps(nextProps) {`
`51`		`- const {inputRef: nextInputRef, component: nextComponent, initialProps: nextInitialProps, useSafeArea} = nextProps;`
`52`		`- const {component} = this.props;`
	`50`	`+ componentDidUpdate(prevProps) {`
	`51`	`+ const {inputRef: nextInputRef, component: nextComponent, initialProps: nextInitialProps, useSafeArea} = this.props;`
	`52`	`+ const {component} = prevProps;`
`53`	`53`
`54`	`54`	`if (nextInputRef && nextComponent !== component) {`
`55`	`55`	`if (nextComponent) {`
`@@ -63,7 +63,7 @@ export default class CustomKeyboardView extends CustomKeyboardViewBase {`
`63`	`63`	`}`
`64`	`64`	`}`
`65`	`65`
`66`		`- await super.UNSAFE_componentWillReceiveProps(nextProps);`
	`66`	`+ super.componentDidUpdate(prevProps);`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`render() {`
Original file line number	Diff line number	Diff line change
`@@ -51,8 +51,8 @@ export default class CustomKeyboardViewBase extends Component {`
`51`	`51`	`}`
`52`	`52`	`}`
`53`	`53`
`54`		`- async UNSAFE_componentWillReceiveProps(nextProps) {`
`55`		`- const {onRequestShowKeyboard} = nextProps;`
	`54`	`+ componentDidUpdate(prevProps) {`
	`55`	`+ const {onRequestShowKeyboard} = this.props;`
`56`	`56`
`57`	`57`	`if (onRequestShowKeyboard && !this.registeredRequestShowKeyboard) {`
`58`	`58`	`this.registeredRequestShowKeyboard = true;`
`@@ -61,7 +61,7 @@ export default class CustomKeyboardViewBase extends Component {`
`61`	`61`	`});`
`62`	`62`	`}`
`63`	`63`
`64`		`- this.registerListener(this.props, nextProps);`
	`64`	`+ this.registerListener(prevProps, this.props);`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`registerListener(props, nextProps) {`