[REGRESSION] Use LayoutAnimation instead of Transition API (#1338)

RocketChat · Oct 30, 2019 · 0a8404d · 0a8404d
1 parent fcb420a
commit 0a8404d
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 54 deletions.
diff --git a/app/index.js b/app/index.js
@@ -19,7 +19,6 @@ import { defaultHeader, onNavigationStateChange } from './utils/navigation';
 import { loggerConfig, analytics } from './utils/log';
 import Toast from './containers/Toast';
 import RocketChat from './lib/rocketchat';
-import LayoutAnimation from './utils/layoutAnimation';
 
 useScreens();
 
@@ -313,14 +312,12 @@ export default class Root extends React.Component {
 	render() {
 		return (
 			<Provider store={store}>
-				<LayoutAnimation>
-					<App
-						ref={(navigatorRef) => {
-							Navigation.setTopLevelNavigator(navigatorRef);
-						}}
-						onNavigationStateChange={onNavigationStateChange}
-					/>
-				</LayoutAnimation>
+				<App
+					ref={(navigatorRef) => {
+						Navigation.setTopLevelNavigator(navigatorRef);
+					}}
+					onNavigationStateChange={onNavigationStateChange}
+				/>
 			</Provider>
 		);
 	}

diff --git a/app/share.js b/app/share.js
@@ -11,7 +11,6 @@ import sharedStyles from './views/Styles';
 import { isNotch, isIOS } from './utils/deviceInfo';
 import { defaultHeader, onNavigationStateChange } from './utils/navigation';
 import RocketChat from './lib/rocketchat';
-import LayoutAnimation from './utils/layoutAnimation';
 
 const InsideNavigator = createStackNavigator({
 	ShareListView: {
@@ -85,14 +84,12 @@ class Root extends React.Component {
 				onLayout={this.handleLayout}
 			>
 				<Provider store={store}>
-					<LayoutAnimation>
-						<AppContainer
-							ref={(navigatorRef) => {
-								Navigation.setTopLevelNavigator(navigatorRef);
-							}}
-							onNavigationStateChange={onNavigationStateChange}
-						/>
-					</LayoutAnimation>
+					<AppContainer
+						ref={(navigatorRef) => {
+							Navigation.setTopLevelNavigator(navigatorRef);
+						}}
+						onNavigationStateChange={onNavigationStateChange}
+					/>
 				</Provider>
 			</View>
 		);

diff --git a/app/utils/layoutAnimation.js b/app/utils/layoutAnimation.js
@@ -1,44 +1,10 @@
-import React from 'react';
-import { Transition, Transitioning } from 'react-native-reanimated';
-import PropTypes from 'prop-types';
+import { LayoutAnimation } from 'react-native';
 
 import debounce from './debounce';
 import { isIOS } from './deviceInfo';
-import sharedStyles from '../views/Styles';
-
-const transition = (
-	<Transition.Together>
-		<Transition.In type='fade' />
-		<Transition.Out type='fade' />
-		<Transition.Change interpolation='easeInOut' />
-	</Transition.Together>
-);
-
-const TRANSITION_REF = React.createRef();
 
 export const animateNextTransition = debounce(() => {
 	if (isIOS) {
-		TRANSITION_REF.current.animateNextTransition();
+		LayoutAnimation.easeInEaseOut();
 	}
 }, 200, true);
-
-const LayoutAnimation = ({ children }) => {
-	if (isIOS) {
-		return (
-			<Transitioning.View
-				style={sharedStyles.root}
-				transition={transition}
-				ref={TRANSITION_REF}
-			>
-				{children}
-			</Transitioning.View>
-		);
-	}
-	return children;
-};
-
-LayoutAnimation.propTypes = {
-	children: PropTypes.node
-};
-
-export default LayoutAnimation;