@expo/ui 56.0.8 → 56.0.10

package/build/universal/RNHostView/types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/universal/RNHostView/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,OAAO,CAAC;AAE1C,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAEnD;;GAEG;AACH,MAAM,WAAW,eAAgB,SAAQ,kBAAkB;IACzD;;;;;;;;;OASG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;IAExB;;OAEG;IACH,QAAQ,EAAE,YAAY,CAAC;CACxB"}

package/build/universal/Switch/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/universal/Switch/index.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAc3C;;GAEG;AACH,wBAAgB,MAAM,CAAC,EAAE,KAAK,EAAE,aAAa,EAAE,KAAK,EAAE,QAAgB,EAAE,MAAM,EAAE,EAAE,WAAW,2CAa5F;AAED,cAAc,SAAS,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/universal/Switch/index.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAiB3C;;GAEG;AACH,wBAAgB,MAAM,CAAC,EAAE,KAAK,EAAE,aAAa,EAAE,KAAK,EAAE,QAAgB,EAAE,MAAM,EAAE,EAAE,WAAW,2CAe5F;AAED,cAAc,SAAS,CAAC"}

package/build/universal/TextInput/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/universal/TextInput/index.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAE9C,wBAAgB,SAAS,CAAC,EACxB,GAAG,EACH,KAAK,EACL,YAAY,EACZ,WAAW,EACX,SAAS,EACT,QAAQ,EACR,SAAS,EACT,YAAY,EACZ,cAAc,EACd,WAAW,EACX,aAAa,EACb,eAAe,EACf,OAAO,EACP,MAAM,EACN,WAAW,EACX,SAAS,EACT,QAAQ,EACR,SAAS,EACT,YAAY,EACZ,YAAY,EACZ,aAAa,EACb,IAAI,EACJ,MAAM,EACN,oBAAoB,EACpB,KAAK,EACL,SAAS,EACT,eAAe,EACf,YAAY,EACZ,mBAAmB,EACnB,SAAS,EACT,WAAW,EACX,cAAc,EACd,SAAS,EACT,iBAAiB,EACjB,iBAAiB,GAClB,EAAE,cAAc,2CAiFhB;AAED,cAAc,SAAS,CAAC;AACxB,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,UAAU,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/universal/TextInput/index.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAM9C,wBAAgB,SAAS,CAAC,EACxB,GAAG,EACH,KAAK,EACL,YAAY,EACZ,WAAW,EACX,SAAS,EACT,QAAQ,EACR,SAAS,EACT,YAAY,EACZ,cAAc,EACd,WAAW,EACX,aAAa,EACb,eAAe,EACf,OAAO,EACP,MAAM,EACN,WAAW,EACX,SAAS,EACT,QAAQ,EACR,SAAS,EACT,YAAY,EACZ,YAAY,EACZ,aAAa,EACb,IAAI,EACJ,MAAM,EACN,oBAAoB,EACpB,KAAK,EACL,SAAS,EACT,eAAe,EACf,YAAY,EACZ,mBAAmB,EACnB,SAAS,EACT,WAAW,EACX,cAAc,EACd,SAAS,EACT,iBAAiB,EACjB,iBAAiB,GAClB,EAAE,cAAc,2CAuFhB;AAED,cAAc,SAAS,CAAC;AACxB,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,UAAU,CAAC"}

package/build/universal/index.d.ts

@@ -8,8 +8,13 @@ export * from './Switch';
 export * from './Slider';
 export * from './Checkbox';
 export * from './BottomSheet';
+export * from './Collapsible';
 export * from './FieldGroup';
 export * from './Icon';
+export * from './List';
+export * from './ListItem';
+export * from './Picker';
+export * from './RNHostView';
 export * from './Spacer';
 export * from './State';
 export { TextInput, type TextInputProps, type TextInputRef } from './TextInput';

