expo-modules-core 1.2.2 → 1.2.3

package/CHANGELOG.md

@@ -10,6 +10,13 @@
 
 ### 💡 Others
 
+## 1.2.3 — 2023-02-21
+
+### 🐛 Bug fixes
+
+- [iOS] Fixed URI with encoded `#` getting cut off. ([#21326](https://github.com/expo/expo/pull/21326) by [@lukmccall](https://github.com/lukmccall))
+- [Android] Fail gracefully when the view cannot be constructed due to the missing activity. ([#21328](https://github.com/expo/expo/pull/21328) by [@lukmccall](https://github.com/lukmccall))
+
 ## 1.2.2 — 2023-02-14
 
 ### 🐛 Bug fixes

package/android/build.gradle

@@ -6,7 +6,7 @@ apply plugin: 'maven-publish'
 apply plugin: "de.undercouch.download"
 
 group = 'host.exp.exponent'
-version = '1.2.2'
+version = '1.2.3'
 
 buildscript {
   def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
@@ -173,7 +173,7 @@ android {
     targetSdkVersion safeExtGet("targetSdkVersion", 33)
     consumerProguardFiles 'proguard-rules.pro'
     versionCode 1
-    versionName "1.2.2"
+    versionName "1.2.3"
     buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled.toString()
 
     testInstrumentationRunner "expo.modules.TestRunner"

package/android/src/main/java/expo/modules/kotlin/views/ViewDefinitionBuilder.kt

@@ -4,9 +4,12 @@
 package expo.modules.kotlin.views
 
 import android.content.Context
+import android.util.Log
 import android.view.View
 import android.view.ViewGroup
 import expo.modules.kotlin.AppContext
+import expo.modules.kotlin.exception.CodedException
+import expo.modules.kotlin.exception.UnexpectedException
 import expo.modules.kotlin.modules.DefinitionMarker
 import expo.modules.kotlin.types.toAnyType
 import kotlin.reflect.KClass
@@ -147,7 +150,11 @@ class ViewDefinitionBuilder<T : View>(@PublishedApi internal val viewType: KClas
 
     // Backward compatibility
     if (args.size == 1) {
-      return@viewFactory primaryConstructor.call(context)
+      return@viewFactory try {
+        primaryConstructor.call(context)
+      } catch (e: Throwable) {
+        handleFailureDuringViewCreation(context, appContext, e)
+      }
     }
 
     val secondArgType = args[1].type
@@ -159,7 +166,24 @@ class ViewDefinitionBuilder<T : View>(@PublishedApi internal val viewType: KClas
       throw IllegalStateException("Android view has more constructor arguments than expected.")
     }
 
-    return@viewFactory primaryConstructor.call(context, appContext)
+    return@viewFactory try {
+      primaryConstructor.call(context, appContext)
+    } catch (e: Throwable) {
+      handleFailureDuringViewCreation(context, appContext, e)
+    }
+  }
+
+  private fun handleFailureDuringViewCreation(context: Context, appContext: AppContext, e: Throwable): View {
+    Log.e("ExpoModulesCore", "Couldn't create view of type $viewType", e)
+
+    appContext.errorManager?.reportExceptionToLogBox(
+      if (e is CodedException) {
+        e
+      } else {
+        UnexpectedException(e)
+      }
+    )
+    return View(context)
   }
 
   private fun getPrimaryConstructor(): KFunction<T>? {

package/ios/Swift/Utilities.swift

@@ -32,15 +32,29 @@ internal func toNSError(_ error: Error) -> NSError {
  Note that it encodes only characters that are not allowed in the url query and '#' that indicates the fragment part.
  */
 internal func percentEncodeUrlString(_ url: String) -> String? {
+  // URL contains '#' so it has a fragment part.
+  // We know that because that is the only allowed use case of the undecoded '#' symbol inside of the URL.
+  if url.contains("#") {
+    let urlParts = url.split(separator: "#")
+
+    // Encodes the url without the fragment part. It'll leave the fragment part untounched.
+    guard let parsed = percentEncodeUrlStringWithoutFragment(String(urlParts[0])) else {
+      return nil
+    }
+
+    // Concatenate encoded path with fragment.
+    return parsed + "#" + urlParts[1]
+  }
+
+  return percentEncodeUrlStringWithoutFragment(url)
+}
+
+private func percentEncodeUrlStringWithoutFragment(_ url: String) -> String? {
   // The value may come unencoded or already encoded, so first we try to decode it.
   // `removingPercentEncoding` returns nil when the string contains an invalid percent-encoded sequence,
   // but that usually means the value came unencoded, so it falls back to the given string.
   let decodedString = url.removingPercentEncoding ?? url
 
-  // A `CharacterSet` with all query-allowed characters and the hash which is not allowed in the query,
-  // but it must stay unencoded to indicate the start of the url fragment part.
-  let allowedCharactersSet = CharacterSet.urlQueryAllowed.union(CharacterSet(charactersIn: "#"))
-
   // Do the percent encoding, but note that it may still return nil when it's not possible to encode for some reason.
-  return decodedString.addingPercentEncoding(withAllowedCharacters: allowedCharactersSet)
+  return decodedString.addingPercentEncoding(withAllowedCharacters: CharacterSet.urlQueryAllowed)
 }

package/ios/Tests/ConvertiblesSpec.swift

@@ -43,6 +43,17 @@ class ConvertiblesSpec: ExpoSpec {
         expect(url.absoluteString) == urlString
         expect(url.absoluteString.removingPercentEncoding) == "https://expo.dev/?param=🥓"
       }
+      
+      it("converts from url with encoded query containg the anchor") {
+        let query = "color=%230000ff"
+        let urlString = "https://expo.dev/?\(query)#anchor"
+        let url = try URL.convert(from: urlString)
+
+        expect(url.query) == query
+        expect(url.absoluteString) == urlString
+        expect(url.absoluteString.removingPercentEncoding) == "https://expo.dev/?color=#0000ff#anchor"
+        expect(url.fragment) == "anchor"
+      }
 
       it("converts from url containing percent character") {
         // The percent character alone requires percent-encoding to `%25`.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-modules-core",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "description": "The core of Expo Modules architecture",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -42,5 +42,5 @@
     "@testing-library/react-hooks": "^7.0.1",
     "expo-module-scripts": "^3.0.0"
   },
-  "gitHead": "c8107d57eabaedff5d53bc8036d062db12a473c8"
+  "gitHead": "40dcd1732b69f09798a28691f6b17b820a2bbbf5"
 }