expo-modules-core 2.3.12 → 2.4.0

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

@@ -19,6 +19,7 @@ import expo.modules.kotlin.functions.AsyncFunctionWithPromiseComponent
 import expo.modules.kotlin.functions.Queues
 import expo.modules.kotlin.functions.createAsyncFunctionComponent
 import expo.modules.kotlin.modules.DefinitionMarker
+import expo.modules.kotlin.types.TypeConverterProvider
 import expo.modules.kotlin.types.enforceType
 import expo.modules.kotlin.types.toAnyType
 import expo.modules.kotlin.types.toArgsArray
@@ -28,7 +29,8 @@ import kotlin.reflect.KType
 @DefinitionMarker
 class ViewDefinitionBuilder<T : View>(
   @PublishedApi internal val viewClass: KClass<T>,
-  @PublishedApi internal val viewType: KType
+  @PublishedApi internal val viewType: KType,
+  @PublishedApi internal val converters: TypeConverterProvider? = null
 ) {
   @PublishedApi
   internal var name = viewClass.simpleName
@@ -144,6 +146,23 @@ class ViewDefinitionBuilder<T : View>(
     )
   }
 
+  /**
+   * Creates a view prop that defines its name, default value and setter.
+   */
+  @JvmName("PropGeneric")
+  inline fun <reified ViewType : View, reified PropType> Prop(
+    name: String,
+    defaultValue: PropType,
+    noinline body: (view: ViewType, prop: PropType) -> Unit
+  ) {
+    props[name] = ConcreteViewPropWithDefault(
+      name,
+      toAnyType<PropType>(),
+      body,
+      defaultValue
+    )
+  }
+
   inline fun <reified ViewType : View, reified PropType, reified CustomValueType> PropGroup(
     vararg props: Pair<String, CustomValueType>,
     noinline body: (view: ViewType, value: CustomValueType, prop: PropType) -> Unit
@@ -229,7 +248,7 @@ class ViewDefinitionBuilder<T : View>(
     name: String,
     crossinline body: (p0: P0, p1: P1) -> R
   ): AsyncFunctionComponent {
-    return createAsyncFunctionComponent(name, toArgsArray<P0, P1>()) { (p0, p1) ->
+    return createAsyncFunctionComponent(name, toArgsArray<P0, P1>(converterProvider = converters)) { (p0, p1) ->
       enforceType<P0, P1>(p0, p1)
       body(p0, p1)
     }.also {
@@ -242,7 +261,7 @@ class ViewDefinitionBuilder<T : View>(
     name: String,
     crossinline body: (p0: P0, p1: Promise) -> R
   ): AsyncFunctionComponent {
-    return AsyncFunctionWithPromiseComponent(name, toArgsArray<P0>()) { (p0), promise ->
+    return AsyncFunctionWithPromiseComponent(name, toArgsArray<P0>(converterProvider = converters)) { (p0), promise ->
       enforceType<P0>(p0)
       body(p0, promise)
     }.also {
@@ -254,7 +273,7 @@ class ViewDefinitionBuilder<T : View>(
     name: String,
     crossinline body: (p0: P0, p1: P1, p2: P2) -> R
   ): AsyncFunctionComponent {
-    return createAsyncFunctionComponent(name, toArgsArray<P0, P1, P2>()) { (p0, p1, p2) ->
+    return createAsyncFunctionComponent(name, toArgsArray<P0, P1, P2>(converterProvider = converters)) { (p0, p1, p2) ->
       enforceType<P0, P1, P2>(p0, p1, p2)
       body(p0, p1, p2)
     }.also {
@@ -267,7 +286,7 @@ class ViewDefinitionBuilder<T : View>(
     name: String,
     crossinline body: (p0: P0, p1: P1, p2: Promise) -> R
   ): AsyncFunctionComponent {
-    return AsyncFunctionWithPromiseComponent(name, toArgsArray<P0, P1>()) { (p0, p1), promise ->
+    return AsyncFunctionWithPromiseComponent(name, toArgsArray<P0, P1>(converterProvider = converters)) { (p0, p1), promise ->
       enforceType<P0, P1>(p0, p1)
       body(p0, p1, promise)
     }.also {
@@ -279,7 +298,7 @@ class ViewDefinitionBuilder<T : View>(
     name: String,
     crossinline body: (p0: P0, p1: P1, p2: P2, p3: P3) -> R
   ): AsyncFunctionComponent {
-    return createAsyncFunctionComponent(name, toArgsArray<P0, P1, P2, P3>()) { (p0, p1, p2, p3) ->
+    return createAsyncFunctionComponent(name, toArgsArray<P0, P1, P2, P3>(converterProvider = converters)) { (p0, p1, p2, p3) ->
       enforceType<P0, P1, P2, P3>(p0, p1, p2, p3)
       body(p0, p1, p2, p3)
     }.also {
@@ -292,7 +311,7 @@ class ViewDefinitionBuilder<T : View>(
     name: String,
     crossinline body: (p0: P0, p1: P1, p2: P2, p3: Promise) -> R
   ): AsyncFunctionComponent {
-    return AsyncFunctionWithPromiseComponent(name, toArgsArray<P0, P1, P2>()) { (p0, p1, p2), promise ->
+    return AsyncFunctionWithPromiseComponent(name, toArgsArray<P0, P1, P2>(converterProvider = converters)) { (p0, p1, p2), promise ->
       enforceType<P0, P1, P2>(p0, p1, p2)
       body(p0, p1, p2, promise)
     }.also {
@@ -304,7 +323,7 @@ class ViewDefinitionBuilder<T : View>(
     name: String,
     crossinline body: (p0: P0, p1: P1, p2: P2, p3: P3, p4: P4) -> R
   ): AsyncFunctionComponent {
-    return createAsyncFunctionComponent(name, toArgsArray<P0, P1, P2, P3, P4>()) { (p0, p1, p2, p3, p4) ->
+    return createAsyncFunctionComponent(name, toArgsArray<P0, P1, P2, P3, P4>(converterProvider = converters)) { (p0, p1, p2, p3, p4) ->
       enforceType<P0, P1, P2, P3, P4>(p0, p1, p2, p3, p4)
       body(p0, p1, p2, p3, p4)
     }.also {
@@ -317,7 +336,7 @@ class ViewDefinitionBuilder<T : View>(
     name: String,
     crossinline body: (p0: P0, p1: P1, p2: P2, p3: P3, p4: Promise) -> R
   ): AsyncFunctionComponent {
-    return AsyncFunctionWithPromiseComponent(name, toArgsArray<P0, P1, P2, P3>()) { (p0, p1, p2, p3), promise ->
+    return AsyncFunctionWithPromiseComponent(name, toArgsArray<P0, P1, P2, P3>(converterProvider = converters)) { (p0, p1, p2, p3), promise ->
       enforceType<P0, P1, P2, P3>(p0, p1, p2, p3)
       body(p0, p1, p2, p3, promise)
     }.also {
@@ -329,7 +348,7 @@ class ViewDefinitionBuilder<T : View>(
     name: String,
     crossinline body: (p0: P0, p1: P1, p2: P2, p3: P3, p4: P4, p5: P5) -> R
   ): AsyncFunctionComponent {
-    return createAsyncFunctionComponent(name, toArgsArray<P0, P1, P2, P3, P4, P5>()) { (p0, p1, p2, p3, p4, p5) ->
+    return createAsyncFunctionComponent(name, toArgsArray<P0, P1, P2, P3, P4, P5>(converterProvider = converters)) { (p0, p1, p2, p3, p4, p5) ->
       enforceType<P0, P1, P2, P3, P4, P5>(p0, p1, p2, p3, p4, p5)
       body(p0, p1, p2, p3, p4, p5)
     }.also {
@@ -342,7 +361,7 @@ class ViewDefinitionBuilder<T : View>(
     name: String,
     crossinline body: (p0: P0, p1: P1, p2: P2, p3: P3, p4: P4, p5: Promise) -> R
   ): AsyncFunctionComponent {
-    return AsyncFunctionWithPromiseComponent(name, toArgsArray<P0, P1, P2, P3, P4>()) { (p0, p1, p2, p3, p4), promise ->
+    return AsyncFunctionWithPromiseComponent(name, toArgsArray<P0, P1, P2, P3, P4>(converterProvider = converters)) { (p0, p1, p2, p3, p4), promise ->
       enforceType<P0, P1, P2, P3, P4>(p0, p1, p2, p3, p4)
       body(p0, p1, p2, p3, p4, promise)
     }.also {
@@ -354,7 +373,7 @@ class ViewDefinitionBuilder<T : View>(
     name: String,
     crossinline body: (p0: P0, p1: P1, p2: P2, p3: P3, p4: P4, p5: P5, p6: P6) -> R
   ): AsyncFunctionComponent {
-    return createAsyncFunctionComponent(name, toArgsArray<P0, P1, P2, P3, P4, P5, P6>()) { (p0, p1, p2, p3, p4, p5, p6) ->
+    return createAsyncFunctionComponent(name, toArgsArray<P0, P1, P2, P3, P4, P5, P6>(converterProvider = converters)) { (p0, p1, p2, p3, p4, p5, p6) ->
       enforceType<P0, P1, P2, P3, P4, P5, P6>(p0, p1, p2, p3, p4, p5, p6)
       body(p0, p1, p2, p3, p4, p5, p6)
     }.also {
@@ -367,7 +386,7 @@ class ViewDefinitionBuilder<T : View>(
     name: String,
     crossinline body: (p0: P0, p1: P1, p2: P2, p3: P3, p4: P4, p5: P5, p6: Promise) -> R
   ): AsyncFunctionComponent {
-    return AsyncFunctionWithPromiseComponent(name, toArgsArray<P0, P1, P2, P3, P4, P5>()) { (p0, p1, p2, p3, p4, p5), promise ->
+    return AsyncFunctionWithPromiseComponent(name, toArgsArray<P0, P1, P2, P3, P4, P5>(converterProvider = converters)) { (p0, p1, p2, p3, p4, p5), promise ->
       enforceType<P0, P1, P2, P3, P4, P5>(p0, p1, p2, p3, p4, p5)
       body(p0, p1, p2, p3, p4, p5, promise)
     }.also {
@@ -379,7 +398,7 @@ class ViewDefinitionBuilder<T : View>(
     name: String,
     crossinline body: (p0: P0, p1: P1, p2: P2, p3: P3, p4: P4, p5: P5, p6: P6, p7: P7) -> R
   ): AsyncFunctionComponent {
-    return createAsyncFunctionComponent(name, toArgsArray<P0, P1, P2, P3, P4, P5, P6, P7>()) { (p0, p1, p2, p3, p4, p5, p6, p7) ->
+    return createAsyncFunctionComponent(name, toArgsArray<P0, P1, P2, P3, P4, P5, P6, P7>(converterProvider = converters)) { (p0, p1, p2, p3, p4, p5, p6, p7) ->
       enforceType<P0, P1, P2, P3, P4, P5, P6, P7>(p0, p1, p2, p3, p4, p5, p6, p7)
       body(p0, p1, p2, p3, p4, p5, p6, p7)
     }.also {
@@ -392,7 +411,7 @@ class ViewDefinitionBuilder<T : View>(
     name: String,
     crossinline body: (p0: P0, p1: P1, p2: P2, p3: P3, p4: P4, p5: P5, p6: P6, p7: Promise) -> R
   ): AsyncFunctionComponent {
-    return AsyncFunctionWithPromiseComponent(name, toArgsArray<P0, P1, P2, P3, P4, P5, P6>()) { (p0, p1, p2, p3, p4, p5, p6), promise ->
+    return AsyncFunctionWithPromiseComponent(name, toArgsArray<P0, P1, P2, P3, P4, P5, P6>(converterProvider = converters)) { (p0, p1, p2, p3, p4, p5, p6), promise ->
       enforceType<P0, P1, P2, P3, P4, P5, P6>(p0, p1, p2, p3, p4, p5, p6)
       body(p0, p1, p2, p3, p4, p5, p6, promise)
     }.also {
@@ -402,14 +421,14 @@ class ViewDefinitionBuilder<T : View>(
 
   fun AsyncFunction(
     name: String
-  ) = AsyncFunctionBuilder(name).also { functionBuilders[name] = it }
+  ) = AsyncFunctionBuilder(name, converters).also { functionBuilders[name] = it }
 
   private fun createViewFactory(): (Context, AppContext) -> View =
     viewFactory@{ context: Context, appContext: AppContext ->
       val fullConstructor = try {
         // Try to use constructor with two arguments
         viewClass.java.getConstructor(Context::class.java, AppContext::class.java)
-      } catch (e: NoSuchMethodException) {
+      } catch (_: NoSuchMethodException) {
         null
       }
 
@@ -424,7 +443,7 @@ class ViewDefinitionBuilder<T : View>(
       val contextConstructor = try {
         // Try to use constructor that use Android's context
         viewClass.java.getConstructor(Context::class.java)
-      } catch (e: NoSuchMethodException) {
+      } catch (_: NoSuchMethodException) {
         null
       }
 
@@ -439,15 +458,11 @@ class ViewDefinitionBuilder<T : View>(
       throw IllegalStateException("Didn't find a correct constructor for $viewClass")
     }
 
-  private fun handleFailureDuringViewCreation(context: Context, appContext: AppContext, e: Throwable): View {
-    Log.e("ExpoModulesCore", "Couldn't create view of type $viewClass", e)
+  private fun handleFailureDuringViewCreation(context: Context, appContext: AppContext, error: Throwable): View {
+    Log.e("ExpoModulesCore", "Couldn't create view of type $viewClass", error)
 
     appContext.errorManager?.reportExceptionToLogBox(
-      if (e is CodedException) {
-        e
-      } else {
-        UnexpectedException(e)
-      }
+      error as? CodedException ?: UnexpectedException(error)
     )
 
     return if (ViewGroup::class.java.isAssignableFrom(viewClass.java)) {

package/ios/Api/Factories/ViewFactories.swift

@@ -46,6 +46,22 @@ public func Prop<ViewType: UIView, PropType: AnyArgument>(
   )
 }
 
+/**
+ Creates a view prop that defines its name, default value and setter.
+ */
+public func Prop<ViewType: UIView, PropType: AnyArgument>(
+  _ name: String,
+  _ defaultValue: PropType,
+  @_implicitSelfCapture _ setter: @escaping (ViewType, PropType) -> Void
+) -> ConcreteViewProp<ViewType, PropType> {
+  return ConcreteViewProp(
+    name: name,
+    propType: ~PropType.self,
+    defaultValue: defaultValue,
+    setter: setter
+  )
+}
+
 // MARK: - View lifecycle
 
 /**

package/ios/Core/Conversions.swift

@@ -77,11 +77,17 @@ public struct Conversions {
   }
 
   /**
-   Converts hex string to `UIColor` or throws an exception if the string is corrupted.
+   Converts color string to `UIColor` or throws an exception if the string is corrupted.
    */
-  static func toColor(hexString hex: String) throws -> UIColor {
-    var hexStr = hex
-      .trimmingCharacters(in: .whitespacesAndNewlines)
+  static func toColor(colorString: String) throws -> UIColor {
+    let input = colorString.trimmingCharacters(in: .whitespacesAndNewlines)
+
+    // Handle RGB format
+    if input.hasPrefix("rgb") {
+      return try fromRGBString(input)
+    }
+
+    var hexStr = input
       .replacingOccurrences(of: "#", with: "")
 
     // If just RGB, set alpha to maximum
@@ -103,11 +109,33 @@ public struct Conversions {
 
     guard hexStr.range(of: #"^[0-9a-fA-F]{8}$"#, options: .regularExpression) != nil,
           Scanner(string: hexStr).scanHexInt64(&rgba) else {
-      throw InvalidHexColorException(hex)
+      throw InvalidHexColorException(input)
     }
     return try toColor(rgba: rgba)
   }
 
+  private static func fromRGBString(_ rgbString: String) throws -> UIColor {
+    let components = rgbString
+      .replacingOccurrences(of: "rgba(", with: "")
+      .replacingOccurrences(of: "rgb(", with: "")
+      .replacingOccurrences(of: ")", with: "")
+      .split(separator: ",")
+      .compactMap { Double($0.trimmingCharacters(in: .whitespaces)) }
+
+    guard components.count >= 3,
+      components[0] >= 0 && components[0] <= 255,
+      components[1] >= 0 && components[1] <= 255,
+      components[2] >= 0 && components[2] <= 255 else {
+      throw InvalidRGBColorException(rgbString)
+    }
+
+    let alpha = components.count > 3 ? Double(components[3]) : 1.0
+    return UIColor(
+      red: CGFloat(components[0]) / 255.0,
+      green: CGFloat(components[1]) / 255.0,
+      blue: CGFloat(components[2]) / 255.0,
+      alpha: alpha)
+  }
   /**
    Converts an integer for ARGB color to `UIColor`. Since the alpha channel is represented by first 8 bits,
    it's optional out of the box. React Native converts colors to such format.
@@ -156,8 +184,15 @@ public struct Conversions {
     appContext: AppContext? = nil,
     dynamicType: AnyDynamicType? = nil
   ) -> Any {
-    if let appContext, let result = try? dynamicType?.convertResult(value as Any, appContext: appContext) {
-      return result
+    if let appContext {
+      // Dynamic type is provided
+      if dynamicType as? DynamicVoidType == nil, let result = try? dynamicType?.convertResult(value as Any, appContext: appContext) {
+        return result
+      }
+      // Dynamic type can be obtained from the value
+      if let value = value as? AnyArgument, let result = try? type(of: value).getDynamicType().convertResult(value as Any, appContext: appContext) {
+        return result
+      }
     }
     return convertFunctionResultInRuntime(value, appContext: appContext)
   }
@@ -281,6 +316,15 @@ public struct Conversions {
     }
   }
 
+  /**
+   An exception used when the rgb color string is invalid.
+   */
+  internal class InvalidRGBColorException: GenericException<String> {
+    override var reason: String {
+      "Provided rgb color string '\(param)' is invalid"
+    }
+  }
+
   /**
    An exception used when the integer value of the color would result in an overflow of `UInt32`.
    */

package/ios/Core/Convertibles/Convertibles+Color.swift

@@ -7,7 +7,7 @@ extension UIColor: Convertible {
       if let namedColorComponents = namedColors[value] {
         return uiColorWithComponents(namedColorComponents.map { $0 / 255 }) as! Self
       }
-      return try Conversions.toColor(hexString: value) as! Self
+      return try Conversions.toColor(colorString: value) as! Self
     }
     if let components = value as? [Double] {
       return uiColorWithComponents(components) as! Self

package/ios/Core/DynamicTypes/DynamicSharedObjectType.swift

@@ -59,28 +59,39 @@ internal struct DynamicSharedObjectType: AnyDynamicType {
   }
 
   func convertResult<ResultType>(_ result: ResultType, appContext: AppContext) throws -> Any {
-    // If the result is a native shared object, create its JS representation and add the pair to the registry of shared objects.
-    if let sharedObject = result as? SharedObject {
-      // If the JS object already exists, just return it.
-      if let jsObject = sharedObject.getJavaScriptObject() {
-        return jsObject
-      }
-      guard let jsObject = try? appContext.newObject(nativeClassId: typeIdentifier) else {
-        log.warn("Unable to create a JS object for \(description)")
-        return Optional<Any>.none as Any
-      }
+    // Postpone object creation to execute on the JS thread.
+    JavaScriptSharedObjectBinding.init {
+      // If the result is a native shared object, create its JS representation and add the pair to the registry of shared objects.
+      if let sharedObject = result as? SharedObject {
+        // If the JS object already exists, just return it.
+        if let jsObject = sharedObject.getJavaScriptObject() {
+          return jsObject
+        }
+        guard let jsObject = try? appContext.newObject(nativeClassId: typeIdentifier) else {
+          // Throwing is not possible here due to swift-objC interop.
+          log.warn("Unable to create a JS object for \(description)")
+          return JavaScriptObject()
+        }
 
-      // Add newly created objects to the registry.
-      appContext.sharedObjectRegistry.add(native: sharedObject, javaScript: jsObject)
+        // Add newly created objects to the registry.
+        appContext.sharedObjectRegistry.add(native: sharedObject, javaScript: jsObject)
 
-      return jsObject
+        return jsObject
+      }
+      return JavaScriptObject()
     }
-    return result
   }
 
   var description: String {
     return "SharedObject<\(innerType)>"
   }
+
+  func castToJS<ValueType>(_ value: ValueType, appContext: AppContext) throws -> JavaScriptValue {
+    if let value = value as? JavaScriptSharedObjectBinding {
+      return try JavaScriptValue.from(value.get(), runtime: appContext.runtime)
+    }
+    throw NativeSharedObjectNotFoundException()
+  }
 }
 
 internal final class NativeSharedObjectNotFoundException: Exception {

package/ios/Core/Functions/AsyncFunctionDefinition.swift

@@ -65,7 +65,7 @@ public final class AsyncFunctionDefinition<Args, FirstArgType, ReturnType>: AnyA
 
   func call(by owner: AnyObject?, withArguments args: [Any], appContext: AppContext, callback: @escaping (FunctionCallResult) -> ()) {
     let promise = Promise(appContext: appContext) { value in
-      callback(.success(Conversions.convertFunctionResult(value, appContext: appContext)))
+      callback(.success(Conversions.convertFunctionResult(value, appContext: appContext, dynamicType: ~ReturnType.self)))
     } rejecter: { exception in
       callback(.failure(exception))
     }

package/ios/Core/Promise.swift

@@ -19,17 +19,6 @@ public struct Promise: AnyArgument {
   }
 
   public func resolve(_ value: Any? = nil) {
-    if let value = value as? AnySharedObject {
-      resolver(JavaScriptSharedObjectBinding.init {
-        return Conversions.convertFunctionResult(
-          value,
-          appContext: appContext,
-          dynamicType: type(of: value).getDynamicType()
-          // swiftlint:disable:next force_cast
-        ) as! JavaScriptObject
-      })
-      return
-    }
     resolver(value)
   }
 

package/ios/Core/Views/ConcreteViewProp.swift

@@ -16,6 +16,11 @@ public final class ConcreteViewProp<ViewType: UIView, PropType: AnyArgument>: An
    */
   private let propType: AnyDynamicType
 
+  /**
+   Default prop value
+   */
+  private let defaultValue: PropType?
+
   /**
    Closure to call to set the actual property on the given view.
    */
@@ -24,6 +29,14 @@ public final class ConcreteViewProp<ViewType: UIView, PropType: AnyArgument>: An
   internal init(name: String, propType: AnyDynamicType, setter: @escaping SetterType) {
     self.name = name
     self.propType = propType
+    self.defaultValue = nil
+    self.setter = setter
+  }
+
+  internal init(name: String, propType: AnyDynamicType, defaultValue: PropType, setter: @escaping SetterType) {
+    self.name = name
+    self.propType = propType
+    self.defaultValue = defaultValue
     self.setter = setter
   }
 
@@ -36,6 +49,9 @@ public final class ConcreteViewProp<ViewType: UIView, PropType: AnyArgument>: An
     guard let view = view as? ViewType else {
       throw IncompatibleViewException((propName: name, viewType: ViewType.self))
     }
+    if Optional.isNil(value), let defaultValue {
+      return setter(view, defaultValue)
+    }
     guard let value = try propType.cast(value, appContext: appContext) as? PropType else {
       throw Conversions.CastingException<PropType>(value)
     }

package/ios/Core/Views/SwiftUI/Convertibles+SwiftUI.swift

@@ -8,8 +8,70 @@ extension Color: Convertible {
     if let uiColor = try? UIColor.convert(from: value, appContext: appContext) {
       return Color(uiColor)
     }
+    // Context-dependent colors
+    if let stringValue = value as? String, let color = colorFromName(stringValue) {
+      return color
+    }
     throw Conversions.ConvertingException<Color>(value)
   }
+
+  private static func colorFromName(_ name: String) -> Color? {
+    switch name {
+    case "primary":
+      return .primary
+    case "secondary":
+      return .secondary
+    case "red":
+      return .red
+    case "orange":
+      return .orange
+    case "yellow":
+      return .yellow
+    case "green":
+      return .green
+    case "blue":
+      return .blue
+    case "purple":
+      return .purple
+    case "pink":
+      return .pink
+    case "white":
+      return .white
+    case "gray":
+      return .gray
+    case "black":
+      return .black
+    case "clear":
+      return .clear
+    case "mint":
+      if #available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *) {
+        return .mint
+      }
+      return nil
+    case "teal":
+      if #available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *) {
+        return .teal
+      }
+      return nil
+    case "cyan":
+      if #available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *) {
+        return .cyan
+      }
+      return nil
+    case "indigo":
+      if #available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *) {
+        return .indigo
+      }
+      return nil
+    case "brown":
+      if #available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *) {
+        return .brown
+      }
+      return nil
+    default:
+      return nil
+    }
+  }
 }
 
 extension UnitPoint: Convertible {

package/ios/Core/Views/SwiftUI/SwiftUIHostingView.swift

@@ -12,6 +12,13 @@ internal protocol AnyExpoSwiftUIHostingView {
 }
 
 extension ExpoSwiftUI {
+  /**
+   Checks if the child view is wrapped by a `UIViewHost` and matches the specified SwiftUI view type.
+   */
+  public static func isHostingView(_ view: any AnyChild) -> Bool {
+    return view is UIViewHost
+  }
+
   /**
    Checks if the child view is wrapped by a `UIViewHost` and matches the specified SwiftUI view type.
    */

package/ios/DevTools/ExpoRequestInterceptorProtocol.swift

@@ -149,6 +149,46 @@ public final class ExpoRequestInterceptorProtocol: URLProtocol, URLSessionDataDe
     client?.urlProtocol(self, didReceive: challengeWithSender)
   }
 
+  public func urlSession(
+    _ session: URLSession,
+    task: URLSessionTask,
+    didSendBodyData bytesSent: Int64,
+    totalBytesSent: Int64,
+    totalBytesExpectedToSend: Int64
+  ) {
+    // swiftlint:disable line_length
+    // Apple does not support sending upload progress from URLProtocol back to URLProtocolClient.
+    // > Similarly, there is no way for your NSURLProtocol subclass to call the NSURLConnection delegate's -connection:needNewBodyStream: or -connection:didSendBodyData:totalBytesWritten:totalBytesExpectedToWrite: methods (<rdar://problem/9226155> and <rdar://problem/9226157>).  The latter is not a serious concern--it just means that your clients don't get upload progress--but the former is a real issue.  If you're in a situation where you might need a second copy of a request body, you will need your own logic to make that copy, including the case where the body is a stream.
+    // See: https://developer.apple.com/library/archive/samplecode/CustomHTTPProtocol/Listings/Read_Me_About_CustomHTTPProtocol_txt.html
+    //
+    // Workaround to get the original task's URLSessionDelegate through the internal property and send upload process
+    // Fixes https://github.com/expo/expo/issues/28269
+    // swiftlint:enable line_length
+    guard let dataTask = dataTask_ else {
+      return
+    }
+
+    // Prevent recursive delegate calls
+    if task === dataTask {
+      return
+    }
+
+    if #available(iOS 15.0, tvOS 15.0, macOS 12.0, *), let delegate = dataTask.delegate {
+      // For the case if the task has a dedicated delegate than the default delegate from its URLSession
+      delegate.urlSession?(
+        session, task: dataTask, didSendBodyData: bytesSent, totalBytesSent: totalBytesSent, totalBytesExpectedToSend: totalBytesExpectedToSend
+      )
+      return
+    }
+    guard let session = task.value(forKey: "session") as? URLSession,
+      let delegate = session.delegate as? URLSessionTaskDelegate else {
+      return
+    }
+    delegate.urlSession?(
+      session, task: dataTask, didSendBodyData: bytesSent, totalBytesSent: totalBytesSent, totalBytesExpectedToSend: totalBytesExpectedToSend
+    )
+  }
+
   /**
    Data structure to save the response for redirection
    */