@expo/ui 57.0.21 → 57.0.23

package/ios/Modifiers/ContainerBackgroundModifier.swift

@@ -2,20 +2,18 @@
 
 import ExpoModulesCore
 import SwiftUI
-#if !os(tvOS)
-import WidgetKit
-#endif
 
 internal enum ContainerBackgroundPlacementOptions: String, Enumerable {
   case widget
   case navigation
   case navigationSplitView
 
-#if !os(tvOS)
+#if !os(tvOS) && !os(macOS)
+  // `widget` is declared in WidgetKit, so expo-widgets applies it through `ViewModifierRegistry.widgetKit`.
   @available(iOS 18.0, *)
-  var toContainerBackgroundPlacement: ContainerBackgroundPlacement {
+  var toContainerBackgroundPlacement: ContainerBackgroundPlacement? {
     switch self {
-    case .widget: return .widget
+    case .widget: return nil
     case .navigation: return .navigation
     case .navigationSplitView: return .navigationSplitView
     }
@@ -28,20 +26,35 @@ internal struct ContainerBackgroundModifier: ViewModifier, Record {
   @Field var container: ContainerBackgroundPlacementOptions?
 
   func body(content: Content) -> some View {
-#if !os(tvOS)
+#if os(tvOS) || os(macOS)
+    content
+#else
     if let shapeStyle = style?.toAnyShapeStyle(), let container {
-      if #available(iOS 18.0, *) {
-        content.containerBackground(shapeStyle, for: container.toContainerBackgroundPlacement)
-      } else if #available(iOS 17.0, *) {
-        content.containerBackground(shapeStyle, for: .widget)
+      if container == .widget, let widgetKit = ViewModifierRegistry.widgetKit {
+        widgetKit.containerBackground(AnyView(content), style: shapeStyle)
+      } else if #available(iOS 18.0, *), let placement = container.toContainerBackgroundPlacement {
+        content.containerBackground(shapeStyle, for: placement)
+      } else if let widgetKit = ViewModifierRegistry.widgetKit {
+        // On iOS 17, the other placements fall back to `widget`.
+        widgetKit.containerBackground(AnyView(content), style: shapeStyle)
       } else {
         content
       }
     } else {
       content
     }
-#else
-    content
 #endif
   }
+
+#if DEBUG
+  private static var didWarnAboutWidgetPlacement = false
+
+  func warnIfWidgetPlacementIsUnavailable() {
+    guard container == .widget, ViewModifierRegistry.widgetKit == nil, !Self.didWarnAboutWidgetPlacement else {
+      return
+    }
+    Self.didWarnAboutWidgetPlacement = true
+    log.warn("containerBackground with the 'widget' placement has no effect here, because it only applies inside widgets rendered by expo-widgets. Use the 'navigation' or 'navigationSplitView' placement in app screens.")
+  }
+#endif
 }

package/ios/Modifiers/PreferredColorSchemeModifier.swift

@@ -0,0 +1,12 @@
+// Copyright 2025-present 650 Industries. All rights reserved.
+
+import ExpoModulesCore
+import SwiftUI
+
+internal struct PreferredColorSchemeModifier: ViewModifier, Record {
+  @Field var colorScheme: ColorSchemeType?
+
+  func body(content: Content) -> some View {
+    content.preferredColorScheme(colorScheme?.toNativeColorScheme())
+  }
+}

package/ios/Modifiers/PresentationModifiers.swift

@@ -238,23 +238,39 @@ internal enum PresentationSizingOption: String, Enumerable {
   case page
 }
 
+internal struct PresentationSizingFittedAxes: Record {
+  @Field var horizontal: Bool = false
+  @Field var vertical: Bool = false
+}
+
 internal struct PresentationSizingModifier: ViewModifier, Record {
   @Field var sizing: PresentationSizingOption = .automatic
+  @Field var fitted: PresentationSizingFittedAxes?
 
   func body(content: Content) -> some View {
     if #available(iOS 18.0, tvOS 18.0, macOS 15.0, *) {
       switch sizing {
       case .automatic:
-        content.presentationSizing(.automatic)
+        applySizing(content, .automatic)
       case .fitted:
-        content.presentationSizing(.fitted)
+        applySizing(content, .fitted)
       case .form:
-        content.presentationSizing(.form)
+        applySizing(content, .form)
       case .page:
-        content.presentationSizing(.page)
+        applySizing(content, .page)
       }
     } else {
       content
     }
   }
+
+  @available(iOS 18.0, tvOS 18.0, macOS 15.0, *)
+  @ViewBuilder
+  private func applySizing(_ content: Content, _ sizing: some PresentationSizing) -> some View {
+    if let fitted {
+      content.presentationSizing(sizing.fitted(horizontal: fitted.horizontal, vertical: fitted.vertical))
+    } else {
+      content.presentationSizing(sizing)
+    }
+  }
 }

