@expo/ui 55.0.1 → 55.0.3

package/ios/Modifiers/ViewModifierRegistry.swift

@@ -780,7 +780,6 @@ internal struct ListRowBackground: ViewModifier, Record {
   }
 }
 
-
 internal enum VerticalEdgeOptions: String, Enumerable {
   case all
   case top
@@ -1106,7 +1105,7 @@ internal enum AxisOptions: String, Enumerable {
   case horizontal
   case vertical
   case both
-  
+
   func toAxis() -> Axis.Set {
     switch self {
     case .vertical:
@@ -1307,7 +1306,7 @@ public class ViewModifierRegistry {
   }
 
   /**
-    * Applies `Text returning modifiers. Useful for Text concatenation in TextView.
+   * Applies Text returning modifiers. Useful for Text concatenation in TextView.
    */
   func applyTextModifier(
     _ type: String,
@@ -1353,6 +1352,29 @@ public class ViewModifierRegistry {
     }
   }
 
+  /**
+   * Applies Image returning modifiers.
+   */
+  func applyImageModifier(
+    _ type: String,
+    to image: Image,
+    appContext: AppContext,
+    params: [String: Any]
+  ) -> Image {
+    switch type {
+    case "resizable":
+      guard let modifier = try? ResizableModifier(from: params, appContext: appContext)
+      else { return image.resizable() }
+      return image.resizable(capInsets: EdgeInsets(top: modifier.top, leading: modifier.leading, bottom: modifier.bottom, trailing: modifier.trailing), resizingMode: modifier.resizingMode.toResizingMode)
+    default:
+      #if DEBUG
+      return image
+      #else
+      return image
+      #endif
+    }
+  }
+
   /**
    * Checks if a modifier type is registered.
    */
@@ -1500,6 +1522,10 @@ extension ViewModifierRegistry {
       return try RotationEffectModifier(from: params, appContext: appContext)
     }
 
+    register("rotation3DEffect") { params, appContext, _ in
+      return try Rotation3DEffectModifier(from: params, appContext: appContext)
+    }
+
     register("offset") { params, appContext, _ in
       return try OffsetModifier(from: params, appContext: appContext)
     }
@@ -1816,6 +1842,14 @@ extension ViewModifierRegistry {
       return try ScrollDisabledModifier(from: params, appContext: appContext)
     }
 
+    register("defaultScrollAnchor") { params, appContext, _ in
+      return try DefaultScrollAnchorModifier(from: params, appContext: appContext)
+    }
+
+    register("defaultScrollAnchorForRole") { params, appContext, _ in
+      return try DefaultScrollAnchorForRoleModifier(from: params, appContext: appContext)
+    }
+
     register("progressViewStyle") { params, appContext, _ in
       return try ProgressViewStyleModifier(from: params, appContext: appContext)
     }

package/ios/Modifiers/WidgetModifiers.swift

@@ -0,0 +1,46 @@
+// Copyright 2015-present 650 Industries. All rights reserved.
+
+import ExpoModulesCore
+import SwiftUI
+#if !os(tvOS)
+import WidgetKit
+#endif
+
+internal enum WidgetAccentedRenderingModeOptions: String, Enumerable {
+  case accented
+  case desaturated
+  case accentedDesaturated
+  case fullColor
+
+#if !os(tvOS)
+  @available(iOS 18.0, *)
+  var toWidgetAccentedRenderingMode: WidgetAccentedRenderingMode {
+    switch self {
+    case .accented: return .accented
+    case .accentedDesaturated: return .accentedDesaturated
+    case .desaturated: return .desaturated
+    case .fullColor: return .fullColor
+    }
+  }
+#endif
+}
+
+/**
+ * This is a unique modifier that exists only on Image, but returns some View, and for this reason it cannot be a ViewModifier.
+ */
+internal struct WidgetAccentedRenderingModeModifier: Record {
+  @Field var renderingMode: WidgetAccentedRenderingModeOptions?
+
+  @ViewBuilder
+  func apply(to image: Image) -> some View {
+#if !os(tvOS)
+    if #available(iOS 18.0, *), renderingMode != nil {
+      image.widgetAccentedRenderingMode(renderingMode?.toWidgetAccentedRenderingMode)
+    } else {
+      image
+    }
+#else
+    image
+#endif
+  }
+}

package/ios/Picker/PickerView.swift

@@ -12,25 +12,17 @@ internal final class PickerProps: UIBaseViewProps {
 
 internal struct PickerView: ExpoSwiftUI.View {
   @State var selection: AnyHashable?
-  @State var prevSelection: AnyHashable?
   @ObservedObject var props: PickerProps
-
+  
   init(props: PickerProps) {
     self.props = props
-    let initialSelection = Self.getHashableFromEither(props.selection)
-    _selection = State(initialValue: initialSelection)
-    _prevSelection = State(initialValue: initialSelection)
   }
 
   @ViewBuilder
   private func makePicker() -> some View {
-    let content = (props.children?
-      .compactMap { $0.childView as? PickerContentView }
-      .first)
+    let content = props.children?.slot("content")
 
-    let labelContent = props.children?
-      .compactMap { $0.childView as? PickerLabelView }
-      .first
+    let labelContent = props.children?.slot("label")
 
     if let systemImage = props.systemImage, let label = props.label {
       Picker(label, systemImage: systemImage, selection: $selection) { content }
@@ -61,11 +53,11 @@ internal struct PickerView: ExpoSwiftUI.View {
       }
       props.onSelectionChange(payload)
     }
-    .onReceive(props.selection.publisher) { newValue in
-      let hashableValue = Self.getHashableFromEither(newValue)
-      if prevSelection == hashableValue { return }
-      selection = hashableValue
-      prevSelection = hashableValue
+    .onChange(of: props.selection) { newValue in
+      selection = Self.getHashableFromEither(newValue)
+    }
+    .onAppear {
+      selection = Self.getHashableFromEither(props.selection)
     }
   }
 

package/ios/Popover/PopoverProps.swift

@@ -8,10 +8,6 @@ internal class PopoverViewProps: UIBaseViewProps {
   @Field var arrowEdge: PopoverArrowEdgeOption?
 }
 
-internal final class PopoverViewContentPorps: ExpoSwiftUI.ViewProps {}
-
-internal final class PopoverViewPopContentPorps: ExpoSwiftUI.ViewProps {}
-
 internal enum PopoverAttachmentAnchorOption: String, Enumerable {
   case top
   case center

package/ios/Popover/PopoverView.swift

@@ -7,11 +7,6 @@ internal struct PopoverView: ExpoSwiftUI.View {
   @ObservedObject var props: PopoverViewProps
   @State private var isPresented: Bool = false
 
-  init(props: PopoverViewProps) {
-    self.props = props
-    _isPresented = State(initialValue: props.isPresented)
-  }
-
   var body: some View {
 #if os(tvOS)
     triggerContent
@@ -40,23 +35,22 @@ internal struct PopoverView: ExpoSwiftUI.View {
       .onChange(of: props.isPresented) { newValue in
         isPresented = newValue
       }
+      .onAppear {
+        isPresented = props.isPresented
+      }
 #endif
   }
 
   @ViewBuilder
   private var triggerContent: some View {
-    if let content = props.children?
-      .compactMap({ $0.childView as? PopoverViewContent })
-      .first {
+    if let content = props.children?.slot("trigger") {
       content
     }
   }
 
   @ViewBuilder
   private var popoverContent: some View {
-    if let content = props.children?
-      .compactMap({ $0.childView as? PopoverViewPopContent })
-      .first {
+    if let content = props.children?.slot("popover") {
       content
     }
   }

package/ios/ProgressView.swift

@@ -3,11 +3,6 @@
 import ExpoModulesCore
 import SwiftUI
 
-final class ClosedRangeDate: Record {
-  @Field var lower: Date?
-  @Field var upper: Date?
-}
-
 public final class ProgressViewProps: UIBaseViewProps {
   @Field var timerInterval: ClosedRangeDate?
   @Field var countsDown: Bool?

package/ios/RNHostView.swift

@@ -1,21 +1,102 @@
 // Copyright 2015-present 650 Industries. All rights reserved.
 
+import SwiftUI
 import ExpoModulesCore
 
-public final class RNHostView: ExpoView, ExpoSwiftUI.RNHostViewProtocol {
-  public required init(appContext: AppContext? = nil) {
-    super.init(appContext: appContext)
-    ExpoUITouchHandlerHelper.createAndAttachTouchHandler(for: self)
+internal final class RNHostViewProps: ExpoSwiftUI.ViewProps {
+  @Field var matchContents: Bool = false
+}
+
+struct RNHostView: ExpoSwiftUI.View {
+  
+  @ObservedObject var props: RNHostViewProps
+
+  var body: some View {
+    if props.matchContents, let childUIView = firstChildUIView {
+      ApplySizeFromYogaNode(childUIView: childUIView) {
+        Children()
+      }
+      .onAppear {
+        ExpoUITouchHandlerHelper.createAndAttachTouchHandler(for: childUIView)
+      }
+    } else {
+      Children()
+        .frame(maxWidth: .infinity, maxHeight: .infinity)
+        .modifier(ReportSizeToYogaNodeModifier(shadowNodeProxy: props.shadowNodeProxy))
+        .onAppear {
+          if let view = firstChildUIView {
+            ExpoUITouchHandlerHelper.createAndAttachTouchHandler(for: view)
+          }
+        }
+    }
+  }
+
+  private var firstChildUIView: UIView? {
+    props.children?.first?.uiView
+  }
+}
+
+// Sets SwiftUI view size from Yoga node size
+// Listens to Yoga node size changes and updates the SwiftUI view size
+private struct ApplySizeFromYogaNode<Content: SwiftUI.View>: SwiftUI.View {
+  @StateObject private var observer: Observer
+  let content: Content
+
+  init(childUIView: UIView, @ViewBuilder content: () -> Content) {
+    _observer = StateObject(wrappedValue: Observer(view: childUIView))
+    self.content = content()
   }
 
-  public var matchContents: Bool = false
+  var body: some SwiftUI.View {
+    content
+      .frame(width: observer.size.width, height: observer.size.height)
+  }
+
+  @MainActor
+  fileprivate class Observer: ObservableObject {
+    @Published var size: CGSize
+    private var kvoToken: NSKeyValueObservation?
+
+    init(view: UIView) {
+      self.size = view.bounds.size
+      kvoToken = view.observe(\.bounds) { [weak self] view, _ in
+        MainActor.assumeIsolated {
+          self?.size = view.bounds.size
+        }
+      }
+    }
+
+    deinit {
+      kvoToken?.invalidate()
+    }
+  }
+}
+
+// Sets Yoga node size from SwiftUI view size
+// Listens to SwiftUI view size changes and updates the Yoga node size
+private struct ReportSizeToYogaNodeModifier: ViewModifier {
+  let shadowNodeProxy: ExpoSwiftUI.ShadowNodeProxy
+
+  private func handleSizeChange(_ size: CGSize) {
+    shadowNodeProxy.setViewSize?(size)
+  }
 
-  public override func layoutSubviews() {
-    super.layoutSubviews()
-    if matchContents, let subview = self.subviews.first {
-      self.setViewSize(subview.bounds.size)
+  func body(content: Content) -> some View {
+    if #available(iOS 16.0, tvOS 16.0, macOS 13.0, *) {
+      content.onGeometryChange(for: CGSize.self, of: { proxy in proxy.size }) { size in
+        handleSizeChange(size)
+      }
     } else {
-      self.setViewSize(bounds.size)
+      content.overlay {
+        GeometryReader { geometry in
+          Color.clear
+            .hidden()
+            .onAppear {
+              handleSizeChange(geometry.size)
+            }
+            .onChange(of: geometry.size) { handleSizeChange($0) }
+        }
+      }
     }
   }
 }

package/ios/SectionView.swift

@@ -13,14 +13,12 @@ internal struct SectionView: ExpoSwiftUI.View {
   @ObservedObject var props: SectionProps
   @State private var isExpanded: Bool = true
 
-  init(props: SectionProps) {
-    self.props = props
-    _isExpanded = State(initialValue: props.isExpanded ?? true)
-  }
-
   var body: some View {
     if #available(iOS 17.0, macOS 14.0, tvOS 17.0, *), let propIsExpanded = props.isExpanded {
       collapsibleSection
+        .onAppear {
+          isExpanded = props.isExpanded ?? true
+        }
         .onChange(of: props.isExpanded) { newValue in
           if let newValue {
             isExpanded = newValue
@@ -95,21 +93,15 @@ internal struct SectionView: ExpoSwiftUI.View {
     }
   }
   
-  private var contentChildren: SectionContent? {
-    props.children?
-      .compactMap({ $0.childView as? SectionContent })
-      .first
+  private var contentChildren: SlotView? {
+    props.children?.slot("content")
   }
 
-  private var headerView: SectionHeader? {
-    props.children?
-      .compactMap({ $0.childView as? SectionHeader })
-      .first
+  private var headerView: SlotView? {
+    props.children?.slot("header")
   }
 
-  private var footerView: SectionFooter? {
-    props.children?
-      .compactMap({ $0.childView as? SectionFooter })
-      .first
+  private var footerView: SlotView? {
+    props.children?.slot("footer")
   }
 }

package/ios/SecureFieldView.swift

@@ -46,7 +46,6 @@ struct SecureFieldView: ExpoSwiftUI.View, ExpoSwiftUI.FocusableView {
       props.placeholder,
       text: $textManager.text
     )
-      .modifier(UIBaseViewModifier(props: props))
       .fixedSize(horizontal: false, vertical: true)
       .focused($isFocused)
       .onSubmit({

package/ios/ShareLink/ShareLinkView.swift

@@ -97,7 +97,7 @@ struct ShareLinkView: ExpoSwiftUI.View {
 
   var body: some View {
  #if !os(tvOS)
-    shareLink.modifier(UIBaseViewModifier(props: props))
+    shareLink
       .onDisappear {
         // cleanup if unmounted mid async request
         if #available(iOS 16.0, *) {

package/ios/SliderView.swift

@@ -6,15 +6,22 @@ import ExpoModulesCore
 struct SliderView: ExpoSwiftUI.View {
   @ObservedObject var props: SliderProps
   @State var value: Float = 0.0
-
+  @State var isEditing: Bool = false
+  
   init(props: SliderProps) {
     self.props = props
-    _value = State(initialValue: props.value ?? 0.0)
   }
 
   var body: some View {
 #if !os(tvOS)
     sliderContent
+      .onAppear {
+        value = props.value ?? 0.0
+      }
+      .onChange(of: props.value) { newValue in
+        guard !isEditing else { return }
+        value = newValue ?? 0.0
+      }
       .onChange(of: value) { newValue in
         if props.value != newValue {
           props.onValueChanged([
@@ -22,10 +29,6 @@ struct SliderView: ExpoSwiftUI.View {
           ])
         }
       }
-      .onReceive(props.value.publisher, perform: { newValue in
-        var sliderValue = newValue
-        value = sliderValue
-      })
 #else
     Text("Slider is not supported on tvOS")
 #endif
@@ -34,14 +37,9 @@ struct SliderView: ExpoSwiftUI.View {
 #if !os(tvOS)
   @ViewBuilder
   private var sliderContent: some View {
-    let label = props.children?.compactMap({ $0.childView as? SliderLabelView })
-    .first(where: { $0.props.kind == .label })
-    let minimumValueLabel = props.children?
-      .compactMap({ $0.childView as? SliderLabelView })
-      .first(where: { $0.props.kind == .minimum })
-    let maximumValueLabel = props.children?
-      .compactMap({ $0.childView as? SliderLabelView })
-      .first(where: { $0.props.kind == .maximum })
+    let label = props.children?.slot("label")
+    let minimumValueLabel = props.children?.slot("minimum")
+    let maximumValueLabel = props.children?.slot("maximum")
 
     if let min = props.min, let max = props.max, let step = props.step {
       Slider(
@@ -52,6 +50,7 @@ struct SliderView: ExpoSwiftUI.View {
         minimumValueLabel: { minimumValueLabel },
         maximumValueLabel: { maximumValueLabel }
       ) { isEditing in
+        self.isEditing = isEditing
         props.onEditingChanged(["isEditing": isEditing])
       }
     } else if let min = props.min, let max = props.max {
@@ -62,6 +61,7 @@ struct SliderView: ExpoSwiftUI.View {
         minimumValueLabel: { minimumValueLabel },
         maximumValueLabel: { maximumValueLabel }
       ) { isEditing in
+        self.isEditing = isEditing
         props.onEditingChanged(["isEditing": isEditing])
       }
     } else if let step = props.step {
@@ -73,6 +73,7 @@ struct SliderView: ExpoSwiftUI.View {
         minimumValueLabel: { minimumValueLabel },
         maximumValueLabel: { maximumValueLabel }
       ) { isEditing in
+        self.isEditing = isEditing
         props.onEditingChanged(["isEditing": isEditing])
       }
     } else {
@@ -82,6 +83,7 @@ struct SliderView: ExpoSwiftUI.View {
         minimumValueLabel: { minimumValueLabel },
         maximumValueLabel: { maximumValueLabel }
       ) { isEditing in
+        self.isEditing = isEditing
         props.onEditingChanged(["isEditing": isEditing])
       }
     }
@@ -98,20 +100,3 @@ final class SliderProps: UIBaseViewProps {
   var onEditingChanged = EventDispatcher()
 }
 
-internal enum SliderLabelKind: String, Enumerable {
-  case label
-  case minimum
-  case maximum
-}
-
-internal final class SliderLabelProps: ExpoSwiftUI.ViewProps {
-  @Field var kind: SliderLabelKind = .minimum
-}
-
-internal struct SliderLabelView: ExpoSwiftUI.View {
-  @ObservedObject var props: SliderLabelProps
-
-  var body: some View {
-    Children()
-  }
-}

package/ios/SlotView.swift

@@ -0,0 +1,38 @@
+// Copyright 2025-present 650 Industries. All rights reserved.
+
+import SwiftUI
+import ExpoModulesCore
+
+internal final class SlotViewProps: ExpoSwiftUI.ViewProps {
+  @Field var name: String = ""
+}
+
+internal struct SlotView: ExpoSwiftUI.View {
+  @ObservedObject var props: SlotViewProps
+
+  init(props: SlotViewProps) {
+    self.props = props
+  }
+
+  var body: some View {
+    Children()
+  }
+}
+
+extension [any ExpoSwiftUI.AnyChild] {
+  func slot(_ name: String) -> SlotView? {
+    compactMap { $0.childView as? SlotView }
+      .first { $0.props.name == name }
+  }
+
+  func withoutSlot(_ name: String) -> [any ExpoSwiftUI.AnyChild] {
+    filter {
+      guard let slot = $0.childView as? SlotView else { return true }
+      return slot.props.name != name
+    }
+  }
+
+  func withoutSlots() -> [any ExpoSwiftUI.AnyChild] {
+    filter { !($0.childView is SlotView) }
+  }
+}

package/ios/StepperView.swift

@@ -5,37 +5,33 @@ import ExpoModulesCore
 
 final class StepperProps: UIBaseViewProps {
   @Field var label: String
-  @Field var defaultValue: Int?
+  @Field var value: Int = 0
   @Field var min: Int = 0
   @Field var max: Int = 100
   @Field var step: Int = 1
-  var onValueChanged = EventDispatcher()
+  var onValueChange = EventDispatcher()
 }
 
 struct StepperView: ExpoSwiftUI.View {
   @ObservedObject var props: StepperProps
-  @State var value: Int
-
+  @State var value: Int = 0
+  
   init(props: StepperProps) {
     self.props = props
-    let initialValue = props.defaultValue ?? 0
-    let clampedValue = max(props.min, min(props.max, initialValue))
-    self._value = State(initialValue: clampedValue)
   }
 
   var body: some View {
 #if !os(tvOS)
     Stepper(props.label, value: $value, in: props.min...props.max, step: props.step)
-      .onChange(of: value, perform: { newValue in
-        props.onValueChanged(([
-          "value": Int(newValue)
-        ]))
-      })
       .onAppear {
-        // Ensure the value is set correctly when the view appears
-        if let defaultValue = props.defaultValue {
-          let clampedValue = max(props.min, min(props.max, defaultValue))
-          value = clampedValue
+        value = max(props.min, min(props.max, props.value))
+      }
+      .onChange(of: props.value) { newValue in
+        value = max(props.min, min(props.max, newValue))
+      }
+      .onChange(of: value) { newValue in
+        if props.value != newValue {
+          props.onValueChange(["value": Int(newValue)])
         }
       }
 #else

package/ios/TextFieldView.swift

@@ -161,7 +161,6 @@ struct TextFieldView: ExpoSwiftUI.View, ExpoSwiftUI.FocusableView {
       )
     }
     return text.lineLimit((props.multiline && allowMultiLine()) ? props.numberOfLines : 1)
-      .modifier(UIBaseViewModifier(props: props))
       .fixedSize(horizontal: false, vertical: true)
       .keyboardType(getKeyboardType(props.keyboardType))
       .autocorrectionDisabled(!props.autocorrection)

package/ios/TextView.swift

@@ -3,9 +3,28 @@
 import SwiftUI
 import ExpoModulesCore
 
+public enum TextDateStyle: String, Enumerable {
+  case timer, relative, offset, date, time
+
+  func toSwiftUI() -> SwiftUI.Text.DateStyle {
+    switch self {
+    case .timer: return .timer
+    case .relative: return .relative
+    case .offset: return .offset
+    case .date: return .date
+    case .time: return .time
+    }
+  }
+}
+
 public final class TextViewProps: UIBaseViewProps {
   @Field public var text: String = ""
   @Field public var markdownEnabled: Bool = false
+  @Field public var date: Date?
+  @Field public var dateStyle: TextDateStyle?
+  @Field public var timerInterval: ClosedRangeDate?
+  @Field public var countsDown: Bool?
+  @Field public var pauseTime: Date?
 
   // Override default frame alignment for text views
   override var defaultFrameAlignment: Alignment { .leading }
@@ -24,7 +43,24 @@ public struct TextView: ExpoSwiftUI.View {
   }
 
   internal func buildText(applyModifiers: Bool = true) -> Text {
-    let text = props.markdownEnabled ? Text(LocalizedStringKey(props.text)) : Text(props.text)
+    let text: Text
+
+    if #available(iOS 16.0, tvOS 16.0, *),
+       let timerInterval = props.timerInterval,
+       let lower = timerInterval.lower,
+       let upper = timerInterval.upper,
+       lower <= upper {
+      text = Text(
+        timerInterval: ClosedRange(uncheckedBounds: (lower: lower, upper: upper)),
+        pauseTime: props.pauseTime,
+        countsDown: props.countsDown ?? true
+      )
+    } else if let date = props.date {
+      text = Text(date, style: props.dateStyle?.toSwiftUI() ?? .date)
+    } else {
+      text = props.markdownEnabled ? Text(LocalizedStringKey(props.text)) : Text(props.text)
+    }
+
     var result = applyModifiers
     ? text.applyTextModifiers(props.modifiers, appContext: props.appContext)
     : text