Fixed set state after component is unmounted

WordPress · Feb 18, 2019 · 787df73 · 787df73
1 parent 9b94dbe
commit 787df73
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/packages/editor/src/components/mobile/bottom-sheet/index.native.js b/packages/editor/src/components/mobile/bottom-sheet/index.native.js
@@ -21,6 +21,7 @@ import PickerCell from './picker-cell';
 class BottomSheet extends Component {
 	constructor() {
 		super( ...arguments );
+		this._isMounted = false;
 		this.onSafeAreaInsetsUpdate = this.onSafeAreaInsetsUpdate.bind( this );
 		this.state = {
 			safeAreaBottomInset: 0,
@@ -30,17 +31,21 @@ class BottomSheet extends Component {
 	}
 
 	componentDidMount() {
+		this._isMounted = true;
 		SafeArea.addEventListener( 'safeAreaInsetsForRootViewDidChange', this.onSafeAreaInsetsUpdate );
 	}
 
 	componentWillUnmount() {
+		this._isMounted = false;
 		SafeArea.removeEventListener( 'safeAreaInsetsForRootViewDidChange', this.onSafeAreaInsetsUpdate );
 	}
 
 	onSafeAreaInsetsUpdate( result ) {
-		const { safeAreaInsets } = result;
-		if ( this.state.safeAreaBottomInset !== safeAreaInsets.bottom ) {
-			this.setState( { safeAreaBottomInset: safeAreaInsets.bottom } );
+		if ( this._isMounted ) {
+			const { safeAreaInsets } = result;
+			if ( this.state.safeAreaBottomInset !== safeAreaInsets.bottom ) {
+				this.setState( { safeAreaBottomInset: safeAreaInsets.bottom } );
+			}
 		}
 	}