package/ios/Modifiers/SearchToolbarBehaviorModifier.swift

@@ -0,0 +1,35 @@
+// Copyright 2026-present 650 Industries. All rights reserved.
+
+import ExpoModulesCore
+import SwiftUI
+
+internal enum SearchToolbarBehaviorType: String, Enumerable {
+  case automatic
+  case minimize
+}
+
+internal struct SearchToolbarBehaviorModifier: ViewModifier, Record {
+  @Field var behavior: SearchToolbarBehaviorType = .automatic
+
+  @ViewBuilder
+  func body(content: Content) -> some View {
+    if #available(iOS 26.0, macOS 26.0, tvOS 26.0, *) {
+#if compiler(>=6.2) // Xcode 26
+      switch behavior {
+      case .automatic:
+        content.searchToolbarBehavior(.automatic)
+      case .minimize:
+#if os(macOS) || os(tvOS)
+        content.searchToolbarBehavior(.automatic)
+#else
+        content.searchToolbarBehavior(.minimize)
+#endif
+      }
+#else
+      content
+#endif
+    } else {
+      content
+    }
+  }
+}

package/ios/Modifiers/SearchableModifier.swift

@@ -0,0 +1,94 @@
+// Copyright 2026-present 650 Industries. All rights reserved.
+
+import ExpoModulesCore
+import SwiftUI
+
+internal enum SearchFieldPlacementType: String, Enumerable {
+  case automatic
+  case toolbar
+  case sidebar
+  case navigationBarDrawer
+
+  var toSearchFieldPlacement: SearchFieldPlacement {
+    switch self {
+    case .automatic:
+      return .automatic
+    case .toolbar:
+#if os(tvOS)
+      return .automatic
+#else
+      return .toolbar
+#endif
+    case .sidebar:
+#if os(tvOS)
+      return .automatic
+#else
+      return .sidebar
+#endif
+    case .navigationBarDrawer:
+#if os(iOS)
+      return .navigationBarDrawer
+#else
+      return .automatic
+#endif
+    }
+  }
+}
+
+internal struct SearchableModifier: ViewModifier, Record {
+  @Field var text: ObservableState?
+  @Field var placement: SearchFieldPlacementType = .automatic
+  @Field var prompt: String?
+  var eventDispatcher: EventDispatcher?
+
+  init() {}
+
+  init(from params: Dict, appContext: AppContext, eventDispatcher: EventDispatcher) throws {
+    try self = .init(from: params, appContext: appContext)
+    self.eventDispatcher = eventDispatcher
+  }
+
+  @ViewBuilder
+  func body(content: Content) -> some View {
+    if let text {
+      SearchableWrapper(
+        state: text,
+        placement: placement,
+        prompt: prompt,
+        eventDispatcher: eventDispatcher
+      ) {
+        content
+      }
+    } else {
+      content
+    }
+  }
+}
+
+private struct SearchableWrapper<C: View>: View {
+  @ObservedObject var state: ObservableState
+  let placement: SearchFieldPlacementType
+  let prompt: String?
+  let eventDispatcher: EventDispatcher?
+  @ViewBuilder let content: () -> C
+
+  var body: some View {
+    // The search field writes through the binding. Only report edits that come from the field,
+    // so a value written from JavaScript does not bounce back as an event.
+    let query = Binding<String>(
+      get: { state.value as? String ?? "" },
+      set: { newValue in
+        guard newValue != state.value as? String else {
+          return
+        }
+        state.value = newValue
+        eventDispatcher?(["searchable": ["text": newValue]])
+      }
+    )
+    if let prompt {
+      content().searchable(text: query, placement: placement.toSearchFieldPlacement, prompt: prompt)
+    } else {
+      content().searchable(text: query, placement: placement.toSearchFieldPlacement)
+    }
+  }
+}

