Skip to content

Inject _WORKLET to RN runtime #4511

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
tomekzaw merged 3 commits into from
Jun 6, 2023
Merged

Inject _WORKLET to RN runtime #4511

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e80a9f8
Inject `_WORKLET` to RN runtime
tomekzaw May 31, 2023
cc8531c
Improve Babel plugin check
tomekzaw Jun 5, 2023
7947dda
Unify logic
tomekzaw Jun 5, 2023
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
2 changes: 2 additions & 0 deletions android/src/main/cpp/NativeProxy.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -474,6 +474,8 @@ void NativeProxy::setGlobalProperties(
jsRuntime.global().setProperty(
jsRuntime, "_WORKLET_RUNTIME", workletRuntimeValue);

jsRuntime.global().setProperty(jsRuntime, "_WORKLET", false);

#ifdef RCT_NEW_ARCH_ENABLED
jsRuntime.global().setProperty(jsRuntime, "_IS_FABRIC", true);
#else
Expand Down
2 changes: 2 additions & 0 deletions ios/REAModule.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,8 @@ - (void)setBridge:(RCTBridge *)bridge

runtime.global().setProperty(runtime, "_WORKLET_RUNTIME", workletRuntimeValue);

runtime.global().setProperty(runtime, "_WORKLET", false);

runtime.global().setProperty(runtime, "_IS_FABRIC", true);

auto version = getReanimatedVersionString(runtime);
Expand Down
2 changes: 2 additions & 0 deletions ios/native/REAInitializer.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ - (void)setBridge:(RCTBridge *)bridge;

runtime.global().setProperty(runtime, "_WORKLET_RUNTIME", workletRuntimeValue);

runtime.global().setProperty(runtime, "_WORKLET", false);

runtime.global().setProperty(runtime, "_IS_FABRIC", false);

auto version = getReanimatedVersionString(runtime);
Expand Down
13 changes: 7 additions & 6 deletions src/reanimated2/threads.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ export function runOnUIImmediately<A extends any[], R>(
worklet: ComplexWorkletFunction<A, R>
): (...args: A) => void {
'worklet';
if (__DEV__ && !IS_JEST && _WORKLET) {
if (__DEV__ && !IS_WEB && _WORKLET) {
throw new Error(
'runOnUIImmediately() cannot be called on the UI runtime. Please call the function synchronously or use `queueMicrotask` or `requestAnimationFrame` instead.'
);
Expand All @@ -141,11 +141,12 @@ export function runOnUIImmediately<A extends any[], R>(
};
}

if (__DEV__) {
try {
// eslint-disable-next-line @typescript-eslint/no-empty-function
runOnUI(() => {});
} catch (e) {
if (__DEV__ && !IS_WEB) {
const f = () => {
'worklet';
};
// @ts-ignore plugin
if (f.__workletHash === undefined) {
throw new Error(
'Failed to create a worklet. Did you forget to add Reanimated Babel plugin in babel.config.js? See installation docs at https://docs.swmansion.com/react-native-reanimated/docs/fundamentals/installation#babel-plugin.'
);
Expand Down