Skip to content

Update version of react-native-reanimated to 2.4.0 #1821

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 16 commits into from
Feb 6, 2022
Merged

Update version of react-native-reanimated to 2.4.0 #1821

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
cb7da5e
Update versions of react-native-reanimated and react-native-gesture-h…
ethanshar Dec 10, 2021
05124b7
Merge branch 'master' into infra/updateReanimatedAndGestureHandler
ethanshar Dec 19, 2021
a02db6b
Update reanimated to 2.3.1
ethanshar Dec 19, 2021
01d66e7
Fix exposed issue with interpolateColors can't handle undefined values
ethanshar Dec 19, 2021
404c0df
Merge branch 'master' into infra/updateReanimatedAndGestureHandler
ethanshar Jan 18, 2022
13bc6d4
Bumped reanimated to 2.4.0
yedidyak Feb 6, 2022
dd4a603
Merge branch 'master' into infra/updateReanimatedAndGestureHandler_2.4
M-i-k-e-l Feb 6, 2022
c4f7569
Fix TabController on Android
M-i-k-e-l Feb 6, 2022
ff42e8c
Fix tests (workarounds)
M-i-k-e-l Feb 6, 2022
6d6c20b
Remove expect errors
M-i-k-e-l Feb 6, 2022
0a90c2c
Change function name
M-i-k-e-l Feb 6, 2022
60020e9
Remove setup which seems to be no longer needed
M-i-k-e-l Feb 6, 2022
cd33cca
Revert to old function (for users who use older versions of reanimated)
M-i-k-e-l Feb 6, 2022
a72d49f
Change to noop
M-i-k-e-l Feb 6, 2022
f194571
Allow overriding onMomentumScrollEnd
M-i-k-e-l Feb 6, 2022
b96b37e
Fix types
M-i-k-e-l Feb 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions generatedTypes/src/incubator/TransitionView/useAnimatedTranslator.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ export default function useAnimatedTranslator(props: TranslatorProps): {
init: (to: {
x: number;
y: number;
}, animationDirection: TransitionViewDirection, callback: (isFinished: boolean) => void) => void;
}, animationDirection: TransitionViewDirection, callback: (isFinished?: boolean | undefined) => void) => void;
animate: (to: {
x: number;
y: number;
}, animationDirection: TransitionViewDirection, callback: (isFinished: boolean) => void) => void;
}, animationDirection: TransitionViewDirection, callback: (isFinished?: boolean | undefined) => void) => void;
animatedStyle: {
transform: ({
translateX: number;
Expand Down
4 changes: 2 additions & 2 deletions generatedTypes/src/incubator/TransitionView/useAnimationEndNotifier.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ export interface AnimationNotifierEndProps {
onAnimationEnd?: (animationType: TransitionViewAnimationType) => void;
}
export default function useAnimationEndNotifier(props: AnimationNotifierEndProps): {
onEnterAnimationEnd: (isFinished: boolean) => void;
onExitAnimationEnd: (isFinished: boolean) => void;
onEnterAnimationEnd: (isFinished?: boolean | undefined) => void;
onExitAnimationEnd: (isFinished?: boolean | undefined) => void;
};
9 changes: 6 additions & 3 deletions jest-setup.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
import {NativeModules, AccessibilityInfo} from 'react-native';

require('./node_modules/react-native-reanimated/src/reanimated2/jestUtils').setUpTests();

NativeModules.StatusBarManager = {getHeight: jest.fn()};
jest.spyOn(AccessibilityInfo, 'isScreenReaderEnabled').mockImplementation(() => new Promise.resolve(false));

// mock native modules
jest.mock('@react-native-community/blur', () => {});
jest.mock('@react-native-community/netinfo', () => {});
jest.mock('react-native-reanimated', () => require('react-native-reanimated/mock'));
// TODO: Adding here a todo for package.json: need to remove moduleNameMapper, see this: https://github.com/software-mansion/react-native-reanimated/issues/1196
jest.mock('react-native-reanimated', () => {
const reactNativeReanimated = require('react-native-reanimated/mock');
reactNativeReanimated.interpolateColor = jest.fn(v => v); // TODO: See this https://github.com/software-mansion/react-native-reanimated/issues/2749
return reactNativeReanimated;
});
global.__reanimatedWorkletInit = jest.fn();
jest.mock('react-native-gesture-handler', () => {});
jest.mock('@react-native-picker/picker', () => ({Picker: {Item: {}}}));
Expand Down
5 changes: 4 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
"react-native-keyboard-tracking-view": "^5.6.1",
"react-native-linear-gradient": "2.5.6",
"react-native-navigation": "^7.19.1",
"react-native-reanimated": "2.2.4",
"react-native-reanimated": "2.4.0",
"react-native-shimmer-placeholder": "^2.0.6",
"react-native-svg": "^12.1.0",
"react-native-svg-transformer": "^0.14.3",
Expand Down Expand Up @@ -133,6 +133,9 @@
"setupFiles": [
"./jest-setup.js"
],
"moduleNameMapper": {
"^react-native-reanimated$": "<rootDir>/node_modules/react-native-reanimated/src/Animated.js"
},
"transform": {
"^.+\\.js$": "<rootDir>/node_modules/react-native/jest/preprocessor.js"
}
Expand Down
2 changes: 1 addition & 1 deletion src/components/segmentedControl/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import {useOrientation} from 'hooks';
const BORDER_WIDTH = 1;
const TIMING_CONFIG = {
duration: 300,
easing: Easing.bezier(0.33, 1, 0.68, 1)
easing: Easing.bezierFn(0.33, 1, 0.68, 1)
};

export type SegmentedControlItemProps = SegmentProps;
Expand Down
3 changes: 1 addition & 2 deletions src/components/tabController/PageCarousel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@ function PageCarousel({...props}) {
}

const actualIndex = FIX_RTL ? itemsCount - index - 1 : index;
// @ts-expect-error
carousel.current?.scrollTo({x: actualIndex * pageWidth, animated: false});
},
[pageWidth, itemsCount]);
Expand All @@ -88,7 +87,6 @@ function PageCarousel({...props}) {
});

