mirror of
https://github.com/zhigang1992/react-native.git
synced 2026-04-10 22:47:58 +08:00
Remove UIImplementationProvider class and refactor UIManagerModule
Summary:
@public
This diff deprecates and deletes the UIImplementationProvider class.
It is not required to create an UIImplementation provider anymore, from now on the UIImplementation is created inside the UIManagerModule.
If you are using the UIImplementationProvider to create a ReactInstanceManager
e.g.:
```
ReactInstanceManager =
getReactInstanceManagerBuilder()
...
.setUIImplementationProvider(...)
...
.build();
```
Then you should just remove that line:
```
ReactInstanceManager =
getReactInstanceManagerBuilder()
.set.....
.build();
```
Reviewed By: achen1
Differential Revision: D8650376
fbshipit-source-id: 8d883295d8bf6578a99685edf6a2a84c6d0df0cf
This commit is contained in:
committed by
Facebook Github Bot
parent
a373bf705d
commit
506f920838
@@ -37,11 +37,10 @@ import com.facebook.react.modules.core.PermissionListener;
|
||||
import com.facebook.react.shell.MainReactPackage;
|
||||
import com.facebook.react.testing.idledetection.ReactBridgeIdleSignaler;
|
||||
import com.facebook.react.testing.idledetection.ReactIdleDetectionUtil;
|
||||
import com.facebook.react.uimanager.events.EventDispatcher;
|
||||
import com.facebook.react.uimanager.UIImplementationProvider;
|
||||
import com.facebook.react.uimanager.UIManagerModule;
|
||||
import com.facebook.react.uimanager.ViewManager;
|
||||
import com.facebook.react.uimanager.ViewManagerRegistry;
|
||||
import com.facebook.react.uimanager.events.EventDispatcher;
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
import java.util.concurrent.CountDownLatch;
|
||||
@@ -139,16 +138,11 @@ public class ReactAppTestActivity extends FragmentActivity
|
||||
loadApp(appKey, spec, null, DEFAULT_BUNDLE_NAME, enableDevSupport);
|
||||
}
|
||||
|
||||
public void loadApp(String appKey, ReactInstanceSpecForTest spec, String bundleName) {
|
||||
loadApp(appKey, spec, null, bundleName, false /* = useDevSupport */);
|
||||
}
|
||||
|
||||
public void loadApp(
|
||||
String appKey,
|
||||
ReactInstanceSpecForTest spec,
|
||||
String bundleName,
|
||||
UIImplementationProvider uiImplementationProvider) {
|
||||
loadApp(appKey, spec, null, bundleName, false /* = useDevSupport */, uiImplementationProvider);
|
||||
String bundleName) {
|
||||
loadApp(appKey, spec, null, bundleName, false /* = useDevSupport */);
|
||||
}
|
||||
|
||||
public void resetRootViewForScreenshotTests() {
|
||||
@@ -165,23 +159,13 @@ public class ReactAppTestActivity extends FragmentActivity
|
||||
mScreenshotingFrameLayout.addView(mReactRootView);
|
||||
}
|
||||
|
||||
public void loadApp(
|
||||
String appKey,
|
||||
ReactInstanceSpecForTest spec,
|
||||
@Nullable Bundle initialProps,
|
||||
String bundleName,
|
||||
boolean useDevSupport) {
|
||||
loadApp(appKey, spec, initialProps, bundleName, useDevSupport, null);
|
||||
}
|
||||
|
||||
public void loadApp(
|
||||
String appKey,
|
||||
ReactInstanceSpecForTest spec,
|
||||
@Nullable Bundle initialProps,
|
||||
String bundleName,
|
||||
boolean useDevSupport,
|
||||
UIImplementationProvider uiImplementationProvider) {
|
||||
loadBundle(spec, bundleName, useDevSupport, uiImplementationProvider);
|
||||
boolean useDevSupport) {
|
||||
loadBundle(spec, bundleName, useDevSupport);
|
||||
renderComponent(appKey, initialProps);
|
||||
}
|
||||
|
||||
@@ -217,14 +201,6 @@ public class ReactAppTestActivity extends FragmentActivity
|
||||
ReactInstanceSpecForTest spec,
|
||||
String bundleName,
|
||||
boolean useDevSupport) {
|
||||
loadBundle(spec, bundleName, useDevSupport, null);
|
||||
}
|
||||
|
||||
public void loadBundle(
|
||||
ReactInstanceSpecForTest spec,
|
||||
String bundleName,
|
||||
boolean useDevSupport,
|
||||
UIImplementationProvider uiImplementationProvider) {
|
||||
|
||||
mBridgeIdleSignaler = new ReactBridgeIdleSignaler();
|
||||
|
||||
@@ -277,8 +253,7 @@ public class ReactAppTestActivity extends FragmentActivity
|
||||
};
|
||||
}
|
||||
});
|
||||
}})
|
||||
.setUIImplementationProvider(uiImplementationProvider);
|
||||
}});
|
||||
|
||||
final CountDownLatch latch = new CountDownLatch(1);
|
||||
runOnUiThread(new Runnable() {
|
||||
|
||||
@@ -29,7 +29,6 @@ import com.facebook.react.modules.systeminfo.AndroidInfoModule;
|
||||
import com.facebook.react.testing.FakeWebSocketModule;
|
||||
import com.facebook.react.testing.ReactIntegrationTestCase;
|
||||
import com.facebook.react.testing.ReactTestHelper;
|
||||
import com.facebook.react.uimanager.UIImplementationProvider;
|
||||
import com.facebook.react.uimanager.UIManagerModule;
|
||||
import com.facebook.react.uimanager.ViewManager;
|
||||
import com.facebook.react.views.view.ReactViewManager;
|
||||
@@ -85,7 +84,7 @@ public class CatalystNativeJSToJavaParametersTestCase extends ReactIntegrationTe
|
||||
List<ViewManager> viewManagers = Arrays.<ViewManager>asList(
|
||||
new ReactViewManager());
|
||||
final UIManagerModule mUIManager =
|
||||
new UIManagerModule(getContext(), viewManagers, new UIImplementationProvider(), 0);
|
||||
new UIManagerModule(getContext(), viewManagers, 0);
|
||||
UiThreadUtil.runOnUiThread(
|
||||
new Runnable() {
|
||||
@Override
|
||||
|
||||
@@ -21,7 +21,6 @@ import com.facebook.react.testing.AssertModule;
|
||||
import com.facebook.react.testing.FakeWebSocketModule;
|
||||
import com.facebook.react.testing.ReactIntegrationTestCase;
|
||||
import com.facebook.react.testing.ReactTestHelper;
|
||||
import com.facebook.react.uimanager.UIImplementationProvider;
|
||||
import com.facebook.react.uimanager.UIManagerModule;
|
||||
import com.facebook.react.uimanager.ViewManager;
|
||||
import com.facebook.react.views.view.ReactViewManager;
|
||||
@@ -62,7 +61,7 @@ public class CatalystNativeJavaToJSArgumentsTestCase extends ReactIntegrationTes
|
||||
List<ViewManager> viewManagers = Arrays.<ViewManager>asList(
|
||||
new ReactViewManager());
|
||||
final UIManagerModule mUIManager =
|
||||
new UIManagerModule(getContext(), viewManagers, new UIImplementationProvider(), 0);
|
||||
new UIManagerModule(getContext(), viewManagers, 0);
|
||||
UiThreadUtil.runOnUiThread(
|
||||
new Runnable() {
|
||||
@Override
|
||||
|
||||
@@ -22,7 +22,6 @@ import com.facebook.react.testing.AssertModule;
|
||||
import com.facebook.react.testing.FakeWebSocketModule;
|
||||
import com.facebook.react.testing.ReactIntegrationTestCase;
|
||||
import com.facebook.react.testing.ReactTestHelper;
|
||||
import com.facebook.react.uimanager.UIImplementationProvider;
|
||||
import com.facebook.react.uimanager.UIManagerModule;
|
||||
import com.facebook.react.uimanager.ViewManager;
|
||||
import java.util.ArrayList;
|
||||
@@ -112,7 +111,7 @@ public class CatalystNativeJavaToJSReturnValuesTestCase extends ReactIntegration
|
||||
|
||||
final UIManagerModule mUIManager =
|
||||
new UIManagerModule(
|
||||
getContext(), new ArrayList<ViewManager>(), new UIImplementationProvider(), 0);
|
||||
getContext(), new ArrayList<ViewManager>(), 0);
|
||||
|
||||
mAssertModule = new AssertModule();
|
||||
|
||||
|
||||
@@ -22,7 +22,6 @@ import com.facebook.react.testing.FakeWebSocketModule;
|
||||
import com.facebook.react.testing.ReactIntegrationTestCase;
|
||||
import com.facebook.react.testing.ReactTestHelper;
|
||||
import com.facebook.react.uimanager.PixelUtil;
|
||||
import com.facebook.react.uimanager.UIImplementationProvider;
|
||||
import com.facebook.react.uimanager.UIManagerModule;
|
||||
import com.facebook.react.uimanager.ViewManager;
|
||||
import com.facebook.react.views.text.ReactRawTextManager;
|
||||
@@ -77,7 +76,7 @@ public class CatalystUIManagerTestCase extends ReactIntegrationTestCase {
|
||||
new ReactTextViewManager(),
|
||||
new ReactRawTextManager());
|
||||
uiManager =
|
||||
new UIManagerModule(getContext(), viewManagers, new UIImplementationProvider(), 0);
|
||||
new UIManagerModule(getContext(), viewManagers, 0);
|
||||
UiThreadUtil.runOnUiThread(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
|
||||
@@ -7,22 +7,20 @@
|
||||
|
||||
package com.facebook.react.tests;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
|
||||
import com.facebook.react.testing.FakeWebSocketModule;
|
||||
import com.facebook.react.testing.ReactIntegrationTestCase;
|
||||
import com.facebook.react.testing.ReactTestHelper;
|
||||
import com.facebook.react.testing.StringRecordingModule;
|
||||
import com.facebook.react.bridge.CatalystInstance;
|
||||
import com.facebook.react.bridge.JavaScriptModule;
|
||||
import com.facebook.react.bridge.UiThreadUtil;
|
||||
import com.facebook.react.modules.appstate.AppStateModule;
|
||||
import com.facebook.react.modules.deviceinfo.DeviceInfoModule;
|
||||
import com.facebook.react.uimanager.UIImplementationProvider;
|
||||
import com.facebook.react.testing.FakeWebSocketModule;
|
||||
import com.facebook.react.testing.ReactIntegrationTestCase;
|
||||
import com.facebook.react.testing.ReactTestHelper;
|
||||
import com.facebook.react.testing.StringRecordingModule;
|
||||
import com.facebook.react.uimanager.UIManagerModule;
|
||||
import com.facebook.react.uimanager.ViewManager;
|
||||
import com.facebook.react.views.view.ReactViewManager;
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* Test locale-based functionality of JS VM
|
||||
@@ -47,7 +45,6 @@ public class JSLocaleTest extends ReactIntegrationTestCase {
|
||||
final UIManagerModule mUIManager = new UIManagerModule(
|
||||
getContext(),
|
||||
viewManagers,
|
||||
new UIImplementationProvider(),
|
||||
0);
|
||||
UiThreadUtil.runOnUiThread(
|
||||
new Runnable() {
|
||||
|
||||
@@ -24,7 +24,6 @@ import com.facebook.react.modules.systeminfo.AndroidInfoModule;
|
||||
import com.facebook.react.testing.FakeWebSocketModule;
|
||||
import com.facebook.react.testing.ReactIntegrationTestCase;
|
||||
import com.facebook.react.testing.ReactTestHelper;
|
||||
import com.facebook.react.uimanager.UIImplementationProvider;
|
||||
import com.facebook.react.uimanager.UIManagerModule;
|
||||
import com.facebook.react.uimanager.ViewManager;
|
||||
import com.facebook.react.views.progressbar.ReactProgressBarViewManager;
|
||||
@@ -68,7 +67,7 @@ public class ProgressBarTestCase extends ReactIntegrationTestCase {
|
||||
new ReactViewManager(),
|
||||
new ReactProgressBarViewManager());
|
||||
mUIManager =
|
||||
new UIManagerModule(getContext(), viewManagers, new UIImplementationProvider(), 0);
|
||||
new UIManagerModule(getContext(), viewManagers, 0);
|
||||
UiThreadUtil.runOnUiThread(
|
||||
new Runnable() {
|
||||
@Override
|
||||
|
||||
@@ -21,7 +21,6 @@ import com.facebook.react.testing.FakeWebSocketModule;
|
||||
import com.facebook.react.testing.ReactIntegrationTestCase;
|
||||
import com.facebook.react.testing.ReactTestHelper;
|
||||
import com.facebook.react.uimanager.PixelUtil;
|
||||
import com.facebook.react.uimanager.UIImplementationProvider;
|
||||
import com.facebook.react.uimanager.UIManagerModule;
|
||||
import com.facebook.react.uimanager.ViewManager;
|
||||
import com.facebook.react.views.view.ReactViewGroup;
|
||||
@@ -49,7 +48,7 @@ public class ViewRenderingTestCase extends ReactIntegrationTestCase {
|
||||
|
||||
List<ViewManager> viewManagers = Arrays.<ViewManager>asList(new ReactViewManager());
|
||||
final UIManagerModule uiManager =
|
||||
new UIManagerModule(getContext(), viewManagers, new UIImplementationProvider(), 0);
|
||||
new UIManagerModule(getContext(), viewManagers, 0);
|
||||
UiThreadUtil.runOnUiThread(
|
||||
new Runnable() {
|
||||
@Override
|
||||
|
||||
Reference in New Issue
Block a user