@expo/ui 58.0.19 → 58.0.20

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 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.20'
 
 android {
   namespace "expo.modules.ui"
   defaultConfig {
     versionCode 1
-    versionName "58.0.19"
+    versionName "58.0.20"
     testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
   }
   buildFeatures {

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/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.19/expo.modules.ui-58.0.19.module → 58.0.20/expo.modules.ui-58.0.20.module}

@@ -3,7 +3,7 @@
   "component": {
     "group": "expo.modules.ui",
     "module": "expo.modules.ui",
-    "version": "58.0.19",
+    "version": "58.0.20",
     "attributes": {
       "org.gradle.status": "release"
     }
@@ -24,8 +24,8 @@
       },
       "files": [
         {
-          "name": "expo.modules.ui-58.0.19.aar",
-          "url": "expo.modules.ui-58.0.19.aar",
+          "name": "expo.modules.ui-58.0.20.aar",
+          "url": "expo.modules.ui-58.0.20.aar",
           "size": 1859361,
           "sha512": "ba561fa50c9fde30184d2c36051e644fd87db59555b7b38f8e2e5b7096b03bf0d2aec3e53fff1831d2705d85b174ec1a7fc2e9cadc69c41237aac262bbea9365",
           "sha256": "6cbb10f1e4cd5618c6997d87c2021e97c7bab1b8fc4ecc7be48f563e9c0e284a",
@@ -141,8 +141,8 @@
       ],
       "files": [
         {
-          "name": "expo.modules.ui-58.0.19.aar",
-          "url": "expo.modules.ui-58.0.19.aar",
+          "name": "expo.modules.ui-58.0.20.aar",
+          "url": "expo.modules.ui-58.0.20.aar",
           "size": 1859361,
           "sha512": "ba561fa50c9fde30184d2c36051e644fd87db59555b7b38f8e2e5b7096b03bf0d2aec3e53fff1831d2705d85b174ec1a7fc2e9cadc69c41237aac262bbea9365",
           "sha256": "6cbb10f1e4cd5618c6997d87c2021e97c7bab1b8fc4ecc7be48f563e9c0e284a",
@@ -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.20-sources.jar",
+          "url": "expo.modules.ui-58.0.20-sources.jar",
           "size": 113113,
           "sha512": "10ed672c04082cf5f06e6ca6dca0f28229f11f3d503d46e5b61dbc7d3ad50bfdc1399838dd38dc5b8c1643ec375c4bf1672c95606ce28f7ed36384f66b829b68",
           "sha256": "f9a24faad34f9f66bebcdde7d05a6cf72a8b4b9030819b80049de5084a694ef0",

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

@@ -0,0 +1 @@
+8a77f323b246c691865ac941165d9266

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

@@ -0,0 +1 @@
+b378b5a3097dfa2a27e87822671b5b1867b14d52

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

@@ -0,0 +1 @@
+46af13485988415a3ff14c812754b46df0b5cf7d0b7ebb28a80d7b16c3306fe4

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

@@ -0,0 +1 @@
+c9fcfdbaa4dbae59c5112fffa82e03ce4c36bb3840f98c1f149c9b0d8d0634dff5c5f63e47f32e921933b5a29bdab362830aecf5f37e3fa82cd552c28e774f71

package/local-maven-repo/expo/modules/ui/expo.modules.ui/{58.0.19/expo.modules.ui-58.0.19.pom → 58.0.20/expo.modules.ui-58.0.20.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.20</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.20/expo.modules.ui-58.0.20.pom.md5

@@ -0,0 +1 @@
+9cd26d77ffc11275527c424abeca3563

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

@@ -0,0 +1 @@
+ff65582de003d4ba6fbfb2194fb4bb97bd523798

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

@@ -0,0 +1 @@
+fde46f8c2665d31cc8c43574f2897aed7e82a9db1e29fdf0a557e4c8d528f005

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

@@ -0,0 +1 @@
+1f1f387588df2979f0a9f2eb9db168b05343069b1ffe2f46f30da422e31d554d9133a96afc594e69824183460ab5bfb9f2982a43613d294c31eac7a3d814b23b

package/package.json

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

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.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