diff --git a/RNTester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterApplication.java b/RNTester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterApplication.java index 7ed10e4abb1..2e3b26667bc 100644 --- a/RNTester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterApplication.java +++ b/RNTester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterApplication.java @@ -25,7 +25,6 @@ import com.facebook.react.bridge.JavaScriptContextHolder; import com.facebook.react.bridge.ReactApplicationContext; import com.facebook.react.bridge.UIManager; import com.facebook.react.fabric.ComponentFactory; -import com.facebook.react.fabric.CoreComponentsRegistry; import com.facebook.react.fabric.FabricJSIModuleProvider; import com.facebook.react.fabric.ReactNativeConfig; import com.facebook.react.shell.MainReactPackage; @@ -85,7 +84,8 @@ public class RNTesterApplication extends Application implements ReactApplication @Override public JSIModuleProvider getJSIModuleProvider() { ComponentFactory ComponentFactory = new ComponentFactory(); - CoreComponentsRegistry.register(ComponentFactory); + // TODO: T71642450 Register CoreComponentsRegistry again + // CoreComponentsRegistry.register(ComponentFactory); return new FabricJSIModuleProvider( reactApplicationContext, ComponentFactory, diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/ComponentRegistry.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/ComponentRegistry.java deleted file mode 100644 index 07357bc3084..00000000000 --- a/ReactAndroid/src/main/java/com/facebook/react/fabric/ComponentRegistry.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright (c) Facebook, Inc. and its affiliates. - * - * This source code is licensed under the MIT license found in the - * LICENSE file in the root directory of this source tree. - */ - -package com.facebook.react.fabric; - -import com.facebook.jni.HybridData; -import com.facebook.proguard.annotations.DoNotStrip; - -/** - * This class is responsible for registrering a set of RN Android view managers into a {@link - * ComponentFactory}. - */ -public class ComponentRegistry { - - @DoNotStrip private final HybridData mHybridData; - - @DoNotStrip - private native HybridData initHybrid(ComponentFactory componentFactory); - - public ComponentRegistry(ComponentFactory componentFactory) { - mHybridData = initHybrid(componentFactory); - } -} diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/CoreComponentsRegistry.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/CoreComponentsRegistry.java deleted file mode 100644 index 66461d37ca1..00000000000 --- a/ReactAndroid/src/main/java/com/facebook/react/fabric/CoreComponentsRegistry.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright (c) Facebook, Inc. and its affiliates. - * - * This source code is licensed under the MIT license found in the - * LICENSE file in the root directory of this source tree. - */ - -package com.facebook.react.fabric; - -import com.facebook.jni.HybridData; -import com.facebook.proguard.annotations.DoNotStrip; - -@DoNotStrip -public class CoreComponentsRegistry extends ComponentRegistry { - - static { - FabricSoLoader.staticInit(); - } - - @DoNotStrip - private static native HybridData initHybrid(); - - @DoNotStrip - private CoreComponentsRegistry(ComponentFactory componentFactory) { - super(componentFactory); - } - - @DoNotStrip - public static CoreComponentsRegistry register(ComponentFactory componentFactory) { - return new CoreComponentsRegistry(componentFactory); - } -} diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/CoreComponentsRegistry.cpp b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/CoreComponentsRegistry.cpp deleted file mode 100644 index 962facf0eb4..00000000000 --- a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/CoreComponentsRegistry.cpp +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright (c) Facebook, Inc. and its affiliates. - * - * This source code is licensed under the MIT license found in the - * LICENSE file in the root directory of this source tree. - */ - -#include "CoreComponentsRegistry.h" - -#include - -#include - -#include -#include - -namespace facebook { -namespace react { - -CoreComponentsRegistry::CoreComponentsRegistry(ComponentFactory *delegate) - : delegate_(delegate) {} - -std::shared_ptr -CoreComponentsRegistry::sharedProviderRegistry() { - static auto providerRegistry = - []() -> std::shared_ptr { - auto providerRegistry = - std::make_shared(); - - providerRegistry->add( - concreteComponentDescriptorProvider()); - return providerRegistry; - }(); - - return providerRegistry; -} - -jni::local_ref -CoreComponentsRegistry::initHybrid( - jni::alias_ref, - ComponentFactory *delegate) { - auto instance = makeCxxInstance(delegate); - - auto buildRegistryFunction = - [](EventDispatcher::Weak const &eventDispatcher, - ContextContainer::Shared const &contextContainer) - -> ComponentDescriptorRegistry::Shared { - auto registry = CoreComponentsRegistry::sharedProviderRegistry() - ->createComponentDescriptorRegistry( - {eventDispatcher, contextContainer}); - return registry; - }; - - delegate->buildRegistryFunction = buildRegistryFunction; - return instance; -} - -void CoreComponentsRegistry::registerNatives() { - registerHybrid({ - makeNativeMethod("initHybrid", CoreComponentsRegistry::initHybrid), - }); -} - -} // namespace react -} // namespace facebook diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/CoreComponentsRegistry.h b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/CoreComponentsRegistry.h deleted file mode 100644 index 255a51a12f9..00000000000 --- a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/CoreComponentsRegistry.h +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (c) Facebook, Inc. and its affiliates. - * - * This source code is licensed under the MIT license found in the - * LICENSE file in the root directory of this source tree. - */ - -#pragma once - -#include -#include -#include -#include "ComponentFactory.h" - -namespace facebook { -namespace react { - -class CoreComponentsRegistry - : public facebook::jni::HybridClass { - public: - constexpr static auto kJavaDescriptor = - "Lcom/facebook/react/fabric/CoreComponentsRegistry;"; - - static void registerNatives(); - - CoreComponentsRegistry(ComponentFactory *delegate); - - private: - friend HybridBase; - - static std::shared_ptr - sharedProviderRegistry(); - - const ComponentFactory *delegate_; - - static jni::local_ref initHybrid( - jni::alias_ref, - ComponentFactory *delegate); -}; - -} // namespace react -} // namespace facebook diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/OnLoad.cpp b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/OnLoad.cpp index 03005372a65..7d6008ccd04 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/OnLoad.cpp +++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/OnLoad.cpp @@ -9,7 +9,6 @@ #include "Binding.h" #include "ComponentFactory.h" -#include "CoreComponentsRegistry.h" #include "EventBeatManager.h" #include "EventEmitterWrapper.h" #include "StateWrapperImpl.h" @@ -21,6 +20,5 @@ JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *) { facebook::react::EventEmitterWrapper::registerNatives(); facebook::react::StateWrapperImpl::registerNatives(); facebook::react::ComponentFactory::registerNatives(); - facebook::react::CoreComponentsRegistry::registerNatives(); }); }