expo-modules-core 1.11.10 → 1.11.12

package/CHANGELOG.md

@@ -10,6 +10,19 @@
 
 ### 💡 Others
 
+## 1.11.12 — 2024-03-13
+
+### 🎉 New features
+
+- Add iOS support for `PlatformColor` and `DynamicColorIOS` color props. ([#26724](https://github.com/expo/expo/pull/26724) by [@dlindenkreuz](https://github.com/dlindenkreuz))
+
+## 1.11.11 — 2024-03-11
+
+### 🐛 Bug fixes
+
+- [Android] Ensured that `onCreate` before `OnActivityEntersForeground` event. ([#26944](https://github.com/expo/expo/pull/26944) by [@lukmccall](https://github.com/lukmccall))
+- [Android] Fixed activity contract registration after host destruction. ([#26881](https://github.com/expo/expo/pull/26881) by [@lukmccall](https://github.com/lukmccall))
+
 ## 1.11.10 — 2024-03-06
 
 ### 🐛 Bug fixes
@@ -21,8 +34,6 @@
 ### 🎉 New features
 
 - Add timer capability to Logger. ([#26454](https://github.com/expo/expo/pull/26454), [#26477](https://github.com/expo/expo/pull/26477) by [@wschurman](https://github.com/wschurman))
-- Add iOS support for `PlatformColor` and `DynamicColorIOS` color props. ([#26724](https://github.com/expo/expo/pull/26724) by [@dlindenkreuz](https://github.com/dlindenkreuz))
-- `BarCodeScannerResult` interface now declares an additional `raw` field corresponding to the barcode value as it was encoded in the barcode without parsing. Will always be undefined on iOS. ([#25391](https://github.com/expo/expo/pull/25391) by [@ajacquierbret](https://github.com/ajacquierbret))
 
 ## 1.11.8 — 2024-01-23
 

package/android/build.gradle

@@ -5,7 +5,7 @@ apply plugin: 'kotlin-android'
 apply plugin: 'maven-publish'
 
 group = 'host.exp.exponent'
-version = '1.11.10'
+version = '1.11.12'
 
 def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
 if (expoModulesCorePlugin.exists()) {
@@ -143,7 +143,7 @@ android {
   defaultConfig {
     consumerProguardFiles 'proguard-rules.pro'
     versionCode 1
-    versionName "1.11.10"
+    versionName "1.11.12"
     buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled.toString()
 
     testInstrumentationRunner "expo.modules.TestRunner"

package/android/src/main/java/expo/modules/kotlin/AppContext.kt

@@ -64,6 +64,8 @@ class AppContext(
   // We postpone creating the `JSIInteropModuleRegistry` to not load so files in unit tests.
   internal lateinit var jsiInterop: JSIInteropModuleRegistry
 
+  private var hostWasDestroyed = false
+
   /**
    * The core module that defines the `expo` object in the global scope of the JS runtime.
    *
@@ -132,9 +134,7 @@ class AppContext(
   }
 
   fun onCreate() = trace("AppContext.onCreate") {
-    registry.readyForPostingEvents()
-    registry.post(EventName.MODULE_CREATE)
-    registry.flushTheEventQueue()
+    registry.postOnCreate()
   }
 
   /**
@@ -314,6 +314,12 @@ class AppContext(
       "Current Activity is of incorrect class, expected AppCompatActivity, received ${currentActivity?.localClassName}"
     }
 
+    // We need to re-register activity contracts when reusing AppContext with new Activity after host destruction.
+    if (hostWasDestroyed) {
+      hostWasDestroyed = false
+      registry.registerActivityContracts()
+    }
+
     activityResultsManager.onHostResume(activity)
     registry.post(EventName.ACTIVITY_ENTERS_FOREGROUND)
   }
@@ -331,6 +337,10 @@ class AppContext(
       activityResultsManager.onHostDestroy(it)
     }
     registry.post(EventName.ACTIVITY_DESTROYS)
+
+    // The host (Activity) was destroyed, but it doesn't mean that modules will be destroyed too.
+    // So we save that information, and we will re-register activity contracts when the host will be resumed with new Activity.
+    hostWasDestroyed = true
   }
 
   internal fun onActivityResult(activity: Activity, requestCode: Int, resultCode: Int, data: Intent?) {

package/android/src/main/java/expo/modules/kotlin/ModuleRegistry.kt

@@ -33,10 +33,6 @@ class ModuleRegistry(
       )
     }
 
-    holder.apply {
-      registerContracts()
-    }
-
     registry[holder.name] = holder
   }
 
@@ -112,14 +108,32 @@ class ModuleRegistry(
     logger.info("✅ ModuleRegistry was destroyed")
   }
 
+  /**
+   * Post onCreate event to all modules. It has its own method to ensure that it’s called first.
+   */
+  fun postOnCreate() {
+    forEach {
+      it.post(EventName.MODULE_CREATE)
+    }
+    registerActivityContracts()
+    readyForPostingEvents()
+    flushTheEventQueue()
+  }
+
+  internal fun registerActivityContracts() {
+    forEach { holder ->
+      holder.registerContracts()
+    }
+  }
+
   /**
    * Tell the modules registry it can handle events as they come, without adding them to the event queue.
    */
-  fun readyForPostingEvents() = synchronized(this) {
+  private fun readyForPostingEvents() = synchronized(this) {
     isReadyForPostingEvents = true
   }
 
-  fun flushTheEventQueue() = synchronized(this) {
+  private fun flushTheEventQueue() = synchronized(this) {
     eventQueue.forEach { event ->
       forEach {
         event.post(it)

package/ios/Convertibles/Convertibles+Color.swift

@@ -15,6 +15,42 @@ extension UIColor: Convertible {
     if let value = value as? Int {
       return try Conversions.toColor(argb: UInt64(value)) as! Self
     }
+
+    // Handle `PlatformColor` and `DynamicColorIOS`
+    if let opaqueValue = value as? [String: Any] {
+      if let semanticName = opaqueValue["semantic"] as? String,
+        let color = resolveNamedColor(name: semanticName) {
+        return color as! Self
+      }
+      if let semanticArray = opaqueValue["semantic"] as? [String] {
+        for semanticName in semanticArray {
+          if let color = resolveNamedColor(name: semanticName) {
+            return color as! Self
+          }
+        }
+      }
+      if let appearances = opaqueValue["dynamic"] as? [String: Any],
+        let lightColor = try appearances["light"].map({ try UIColor.convert(from: $0, appContext: appContext) }),
+        let darkColor = try appearances["dark"].map({ try UIColor.convert(from: $0, appContext: appContext) }) {
+        let highContrastLightColor = try appearances["highContrastLight"].map({ try UIColor.convert(from: $0, appContext: appContext) })
+        let highContrastDarkColor = try appearances["highContrastDark"].map({ try UIColor.convert(from: $0, appContext: appContext) })
+
+        let color = UIColor { (traitCollection: UITraitCollection) -> UIColor in
+          if traitCollection.userInterfaceStyle == .dark {
+            if traitCollection.accessibilityContrast == .high, let highContrastDarkColor {
+              return highContrastDarkColor
+            }
+            return darkColor
+          }
+
+          if traitCollection.accessibilityContrast == .high, let highContrastLightColor {
+            return highContrastLightColor
+          }
+          return lightColor
+        }
+        return color as! Self
+      }
+    }
     throw Conversions.ConvertingException<UIColor>(value)
     // swiftlint:enable force_cast
   }
@@ -33,6 +69,24 @@ extension CGColor: Convertible {
   }
 }
 
+private func resolveNamedColor(name: String) -> UIColor? {
+  return UIColor(named: name) ?? uiColorFromSemanticName(name: name)
+}
+
+private func uiColorFromSemanticName(name: String) -> UIColor? {
+  let selector: Selector
+  if name.hasSuffix("Color") {
+    selector = Selector(name)
+  } else {
+    selector = Selector("\(name)Color")
+  }
+  guard UIColor.responds(to: selector) else {
+    return nil
+  }
+
+  return UIColor.perform(selector).takeUnretainedValue() as? UIColor
+}
+
 private func uiColorWithComponents(_ components: [Double]) -> UIColor {
   let alpha = components.count > 3 ? components[3] : 1.0
   return UIColor(red: components[0], green: components[1], blue: components[2], alpha: alpha)

package/ios/Tests/ConvertiblesSpec.swift

@@ -363,6 +363,22 @@ class ConvertiblesSpec: ExpoSpec {
         let transparent = try CGColor.convert(from: "transparent", appContext: appContext)
         expect(transparent.alpha) == .zero
       }
+      
+      it("converts from PlatformColor") {
+        let color = try CGColor.convert(from: ["semantic": ["invalid_color", "systemRed", "systemBlue"]], appContext: appContext)
+        expect(color) == UIColor.systemRed.cgColor
+      }
+      
+      it("converts from DynamicColorIOS") {
+        let color = try CGColor.convert(from: ["dynamic": ["light": "#000", "dark": ["semantic": "systemGray"]]], appContext: appContext)
+        testColorComponents(color, 0x00, 0x00, 0x00, 0xFF)
+      }
+      
+      it("converts from DynamicColorIOS with traits") {
+        let color = try UIColor.convert(from: ["dynamic": ["light": "#000", "dark": ["semantic": "systemGray"]]], appContext: appContext)
+        let traits = UITraitCollection(userInterfaceStyle: .dark)
+        expect(color.resolvedColor(with: traits)) == UIColor.systemGray.resolvedColor(with: traits)
+      }
 
       it("throws when string is invalid") {
         testInvalidHexColor("")

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-modules-core",
-  "version": "1.11.10",
+  "version": "1.11.12",
   "description": "The core of Expo Modules architecture",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -44,5 +44,5 @@
     "@testing-library/react-hooks": "^7.0.1",
     "expo-module-scripts": "^3.0.0"
   },
-  "gitHead": "407d15c8c4930e7b03804ffbfc5a068708679a57"
+  "gitHead": "d846eb40fc384b9e4b21260af2a990dfe79cf461"
 }