Skip to content
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.

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

Remove Reanimated 2 support #2864

Merged
merged 1 commit into from
Jan 6, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
86 changes: 0 additions & 86 deletions apps/docs/docs/animations/reanimated2.md

This file was deleted.

3 changes: 1 addition & 2 deletions apps/docs/docs/animations/reanimated3.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ sidebar_label: Animations
slug: /animations/animations
---

React Native Skia offers integration with [Reanimated v3](https://docs.swmansion.com/react-native-reanimated/), enabling the execution of animations on the UI thread.
This integration is available starting from Reanimated v3. If you are using Reanimated v2, refer to the [Reanimated 2 support section](/docs/animations/reanimated2).
React Native Skia offers integration with [Reanimated v3 and above](https://docs.swmansion.com/react-native-reanimated/), enabling the execution of animations on the UI thread.

React Native Skia supports the direct usage of Reanimated's shared and derived values as properties. There is no need for functions like `createAnimatedComponent` or `useAnimatedProps`; simply pass the Reanimated values directly as properties.

Expand Down
1 change: 0 additions & 1 deletion apps/docs/sidebars.js
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,6 @@ const sidebars = {
"animations/gestures",
"animations/hooks",
"animations/textures",
"animations/reanimated2",
],
},
{
Expand Down
1 change: 0 additions & 1 deletion packages/skia/src/external/reanimated/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
export * from "./useAnimatedImageValue";
export * from "./useDerivedValueOnJS";
export * from "./renderHelpers";
export * from "./interpolators";
export * from "./textures";
Expand Down
48 changes: 4 additions & 44 deletions packages/skia/src/external/reanimated/renderHelpers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import type { Node } from "../../dom/types";

import Rea from "./ReanimatedProxy";

export let HAS_REANIMATED = false;
export let HAS_REANIMATED_3 = false;
try {
// This logic is convoluted but necessary
Expand All @@ -16,21 +15,20 @@ try {
const reanimatedVersion =
require("react-native-reanimated/package.json").version;
require("react-native-reanimated");
HAS_REANIMATED = !!reanimatedVersion;
if (
reanimatedVersion &&
(reanimatedVersion >= "3.0.0" || reanimatedVersion.includes("3.0.0-"))
) {
HAS_REANIMATED_3 = true;
}
} catch (e) {
HAS_REANIMATED = false;
// do nothing
}

const _bindings = new WeakMap<Node<unknown>, unknown>();

export const unbindReanimatedNode = (node: Node<unknown>) => {
if (!HAS_REANIMATED) {
if (!HAS_REANIMATED_3) {
return;
}
const previousMapperId = _bindings.get(node);
Expand All @@ -40,7 +38,7 @@ export const unbindReanimatedNode = (node: Node<unknown>) => {
};

export function extractReanimatedProps(props: AnimatedProps<any>) {
if (!HAS_REANIMATED) {
if (!HAS_REANIMATED_3) {
return [props, {}];
}
const reanimatedProps = {} as AnimatedProps<any>;
Expand All @@ -60,50 +58,12 @@ export function extractReanimatedProps(props: AnimatedProps<any>) {
return [otherProps, reanimatedProps];
}

function bindReanimatedProps2(
container: Container,
node: Node<any>,
reanimatedProps: AnimatedProps<any>
) {
const sharedValues = Object.values(reanimatedProps);
const previousMapperId = _bindings.get(node);
if (previousMapperId !== undefined) {
Rea.stopMapper(previousMapperId as number);
}
if (sharedValues.length > 0) {
const viewId = container.getNativeId();
const { SkiaViewApi } = global;
const updateProps = () => {
for (const propName in reanimatedProps) {
node && node.setProp(propName, reanimatedProps[propName].value);
}
// On React Native we use the SkiaViewApi to redraw because it can
// run on the worklet thread (container.redraw can't)
// if SkiaViewApi is undefined, we are on web and container.redraw()
// can safely be invoked
if (SkiaViewApi) {
SkiaViewApi.requestRedraw(viewId);
} else {
container.redraw();
}
};
const mapperId = Rea.startMapper(() => {
"worklet";
Rea.runOnJS(updateProps)();
}, sharedValues);
_bindings.set(node, mapperId);
}
}

export function bindReanimatedProps(
container: Container,
node: Node<any>,
reanimatedProps: AnimatedProps<any>
) {
if (HAS_REANIMATED && !HAS_REANIMATED_3) {
return bindReanimatedProps2(container, node, reanimatedProps);
}
if (!HAS_REANIMATED) {
if (!HAS_REANIMATED_3) {
return;
}
const sharedValues = Object.values(reanimatedProps);
Expand Down
20 changes: 0 additions & 20 deletions packages/skia/src/external/reanimated/useDerivedValueOnJS.ts

This file was deleted.

10 changes: 0 additions & 10 deletions packages/skia/src/sksg/Container.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@ import { type SharedValue } from "react-native-reanimated";

import Rea from "../external/reanimated/ReanimatedProxy";
import type { Skia, SkCanvas } from "../skia/types";
import {
HAS_REANIMATED,
HAS_REANIMATED_3,
} from "../external/reanimated/renderHelpers";

import { createDrawingContext } from "./DrawingContext";
import type { Node } from "./nodes";
Expand Down Expand Up @@ -40,9 +36,6 @@ export class Container {

set root(root: Node[]) {
const isOnscreen = this.nativeId !== -1;
if (HAS_REANIMATED && !HAS_REANIMATED_3) {
throw new Error("React Native Skia only supports Reanimated 3 and above");
}
if (isOnscreen) {
if (this.mapperId !== null) {
Rea.stopMapper(this.mapperId);
Expand All @@ -62,9 +55,6 @@ export class Container {

redraw() {
const isOnscreen = this.nativeId !== -1;
if (HAS_REANIMATED && !HAS_REANIMATED_3) {
throw new Error("React Native Skia only supports Reanimated 3 and above");
}
if (isOnscreen) {
const { nativeId, Skia, root } = this;
Rea.runOnUI(() => {
Expand Down
Loading