package/ios/Modifiers/View+ModifierArray.swift

@@ -67,10 +67,10 @@ internal extension Image {
         )
       }
 
-      if #available(iOS 18.0, *),
+      if let widgetKit = ViewModifierRegistry.widgetKit,
          let modifierConfig = modifiers.first(where: { $0["$type"] as? String == "widgetAccentedRenderingMode" }),
-         let modifier = try? WidgetAccentedRenderingModeModifier(from: modifierConfig, appContext: appContext) {
-        modifier.apply(to: image)
+         let view = widgetKit.widgetAccentedRenderingMode(image, params: modifierConfig, appContext: appContext) {
+        view
       } else {
         image
       }

package/ios/Modifiers/ViewModifierRegistry.swift

@@ -1529,6 +1529,8 @@ public class ViewModifierRegistry {
   public typealias ModifierFactory = ([String: Any], AppContext, EventDispatcher) throws -> any ViewModifier
   private(set) internal var modifierFactories: [String: ModifierFactory] = [:]
 
+  public static var widgetKit: WidgetKitModifiers?
+
   private init() {
     registerBuiltInModifiers()
   }
@@ -1813,6 +1815,83 @@ internal struct NavigationTitleModifier: ViewModifier, Record {
   }
 }
 
+internal enum NavigationBarTitleDisplayMode: String, Enumerable {
+  case automatic
+  case inline
+  case large
+
+#if os(iOS)
+  var value: NavigationBarItem.TitleDisplayMode {
+    switch self {
+    case .automatic:
+      return .automatic
+    case .inline:
+      return .inline
+    case .large:
+      return .large
+    }
+  }
+#endif
+}
+
+internal struct NavigationBarTitleDisplayModeModifier: ViewModifier, Record {
+  @Field var displayMode: NavigationBarTitleDisplayMode = .automatic
+
+  func body(content: Content) -> some View {
+#if os(iOS)
+    content.navigationBarTitleDisplayMode(displayMode.value)
+#else
+    content
+#endif
+  }
+}
+
+internal enum ToolbarTitleDisplayModeType: String, Enumerable {
+  case automatic
+  case inline
+  case inlineLarge
+  case large
+
+  @available(iOS 17.0, tvOS 17.0, macOS 14.0, *)
+  var value: SwiftUI.ToolbarTitleDisplayMode? {
+    switch self {
+    case .automatic:
+      return .automatic
+    case .inline:
+      return .inline
+    case .inlineLarge:
+#if os(tvOS)
+      return nil
+#else
+      return .inlineLarge
+#endif
+    case .large:
+#if os(iOS)
+      return .large
+#else
+      return nil
+#endif
+    }
+  }
+}
+
+internal struct ToolbarTitleDisplayModeModifier: ViewModifier, Record {
+  @Field var mode: ToolbarTitleDisplayModeType = .automatic
+
+  @ViewBuilder
+  func body(content: Content) -> some View {
+    if #available(iOS 17.0, tvOS 17.0, macOS 14.0, *) {
+      if let value = mode.value {
+        content.toolbarTitleDisplayMode(value)
+      } else {
+        content
+      }
+    } else {
+      content
+    }
+  }
+}
+
 // MARK: - Built-in Modifier Registration
 
 // swiftlint:disable:next no_grouping_extension
@@ -1989,6 +2068,14 @@ extension ViewModifierRegistry {
       return try NavigationTitleModifier(from: params, appContext: appContext)
     }
 
+    register("navigationBarTitleDisplayMode") { params, appContext, _ in
+      return try NavigationBarTitleDisplayModeModifier(from: params, appContext: appContext)
+    }
+
+    register("toolbarTitleDisplayMode") { params, appContext, _ in
+      return try ToolbarTitleDisplayModeModifier(from: params, appContext: appContext)
+    }
+
     register("navigationSplitViewStyle") { params, appContext, _ in
       return try NavigationSplitViewStyleModifier(from: params, appContext: appContext)
     }
