@expo/ui 58.0.8 → 58.0.9

package/build/swift-ui/List/ListForEach.d.ts

@@ -1,3 +1,4 @@
+import { type ReactElement } from 'react';
 import { type CommonViewModifierProps } from '../types';
 import { type ListForEachProps } from './DataListForEach';
 export { type ListForEachProps };
@@ -32,4 +33,9 @@ export interface ListForEachElementsProps extends CommonViewModifierProps {
  * Pass `data` with `keyExtractor`, and render each row from a `children` function.
  * Recycles rows unless `recycling` is `false`.
  */
-export declare function ListForEach<ItemT>(props: ListForEachProps<ItemT> | ListForEachElementsProps): import("react").JSX.Element;
+export declare function ListForEach<T>(props: ListForEachProps<T>): ReactElement;
+/**
+ * @hidden
+ * @deprecated Pass `data` and `keyExtractor`, and render each row from a `children` function.
+ */
+export declare function ListForEach(props: ListForEachElementsProps): ReactElement;

package/build/swift-ui/List/ListForEach.js

@@ -4,11 +4,7 @@ import { useItemKeys } from '../../recycling/useRecycledRows';
 import { DataListForEach, NativeSlot } from './DataListForEach';
 const ListForEachNativeView = requireNativeView('ExpoUI', 'ListForEachView');
 let warnedElements = false;
-/**
- * A group of rows inside `List`, with optional deletion and reordering.
- * Pass `data` with `keyExtractor`, and render each row from a `children` function.
- * Recycles rows unless `recycling` is `false`.
- */ export function ListForEach(props) {
+export function ListForEach(props) {
     if (props.data === undefined) {
         if (__DEV__ && !warnedElements) {
             warnedElements = true;

package/build/swift-ui/List/ListForEach.js.map

@@ -1 +1 @@
-{"version":3,"sources":["swift-ui/List/ListForEach.tsx"],"sourcesContent":[null],"names":["requireNativeView","useItemKeys","DataListForEach","NativeSlot","ListForEachNativeView","warnedElements","ListForEach","props","data","undefined","__DEV__","console","warn","ChildrenListForEach","recycling","rest","StaticListForEach","children","onDelete","onMove","deleteEnabled","moveEnabled","nativeEvent","indices","sourceIndices","destination","keyExtractor","renderItem","overscanCount","_overscanCount","estimatedItemSize","_estimatedItemSize","itemKeys","map","item","index","itemKey","revision"],"mappings":";AAAA,SAASA,iBAAiB,QAAQ,OAAO;AAEzC,SAASC,WAAW,QAAQ,kCAAkC;AAG9D,SAASC,eAAe,EAAEC,UAAU,QAA+B,oBAAoB;AAIvF,MAAMC,wBACJJ,kBAA0C,UAAU;AAyCtD,IAAIK,iBAAiB;AAErB;;;;CAIC,GACD,OAAO,SAASC,YAAmBC,KAAyD;IAC1F,IAAIA,MAAMC,IAAI,KAAKC,WAAW;QAC5B,IAAIC,WAAW,CAACL,gBAAgB;YAC9BA,iBAAiB;YACjBM,QAAQC,IAAI,CACV;QAEJ;QACA,qBAAO,KAACC;YAAqB,GAAGN,KAAK;;IACvC;IACA,MAAM,EAAEO,YAAY,IAAI,EAAE,GAAGC,MAAM,GAAGR;IACtC,OAAOO,0BAAY,KAACZ;QAAiB,GAAGa,IAAI;uBAAO,KAACC;QAAmB,GAAGD,IAAI;;AAChF;AAEA,SAASF,oBAAoB,EAAEI,QAAQ,EAAEC,QAAQ,EAAEC,MAAM,EAAE,GAAGZ,OAAiC;IAC7F,qBACE,KAACH;QACE,GAAGG,KAAK;QACTa,eAAe,CAAC,CAACF;QACjBG,aAAa,CAAC,CAACF;QACfD,UAAUA,WAAW,CAAC,EAAEI,WAAW,EAAE,GAAKJ,SAASI,YAAYC,OAAO,IAAId;QAC1EU,QACEA,SACI,CAAC,EAAEG,WAAW,EAAE,GAAKH,OAAOG,YAAYE,aAAa,EAAEF,YAAYG,WAAW,IAC9EhB;kBAELQ;;AAGP;AAEA,SAASD,kBAAyB,EAChCR,IAAI,EACJkB,YAAY,EACZT,UAAUU,UAAU,EACpBC,eAAeC,cAAc,EAC7BC,mBAAmBC,kBAAkB,EACrC,GAAGxB,OACwC;IAC3C,MAAMyB,WAAW/B,YAAY,gBAAgBO,MAAMkB;IACnD,qBACE,KAACb;QAAqB,GAAGN,KAAK;kBAC3BC,KAAKyB,GAAG,CAAC,CAACC,MAAMC,sBACf,KAAChC;gBAAiCiC,SAASJ,QAAQ,CAACG,MAAM;gBAAGA,OAAOA;gBAAOE,UAAU;0BAClFV,WAAW;oBAAEO;oBAAMC;gBAAM;eADXH,QAAQ,CAACG,MAAM;;AAMxC"}
+{"version":3,"sources":["swift-ui/List/ListForEach.tsx"],"sourcesContent":[null],"names":["requireNativeView","useItemKeys","DataListForEach","NativeSlot","ListForEachNativeView","warnedElements","ListForEach","props","data","undefined","__DEV__","console","warn","ChildrenListForEach","recycling","rest","StaticListForEach","children","onDelete","onMove","deleteEnabled","moveEnabled","nativeEvent","indices","sourceIndices","destination","keyExtractor","renderItem","overscanCount","_overscanCount","estimatedItemSize","_estimatedItemSize","itemKeys","map","item","index","itemKey","revision"],"mappings":";AAAA,SAASA,iBAAiB,QAAQ,OAAO;AAGzC,SAASC,WAAW,QAAQ,kCAAkC;AAG9D,SAASC,eAAe,EAAEC,UAAU,QAA+B,oBAAoB;AAIvF,MAAMC,wBACJJ,kBAA0C,UAAU;AAyCtD,IAAIK,iBAAiB;AAarB,OAAO,SAASC,YAAeC,KAAqD;IAClF,IAAIA,MAAMC,IAAI,KAAKC,WAAW;QAC5B,IAAIC,WAAW,CAACL,gBAAgB;YAC9BA,iBAAiB;YACjBM,QAAQC,IAAI,CACV;QAEJ;QACA,qBAAO,KAACC;YAAqB,GAAGN,KAAK;;IACvC;IACA,MAAM,EAAEO,YAAY,IAAI,EAAE,GAAGC,MAAM,GAAGR;IACtC,OAAOO,0BAAY,KAACZ;QAAiB,GAAGa,IAAI;uBAAO,KAACC;QAAmB,GAAGD,IAAI;;AAChF;AAEA,SAASF,oBAAoB,EAAEI,QAAQ,EAAEC,QAAQ,EAAEC,MAAM,EAAE,GAAGZ,OAAiC;IAC7F,qBACE,KAACH;QACE,GAAGG,KAAK;QACTa,eAAe,CAAC,CAACF;QACjBG,aAAa,CAAC,CAACF;QACfD,UAAUA,WAAW,CAAC,EAAEI,WAAW,EAAE,GAAKJ,SAASI,YAAYC,OAAO,IAAId;QAC1EU,QACEA,SACI,CAAC,EAAEG,WAAW,EAAE,GAAKH,OAAOG,YAAYE,aAAa,EAAEF,YAAYG,WAAW,IAC9EhB;kBAELQ;;AAGP;AAEA,SAASD,kBAAqB,EAC5BR,IAAI,EACJkB,YAAY,EACZT,UAAUU,UAAU,EACpBC,eAAeC,cAAc,EAC7BC,mBAAmBC,kBAAkB,EACrC,GAAGxB,OACoC;IACvC,MAAMyB,WAAW/B,YAAY,gBAAgBO,MAAMkB;IACnD,qBACE,KAACb;QAAqB,GAAGN,KAAK;kBAC3BC,KAAKyB,GAAG,CAAC,CAACC,MAAMC,sBACf,KAAChC;gBAAiCiC,SAASJ,QAAQ,CAACG,MAAM;gBAAGA,OAAOA;gBAAOE,UAAU;0BAClFV,WAAW;oBAAEO;oBAAMC;gBAAM;eADXH,QAAQ,CAACG,MAAM;;AAMxC"}

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

@@ -20,6 +20,7 @@ export * from './LabeledContent';
 export * from './HStack';
 export * from './LazyHStack';
 export * from './LazyVStack';
+export { type LazyStackForEachProps } from './LazyStackForEach';
 export * from './VStack';
 export * from './ZStack';
 export * from './Group';

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

@@ -1 +1 @@
-{"version":3,"sources":["swift-ui/index.tsx"],"sourcesContent":[null],"names":["useNativeState","withAnimation","TextField"],"mappings":"AAAA,cAAc,8BAA8B;AAC5C,cAAc,UAAU;AACxB,cAAc,gBAAgB;AAC9B,cAAc,WAAW;AACzB,cAAc,UAAU;AACxB,cAAc,gBAAgB;AAC9B,cAAc,2BAA2B;AACzC,cAAc,uBAAuB;AACrC,cAAc,iBAAiB;AAC/B,cAAc,gBAAgB;AAC9B,cAAc,eAAe;AAC7B,cAAc,YAAY;AAC1B,cAAc,oBAAoB;AAClC,cAAc,SAAS;AACvB,cAAc,UAAU;AACxB,cAAc,SAAS;AACvB,cAAc,UAAU;AACxB,cAAc,UAAU;AACxB,cAAc,mBAAmB;AACjC,cAAc,WAAW;AACzB,cAAc,eAAe;AAC7B,cAAc,eAAe;AAC7B,cAAc,WAAW;AACzB,cAAc,WAAW;AACzB,cAAc,UAAU;AACxB,cAAc,SAAS;AACvB,cAAc,SAAS;AACvB,cAAc,0BAA0B;AACxC,cAAc,mBAAmB;AACjC,cAAc,wBAAwB;AACtC,cAAc,oBAAoB;AAClC,cAAc,WAAW;AACzB,cAAc,iBAAiB;AAC/B,cAAc,YAAY;AAC1B,cAAc,cAAc;AAC5B,cAAc,WAAW;AACzB,cAAc,WAAW;AACzB,cAAc,YAAY;AAC1B,cAAc,iBAAiB;AAC/B,cAAc,SAAS;AACvB,SAASA,cAAc,QAAQ,WAAW;AAC1C,SAASC,aAAa,QAA8C,kBAAkB;AACtF,cAAc,eAAe;AAC7B,cAAc,YAAY;AAC1B,cAAc,YAAY;AAC1B,cAAc,WAAW;AACzB,SACEC,SAAS,QAIJ,cAAc;AACrB,cAAc,gBAAgB;AAC9B,cAAc,cAAc;AAC5B,cAAc,yBAAyB;AACvC,cAAc,eAAe;AAC7B,cAAc,WAAW;AACzB,cAAc,SAAS;AACvB,cAAc,YAAY;AAC1B,cAAc,eAAe;AAC7B,cAAc,YAAY;AAC1B,cAAc,SAAS;AACvB,cAAc,eAAe;AAC7B,cAAc,SAAS"}
+{"version":3,"sources":["swift-ui/index.tsx"],"sourcesContent":[null],"names":["useNativeState","withAnimation","TextField"],"mappings":"AAAA,cAAc,8BAA8B;AAC5C,cAAc,UAAU;AACxB,cAAc,gBAAgB;AAC9B,cAAc,WAAW;AACzB,cAAc,UAAU;AACxB,cAAc,gBAAgB;AAC9B,cAAc,2BAA2B;AACzC,cAAc,uBAAuB;AACrC,cAAc,iBAAiB;AAC/B,cAAc,gBAAgB;AAC9B,cAAc,eAAe;AAC7B,cAAc,YAAY;AAC1B,cAAc,oBAAoB;AAClC,cAAc,SAAS;AACvB,cAAc,UAAU;AACxB,cAAc,SAAS;AACvB,cAAc,UAAU;AACxB,cAAc,UAAU;AACxB,cAAc,mBAAmB;AACjC,cAAc,WAAW;AACzB,cAAc,eAAe;AAC7B,cAAc,eAAe;AAE7B,cAAc,WAAW;AACzB,cAAc,WAAW;AACzB,cAAc,UAAU;AACxB,cAAc,SAAS;AACvB,cAAc,SAAS;AACvB,cAAc,0BAA0B;AACxC,cAAc,mBAAmB;AACjC,cAAc,wBAAwB;AACtC,cAAc,oBAAoB;AAClC,cAAc,WAAW;AACzB,cAAc,iBAAiB;AAC/B,cAAc,YAAY;AAC1B,cAAc,cAAc;AAC5B,cAAc,WAAW;AACzB,cAAc,WAAW;AACzB,cAAc,YAAY;AAC1B,cAAc,iBAAiB;AAC/B,cAAc,SAAS;AACvB,SAASA,cAAc,QAAQ,WAAW;AAC1C,SAASC,aAAa,QAA8C,kBAAkB;AACtF,cAAc,eAAe;AAC7B,cAAc,YAAY;AAC1B,cAAc,YAAY;AAC1B,cAAc,WAAW;AACzB,SACEC,SAAS,QAIJ,cAAc;AACrB,cAAc,gBAAgB;AAC9B,cAAc,cAAc;AAC5B,cAAc,yBAAyB;AACvC,cAAc,eAAe;AAC7B,cAAc,WAAW;AACzB,cAAc,SAAS;AACvB,cAAc,YAAY;AAC1B,cAAc,eAAe;AAC7B,cAAc,YAAY;AAC1B,cAAc,SAAS;AACvB,cAAc,eAAe;AAC7B,cAAc,SAAS"}

package/build/universal/Switch/index.android.js

@@ -1,6 +1,6 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { Row, Switch as ComposeSwitch, Text } from '@expo/ui/jetpack-compose';
-import { testID as testIDModifier, weight } from '@expo/ui/jetpack-compose/modifiers';
+import { fillMaxWidth, IntrinsicSize, testID as testIDModifier, weight, width } from '@expo/ui/jetpack-compose/modifiers';
 export function Switch({ value, onValueChange, label, disabled, testID, modifiers }) {
     const toggle = /*#__PURE__*/ _jsx(ComposeSwitch, {
         value: value,
@@ -19,6 +19,10 @@ export function Switch({ value, onValueChange, label, disabled, testID, modifier
         horizontalArrangement: {
             spacedBy: 8
         },
+        modifiers: [
+            fillMaxWidth(),
+            width(IntrinsicSize.Max)
+        ],
         children: [
             /*#__PURE__*/ _jsx(Text, {
                 modifiers: [

package/build/universal/Switch/index.android.js.map

@@ -1 +1 @@
-{"version":3,"sources":["universal/Switch/index.android.tsx"],"sourcesContent":[null],"names":["Row","Switch","ComposeSwitch","Text","testID","testIDModifier","weight","value","onValueChange","label","disabled","modifiers","toggle","onCheckedChange","undefined","enabled","verticalAlignment","horizontalArrangement","spacedBy"],"mappings":";AAAA,SAASA,GAAG,EAAEC,UAAUC,aAAa,EAAEC,IAAI,QAAQ,2BAA2B;AAC9E,SAASC,UAAUC,cAAc,EAAEC,MAAM,QAAQ,qCAAqC;AAItF,OAAO,SAASL,OAAO,EAAEM,KAAK,EAAEC,aAAa,EAAEC,KAAK,EAAEC,QAAQ,EAAEN,MAAM,EAAEO,SAAS,EAAe;IAC9F,MAAMC,uBACJ,KAACV;QACCK,OAAOA;QACPM,iBAAiBH,WAAWI,YAAYN;QACxCO,SAAS,CAACL;QACVC,WAAW;eAAKA,aAAa,EAAE;eAAOP,SAAS;gBAACC,eAAeD;aAAQ,GAAG,EAAE;SAAE;;IAIlF,IAAIK,SAAS,MAAM,OAAOG;IAE1B,qBACE,MAACZ;QAAIgB,mBAAkB;QAASC,uBAAuB;YAAEC,UAAU;QAAE;;0BACnE,KAACf;gBAAKQ,WAAW;oBAACL,OAAO;iBAAG;0BAAGG;;YAC9BG;;;AAGP;AAEA,cAAc,UAAU"}
+{"version":3,"sources":["universal/Switch/index.android.tsx"],"sourcesContent":[null],"names":["Row","Switch","ComposeSwitch","Text","fillMaxWidth","IntrinsicSize","testID","testIDModifier","weight","width","value","onValueChange","label","disabled","modifiers","toggle","onCheckedChange","undefined","enabled","verticalAlignment","horizontalArrangement","spacedBy","Max"],"mappings":";AAAA,SAASA,GAAG,EAAEC,UAAUC,aAAa,EAAEC,IAAI,QAAQ,2BAA2B;AAC9E,SACEC,YAAY,EACZC,aAAa,EACbC,UAAUC,cAAc,EACxBC,MAAM,EACNC,KAAK,QACA,qCAAqC;AAI5C,OAAO,SAASR,OAAO,EAAES,KAAK,EAAEC,aAAa,EAAEC,KAAK,EAAEC,QAAQ,EAAEP,MAAM,EAAEQ,SAAS,EAAe;IAC9F,MAAMC,uBACJ,KAACb;QACCQ,OAAOA;QACPM,iBAAiBH,WAAWI,YAAYN;QACxCO,SAAS,CAACL;QACVC,WAAW;eAAKA,aAAa,EAAE;eAAOR,SAAS;gBAACC,eAAeD;aAAQ,GAAG,EAAE;SAAE;;IAIlF,IAAIM,SAAS,MAAM,OAAOG;IAE1B,qBACE,MAACf;QACCmB,mBAAkB;QAClBC,uBAAuB;YAAEC,UAAU;QAAE;QACrCP,WAAW;YAACV;YAAgBK,MAAMJ,cAAciB,GAAG;SAAE;;0BACrD,KAACnB;gBAAKW,WAAW;oBAACN,OAAO;iBAAG;0BAAGI;;YAC9BG;;;AAGP;AAEA,cAAc,UAAU"}

package/expo-module.config.json

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

package/ios/DataListForEachView.swift

@@ -3,7 +3,26 @@
 import ExpoModulesCore
 import SwiftUI
 
+// The axis the rows scroll along: vertical in `List` and `LazyVStack`, horizontal in `LazyHStack`.
+enum DataListForEachAxis: String, Enumerable {
+  case vertical
+  case horizontal
+}
+
+private struct ContainerCrossAxisSizeKey: EnvironmentKey {
+  static let defaultValue: CGFloat = 0
+}
+
+extension EnvironmentValues {
+  // Set by `ListView`, `LazyVStackView` and `LazyHStackView`, so recycled rows reset their cached sizes when it changes.
+  var containerCrossAxisSize: CGFloat {
+    get { self[ContainerCrossAxisSizeKey.self] }
+    set { self[ContainerCrossAxisSizeKey.self] = newValue }
+  }
+}
+
 final class DataListForEachProps: UIBaseViewProps {
+  @Field var axis: DataListForEachAxis = .vertical
   @Field var itemKeys: [String] = []
   @Field var revision: Int = 0
   @Field var estimatedItemSize: Double = 64
@@ -79,6 +98,7 @@ private struct DataListForEachRow: View {
   @ObservedObject var listProps: DataListForEachProps
   @ObservedObject var poolProps: DataListForEachPoolProps
   let window: DataListForEachWindow
+  @Environment(\.containerCrossAxisSize) private var crossAxisSize
   @State private var appeared = false
   @State private var visibilityID = UUID()
 
@@ -99,27 +119,27 @@ private struct DataListForEachRow: View {
           itemKey: itemKey,
           index: index,
           revision: listProps.revision,
-          estimatedHeight: CGFloat(listProps.estimatedItemSize),
+          estimatedSize: CGFloat(listProps.estimatedItemSize),
+          axis: listProps.axis,
           window: window
         )
       } else {
-        Color.clear
-          .frame(height: window.height(for: itemKey, fallback: listProps.estimatedItemSize))
-          .accessibilityHidden(true)
+        DataListForEachPlaceholder(
+          size: window.size(for: itemKey, fallback: listProps.estimatedItemSize),
+          axis: listProps.axis
+        )
       }
     }
-    .frame(maxWidth: .infinity, alignment: .leading)
     .onAppear {
       appeared = true
+      window.updateCrossAxisSize(crossAxisSize)
       window.appear(itemKey, index: index, token: visibilityID, props: listProps)
     }
+    .onChange(of: crossAxisSize) { window.updateCrossAxisSize($0) }
     .onChange(of: listProps.revision) { _ in
       window.reset(listProps)
       if appeared { window.appear(itemKey, index: index, token: visibilityID, props: listProps) }
     }
-    .onGeometryChange(for: CGFloat.self, of: { $0.size.width }, action: { width in
-      window.updateWidth(width)
-    })
     .onDisappear {
       appeared = false
       window.disappear(itemKey, token: visibilityID)
@@ -127,12 +147,25 @@ private struct DataListForEachRow: View {
   }
 }
 
+private struct DataListForEachPlaceholder: View {
+  let size: CGFloat
+  let axis: DataListForEachAxis
+
+  // Sized along the scroll axis only, so it never stretches a lazy stack across it.
+  var body: some View {
+    Color.clear
+      .frame(width: axis == .horizontal ? size : 0, height: axis == .horizontal ? 0 : size)
+      .accessibilityHidden(true)
+  }
+}
+
 private struct DataListForEachSlotContent: View {
   @ObservedObject var props: DataListForEachItemProps
   let itemKey: String
   let index: Int
   let revision: Int
-  let estimatedHeight: CGFloat
+  let estimatedSize: CGFloat
+  let axis: DataListForEachAxis
   let window: DataListForEachWindow
   // we use this state so swiftui re-layouts when the slot is reused for a different item
   @State private var showsContent = false
@@ -146,14 +179,17 @@ private struct DataListForEachSlotContent: View {
       if showsContent {
         DataListForEachItemView(props: props)
           .id(itemKey)
-          .onGeometryChange(for: CGFloat.self, of: { $0.size.height }, action: { height in
-            window.measure(height, for: itemKey, revision: revision)
-          })
+          .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.
-        Color.clear
-          .frame(height: window.height(for: itemKey, fallback: Double(estimatedHeight)))
-          .accessibilityHidden(true)
+        DataListForEachPlaceholder(
+          size: window.size(for: itemKey, fallback: Double(estimatedSize)),
+          axis: axis
+        )
       }
     }
     .onAppear { showsContent = matches }
@@ -166,8 +202,9 @@ private final class DataListForEachWindow: ObservableObject {
   private weak var props: DataListForEachProps?
   private var appeared: [String: Int] = [:]
   private var visibilityTokens: [String: UUID] = [:]
-  private var heights: [String: CGFloat] = [:]
-  private var width: CGFloat = 0
+  // Row sizes along the scroll axis.
+  private var sizes: [String: CGFloat] = [:]
+  private var crossAxisSize: CGFloat = 0
   private var revision = -1
   private var pending: DispatchWorkItem?
   private var lastSent: [Int] = []
@@ -182,7 +219,7 @@ private final class DataListForEachWindow: ObservableObject {
       return
     }
     revision = props.revision
-    heights.removeAll()
+    sizes.removeAll()
     let positions = Dictionary(uniqueKeysWithValues: props.itemKeys.enumerated().map { ($0.element, $0.offset) })
     appeared = positions.filter { appeared[$0.key] != nil }
     visibilityTokens = visibilityTokens.filter { positions[$0.key] != nil }
@@ -190,12 +227,12 @@ private final class DataListForEachWindow: ObservableObject {
     schedule()
   }
 
-  func updateWidth(_ newWidth: CGFloat) {
-    if width != newWidth {
-      if width > 0 {
-        heights.removeAll()
+  func updateCrossAxisSize(_ newSize: CGFloat) {
+    if crossAxisSize != newSize {
+      if crossAxisSize > 0 {
+        sizes.removeAll()
       }
-      width = newWidth
+      crossAxisSize = newSize
     }
   }
 
@@ -220,15 +257,15 @@ private final class DataListForEachWindow: ObservableObject {
     schedule()
   }
 
-  func height(for key: String, fallback: Double) -> CGFloat {
-    heights[key] ?? CGFloat(fallback)
+  func size(for key: String, fallback: Double) -> CGFloat {
+    sizes[key] ?? CGFloat(fallback)
   }
 
-  func measure(_ height: CGFloat, for key: String, revision: Int) {
-    guard revision == self.revision, height.isFinite, height > 0 else {
+  func measure(_ size: CGFloat, for key: String, revision: Int) {
+    guard revision == self.revision, size.isFinite, size > 0 else {
       return
     }
-    heights[key] = height
+    sizes[key] = size
   }
 
   private func schedule() {

package/ios/LazyHStackView.swift

@@ -10,6 +10,7 @@ public final class LazyHStackViewProps: UIBaseViewProps {
 
 public struct LazyHStackView: ExpoSwiftUI.View {
   @ObservedObject public var props: LazyHStackViewProps
+  @State private var crossAxisSize: CGFloat = 0
 
   public init(props: LazyHStackViewProps) {
     self.props = props
@@ -21,5 +22,7 @@ public struct LazyHStackView: ExpoSwiftUI.View {
       spacing: props.spacing.map { CGFloat($0) }) {
         Children()
     }
+    .onGeometryChange(for: CGFloat.self, of: { $0.size.height }, action: { crossAxisSize = $0 })
+    .environment(\.containerCrossAxisSize, crossAxisSize)
   }
 }

package/ios/LazyVStackView.swift

@@ -10,6 +10,7 @@ public final class LazyVStackViewProps: UIBaseViewProps {
 
 public struct LazyVStackView: ExpoSwiftUI.View {
   @ObservedObject public var props: LazyVStackViewProps
+  @State private var crossAxisSize: CGFloat = 0
 
   public init(props: LazyVStackViewProps) {
     self.props = props
@@ -21,5 +22,7 @@ public struct LazyVStackView: ExpoSwiftUI.View {
       spacing: props.spacing.map { CGFloat($0) }) {
         Children()
     }
+    .onGeometryChange(for: CGFloat.self, of: { $0.size.width }, action: { crossAxisSize = $0 })
+    .environment(\.containerCrossAxisSize, crossAxisSize)
   }
 }

package/ios/ListView.swift

@@ -11,8 +11,16 @@ final class ListProps: UIBaseViewProps {
 struct ListView: ExpoSwiftUI.View {
   @ObservedObject var props: ListProps
   @State private var selection = Set<AnyHashable>()
+  @State private var crossAxisSize: CGFloat = 0
 
   var body: some View {
+    list
+      .onGeometryChange(for: CGFloat.self, of: { $0.size.width }, action: { crossAxisSize = $0 })
+      .environment(\.containerCrossAxisSize, crossAxisSize)
+  }
+
+  @ViewBuilder
+  private var list: some View {
     if props.selection != nil {
       List(selection: $selection) {
         Children()

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

@@ -0,0 +1 @@
+ec47224b2d335b3f472a55d70f343b8f

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

@@ -0,0 +1 @@
+a5da15def1d399f452a19c62651e73a942d873ec

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

@@ -0,0 +1 @@
+73965c56280c334bb29231b9523362401285d6609ef8b75839f1c89b6a3aa4f7

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

@@ -0,0 +1 @@
+d1b747e78264dad3ee7a5322811ff5d079433fa34a32ebb5ae5c29c5c3ef412746a8c10d3e22937037b45a4b909783329deebf92b09e5c1ef486807a5978ffc6

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

@@ -0,0 +1 @@
+03491dfb69ff8c25616d5f8ca35be94a

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

@@ -0,0 +1 @@
+518280855fc0ebe67334a36edceffbfbce55f947

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

@@ -0,0 +1 @@
+a88a20a3df6e5cfd20d54e45c597425a5e052a5b8ba95a41d6b5a92aa8c02fc6

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

@@ -0,0 +1 @@
+1c0e1676d8ed6f47450bb5e7f28d486d275a7e0264893ea78bac3cacc0341aa3e0097f5c033fb601eac07fc8482498005a51f27b8bffcc7249366b34b14b40f5

package/local-maven-repo/expo/modules/ui/expo.modules.ui/{58.0.8/expo.modules.ui-58.0.8.module → 58.0.9/expo.modules.ui-58.0.9.module}

@@ -3,7 +3,7 @@
   "component": {
     "group": "expo.modules.ui",
     "module": "expo.modules.ui",
-    "version": "58.0.8",
+    "version": "58.0.9",
     "attributes": {
       "org.gradle.status": "release"
     }
@@ -24,13 +24,13 @@
       },
       "files": [
         {
-          "name": "expo.modules.ui-58.0.8.aar",
-          "url": "expo.modules.ui-58.0.8.aar",
-          "size": 1836349,
-          "sha512": "e5ced1751f3e2e90a7320abf88d98bea0a578fbcabcf73c0aca0e9997efe4d0313375d810c789fe2d96f6f6d5cdb9f36c21c2b82f67db8626149105938f29523",
-          "sha256": "315787d05711205c64b7245b046f29efe369b50f4e86866afef62b2b2474e537",
-          "sha1": "94aec72d27a48e827dbb31b9d734150334b08662",
-          "md5": "31be76a409dceed307ca47e9e66c8348"
+          "name": "expo.modules.ui-58.0.9.aar",
+          "url": "expo.modules.ui-58.0.9.aar",
+          "size": 1842529,
+          "sha512": "1c0e1676d8ed6f47450bb5e7f28d486d275a7e0264893ea78bac3cacc0341aa3e0097f5c033fb601eac07fc8482498005a51f27b8bffcc7249366b34b14b40f5",
+          "sha256": "a88a20a3df6e5cfd20d54e45c597425a5e052a5b8ba95a41d6b5a92aa8c02fc6",
+          "sha1": "518280855fc0ebe67334a36edceffbfbce55f947",
+          "md5": "03491dfb69ff8c25616d5f8ca35be94a"
         }
       ]
     },
@@ -141,13 +141,13 @@
       ],
       "files": [
         {
-          "name": "expo.modules.ui-58.0.8.aar",
-          "url": "expo.modules.ui-58.0.8.aar",
-          "size": 1836349,
-          "sha512": "e5ced1751f3e2e90a7320abf88d98bea0a578fbcabcf73c0aca0e9997efe4d0313375d810c789fe2d96f6f6d5cdb9f36c21c2b82f67db8626149105938f29523",
-          "sha256": "315787d05711205c64b7245b046f29efe369b50f4e86866afef62b2b2474e537",
-          "sha1": "94aec72d27a48e827dbb31b9d734150334b08662",
-          "md5": "31be76a409dceed307ca47e9e66c8348"
+          "name": "expo.modules.ui-58.0.9.aar",
+          "url": "expo.modules.ui-58.0.9.aar",
+          "size": 1842529,
+          "sha512": "1c0e1676d8ed6f47450bb5e7f28d486d275a7e0264893ea78bac3cacc0341aa3e0097f5c033fb601eac07fc8482498005a51f27b8bffcc7249366b34b14b40f5",
+          "sha256": "a88a20a3df6e5cfd20d54e45c597425a5e052a5b8ba95a41d6b5a92aa8c02fc6",
+          "sha1": "518280855fc0ebe67334a36edceffbfbce55f947",
+          "md5": "03491dfb69ff8c25616d5f8ca35be94a"
         }
       ]
     },
@@ -161,13 +161,13 @@
       },
       "files": [
         {
-          "name": "expo.modules.ui-58.0.8-sources.jar",
-          "url": "expo.modules.ui-58.0.8-sources.jar",
-          "size": 109792,
-          "sha512": "fe7df10c6d11c1f95ca7de35f60911401b64bd4b258c6c7956611f973bd062a367c0aea2693298e3d703e58a89b70cfd2c47851400299d035ea28499e595fb8e",
-          "sha256": "02ee570f6a4a03679186bf43c56875eebf84f15abb7e79bb7040eddad7da908d",
-          "sha1": "c96c6c3f5dc0911a893274646c0cf2096a610423",
-          "md5": "9fb8758d9f0ad26c9154ad6536600e2c"
+          "name": "expo.modules.ui-58.0.9-sources.jar",
+          "url": "expo.modules.ui-58.0.9-sources.jar",
+          "size": 110135,
+          "sha512": "d1b747e78264dad3ee7a5322811ff5d079433fa34a32ebb5ae5c29c5c3ef412746a8c10d3e22937037b45a4b909783329deebf92b09e5c1ef486807a5978ffc6",
+          "sha256": "73965c56280c334bb29231b9523362401285d6609ef8b75839f1c89b6a3aa4f7",
+          "sha1": "a5da15def1d399f452a19c62651e73a942d873ec",
+          "md5": "ec47224b2d335b3f472a55d70f343b8f"
         }
       ]
     }

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

@@ -0,0 +1 @@
+31e281ac2bb4dffa91f358cf5d640e10

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

@@ -0,0 +1 @@
+10a6ee8c177a62ee345887c2bed3646fcdf2bcd2

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

@@ -0,0 +1 @@
+bb9ec229a95ef7d1d0de7c04bd74d4b6bdbf3edefc4fd79ff981bf59eb9ad7c5

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

@@ -0,0 +1 @@
+230bb0ac3f5f59bd76471e8b3f81c13e307783067b67697d2f986d4124fa867b93dc6889fbfeea2742adf374356352c4b389681a789b0d49f374e24dea8d966a

package/local-maven-repo/expo/modules/ui/expo.modules.ui/{58.0.8/expo.modules.ui-58.0.8.pom → 58.0.9/expo.modules.ui-58.0.9.pom}

@@ -9,7 +9,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>expo.modules.ui</groupId>
   <artifactId>expo.modules.ui</artifactId>
-  <version>58.0.8</version>
+  <version>58.0.9</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.9/expo.modules.ui-58.0.9.pom.md5

@@ -0,0 +1 @@
+ae57212338708f66ac952ed7f3f02404

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

@@ -0,0 +1 @@
+3ac2c204accfb124d9f79698c682e6ba02ca29cd

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

@@ -0,0 +1 @@
+4c1e29b3da7ef0b39b38098eae7b5825d72b6e25656f8de8bc81d1f69ee27212

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

@@ -0,0 +1 @@
+bd9a114fb2bdac0e64ebc684918b6ee54e0ea6afc248716449dd9c5c2df5751328cca2033951d3b3aef8df411f8efaa9c0876c790a5fba751f93cd6e83939e4c

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@expo/ui",
-  "version": "58.0.8",
+  "version": "58.0.9",
   "description": "A collection of UI components",
   "keywords": [
     "Jetpack Compose",
@@ -148,7 +148,7 @@
     "@types/jest": "^29.2.1",
     "@types/node": "^22.14.0",
     "@types/react": "~19.3.0",
-    "expo-module-scripts": "56.0.3",
+    "expo-module-scripts": "56.0.4",
     "react-native-reanimated": "4.7.0",
     "react-native-worklets": "0.13.0"
   },
@@ -171,9 +171,9 @@
       "optional": true
     }
   },
-  "gitHead": "74f6d2b90bc50bd8df7b160d6e6b2204b37a8ce7",
   "scripts": {
     "precompile-ios": "et prebuild-package-for-publish",
+    "precompile-android": "et prebuild-android-package-for-publish",
     "build": "pnpm run build:lib && pnpm run build:plugin",
     "build:lib": "expo-build src",
     "build:plugin": "expo-build --base plugin cjs:src",

package/src/jetpack-compose/LazyColumn/index.tsx

@@ -4,6 +4,8 @@ import type { ExpoModifier } from '../../types';
 import { LazyItems } from '../LazyItems';
 import { createViewModifierEventListener } from '../modifiers/utils';
 
+export { LazyItems, type LazyItemsProps } from '../LazyItems';
+
 /**
  * Content padding values for LazyColumn.
  */

package/src/jetpack-compose/LazyItems/index.tsx

@@ -5,38 +5,36 @@ import {
   useItemKeys,
   useRecycledRows,
   type RecycledSlotProps,
-  type RenderItem,
   type WindowChangeEvent,
 } from '../../recycling/useRecycledRows';
 import { type ViewEvent } from '../../types';
 
-export interface LazyItemsProps<ItemT> {
+export interface LazyItemsProps<T> {
   /** Items to display. Replace the array when updating data. */
-  data: readonly ItemT[];
+  data: readonly T[];
   /** Returns a stable, unique string key, also used as the lazy list item key. */
-  keyExtractor: (item: ItemT, index: number) => string;
+  keyExtractor: (item: T, index: number) => string;
   /**
-   * Renders a row. Wrap it in `useCallback`, or every row re-renders on each parent render.
-   * Recycled rows are reused for other items, so their local state (`useState`) carries over.
-   * Reset it when the item changes, or keep the state outside the row.
+   * Renders an item. Wrap it in `useCallback`, or every item re-renders on each parent render.
+   * Recycled views are reused for other items, so their local state (`useState`) carries over.
+   * Reset it when the item changes, or keep the state outside the view.
    */
-  children: RenderItem<ItemT>;
+  children: (info: { item: T; index: number }) => ReactElement;
   /**
-   * Renders only the rows near the visible range and reuses them while scrolling. Set to `false` to
-   * render every row at once. Set it once; changing it remounts the rows.
+   * Renders only the items near the visible range and reuses them while scrolling. Set to `false`
+   * to render every item at once. Set it once; changing it remounts the items.
    * @default true
    */
   recycling?: boolean;
   /**
-   * Extra rows to prepare on each side of the visible rows. Must be a non-negative integer.
+   * Extra items to prepare on each side of the visible items. Must be a non-negative integer.
    * Ignored when `recycling` is `false`.
    * @default 10
    */
   overscanCount?: number;
   /**
-   * Placeholder size in dp along the scroll axis, until a row is measured. Must be positive.
-   * Measurements reset when the data changes. In `LazyColumn.Items` they also reset when the list
-   * width changes. Ignored when `recycling` is `false`.
+   * Placeholder size in dp along the scroll axis, until an item is measured. Must be positive.
+   * Ignored when `recycling` is `false`.
    * @default 64
    */
   estimatedItemSize?: number;
@@ -62,8 +60,7 @@ const LazyItemsPoolNativeView: React.ComponentType<{ children: ReactElement[] }>
  * so large data sets stay cheap. Rows that are not ready yet show a placeholder of
  * `estimatedItemSize`, or of the size last measured for that item.
  *
- * Mount it as a direct child of `LazyColumn` or `LazyRow`. Plain children of the same list stay
- * single items, so static and recycled content can be mixed in order.
+ * Mount it as a direct child of `LazyColumn` or `LazyRow`.
  * @platform android
  */
 export const LazyItems = createLazyItems('LazyColumn.Items');
@@ -73,29 +70,29 @@ export const LazyItems = createLazyItems('LazyColumn.Items');
  * Creates the `Items` component of one lazy list, so its errors name that list.
  */
 export function createLazyItems(componentName: string) {
-  function Items<ItemT>({ recycling = true, ...props }: LazyItemsProps<ItemT>) {
+  function Items<T>({ recycling = true, ...props }: LazyItemsProps<T>) {
     return recycling ? <RecycledItems {...props} /> : <StaticItems {...props} />;
   }
 
   // Each row is a plain child of the lazy list, so it becomes one lazy item.
-  function StaticItems<ItemT>({
+  function StaticItems<T>({
     data,
     keyExtractor,
     children: renderItem,
-  }: Omit<LazyItemsProps<ItemT>, 'recycling'>) {
+  }: Omit<LazyItemsProps<T>, 'recycling'>) {
     const itemKeys = useItemKeys(componentName, data, keyExtractor);
     return data.map((item, index) => (
       <Fragment key={itemKeys[index]}>{renderItem({ item, index })}</Fragment>
     ));
   }
 
-  function RecycledItems<ItemT>({
+  function RecycledItems<T>({
     data,
     keyExtractor,
     children: renderItem,
     overscanCount,
     estimatedItemSize = 64,
-  }: Omit<LazyItemsProps<ItemT>, 'recycling'>) {
+  }: Omit<LazyItemsProps<T>, 'recycling'>) {
     const { itemKeys, revision, rows, onWindowChange } = useRecycledRows({
       componentName,
       Slot: LazyItemsSlotNativeView,

package/src/jetpack-compose/LazyRow/index.tsx

@@ -5,6 +5,8 @@ import { type ContentPadding } from '../LazyColumn';
 import { createLazyItems } from '../LazyItems';
 import { createViewModifierEventListener } from '../modifiers/utils';
 
+export { LazyItems, type LazyItemsProps } from '../LazyItems';
+
 export interface LazyRowProps {
   /**
    * The content to display inside the lazy row.

package/src/jetpack-compose/index.ts

@@ -17,7 +17,6 @@ export * from './ExposedDropdownMenuBox';
 export * from './Divider';
 export * from './Host';
 export * from './LazyColumn';
-export { type LazyItemsProps } from './LazyItems';
 export * from './LazyRow';
 export * from './ListItem';
 export * from './RNHostView';