diff --git a/Libraries/ReactNative/AppContainer.js b/Libraries/ReactNative/AppContainer.js index 2024b4cee44b35..23da450a3108e7 100644 --- a/Libraries/ReactNative/AppContainer.js +++ b/Libraries/ReactNative/AppContainer.js @@ -19,6 +19,7 @@ import * as React from 'react'; type Props = $ReadOnly<{| children?: React.Node, fabric?: boolean, + useConcurrentRoot?: boolean, rootTag: number | RootTag, initialProps?: {...}, showArchitectureIndicator?: boolean, diff --git a/Libraries/ReactNative/AppRegistry.js b/Libraries/ReactNative/AppRegistry.js index 0bb8a8658f7ef0..65de45fb809d65 100644 --- a/Libraries/ReactNative/AppRegistry.js +++ b/Libraries/ReactNative/AppRegistry.js @@ -128,6 +128,7 @@ const AppRegistry = { appKey === 'LogBox', appKey, coerceDisplayMode(displayMode), + appParameters.concurrentRoot, ); }, }; diff --git a/Libraries/ReactNative/renderApplication.js b/Libraries/ReactNative/renderApplication.js index 5278769cd3fd71..72933a59ef600c 100644 --- a/Libraries/ReactNative/renderApplication.js +++ b/Libraries/ReactNative/renderApplication.js @@ -32,6 +32,7 @@ function renderApplication( isLogBox?: boolean, debugName?: string, displayMode?: ?DisplayModeType, + useConcurrentRoot?: boolean, ) { invariant(rootTag, 'Expect to have a valid rootTag, instead got ', rootTag); @@ -64,9 +65,13 @@ function renderApplication( performanceLogger.startTimespan('renderApplication_React_render'); performanceLogger.setExtra('usedReactFabric', fabric ? '1' : '0'); - if (fabric) { - require('../Renderer/shims/ReactFabric').render(renderable, rootTag); + require('../Renderer/shims/ReactFabric').render( + renderable, + rootTag, + null, + useConcurrentRoot, + ); } else { require('../Renderer/shims/ReactNative').render(renderable, rootTag); } diff --git a/packages/rn-tester/android/app/build.gradle b/packages/rn-tester/android/app/build.gradle index 3d986ef3b94694..6597a0ecdf0f4b 100644 --- a/packages/rn-tester/android/app/build.gradle +++ b/packages/rn-tester/android/app/build.gradle @@ -213,7 +213,6 @@ dependencies { hermesDebugImplementation files(hermesPath + "hermes-debug.aar") hermesReleaseImplementation files(hermesPath + "hermes-release.aar") - debugImplementation("com.facebook.fresco:stetho:2.3.0") debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}") { exclude group:'com.facebook.fbjni' } @@ -224,7 +223,6 @@ dependencies { debugImplementation("com.facebook.flipper:flipper-fresco-plugin:${FLIPPER_VERSION}") { exclude group:'com.facebook.flipper' - exclude group:'com.facebook.fresco', module:'stetho' } if (useIntlJsc) { diff --git a/packages/rn-tester/android/app/gradle.properties b/packages/rn-tester/android/app/gradle.properties index 9eea6a6e70f5db..0a1df11bf24caa 100644 --- a/packages/rn-tester/android/app/gradle.properties +++ b/packages/rn-tester/android/app/gradle.properties @@ -10,4 +10,4 @@ android.useAndroidX=true android.enableJetifier=true # Version of flipper SDK to use with React Native -FLIPPER_VERSION=0.75.1 +FLIPPER_VERSION=0.93.0 diff --git a/template/android/app/build.gradle b/template/android/app/build.gradle index 03c69565e96a06..3e76ea0e075e8b 100644 --- a/template/android/app/build.gradle +++ b/template/android/app/build.gradle @@ -185,7 +185,6 @@ dependencies { implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0" - debugImplementation("com.facebook.fresco:stetho:2.3.0") debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}") { exclude group:'com.facebook.fbjni' } @@ -197,7 +196,6 @@ dependencies { debugImplementation("com.facebook.flipper:flipper-fresco-plugin:${FLIPPER_VERSION}") { exclude group:'com.facebook.flipper' - exclude group:'com.facebook.fresco', module:'stetho' } if (enableHermes) { diff --git a/template/android/gradle.properties b/template/android/gradle.properties index d21d03f2b414a0..dbcbe6f208aee8 100644 --- a/template/android/gradle.properties +++ b/template/android/gradle.properties @@ -25,4 +25,4 @@ android.useAndroidX=true android.enableJetifier=true # Version of flipper SDK to use with React Native -FLIPPER_VERSION=0.75.1 +FLIPPER_VERSION=0.93.0