@expo/ui 58.0.8 → 58.0.10

package/src/swift-ui/List/DataListForEach.tsx

@@ -10,7 +10,7 @@ import { type ViewEvent } from '../../types';
 import { createViewModifierEventListener } from '../modifiers/utils';
 import { type CommonViewModifierProps } from '../types';
 
-export interface ListForEachProps<ItemT> extends CommonViewModifierProps {
+export interface ListForEachProps<T> extends CommonViewModifierProps {
   /** Called with deleted indices from this group's `data` array. */
   onDelete?: (indices: number[]) => void;
   /**
@@ -19,16 +19,16 @@ export interface ListForEachProps<ItemT> extends CommonViewModifierProps {
    */
   onMove?: (sourceIndices: number[], destination: number) => void;
   /** Items to display. Replace the array when updating data. */
-  data: readonly ItemT[];
+  data: readonly T[];
   /** Returns a stable, unique string key, also used for `List` selection. */
-  keyExtractor: (item: ItemT, index: number) => string;
+  keyExtractor: (item: T, index: number) => string;
   /**
    * Renders a row. When `recycling` is `true`, 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.
    */
-  children: (info: { item: ItemT; index: number }) => ReactElement;
+  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.
@@ -43,8 +43,7 @@ export interface ListForEachProps<ItemT> extends CommonViewModifierProps {
   overscanCount?: number;
   /**
    * Placeholder height in points, excluding `List` insets, until a row is measured.
-   * Must be positive. Measurements reset when `data` or width changes.
-   * Ignored when `recycling` is `false`.
+   * Must be positive. Ignored when `recycling` is `false`.
    * @default 64
    */
   estimatedItemSize?: number;
@@ -74,7 +73,7 @@ const NativePool = requireNativeView<{ children: ReactElement[] }>(
  * Rows show placeholders while JS prepares content. Native keys still cover the full data set.
  * @platform ios
  */
-export function DataListForEach<ItemT>({
+export function DataListForEach<T>({
   data,
   keyExtractor,
   children: renderItem,
@@ -84,7 +83,7 @@ export function DataListForEach<ItemT>({
   onDelete,
   onMove,
   ...props
-}: ListForEachProps<ItemT>) {
+}: ListForEachProps<T>) {
   const { itemKeys, revision, rows, onWindowChange, isCurrentRevision } = useRecycledRows({
     componentName: 'List.ForEach',
     Slot: NativeSlot,

package/src/swift-ui/List/ListForEach.tsx

@@ -1,4 +1,5 @@
 import { requireNativeView } from 'expo';
+import { type ReactElement } from 'react';
 
 import { useItemKeys } from '../../recycling/useRecycledRows';
 import { type ViewEvent } from '../../types';
@@ -56,7 +57,13 @@ let warnedElements = false;
  * Pass `data` with `keyExtractor`, and render each row from a `children` function.
  * Recycles rows unless `recycling` is `false`.
  */
-export function ListForEach<ItemT>(props: ListForEachProps<ItemT> | ListForEachElementsProps) {
+export function ListForEach<T>(props: ListForEachProps<T>): ReactElement;
+/**
+ * @hidden
+ * @deprecated Pass `data` and `keyExtractor`, and render each row from a `children` function.
+ */
+export function ListForEach(props: ListForEachElementsProps): ReactElement;
+export function ListForEach<T>(props: ListForEachProps<T> | ListForEachElementsProps) {
   if (props.data === undefined) {
     if (__DEV__ && !warnedElements) {
       warnedElements = true;
@@ -87,14 +94,14 @@ function ChildrenListForEach({ children, onDelete, onMove, ...props }: ListForEa
   );
 }
 
-function StaticListForEach<ItemT>({
+function StaticListForEach<T>({
   data,
   keyExtractor,
   children: renderItem,
   overscanCount: _overscanCount,
   estimatedItemSize: _estimatedItemSize,
   ...props
-}: Omit<ListForEachProps<ItemT>, 'recycling'>) {
+}: Omit<ListForEachProps<T>, 'recycling'>) {
   const itemKeys = useItemKeys('List.ForEach', data, keyExtractor);
   return (
     <ChildrenListForEach {...props}>

package/src/swift-ui/RNHostView.tsx

@@ -2,6 +2,7 @@ import { requireNativeView } from 'expo';
 import type { LayoutChangeEvent } from 'react-native';
 
 import { PresentedContentContext, useIsPresentedInOwnWindow } from '../PresentedContentContext';
+import { resolveMatchContents } from '../utils/matchContents';
 
 const RNHostNativeView: React.ComponentType<any> = requireNativeView('ExpoUI', 'RNHostView');
 
@@ -10,10 +11,12 @@ export interface RNHostViewProps {
    * When `true`, the RNHost will update its size in the React Native view tree to match the
    * children's size.
    * When `false`, the RNHost will use the size of the parent SwiftUI View.
+   * Pass an object to choose per axis. For example, `{ vertical: true }` takes the width from the
+   * parent and the height from the children, so text wraps and grows vertically.
    * Can be only set once on mount.
    * @default false
    */
-  matchContents?: boolean;
+  matchContents?: boolean | { vertical?: boolean; horizontal?: boolean };
   onLayout?: (event: LayoutChangeEvent) => void;
   /**
    * The RN View to be hosted.
@@ -21,21 +24,25 @@ export interface RNHostViewProps {
   children: React.ReactElement;
 }
 
-export function RNHostView(props: RNHostViewProps) {
+export function RNHostView({ matchContents, ...props }: RNHostViewProps) {
   // A sheet or popover presents its content in its own view controller, where the React Native
   // surface root is not an ancestor and so touch dispatches don't work.
   // Hosted content there owns its touches and is the origin it is measured from; native reads
   // this one prop for both.
   const layoutRoot = useIsPresentedInOwnWindow();
+  const { horizontal: matchContentsHorizontal, vertical: matchContentsVertical } =
+    resolveMatchContents(matchContents);
 
   return (
     <RNHostNativeView
       {...props}
       layoutRoot={layoutRoot}
-      expoInternalSizeFromChildren={props.matchContents}
+      matchContentsHorizontal={matchContentsHorizontal}
+      matchContentsVertical={matchContentsVertical}
+      expoInternalSizeFromChildren={matchContentsHorizontal || matchContentsVertical}
       // `matchContents` can only be used once on mount
       // So we force unmount when it changes to prevent unexpected layout
-      key={props.matchContents ? 'matchContents' : 'noMatchContents'}>
+      key={`${matchContentsHorizontal}-${matchContentsVertical}`}>
       {/* Reset context here so only nearest RNHostView becomes the layout root for its children, and not any other RNHostView above it in the tree. */}
       <PresentedContentContext.Provider value={false}>
         {props.children}

package/src/swift-ui/index.tsx

@@ -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/src/swift-ui/modifiers/containerBackground.ts

@@ -6,8 +6,8 @@ export type ContainerBackgroundPlacement = 'widget' | 'navigation' | 'navigation
 /**
  * Sets the container background of the enclosing container.
  *
- * > **Note:** `navigation` and `navigationSplitView` require iOS 18. On iOS 17 they fall back to
- * > the `widget` placement.
+ * > **Note:** `navigation` and `navigationSplitView` require iOS 18. The `widget` placement works
+ * > only in `expo-widgets` widgets, where the other placements fall back to it on iOS 17.
  *
  * @param style - Any [`ShapeStyle`](#shapestyle): a color, a hierarchical style, a material, or a gradient.
  * @param container - The type of container to apply the background to.

package/src/swift-ui/modifiers/index.ts

@@ -826,6 +826,16 @@ export const scrollDismissesKeyboard = (
 export const scrollDisabled = (disabled: boolean = true) =>
   createModifier('scrollDisabled', { disabled });
 
+/**
+ * Sets the preferred color scheme for the nearest enclosing presentation, such as a `BottomSheet`,
+ * including its background. The value overrides the device's light or dark appearance for that
+ * presentation.
+ * @param colorScheme - The preferred color scheme, or `null` to indicate no preference.
+ * @see Official [SwiftUI documentation](https://developer.apple.com/documentation/swiftui/view/preferredcolorscheme(_:)).
+ */
+export const preferredColorScheme = (colorScheme: 'light' | 'dark' | null) =>
+  createModifier('preferredColorScheme', { colorScheme });
+
 /**
  * Disables or enables clipping of a scrollable view's content to its bounds.
  * Content drawn outside those bounds, such as a shadow or a view scaled up past the edge, is
@@ -1839,6 +1849,7 @@ export type BuiltInModifier =
   | ReturnType<typeof containerRelativeFrame>
   | ReturnType<typeof scrollContentBackground>
   | ReturnType<typeof scrollDisabled>
+  | ReturnType<typeof preferredColorScheme>
   | ReturnType<typeof scrollClipDisabled>
   | ReturnType<typeof scrollIndicators>
   | ReturnType<typeof scrollEdgeEffectStyle>

package/src/universal/ListItem/ListItem.tsx

@@ -33,7 +33,10 @@ export function ListItem(props: ListItemProps) {
   const supporting = slots.supporting ?? supportingText;
 
   return (
-    <Pressable onPress={onPress} style={styles.row} testID={testID}>
+    <Pressable
+      onPress={onPress}
+      style={[styles.row, onPress != null ? styles.rowIsPressable : styles.rowIsStatic]}
+      testID={testID}>
       {leading != null ? <View style={styles.slot}>{leading}</View> : null}
       <View style={styles.main}>
         <Text style={isDark && styles.darkText}>{slots.headline}</Text>
@@ -52,8 +55,14 @@ const styles = StyleSheet.create({
     width: '100%',
     paddingVertical: 12,
     paddingHorizontal: 16,
+  },
+  // Pressable defaults to cursor: pointer; override it when not pressable.
+  rowIsPressable: {
     cursor: 'pointer',
   },
+  rowIsStatic: {
+    cursor: 'auto',
+  },
   main: {
     flexDirection: 'column',
     gap: 2,

package/src/universal/RNHostView/index.tsx

@@ -1,11 +1,14 @@
 import { StyleSheet, View } from 'react-native';
 
+import { resolveMatchContents } from '../../utils/matchContents';
 import { useUniversalLifecycle } from '../hooks';
 import type { RNHostViewProps } from './types';
 
 const styles = StyleSheet.create({
-  fillParent: { width: '100%', height: '100%' },
-  matchContents: { width: 'fit-content', height: 'fit-content' },
+  fillWidth: { width: '100%' },
+  fillHeight: { height: '100%' },
+  fitWidth: { width: 'fit-content' },
+  fitHeight: { height: 'fit-content' },
   hidden: { display: 'none' },
 });
 
@@ -23,13 +26,15 @@ export function RNHostView({
   onLayout,
 }: RNHostViewProps) {
   useUniversalLifecycle(onAppear, onDisappear);
+  const { horizontal, vertical } = resolveMatchContents(matchContents);
 
   return (
     <View
       testID={testID}
       onLayout={onLayout}
       style={[
-        matchContents ? styles.matchContents : styles.fillParent,
+        horizontal ? styles.fitWidth : styles.fillWidth,
+        vertical ? styles.fitHeight : styles.fillHeight,
         style,
         hidden && styles.hidden,
       ]}>

package/src/universal/RNHostView/types.ts

@@ -8,16 +8,18 @@ import type { UniversalBaseProps } from '../types';
  */
 export interface RNHostViewProps extends UniversalBaseProps {
   /**
-   * When `true`, the host updates its size in the native view tree to match
-   * the children's size. When `false`, the host uses the size of the parent
-   * native view.
+   * When `true`, the host updates its size in the SwiftUI or Compose view tree to
+   * match the children's size. When `false`, the host uses the size of the parent
+   * SwiftUI or Compose view. Pass an object to choose per axis. For example,
+   * `{ vertical: true }` takes the width from the parent and the height from the
+   * children, so text wraps and grows vertically.
    *
    * Can only be set once on mount; changing it remounts the component.
    * @default false
    * @platform android
    * @platform ios
    */
-  matchContents?: boolean;
+  matchContents?: boolean | { vertical?: boolean; horizontal?: boolean };
 
   onLayout?: (event: LayoutChangeEvent) => void;
 

package/src/universal/Switch/index.android.tsx

@@ -1,5 +1,11 @@
 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';
 
 import type { SwitchProps } from './types';
 
@@ -16,7 +22,10 @@ export function Switch({ value, onValueChange, label, disabled, testID, modifier
   if (label == null) return toggle;
 
   return (
-    <Row verticalAlignment="center" horizontalArrangement={{ spacedBy: 8 }}>
+    <Row
+      verticalAlignment="center"
+      horizontalArrangement={{ spacedBy: 8 }}
+      modifiers={[fillMaxWidth(), width(IntrinsicSize.Max)]}>
       <Text modifiers={[weight(1)]}>{label}</Text>
       {toggle}
     </Row>

package/src/utils/matchContents.ts

@@ -0,0 +1,14 @@
+/**
+ * Resolves `RNHostView`'s `matchContents` prop to one flag per axis.
+ */
+export function resolveMatchContents(
+  matchContents: boolean | { vertical?: boolean; horizontal?: boolean } | null | undefined
+): { horizontal: boolean; vertical: boolean } {
+  if (matchContents != null && typeof matchContents === 'object') {
+    return {
+      horizontal: matchContents.horizontal ?? false,
+      vertical: matchContents.vertical ?? false,
+    };
+  }
+  return { horizontal: matchContents ?? false, vertical: matchContents ?? false };
+}

package/ios/AccessoryWidgetBackgroundView.swift

@@ -1,27 +0,0 @@
-import SwiftUI
-import ExpoModulesCore
-#if !os(tvOS)
-import WidgetKit
-#endif
-
-public final class AccessoryWidgetBackgroundProps: UIBaseViewProps {}
-
-public struct AccessoryWidgetBackgroundView: ExpoSwiftUI.View {
-  @ObservedObject public var props: AccessoryWidgetBackgroundProps
-
-  public init(props: AccessoryWidgetBackgroundProps) {
-    self.props = props
-  }
-
-  public var body: some View {
-#if !os(tvOS)
-    if #available(iOS 16.0, *) {
-      AccessoryWidgetBackground()
-    } else {
-      Color.clear
-    }
-#else
-    EmptyView()
-#endif
-  }
-}

package/ios/Modifiers/WidgetModifiers.swift

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

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

@@ -1 +0,0 @@
-9fb8758d9f0ad26c9154ad6536600e2c

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

@@ -1 +0,0 @@
-c96c6c3f5dc0911a893274646c0cf2096a610423

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

@@ -1 +0,0 @@
-02ee570f6a4a03679186bf43c56875eebf84f15abb7e79bb7040eddad7da908d

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

@@ -1 +0,0 @@
-fe7df10c6d11c1f95ca7de35f60911401b64bd4b258c6c7956611f973bd062a367c0aea2693298e3d703e58a89b70cfd2c47851400299d035ea28499e595fb8e

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

@@ -1 +0,0 @@
-31be76a409dceed307ca47e9e66c8348

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

@@ -1 +0,0 @@
-94aec72d27a48e827dbb31b9d734150334b08662

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

@@ -1 +0,0 @@
-315787d05711205c64b7245b046f29efe369b50f4e86866afef62b2b2474e537

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

@@ -1 +0,0 @@
-e5ced1751f3e2e90a7320abf88d98bea0a578fbcabcf73c0aca0e9997efe4d0313375d810c789fe2d96f6f6d5cdb9f36c21c2b82f67db8626149105938f29523

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

@@ -1 +0,0 @@
-d90e8090b804462073dc5b54b9753b7d

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

@@ -1 +0,0 @@
-04e6aa44f454389ad4bdd5cf30bd1d86bae120ad

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

@@ -1 +0,0 @@
-dc6fa612aeec16b9c3aeda4837e935cdeeb84368a021a3f44def2a1f95101945

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

@@ -1 +0,0 @@
-576894a57cc60ce514c66e1cabe503a43173905290c5982e5268be4c8cf344b915e5320d628c809ce8b1fa8d199bca5293717a98be66f0ade834a7a3f2dbb57c

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

@@ -1 +0,0 @@
-bc00f54a242aca990d0c2de2c183ebc5

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

@@ -1 +0,0 @@
-1796327cd18b03ab779e31706ba31eae75368745

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

@@ -1 +0,0 @@
-f2ca3168b9cef1803d4210547ea66a36803383de87fcbb41f0dccb5b7505d34d

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

@@ -1 +0,0 @@
-ce4c6350bbf8c0e67d3e2d2bc08434e67d236e63cb336a35b82962d1842dec854ddfe8e78c45e4b09d43e48e2dee4b8a8f18cce0520e95df65ddcb16721742cd

package/local-maven-repo/expo/modules/ui/expo.modules.ui/maven-metadata.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata>
-  <groupId>expo.modules.ui</groupId>
-  <artifactId>expo.modules.ui</artifactId>
-  <versioning>
-    <latest>58.0.8</latest>
-    <release>58.0.8</release>
-    <versions>
-      <version>58.0.8</version>
-    </versions>
-    <lastUpdated>20260928121125</lastUpdated>
-  </versioning>
-</metadata>

package/local-maven-repo/expo/modules/ui/expo.modules.ui/maven-metadata.xml.md5

@@ -1 +0,0 @@
-e688c2de104d33044dd1efbb0fb077a5

package/local-maven-repo/expo/modules/ui/expo.modules.ui/maven-metadata.xml.sha1

@@ -1 +0,0 @@
-c07aaec5e802705f3098f5318af20765f1b90eaf

package/local-maven-repo/expo/modules/ui/expo.modules.ui/maven-metadata.xml.sha256

@@ -1 +0,0 @@
-7d1dc7ca750e3904d57d825eed29663ed37a41fa992e790bd198f2fe23579db2

package/local-maven-repo/expo/modules/ui/expo.modules.ui/maven-metadata.xml.sha512

@@ -1 +0,0 @@
-d47c70eb9cd8b56d5ff5494bd9fca491c4a71662d618fa6a0dc0b82394a129c8bf18ab740bf4eea86f8fe115c41fc2251d0fb53f8b0f51ff9cd094e2f50472fa