Revert "[RNMobile] another approach to fix jumping toolbar (#24414)"

This reverts commit 6604d96.
WordPress · Aug 14, 2020 · d15ae34 · d15ae34
1 parent d5a8822
commit d15ae34
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 89 deletions.
diff --git a/packages/block-library/src/button/edit.native.js b/packages/block-library/src/button/edit.native.js
@@ -372,6 +372,7 @@ class ButtonEdit extends Component {
 						__unstableMobileNoFocusOnMount={ ! isSelected }
 						selectionColor={ textColor }
 						onBlur={ () => {
+							this.onToggleButtonFocus( false );
 							this.onSetMaxWidth();
 						} }
 						onReplace={ onReplace }

diff --git a/packages/components/src/mobile/keyboard-avoiding-view/index.ios.js b/packages/components/src/mobile/keyboard-avoiding-view/index.ios.js
@@ -3,95 +3,19 @@
  */
 import {
 	KeyboardAvoidingView as IOSKeyboardAvoidingView,
-	Animated,
-	Keyboard,
 	Dimensions,
-	View,
 } from 'react-native';
-import SafeArea from 'react-native-safe-area';
-
-/**
- * WordPress dependencies
- */
-import { useEffect, useRef } from '@wordpress/element';
-import { useResizeObserver } from '@wordpress/compose';
-
-/**
- * Internal dependencies
- */
-import styles from './styles.scss';
-
-const AnimatedKeyboardAvoidingView = Animated.createAnimatedComponent(
-	IOSKeyboardAvoidingView
-);
-
-const MIN_HEIGHT = 44;
-
-export const KeyboardAvoidingView = ( {
-	parentHeight,
-	style,
-	withAnimatedHeight = false,
-	...otherProps
-} ) => {
-	const [ resizeObserver, sizes ] = useResizeObserver();
-	const { height = 0 } = sizes || {};
-
-	const animatedHeight = useRef( new Animated.Value( MIN_HEIGHT ) ).current;
 
+export const KeyboardAvoidingView = ( { parentHeight, ...otherProps } ) => {
 	const { height: fullHeight } = Dimensions.get( 'window' );
 	const keyboardVerticalOffset = fullHeight - parentHeight;
 
-	useEffect( () => {
-		Keyboard.addListener( 'keyboardWillShow', onKeyboardWillShow );
-		Keyboard.addListener( 'keyboardWillHide', onKeyboardWillHide );
-		return () => {
-			Keyboard.removeListener( 'keyboardWillShow', onKeyboardWillShow );
-			Keyboard.removeListener( 'keyboardWillHide', onKeyboardWillHide );
-		};
-	}, [] );
-
-	function onKeyboardWillShow( { endCoordinates } ) {
-		SafeArea.getSafeAreaInsetsForRootView().then( ( result ) => {
-			animatedHeight.setValue(
-				endCoordinates.height +
-					MIN_HEIGHT -
-					result.safeAreaInsets.bottom
-			);
-		} );
-	}
-
-	function onKeyboardWillHide( { duration } ) {
-		Animated.timing( animatedHeight, {
-			toValue: MIN_HEIGHT,
-			duration,
-			useNativeDriver: false,
-		} ).start();
-	}
-
 	return (
-		<AnimatedKeyboardAvoidingView
+		<IOSKeyboardAvoidingView
 			{ ...otherProps }
 			behavior="padding"
 			keyboardVerticalOffset={ keyboardVerticalOffset }
-			style={
-				withAnimatedHeight
-					? [ style, { height: animatedHeight } ]
-					: style
-			}
-		>
-			<View
-				style={ [
-					{
-						top: -height + MIN_HEIGHT,
-					},
-					styles.animatedChildStyle,
-					! withAnimatedHeight && styles.defaultChildStyle,
-				] }
-			>
-				{ resizeObserver }
-				{ otherProps.children }
-			</View>
-		</AnimatedKeyboardAvoidingView>
+		/>
 	);
 };
 

diff --git a/packages/components/src/mobile/keyboard-avoiding-view/styles.native.scss b/packages/components/src/mobile/keyboard-avoiding-view/styles.native.scss
diff --git a/packages/edit-post/src/components/layout/index.native.js b/packages/edit-post/src/components/layout/index.native.js
@@ -153,7 +153,6 @@ class Layout extends Component {
 					<KeyboardAvoidingView
 						parentHeight={ this.state.rootViewHeight }
 						style={ toolbarKeyboardAvoidingViewStyle }
-						withAnimatedHeight
 					>
 						{ isTemplatePickerAvailable && (
 							<__experimentalPageTemplatePicker