mirror of
https://github.com/facebook/react-native.git
synced 2025-11-01 09:14:26 +00:00
Revert D25746024: Refactor initialization of Fabric to avoid loading UIManagerModule
Differential Revision: D25746024 (https://github.com/facebook/react-native/commit/d3a3ce857ef5a54e7014e06af194b596ec18a03e) Original commit changeset: 3d12d29973a1 fbshipit-source-id: 67a7f045e5c6b1bc0201ad58b569fc870c3a89f9
This commit is contained in:
committed by
Facebook GitHub Bot
parent
6651b7c59b
commit
2027d6236a
@@ -8,6 +8,7 @@
|
||||
package com.facebook.react.fabric;
|
||||
|
||||
import androidx.annotation.NonNull;
|
||||
import com.facebook.infer.annotation.Assertions;
|
||||
import com.facebook.react.bridge.JSIModuleProvider;
|
||||
import com.facebook.react.bridge.ReactApplicationContext;
|
||||
import com.facebook.react.bridge.UIManager;
|
||||
@@ -25,10 +26,9 @@ import com.facebook.react.fabric.mounting.mountitems.MountItem;
|
||||
import com.facebook.react.fabric.mounting.mountitems.PreAllocateViewMountItem;
|
||||
import com.facebook.react.fabric.mounting.mountitems.SendAccessibilityEvent;
|
||||
import com.facebook.react.uimanager.StateWrapper;
|
||||
import com.facebook.react.uimanager.ViewManagerRegistry;
|
||||
import com.facebook.react.uimanager.UIManagerModule;
|
||||
import com.facebook.react.uimanager.events.BatchEventDispatchedListener;
|
||||
import com.facebook.react.uimanager.events.EventDispatcher;
|
||||
import com.facebook.react.uimanager.events.EventDispatcherImpl;
|
||||
import com.facebook.systrace.Systrace;
|
||||
|
||||
public class FabricJSIModuleProvider implements JSIModuleProvider<UIManager> {
|
||||
@@ -36,17 +36,14 @@ public class FabricJSIModuleProvider implements JSIModuleProvider<UIManager> {
|
||||
@NonNull private final ReactApplicationContext mReactApplicationContext;
|
||||
@NonNull private final ComponentFactory mComponentFactory;
|
||||
@NonNull private final ReactNativeConfig mConfig;
|
||||
@NonNull private final ViewManagerRegistry mViewManagerRegistry;
|
||||
|
||||
public FabricJSIModuleProvider(
|
||||
@NonNull ReactApplicationContext reactApplicationContext,
|
||||
@NonNull ComponentFactory componentFactory,
|
||||
@NonNull ReactNativeConfig config,
|
||||
@NonNull ViewManagerRegistry viewManagerRegistry) {
|
||||
@NonNull ReactNativeConfig config) {
|
||||
mReactApplicationContext = reactApplicationContext;
|
||||
mComponentFactory = componentFactory;
|
||||
mConfig = config;
|
||||
mViewManagerRegistry = viewManagerRegistry;
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -82,10 +79,15 @@ public class FabricJSIModuleProvider implements JSIModuleProvider<UIManager> {
|
||||
private FabricUIManager createUIManager(@NonNull EventBeatManager eventBeatManager) {
|
||||
Systrace.beginSection(
|
||||
Systrace.TRACE_TAG_REACT_JAVA_BRIDGE, "FabricJSIModuleProvider.createUIManager");
|
||||
EventDispatcher eventDispatcher = new EventDispatcherImpl(mReactApplicationContext);
|
||||
UIManagerModule nativeModule =
|
||||
Assertions.assertNotNull(mReactApplicationContext.getNativeModule(UIManagerModule.class));
|
||||
EventDispatcher eventDispatcher = nativeModule.getEventDispatcher();
|
||||
FabricUIManager fabricUIManager =
|
||||
new FabricUIManager(
|
||||
mReactApplicationContext, mViewManagerRegistry, eventDispatcher, eventBeatManager);
|
||||
mReactApplicationContext,
|
||||
nativeModule.getViewManagerRegistry_DO_NOT_USE(),
|
||||
eventDispatcher,
|
||||
eventBeatManager);
|
||||
|
||||
Systrace.endSection(Systrace.TRACE_TAG_REACT_JAVA_BRIDGE);
|
||||
return fabricUIManager;
|
||||
|
||||
Reference in New Issue
Block a user