package/build/universal/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/universal/index.ts"],"names":[],"mappings":"AAAA,cAAc,QAAQ,CAAC;AACvB,cAAc,UAAU,CAAC;AACzB,cAAc,OAAO,CAAC;AACtB,cAAc,QAAQ,CAAC;AACvB,cAAc,UAAU,CAAC;AACzB,cAAc,cAAc,CAAC;AAC7B,cAAc,UAAU,CAAC;AACzB,cAAc,UAAU,CAAC;AACzB,cAAc,YAAY,CAAC;AAC3B,cAAc,eAAe,CAAC;AAC9B,cAAc,cAAc,CAAC;AAC7B,cAAc,QAAQ,CAAC;AACvB,cAAc,UAAU,CAAC;AACzB,cAAc,SAAS,CAAC;AACxB,OAAO,EAAE,SAAS,EAAE,KAAK,cAAc,EAAE,KAAK,YAAY,EAAE,MAAM,aAAa,CAAC;AAEhF,YAAY,EAAE,cAAc,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/universal/index.ts"],"names":[],"mappings":"AAAA,cAAc,QAAQ,CAAC;AACvB,cAAc,UAAU,CAAC;AACzB,cAAc,OAAO,CAAC;AACtB,cAAc,QAAQ,CAAC;AACvB,cAAc,UAAU,CAAC;AACzB,cAAc,cAAc,CAAC;AAC7B,cAAc,UAAU,CAAC;AACzB,cAAc,UAAU,CAAC;AACzB,cAAc,YAAY,CAAC;AAC3B,cAAc,eAAe,CAAC;AAC9B,cAAc,eAAe,CAAC;AAC9B,cAAc,cAAc,CAAC;AAC7B,cAAc,QAAQ,CAAC;AACvB,cAAc,QAAQ,CAAC;AACvB,cAAc,YAAY,CAAC;AAC3B,cAAc,UAAU,CAAC;AACzB,cAAc,cAAc,CAAC;AAC7B,cAAc,UAAU,CAAC;AACzB,cAAc,SAAS,CAAC;AACxB,OAAO,EAAE,SAAS,EAAE,KAAK,cAAc,EAAE,KAAK,YAAY,EAAE,MAAM,aAAa,CAAC;AAEhF,YAAY,EAAE,cAAc,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC"}

package/expo-module.config.json

@@ -10,7 +10,7 @@
     "publication": {
       "groupId": "expo.modules.ui",
       "artifactId": "expo.modules.ui",
-      "version": "56.0.8",
+      "version": "56.0.10",
       "repository": "local-maven-repo"
     }
   }

package/ios/BottomSheetView.swift