useEffect(() => {
// @ts-expect-error
carousel.current?.scrollTo({x: currentPage.value * pageWidth, animated: false});
}, [pageWidth]);

Expand All @@ -103,6 +101,7 @@ function PageCarousel({...props}) {
scrollEventThrottle={16}
contentOffset={initialOffset} // iOS only
onLayout={scrollToInitial} // Android only
onMomentumScrollEnd={() => {}} // workaround for useAnimatedScrollHandler.onMomentumEnd not being called (https://github.com/software-mansion/react-native-reanimated/issues/2735)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It'll override the onMomentumScrollEnd prop that the user might send, no?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is VERY strange, if the user sends onMomentumScrollEnd the workaround stops working (even though this is overriding it).

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed by adding useCallback

/>
);
}
Expand Down
4 changes: 3 additions & 1 deletion src/incubator/TouchableOpacity.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,9 @@ function TouchableOpacity(props: Props) {
const scale = interpolate(isActive.value, [0, 1], [1, activeScale]);

return {
backgroundColor: interpolateColor(isActive.value, [0, 1], [backgroundColor, activeColor]),
backgroundColor: !feedbackColor
? backgroundColor
: interpolateColor(isActive.value, [0, 1], [backgroundColor, activeColor]),
opacity,
transform: [{scale}]
};
Expand Down
4 changes: 2 additions & 2 deletions src/incubator/TransitionView/useAnimatedTranslator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export default function useAnimatedTranslator(props: TranslatorProps) {

const init = useCallback((to: {x: number; y: number},
animationDirection: TransitionViewDirection,
callback: (isFinished: boolean) => void) => {
callback: (isFinished?: boolean) => void) => {
'worklet';
// @ts-expect-error
if ([TransitionViewDirectionEnum.LEFT, TransitionViewDirectionEnum.RIGHT].includes(animationDirection)) {
Expand All @@ -39,7 +39,7 @@ export default function useAnimatedTranslator(props: TranslatorProps) {

const animate = useCallback((to: {x: number; y: number},
animationDirection: TransitionViewDirection,
callback: (isFinished: boolean) => void) => {
callback: (isFinished?: boolean) => void) => {
'worklet';
// @ts-expect-error
if ([TransitionViewDirectionEnum.LEFT, TransitionViewDirectionEnum.RIGHT].includes(animationDirection)) {
Expand Down
4 changes: 2 additions & 2 deletions src/incubator/TransitionView/useAnimationEndNotifier.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ export interface AnimationNotifierEndProps {
export default function useAnimationEndNotifier(props: AnimationNotifierEndProps) {
const {onAnimationEnd} = props;

const onEnterAnimationEnd = useCallback((isFinished: boolean) => {
const onEnterAnimationEnd = useCallback((isFinished?: boolean) => {
'worklet';
if (onAnimationEnd && isFinished) {
runOnJS(onAnimationEnd)('enter');
}
},
[onAnimationEnd]);

const onExitAnimationEnd = useCallback((isFinished: boolean) => {
const onExitAnimationEnd = useCallback((isFinished?: boolean) => {
'worklet';
if (onAnimationEnd && isFinished) {
runOnJS(onAnimationEnd)('exit');
Expand Down
2 changes: 1 addition & 1 deletion src/incubator/panView/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ const PanView = (props: Props) => {
translationY.value = result.y;
};

const dismiss = useCallback((isFinished: boolean) => {
const dismiss = useCallback((isFinished?: boolean) => {
'worklet';
if (isFinished && waitingForDismiss.value && onDismiss) {
waitingForDismiss.value = false;
Expand Down