@@ -1997,6 +2084,26 @@ extension ViewModifierRegistry {
       return try NavigationSplitViewColumnWidthModifier(from: params, appContext: appContext)
     }
 
+    register("arrangementViewStyle") { params, appContext, _ in
+      return try ArrangementViewStyleModifier(from: params, appContext: appContext)
+    }
+
+    register("splitArrangementLayoutRatio") { params, appContext, _ in
+      return try SplitArrangementLayoutRatioModifier(from: params, appContext: appContext)
+    }
+
+    register("splitArrangementLayoutSize") { params, appContext, _ in
+      return try SplitArrangementLayoutSizeModifier(from: params, appContext: appContext)
+    }
+
+    register("splitArrangementFixedLayoutSize") { params, appContext, _ in
+      return try SplitArrangementFixedLayoutSizeModifier(from: params, appContext: appContext)
+    }
+
+    register("overlayArrangementEdge") { params, appContext, _ in
+      return try OverlayArrangementEdgeModifier(from: params, appContext: appContext)
+    }
+
     register("accessibilityLabel") { params, appContext, _ in
       return try AccessibilityLabelModifier(from: params, appContext: appContext)
     }
@@ -2269,6 +2376,14 @@ extension ViewModifierRegistry {
       return try ScrollPositionModifier(from: params, appContext: appContext, eventDispatcher: eventDispatcher)
     }
 
+    register("searchable") { params, appContext, eventDispatcher in
+      return try SearchableModifier(from: params, appContext: appContext, eventDispatcher: eventDispatcher)
+    }
+
+    register("searchToolbarBehavior") { params, appContext, _ in
+      return try SearchToolbarBehaviorModifier(from: params, appContext: appContext)
+    }
+
     register("pickerStyle") { params, appContext, _ in
       return try PickerStyleModifier(from: params, appContext: appContext)
     }
@@ -2305,6 +2420,10 @@ extension ViewModifierRegistry {
       return try ScrollDisabledModifier(from: params, appContext: appContext)
     }
 
+    register("preferredColorScheme") { params, appContext, _ in
+      return try PreferredColorSchemeModifier(from: params, appContext: appContext)
+    }
+
     register("scrollClipDisabled") { params, appContext, _ in
       return try ScrollClipDisabledModifier(from: params, appContext: appContext)
     }
@@ -2389,14 +2508,6 @@ extension ViewModifierRegistry {
       return try ContentTransitionModifier(from: params, appContext: appContext)
     }
 
-    register("widgetURL") { params, appContext, _ in
-      return try WidgetURLModifier(from: params, appContext: appContext)
-    }
-
-    register("activityBackgroundTint") { params, appContext, _ in
-      return try ActivityBackgroundTintModifier(from: params, appContext: appContext)
-    }
-
     register("keyboardType") { params, appContext, _ in
       return try KeyboardTypeModifier(from: params, appContext: appContext)
     }