@@ -7,6 +7,7 @@ final class BottomSheetProps: UIBaseViewProps {
   @Field var isPresented: Bool = false
   @Field var fitToContents: Bool = false
   var onIsPresentedChange = EventDispatcher()
+  var onDismiss = EventDispatcher()
 }
 
 struct SizePreferenceKey: PreferenceKey {
@@ -86,7 +87,9 @@ struct BottomSheetView: ExpoSwiftUI.View {
 
   var body: some View {
     Rectangle().hidden()
-      .sheet(isPresented: $isPresented) {
+      .sheet(isPresented: $isPresented, onDismiss: {
+        props.onDismiss()
+      }) {
         sheetContent
       }
       .onChange(of: isPresented, perform: { newIsPresented in

package/ios/ExpoUIModule.swift

@@ -1,6 +1,7 @@
 // Copyright 2025-present 650 Industries. All rights reserved.
 
 import ExpoModulesCore
+import SwiftUI
 
 public final class ExpoUIModule: Module {
   public func definition() -> ModuleDefinition {
@@ -28,7 +29,19 @@ public final class ExpoUIModule: Module {
       }
 
       Function("setValue") { (state: ObservableState, wrapper: [String: Any]) in
-        state.value = wrapper["value"]
+        let newValue = wrapper["value"]
+        // Update state on the UI thread
+        if Thread.isMainThread {
+          state.value = newValue
+        } else {
+          DispatchQueue.main.async {
+            state.value = newValue
+          }
+        }
+      }
+
+      Function("setOnChange") { (state: ObservableState, callback: WorkletCallback?) in
+        state.onChange = callback
       }
     }
 
@@ -38,6 +51,33 @@ public final class ExpoUIModule: Module {
       RefreshableManager.shared.completeRefresh(id: id)
     }
 
+    AsyncFunction("withAnimation") { (
+      animation: AnimationConfig?,
+      body: WorkletCallback,
+      completion: WorkletCallback?,
+      completionCriteria: AnimationCompletionCriteriaType?
+    ) in
+      let swiftUIAnimation = animation?.toSwiftUIAnimation()
+
+      if let completion {
+        if #available(iOS 17.0, tvOS 17.0, *) {
+          let criteria: SwiftUI.AnimationCompletionCriteria =
+            completionCriteria == .removed ? .removed : .logicallyComplete
+          withAnimation(swiftUIAnimation, completionCriteria: criteria) {
+            body.invoke()
+          } completion: {
+            completion.invoke()
+          }
+          return
+        }
+      }
+
+      withAnimation(swiftUIAnimation) {
+        body.invoke()
+      }
+    }
+    .runOnQueue(.main)
+
     // MARK: - Expo UI Views with AsyncFunctions
 
     ExpoUIView(SecureFieldView.self) {
@@ -81,13 +121,16 @@ public final class ExpoUIModule: Module {
       }
     }
 
-    // MARK: - Views don't support common view modifiers
+    // MARK: - Views that apply common view modifiers internally
+
+    View(HostView.self)
+    View(TextView.self)
+
+    // MARK: - Views that don't support common view modifiers
 
     View(SlotView.self)
     View(NamespaceView.self)
     View(GridRowView.self)
-    View(HostView.self)
-    View(TextView.self)
 
     // MARK: - Expo UI Views
 

package/ios/HostView.swift

@@ -38,6 +38,7 @@ internal final class HostViewProps: ExpoSwiftUI.ViewProps, ExpoSwiftUI.SafeAreaC
   @Field var matchContentsHorizontal = false
   @Field var matchContentsVertical = false
   @Field var ignoreSafeArea: ExpoSwiftUI.IgnoreSafeArea?
+  @Field var modifiers: ModifierArray?
   var onLayoutContent = EventDispatcher()
 }
 
@@ -45,38 +46,40 @@ struct HostView: ExpoSwiftUI.View, ExpoSwiftUI.WithHostingView {
   @ObservedObject var props: HostViewProps
 
   var body: some View {
-    var useViewportSizeMeasurement: Bool = props.useViewportSizeMeasurement
-    if #available(iOS 16.0, tvOS 16.0, macOS 13.0, *) {
-      useViewportSizeMeasurement = props.useViewportSizeMeasurement
-    } else {
-      log.warn("useViewportSizeMeasurement is not supported on iOS/tvOS < 16.0")
-      useViewportSizeMeasurement = false
-    }
-
     let layoutDirection = props.layoutDirection.toLayoutDirection()
     let alignment: Alignment = layoutDirection == .rightToLeft ? .topTrailing : .topLeading
 
     if #available(iOS 16.0, tvOS 16.0, macOS 13.0, *) {
       // swiftlint:disable:next identifier_name
-      let HostLayout = useViewportSizeMeasurement
+      let HostLayout = props.useViewportSizeMeasurement
         ? AnyLayout(ViewportSizeMeasurementLayout(layoutDirection: layoutDirection))
         : AnyLayout(ZStackLayout(alignment: alignment))
-      return HostLayout {
+      HostLayout {
         Children()
       }
       .fixedSize(horizontal: props.matchContentsHorizontal, vertical: props.matchContentsVertical)
       .modifier(LayoutDirectionModifier(layoutDirection: layoutDirection))
       .modifier(ColorSchemeModifier(colorScheme: props.colorScheme?.toColorScheme()))
+      .applyModifiers(
+        props.modifiers,
+        appContext: props.appContext,
+        globalEventDispatcher: props.globalEventDispatcher
+      )
+      .modifier(GeometryChangeModifier(props: props))
+    } else {
+      ZStack(alignment: alignment) {
+        Children()
+      }
+      .fixedSize(horizontal: props.matchContentsHorizontal, vertical: props.matchContentsVertical)
+      .modifier(LayoutDirectionModifier(layoutDirection: layoutDirection))
+      .modifier(ColorSchemeModifier(colorScheme: props.colorScheme?.toColorScheme()))
+      .applyModifiers(
+        props.modifiers,
+        appContext: props.appContext,
+        globalEventDispatcher: props.globalEventDispatcher
+      )
       .modifier(GeometryChangeModifier(props: props))
     }
-
-    return ZStack(alignment: alignment) {
-      Children()
-    }
-    .fixedSize(horizontal: props.matchContentsHorizontal, vertical: props.matchContentsVertical)
-    .modifier(LayoutDirectionModifier(layoutDirection: layoutDirection))
-    .modifier(ColorSchemeModifier(colorScheme: props.colorScheme?.toColorScheme()))
-    .modifier(GeometryChangeModifier(props: props))
   }
 
   private func safeAreaSize() -> CGSize {

package/ios/Modifiers/AnimationConfig.swift

@@ -0,0 +1,109 @@
+// Copyright 2025-present 650 Industries. All rights reserved.
+
+import ExpoModulesCore
+import SwiftUI
+
+internal enum AnimationType: String, Enumerable {
+  case easeInOut
+  case easeIn
+  case easeOut
+  case linear
+  case spring
+  case interpolatingSpring
+  case `default`
+}
+
+internal enum AnimationCompletionCriteriaType: String, Enumerable {
+  case logicallyComplete
+  case removed
+}
+
+/**
+ Describes a SwiftUI `Animation` value over the JS bridge. Consumed by both
+ the `animation(_:value:)` view modifier and the `withAnimation(_:_:)`
+ function so they accept the same JS shape.
+ */
+internal struct AnimationConfig: Record {
+  // Shared fallbacks used when the JS side omits a parameter. Mirrors
+  // SwiftUI's own defaults so each animation variant resolves the same way.
+  private static let defaultDuration: Double = 0.5
+  private static let defaultResponse: Double = 0.5
+  private static let defaultDampingFraction: Double = 0.825
+  private static let defaultBlendDuration: Double = 0.0
+  private static let defaultBounce: Double = 0.0
+
+  @Field var type: AnimationType = .default
+  @Field var duration: Double?
+  @Field var response: Double?
+  @Field var dampingFraction: Double?
+  @Field var blendDuration: Double?
+  @Field var bounce: Double?
+  @Field var mass: Double = 1.0
+  @Field var stiffness: Double?
+  @Field var damping: Double?
+  @Field var initialVelocity: Double = 0.0
+  @Field var delay: Double?
+  @Field var repeatCount: Int?
+  @Field var autoreverses: Bool = true
+
+  func toSwiftUIAnimation() -> Animation {
+    var animation: Animation
+
+    switch type {
+    case .easeIn:
+      animation = duration.map { Animation.easeIn(duration: $0) } ?? .easeIn
+    case .easeOut:
+      animation = duration.map { Animation.easeOut(duration: $0) } ?? .easeOut
+    case .linear:
+      animation = duration.map { Animation.linear(duration: $0) } ?? .linear
+    case .easeInOut:
+      animation = duration.map { Animation.easeInOut(duration: $0) } ?? .easeInOut
+    case .spring:
+      if response != nil || dampingFraction != nil {
+        animation = .spring(
+          response: response ?? Self.defaultResponse,
+          dampingFraction: dampingFraction ?? Self.defaultDampingFraction,
+          blendDuration: blendDuration ?? Self.defaultBlendDuration
+        )
+      } else if duration != nil || bounce != nil {
+        animation = .spring(
+          duration: duration ?? Self.defaultDuration,
+          bounce: bounce ?? Self.defaultBounce,
+          blendDuration: blendDuration ?? Self.defaultBlendDuration
+        )
+      } else if let blendDuration {
+        animation = .spring(blendDuration: blendDuration)
+      } else {
+        animation = .spring
+      }
+    case .interpolatingSpring:
+      if duration != nil || bounce != nil {
+        animation = .interpolatingSpring(
+          duration: duration ?? Self.defaultDuration,
+          bounce: bounce ?? Self.defaultBounce,
+          initialVelocity: initialVelocity
+        )
+      } else if let stiffness, let damping {
+        animation = .interpolatingSpring(
+          mass: mass,
+          stiffness: stiffness,
+          damping: damping,
+          initialVelocity: initialVelocity
+        )
+      } else {
+        animation = .interpolatingSpring
+      }
+    default:
+      animation = .default
+    }
+
+    if let delay {
+      animation = animation.delay(delay)
+    }
+    if let repeatCount {
+      animation = animation.repeatCount(repeatCount, autoreverses: autoreverses)
+    }
+
+    return animation
+  }
+}

package/ios/Modifiers/FontModifier.swift

@@ -16,15 +16,15 @@ internal enum FontWeight: String, Enumerable {
 
   func toSwiftUI() -> Font.Weight {
     switch self {
-    case .ultraLight: return .ultraLight
-    case .thin: return .thin
-    case .light: return .light
-    case .regular: return .regular
-    case .medium: return .medium
-    case .semibold: return .semibold
-    case .bold: return .bold
-    case .heavy: return .heavy
-    case .black: return .black
+    case .ultraLight: .ultraLight
+    case .thin: .thin
+    case .light: .light
+    case .regular: .regular
+    case .medium: .medium
+    case .semibold: .semibold
+    case .bold: .bold
+    case .heavy: .heavy
+    case .black: .black
     }
   }
 }
@@ -37,10 +37,40 @@ internal enum FontDesign: String, Enumerable {
 
   func toSwiftUI() -> Font.Design {
     switch self {
-    case .default: return .default
-    case .rounded: return .rounded
-    case .serif: return .serif
-    case .monospaced: return .monospaced
+    case .default: .default
+    case .rounded: .rounded
+    case .serif: .serif
+    case .monospaced: .monospaced
+    }
+  }
+}
+
+internal enum FontTextStyle: String, Enumerable {
+  case largeTitle
+  case title
+  case title2
+  case title3
+  case headline
+  case subheadline
+  case body
+  case callout
+  case footnote
+  case caption
+  case caption2
+
+  func toSwiftUI() -> Font.TextStyle {
+    switch self {
+    case .largeTitle: .largeTitle
+    case .title: .title
+    case .title2: .title2
+    case .title3: .title3
+    case .headline: .headline
+    case .subheadline: .subheadline
+    case .body: .body
+    case .callout: .callout
+    case .footnote: .footnote
+    case .caption: .caption
+    case .caption2: .caption2
     }
   }
 }
@@ -50,16 +80,38 @@ internal struct FontModifier: ViewModifier, Record {
   @Field var size: CGFloat?
   @Field var weight: FontWeight?
   @Field var design: FontDesign?
+  @Field var textStyle: FontTextStyle?
 
   func body(content: Content) -> some View {
+    content.font(resolveFont())
+  }
+
+  private func resolveFont() -> Font {
     if let family = family {
-      content.font(Font.custom(family, size: size ?? 17))
-    } else {
-      content.font(.system(
-        size: size ?? 17,
-        weight: weight?.toSwiftUI() ?? .regular,
-        design: design?.toSwiftUI() ?? .default
-      ))
+      let baseSize = size ?? 17
+      var font: Font = if let textStyle = textStyle {
+        Font.custom(family, size: baseSize, relativeTo: textStyle.toSwiftUI())
+      } else {
+        Font.custom(family, size: baseSize)
+      }
+      if let weight = weight {
+        font = font.weight(weight.toSwiftUI())
+      }
+      return font
     }
+
+    if let textStyle = textStyle {
+      var font = Font.system(textStyle.toSwiftUI(), design: design?.toSwiftUI() ?? .default)
+      if let weight = weight {
+        font = font.weight(weight.toSwiftUI())
+      }
+      return font
+    }
+
+    return .system(
+      size: size ?? 17,
+      weight: weight?.toSwiftUI() ?? .regular,
+      design: design?.toSwiftUI() ?? .default
+    )
   }
 }

package/ios/Modifiers/ScrollObservationModifiers.swift

@@ -0,0 +1,107 @@
+// Copyright 2026-present 650 Industries. All rights reserved.
+
+import ExpoModulesCore
+import SwiftUI
+
+internal struct OnScrollGeometryChangeModifier: ViewModifier, Record {
+  // Worklet path: synchronous invocation on the UI runtime (no JS-thread dispatch).
+  @Field var workletCallback: WorkletCallback?
+  // JS-thread path: async event via the global modifier event dispatcher.
+  var eventDispatcher: EventDispatcher?
+
+  init() {}
+
+  init(from params: Dict, appContext: AppContext, eventDispatcher: EventDispatcher) throws {
+    try self = .init(from: params, appContext: appContext)
+    self.eventDispatcher = eventDispatcher
+  }
+
+  func body(content: Content) -> some View {
+    if #available(iOS 18.0, tvOS 18.0, *) {
+      content
+        .onScrollGeometryChange(for: ScrollGeometryPayload.self) { ScrollGeometryPayload($0) }
+        action: { [workletCallback, eventDispatcher] _, payload in
+          let geometry = payload.dictionary
+          if let workletCallback {
+            workletCallback.invoke(arguments: [geometry])
+          } else {
+            eventDispatcher?(["onScrollGeometryChange": geometry])
+          }
+        }
+    } else {
+      content
+    }
+  }
+}
+
+internal struct OnScrollPhaseChangeModifier: ViewModifier, Record {
+  var eventDispatcher: EventDispatcher?
+
+  init() {}
+
+  init(from params: Dict, appContext: AppContext, eventDispatcher: EventDispatcher) throws {
+    try self = .init(from: params, appContext: appContext)
+    self.eventDispatcher = eventDispatcher
+  }
+
+  func body(content: Content) -> some View {
+    if #available(iOS 18.0, tvOS 18.0, *) {
+      content.onScrollPhaseChange { [eventDispatcher] _, newPhase, context in
+        eventDispatcher?([
+          "onScrollPhaseChange": [
+            "phase": Self.phaseString(newPhase),
+            "geometry": ScrollGeometryPayload(context.geometry).dictionary
+          ]
+        ])
+      }
+    } else {
+      content
+    }
+  }
+
+  @available(iOS 18.0, tvOS 18.0, *)
+  private static func phaseString(_ phase: ScrollPhase) -> String {
+    return switch phase {
+    case .idle: "idle"
+    case .tracking: "tracking"
+    case .interacting: "interacting"
+    case .animating: "animating"
+    case .decelerating: "decelerating"
+    @unknown default: "idle"
+    }
+  }
+}
+
+internal struct ScrollGeometryPayload: Equatable {
+  let contentOffsetX: CGFloat
+  let contentOffsetY: CGFloat
+  let containerWidth: CGFloat
+  let containerHeight: CGFloat
+  let contentWidth: CGFloat
+  let contentHeight: CGFloat
+
+  var dictionary: [String: Any] {
+    [
+      "contentOffsetX": contentOffsetX,
+      "contentOffsetY": contentOffsetY,
+      "containerWidth": containerWidth,
+      "containerHeight": containerHeight,
+      "contentWidth": contentWidth,
+      "contentHeight": contentHeight
+    ]
+  }
+}
+
+@available(iOS 18.0, tvOS 18.0, *)
+extension ScrollGeometryPayload {
+  init(_ geometry: ScrollGeometry) {
+    self.init(
+      contentOffsetX: geometry.contentOffset.x,
+      contentOffsetY: geometry.contentOffset.y,
+      containerWidth: geometry.containerSize.width,
+      containerHeight: geometry.containerSize.height,
+      contentWidth: geometry.contentSize.width,
+      contentHeight: geometry.contentSize.height
+    )
+  }
+}

package/ios/Modifiers/ViewModifierRegistry.swift

@@ -621,38 +621,12 @@ internal struct AnyViewModifier: ViewModifier {
   }
 }
 
-internal enum AnimationType: String, Enumerable {
-  case easeInOut
-  case easeIn
-  case easeOut
-  case linear
-  case spring
-  case interpolatingSpring
-  case `default`
-}
-
-internal struct AnimationConfig: Record {
-  @Field var type: AnimationType = .default
-  @Field var duration: Double?
-  @Field var response: Double?
-  @Field var dampingFraction: Double?
-  @Field var blendDuration: Double?
-  @Field var bounce: Double?
-  @Field var mass: Double?
-  @Field var stiffness: Double?
-  @Field var damping: Double?
-  @Field var initialVelocity: Double?
-  @Field var delay: Double?
-  @Field var repeatCount: Int?
-  @Field var autoreverses: Bool?
-}
-
 internal struct AnimationModifier: ViewModifier, Record {
   @Field var animation: AnimationConfig
   @Field var animatedValue: Either<Double, Bool>?
 
   func body(content: Content) -> some View {
-    let animationValue = parseAnimation(animation)
+    let animationValue = animation.toSwiftUIAnimation()
     if let value: Bool = animatedValue?.get() {
       content.animation(animationValue, value: value)
     } else if let value: Double = animatedValue?.get() {
@@ -661,91 +635,6 @@ internal struct AnimationModifier: ViewModifier, Record {
       content
     }
   }
-
-  private func parseAnimation(_ config: AnimationConfig) -> Animation {
-    let type = config.type
-
-    var animation: Animation
-
-    switch type {
-    case .easeIn:
-      if let duration = config.duration {
-        animation = .easeIn(duration: duration)
-      } else {
-        animation = .easeIn
-      }
-
-    case .easeOut:
-      if let duration = config.duration {
-        animation = .easeOut(duration: duration)
-      } else {
-        animation = .easeOut
-      }
-
-    case .linear:
-      if let duration = config.duration {
-        animation = .linear(duration: duration)
-      } else {
-        animation = .linear
-      }
-
-    case .easeInOut:
-      if let duration = config.duration {
-        animation = .easeInOut(duration: duration)
-      } else {
-        animation = .easeInOut
-      }
-
-    case .spring:
-      let duration = config.duration
-      let bounce = config.bounce
-      let response = config.response
-      let dampingFraction = config.dampingFraction
-      let blendDuration = config.blendDuration
-
-      if response != nil || dampingFraction != nil {
-        // default values are 0.5, 0.825, 0.0
-        animation = .spring(response: response ?? 0.5, dampingFraction: dampingFraction ?? 0.825, blendDuration: blendDuration ?? 0.0)
-      } else if duration != nil || bounce != nil {
-        // default values are 0.5, 0.0, 0.0
-        animation = .spring(duration: duration ?? 0.5, bounce: bounce ?? 0.0, blendDuration: blendDuration ?? 0.0)
-      } else if let blendDuration = blendDuration {
-        animation = .spring(blendDuration: blendDuration)
-      } else {
-        animation = .spring
-      }
-
-    case .interpolatingSpring:
-      let duration = config.duration
-      let bounce = config.bounce
-      let mass = config.mass
-      let stiffness = config.stiffness
-      let damping = config.damping
-      let initialVelocity = config.initialVelocity
-
-      if duration != nil || bounce != nil {
-        animation = .interpolatingSpring(duration: duration ?? 0.5, bounce: bounce ?? 0.0, initialVelocity: initialVelocity ?? 0.0)
-      } else if let stiffness, let damping {
-        animation = .interpolatingSpring(mass: mass ?? 1.0, stiffness: stiffness, damping: damping, initialVelocity: initialVelocity ?? 0.0)
-      } else {
-        animation = .interpolatingSpring
-      }
-
-    default:
-      animation = .default
-    }
-
-    if let delay = config.delay {
-      animation = animation.delay(delay)
-    }
-
-    if let repeatCount = config.repeatCount {
-      let autoreverses = config.autoreverses ?? false
-      animation = animation.repeatCount(repeatCount, autoreverses: autoreverses)
-    }
-
-    return animation
-  }
 }
 
 internal enum ScrollContentBackgroundTypes: String, Enumerable {
@@ -1961,5 +1850,13 @@ extension ViewModifierRegistry {
     register("symbolEffect") { params, appContext, _ in
       return try SymbolEffectModifier(from: params, appContext: appContext)
     }
+
+    register("onScrollPhaseChange") { params, appContext, eventDispatcher in
+      return try OnScrollPhaseChangeModifier(from: params, appContext: appContext, eventDispatcher: eventDispatcher)
+    }
+
+    register("onScrollGeometryChange") { params, appContext, eventDispatcher in
+      return try OnScrollGeometryChangeModifier(from: params, appContext: appContext, eventDispatcher: eventDispatcher)
+    }
   }
 }