@expo/ui 58.0.9 → 58.0.10

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/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.9/expo.modules.ui-58.0.9-sources.jar.md5

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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