Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions packages/app/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,10 @@ android {
"src/reactactivitydelegate-0.75/java",
"src/reactapplication-0.76/java",
"src/reacthost-0.76/java",

reactNativeVersion >= v(0, 82, 0)
? "src/reactsurface-0.82/java"
: "src/reactsurface-old/java"
]
}

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
package com.microsoft.reacttestapp.component

import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import com.facebook.react.ReactActivity
import com.facebook.react.ReactRootView
import com.facebook.react.interfaces.fabric.ReactSurface
import com.google.android.material.bottomsheet.BottomSheetDialogFragment
import com.microsoft.reacttestapp.TestApp

class ComponentBottomSheetDialogFragment : BottomSheetDialogFragment() {

companion object {
const val TAG = "ReactComponentBottomSheetDialog"

private const val DISPLAY_NAME = "displayName"
private const val INITIAL_PROPERTIES = "initialProperties"
private const val NAME = "name"

fun newInstance(component: ComponentViewModel): ComponentBottomSheetDialogFragment {
val args = Bundle()
args.putString(NAME, component.name)
args.putString(DISPLAY_NAME, component.displayName)
args.putBundle(INITIAL_PROPERTIES, component.initialProperties)

val fragment = ComponentBottomSheetDialogFragment()
fragment.arguments = args
return fragment
}
}

private var surface: ReactSurface? = null

override fun onCreateView(
inflater: LayoutInflater,
container: ViewGroup?,
savedInstanceState: Bundle?
): View {
val activity = requireActivity() as ReactActivity
val application = activity.application as TestApp
val surface = application.reactHost.createSurface(
activity,
requireNotNull(requireArguments().getString(NAME)),
requireArguments().getBundle(INITIAL_PROPERTIES)
)
this.surface = requireNotNull(surface)
surface.start()
return surface.view as View
}
}
3 changes: 2 additions & 1 deletion packages/app/test/pack.test.mts
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ describe("npm pack", () => {
"android/app/src/main/java/com/microsoft/reacttestapp/MainActivity.kt",
"android/app/src/main/java/com/microsoft/reacttestapp/Session.kt",
"android/app/src/main/java/com/microsoft/reacttestapp/component/ComponentActivity.kt",
"android/app/src/main/java/com/microsoft/reacttestapp/component/ComponentBottomSheetDialogFragment.kt",
"android/app/src/main/java/com/microsoft/reacttestapp/component/ComponentListAdapter.kt",
"android/app/src/main/java/com/microsoft/reacttestapp/component/ComponentViewModel.kt",
"android/app/src/main/java/com/microsoft/reacttestapp/manifest/Manifest.kt",
Expand Down Expand Up @@ -88,6 +87,8 @@ describe("npm pack", () => {
"android/app/src/reactactivitydelegate-0.75/java/com/microsoft/reacttestapp/component/ComponentActivityDelegate.kt",
"android/app/src/reactapplication-0.76/java/com/microsoft/reacttestapp/TestApp.kt",
"android/app/src/reacthost-0.76/java/com/microsoft/reacttetapp/react/MainReactNativeHost.kt",
"android/app/src/reactsurface-0.82/java/com/microsoft/reacttestapp/component/ComponentBottomSheetDialogFragment.kt",
"android/app/src/reactsurface-old/java/com/microsoft/reacttestapp/component/ComponentBottomSheetDialogFragment.kt",
"android/autolink.gradle",
"android/autolink.mjs",
"android/config-plugins.gradle",
Expand Down
Loading