Skip to content

Increase screen transition velocity #5847

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
piaskowyk merged 1 commit into from
Apr 2, 2024
Merged

Increase screen transition velocity #5847

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 21 additions & 5 deletions src/reanimated2/screenTransition/swipeSimulator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@ import type {
import { applyStyle, applyStyleForBelowTopScreen } from './styleUpdater';
import { RNScreensTurboModule } from './RNScreensTurboModule';

const BASE_VELOCITY = 300;
const BASE_VELOCITY = 400;
const ADDITIONAL_VELOCITY_FACTOR_X = 400;
const ADDITIONAL_VELOCITY_FACTOR_Y = 500;
const ADDITIONAL_VELOCITY_FACTOR_XY = 600;

function computeEasingProgress(
startingTimestamp: number,
Expand Down Expand Up @@ -100,17 +103,30 @@ export function getSwipeSimulator(
const velocity = { x: BASE_VELOCITY, y: BASE_VELOCITY };
if (lockAxis === 'x') {
velocity.y = 0;
velocity.x +=
(ADDITIONAL_VELOCITY_FACTOR_X * distance.x) / screenDimensions.width;
} else if (lockAxis === 'y') {
velocity.x = 0;
velocity.y +=
(ADDITIONAL_VELOCITY_FACTOR_Y * distance.y) / screenDimensions.height;
} else {
const euclideanDistance = Math.sqrt(distance.x ** 2 + distance.y ** 2);
const screenDiagonal = Math.sqrt(
screenDimensions.width ** 2 + screenDimensions.height ** 2
);
const velocityVectorLength =
BASE_VELOCITY +
(ADDITIONAL_VELOCITY_FACTOR_XY * euclideanDistance) / screenDiagonal;
if (Math.abs(startingPosition.x) > Math.abs(startingPosition.y)) {
velocity.x = BASE_VELOCITY;
velocity.x = velocityVectorLength;
velocity.y =
BASE_VELOCITY * Math.abs(startingPosition.y / startingPosition.x);
velocityVectorLength *
Math.abs(startingPosition.y / startingPosition.x);
} else {
velocity.x =
BASE_VELOCITY * Math.abs(startingPosition.x / startingPosition.y);
velocity.y = BASE_VELOCITY;
velocityVectorLength *
Math.abs(startingPosition.x / startingPosition.y);
velocity.y = velocityVectorLength;
}
}

Expand Down