@ionic/portals-react-native 0.5.2 → 0.6.0

package/ReactNativePortals.podspec

@@ -1,21 +1,46 @@
-require 'json'
+require "json"
 
-package = JSON.parse(File.read(File.join(__dir__, 'package.json')))
+package = JSON.parse(File.read(File.join(__dir__, "package.json")))
+folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
 
 Pod::Spec.new do |s|
-  s.name         = 'ReactNativePortals'
-  s.version      = package['version']
-  s.summary      = package['description']
-  s.homepage     = package['homepage']
-  s.license      = package['license']
-  s.authors      = package['author']
+  s.name         = "ReactNativePortals"
+  s.version      = package["version"]
+  s.summary      = package["description"]
+  s.homepage     = package["homepage"]
+  s.license      = package["license"]
+  s.authors      = package["author"]
 
-  s.platforms    = { ios: '13.0' }
-  s.source       = { git: 'https://github.com/ionic-team/react-native-ionic-portals.git', tag: "#{s.version}" }
+  s.platforms    = { :ios => min_ios_version_supported }
+  s.source       = { :git => "https://github.com/ionic-team/ionic-portals-react-native.git", :tag => "#{s.version}" }
 
-  s.source_files = 'ios/**/*.{h,m,mm,swift}'
+  s.source_files = "ios/**/*.{h,m,mm,swift}"
 
-  s.dependency 'React-Core'
-  s.dependency 'IonicPortals', '~> 0.8.0'
-  s.dependency 'IonicLiveUpdates', '~> 0.4.0'
+  # Use install_modules_dependencies helper to install the dependencies if React Native version >=0.71.0.
+  # See https://github.com/facebook/react-native/blob/febf6b7f33fdb4904669f99d795eba4c0f95d7bf/scripts/cocoapods/new_architecture.rb#L79.
+  if respond_to?(:install_modules_dependencies, true)
+    s.dependency 'IonicPortals', '~> 0.11.0'
+    s.dependency 'IonicLiveUpdates', '~> 0.5.2'
+    install_modules_dependencies(s)
+
+  else
+    s.dependency "React-Core"
+    s.dependency 'IonicPortals', '~> 0.11.0'
+    s.dependency 'IonicLiveUpdates', '~> 0.5.2'
+
+    # Don't install the dependencies when we run `pod install` in the old architecture.
+    if ENV['RCT_NEW_ARCH_ENABLED'] == '1' then
+      s.compiler_flags = folly_compiler_flags + " -DRCT_NEW_ARCH_ENABLED=1"
+      s.pod_target_xcconfig    = {
+          "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\"",
+          "OTHER_CPLUSPLUSFLAGS" => "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1",
+          "CLANG_CXX_LANGUAGE_STANDARD" => "c++17"
+      }
+      s.dependency "React-Codegen"
+      s.dependency "RCT-Folly"
+      s.dependency "RCTRequired"
+      s.dependency "RCTTypeSafety"
+      s.dependency "ReactCommon/turbomodule/core"
+    end
+  end
 end

package/android/build.gradle

@@ -1,131 +1,101 @@
 buildscript {
-    // Buildscript is evaluated before everything else so we can't use getExtOrDefault
-    def kotlin_version = rootProject.ext.has('kotlinVersion') ? rootProject.ext.get('kotlinVersion') : project.properties['ReactNativePortals_kotlinVersion']
+  // Buildscript is evaluated before everything else so we can't use getExtOrDefault
+  def kotlin_version = rootProject.ext.has("kotlinVersion") ? rootProject.ext.get("kotlinVersion") : project.properties["PortalsReactNative_kotlinVersion"]
 
-    repositories {
-        google()
-        mavenCentral()
-    }
+  repositories {
+    google()
+    mavenCentral()
+  }
 
-    dependencies {
-        classpath 'com.android.tools.build:gradle:7.1.2'
-        // noinspection DifferentKotlinGradleVersion
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-    }
+  dependencies {
+    classpath "com.android.tools.build:gradle:7.2.1"
+    // noinspection DifferentKotlinGradleVersion
+    classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+  }
 }
 
-apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
+def reactNativeArchitectures() {
+  def value = rootProject.getProperties().get("reactNativeArchitectures")
+  return value ? value.split(",") : ["armeabi-v7a", "x86", "x86_64", "arm64-v8a"]
+}
 
-def getExtOrIntegerDefault(name) {
-    return rootProject.ext.has(name) ? rootProject.ext.get(name) : (project.properties['ReactNativePortals_' + name]).toInteger()
+def isNewArchitectureEnabled() {
+  return rootProject.hasProperty("newArchEnabled") && rootProject.getProperty("newArchEnabled") == "true"
 }
 
-android {
-    compileSdkVersion getExtOrIntegerDefault('compileSdkVersion')
-    defaultConfig {
-        minSdkVersion 16
-        targetSdkVersion getExtOrIntegerDefault('targetSdkVersion')
-        versionCode 1
-        versionName "1.0"
-    }
+apply plugin: "com.android.library"
+apply plugin: "kotlin-android"
 
-    buildTypes {
-        release {
-            minifyEnabled false
-        }
-    }
-    lintOptions {
-        disable 'GradleCompatible'
-    }
+if (isNewArchitectureEnabled()) {
+  apply plugin: "com.facebook.react"
 }
 
-tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
+def getExtOrDefault(name) {
+  return rootProject.ext.has(name) ? rootProject.ext.get(name) : project.properties["PortalsReactNative_" + name]
+}
 
-    kotlinOptions {
-        freeCompilerArgs += '-opt-in=kotlin.RequiresOptIn'
-    }
+def getExtOrIntegerDefault(name) {
+  return rootProject.ext.has(name) ? rootProject.ext.get(name) : (project.properties["PortalsReactNative_" + name]).toInteger()
 }
 
-repositories {
-    mavenCentral()
-    google()
+def supportsNamespace() {
+  def parsed = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION.tokenize('.')
+  def major = parsed[0].toInteger()
+  def minor = parsed[1].toInteger()
 
-    def found = false
-    def defaultDir = null
-    def androidSourcesName = 'React Native sources'
-
-    if (rootProject.ext.has('reactNativeAndroidRoot')) {
-        defaultDir = rootProject.ext.get('reactNativeAndroidRoot')
-    } else {
-        defaultDir = new File(
-            projectDir,
-            '/../../../node_modules/react-native/android'
-        )
-    }
+  // Namespace support was added in 7.3.0
+  return (major == 7 && minor >= 3) || major >= 8
+}
+
+android {
+  if (supportsNamespace()) {
+    namespace "com.ionic.portalsreactnative"
 
-    if (defaultDir.exists()) {
-        maven {
-            url defaultDir.toString()
-            name androidSourcesName
-        }
-
-        logger.info(":${project.name}:reactNativeAndroidRoot ${defaultDir.canonicalPath}")
-        found = true
-    } else {
-        def parentDir = rootProject.projectDir
-
-        1.upto(5, {
-            if (found) return true
-            parentDir = parentDir.parentFile
-
-            def androidSourcesDir = new File(
-                parentDir,
-                'node_modules/react-native'
-            )
-
-            def androidPrebuiltBinaryDir = new File(
-                parentDir,
-                'node_modules/react-native/android'
-            )
-
-            if (androidPrebuiltBinaryDir.exists()) {
-                maven {
-                    url androidPrebuiltBinaryDir.toString()
-                    name androidSourcesName
-                }
-
-                logger.info(":${project.name}:reactNativeAndroidRoot ${androidPrebuiltBinaryDir.canonicalPath}")
-                found = true
-            } else if (androidSourcesDir.exists()) {
-                maven {
-                    url androidSourcesDir.toString()
-                    name androidSourcesName
-                }
-
-                logger.info(":${project.name}:reactNativeAndroidRoot ${androidSourcesDir.canonicalPath}")
-                found = true
-            }
-        })
+    sourceSets {
+      main {
+        manifest.srcFile "src/main/AndroidManifestNew.xml"
+      }
     }
+  }
+
+  compileSdkVersion getExtOrIntegerDefault("compileSdkVersion")
+
+  defaultConfig {
+    minSdkVersion getExtOrIntegerDefault("minSdkVersion")
+    targetSdkVersion getExtOrIntegerDefault("targetSdkVersion")
+
+  }
 
-    if (!found) {
-        throw new GradleException(
-            "${project.name}: unable to locate React Native android sources. " +
-                "Ensure you have you installed React Native as a dependency in your project and try again."
-        )
+  buildTypes {
+    release {
+      minifyEnabled false
     }
+  }
+
+  lintOptions {
+    disable "GradleCompatible"
+  }
+
+  compileOptions {
+    sourceCompatibility JavaVersion.VERSION_1_8
+    targetCompatibility JavaVersion.VERSION_1_8
+  }
 }
 
+repositories {
+  mavenCentral()
+  google()
+}
+
+def kotlin_version = getExtOrDefault("kotlinVersion")
+
 dependencies {
-    //noinspection GradleDynamicVersion
-    api 'com.facebook.react:react-native:+'
-    //noinspection GradleDynamicVersion
-    api "io.ionic:portals:0.8.+"
-    //noinspection GradleDynamicVersion
-    api "io.ionic:liveupdates:0.4.+"
-
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.3"
+  // For < 0.71, this will be from the local maven repo
+  // For > 0.71, this will be replaced by `com.facebook.react:react-android:$version` by react gradle plugin
+  //noinspection GradleDynamicVersion
+  implementation "com.facebook.react:react-native:+"
+  implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+  implementation "io.ionic:portals:0.10.+"
+  implementation "io.ionic:liveupdates:0.5.+"
 }
+

package/android/gradle.properties

@@ -1,4 +1,6 @@
-ReactNativePortals_kotlinVersion=1.8.0
-ReactNativePortals_compileSdkVersion=33
-ReactNativePortals_targetSdkVersion=33
+PortalsReactNative_kotlinVersion=1.8.0
+PortalsReactNative_minSdkVersion=21
+PortalsReactNative_targetSdkVersion=33
+PortalsReactNative_compileSdkVersion=33
+PortalsReactNative_ndkversion=21.4.7075529
 android.useAndroidX=true

package/android/src/main/java/io/ionic/portals/reactnative/PortalView.kt

@@ -9,6 +9,7 @@ import androidx.fragment.app.FragmentActivity
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReadableArray
 import com.facebook.react.bridge.ReadableMap
+import com.facebook.react.modules.core.DeviceEventManagerModule
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.ViewGroupManager
 import com.facebook.react.uimanager.annotations.ReactProp
@@ -32,7 +33,7 @@ internal class PortalViewManager(private val context: ReactApplicationContext) :
         when (fragmentMap[viewGroup.id]) {
             null -> fragmentMap[viewGroup.id] = PortalViewState(
                 fragment = null,
-                portal = RNPortalManager.getPortal(name),
+                portal = RNPortalManager.getPortal(name) ?: RNPortalManager.createPortal(portal),
                 initialContext = portal.getMap("initialContext")?.toHashMap()
             )
         }
@@ -68,13 +69,15 @@ internal class PortalViewManager(private val context: ReactApplicationContext) :
         setupLayout(parentView)
 
         val portal = rnPortal.builder.create()
-
-        if (rnPortal.onFCP != null || rnPortal.onFID != null || rnPortal.onTTFB != null) {
-            val vitalsPlugin = WebVitals { _, metric, duration ->
-                when (metric) {
-                    WebVitals.Metric.FCP -> rnPortal.onFCP?.let { it(duration) }
-                    WebVitals.Metric.FID -> rnPortal.onFID?.let { it(duration) }
-                    WebVitals.Metric.TTFB -> rnPortal.onTTFB?.let { it(duration) }
+        val vitals: List<String>? = rnPortal.vitals
+
+        if (vitals != null) {
+            val vitalsPlugin = WebVitals { name, metric, duration ->
+                val stringMetric = metric.toString().lowercase()
+                if (vitals.contains(stringMetric)) {
+                    context
+                        .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
+                        .emit("vitals:$stringMetric", mapOf("duration" to duration, "portalName" to name).toReadableMap())
                 }
             }
             portal.addPluginInstance(vitalsPlugin)

package/android/src/main/java/io/ionic/portals/reactnative/ReactNativePortalManager.kt

@@ -17,9 +17,7 @@ internal data class RNPortal(
     val builder: PortalBuilder,
     val index: String?,
     val plugins: List<PortalPlugin>,
-    var onFCP: ((Long) -> Unit)? = null,
-    var onTTFB: ((Long) -> Unit)? = null,
-    var onFID: ((Long) -> Unit)? = null
+    var vitals: MutableList<String>? = null
 )
 
 internal data class PortalPlugin(val androidClassPath: String, val iosClassName: String) {
@@ -43,13 +41,21 @@ internal data class PortalPlugin(val androidClassPath: String, val iosClassName:
 
 internal object RNPortalManager {
     private val manager = PortalManager
+    @Deprecated("Will be removed in the next release.")
     private val portals: ConcurrentHashMap<String, RNPortal> = ConcurrentHashMap()
     private lateinit var reactApplicationContext: ReactApplicationContext
     private var usesSecureLiveUpdates = false
 
     fun register(key: String) = manager.register(key)
 
+    @Deprecated("Will be removed in the next release.")
     fun addPortal(map: ReadableMap): RNPortal? {
+        val portal = createPortal(map) ?: return null
+        portals[portal.builder.name] = portal
+        return portal
+    }
+
+    fun createPortal(map: ReadableMap): RNPortal? {
         val name = map.getString("name") ?: return null
         val portalBuilder = PortalBuilder(name)
 
@@ -60,13 +66,16 @@ internal object RNPortalManager {
             ?.toHashMap()
             ?.let(portalBuilder::setInitialContext)
 
+        if (map.hasKey("devMode")) {
+            map.getBoolean("devMode").let(portalBuilder::setDevMode)
+        }
 
         val plugins: List<PortalPlugin> = map.getArray("plugins")
             ?.let { rnArray ->
                 val list = mutableListOf<PortalPlugin>()
                 for (idx in 0 until rnArray.size()) {
                     rnArray.getMap(idx)
-                        ?.let(PortalPlugin.Companion::fromReadableMap)
+                        .let(PortalPlugin.Companion::fromReadableMap)
                         ?.let(list::add)
                 }
                 return@let list
@@ -84,7 +93,7 @@ internal object RNPortalManager {
 
                 for (idx in 0 until rnArray.size()) {
                     rnArray.getMap(idx)
-                        ?.let assetMap@{ map ->
+                        .let assetMap@{ map ->
                             val name = map.getString("name") ?: return@assetMap null
                             AssetMap(
                                 name = name,
@@ -105,11 +114,11 @@ internal object RNPortalManager {
                 val appId = readableMap.getString("appId") ?: return@let null
                 val channel = readableMap.getString("channel") ?: return@let null
                 val syncOnAdd = readableMap.getBoolean("syncOnAdd")
-                Pair(LiveUpdate(appId, channel, RNPortalManager.usesSecureLiveUpdates), syncOnAdd)
+                Pair(LiveUpdate(appId, channel, usesSecureLiveUpdates), syncOnAdd)
             }
             ?.let { (liveUpdate, updateOnAppLoad) ->
                 portalBuilder.setLiveUpdateConfig(
-                    context = RNPortalManager.reactApplicationContext,
+                    context = reactApplicationContext,
                     liveUpdateConfig = liveUpdate,
                     updateOnAppLoad = updateOnAppLoad
                 )
@@ -118,18 +127,30 @@ internal object RNPortalManager {
          portalBuilder
             .addPlugin(PortalsPlugin::class.java)
 
-        val rnPortal = RNPortal(
+        val vitals = map.getArray("webVitals")
+        val maybeList = if (vitals != null) {
+            val size = vitals.size()
+            (0 until size).fold(mutableListOf<String>()) { list, next ->
+                val vital = vitals.getString(next)
+                list.add(vital)
+                return@fold list
+            }
+        } else {
+            null
+        }
+
+        return RNPortal(
             builder = portalBuilder,
             index = map.getString("index"),
-            plugins = plugins
+            plugins = plugins,
+            vitals = maybeList
         )
-
-        portals[name] = rnPortal
-        return rnPortal
     }
 
-    fun getPortal(name: String): RNPortal = portals[name]
-        ?: throw IllegalStateException("Portal with portalId $name not found in RNPortalManager")
+    @Deprecated("Will be removed in the next release.")
+    fun getPortal(name: String): RNPortal? {
+        return portals[name]
+    }
 
     fun enableSecureLiveUpdates(keyPath: String) {
         LiveUpdateManager.secureLiveUpdatePEM = keyPath

package/android/src/main/java/io/ionic/portals/reactnative/ReactNativePortalsModule.kt

@@ -1,7 +1,6 @@
 package io.ionic.portals.reactnative
 
 import com.facebook.react.bridge.*
-import io.ionic.portals.Portal
 
 internal class PortalManagerModule(reactContext: ReactApplicationContext) :
     ReactContextBaseJavaModule(reactContext) {
@@ -32,7 +31,7 @@ internal class PortalManagerModule(reactContext: ReactApplicationContext) :
         val portals = WritableNativeArray()
 
         for (i in 0 until array.size()) {
-            val map = array.getMap(i) ?: continue
+            val map = array.getMap(i)
             val portal = RNPortalManager.addPortal(map) ?: continue
             portals.pushMap(portal.toReadableMap())
         }
@@ -44,7 +43,7 @@ internal class PortalManagerModule(reactContext: ReactApplicationContext) :
     fun getPortal(name: String, promise: Promise) {
         try {
             val portal = RNPortalManager.getPortal(name)
-            promise.resolve(portal.toReadableMap())
+            promise.resolve(portal?.toReadableMap())
         } catch (e: IllegalStateException) {
             promise.reject(null, "Portal named $name not registered.")
         }

package/android/src/main/java/io/ionic/portals/reactnative/ReactNativeWebVitalsModule.kt

@@ -4,41 +4,33 @@ import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReactContextBaseJavaModule
 import com.facebook.react.bridge.ReactMethod
-import com.facebook.react.modules.core.DeviceEventManagerModule
 
 internal class PortalWebVitalsModule(reactContext: ReactApplicationContext): ReactContextBaseJavaModule(reactContext) {
     override fun getName() = "IONPortalsWebVitals"
 
-    @ReactMethod
-    fun registerOnFirstContentfulPaint(portalName: String, promise: Promise) {
-        RNPortalManager.getPortal(portalName).onFCP = { duration ->
-            reactApplicationContext
-                .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
-                .emit("vitals:fcp", mapOf("duration" to duration, "portalName" to portalName).toReadableMap())
+    private fun registerVital(portalName: String, vitalName: String) {
+        val portal = RNPortalManager.getPortal(portalName) ?: return
+        if (portal.vitals == null) {
+            portal.vitals = mutableListOf()
         }
+        portal.vitals?.add(vitalName)
+    }
 
+    @ReactMethod
+    fun registerOnFirstContentfulPaint(portalName: String, promise: Promise) {
+        registerVital(portalName,"fcp")
         promise.resolve(null)
     }
 
     @ReactMethod
     fun registerOnFirstInputDelay(portalName: String, promise: Promise) {
-        RNPortalManager.getPortal(portalName).onFID = { duration ->
-            reactApplicationContext
-                .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
-                .emit("vitals:fid", mapOf("duration" to duration, "portalName" to portalName).toReadableMap())
-        }
-
+        registerVital(portalName,"fid")
         promise.resolve(null)
     }
 
     @ReactMethod
     fun registerOnTimeToFirstByte(portalName: String, promise: Promise) {
-        RNPortalManager.getPortal(portalName).onTTFB = { duration ->
-            reactApplicationContext
-                .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
-                .emit("vitals:ttfb", mapOf("duration" to duration, "portalName" to portalName).toReadableMap())
-        }
-
+        registerVital(portalName,"ttfb")
         promise.resolve(null)
     }
 

package/ios/IonicPortals+Codable.swift

@@ -0,0 +1,77 @@
+//
+//  IonicPortals+Codable.swift
+//  ReactNativePortals
+//
+//  Created by Trevor Lambert on 6/5/24.
+//  Copyright © 2024 Facebook. All rights reserved.
+//
+
+import Foundation
+import IonicPortals
+
+extension AssetMap: Encodable {
+    enum CodingKeys: String, CodingKey {
+        case startDir, virtualPath, name
+    }
+    
+    public func encode(to encoder: Encoder) throws {
+        var container = encoder.container(keyedBy: CodingKeys.self)
+        try container.encode(startDir, forKey: .startDir)
+        try container.encode(virtualPath, forKey: .virtualPath)
+        try container.encode(name, forKey: .name)
+    }
+}
+
+extension AssetMap: Decodable {
+    public init(from decoder: Decoder) throws {
+        let container = try decoder.container(keyedBy: CodingKeys.self)
+        let name = try container.decode(String.self, forKey: .name)
+        let startDir = try container.decodeIfPresent(String.self, forKey: .startDir) ?? ""
+        let virtualPath = try container.decodeIfPresent(String.self, forKey: .virtualPath)
+        self.init(name: name, virtualPath: virtualPath, startDir: startDir)
+    }
+}
+
+//export interface Portal {
+//  /** The name of the Portal to be referenced. Must be **unique** */
+//  name: string;
+//  /** Any Capacitor plugins to be made available to the Portal */
+//  plugins?: CapacitorPlugin[];
+//  /**
+//   * The root directory of the web application relative to Bundle.main on iOS
+//   * and src/main/assets on Android. If omitted, `name` is used.
+//   */
+//  startDir?: string;
+//  /** The name of the initial file to load. If omitted, 'index.html' is used. */
+//  index?: string;
+//  /** Any data needed at initial render when a portal is loaded. */
+//  initialContext?: {
+//    [key: string]: any;
+//  };
+//  assetMaps?: AssetMap[];
+//  liveUpdate?: LiveUpdateConfig;
+//}
+
+//export interface LiveUpdate {
+//  /** The AppFlow application ID */
+//  appId: string;
+//  /** The AppFlow distribution channel */
+//  channel: string;
+//}
+//
+///** Data needed to register a live update to be managed */
+//export type LiveUpdateConfig = LiveUpdate & { syncOnAdd: boolean };
+
+//export interface AssetMap {
+//  /** The name to index the asset map by */
+//  name: string;
+//  /** Any path to match via the web. If omitted, {@link AssetMap#name} will be used. */
+//  virtualPath?: string;
+//  /** The root directory of the assets relative to Bundle.main on iOS
+//   * and src/main/assets on Android. If omitted, the root of Bundle.main
+//   * and src/main/assets will be used.
+//   */
+//  startDir?: string;
+//}
+
+