@@ -2410,7 +2521,11 @@ extension ViewModifierRegistry {
     }
 
     register("containerBackground") { params, appContext, _ in
-      return try ContainerBackgroundModifier(from: params, appContext: appContext)
+      let modifier = try ContainerBackgroundModifier(from: params, appContext: appContext)
+      #if DEBUG
+      modifier.warnIfWidgetPlacementIsUnavailable()
+      #endif
+      return modifier
     }
 
     register("symbolEffect") { params, appContext, _ in

package/ios/Modifiers/WidgetKitModifiers.swift

@@ -0,0 +1,13 @@
+// Copyright 2026-present 650 Industries. All rights reserved.
+
+import ExpoModulesCore
+import SwiftUI
+
+/**
+ * The parts of SwiftUI that are declared in WidgetKit. expo-widgets sets
+ * `ViewModifierRegistry.widgetKit`, so ExpoUI does not link WidgetKit.
+ */
+public protocol WidgetKitModifiers {
+  func containerBackground(_ view: AnyView, style: AnyShapeStyle) -> AnyView
+  func widgetAccentedRenderingMode(_ image: Image, params: [String: Any], appContext: AppContext) -> AnyView?
+}

package/ios/Picker/PickerView.swift

@@ -12,6 +12,7 @@ internal final class PickerProps: UIBaseViewProps {
 
 internal struct PickerView: ExpoSwiftUI.View {
   @State var selection: AnyHashable?
+  @State private var previousSelection: AnyHashable?
   @ObservedObject var props: PickerProps
   
   init(props: PickerProps) {
@@ -38,11 +39,8 @@ internal struct PickerView: ExpoSwiftUI.View {
 
     picker
     .onChange(of: selection) { newValue in
-      guard let newValue else { return }
-      let currentSelection = Self.getHashableFromEither(props.selection)
-      if currentSelection == newValue {
-        return
-      }
+      guard let newValue, newValue != previousSelection else { return }
+      previousSelection = newValue
       let payload: [String: Any]
       if let stringValue = newValue as? String {
         payload = ["selection": stringValue]
@@ -54,10 +52,14 @@ internal struct PickerView: ExpoSwiftUI.View {
       props.onSelectionChange(payload)
     }
     .onChange(of: props.selection) { newValue in
-      selection = Self.getHashableFromEither(newValue)
+      let newSelection = Self.getHashableFromEither(newValue)
+      previousSelection = newSelection
+      selection = newSelection
     }
     .onAppear {
-      selection = Self.getHashableFromEither(props.selection)
+      let initialSelection = Self.getHashableFromEither(props.selection)
+      previousSelection = initialSelection
+      selection = initialSelection
     }
   }
 

package/ios/RNHostView.swift

@@ -4,7 +4,8 @@ import SwiftUI
 import ExpoModulesCore
 
 internal final class RNHostViewProps: ExpoSwiftUI.ViewProps {
-  @Field var matchContents: Bool = false
+  @Field var matchContentsHorizontal: Bool = false
+  @Field var matchContentsVertical: Bool = false
   /**
    Adds LeafNode and MeasurableYogaNode trait in Shadow node
    */
@@ -50,8 +51,13 @@ struct RNHostView: ExpoSwiftUI.View {
 
   @ViewBuilder
   private var hostedContent: some View {
-    if props.matchContents, let childUIView = firstChildUIView {
-      ApplySizeFromYogaNode(childUIView: childUIView) {
+    if matchesContents, let childUIView = firstChildUIView {
+      ApplySizeFromYogaNode(
+        childUIView: childUIView,
+        horizontal: props.matchContentsHorizontal,
+        vertical: props.matchContentsVertical,
+        shadowNodeProxy: props.shadowNodeProxy
+      ) {
         Children()
       }
       .onAppear {
@@ -62,7 +68,7 @@ struct RNHostView: ExpoSwiftUI.View {
       .onDisappear {
         touchHandler.detach()
       }
-    } else if props.matchContents {
+    } else if matchesContents {
       // No hosted UIView (a pure SwiftUI child, e.g. Text/Image). Render it at its
       // natural size instead of falling into the fill branch below, which would
       // stretch a self-sizing SwiftUI view to fill its container.
@@ -87,6 +93,10 @@ struct RNHostView: ExpoSwiftUI.View {
     }
   }
 
+  private var matchesContents: Bool {
+    props.matchContentsHorizontal || props.matchContentsVertical
+  }
+
   private var firstChildUIView: UIView? {
     props.children?.first?.uiView
   }
@@ -143,20 +153,52 @@ private final class RNHostTouchHandler: ObservableObject {
   }
 }
 
-// Sets SwiftUI view size from Yoga node size
+// Sets SwiftUI view size from Yoga node size on the matched axes
 // Listens to Yoga node size changes and updates the SwiftUI view size
+// An axis that is not matched fills the parent and reports its size to the Yoga node instead
 private struct ApplySizeFromYogaNode<Content: SwiftUI.View>: SwiftUI.View {
   @StateObject private var observer: Observer
+  let horizontal: Bool
+  let vertical: Bool
+  let shadowNodeProxy: ExpoSwiftUI.ShadowNodeProxy
   let content: Content
 
-  init(childUIView: UIView, @ViewBuilder content: () -> Content) {
+  init(
+    childUIView: UIView,
+    horizontal: Bool,
+    vertical: Bool,
+    shadowNodeProxy: ExpoSwiftUI.ShadowNodeProxy,
+    @ViewBuilder content: () -> Content
+  ) {
     _observer = StateObject(wrappedValue: Observer(view: childUIView))
+    self.horizontal = horizontal
+    self.vertical = vertical
+    self.shadowNodeProxy = shadowNodeProxy
     self.content = content()
   }
 
   var body: some SwiftUI.View {
-    content
-      .frame(width: observer.size.width, height: observer.size.height)
+    if horizontal && vertical {
+      content
+        .frame(width: observer.size.width, height: observer.size.height)
+    } else {
+      content
+        .frame(
+          width: horizontal ? observer.size.width : nil,
+          height: vertical ? observer.size.height : nil
+        )
+        .frame(
+          maxWidth: horizontal ? nil : .infinity,
+          maxHeight: vertical ? nil : .infinity
+        )
+        .modifier(
+          ReportSizeToYogaNodeModifier(
+            shadowNodeProxy: shadowNodeProxy,
+            reportWidth: !horizontal,
+            reportHeight: !vertical
+          )
+        )
+    }
   }
 
   @MainActor
@@ -183,9 +225,13 @@ private struct ApplySizeFromYogaNode<Content: SwiftUI.View>: SwiftUI.View {
 // Listens to SwiftUI view size changes and updates the Yoga node size
 private struct ReportSizeToYogaNodeModifier: ViewModifier {
   let shadowNodeProxy: ExpoSwiftUI.ShadowNodeProxy
+  var reportWidth = true
+  var reportHeight = true
 
   private func handleSizeChange(_ size: CGSize) {
-    shadowNodeProxy.setViewSize?(size)
+    shadowNodeProxy.setViewSize?(
+      CGSize(width: reportWidth ? size.width : .nan, height: reportHeight ? size.height : .nan)
+    )
   }
 
   func body(content: Content) -> some View {

package/local-maven-repo/expo/modules/ui/expo.modules.ui/57.0.23/expo.modules.ui-57.0.23-sources.jar.md5

@@ -0,0 +1 @@
+9e119ee5a1c2c38e6d69d4f866341e7a

package/local-maven-repo/expo/modules/ui/expo.modules.ui/57.0.23/expo.modules.ui-57.0.23-sources.jar.sha1

@@ -0,0 +1 @@
+04332c3498b6b2a56dfb4cbefe592c11f4a8f36a

package/local-maven-repo/expo/modules/ui/expo.modules.ui/57.0.23/expo.modules.ui-57.0.23-sources.jar.sha256

@@ -0,0 +1 @@
+5f4063182b296fa0028d945a2621f9d8a86eb5219b0ad88492a18dfe4d737978

package/local-maven-repo/expo/modules/ui/expo.modules.ui/57.0.23/expo.modules.ui-57.0.23-sources.jar.sha512

@@ -0,0 +1 @@
+0a89146da34d837d01eb682540df3405b70f6b1d18c50bedc2ecc1d0dee3188df777de03a5b629100950a0f6d3c2d9f89f52416641cb22d8f3a715c8e841ff18

package/local-maven-repo/expo/modules/ui/expo.modules.ui/57.0.23/expo.modules.ui-57.0.23.aar.md5

@@ -0,0 +1 @@
+53230bb5c7cc2bcc0d717bc544974f6c

package/local-maven-repo/expo/modules/ui/expo.modules.ui/57.0.23/expo.modules.ui-57.0.23.aar.sha1

@@ -0,0 +1 @@
+bc99884c9e5f484800ffb10156cc8b50fa4d31c8

package/local-maven-repo/expo/modules/ui/expo.modules.ui/57.0.23/expo.modules.ui-57.0.23.aar.sha256

@@ -0,0 +1 @@
+45594b39ac8f0c6eb37b663d40160b8e93b6d5f56b985a739c8a03c6780d910f

package/local-maven-repo/expo/modules/ui/expo.modules.ui/57.0.23/expo.modules.ui-57.0.23.aar.sha512

@@ -0,0 +1 @@
+7ba6b0ca0e41c0aeaea90cfc7d49664bb88531a251ba79b1124009eba0b724b48ba1c306744111a40871213cdf5767638b931803dc2229c4ba1850b6cc87ca15