Skip to content

Decouple TimerExecutor creation from ReactInstance #53569

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

Closed
wants to merge 1 commit into from
Closed

Decouple TimerExecutor creation from ReactInstance #53569

Show file tree
Hide file tree
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
13 changes: 9 additions & 4 deletions ...ges/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/JSTimerExecutor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,20 @@

package com.facebook.react.runtime

import com.facebook.jni.HybridData
import com.facebook.jni.annotations.DoNotStripAny
import com.facebook.jni.HybridClassBase
import com.facebook.jni.annotations.DoNotStrip
import com.facebook.react.bridge.WritableArray
import com.facebook.react.bridge.WritableNativeArray
import com.facebook.react.modules.core.JavaScriptTimerExecutor
import com.facebook.soloader.SoLoader

@DoNotStripAny
internal class JSTimerExecutor(private val mHybridData: HybridData) : JavaScriptTimerExecutor {
@DoNotStrip
internal class JSTimerExecutor() : HybridClassBase(), JavaScriptTimerExecutor {
init {
initHybrid()
}

private external fun initHybrid()

private external fun callTimers(timerIDs: WritableNativeArray)

Expand Down
6 changes: 1 addition & 5 deletions packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactInstance.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ import java.util.ArrayList
import java.util.HashMap
import java.util.HashSet
import kotlin.collections.Collection
import kotlin.jvm.JvmStatic

/**
* A replacement for [com.facebook.react.bridge.CatalystInstance] responsible for creating and
Expand Down Expand Up @@ -126,7 +125,7 @@ internal class ReactInstance(
ReactChoreographer.initialize(AndroidChoreographerProvider.getInstance())
devSupportManager.startInspector()

val jsTimerExecutor = createJSTimerExecutor()
val jsTimerExecutor = JSTimerExecutor()
javaTimerManager =
JavaTimerManager(
context,
Expand Down Expand Up @@ -182,7 +181,6 @@ internal class ReactInstance(
getJSCallInvokerHolder(),
getNativeMethodCallInvokerHolder(),
)

Systrace.endSection(Systrace.TRACE_TAG_REACT)

// Set up Fabric
Expand Down Expand Up @@ -633,7 +631,5 @@ internal class ReactInstance(
SystraceMessage.endSection(Systrace.TRACE_TAG_REACT).flush()
}
}

@JvmStatic @DoNotStrip private external fun createJSTimerExecutor(): JSTimerExecutor
}
}
6 changes: 6 additions & 0 deletions packages/react-native/ReactAndroid/src/main/jni/react/runtime/jni/JJSTimerExecutor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,11 @@

namespace facebook::react {

void JJSTimerExecutor::initHybrid(
jni::alias_ref<JJSTimerExecutor::jhybridobject> jobj) {
setCxxInstance(jobj);
}

void JJSTimerExecutor::setTimerManager(
std::weak_ptr<TimerManager> timerManager) {
timerManager_ = timerManager;
Expand All @@ -28,6 +33,7 @@ void JJSTimerExecutor::callTimers(WritableNativeArray* timerIDs) {
void JJSTimerExecutor::registerNatives() {
registerHybrid({
makeNativeMethod("callTimers", JJSTimerExecutor::callTimers),
makeNativeMethod("initHybrid", JJSTimerExecutor::initHybrid),
});
}

Expand Down
6 changes: 4 additions & 2 deletions packages/react-native/ReactAndroid/src/main/jni/react/runtime/jni/JJSTimerExecutor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,20 @@ namespace facebook::react {

class JJSTimerExecutor : public jni::HybridClass<JJSTimerExecutor> {
public:
JJSTimerExecutor() = default;

constexpr static auto kJavaDescriptor =
"Lcom/facebook/react/runtime/JSTimerExecutor;";

static void registerNatives();

static void initHybrid(jni::alias_ref<jhybridobject> jobj);

void setTimerManager(std::weak_ptr<TimerManager> timerManager);

void callTimers(WritableNativeArray* timerIDs);

private:
JJSTimerExecutor() = default;

friend HybridBase;

std::weak_ptr<TimerManager> timerManager_;
Expand Down
8 changes: 0 additions & 8 deletions packages/react-native/ReactAndroid/src/main/jni/react/runtime/jni/JReactInstance.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,12 +168,6 @@ JReactInstance::getNativeMethodCallInvokerHolder() {
return nativeMethodCallInvokerHolder_;
}

jni::global_ref<JJSTimerExecutor::javaobject>
JReactInstance::createJSTimerExecutor(
jni::alias_ref<jhybridobject> /* unused */) {
return jni::make_global(JJSTimerExecutor::newObjectCxxArgs());
}

void JReactInstance::callFunctionOnModule(
const std::string& moduleName,
const std::string& methodName,
Expand Down Expand Up @@ -217,8 +211,6 @@ void JReactInstance::unregisterFromInspector() {
void JReactInstance::registerNatives() {
registerHybrid({
makeNativeMethod("initHybrid", JReactInstance::initHybrid),
makeNativeMethod(
"createJSTimerExecutor", JReactInstance::createJSTimerExecutor),
makeNativeMethod(
"loadJSBundleFromAssets", JReactInstance::loadJSBundleFromAssets),
makeNativeMethod(
Expand Down
6 changes: 0 additions & 6 deletions packages/react-native/ReactAndroid/src/main/jni/react/runtime/jni/JReactInstance.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,6 @@ class JReactInstance : public jni::HybridClass<JReactInstance> {
jni::alias_ref<JReactHostInspectorTarget::javaobject>
jReactHostInspectorTarget);

/*
* Instantiates and returns an instance of `JSTimerExecutor`.
*/
static jni::global_ref<JJSTimerExecutor::javaobject> createJSTimerExecutor(
jni::alias_ref<jhybridobject> /* unused */);

static void registerNatives();

void loadJSBundleFromAssets(
Expand Down
Loading