Page Menu
Home
Phabricator
Search
Configure Global Search
Log In
Files
F3526039
D14102.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
4 KB
Referenced Files
None
Subscribers
None
D14102.diff
View Options
diff --git a/native/navigation/overlay-context.js b/native/navigation/overlay-context.js
--- a/native/navigation/overlay-context.js
+++ b/native/navigation/overlay-context.js
@@ -1,12 +1,15 @@
// @flow
import * as React from 'react';
+import type { SharedValue } from 'react-native-reanimated';
import Animated from 'react-native-reanimated';
export type VisibleOverlay = {
+routeKey: string,
+routeName: string,
+ // position is deprecated - use positionV2 and Reanimated V2 API
+position: ?Animated.Value,
+ +positionV2: ?SharedValue<number>,
+shouldRenderScreenContent: boolean,
+onExitFinish?: () => void,
+presentedFrom: ?string,
@@ -16,7 +19,9 @@
export type OverlayContextType = {
// position and isDismissing are local to the current route
+ // position is deprecated - use positionV2 and Reanimated V2 API
+position: ?Animated.Node,
+ +positionV2: ?SharedValue<number>,
+shouldRenderScreenContent: boolean,
+onExitFinish?: () => void,
+isDismissing: boolean,
diff --git a/native/navigation/overlay-navigator.react.js b/native/navigation/overlay-navigator.react.js
--- a/native/navigation/overlay-navigator.react.js
+++ b/native/navigation/overlay-navigator.react.js
@@ -22,7 +22,14 @@
import invariant from 'invariant';
import * as React from 'react';
import { View, StyleSheet } from 'react-native';
-import Animated, { EasingNode } from 'react-native-reanimated';
+import Animated, {
+ Easing,
+ EasingNode,
+ cancelAnimation,
+ makeMutable,
+ withTiming,
+} from 'react-native-reanimated';
+import type { SharedValue } from 'react-native-reanimated';
import { values } from 'lib/utils/objects.js';
@@ -77,6 +84,7 @@
+descriptor: Descriptor<OverlayNavigationHelpers<>, {}>,
+context: {
+position: ?Value,
+ +positionV2: ?SharedValue<number>,
+shouldRenderScreenContent: boolean,
+onExitFinish?: () => void,
+isDismissing: boolean,
@@ -130,6 +138,22 @@
const positionRefs = React.useRef<{ [string]: Animated.Value }>({});
const positions = positionRefs.current;
+ const positionRefsV2 = React.useRef<{ [string]: SharedValue<number> }>({});
+ const positionsV2 = positionRefsV2.current;
+
+ // cleanup shared values not created with useSharedValue just in case
+ // like described in the reanimated docs:
+ // https://docs.swmansion.com/react-native-reanimated/docs/advanced/makeMutable#remarks
+ React.useEffect(() => {
+ return () => {
+ // we don't want to capture positionV2Refs.current
+ // eslint-disable-next-line react-hooks/exhaustive-deps
+ Object.values(positionRefsV2.current).forEach(position =>
+ cancelAnimation(position),
+ );
+ };
+ }, []);
+
const firstRenderRef = React.useRef(true);
React.useEffect(() => {
firstRenderRef.current = false;
@@ -150,11 +174,15 @@
if (!positions[route.key] && shouldUseLegacyAnimation) {
positions[route.key] = new Value(firstRender ? 1 : 0);
}
+ if (!positionsV2[route.key] && shouldUseLegacyAnimation) {
+ positionsV2[route.key] = makeMutable(firstRender ? 1 : 0);
+ }
return {
route,
descriptor,
context: {
position: positions[route.key],
+ positionV2: positionsV2[route.key],
isDismissing: curIndex < routeIndex,
shouldRenderScreenContent: true,
},
@@ -167,7 +195,7 @@
// render. We know that they should only substantially change if something
// about the underlying route has changed
// eslint-disable-next-line react-hooks/exhaustive-deps
- [positions, routes, curIndex],
+ [positions, positionsV2, routes, curIndex],
);
const prevScenesRef = React.useRef<?$ReadOnlyArray<Scene>>();
@@ -187,6 +215,7 @@
routeKey: route.key,
routeName: route.name,
position: positions[route.key],
+ positionV2: positionsV2[route.key],
shouldRenderScreenContent: true,
presentedFrom,
};
@@ -436,6 +465,10 @@
if (!position) {
continue;
}
+ const positionV2 = positionsV2[key];
+ if (!positionV2) {
+ continue;
+ }
const toValue = pendingAnimations[key];
let duration = 150;
@@ -454,9 +487,13 @@
easing: EasingNode.inOut(EasingNode.ease),
toValue,
}).start();
+ positionV2.value = withTiming(toValue, {
+ duration,
+ easing: Easing.inOut(Easing.ease),
+ });
}
pendingAnimationsRef.current = {};
- }, [positions, pendingAnimations]);
+ }, [positions, positionsV2, pendingAnimations]);
// If sceneData changes, we update scrollBlockingModalStatus based on it,
// both in state and within the individual sceneData contexts.
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Tue, Dec 24, 7:20 PM (8 h, 39 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2694735
Default Alt Text
D14102.diff (4 KB)
Attached To
Mode
D14102: [native] Introduce positionsV2 values in OverlayNavigator
Attached
Detach File
Event Timeline
Log In to Comment