@expo/ui 0.1.1-alpha.8 → 0.1.1-alpha.9

package/CHANGELOG.md

@@ -10,6 +10,12 @@
 
 ### 💡 Others
 
+## 0.1.1-alpha.9 — 2025-06-08
+
+### 🎉 New features
+
+- Allowed custom children in SwiftUI Button. ([#37136](https://github.com/expo/expo/pull/37136) by [@kudo](https://github.com/kudo))
+
 ## 0.1.1-alpha.8 — 2025-06-04
 
 ### 🎉 New features

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 = '0.1.1-alpha.8'
+version = '0.1.1-alpha.9'
 
 android {
   namespace "expo.modules.ui"
   defaultConfig {
     versionCode 1
-    versionName "0.1.1-alpha.8"
+    versionName "0.1.1-alpha.9"
   }
   buildFeatures {
     compose true

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

@@ -30,6 +30,7 @@ export type ButtonProps = {
     onPress?: () => void;
     /**
      * A string describing the system image to display in the button.
+     * This is only used if `children` is a string.
      * Uses Material Icons on Android and SF Symbols on iOS.
      */
     systemImage?: string;
@@ -43,9 +44,9 @@ export type ButtonProps = {
      */
     variant?: ButtonVariant;
     /**
-     * The text to display inside the button.
+     * The text or React node to display inside the button.
      */
-    children: string;
+    children: string | React.ReactNode;
     /**
      * Button color.
      */
@@ -60,13 +61,13 @@ export type ButtonProps = {
  */
 export type NativeButtonProps = Omit<ButtonProps, 'role' | 'onPress' | 'children' | 'systemImage'> & {
     buttonRole?: ButtonRole;
-    text: string;
+    text: string | undefined;
     systemImage?: string;
 } & ViewEvent<'onButtonPressed', void>;
 /**
  * @hidden
  */
-export declare function transformButtonProps(props: ButtonProps): NativeButtonProps;
+export declare function transformButtonProps(props: Omit<ButtonProps, 'children'>, text: string | undefined): NativeButtonProps;
 /**
  * `<Button>` component without a host view.
  * You should use this with a `Host` component in ancestor.

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/swift-ui/Button/index.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEpD,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAGxC;;;;;GAKG;AACH,MAAM,MAAM,UAAU,GAAG,SAAS,GAAG,QAAQ,GAAG,aAAa,CAAC;AAE9D;;;;;;;;;;;;;;GAcG;AACH,MAAM,MAAM,aAAa,GAErB,SAAS,GACT,UAAU,GACV,OAAO,GAEP,mBAAmB,GACnB,YAAY,GAEZ,cAAc,GACd,oBAAoB,GACpB,MAAM,GACN,MAAM,CAAC;AAEX,MAAM,MAAM,WAAW,GAAG;IACxB;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;IACrB;;;OAGG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;;OAGG;IACH,IAAI,CAAC,EAAE,UAAU,CAAC;IAClB;;OAEG;IACH,OAAO,CAAC,EAAE,aAAa,CAAC;IACxB;;OAEG;IACH,QAAQ,EAAE,MAAM,CAAC;IACjB;;OAEG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;OAEG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,iBAAiB,GAAG,IAAI,CAClC,WAAW,EACX,MAAM,GAAG,SAAS,GAAG,UAAU,GAAG,aAAa,CAChD,GAAG;IACF,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,GAAG,SAAS,CAAC,iBAAiB,EAAE,IAAI,CAAC,CAAC;AAQvC;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,WAAW,GAAG,iBAAiB,CAS1E;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,WAAW,+BAEjD;AAED;;GAEG;AACH,wBAAgB,MAAM,CAAC,KAAK,EAAE,WAAW,GAAG;IAAE,KAAK,CAAC,EAAE,SAAS,CAAC,SAAS,CAAC,CAAA;CAAE,+BAO3E"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/swift-ui/Button/index.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEpD,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAGxC;;;;;GAKG;AACH,MAAM,MAAM,UAAU,GAAG,SAAS,GAAG,QAAQ,GAAG,aAAa,CAAC;AAE9D;;;;;;;;;;;;;;GAcG;AACH,MAAM,MAAM,aAAa,GAErB,SAAS,GACT,UAAU,GACV,OAAO,GAEP,mBAAmB,GACnB,YAAY,GAEZ,cAAc,GACd,oBAAoB,GACpB,MAAM,GACN,MAAM,CAAC;AAEX,MAAM,MAAM,WAAW,GAAG;IACxB;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;IACrB;;;;OAIG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;;OAGG;IACH,IAAI,CAAC,EAAE,UAAU,CAAC;IAClB;;OAEG;IACH,OAAO,CAAC,EAAE,aAAa,CAAC;IACxB;;OAEG;IACH,QAAQ,EAAE,MAAM,GAAG,KAAK,CAAC,SAAS,CAAC;IACnC;;OAEG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;OAEG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,iBAAiB,GAAG,IAAI,CAClC,WAAW,EACX,MAAM,GAAG,SAAS,GAAG,UAAU,GAAG,aAAa,CAChD,GAAG;IACF,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;IACzB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,GAAG,SAAS,CAAC,iBAAiB,EAAE,IAAI,CAAC,CAAC;AAQvC;;GAEG;AACH,wBAAgB,oBAAoB,CAClC,KAAK,EAAE,IAAI,CAAC,WAAW,EAAE,UAAU,CAAC,EACpC,IAAI,EAAE,MAAM,GAAG,SAAS,GACvB,iBAAiB,CASnB;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,WAAW,+BAOjD;AAED;;GAEG;AACH,wBAAgB,MAAM,CAAC,KAAK,EAAE,WAAW,GAAG;IAAE,KAAK,CAAC,EAAE,SAAS,CAAC,SAAS,CAAC,CAAA;CAAE,+BAO3E"}

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

@@ -5,13 +5,13 @@ const ButtonNativeView = requireNativeView('ExpoUI', 'Button');
 /**
  * @hidden
  */
-export function transformButtonProps(props) {
-    const { role, children, onPress, systemImage, ...restProps } = props;
+export function transformButtonProps(props, text) {
+    const { role, onPress, systemImage, ...restProps } = props;
     return {
         ...restProps,
-        text: children ?? '',
-        buttonRole: role,
+        text,
         systemImage,
+        buttonRole: role,
         onButtonPressed: onPress,
     };
 }
@@ -20,7 +20,12 @@ export function transformButtonProps(props) {
  * You should use this with a `Host` component in ancestor.
  */
 export function ButtonPrimitive(props) {
-    return <ButtonNativeView {...transformButtonProps(props)}/>;
+    const { children, ...restProps } = props;
+    const text = typeof children === 'string' ? children : undefined;
+    if (text !== undefined) {
+        return <ButtonNativeView {...transformButtonProps(restProps, text)}/>;
+    }
+    return <ButtonNativeView {...transformButtonProps(restProps, text)}>{children}</ButtonNativeView>;
 }
 /**
  * Displays a native button component.

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/swift-ui/Button/index.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,MAAM,CAAC;AAIzC,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAoF/B,wFAAwF;AACxF,MAAM,gBAAgB,GAA2C,iBAAiB,CAChF,QAAQ,EACR,QAAQ,CACT,CAAC;AAEF;;GAEG;AACH,MAAM,UAAU,oBAAoB,CAAC,KAAkB;IACrD,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,WAAW,EAAE,GAAG,SAAS,EAAE,GAAG,KAAK,CAAC;IACrE,OAAO;QACL,GAAG,SAAS;QACZ,IAAI,EAAE,QAAQ,IAAI,EAAE;QACpB,UAAU,EAAE,IAAI;QAChB,WAAW;QACX,eAAe,EAAE,OAAO;KACzB,CAAC;AACJ,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,eAAe,CAAC,KAAkB;IAChD,OAAO,CAAC,gBAAgB,CAAC,IAAI,oBAAoB,CAAC,KAAK,CAAC,CAAC,EAAG,CAAC;AAC/D,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,MAAM,CAAC,KAAqD;IAC1E,MAAM,0BAA0B,GAAG,KAAK,CAAC,KAAK,IAAI,IAAI,CAAC;IACvD,OAAO,CACL,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,aAAa,CAAC,0BAA0B,CAAC,CAAC,0BAA0B,CAAC,CAC7F;MAAA,CAAC,eAAe,CAAC,IAAI,KAAK,CAAC,EAC7B;IAAA,EAAE,IAAI,CAAC,CACR,CAAC;AACJ,CAAC","sourcesContent":["import { requireNativeView } from 'expo';\nimport { StyleProp, ViewStyle } from 'react-native';\n\nimport { ViewEvent } from '../../types';\nimport { Host } from '../Host';\n\n/**\n * The role of the button.\n * - `default` - The default button role.\n * - `cancel` - A button that cancels the current operation.\n * - `destructive` - A button that deletes data or performs a destructive action.\n */\nexport type ButtonRole = 'default' | 'cancel' | 'destructive';\n\n/**\n * The built-in button styles available on iOS.\n *\n * Common styles:\n * - `default` - The default system button style.\n * - `bordered` - A button with a light fill. On Android, equivalent to `FilledTonalButton`.\n * - `borderless` - A button with no background or border. On Android, equivalent to `TextButton`.\n * - `borderedProminent` - A bordered button with a prominent appearance.\n * - `plain` - A button with no border or background and a less prominent text.\n * macOS-only styles:\n * - `accessoryBar` - A button style for accessory bars.\n * - `accessoryBarAction` - A button style for accessory bar actions.\n * - `card` - A button style for cards.\n * - `link` - A button style for links.\n */\nexport type ButtonVariant =\n  // Common\n  | 'default'\n  | 'bordered'\n  | 'plain'\n  // Apple-only\n  | 'borderedProminent'\n  | 'borderless'\n  // MacOS-only;\n  | 'accessoryBar'\n  | 'accessoryBarAction'\n  | 'card'\n  | 'link';\n\nexport type ButtonProps = {\n  /**\n   * A callback that is called when the button is pressed.\n   */\n  onPress?: () => void;\n  /**\n   * A string describing the system image to display in the button.\n   * Uses Material Icons on Android and SF Symbols on iOS.\n   */\n  systemImage?: string;\n  /**\n   * Indicated the role of the button.\n   * @platform ios\n   */\n  role?: ButtonRole;\n  /**\n   * The button variant.\n   */\n  variant?: ButtonVariant;\n  /**\n   * The text to display inside the button.\n   */\n  children: string;\n  /**\n   * Button color.\n   */\n  color?: string;\n  /**\n   * Disabled state of the button.\n   */\n  disabled?: boolean;\n};\n\n/**\n * @hidden\n */\nexport type NativeButtonProps = Omit<\n  ButtonProps,\n  'role' | 'onPress' | 'children' | 'systemImage'\n> & {\n  buttonRole?: ButtonRole;\n  text: string;\n  systemImage?: string;\n} & ViewEvent<'onButtonPressed', void>;\n\n// We have to work around the `role` and `onPress` props being reserved by React Native.\nconst ButtonNativeView: React.ComponentType<NativeButtonProps> = requireNativeView(\n  'ExpoUI',\n  'Button'\n);\n\n/**\n * @hidden\n */\nexport function transformButtonProps(props: ButtonProps): NativeButtonProps {\n  const { role, children, onPress, systemImage, ...restProps } = props;\n  return {\n    ...restProps,\n    text: children ?? '',\n    buttonRole: role,\n    systemImage,\n    onButtonPressed: onPress,\n  };\n}\n\n/**\n * `<Button>` component without a host view.\n * You should use this with a `Host` component in ancestor.\n */\nexport function ButtonPrimitive(props: ButtonProps) {\n  return <ButtonNativeView {...transformButtonProps(props)} />;\n}\n\n/**\n * Displays a native button component.\n */\nexport function Button(props: ButtonProps & { style?: StyleProp<ViewStyle> }) {\n  const useViewportSizeMeasurement = props.style == null;\n  return (\n    <Host style={props.style} matchContents useViewportSizeMeasurement={useViewportSizeMeasurement}>\n      <ButtonPrimitive {...props} />\n    </Host>\n  );\n}\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/swift-ui/Button/index.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,MAAM,CAAC;AAIzC,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAqF/B,wFAAwF;AACxF,MAAM,gBAAgB,GAA2C,iBAAiB,CAChF,QAAQ,EACR,QAAQ,CACT,CAAC;AAEF;;GAEG;AACH,MAAM,UAAU,oBAAoB,CAClC,KAAoC,EACpC,IAAwB;IAExB,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,WAAW,EAAE,GAAG,SAAS,EAAE,GAAG,KAAK,CAAC;IAC3D,OAAO;QACL,GAAG,SAAS;QACZ,IAAI;QACJ,WAAW;QACX,UAAU,EAAE,IAAI;QAChB,eAAe,EAAE,OAAO;KACzB,CAAC;AACJ,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,eAAe,CAAC,KAAkB;IAChD,MAAM,EAAE,QAAQ,EAAE,GAAG,SAAS,EAAE,GAAG,KAAK,CAAC;IACzC,MAAM,IAAI,GAAG,OAAO,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC;IACjE,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;QACvB,OAAO,CAAC,gBAAgB,CAAC,IAAI,oBAAoB,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC,EAAG,CAAC;IACzE,CAAC;IACD,OAAO,CAAC,gBAAgB,CAAC,IAAI,oBAAoB,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,gBAAgB,CAAC,CAAC;AACpG,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,MAAM,CAAC,KAAqD;IAC1E,MAAM,0BAA0B,GAAG,KAAK,CAAC,KAAK,IAAI,IAAI,CAAC;IACvD,OAAO,CACL,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,aAAa,CAAC,0BAA0B,CAAC,CAAC,0BAA0B,CAAC,CAC7F;MAAA,CAAC,eAAe,CAAC,IAAI,KAAK,CAAC,EAC7B;IAAA,EAAE,IAAI,CAAC,CACR,CAAC;AACJ,CAAC","sourcesContent":["import { requireNativeView } from 'expo';\nimport { StyleProp, ViewStyle } from 'react-native';\n\nimport { ViewEvent } from '../../types';\nimport { Host } from '../Host';\n\n/**\n * The role of the button.\n * - `default` - The default button role.\n * - `cancel` - A button that cancels the current operation.\n * - `destructive` - A button that deletes data or performs a destructive action.\n */\nexport type ButtonRole = 'default' | 'cancel' | 'destructive';\n\n/**\n * The built-in button styles available on iOS.\n *\n * Common styles:\n * - `default` - The default system button style.\n * - `bordered` - A button with a light fill. On Android, equivalent to `FilledTonalButton`.\n * - `borderless` - A button with no background or border. On Android, equivalent to `TextButton`.\n * - `borderedProminent` - A bordered button with a prominent appearance.\n * - `plain` - A button with no border or background and a less prominent text.\n * macOS-only styles:\n * - `accessoryBar` - A button style for accessory bars.\n * - `accessoryBarAction` - A button style for accessory bar actions.\n * - `card` - A button style for cards.\n * - `link` - A button style for links.\n */\nexport type ButtonVariant =\n  // Common\n  | 'default'\n  | 'bordered'\n  | 'plain'\n  // Apple-only\n  | 'borderedProminent'\n  | 'borderless'\n  // MacOS-only;\n  | 'accessoryBar'\n  | 'accessoryBarAction'\n  | 'card'\n  | 'link';\n\nexport type ButtonProps = {\n  /**\n   * A callback that is called when the button is pressed.\n   */\n  onPress?: () => void;\n  /**\n   * A string describing the system image to display in the button.\n   * This is only used if `children` is a string.\n   * Uses Material Icons on Android and SF Symbols on iOS.\n   */\n  systemImage?: string;\n  /**\n   * Indicated the role of the button.\n   * @platform ios\n   */\n  role?: ButtonRole;\n  /**\n   * The button variant.\n   */\n  variant?: ButtonVariant;\n  /**\n   * The text or React node to display inside the button.\n   */\n  children: string | React.ReactNode;\n  /**\n   * Button color.\n   */\n  color?: string;\n  /**\n   * Disabled state of the button.\n   */\n  disabled?: boolean;\n};\n\n/**\n * @hidden\n */\nexport type NativeButtonProps = Omit<\n  ButtonProps,\n  'role' | 'onPress' | 'children' | 'systemImage'\n> & {\n  buttonRole?: ButtonRole;\n  text: string | undefined;\n  systemImage?: string;\n} & ViewEvent<'onButtonPressed', void>;\n\n// We have to work around the `role` and `onPress` props being reserved by React Native.\nconst ButtonNativeView: React.ComponentType<NativeButtonProps> = requireNativeView(\n  'ExpoUI',\n  'Button'\n);\n\n/**\n * @hidden\n */\nexport function transformButtonProps(\n  props: Omit<ButtonProps, 'children'>,\n  text: string | undefined\n): NativeButtonProps {\n  const { role, onPress, systemImage, ...restProps } = props;\n  return {\n    ...restProps,\n    text,\n    systemImage,\n    buttonRole: role,\n    onButtonPressed: onPress,\n  };\n}\n\n/**\n * `<Button>` component without a host view.\n * You should use this with a `Host` component in ancestor.\n */\nexport function ButtonPrimitive(props: ButtonProps) {\n  const { children, ...restProps } = props;\n  const text = typeof children === 'string' ? children : undefined;\n  if (text !== undefined) {\n    return <ButtonNativeView {...transformButtonProps(restProps, text)} />;\n  }\n  return <ButtonNativeView {...transformButtonProps(restProps, text)}>{children}</ButtonNativeView>;\n}\n\n/**\n * Displays a native button component.\n */\nexport function Button(props: ButtonProps & { style?: StyleProp<ViewStyle> }) {\n  const useViewportSizeMeasurement = props.style == null;\n  return (\n    <Host style={props.style} matchContents useViewportSizeMeasurement={useViewportSizeMeasurement}>\n      <ButtonPrimitive {...props} />\n    </Host>\n  );\n}\n"]}

package/build/swift-ui/ContextMenu/utils.js

@@ -37,9 +37,12 @@ function createButtonElement(uuid, props, handlers) {
     if (props.onPress) {
         handlers[uuid] = { onPress: props.onPress };
     }
+    if (typeof props.children !== 'string') {
+        throw new Error('ContextMenu Button only supports string children');
+    }
     return {
         contextMenuElementID: uuid,
-        button: transformButtonProps(props),
+        button: transformButtonProps(props, props.children),
     };
 }
 function createSwitchElement(uuid, props, handlers) {
@@ -65,10 +68,13 @@ function createPickerElement(uuid, props, handlers) {
     };
 }
 function createSubmenuElement(uuid, props, handlers) {
+    if (typeof props.button.props.children !== 'string') {
+        throw new Error('ContextMenu Submenu Button only supports string children');
+    }
     return {
         contextMenuElementID: uuid,
         submenu: {
-            button: transformButtonProps(props.button.props),
+            button: transformButtonProps(props.button.props, props.button.props.children),
             elements: transformChildrenToElementArray(props.children, handlers),
         },
     };

package/build/swift-ui/ContextMenu/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/swift-ui/ContextMenu/utils.ts"],"names":[],"mappings":"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","sourcesContent":["import { Children, isValidElement, ReactElement, ReactNode } from 'react';\nimport { NativeSyntheticEvent } from 'react-native';\n\nimport { ContextMenuElementBase, EventHandlers, Submenu, SubmenuProps } from './index';\nimport {\n  Button,\n  ButtonPrimitive,\n  ButtonProps,\n  NativeButtonProps,\n  transformButtonProps,\n} from '../Button';\nimport { Picker, PickerPrimitive, PickerProps } from '../Picker';\nimport { Switch, SwitchPrimitive, SwitchProps } from '../Switch';\n\n// We use this slightly odd typing for the elements to make unpacking the elements easier on the native side\ntype ButtonMenuElement = {\n  button: NativeButtonProps;\n} & ContextMenuElementBase;\n\ntype SwitchMenuElement = {\n  switch: SwitchProps;\n} & ContextMenuElementBase;\n\ntype PickerMenuElement = {\n  picker: PickerProps;\n} & ContextMenuElementBase;\n\ntype SubmenuElement = {\n  submenu: {\n    elements: MenuElement[];\n    button: NativeButtonProps;\n  };\n} & ContextMenuElementBase;\n\nexport type MenuElement =\n  | ButtonMenuElement\n  | SwitchMenuElement\n  | PickerMenuElement\n  | SubmenuElement;\n\n// Maps the react children to NativeMenuElement[] which is used to render out the native menu\n// TODO: Ideally we want to pass the children directly to the native side without having to do this\nexport function transformChildrenToElementArray(\n  children: ReactNode,\n  eventHandlersMap: EventHandlers\n): MenuElement[] {\n  return Children.toArray(children)\n    .map((child) => processChildElement(child, eventHandlersMap))\n    .filter((el): el is MenuElement => el !== null);\n}\n\nfunction processChildElement(\n  child: ReactNode,\n  eventHandlersMap: EventHandlers\n): MenuElement | null {\n  if (!isValidElement(child)) return null;\n\n  const uuid = expo.uuidv4();\n\n  if (child.type === Button || child.type === ButtonPrimitive) {\n    // @ts-expect-error TODO TS2345: Argument of type unknown is not assignable to parameter of type SubmenuProps\n    return createButtonElement(uuid, child.props, eventHandlersMap);\n  }\n\n  if (child.type === Switch || child.type === SwitchPrimitive) {\n    // @ts-expect-error TODO TS2345: Argument of type unknown is not assignable to parameter of type SubmenuProps\n    return createSwitchElement(uuid, child.props, eventHandlersMap);\n  }\n\n  if (child.type === Picker || child.type === PickerPrimitive) {\n    // @ts-expect-error TODO TS2345: Argument of type unknown is not assignable to parameter of type SubmenuProps\n    return createPickerElement(uuid, child.props, eventHandlersMap);\n  }\n\n  if (isSubmenuComponent(child)) {\n    // @ts-expect-error TODO TS2345: Argument of type unknown is not assignable to parameter of type SubmenuProps\n    return createSubmenuElement(uuid, child.props, eventHandlersMap);\n  }\n\n  console.warn('Unsupported child type in Menu: ', child.type);\n  return null;\n}\n\nfunction createButtonElement(\n  uuid: string,\n  props: ButtonProps,\n  handlers: EventHandlers\n): MenuElement {\n  if (props.onPress) {\n    handlers[uuid] = { onPress: props.onPress };\n  }\n\n  return {\n    contextMenuElementID: uuid,\n    button: transformButtonProps(props),\n  };\n}\n\nfunction createSwitchElement(\n  uuid: string,\n  props: SwitchProps,\n  handlers: EventHandlers\n): MenuElement {\n  if (props.onValueChange) {\n    handlers[uuid] = {\n      onValueChange: ({ nativeEvent: { value } }: NativeSyntheticEvent<{ value: boolean }>) => {\n        props.onValueChange?.(value);\n      },\n    };\n  }\n\n  return {\n    contextMenuElementID: uuid,\n    switch: props,\n  };\n}\n\nfunction createPickerElement(\n  uuid: string,\n  props: PickerProps,\n  handlers: EventHandlers\n): MenuElement {\n  if (props.onOptionSelected) {\n    handlers[uuid] = { onOptionSelected: props.onOptionSelected };\n  }\n\n  return {\n    contextMenuElementID: uuid,\n    picker: props,\n  };\n}\n\nfunction createSubmenuElement(\n  uuid: string,\n  props: SubmenuProps,\n  handlers: EventHandlers\n): MenuElement {\n  return {\n    contextMenuElementID: uuid,\n    submenu: {\n      button: transformButtonProps(props.button.props),\n      elements: transformChildrenToElementArray(props.children, handlers),\n    },\n  };\n}\n\nfunction isSubmenuComponent(child: ReactElement): boolean {\n  return child.type.toString() === Submenu.toString();\n}\n"]}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/swift-ui/ContextMenu/utils.ts"],"names":[],"mappings":"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","sourcesContent":["import { Children, isValidElement, ReactElement, ReactNode } from 'react';\nimport { NativeSyntheticEvent } from 'react-native';\n\nimport { ContextMenuElementBase, EventHandlers, Submenu, SubmenuProps } from './index';\nimport {\n  Button,\n  ButtonPrimitive,\n  ButtonProps,\n  NativeButtonProps,\n  transformButtonProps,\n} from '../Button';\nimport { Picker, PickerPrimitive, PickerProps } from '../Picker';\nimport { Switch, SwitchPrimitive, SwitchProps } from '../Switch';\n\n// We use this slightly odd typing for the elements to make unpacking the elements easier on the native side\ntype ButtonMenuElement = {\n  button: NativeButtonProps;\n} & ContextMenuElementBase;\n\ntype SwitchMenuElement = {\n  switch: SwitchProps;\n} & ContextMenuElementBase;\n\ntype PickerMenuElement = {\n  picker: PickerProps;\n} & ContextMenuElementBase;\n\ntype SubmenuElement = {\n  submenu: {\n    elements: MenuElement[];\n    button: NativeButtonProps;\n  };\n} & ContextMenuElementBase;\n\nexport type MenuElement =\n  | ButtonMenuElement\n  | SwitchMenuElement\n  | PickerMenuElement\n  | SubmenuElement;\n\n// Maps the react children to NativeMenuElement[] which is used to render out the native menu\n// TODO: Ideally we want to pass the children directly to the native side without having to do this\nexport function transformChildrenToElementArray(\n  children: ReactNode,\n  eventHandlersMap: EventHandlers\n): MenuElement[] {\n  return Children.toArray(children)\n    .map((child) => processChildElement(child, eventHandlersMap))\n    .filter((el): el is MenuElement => el !== null);\n}\n\nfunction processChildElement(\n  child: ReactNode,\n  eventHandlersMap: EventHandlers\n): MenuElement | null {\n  if (!isValidElement(child)) return null;\n\n  const uuid = expo.uuidv4();\n\n  if (child.type === Button || child.type === ButtonPrimitive) {\n    // @ts-expect-error TODO TS2345: Argument of type unknown is not assignable to parameter of type SubmenuProps\n    return createButtonElement(uuid, child.props, eventHandlersMap);\n  }\n\n  if (child.type === Switch || child.type === SwitchPrimitive) {\n    // @ts-expect-error TODO TS2345: Argument of type unknown is not assignable to parameter of type SubmenuProps\n    return createSwitchElement(uuid, child.props, eventHandlersMap);\n  }\n\n  if (child.type === Picker || child.type === PickerPrimitive) {\n    // @ts-expect-error TODO TS2345: Argument of type unknown is not assignable to parameter of type SubmenuProps\n    return createPickerElement(uuid, child.props, eventHandlersMap);\n  }\n\n  if (isSubmenuComponent(child)) {\n    // @ts-expect-error TODO TS2345: Argument of type unknown is not assignable to parameter of type SubmenuProps\n    return createSubmenuElement(uuid, child.props, eventHandlersMap);\n  }\n\n  console.warn('Unsupported child type in Menu: ', child.type);\n  return null;\n}\n\nfunction createButtonElement(\n  uuid: string,\n  props: ButtonProps,\n  handlers: EventHandlers\n): MenuElement {\n  if (props.onPress) {\n    handlers[uuid] = { onPress: props.onPress };\n  }\n  if (typeof props.children !== 'string') {\n    throw new Error('ContextMenu Button only supports string children');\n  }\n  return {\n    contextMenuElementID: uuid,\n    button: transformButtonProps(props, props.children),\n  };\n}\n\nfunction createSwitchElement(\n  uuid: string,\n  props: SwitchProps,\n  handlers: EventHandlers\n): MenuElement {\n  if (props.onValueChange) {\n    handlers[uuid] = {\n      onValueChange: ({ nativeEvent: { value } }: NativeSyntheticEvent<{ value: boolean }>) => {\n        props.onValueChange?.(value);\n      },\n    };\n  }\n\n  return {\n    contextMenuElementID: uuid,\n    switch: props,\n  };\n}\n\nfunction createPickerElement(\n  uuid: string,\n  props: PickerProps,\n  handlers: EventHandlers\n): MenuElement {\n  if (props.onOptionSelected) {\n    handlers[uuid] = { onOptionSelected: props.onOptionSelected };\n  }\n\n  return {\n    contextMenuElementID: uuid,\n    picker: props,\n  };\n}\n\nfunction createSubmenuElement(\n  uuid: string,\n  props: SubmenuProps,\n  handlers: EventHandlers\n): MenuElement {\n  if (typeof props.button.props.children !== 'string') {\n    throw new Error('ContextMenu Submenu Button only supports string children');\n  }\n  return {\n    contextMenuElementID: uuid,\n    submenu: {\n      button: transformButtonProps(props.button.props, props.button.props.children),\n      elements: transformChildrenToElementArray(props.children, handlers),\n    },\n  };\n}\n\nfunction isSubmenuComponent(child: ReactElement): boolean {\n  return child.type.toString() === Submenu.toString();\n}\n"]}

package/expo-module.config.json

@@ -9,7 +9,7 @@
     "publication": {
       "groupId": "expo.modules.ui",
       "artifactId": "expo.modules.ui",
-      "version": "0.1.1-alpha.8",
+      "version": "0.1.1-alpha.9",
       "repository": "local-maven-repo"
     }
   }

package/ios/Button/Button.swift

@@ -13,10 +13,14 @@ struct Button: ExpoSwiftUI.View {
         props.onButtonPressed()
       },
       label: {
-        if let systemImage = props.systemImage {
-          Label(props.text, systemImage: systemImage)
+        if let text = props.text {
+          if let systemImage = props.systemImage {
+            Label(text, systemImage: systemImage)
+          } else {
+            Text(text)
+          }
         } else {
-          Text(props.text)
+          Children()
         }
       })
     .disabled(props.disabled)

package/ios/Button/ButtonProps.swift

@@ -34,7 +34,7 @@ internal enum ButtonVariant: String, Enumerable {
 
 final class ButtonProps: ExpoSwiftUI.ViewProps, Observable {
   required init() {}
-  @Field var text: String = ""
+  @Field var text: String?
   @Field var systemImage: String?
   @Field var color: Color?
   @Field var buttonRole: ButtonRole? = .default

package/ios/DisclosureGroupView.swift

@@ -14,9 +14,13 @@ internal struct DisclosureGroupView: ExpoSwiftUI.View {
   @ObservedObject var props: DisclosureGroupViewProps
 
   var body: some View {
+    #if os(tvOS)
+    Text("DisclosureGroupView is not supported on tvOS")
+    #else
     DisclosureGroup(props.label) {
       Children()
     }
     .modifier(CommonViewModifiers(props: props))
+    #endif
   }
 }

package/ios/FormView.swift

@@ -19,7 +19,7 @@ internal struct FormView: ExpoSwiftUI.View {
     }
     .modifier(CommonViewModifiers(props: props))
 
-    if #available(iOS 16.0, *) {
+    if #available(iOS 16.0, tvOS 16.0, *) {
       form.scrollDisabled(!props.scrollEnabled)
     } else {
       form

package/ios/Modifiers/View+GestureModifiers.swift

@@ -7,13 +7,15 @@ internal extension View {
   @ViewBuilder
   func applyOnTapGesture(useTapGesture: Bool?, eventDispatcher: EventDispatcher, useContentShape: Bool = false) -> some View {
     if useTapGesture == true {
-      self
-        .if(useContentShape) {
-          $0.contentShape(Rectangle())
-        }
-        .onTapGesture {
-          eventDispatcher()
-        }
+      if #available(iOS 13.0, macOS 10.13, tvOS 16.0, *) {
+        self
+          .if(useContentShape) {
+            $0.contentShape(Rectangle())
+          }
+          .onTapGesture {
+            eventDispatcher()
+          }
+      }
     } else {
       self
     }

package/ios/SliderView.swift

@@ -49,7 +49,7 @@ struct SliderView: ExpoSwiftUI.View {
       value = sliderValue
     })
     #else
-    Text("Slider not supported on this platform")
+    Text("Slider is not supported on tvOS")
     #endif
   }
 }

package/local-maven-repo/expo/modules/ui/expo.modules.ui/{0.1.1-alpha.8/expo.modules.ui-0.1.1-alpha.8.module → 0.1.1-alpha.9/expo.modules.ui-0.1.1-alpha.9.module}

@@ -3,7 +3,7 @@
   "component": {
     "group": "expo.modules.ui",
     "module": "expo.modules.ui",
-    "version": "0.1.1-alpha.8",
+    "version": "0.1.1-alpha.9",
     "attributes": {
       "org.gradle.status": "release"
     }
@@ -24,8 +24,8 @@
       },
       "files": [
         {
-          "name": "expo.modules.ui-0.1.1-alpha.8.aar",
-          "url": "expo.modules.ui-0.1.1-alpha.8.aar",
+          "name": "expo.modules.ui-0.1.1-alpha.9.aar",
+          "url": "expo.modules.ui-0.1.1-alpha.9.aar",
           "size": 186114,
           "sha512": "ecc8ec9455298d16ec7a602b4cfb56e0f1c03040e300f45a87fe0fd0a41273e742b595b07e4ede01c724d16a3f11a3d2e65c6814b3d8d8d156d41f13989182ee",
           "sha256": "abe2d92b3e81e64b0d3b4d8e276c6ff4347b1846dcd2417f53d40a99fd4f0da0",
@@ -102,8 +102,8 @@
       ],
       "files": [
         {
-          "name": "expo.modules.ui-0.1.1-alpha.8.aar",
-          "url": "expo.modules.ui-0.1.1-alpha.8.aar",
+          "name": "expo.modules.ui-0.1.1-alpha.9.aar",
+          "url": "expo.modules.ui-0.1.1-alpha.9.aar",
           "size": 186114,
           "sha512": "ecc8ec9455298d16ec7a602b4cfb56e0f1c03040e300f45a87fe0fd0a41273e742b595b07e4ede01c724d16a3f11a3d2e65c6814b3d8d8d156d41f13989182ee",
           "sha256": "abe2d92b3e81e64b0d3b4d8e276c6ff4347b1846dcd2417f53d40a99fd4f0da0",
@@ -122,8 +122,8 @@
       },
       "files": [
         {
-          "name": "expo.modules.ui-0.1.1-alpha.8-sources.jar",
-          "url": "expo.modules.ui-0.1.1-alpha.8-sources.jar",
+          "name": "expo.modules.ui-0.1.1-alpha.9-sources.jar",
+          "url": "expo.modules.ui-0.1.1-alpha.9-sources.jar",
           "size": 14626,
           "sha512": "d5bc1af7c33732fcf29123ea132de19ed9cf5deeb034540970198f637d519a01ad470c3e2d3be3758ce3d7808a3ee7023413050d62847e04222ae3ebf8c7595f",
           "sha256": "103d283232c7a8c9b6b101e74947ae87f2e4b7df60c348931584239fa6619a99",

package/local-maven-repo/expo/modules/ui/expo.modules.ui/0.1.1-alpha.9/expo.modules.ui-0.1.1-alpha.9.module.md5

@@ -0,0 +1 @@
+6cd47b0fb48ff6b490575e31124e1c4b

package/local-maven-repo/expo/modules/ui/expo.modules.ui/0.1.1-alpha.9/expo.modules.ui-0.1.1-alpha.9.module.sha1

@@ -0,0 +1 @@
+217394ff36f1b2f2bd0b1b82a82dbd1895e9da01

package/local-maven-repo/expo/modules/ui/expo.modules.ui/0.1.1-alpha.9/expo.modules.ui-0.1.1-alpha.9.module.sha256

@@ -0,0 +1 @@
+b9d541f4a8ce0ea4652226cb4be98c61d656f7d3c3c0eb79e604efd074346d46

package/local-maven-repo/expo/modules/ui/expo.modules.ui/0.1.1-alpha.9/expo.modules.ui-0.1.1-alpha.9.module.sha512

@@ -0,0 +1 @@
+d94cc312e2f216f4eac47d70b49368b1bb00ce13e6b99390178aafbc901a0b81c3b95f7411402163dc6c88942405c637fec1aa8df26d9e8b3a8c3d1b1dc9cdef

package/local-maven-repo/expo/modules/ui/expo.modules.ui/{0.1.1-alpha.8/expo.modules.ui-0.1.1-alpha.8.pom → 0.1.1-alpha.9/expo.modules.ui-0.1.1-alpha.9.pom}

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

@@ -0,0 +1 @@
+899965b488f0d05923d1bead8d7a26ce

package/local-maven-repo/expo/modules/ui/expo.modules.ui/0.1.1-alpha.9/expo.modules.ui-0.1.1-alpha.9.pom.sha1

@@ -0,0 +1 @@
+e331bca97a06ac73384e8966d605506612957489

package/local-maven-repo/expo/modules/ui/expo.modules.ui/0.1.1-alpha.9/expo.modules.ui-0.1.1-alpha.9.pom.sha256

@@ -0,0 +1 @@
+7975c2dc70fea34465b0a4e1805aecfc65d478ef5a0055fba9b39277ef653841

package/local-maven-repo/expo/modules/ui/expo.modules.ui/0.1.1-alpha.9/expo.modules.ui-0.1.1-alpha.9.pom.sha512

@@ -0,0 +1 @@
+30f77f356482e503d38e2feb7c5a6d7674076a3003bf5297fc242ab5e7e8b19829db2981b7d8e5f6de3cbdf733bd85b8a7e2b6e72c918c443665fe4db7ef8dd9

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

@@ -3,11 +3,11 @@
   <groupId>expo.modules.ui</groupId>
   <artifactId>expo.modules.ui</artifactId>
   <versioning>
-    <latest>0.1.1-alpha.8</latest>
-    <release>0.1.1-alpha.8</release>
+    <latest>0.1.1-alpha.9</latest>
+    <release>0.1.1-alpha.9</release>
     <versions>
-      <version>0.1.1-alpha.8</version>
+      <version>0.1.1-alpha.9</version>
     </versions>
-    <lastUpdated>20250604230414</lastUpdated>
+    <lastUpdated>20250608044924</lastUpdated>
   </versioning>
 </metadata>

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

@@ -1 +1 @@
-b1139a862e142d606c470d623a3f153e
+a8819a022d7b0c14beffcbbed1ab71ad

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

@@ -1 +1 @@
-758f8be3c64b76cc4a990542e00877e924587234
+236220b47a2adab66d23c36f2d99c2af4c01781a

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

@@ -1 +1 @@
-01836af63215ed4b29b2fc4b4e8e05e06c48651fadba33f75135702b7ffdfb1c
+3eb430cfa8bc0618015df11a98da2b503d7a465e3e58df08f37b56f2678764aa

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

@@ -1 +1 @@
-c0edbc0c41ef138e28abcc6d2b5e8dd62d8d558c6d762226956fe491cf6767521946c3d75e32ef700c12de1a7fbf2680d78207ff62350d0b9e6a8375e654b4f1
+cb8e043acbd311c01c0b545dcbea03ea2ccd8ed11ef3d9d45cf7a89efc033aad067f02549aec5db14ca46b945373b02836fbd54c7ca7145116f9824d287b1ef8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@expo/ui",
-  "version": "0.1.1-alpha.8",
+  "version": "0.1.1-alpha.9",
   "description": "A collection of UI components",
   "scripts": {
     "build": "expo-module build",
@@ -34,5 +34,5 @@
     "react": "*",
     "react-native": "*"
   },
-  "gitHead": "7638c800b57fe78f57cc7f129022f58e84a523c5"
+  "gitHead": "38da2aaf6aa32f64f9063419054a6ad71dceddea"
 }

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

@@ -48,6 +48,7 @@ export type ButtonProps = {
   onPress?: () => void;
   /**
    * A string describing the system image to display in the button.
+   * This is only used if `children` is a string.
    * Uses Material Icons on Android and SF Symbols on iOS.
    */
   systemImage?: string;
@@ -61,9 +62,9 @@ export type ButtonProps = {
    */
   variant?: ButtonVariant;
   /**
-   * The text to display inside the button.
+   * The text or React node to display inside the button.
    */
-  children: string;
+  children: string | React.ReactNode;
   /**
    * Button color.
    */
@@ -82,7 +83,7 @@ export type NativeButtonProps = Omit<
   'role' | 'onPress' | 'children' | 'systemImage'
 > & {
   buttonRole?: ButtonRole;
-  text: string;
+  text: string | undefined;
   systemImage?: string;
 } & ViewEvent<'onButtonPressed', void>;
 
@@ -95,13 +96,16 @@ const ButtonNativeView: React.ComponentType<NativeButtonProps> = requireNativeVi
 /**
  * @hidden
  */
-export function transformButtonProps(props: ButtonProps): NativeButtonProps {
-  const { role, children, onPress, systemImage, ...restProps } = props;
+export function transformButtonProps(
+  props: Omit<ButtonProps, 'children'>,
+  text: string | undefined
+): NativeButtonProps {
+  const { role, onPress, systemImage, ...restProps } = props;
   return {
     ...restProps,
-    text: children ?? '',
-    buttonRole: role,
+    text,
     systemImage,
+    buttonRole: role,
     onButtonPressed: onPress,
   };
 }
@@ -111,7 +115,12 @@ export function transformButtonProps(props: ButtonProps): NativeButtonProps {
  * You should use this with a `Host` component in ancestor.
  */
 export function ButtonPrimitive(props: ButtonProps) {
-  return <ButtonNativeView {...transformButtonProps(props)} />;
+  const { children, ...restProps } = props;
+  const text = typeof children === 'string' ? children : undefined;
+  if (text !== undefined) {
+    return <ButtonNativeView {...transformButtonProps(restProps, text)} />;
+  }
+  return <ButtonNativeView {...transformButtonProps(restProps, text)}>{children}</ButtonNativeView>;
 }
 
 /**

package/src/swift-ui/ContextMenu/utils.ts

@@ -89,10 +89,12 @@ function createButtonElement(
   if (props.onPress) {
     handlers[uuid] = { onPress: props.onPress };
   }
-
+  if (typeof props.children !== 'string') {
+    throw new Error('ContextMenu Button only supports string children');
+  }
   return {
     contextMenuElementID: uuid,
-    button: transformButtonProps(props),
+    button: transformButtonProps(props, props.children),
   };
 }
 
@@ -135,10 +137,13 @@ function createSubmenuElement(
   props: SubmenuProps,
   handlers: EventHandlers
 ): MenuElement {
+  if (typeof props.button.props.children !== 'string') {
+    throw new Error('ContextMenu Submenu Button only supports string children');
+  }
   return {
     contextMenuElementID: uuid,
     submenu: {
-      button: transformButtonProps(props.button.props),
+      button: transformButtonProps(props.button.props, props.button.props.children),
       elements: transformChildrenToElementArray(props.children, handlers),
     },
   };

package/local-maven-repo/expo/modules/ui/expo.modules.ui/0.1.1-alpha.8/expo.modules.ui-0.1.1-alpha.8.module.md5

@@ -1 +0,0 @@
-c1cce9db74d74601d2c611df525fda49

package/local-maven-repo/expo/modules/ui/expo.modules.ui/0.1.1-alpha.8/expo.modules.ui-0.1.1-alpha.8.module.sha1

@@ -1 +0,0 @@
-f6c515f4464b112e28adf402ca4fe7bd765f7754

package/local-maven-repo/expo/modules/ui/expo.modules.ui/0.1.1-alpha.8/expo.modules.ui-0.1.1-alpha.8.module.sha256

@@ -1 +0,0 @@
-adfd05d143129305c5422f655e6ea77382475d6b97251886e1ad523db4b16916

package/local-maven-repo/expo/modules/ui/expo.modules.ui/0.1.1-alpha.8/expo.modules.ui-0.1.1-alpha.8.module.sha512

@@ -1 +0,0 @@
-db29cc67497560eb0866b9767942427f3437a32d4a5ef419bea60adb9cad79088dafd051a53c4b80d816122449215ffce1d09adabe14be5d5f3371585ea96a82

package/local-maven-repo/expo/modules/ui/expo.modules.ui/0.1.1-alpha.8/expo.modules.ui-0.1.1-alpha.8.pom.md5

@@ -1 +0,0 @@
-8314ceb9ac8deaa6b51db58c9fde92df

package/local-maven-repo/expo/modules/ui/expo.modules.ui/0.1.1-alpha.8/expo.modules.ui-0.1.1-alpha.8.pom.sha1

@@ -1 +0,0 @@
-c9f96f90241b52a6096b7b0a62e1a8024d26f75a

package/local-maven-repo/expo/modules/ui/expo.modules.ui/0.1.1-alpha.8/expo.modules.ui-0.1.1-alpha.8.pom.sha256

@@ -1 +0,0 @@
-cbe1f06ec3c38ffbb90cdd57d7d32f498fe599a39538394c22f3c4a111bf90c2

package/local-maven-repo/expo/modules/ui/expo.modules.ui/0.1.1-alpha.8/expo.modules.ui-0.1.1-alpha.8.pom.sha512

@@ -1 +0,0 @@
-7a6cc59d6a5c251662c6d92a1c48ef5410ef4567e9984f3cec48545423980a26cd6b791cf88e9312d5e09d9727ee31793030ec327a263a8494b342a057d770ab