@expo/ui 58.0.19 → 58.0.21

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Changelog
 
+## 58.0.21
+
+### Patch Changes
+
+- [iOS] Fix `List.ForEach` with `data` and a `children` render function. With recycling, `List` ignored the `moveDisabled` and `deleteDisabled` modifiers on a row. With `recycling={false}`, dragging a row did not reorder it or call `onMove`, and `onDelete` received the wrong index. ([#51704](https://github.com/expo/expo/pull/51704) by [@intergalacticspacehighway](https://github.com/intergalacticspacehighway))
+- [Web] Stop the community `SegmentedControl` from logging the `useNativeDriver` warning when it mounts. ([#51775](https://github.com/expo/expo/pull/51775) by [@miniware9](https://github.com/miniware9))
+
+## 58.0.20
+
+### Patch Changes
+
+- [iOS] Add an `alignment` prop to the SwiftUI `Host`. It sets where the content sits in the host when their sizes differ. A `matchContents` host anchored to the trailing edge of its row can now keep that edge still while its content animates to a new width. ([#51617](https://github.com/expo/expo/pull/51617) by [@maxlapides](https://github.com/maxlapides))
+
 ## 58.0.19
 
 ### Patch Changes

package/android/build.gradle

@@ -12,13 +12,13 @@ apply plugin: 'expo-module-gradle-plugin'
 apply plugin: 'org.jetbrains.kotlin.plugin.compose'
 
 group = 'expo.modules.ui'
-version = '58.0.19'
+version = '58.0.21'
 
 android {
   namespace "expo.modules.ui"
   defaultConfig {
     versionCode 1
-    versionName "58.0.19"
+    versionName "58.0.21"
     testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
   }
   buildFeatures {

package/build/community/segmented-control/vendor/SegmentedControl.js

@@ -4,7 +4,7 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
  * Vendored from @react-native-segmented-control/segmented-control (MIT license).
  * https://github.com/react-native-segmented-control/segmented-control
  */ import * as React from 'react';
-import { Animated, Easing, I18nManager, StyleSheet, View, useColorScheme } from 'react-native';
+import { Animated, Easing, I18nManager, Platform, StyleSheet, View, useColorScheme } from 'react-native';
 import { SegmentedControlTab } from './SegmentedControlTab';
 import { SegmentsSeparators } from './SegmentsSeparators';
 import { buildChangeEvent } from '../types';
@@ -40,7 +40,7 @@ export function SegmentedControl({ style, onChange, onValueChange, enabled = tru
                 toValue: isRTL * (selectedIndex ?? 0),
                 duration: 300,
                 easing: Easing.out(Easing.quad),
-                useNativeDriver: true
+                useNativeDriver: Platform.OS !== 'web'
             }).start();
         }
     }, [

package/build/community/segmented-control/vendor/SegmentedControl.js.map

@@ -1 +1 @@
-{"version":3,"sources":["community/segmented-control/vendor/SegmentedControl.tsx"],"sourcesContent":[null],"names":["React","Animated","Easing","I18nManager","StyleSheet","View","useColorScheme","SegmentedControlTab","SegmentsSeparators","buildChangeEvent","SegmentedControl","style","onChange","onValueChange","enabled","selectedIndex","values","tintColor","appearance","colorSchemeHook","colorScheme","segmentWidth","setSegmentWidth","useState","animation","useRef","Value","current","handleChange","index","val","updateSegmentWidth","useCallback","width","count","length","newSegmentWidth","setValue","useEffect","isRTL","timing","toValue","duration","easing","out","quad","useNativeDriver","start","styles","default","darkControl","disabled","onLayout","nativeEvent","layout","slider","transform","translateX","zIndex","backgroundColor","segmentsContainer","map","value","selected","accessibilityHint","onSelect","create","overflow","position","height","borderRadius","opacity","top","bottom","right","left","borderWidth","borderColor","shadowColor","shadowOffset","shadowOpacity","shadowRadius","elevation","flex","flexDirection","justifyContent","alignItems"],"mappings":"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"}
+{"version":3,"sources":["community/segmented-control/vendor/SegmentedControl.tsx"],"sourcesContent":[null],"names":["React","Animated","Easing","I18nManager","Platform","StyleSheet","View","useColorScheme","SegmentedControlTab","SegmentsSeparators","buildChangeEvent","SegmentedControl","style","onChange","onValueChange","enabled","selectedIndex","values","tintColor","appearance","colorSchemeHook","colorScheme","segmentWidth","setSegmentWidth","useState","animation","useRef","Value","current","handleChange","index","val","updateSegmentWidth","useCallback","width","count","length","newSegmentWidth","setValue","useEffect","isRTL","timing","toValue","duration","easing","out","quad","useNativeDriver","OS","start","styles","default","darkControl","disabled","onLayout","nativeEvent","layout","slider","transform","translateX","zIndex","backgroundColor","segmentsContainer","map","value","selected","accessibilityHint","onSelect","create","overflow","position","height","borderRadius","opacity","top","bottom","right","left","borderWidth","borderColor","shadowColor","shadowOffset","shadowOpacity","shadowRadius","elevation","flex","flexDirection","justifyContent","alignItems"],"mappings":"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"}

package/build/swift-ui/Host/index.d.ts

@@ -1,6 +1,6 @@
 import type { Ref } from 'react';
 import { type ColorValue, type StyleProp, type ViewStyle } from 'react-native';
-import { type CommonViewModifierProps } from '../types';
+import { type Alignment, type CommonViewModifierProps } from '../types';
 export interface HostProps extends CommonViewModifierProps {
     /**
      * When true, the host view will update its size in the React Native view tree to match the content's layout from SwiftUI.
@@ -11,6 +11,16 @@ export interface HostProps extends CommonViewModifierProps {
         vertical?: boolean;
         horizontal?: boolean;
     };
+    /**
+     * The position of the SwiftUI content inside the host when their sizes differ. The sizes differ
+     * when the host is larger than its content, and while the content of a `matchContents` host
+     * animates to a new size. Setting it to the edge that the host is anchored to in its React
+     * Native layout keeps that edge still. For example, a host at the end of a row uses `'trailing'`.
+     * It also aligns the host's children with each other. Leading and trailing follow
+     * `layoutDirection`.
+     * @default 'topLeading'
+     */
+    alignment?: Alignment;
     /**
      * When true and no explicit size is provided, the host will use the viewport size as the proposed size for SwiftUI layout.
      * This is particularly useful for SwiftUI views that need to fill their available space, such as `Form`.

package/build/swift-ui/Host/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["swift-ui/Host/index.tsx"],"sourcesContent":[null],"names":["requireNativeView","I18nManager","NativeTreeContext","useWarnIfNestedHost","TextInputHostProvider","useTextInputHostRef","useMergeRefs","createViewModifierEventListener","HostNativeView","Host","props","matchContents","onLayoutContent","ignoreSafeArea","modifiers","layoutDirection","seedColor","ref","children","restProps","hostRef","mergedRef","undefined","matchContentsVertical","vertical","matchContentsHorizontal","horizontal","getConstants","isRTL","Provider","value"],"mappings":";AAAA,SAASA,iBAAiB,QAAQ,OAAO;AAEzC,SAASC,WAAW,QAAyD,eAAe;AAE5F,SAASC,iBAAiB,EAAEC,mBAAmB,QAAQ,0BAA0B;AACjF,SAASC,qBAAqB,EAAEC,mBAAmB,QAAQ,iBAAiB;AAC5E,SAASC,YAAY,QAAQ,2BAA2B;AACxD,SAASC,+BAA+B,QAAQ,qBAAqB;AAyDrE,MAAMC,iBAMFR,kBAAkB,UAAU;AAEhC;;CAEC,GACD,OAAO,SAASS,KAAKC,KAAgB;IACnC,MAAM,EACJC,aAAa,EACbC,eAAe,EACfC,cAAc,EACdC,SAAS,EACTC,eAAe,EACfC,SAAS,EACTC,GAAG,EACHC,QAAQ,EACR,GAAGC,WACJ,GAAGT;IACJ,MAAMU,UAAUf;IAChB,MAAMgB,YAAYf,aAAaW,KAAKG;IACpCjB,oBAAoB;IAEpB,qBACE,KAACC;QAAsBgB,SAASA;kBAC9B,cAAA,KAACZ;YACCM,WAAWA;YACV,GAAIA,YAAYP,gCAAgCO,aAAaQ,SAAS;YACvEC,uBACE,OAAOZ,kBAAkB,WAAWA,cAAca,QAAQ,GAAGb;YAE/Dc,yBACE,OAAOd,kBAAkB,WAAWA,cAAce,UAAU,GAAGf;YAEjEC,iBAAiBA;YACjBG,iBACEA,mBAAoBd,CAAAA,YAAY0B,YAAY,GAAGC,KAAK,GAAG,gBAAgB,aAAY;YAErFf,gBAAgBA;YAChBG,WAAWA;YACV,GAAGG,SAAS;YACbF,KAAKI;sBACL,cAAA,KAACnB,kBAAkB2B,QAAQ;gBAACC,KAAK;0BAAEZ;;;;AAI3C"}
+{"version":3,"sources":["swift-ui/Host/index.tsx"],"sourcesContent":[null],"names":["requireNativeView","I18nManager","NativeTreeContext","useWarnIfNestedHost","TextInputHostProvider","useTextInputHostRef","useMergeRefs","createViewModifierEventListener","HostNativeView","Host","props","matchContents","onLayoutContent","ignoreSafeArea","modifiers","layoutDirection","seedColor","ref","children","restProps","hostRef","mergedRef","undefined","matchContentsVertical","vertical","matchContentsHorizontal","horizontal","getConstants","isRTL","Provider","value"],"mappings":";AAAA,SAASA,iBAAiB,QAAQ,OAAO;AAEzC,SAASC,WAAW,QAAyD,eAAe;AAE5F,SAASC,iBAAiB,EAAEC,mBAAmB,QAAQ,0BAA0B;AACjF,SAASC,qBAAqB,EAAEC,mBAAmB,QAAQ,iBAAiB;AAC5E,SAASC,YAAY,QAAQ,2BAA2B;AACxD,SAASC,+BAA+B,QAAQ,qBAAqB;AAoErE,MAAMC,iBAMFR,kBAAkB,UAAU;AAEhC;;CAEC,GACD,OAAO,SAASS,KAAKC,KAAgB;IACnC,MAAM,EACJC,aAAa,EACbC,eAAe,EACfC,cAAc,EACdC,SAAS,EACTC,eAAe,EACfC,SAAS,EACTC,GAAG,EACHC,QAAQ,EACR,GAAGC,WACJ,GAAGT;IACJ,MAAMU,UAAUf;IAChB,MAAMgB,YAAYf,aAAaW,KAAKG;IACpCjB,oBAAoB;IAEpB,qBACE,KAACC;QAAsBgB,SAASA;kBAC9B,cAAA,KAACZ;YACCM,WAAWA;YACV,GAAIA,YAAYP,gCAAgCO,aAAaQ,SAAS;YACvEC,uBACE,OAAOZ,kBAAkB,WAAWA,cAAca,QAAQ,GAAGb;YAE/Dc,yBACE,OAAOd,kBAAkB,WAAWA,cAAce,UAAU,GAAGf;YAEjEC,iBAAiBA;YACjBG,iBACEA,mBAAoBd,CAAAA,YAAY0B,YAAY,GAAGC,KAAK,GAAG,gBAAgB,aAAY;YAErFf,gBAAgBA;YAChBG,WAAWA;YACV,GAAGG,SAAS;YACbF,KAAKI;sBACL,cAAA,KAACnB,kBAAkB2B,QAAQ;gBAACC,KAAK;0BAAEZ;;;;AAI3C"}

package/ios/DataListForEachView.swift

@@ -47,9 +47,23 @@ struct DataListForEachItemView: ExpoSwiftUI.View {
   }
 
   var body: some View {
-    Children()
+    content
       .publishZeroContentOrigin(props.shadowNodeProxy)
   }
+
+  // `List` reads row traits such as `moveDisabled` from the row's root view, and a nested
+  // `ForEach` breaks `onMove`. So a single child is the root itself.
+  @ViewBuilder
+  private var content: some View {
+    if let children = props.children, children.count == 1 {
+      let view: any View = children[0].childView
+      AnyView(view)
+    } else {
+      VStack(alignment: .leading, spacing: 0) {
+        Children()
+      }
+    }
+  }
 }
 
 final class DataListForEachPoolProps: ExpoSwiftUI.ViewProps {}
@@ -112,8 +126,9 @@ private struct DataListForEachRow: View {
     return slots[index % slots.count].childView as? DataListForEachItemView
   }
 
+  // A `Group`, not a stack, so the row's traits reach `List`.
   var body: some View {
-    VStack(alignment: .leading, spacing: 0) {
+    Group {
       if let slot {
         DataListForEachSlotContent(
           props: slot.props,
@@ -178,12 +193,15 @@ private struct DataListForEachSlotContent: View {
   var body: some View {
     Group {
       if showsContent {
+        // Measured in the background: `onGeometryChange` on the item hides its row traits from `List`.
         DataListForEachItemView(props: props)
           .id(itemKey)
-          .onGeometryChange(
-            for: CGFloat.self,
-            of: { axis == .horizontal ? $0.size.width : $0.size.height },
-            action: { size in window.measure(size, for: itemKey, revision: revision) }
+          .background(
+            Color.clear.onGeometryChange(
+              for: CGFloat.self,
+              of: { axis == .horizontal ? $0.size.width : $0.size.height },
+              action: { size in window.measure(size, for: itemKey, revision: revision) }
+            )
           )
       } else {
         // Hide the previous item while JS updates this slot.

package/ios/HostView.swift

@@ -60,6 +60,7 @@ internal final class HostViewProps: ExpoSwiftUI.ViewProps, ExpoSwiftUI.SafeAreaC
   @Field var layoutDirection: ExpoLayoutDirection = .leftToRight
   @Field var matchContentsHorizontal = false
   @Field var matchContentsVertical = false
+  @Field var alignment: AlignmentOptions?
   @Field var ignoreSafeArea: ExpoSwiftUI.IgnoreSafeArea?
   @Field var modifiers: ModifierArray?
   var onLayoutContent = EventDispatcher()
@@ -75,7 +76,7 @@ struct HostView: ExpoSwiftUI.View, ExpoSwiftUI.WithHostingView {
 
   var body: some View {
     let layoutDirection = props.layoutDirection.toLayoutDirection()
-    let alignment: Alignment = layoutDirection == .rightToLeft ? .topTrailing : .topLeading
+    let alignment = physicalAlignment(props.alignment?.toAlignment() ?? .topLeading, layoutDirection: layoutDirection)
     let fillHorizontal = !props.useViewportSizeMeasurement && !props.matchContentsHorizontal
     let fillVertical = !props.useViewportSizeMeasurement && !props.matchContentsVertical
     let pinHorizontal = !props.useViewportSizeMeasurement && props.matchContentsHorizontal
@@ -137,6 +138,24 @@ struct HostView: ExpoSwiftUI.View, ExpoSwiftUI.WithHostingView {
 
 }
 
+/**
+ Mirrors the horizontal edge of `alignment` for a right-to-left `Host`. `FillAlignmentModifier` sits
+ outside `LayoutDirectionModifier`, so it reads leading and trailing in the hosting controller's
+ own direction.
+ */
+private func physicalAlignment(_ alignment: Alignment, layoutDirection: LayoutDirection) -> Alignment {
+  guard layoutDirection == .rightToLeft else {
+    return alignment
+  }
+  if alignment.horizontal == .leading {
+    return Alignment(horizontal: .trailing, vertical: alignment.vertical)
+  }
+  if alignment.horizontal == .trailing {
+    return Alignment(horizontal: .leading, vertical: alignment.vertical)
+  }
+  return alignment
+}
+
 /**
  A Layout designed for the `useViewportSizeMeasurement` behavior.
  If parent's proposedViewSize is zero or nil, it will try to use the viewport size to expand its children size.

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

@@ -0,0 +1 @@
+485ed53072102e73937c25dae52b054c

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

@@ -0,0 +1 @@
+0a7945dfaec70218a5a6ed678049dd831dde7c23

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

@@ -0,0 +1 @@
+83f788f94510400d5695ee901721e3cef284309da751b00c9df7eeb8e4fdd5ca

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

@@ -0,0 +1 @@
+61d884b5f7528ac4d2791cebbdc45eefa1bfaf4eca17faf37b322a58a5670b042b1096a860bba051adb4a9d95334f227a9ea8f69473289d7a7725ea2600d7c48

package/local-maven-repo/expo/modules/ui/expo.modules.ui/{58.0.19/expo.modules.ui-58.0.19.module → 58.0.21/expo.modules.ui-58.0.21.module}

@@ -3,7 +3,7 @@
   "component": {
     "group": "expo.modules.ui",
     "module": "expo.modules.ui",
-    "version": "58.0.19",
+    "version": "58.0.21",
     "attributes": {
       "org.gradle.status": "release"
     }
@@ -24,13 +24,13 @@
       },
       "files": [
         {
-          "name": "expo.modules.ui-58.0.19.aar",
-          "url": "expo.modules.ui-58.0.19.aar",
-          "size": 1859361,
-          "sha512": "ba561fa50c9fde30184d2c36051e644fd87db59555b7b38f8e2e5b7096b03bf0d2aec3e53fff1831d2705d85b174ec1a7fc2e9cadc69c41237aac262bbea9365",
-          "sha256": "6cbb10f1e4cd5618c6997d87c2021e97c7bab1b8fc4ecc7be48f563e9c0e284a",
-          "sha1": "93a6d734857d79049d179014133d651be167840a",
-          "md5": "b51953e6905c7a42506ea0d23c859703"
+          "name": "expo.modules.ui-58.0.21.aar",
+          "url": "expo.modules.ui-58.0.21.aar",
+          "size": 1861060,
+          "sha512": "61d884b5f7528ac4d2791cebbdc45eefa1bfaf4eca17faf37b322a58a5670b042b1096a860bba051adb4a9d95334f227a9ea8f69473289d7a7725ea2600d7c48",
+          "sha256": "83f788f94510400d5695ee901721e3cef284309da751b00c9df7eeb8e4fdd5ca",
+          "sha1": "0a7945dfaec70218a5a6ed678049dd831dde7c23",
+          "md5": "485ed53072102e73937c25dae52b054c"
         }
       ]
     },
@@ -141,13 +141,13 @@
       ],
       "files": [
         {
-          "name": "expo.modules.ui-58.0.19.aar",
-          "url": "expo.modules.ui-58.0.19.aar",
-          "size": 1859361,
-          "sha512": "ba561fa50c9fde30184d2c36051e644fd87db59555b7b38f8e2e5b7096b03bf0d2aec3e53fff1831d2705d85b174ec1a7fc2e9cadc69c41237aac262bbea9365",
-          "sha256": "6cbb10f1e4cd5618c6997d87c2021e97c7bab1b8fc4ecc7be48f563e9c0e284a",
-          "sha1": "93a6d734857d79049d179014133d651be167840a",
-          "md5": "b51953e6905c7a42506ea0d23c859703"
+          "name": "expo.modules.ui-58.0.21.aar",
+          "url": "expo.modules.ui-58.0.21.aar",
+          "size": 1861060,
+          "sha512": "61d884b5f7528ac4d2791cebbdc45eefa1bfaf4eca17faf37b322a58a5670b042b1096a860bba051adb4a9d95334f227a9ea8f69473289d7a7725ea2600d7c48",
+          "sha256": "83f788f94510400d5695ee901721e3cef284309da751b00c9df7eeb8e4fdd5ca",
+          "sha1": "0a7945dfaec70218a5a6ed678049dd831dde7c23",
+          "md5": "485ed53072102e73937c25dae52b054c"
         }
       ]
     },
@@ -161,8 +161,8 @@
       },
       "files": [
         {
-          "name": "expo.modules.ui-58.0.19-sources.jar",
-          "url": "expo.modules.ui-58.0.19-sources.jar",
+          "name": "expo.modules.ui-58.0.21-sources.jar",
+          "url": "expo.modules.ui-58.0.21-sources.jar",
           "size": 113113,
           "sha512": "10ed672c04082cf5f06e6ca6dca0f28229f11f3d503d46e5b61dbc7d3ad50bfdc1399838dd38dc5b8c1643ec375c4bf1672c95606ce28f7ed36384f66b829b68",
           "sha256": "f9a24faad34f9f66bebcdde7d05a6cf72a8b4b9030819b80049de5084a694ef0",

package/local-maven-repo/expo/modules/ui/expo.modules.ui/58.0.21/expo.modules.ui-58.0.21.module.md5

@@ -0,0 +1 @@
+8fcf066c38977392c25464211134215f

package/local-maven-repo/expo/modules/ui/expo.modules.ui/58.0.21/expo.modules.ui-58.0.21.module.sha1

@@ -0,0 +1 @@
+aa7bf9c6ba26b5b17ed01fee30da4bebcccc3a30

package/local-maven-repo/expo/modules/ui/expo.modules.ui/58.0.21/expo.modules.ui-58.0.21.module.sha256

@@ -0,0 +1 @@
+40b983bbed71d40341901a69d3ccb11f05df376770fdf645d690adcdc2ecb2ad

package/local-maven-repo/expo/modules/ui/expo.modules.ui/58.0.21/expo.modules.ui-58.0.21.module.sha512

@@ -0,0 +1 @@
+d99293cea982f3bb6bd43ced68122e957b7de2fe6462e340d3a712220a05102f2c399896100844629fbaf9e4676005d0f5975d27b35066d4b1714a40ba160e22

package/local-maven-repo/expo/modules/ui/expo.modules.ui/{58.0.19/expo.modules.ui-58.0.19.pom → 58.0.21/expo.modules.ui-58.0.21.pom}

@@ -9,7 +9,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>expo.modules.ui</groupId>
   <artifactId>expo.modules.ui</artifactId>
-  <version>58.0.19</version>
+  <version>58.0.21</version>
   <packaging>aar</packaging>
   <name>expo.modules.ui</name>
   <url>https://github.com/expo/expo</url>

package/local-maven-repo/expo/modules/ui/expo.modules.ui/58.0.21/expo.modules.ui-58.0.21.pom.md5

@@ -0,0 +1 @@
+5eeba624939deea1d7fb87fe510557ae

package/local-maven-repo/expo/modules/ui/expo.modules.ui/58.0.21/expo.modules.ui-58.0.21.pom.sha1

@@ -0,0 +1 @@
+326c7b1245711c1546f6cff3d3b43a8d0055a7d5

package/local-maven-repo/expo/modules/ui/expo.modules.ui/58.0.21/expo.modules.ui-58.0.21.pom.sha256

@@ -0,0 +1 @@
+6f11e59da1bd0114fa50e832c7adb7f64651956a13e2989218f3f24b5e210b63

package/local-maven-repo/expo/modules/ui/expo.modules.ui/58.0.21/expo.modules.ui-58.0.21.pom.sha512

@@ -0,0 +1 @@
+d469c3b770e3c8135b80e503922da3361b5eb101d722a3cb92fa2602585c37938a0bc8096a6e1735e4d7d8612dcc46b7eb486816780a49a62531c58f48c7d3be

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@expo/ui",
-  "version": "58.0.19",
+  "version": "58.0.21",
   "description": "A collection of UI components",
   "keywords": [
     "Jetpack Compose",

package/src/community/segmented-control/vendor/SegmentedControl.tsx

@@ -5,7 +5,15 @@
  */
 
 import * as React from 'react';
-import { Animated, Easing, I18nManager, StyleSheet, View, useColorScheme } from 'react-native';
+import {
+  Animated,
+  Easing,
+  I18nManager,
+  Platform,
+  StyleSheet,
+  View,
+  useColorScheme,
+} from 'react-native';
 
 import { SegmentedControlTab } from './SegmentedControlTab';
 import { SegmentsSeparators } from './SegmentsSeparators';
@@ -53,7 +61,7 @@ export function SegmentedControl({
         toValue: isRTL * (selectedIndex ?? 0),
         duration: 300,
         easing: Easing.out(Easing.quad),
-        useNativeDriver: true,
+        useNativeDriver: Platform.OS !== 'web',
       }).start();
     }
   }, [animation, segmentWidth, selectedIndex]);

package/src/swift-ui/Host/index.tsx

@@ -6,7 +6,7 @@ import { NativeTreeContext, useWarnIfNestedHost } from '../../NativeTreeContext'
 import { TextInputHostProvider, useTextInputHostRef } from '../../keyboard';
 import { useMergeRefs } from '../../utils/useMergeRefs';
 import { createViewModifierEventListener } from '../modifiers/utils';
-import { type CommonViewModifierProps } from '../types';
+import { type Alignment, type CommonViewModifierProps } from '../types';
 
 export interface HostProps extends CommonViewModifierProps {
   /**
@@ -16,6 +16,17 @@ export interface HostProps extends CommonViewModifierProps {
    */
   matchContents?: boolean | { vertical?: boolean; horizontal?: boolean };
 
+  /**
+   * The position of the SwiftUI content inside the host when their sizes differ. The sizes differ
+   * when the host is larger than its content, and while the content of a `matchContents` host
+   * animates to a new size. Setting it to the edge that the host is anchored to in its React
+   * Native layout keeps that edge still. For example, a host at the end of a row uses `'trailing'`.
+   * It also aligns the host's children with each other. Leading and trailing follow
+   * `layoutDirection`.
+   * @default 'topLeading'
+   */
+  alignment?: Alignment;
+
   /**
    * When true and no explicit size is provided, the host will use the viewport size as the proposed size for SwiftUI layout.
    * This is particularly useful for SwiftUI views that need to fill their available space, such as `Form`.

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

@@ -1 +0,0 @@
-b51953e6905c7a42506ea0d23c859703

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

@@ -1 +0,0 @@
-93a6d734857d79049d179014133d651be167840a

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

@@ -1 +0,0 @@
-6cbb10f1e4cd5618c6997d87c2021e97c7bab1b8fc4ecc7be48f563e9c0e284a

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

@@ -1 +0,0 @@
-ba561fa50c9fde30184d2c36051e644fd87db59555b7b38f8e2e5b7096b03bf0d2aec3e53fff1831d2705d85b174ec1a7fc2e9cadc69c41237aac262bbea9365

package/local-maven-repo/expo/modules/ui/expo.modules.ui/58.0.19/expo.modules.ui-58.0.19.module.md5

@@ -1 +0,0 @@
-f8765d774d7e9b352373ba25a42200e2

package/local-maven-repo/expo/modules/ui/expo.modules.ui/58.0.19/expo.modules.ui-58.0.19.module.sha1

@@ -1 +0,0 @@
-8c2bd451043981662411c611d1573f61b55cf5dd

package/local-maven-repo/expo/modules/ui/expo.modules.ui/58.0.19/expo.modules.ui-58.0.19.module.sha256

@@ -1 +0,0 @@
-82b20f15e0fbc0c319fa61f9d869f302953272c36c4f15afbf4ce22b9cf64a5a

package/local-maven-repo/expo/modules/ui/expo.modules.ui/58.0.19/expo.modules.ui-58.0.19.module.sha512

@@ -1 +0,0 @@
-e4c834445928c130c75b01adbb0f1a7d875ebb80983b79e2c15f24fe34f832b90a23f53a82b6d5a925c8814f959b74f418f9e2d53f68bef68fb53a3c9486e6e6

package/local-maven-repo/expo/modules/ui/expo.modules.ui/58.0.19/expo.modules.ui-58.0.19.pom.md5

@@ -1 +0,0 @@
-946ca0f1d6a7ef71b367ede7f81fe3ff

package/local-maven-repo/expo/modules/ui/expo.modules.ui/58.0.19/expo.modules.ui-58.0.19.pom.sha1

@@ -1 +0,0 @@
-7cce460c1fa19a0c3e04acff06cf0cf34596c0c4

package/local-maven-repo/expo/modules/ui/expo.modules.ui/58.0.19/expo.modules.ui-58.0.19.pom.sha256

@@ -1 +0,0 @@
-58cda1507dfd9c49cea452e3bf9497b7516f2d926ca99101576c5bacf3126fdb

package/local-maven-repo/expo/modules/ui/expo.modules.ui/58.0.19/expo.modules.ui-58.0.19.pom.sha512

@@ -1 +0,0 @@
-5074aa536b5e8a9cc938a82b32c4d7a2d495e86d55f27d120629d312e707e37a9707f1d2853daaf853e257fbb02f3f8622ec54d17a3d1959e5768e10c5efce81