Merge pull request #3 from callstack-internal/initial-props

dratwas · web-flow · commit 75e9cb5e0ebc · 2019-07-19T16:48:58.000+02:00
Add support for initial props + remove Java Proxy.
diff --git a/android/src/main/java/com/callstack/reactnativebrownfield/BridgeManager.kt b/android/src/main/java/com/callstack/reactnativebrownfield/BridgeManager.kt
@@ -6,20 +6,27 @@ import com.facebook.react.ReactPackage
 import com.facebook.soloader.SoLoader
 import java.util.concurrent.atomic.AtomicBoolean
 
+interface InitializedCallback {
+  operator fun invoke(initialized: Boolean)
+}
+
 class BridgeManager private constructor(val reactNativeHost: ReactNativeHost) {
   companion object {
     private lateinit var instance: BridgeManager
     private val initialized = AtomicBoolean()
 
+    @JvmStatic
     val shared: BridgeManager get() = instance
 
+    @JvmStatic
     fun initialize(rnHost: ReactNativeHost, application: Application) {
       if(!initialized.getAndSet(true)) {
         instance = BridgeManager(rnHost)
         SoLoader.init(application.applicationContext,false)
       }
     }
 
+    @JvmStatic
     fun initialize(options: HashMap<String, Any>, application: Application) {
       val rnHost = object : ReactNativeHost(application) {
         override fun getUseDeveloperSupport(): Boolean {
@@ -39,17 +46,22 @@ class BridgeManager private constructor(val reactNativeHost: ReactNativeHost) {
       initialize(rnHost, application)
     }
 
+    @JvmStatic
     fun initialize(packages: List<ReactPackage>, application: Application) {
       val options = hashMapOf("packages" to packages, "mainModuleName" to "index")
 
       initialize(options, application)
     }
   }
 
+  fun startReactNative(callback: InitializedCallback?) {
+    startReactNative { callback?.invoke(it) }
+  }
 
-  fun startReactNative(listener: ((initialized: Boolean) -> Unit)?) {
-    if (listener != null) {
-      reactNativeHost.reactInstanceManager?.addReactInstanceEventListener { listener(true) }
+  @JvmName("startReactNativeKotlin")
+  fun startReactNative(callback: ((initialized: Boolean) -> Unit)?) {
+    if (callback != null) {
+      reactNativeHost.reactInstanceManager?.addReactInstanceEventListener { callback(true) }
     }
 
     reactNativeHost.reactInstanceManager?.createReactContextInBackground()
diff --git a/android/src/main/java/com/callstack/reactnativebrownfield/BridgeManagerJava.java b/android/src/main/java/com/callstack/reactnativebrownfield/BridgeManagerJava.java
diff --git a/android/src/main/java/com/callstack/reactnativebrownfield/CallbackInterface.java b/android/src/main/java/com/callstack/reactnativebrownfield/CallbackInterface.java
diff --git a/android/src/main/java/com/callstack/reactnativebrownfield/PropsBundle.kt b/android/src/main/java/com/callstack/reactnativebrownfield/PropsBundle.kt
@@ -0,0 +1,45 @@
+package com.callstack.reactnativebrownfield
+
+import android.os.Bundle
+import com.facebook.react.bridge.ReadableArray
+import com.facebook.react.bridge.ReadableMap
+import java.util.ArrayList
+
+object PropsBundle {
+    fun fromHashMap(map: HashMap<String, *>): Bundle {
+        val bundle = Bundle()
+        map.forEach {
+            when (it.value) {
+                is ArrayList<*> -> {
+                    bundle.putSerializable(it.key, it.value as ArrayList<*>)
+                }
+                is ReadableArray -> {
+                    bundle.putSerializable(it.key, (it.value as ReadableArray).toArrayList())
+                }
+                is HashMap<*, *> -> {
+                    bundle.putBundle(it.key, fromHashMap(it.value as HashMap<String, *>))
+                }
+                is ReadableMap -> {
+                    bundle.putBundle(it.key, fromHashMap((it.value as ReadableMap).toHashMap()))
+                }
+                is Boolean -> {
+                    bundle.putBoolean(it.key, it.value as Boolean)
+                }
+                is Int -> {
+                    bundle.putInt(it.key, it.value as Int)
+                }
+                is String -> {
+                    bundle.putString(it.key, it.value as String)
+                }
+                is Double -> {
+                    bundle.putDouble(it.key, it.value as Double)
+                }
+                else -> {
+                    bundle.putSerializable(it.key, null)
+                }
+            }
+        }
+
+        return bundle
+    }
+}
diff --git a/android/src/main/java/com/callstack/reactnativebrownfield/ReactNativeActivity.kt b/android/src/main/java/com/callstack/reactnativebrownfield/ReactNativeActivity.kt
@@ -12,28 +12,30 @@ import com.facebook.react.ReactRootView
 import com.facebook.react.devsupport.DoubleTapReloadRecognizer
 import com.facebook.react.modules.core.PermissionListener
 import com.facebook.react.bridge.Callback
+import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler
 import com.facebook.react.modules.core.PermissionAwareActivity
 
 private const val MODULE_NAME = "com.callstack.reactnativebrownfield.ACTIVITY_MODULE_NAME"
+private const val INITIAL_PROPS = "com.callstack.reactnativebrownfield.ACTIVITY_INITIAL_PROPS"
 
 class ReactNativeActivity : ReactActivity(), DefaultHardwareBackBtnHandler, PermissionAwareActivity {
     private var reactRootView: ReactRootView? = null
-    private lateinit var moduleName: String
     private lateinit var doubleTapReloadRecognizer: DoubleTapReloadRecognizer
     private lateinit var permissionsCallback: Callback
     private var permissionListener: PermissionListener? = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        moduleName = intent.getStringExtra(MODULE_NAME)
+        val moduleName = intent.getStringExtra(MODULE_NAME)
+        val initialProps = intent.getBundleExtra(INITIAL_PROPS)
 
         reactRootView = ReactRootView(this)
         reactRootView?.startReactApplication(
             BridgeManager.shared.reactNativeHost.reactInstanceManager,
             moduleName,
-            null
+            initialProps
         )
 
         supportActionBar?.hide()
@@ -146,10 +148,24 @@ class ReactNativeActivity : ReactActivity(), DefaultHardwareBackBtnHandler, Perm
 
     companion object {
         @JvmStatic
-        fun createReactActivityIntent(context: Context, moduleName: String): Intent {
+        @JvmOverloads
+        fun createReactActivityIntent(context: Context, moduleName: String, initialProps: Bundle? = null): Intent {
             val intent = Intent(context, ReactNativeActivity::class.java)
             intent.putExtra(MODULE_NAME, moduleName)
+            if (initialProps != null) {
+                intent.putExtra(INITIAL_PROPS, initialProps)
+            }
             return intent
         }
+
+        @JvmStatic
+        fun createReactActivityIntent(context: Context, moduleName: String, initialProps: HashMap<String, *>): Intent {
+            return createReactActivityIntent(context, moduleName, PropsBundle.fromHashMap(initialProps))
+        }
+
+        @JvmStatic
+        fun createReactActivityIntent(context: Context, moduleName: String, initialProps: ReadableMap): Intent {
+            return createReactActivityIntent(context, moduleName, initialProps.toHashMap())
+        }
     }
 }
diff --git a/android/src/main/java/com/callstack/reactnativebrownfield/ReactNativeFragment.kt b/android/src/main/java/com/callstack/reactnativebrownfield/ReactNativeFragment.kt
@@ -11,27 +11,36 @@ import android.view.ViewGroup
 import com.facebook.infer.annotation.Assertions
 import com.facebook.react.ReactRootView
 import com.facebook.react.bridge.Callback
+import com.facebook.react.bridge.WritableMap
 import com.facebook.react.common.LifecycleState
 import com.facebook.react.devsupport.DoubleTapReloadRecognizer
 import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler
 import com.facebook.react.modules.core.PermissionAwareActivity
 import com.facebook.react.modules.core.PermissionListener
 
 private const val MODULE_NAME = "com.callstack.reactnativebrownfield.FRAGMENT_MODULE_NAME"
+private const val INITIAL_PROPS = "com.callstack.reactnativebrownfield.FRAGMENT_INITIAL_PROPS"
 
 class ReactNativeFragment : Fragment(), PermissionAwareActivity {
 
     private var reactRootView: ReactRootView? = null
-    private lateinit var moduleName: String
     private lateinit var doubleTapReloadRecognizer: DoubleTapReloadRecognizer
     private lateinit var permissionsCallback: Callback
     private var permissionListener: PermissionListener? = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        moduleName = arguments!!.getString(MODULE_NAME)!!
+        val moduleName = arguments?.getString(MODULE_NAME)!!
+        val initialProps = arguments?.getBundle(INITIAL_PROPS)
 
         doubleTapReloadRecognizer = DoubleTapReloadRecognizer()
+
+        reactRootView = ReactRootView(context)
+        reactRootView?.startReactApplication(
+            BridgeManager.shared.reactNativeHost.reactInstanceManager,
+            moduleName,
+            initialProps
+        )
     }
 
 
@@ -40,14 +49,6 @@ class ReactNativeFragment : Fragment(), PermissionAwareActivity {
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View {
-
-        reactRootView = ReactRootView(context)
-        reactRootView?.startReactApplication(
-            BridgeManager.shared.reactNativeHost.reactInstanceManager,
-            moduleName,
-            null
-        )
-
         return reactRootView!!
     }
 
@@ -148,13 +149,27 @@ class ReactNativeFragment : Fragment(), PermissionAwareActivity {
 
     companion object {
         @JvmStatic
-        fun createReactNativeFragment(moduleName: String): ReactNativeFragment {
+        @JvmOverloads
+        fun createReactNativeFragment(moduleName: String, initialProps: Bundle? = null): ReactNativeFragment {
             val fragment = ReactNativeFragment()
             val args = Bundle()
             args.putString(MODULE_NAME, moduleName)
+            if (initialProps != null) {
+                args.putBundle(INITIAL_PROPS, initialProps)
+            }
             fragment.arguments = args
             return fragment
         }
+
+        @JvmStatic
+        fun createReactNativeFragment(moduleName: String, initialProps: HashMap<String, *>): ReactNativeFragment {
+            return createReactNativeFragment(moduleName, PropsBundle.fromHashMap(initialProps))
+        }
+
+        @JvmStatic
+        fun createReactNativeFragment(moduleName: String, initialProps: WritableMap): ReactNativeFragment {
+            return createReactNativeFragment(moduleName, initialProps.toHashMap())
+        }
     }
 
 }
diff --git a/example/native/android/app/src/main/java/com/callstack/nativeexample/MainApplication.java b/example/native/android/app/src/main/java/com/callstack/nativeexample/MainApplication.java
@@ -2,11 +2,11 @@
 
 import android.app.Application;
 import android.util.Log;
+import com.callstack.reactnativebrownfield.BridgeManager;
 import com.facebook.react.PackageList;
 import com.facebook.react.ReactApplication;
 import com.facebook.react.ReactNativeHost;
 import com.facebook.react.ReactPackage;
-import com.callstack.reactnativebrownfield.BridgeManagerJava;
 
 import java.util.HashMap;
 import java.util.List;
@@ -20,15 +20,14 @@ public void onCreate() {
         options.put("packages", packages);
         options.put("mainModuleName", "example/native/index");
 
-        BridgeManagerJava.initialize(options, this);
-        BridgeManagerJava.getShared().startReactNative(init -> {
+        BridgeManager.initialize(options, this);
+        BridgeManager.getShared().startReactNative(init -> {
             Log.d("test", "test");
         });
-
     }
 
     @Override
     public ReactNativeHost getReactNativeHost() {
-        return BridgeManagerJava.getShared().getReactNativeHost();
+        return BridgeManager.getShared().getReactNativeHost();
     }
 }
