@ankhorage/surface 2.2.1 → 3.0.1

package/src/components/icon-button/IconButton.tsx

@@ -46,12 +46,7 @@ export function IconButton({
               opacity: colors.opacity,
             }}
           >
-            <Icon
-              color={colors.contentColor}
-              name={icon.name}
-              provider={icon.provider}
-              size={resolveIconSize(theme, size)}
-            />
+            <Icon {...icon} color={colors.contentColor} size={resolveIconSize(theme, size)} />
           </Box>
         );
       }}

package/src/components/icon-button/types.ts

@@ -1,17 +1,14 @@
 import type { ControlSize } from '../../internal/resolvers/resolveControlSize';
 import type { ButtonVariant } from '../../internal/resolvers/resolveInteractiveColors';
 import type { ButtonBaseProps } from '../../primitives/button-base';
-import type { IconProps } from '../../primitives/icon';
+import type { IconSource } from '../../primitives/icon';
 import type { SurfaceColor } from '../../surfaceColor';
 
 export interface IconButtonProps extends Omit<
   ButtonBaseProps,
   'children' | 'style' | 'accessibilityLabel'
 > {
-  icon: {
-    name: IconProps['name'];
-    provider?: IconProps['provider'];
-  };
+  icon: IconSource;
   accessibilityLabel: string;
   variant?: ButtonVariant;
   color?: SurfaceColor;

package/src/components/menu/Menu.tsx

@@ -4,6 +4,7 @@ import { type LayoutRectangle, Pressable, View } from 'react-native';
 import { FocusScope } from '../../internal/focus/FocusScope';
 import { useFocusManager } from '../../internal/focus/useFocusManager';
 import { Portal } from '../../internal/overlay/Portal';
+import { resolvePointerEvents } from '../../internal/resolvePointerEvents';
 import { resolveOverlayAnimation } from '../../internal/resolvers';
 import { Box, Inline, Stack, Surface } from '../../layout';
 import { ButtonBase } from '../../primitives/button-base';
@@ -12,6 +13,8 @@ import { useTheme } from '../../theme/ThemeContext';
 import { resolveNextMenuIndex } from './navigation';
 import type { MenuAction, MenuProps } from './types';
 
+const boxNonePointerEvents = resolvePointerEvents('box-none');
+
 interface MeasurableNode {
   measureInWindow?: (
     callback: (x: number, y: number, width: number, height: number) => void,
@@ -142,14 +145,17 @@ export function Menu({
       </ButtonBase>
       <Portal layer="menu" visible={open && Boolean(layout)}>
         <View
-          pointerEvents="box-none"
-          style={{
-            bottom: 0,
-            left: 0,
-            position: 'absolute',
-            right: 0,
-            top: 0,
-          }}
+          {...boxNonePointerEvents.props}
+          style={[
+            boxNonePointerEvents.style,
+            {
+              bottom: 0,
+              left: 0,
+              position: 'absolute',
+              right: 0,
+              top: 0,
+            },
+          ]}
         >
           <Pressable
             onPress={passive ? undefined : closeMenu}

package/src/components/modal/Modal.tsx

@@ -3,11 +3,14 @@ import { Pressable, View } from 'react-native';
 
 import { FocusScope } from '../../internal/focus/FocusScope';
 import { Portal } from '../../internal/overlay/Portal';
+import { resolvePointerEvents } from '../../internal/resolvePointerEvents';
 import { resolveOverlayAnimation } from '../../internal/resolvers';
 import { Center, Surface } from '../../layout';
 import { useTheme } from '../../theme/ThemeContext';
 import type { ModalProps } from './types';
 
+const boxNonePointerEvents = resolvePointerEvents('box-none');
+
 export function Modal({
   visible,
   onDismiss,
@@ -27,14 +30,17 @@ export function Modal({
   return (
     <Portal layer="modal" visible={visible}>
       <View
-        pointerEvents="box-none"
-        style={{
-          bottom: 0,
-          left: 0,
-          position: 'absolute',
-          right: 0,
-          top: 0,
-        }}
+        {...boxNonePointerEvents.props}
+        style={[
+          boxNonePointerEvents.style,
+          {
+            bottom: 0,
+            left: 0,
+            position: 'absolute',
+            right: 0,
+            top: 0,
+          },
+        ]}
       >
         <Pressable
           onPress={passive ? undefined : closeOnBackdrop ? onDismiss : undefined}

package/src/components/navigation/NavigationItem.tsx

@@ -56,12 +56,7 @@ export function NavigationItem({
           >
             {item.icon ? (
               <View style={{ marginRight: theme.spacing.s }}>
-                <Icon
-                  color={presentation.contentColor}
-                  name={item.icon.name}
-                  provider={item.icon.provider}
-                  size={compact ? 's' : 'm'}
-                />
+                <Icon {...item.icon} color={presentation.contentColor} size={compact ? 's' : 'm'} />
               </View>
             ) : null}
             <Box flex={1}>

package/src/components/navigation/TabBarItem.tsx

@@ -57,12 +57,7 @@ export function TabBarItem({ item, compact = false, testID, interactionPolicy }:
           >
             {item.icon ? (
               <View style={{ marginBottom: item.label ? theme.spacing.xs : 0 }}>
-                <Icon
-                  color={contentColor}
-                  name={item.icon.name}
-                  provider={item.icon.provider}
-                  size={compact ? 's' : 'm'}
-                />
+                <Icon {...item.icon} color={contentColor} size={compact ? 's' : 'm'} />
               </View>
             ) : null}
             {item.label ? (

package/src/components/navigation/types.ts

@@ -2,9 +2,9 @@ import type React from 'react';
 import type { AccessibilityRole, AccessibilityState } from 'react-native';
 
 import type { InteractionPolicy } from '../../interactionPolicy';
-import type { IconProps } from '../../primitives/icon';
+import type { IconSource } from '../../primitives/icon';
 
-export type NavigationItemIcon = Pick<IconProps, 'name' | 'provider'>;
+export type NavigationItemIcon = IconSource;
 
 export interface NavigationItemSpec {
   id: string;

package/src/components/toast/ToastProvider.tsx

@@ -68,9 +68,10 @@ export function ToastProvider({
   }, [defaultDuration, dismissToast, toasts]);
 
   React.useEffect(() => {
+    const timers = timersRef.current;
     return () => {
-      timersRef.current.forEach((timer) => clearTimeout(timer));
-      timersRef.current.clear();
+      timers.forEach((timer) => clearTimeout(timer));
+      timers.clear();
     };
   }, []);
 

package/src/components/tooltip/Tooltip.tsx

@@ -2,12 +2,15 @@ import React from 'react';
 import { type LayoutRectangle, Platform, Pressable, View } from 'react-native';
 
 import { Portal } from '../../internal/overlay/Portal';
+import { resolvePointerEvents } from '../../internal/resolvePointerEvents';
 import { resolveOverlayAnimation } from '../../internal/resolvers';
 import { Surface } from '../../layout';
 import { Text } from '../../primitives/text';
 import { useTheme } from '../../theme/ThemeContext';
 import type { TooltipProps } from './types';
 
+const noPointerEvents = resolvePointerEvents('none');
+
 interface MeasurableNode {
   measureInWindow?: (
     callback: (x: number, y: number, width: number, height: number) => void,
@@ -85,12 +88,15 @@ export function Tooltip({
       </Pressable>
       <Portal layer="tooltip" visible={visible && Boolean(layout)}>
         <View
-          pointerEvents="none"
-          style={{
-            left: tooltipLeft,
-            position: 'absolute',
-            top: tooltipTop,
-          }}
+          {...noPointerEvents.props}
+          style={[
+            noPointerEvents.style,
+            {
+              left: tooltipLeft,
+              position: 'absolute',
+              top: tooltipTop,
+            },
+          ]}
         >
           <Surface
             p="s"

package/src/context/TranslationContext.tsx

@@ -1,4 +1,4 @@
-import React, { createContext, useContext, useMemo } from 'react';
+import React, { createContext, useContext } from 'react';
 
 /**
  * Minimal translation runtime surface.
@@ -31,20 +31,17 @@ export function TranslationProvider(props: {
 }) {
   const { t, i18n, children } = props;
 
-  const value = useMemo<TranslationRuntime>(
-    () => ({
-      t: (key: string, options?: Record<string, unknown>) => {
-        if (i18n?.t) {
-          const result = i18n.t(key, options);
-          // If translation returns the key, it's missing in the current dictionary
-          if (result !== key) return result;
-        }
-        return t(key, options);
-      },
-      i18n: i18n ?? null,
-    }),
-    [t, i18n, i18n?.language],
-  );
+  const value: TranslationRuntime = {
+    t: (key: string, options?: Record<string, unknown>) => {
+      if (i18n?.t) {
+        const result = i18n.t(key, options);
+        // If translation returns the key, it's missing in the current dictionary
+        if (result !== key) return result;
+      }
+      return t(key, options);
+    },
+    i18n: i18n ?? null,
+  };
 
   return <TranslationContext.Provider value={value}>{children}</TranslationContext.Provider>;
 }

package/src/index.test.ts

@@ -6,8 +6,10 @@ const indexSource = readFileSync(new URL('./index.ts', import.meta.url), 'utf8')
 const packageJson = JSON.parse(
   readFileSync(new URL('../package.json', import.meta.url), 'utf8'),
 ) as {
+  devDependencies: Record<string, string>;
   exports: Record<string, unknown>;
   files: string[];
+  peerDependencies: Record<string, string>;
 };
 
 const expectedRootExports = [
@@ -19,6 +21,7 @@ const expectedRootExports = [
   "export { Field } from './components/field';",
   "export { HelperText } from './components/helper-text';",
   "export { IconButton } from './components/icon-button';",
+  "export { Icon, SUPPORTED_ICON_PROVIDERS } from './primitives/icon';",
   "export type { InteractionPolicy, InteractionPolicyProps } from './interactionPolicy';",
   "export { Label } from './components/label';",
   "export { ListItem } from './components/list-item';",
@@ -67,4 +70,9 @@ describe('public package contract', () => {
       './package.json': './package.json',
     });
   });
+
+  it('supports RN 0.86 patches while validating the canonical RN 0.86.3 baseline', () => {
+    expect(packageJson.peerDependencies['react-native']).toBe('0.86.x');
+    expect(packageJson.devDependencies['react-native']).toBe('0.86.3');
+  });
 });

package/src/index.ts

@@ -67,8 +67,8 @@ export type { ButtonBaseProps } from './primitives/button-base';
 export { ButtonBase } from './primitives/button-base';
 export type { HeadingLevel, HeadingProps } from './primitives/heading';
 export { Heading } from './primitives/heading';
-export type { IconProps, IconProvider } from './primitives/icon';
-export { Icon } from './primitives/icon';
+export type { IconProps, IconProvider, IconSource, IconVariant } from './primitives/icon';
+export { Icon, SUPPORTED_ICON_PROVIDERS } from './primitives/icon';
 export type { ImageFit, ImageProps, SurfaceImageSource } from './primitives/image';
 export { Image } from './primitives/image';
 export type { TextProps } from './primitives/text';

package/src/internal/overlay/OverlayProvider.tsx

@@ -1,6 +1,7 @@
 import React from 'react';
-import { View } from 'react-native';
+import { StyleSheet, View, type ViewStyle } from 'react-native';
 
+import { resolvePointerEvents } from '../resolvePointerEvents';
 import {
   createOverlayEntry,
   type OverlayDescriptor,
@@ -10,6 +11,21 @@ import {
   sortOverlayEntries,
 } from './useOverlayStack';
 
+const boxNonePointerEvents = resolvePointerEvents('box-none');
+const styles = StyleSheet.create({
+  fill: {
+    bottom: 0,
+    left: 0,
+    position: 'absolute',
+    right: 0,
+    top: 0,
+  },
+});
+
+function overlayZIndex(zIndex: number): ViewStyle {
+  return { zIndex };
+}
+
 export function OverlayProvider({ children }: { children: React.ReactNode }) {
   const orderRef = React.useRef(0);
   const [overlays, setOverlays] = React.useState<OverlayEntry[]>([]);
@@ -52,28 +68,12 @@ export function OverlayProvider({ children }: { children: React.ReactNode }) {
     <OverlayStackActionsContext.Provider value={actions}>
       <OverlayStackContext.Provider value={value}>
         {children}
-        <View
-          pointerEvents="box-none"
-          style={{
-            bottom: 0,
-            left: 0,
-            position: 'absolute',
-            right: 0,
-            top: 0,
-          }}
-        >
+        <View {...boxNonePointerEvents.props} style={[boxNonePointerEvents.style, styles.fill]}>
           {overlays.map((overlay) => (
             <View
+              {...boxNonePointerEvents.props}
               key={overlay.id}
-              pointerEvents="box-none"
-              style={{
-                bottom: 0,
-                left: 0,
-                position: 'absolute',
-                right: 0,
-                top: 0,
-                zIndex: overlay.zIndex,
-              }}
+              style={[boxNonePointerEvents.style, styles.fill, overlayZIndex(overlay.zIndex)]}
             >
               {overlay.node}
             </View>

package/src/internal/overlay/Portal.tsx

@@ -19,9 +19,10 @@ export function Portal({ children, layer = 'modal', visible = true }: PortalProp
     if (!overlayActions || !visible) {
       return undefined;
     }
+    const id = idRef.current;
 
     return () => {
-      overlayActions.removeOverlay(idRef.current);
+      overlayActions.removeOverlay(id);
     };
   }, [overlayActions, visible]);
 

package/src/internal/resolvePointerEvents.test.ts

@@ -0,0 +1,19 @@
+import { describe, expect, test } from 'bun:test';
+
+import { resolvePointerEventsForPlatform } from './resolvePointerEvents';
+
+describe('resolvePointerEvents', () => {
+  test('moves React Native Web pointer events into style', () => {
+    expect(resolvePointerEventsForPlatform('box-none', 'web')).toEqual({
+      props: {},
+      style: { pointerEvents: 'box-none' },
+    });
+  });
+
+  test('preserves the native pointer-events prop', () => {
+    expect(resolvePointerEventsForPlatform('none', 'ios')).toEqual({
+      props: { pointerEvents: 'none' },
+      style: null,
+    });
+  });
+});

package/src/internal/resolvePointerEvents.ts

@@ -0,0 +1,29 @@
+import { Platform, type StyleProp, type ViewProps, type ViewStyle } from 'react-native';
+
+interface ResolvedPointerEvents {
+  props: Pick<ViewProps, 'pointerEvents'>;
+  style: StyleProp<ViewStyle>;
+}
+
+export function resolvePointerEvents(
+  pointerEvents: NonNullable<ViewProps['pointerEvents']>,
+): ResolvedPointerEvents {
+  return resolvePointerEventsForPlatform(pointerEvents, Platform.OS);
+}
+
+export function resolvePointerEventsForPlatform(
+  pointerEvents: NonNullable<ViewProps['pointerEvents']>,
+  platform: typeof Platform.OS,
+): ResolvedPointerEvents {
+  if (platform === 'web') {
+    return {
+      props: {},
+      style: { pointerEvents },
+    };
+  }
+
+  return {
+    props: { pointerEvents },
+    style: null,
+  };
+}

package/src/layout/AppBar.tsx

@@ -33,7 +33,7 @@ export function AppBar({
     topInset === 0 ? undefined : { paddingTop: topInset };
 
   return (
-    <Box {...props} bg={bg ?? theme.semantics.surface.default} style={[style]}>
+    <Box {...props} bg={bg ?? theme.semantics.surface.default} style={style}>
       <View style={safeAreaStyle}>
         <View
           style={[

package/src/layout/Box.tsx

@@ -1,13 +1,8 @@
 import React from 'react';
-import {
-  Platform,
-  type StyleProp,
-  View,
-  type ViewProps as ReactNativeViewProps,
-  type ViewStyle,
-} from 'react-native';
+import { View, type ViewProps as ReactNativeViewProps } from 'react-native';
 
 import { useResponsiveRuntime } from '../core/responsive';
+import { resolvePointerEvents } from '../internal/resolvePointerEvents';
 import { useTheme } from '../theme/ThemeContext';
 import { type BoxStyleProps, resolveBoxStyles } from './helpers';
 
@@ -21,31 +16,6 @@ export interface BoxProps extends BoxStyleProps {
   testID?: string;
 }
 
-function resolvePointerEventsStyle(
-  pointerEvents: ReactNativeViewProps['pointerEvents'] | undefined,
-): StyleProp<ViewStyle> | null {
-  if (Platform.OS !== 'web' || pointerEvents === undefined) return null;
-
-  if (pointerEvents === 'auto' || pointerEvents === 'none') {
-    return { pointerEvents };
-  }
-
-  return null;
-}
-
-function resolveViewPointerEvents(
-  pointerEvents: ReactNativeViewProps['pointerEvents'] | undefined,
-): ReactNativeViewProps['pointerEvents'] | undefined {
-  if (pointerEvents === undefined) return undefined;
-  if (Platform.OS !== 'web') return pointerEvents;
-
-  if (pointerEvents === 'box-none' || pointerEvents === 'box-only') {
-    return pointerEvents;
-  }
-
-  return undefined;
-}
-
 export function Box({
   accessible,
   accessibilityLabel,
@@ -60,18 +30,17 @@ export function Box({
   const { theme } = useTheme();
   const { breakpoint } = useResponsiveRuntime();
   const resolved = resolveBoxStyles(theme, breakpoint, props);
-  const pointerEventsStyle = resolvePointerEventsStyle(pointerEvents);
-  const viewPointerEvents = resolveViewPointerEvents(pointerEvents);
+  const resolvedPointerEvents = pointerEvents ? resolvePointerEvents(pointerEvents) : null;
 
   return (
     <View
+      {...resolvedPointerEvents?.props}
       accessible={accessible}
       accessibilityLabel={accessibilityLabel}
       accessibilityRole={accessibilityRole}
       accessibilityState={accessibilityState}
-      pointerEvents={viewPointerEvents}
       testID={testID}
-      style={[resolved, pointerEventsStyle, style]}
+      style={[resolved, resolvedPointerEvents?.style, style]}
     >
       {children}
     </View>

package/src/layout/Grid.tsx

@@ -35,7 +35,7 @@ export function Grid({
   const colSpacing = Number(resolveSpacing(theme, activeColGap) ?? 0);
   const activeMinItemWidth = resolveResponsive(minItemWidth, breakpoint);
 
-  const basisPercent = `${100 / activeCols}%`;
+  const basisPercent: `${number}%` = `${100 / activeCols}%`;
   const nodes = React.Children.toArray(children);
 
   return (
@@ -58,8 +58,8 @@ export function Grid({
                   flexGrow: 1,
                 }
               : {
-                  width: basisPercent as ViewStyle['width'],
-                  flexBasis: basisPercent as ViewStyle['flexBasis'],
+                  width: basisPercent,
+                  flexBasis: basisPercent,
                 };
 
           return (

package/src/primitives/icon/Icon.tsx

@@ -1,40 +1,27 @@
-import React from 'react';
 import { type StyleProp, type TextStyle } from 'react-native';
 
 import { resolveToken } from '../../theme/resolveToken';
 import { useTheme } from '../../theme/ThemeContext';
 import type { SurfaceTheme } from '../../theme/types';
-import { resolveExpoIconComponent } from './resolveExpoIconComponent';
+import { type IconSource, PortableIcon } from './PortableIcon';
 
-export type IconProvider = string;
+export type { IconProvider, IconSource, IconVariant } from './PortableIcon';
 
-export interface IconProps {
-  name: string;
-  provider?: IconProvider;
+interface IconPresentationProps {
   size?: keyof SurfaceTheme['spacing'] | number;
   color?: keyof SurfaceTheme['colors'] | string;
   style?: StyleProp<TextStyle>;
   testID?: string;
 }
 
-export function Icon({
-  name,
-  provider = 'Ionicons',
-  size = 'm',
-  color = 'text',
-  style,
-  testID,
-}: IconProps) {
+export type IconProps = IconSource & IconPresentationProps;
+
+export function Icon(props: IconProps) {
   const { theme } = useTheme();
-  const IconComponent = resolveExpoIconComponent(provider);
+  const size = props.size ?? 'm';
+  const color = props.color ?? 'text';
   const resolvedSize = typeof size === 'number' ? size : resolveToken(theme.spacing, size);
   const resolvedColor = resolveToken(theme.colors, color);
 
-  return React.createElement(IconComponent, {
-    color: resolvedColor,
-    name,
-    size: resolvedSize,
-    style,
-    testID,
-  });
+  return <PortableIcon {...props} color={resolvedColor} size={resolvedSize} />;
 }