@expo/ui 58.0.0 → 58.0.2

package/.npmignore

@@ -20,3 +20,8 @@ __rsc_tests__
 
 CLAUDE.md
 CONTRIBUTING.md
+
+# Exclude native build output (pnpm pack ignores nested .gitignore files)
+.cxx/
+.gradle/
+/android/build/

package/CHANGELOG.md

@@ -10,6 +10,18 @@
 
 ### 💡 Others
 
+## 58.0.2 — 2026-09-15
+
+### 🎉 New features
+
+- [macOS] Added minimal macOS support. ([#50110](https://github.com/expo/expo/pull/50110) by [@gabrieldonadel](https://github.com/gabrieldonadel))
+
+## 58.0.1 — 2026-09-14
+
+### 💡 Others
+
+- Update the native tabs import path in the `TabView` API reference. ([#50119](https://github.com/expo/expo/pull/50119) by [@Ubax](https://github.com/Ubax))
+
 ## 58.0.0 — 2026-09-10
 
 ### 🛠 Breaking changes
@@ -47,6 +59,7 @@
 - [iOS] Added the `scrollClipDisabled` modifier, which lets content that draws outside a scrollable view's bounds, such as a shadow or a scaled-up card, stay visible instead of being clipped. ([#49780](https://github.com/expo/expo/pull/49780) by [@Den1Marshall](https://github.com/Den1Marshall))
 - [iOS] Taught the `tint`, `border`, `strokeBorder` and `containerBackground` modifiers to paint with any `ShapeStyle`, matching SwiftUI, where all four take a `ShapeStyle` rather than a color. The `color` parameter of `border` and `strokeBorder` is deprecated in favor of `content`, the name SwiftUI gives it. ([#49838](https://github.com/expo/expo/pull/49838) by [@Den1Marshall](https://github.com/Den1Marshall))
 - [iOS] Added the `NavigationStack` and `Toolbar` components, the `navigationTitle` modifier, and the `close` button role. ([#49940](https://github.com/expo/expo/pull/49940) by [@nishan](https://github.com/intergalacticspacehighway))
+- [iOS] Added the `NavigationLink` component, and the `path` and `onPathChange` props and the `NavigationDestination` component, so a stack can push a destination that is built only when the link is followed. ([#49991](https://github.com/expo/expo/pull/49991) by [@nishan](https://github.com/intergalacticspacehighway))
 
 ### 🐛 Bug fixes
 
@@ -78,6 +91,7 @@
 - [Android] Explicitly enable `buildFeatures.buildConfig`, required by AGP 9. ([#47729](https://github.com/expo/expo/pull/47729) by [@gabrieldonadel](https://github.com/gabrieldonadel))
 - Fix `Host` color scheme type errors on React Native 0.87. ([#47729](https://github.com/expo/expo/pull/47729) by [@gabrieldonadel](https://github.com/gabrieldonadel))
 - [iOS] Fixed `PlatformColor` and `DynamicColorIOS` values dropping the `backgroundColor` and `borderColor` of a universal component. Both were stringified to `"[object Object]"`, which the native color converter rejects, so the modifier was discarded without a trace. ([#49746](https://github.com/expo/expo/pull/49746) by [@Den1Marshall](https://github.com/Den1Marshall))
+- [iOS] Preserve string-based child identities in `Overlay`, `Background`, and `Mask`. ([#49734](https://github.com/expo/expo/pull/49734) by [@jakex7](https://github.com/jakex7))
 
 ### 💡 Others
 

package/android/build.gradle

@@ -12,13 +12,13 @@ apply plugin: 'expo-module-gradle-plugin'
 apply plugin: 'org.jetbrains.kotlin.plugin.compose'
 
 group = 'expo.modules.ui'
-version = '58.0.0'
+version = '58.0.2'
 
 android {
   namespace "expo.modules.ui"
   defaultConfig {
     versionCode 1
-    versionName "58.0.0"
+    versionName "58.0.2"
     testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
   }
   buildFeatures {

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

@@ -0,0 +1,29 @@
+import { type ReactNode } from 'react';
+export interface NavigationDestinationProps {
+    /**
+     * The `NavigationLink` value this destination is presented for.
+     */
+    value: string;
+    /**
+     * The view pushed onto the stack for `value`.
+     */
+    children: ReactNode;
+}
+/**
+ * Associates a destination view with a `NavigationLink` value, matching SwiftUI's
+ * `navigationDestination(for:destination:)`. It must be a direct child of the `NavigationStack`,
+ * however deeply the link that pushes it is nested inside that stack.
+ *
+ * Keep it mounted so the pushed screen already carries its `navigationTitle` when the slide
+ * starts, or render one for each value on the stack's `path` to build screens on demand.
+ *
+ * @example
+ * ```tsx
+ * <NavigationDestination value="settings">
+ *   <SettingsScreen />
+ * </NavigationDestination>
+ * ```
+ *
+ * @platform ios
+ */
+export declare function NavigationDestination(props: NavigationDestinationProps): import("react/jsx-runtime").JSX.Element;

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

@@ -0,0 +1,29 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import { Slot } from '../SlotView';
+/**
+ * Associates a destination view with a `NavigationLink` value, matching SwiftUI's
+ * `navigationDestination(for:destination:)`. It must be a direct child of the `NavigationStack`,
+ * however deeply the link that pushes it is nested inside that stack.
+ *
+ * Keep it mounted so the pushed screen already carries its `navigationTitle` when the slide
+ * starts, or render one for each value on the stack's `path` to build screens on demand.
+ *
+ * @example
+ * ```tsx
+ * <NavigationDestination value="settings">
+ *   <SettingsScreen />
+ * </NavigationDestination>
+ * ```
+ *
+ * @platform ios
+ */ export function NavigationDestination(props) {
+    return /*#__PURE__*/ _jsx(Slot, {
+        name: "destination",
+        extraProps: {
+            value: props.value
+        },
+        children: props.children
+    });
+}
+
+//# sourceMappingURL=index.js.map

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

@@ -0,0 +1 @@
+{"version":3,"sources":["swift-ui/NavigationDestination/index.tsx"],"sourcesContent":[null],"names":["Slot","NavigationDestination","props","name","extraProps","value","children"],"mappings":";AAEA,SAASA,IAAI,QAAQ,cAAc;AAanC;;;;;;;;;;;;;;;;CAgBC,GACD,OAAO,SAASC,sBAAsBC,KAAiC;IACrE,qBACE,KAACF;QAAKG,MAAK;QAAcC,YAAY;YAAEC,OAAOH,MAAMG,KAAK;QAAC;kBACvDH,MAAMI,QAAQ;;AAGrB"}

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

@@ -0,0 +1,31 @@
+import { type ReactNode } from 'react';
+import { type CommonViewModifierProps } from '../types';
+export interface NavigationLinkProps extends CommonViewModifierProps {
+    /**
+     * The value to append to the enclosing `NavigationStack`'s path when the link is tapped. The
+     * stack presents the `NavigationDestination` whose `value` matches.
+     */
+    value: string;
+    /**
+     * A view that describes the link.
+     */
+    children: ReactNode;
+}
+/**
+ * A view that controls a navigation presentation. In a `List` it renders as a row with a
+ * disclosure chevron, and tapping it pushes the matching `NavigationDestination`.
+ *
+ * The link has to be inside the `NavigationStack` itself. Content presented from the stack, such
+ * as a `BottomSheet` or a `Popover`, is its own presentation context and does not reach the
+ * stack's destinations, so give that content its own `NavigationStack`.
+ *
+ * @example
+ * ```tsx
+ * <NavigationLink value="settings">
+ *   <Text>Settings</Text>
+ * </NavigationLink>
+ * ```
+ *
+ * @platform ios
+ */
+export declare function NavigationLink(props: NavigationLinkProps): import("react/jsx-runtime").JSX.Element;

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

@@ -0,0 +1,31 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import { requireNativeView } from 'expo';
+import { createViewModifierEventListener } from '../modifiers/utils';
+const NavigationLinkNativeView = requireNativeView('ExpoUI', 'NavigationLinkView');
+/**
+ * A view that controls a navigation presentation. In a `List` it renders as a row with a
+ * disclosure chevron, and tapping it pushes the matching `NavigationDestination`.
+ *
+ * The link has to be inside the `NavigationStack` itself. Content presented from the stack, such
+ * as a `BottomSheet` or a `Popover`, is its own presentation context and does not reach the
+ * stack's destinations, so give that content its own `NavigationStack`.
+ *
+ * @example
+ * ```tsx
+ * <NavigationLink value="settings">
+ *   <Text>Settings</Text>
+ * </NavigationLink>
+ * ```
+ *
+ * @platform ios
+ */ export function NavigationLink(props) {
+    const { modifiers, children, ...restProps } = props;
+    return /*#__PURE__*/ _jsx(NavigationLinkNativeView, {
+        modifiers: modifiers,
+        ...modifiers ? createViewModifierEventListener(modifiers) : undefined,
+        ...restProps,
+        children: children
+    });
+}
+
+//# sourceMappingURL=index.js.map

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

@@ -0,0 +1 @@
+{"version":3,"sources":["swift-ui/NavigationLink/index.tsx"],"sourcesContent":[null],"names":["requireNativeView","createViewModifierEventListener","NavigationLinkNativeView","NavigationLink","props","modifiers","children","restProps","undefined"],"mappings":";AAAA,SAASA,iBAAiB,QAAQ,OAAO;AAGzC,SAASC,+BAA+B,QAAQ,qBAAqB;AAerE,MAAMC,2BAA+DF,kBACnE,UACA;AAGF;;;;;;;;;;;;;;;;CAgBC,GACD,OAAO,SAASG,eAAeC,KAA0B;IACvD,MAAM,EAAEC,SAAS,EAAEC,QAAQ,EAAE,GAAGC,WAAW,GAAGH;IAC9C,qBACE,KAACF;QACCG,WAAWA;QACV,GAAIA,YAAYJ,gCAAgCI,aAAaG,SAAS;QACtE,GAAGD,SAAS;kBACZD;;AAGP"}

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

@@ -1,13 +1,44 @@
+import { type ReactNode } from 'react';
 import { type CommonViewModifierProps } from '../types';
 export interface NavigationStackProps extends CommonViewModifierProps {
     /**
-     * The root view of the stack. It is displayed inside a navigation bar.
+     * The root view of the stack, and the `NavigationDestination` views the stack can push. It is
+     * displayed inside a navigation bar.
      */
-    children: React.ReactNode;
+    children: ReactNode;
+    /**
+     * The values of the views pushed on top of the root view, in the order they were pushed.
+     * Leave it undefined to let the stack manage its own path.
+     */
+    path?: string[];
+    /**
+     * Callback function that is called when the stack pushes or pops a view, for example when a
+     * `NavigationLink` is tapped or the user swipes back. Gets called with the new path.
+     *
+     * When `path` is set, the stack is controlled: a push takes effect once the new path comes back
+     * through this prop.
+     */
+    onPathChange?: (path: string[]) => void;
 }
 /**
  * A view that displays a root view and enables you to present additional views over the root view.
  *
+ * @example
+ * ```tsx
+ * const [path, setPath] = useState<string[]>([]);
+ *
+ * <NavigationStack path={path} onPathChange={setPath}>
+ *   <List>
+ *     <NavigationLink value="settings">
+ *       <Text>Settings</Text>
+ *     </NavigationLink>
+ *   </List>
+ *   <NavigationDestination value="settings">
+ *     <SettingsScreen />
+ *   </NavigationDestination>
+ * </NavigationStack>
+ * ```
+ *
  * @platform ios
  */
 export declare function NavigationStack(props: NavigationStackProps): import("react/jsx-runtime").JSX.Element;

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

@@ -5,13 +5,32 @@ const NavigationStackNativeView = requireNativeView('ExpoUI', 'NavigationStackVi
 /**
  * A view that displays a root view and enables you to present additional views over the root view.
  *
+ * @example
+ * ```tsx
+ * const [path, setPath] = useState<string[]>([]);
+ *
+ * <NavigationStack path={path} onPathChange={setPath}>
+ *   <List>
+ *     <NavigationLink value="settings">
+ *       <Text>Settings</Text>
+ *     </NavigationLink>
+ *   </List>
+ *   <NavigationDestination value="settings">
+ *     <SettingsScreen />
+ *   </NavigationDestination>
+ * </NavigationStack>
+ * ```
+ *
  * @platform ios
  */ export function NavigationStack(props) {
-    const { modifiers, ...restProps } = props;
+    const { modifiers, onPathChange, ...restProps } = props;
     return /*#__PURE__*/ _jsx(NavigationStackNativeView, {
         modifiers: modifiers,
         ...modifiers ? createViewModifierEventListener(modifiers) : undefined,
-        ...restProps
+        ...restProps,
+        onPathChange: onPathChange ? ({ nativeEvent: { path } })=>{
+            onPathChange(path);
+        } : undefined
     });
 }
 

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

@@ -1 +1 @@
-{"version":3,"sources":["swift-ui/NavigationStack/index.tsx"],"sourcesContent":[null],"names":["requireNativeView","createViewModifierEventListener","NavigationStackNativeView","NavigationStack","props","modifiers","restProps","undefined"],"mappings":";AAAA,SAASA,iBAAiB,QAAQ,OAAO;AAEzC,SAASC,+BAA+B,QAAQ,qBAAqB;AAUrE,MAAMC,4BAAuEF,kBAC3E,UACA;AAGF;;;;CAIC,GACD,OAAO,SAASG,gBAAgBC,KAA2B;IACzD,MAAM,EAAEC,SAAS,EAAE,GAAGC,WAAW,GAAGF;IACpC,qBACE,KAACF;QACCG,WAAWA;QACV,GAAIA,YAAYJ,gCAAgCI,aAAaE,SAAS;QACtE,GAAGD,SAAS;;AAGnB"}
+{"version":3,"sources":["swift-ui/NavigationStack/index.tsx"],"sourcesContent":[null],"names":["requireNativeView","createViewModifierEventListener","NavigationStackNativeView","NavigationStack","props","modifiers","onPathChange","restProps","undefined","nativeEvent","path"],"mappings":";AAAA,SAASA,iBAAiB,QAAQ,OAAO;AAIzC,SAASC,+BAA+B,QAAQ,qBAAqB;AA4BrE,MAAMC,4BAAuEF,kBAC3E,UACA;AAGF;;;;;;;;;;;;;;;;;;;;CAoBC,GACD,OAAO,SAASG,gBAAgBC,KAA2B;IACzD,MAAM,EAAEC,SAAS,EAAEC,YAAY,EAAE,GAAGC,WAAW,GAAGH;IAClD,qBACE,KAACF;QACCG,WAAWA;QACV,GAAIA,YAAYJ,gCAAgCI,aAAaG,SAAS;QACtE,GAAGD,SAAS;QACbD,cACEA,eACI,CAAC,EAAEG,aAAa,EAAEC,IAAI,EAAE,EAAE;YACxBJ,aAAaI;QACf,IACAF;;AAIZ"}

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

@@ -33,7 +33,7 @@ export type { TabProps } from './Tab';
  * `value` prop, which is used for selection.
  *
  * For routed bottom-tab navigation across full-screen routes, prefer
- * `expo-router/unstable-native-tabs`.
+ * `expo-router/native-tabs`.
  *
  * @platform ios
  */

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

@@ -23,7 +23,7 @@ function TabView(props) {
  * `value` prop, which is used for selection.
  *
  * For routed bottom-tab navigation across full-screen routes, prefer
- * `expo-router/unstable-native-tabs`.
+ * `expo-router/native-tabs`.
  *
  * @platform ios
  */ const _TabView = Object.assign(TabView, {

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

@@ -25,6 +25,8 @@ export * from './ZStack';
 export * from './Group';
 export * from './List';
 export * from './Menu';
+export * from './NavigationDestination';
+export * from './NavigationLink';
 export * from './NavigationStack';
 export * from './Picker';
 export * from './ProgressView';

package/build/swift-ui/index.js

@@ -25,6 +25,8 @@ export * from './ZStack';
 export * from './Group';
 export * from './List';
 export * from './Menu';
+export * from './NavigationDestination';
+export * from './NavigationLink';
 export * from './NavigationStack';
 export * from './Picker';
 export * from './ProgressView';

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,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;AAC7B,cAAc,WAAW;AACzB,cAAc,WAAW;AACzB,cAAc,UAAU;AACxB,cAAc,SAAS;AACvB,cAAc,SAAS;AACvB,cAAc,0BAA0B;AACxC,cAAc,mBAAmB;AACjC,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/expo-module.config.json

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

package/ios/BackgroundView.swift

@@ -3,14 +3,18 @@
 import ExpoModulesCore
 import SwiftUI
 
-internal class BackgroundViewProps: UIBaseViewProps {
+public final class BackgroundViewProps: UIBaseViewProps {
   @Field var alignment: AlignmentOptions?
 }
 
-internal struct BackgroundView: ExpoSwiftUI.View {
-  @ObservedObject var props: BackgroundViewProps
+public struct BackgroundView: ExpoSwiftUI.View {
+  @ObservedObject public var props: BackgroundViewProps
 
-  var body: some View {
+  public init(props: BackgroundViewProps) {
+    self.props = props
+  }
+
+  public var body: some View {
     baseContent
       .background(alignment: props.alignment?.toAlignment() ?? .center) {
         backgroundContent
@@ -19,7 +23,7 @@ internal struct BackgroundView: ExpoSwiftUI.View {
 
   @ViewBuilder
   private var baseContent: some View {
-    ForEach(props.children?.withoutSlots() ?? [], id: \.id) { child in
+    ForEach(props.children?.withoutSlots() ?? [], id: \.childIdentity) { child in
       let view: any View = child.childView
       AnyView(view)
     }
@@ -31,4 +35,4 @@ internal struct BackgroundView: ExpoSwiftUI.View {
       content
     }
   }
-}
+}

package/ios/ConcentricRectangleView.swift

@@ -33,7 +33,7 @@ public struct ConcentricRectangleView: ExpoSwiftUI.View {
   }
 
 #if compiler(>=6.2) // Xcode 26
-  @available(iOS 26.0, tvOS 26.0, *)
+  @available(iOS 26.0, macOS 26.0, tvOS 26.0, *)
   private func cornerStyle(from config: CornerStyleConfig?) -> Edge.Corner.Style {
     // default to concentric
     guard let config = config else {
@@ -57,7 +57,7 @@ public struct ConcentricRectangleView: ExpoSwiftUI.View {
 
   public var body: some View {
 #if compiler(>=6.2) // Xcode 26
-    if #available(iOS 26.0, tvOS 26.0, *) {
+    if #available(iOS 26.0, macOS 26.0, tvOS 26.0, *) {
       let topLeadingCorner = cornerStyle(from: props.corners?.topLeadingCorner)
       let topTrailingCorner = cornerStyle(from: props.corners?.topTrailingCorner)
       let bottomLeadingCorner = cornerStyle(from: props.corners?.bottomLeadingCorner)

package/ios/ExpoUI.podspec

@@ -12,7 +12,8 @@ Pod::Spec.new do |s|
   s.homepage       = package['homepage']
   s.platforms      = {
     :ios => '16.4',
-    :tvos => '16.4'
+    :tvos => '16.4',
+    :osx => '13.4'
   }
   s.swift_version  = '5.9'
   s.source         = { git: 'https://github.com/expo/expo.git' }

package/ios/ExpoUIModule.swift

@@ -157,6 +157,7 @@ public final class ExpoUIModule: Module {
     ExpoUIView(MenuView.self)
 
     ExpoUIView(NavigationStackView.self)
+    ExpoUIView(NavigationLinkView.self)
     ExpoUIView(ToolbarView.self)
 
     ExpoUIView(FormView.self)

package/ios/ExpoUITouchHandlerHelper.h

@@ -1,12 +1,10 @@
 // Copyright 2025-present 650 Industries. All rights reserved.
 
 #import <Foundation/Foundation.h>
+#import <ExpoModulesCore/Platform.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
-@class UIGestureRecognizer;
-@class UIView;
-
 @interface ExpoUITouchHandlerHelper : NSObject
 
 + (nullable UIGestureRecognizer *)createAndAttachTouchHandlerForView:(UIView *)view;

package/ios/HostView.swift

@@ -141,7 +141,16 @@ private struct ViewportSizeMeasurementLayout: Layout {
   }
 
   private func safeAreaSize() -> CGSize {
+#if os(macOS)
+    // `SceneGeometry` is built on `UIWindowScene`, which has no macOS counterpart. The closest
+    // analogue to a window's safe area is its content layout rect, which excludes the title bar.
+    guard let window = NSApplication.shared.keyWindow ?? NSApplication.shared.windows.first else {
+      return .zero
+    }
+    return window.contentLayoutRect.size
+#else
     return SceneGeometry.safeAreaSize()
+#endif
   }
 }
 

package/ios/MaskView.swift

@@ -3,14 +3,18 @@
 import ExpoModulesCore
 import SwiftUI
 
-internal class MaskViewProps: UIBaseViewProps {
+public final class MaskViewProps: UIBaseViewProps {
   @Field var alignment: AlignmentOptions?
 }
 
-internal struct MaskView: ExpoSwiftUI.View {
-  @ObservedObject var props: MaskViewProps
+public struct MaskView: ExpoSwiftUI.View {
+  @ObservedObject public var props: MaskViewProps
 
-  var body: some View {
+  public init(props: MaskViewProps) {
+    self.props = props
+  }
+
+  public var body: some View {
     if let mask = props.children?.slot("content") {
       baseContent.mask(alignment: props.alignment?.toAlignment() ?? .center) {
         mask
@@ -22,7 +26,7 @@ internal struct MaskView: ExpoSwiftUI.View {
 
   @ViewBuilder
   private var baseContent: some View {
-    ForEach(props.children?.withoutSlots() ?? [], id: \.id) { child in
+    ForEach(props.children?.withoutSlots() ?? [], id: \.childIdentity) { child in
       let view: any View = child.childView
       AnyView(view)
     }

package/ios/Modifiers/ContainerBackgroundModifier.swift

@@ -11,7 +11,7 @@ internal enum ContainerBackgroundPlacementOptions: String, Enumerable {
   case navigation
   case navigationSplitView
 
-#if !os(tvOS)
+#if !os(tvOS) && !os(macOS)
   @available(iOS 18.0, *)
   var toContainerBackgroundPlacement: ContainerBackgroundPlacement {
     switch self {
@@ -28,7 +28,15 @@ internal struct ContainerBackgroundModifier: ViewModifier, Record {
   @Field var container: ContainerBackgroundPlacementOptions?
 
   func body(content: Content) -> some View {
-#if !os(tvOS)
+#if os(tvOS)
+    content
+#elseif os(macOS)
+    if let shapeStyle = style?.toAnyShapeStyle(), container == .widget {
+      content.containerBackground(shapeStyle, for: .widget)
+    } else {
+      content
+    }
+#else
     if let shapeStyle = style?.toAnyShapeStyle(), let container {
       if #available(iOS 18.0, *) {
         content.containerBackground(shapeStyle, for: container.toContainerBackgroundPlacement)
@@ -40,8 +48,6 @@ internal struct ContainerBackgroundModifier: ViewModifier, Record {
     } else {
       content
     }
-#else
-    content
 #endif
   }
 }

package/ios/Modifiers/ContentShapeModifier.swift

@@ -21,14 +21,18 @@ internal enum ContentShapeKind: String, Enumerable {
       return .dragPreview
       #endif
     case .contextMenuPreview:
+      #if !os(macOS)
       if #available(iOS 15.0, tvOS 17.0, *) {
         return .contextMenuPreview
       }
+      #endif
       return .interaction
     case .hoverEffect:
+      #if !os(macOS)
       if #available(iOS 15.0, tvOS 18.0, *) {
         return .hoverEffect
       }
+      #endif
       return .interaction
     case .accessibility:
       if #available(iOS 17.0, tvOS 17.0, macOS 14.0, *) {

package/ios/Modifiers/DatePickerStyleModifier.swift

@@ -17,8 +17,10 @@ internal enum DatePickerStyleType: String, Enumerable {
       content.datePickerStyle(.compact)
     case .graphical:
       content.datePickerStyle(.graphical)
+#if !os(macOS)
     case .wheel:
       content.datePickerStyle(.wheel)
+#endif
     default:
       content.datePickerStyle(.automatic)
     }

package/ios/Modifiers/EnvironmentModifier.swift

@@ -15,6 +15,7 @@ internal enum EditModeType: String, Enumerable {
   case inactive
   case transient
 
+#if !os(macOS)
   func toNativeEditMode() -> EditMode {
     switch self {
     case .active:
@@ -25,6 +26,7 @@ internal enum EditModeType: String, Enumerable {
       return .transient
     }
   }
+#endif
 }
 
 internal enum ColorSchemeType: String, Enumerable {
@@ -49,11 +51,15 @@ internal struct EnvironmentModifier: ViewModifier, Record {
   func body(content: Content) -> some View {
     switch key {
     case .editMode:
+#if os(macOS)
+      content
+#else
       if let editMode = EditModeType(rawValue: value) {
         content.environment(\.editMode, .constant(editMode.toNativeEditMode()))
       } else {
         content
       }
+#endif
     case .colorScheme:
       if let colorScheme = ColorSchemeType(rawValue: value) {
         content.environment(\.colorScheme, colorScheme.toNativeColorScheme())

package/ios/Modifiers/IndexViewStyleModifier.swift

@@ -13,6 +13,7 @@ internal enum PageIndexBackgroundDisplayMode: String, Enumerable {
   case never
   case interactive
 
+#if !os(macOS)
   var asSwiftUI: PageIndexViewStyle.BackgroundDisplayMode {
     switch self {
     case .automatic: .automatic
@@ -21,6 +22,7 @@ internal enum PageIndexBackgroundDisplayMode: String, Enumerable {
     case .interactive: .interactive
     }
   }
+#endif
 }
 
 internal struct IndexViewStyleModifier: ViewModifier, Record {
@@ -29,9 +31,13 @@ internal struct IndexViewStyleModifier: ViewModifier, Record {
 
   @ViewBuilder
   func body(content: Content) -> some View {
+#if os(macOS)
+    content
+#else
     switch type ?? .page {
     case .page:
       content.indexViewStyle(.page(backgroundDisplayMode: (backgroundDisplayMode ?? .automatic).asSwiftUI))
     }
+#endif
   }
 }

package/ios/Modifiers/KeyboardTypeModifier.swift

@@ -18,6 +18,7 @@ enum KeyboardType: String, Enumerable {
   case asciiCapableNumberPad = "ascii-capable-number-pad"
 }
 
+#if !os(macOS)
 func getKeyboardType(_ keyboardType: KeyboardType) -> UIKeyboardType {
   switch keyboardType {
   case .defaultKeyboard:
@@ -46,16 +47,21 @@ func getKeyboardType(_ keyboardType: KeyboardType) -> UIKeyboardType {
     return .asciiCapableNumberPad
   }
 }
+#endif
 
 internal struct KeyboardTypeModifier: ViewModifier, Record {
   @Field var keyboardType: KeyboardType?
 
   func body(content: Content) -> some View {
+#if os(macOS)
+    content
+#else
     if let keyboardType {
       content.keyboardType(getKeyboardType(keyboardType))
     } else {
       content
     }
+#endif
   }
 }