@ankhorage/zora 7.0.0 → 8.0.0

package/src/features/uploader/adapters/inbound/Uploader.tsx

@@ -1,15 +1,15 @@
 import React from 'react';
 
-import { Button } from '../../../../components/button';
-import { Icon } from '../../../../components/icon';
-import { Image } from '../../../../components/image';
 import { Modal } from '../../../../components/modal';
 import { Progress } from '../../../../components/progress';
-import { Text } from '../../../../components/text';
-import { Box, Stack } from '../../../../foundation';
 import { FormField } from '../../../../patterns/form-field';
 import { withZoraThemeScope } from '../../../../theme/withZoraThemeScope';
 import type { UploadAsset, UploaderProps, UploadType } from '../../../../types/upload';
+import { Button } from '../../../button/public';
+import { Icon } from '../../../icon/public';
+import { Image } from '../../../image/public';
+import { Box, Stack } from '../../../layout/public';
+import { Text } from '../../../typography/public';
 import { validateUploadAsset } from '../../application/use-cases/validateUploadAsset';
 import { createUploadPicker } from '../../composition/createUploadPicker';
 
@@ -21,9 +21,15 @@ function UploaderInner({
   themeId: _themeId,
   mode: _mode,
   testID,
-  value,
+  value = null,
   onChange,
-  label,
+  onValueChange,
+  onUploadRequest,
+  onRemoveRequest,
+  onValidationError,
+  uploadState = 'idle',
+  uploadProgress,
+  label = 'File',
   description,
   helperText,
   errorText,
@@ -42,14 +48,23 @@ function UploaderInner({
   const passive = interactionPolicy === 'passive';
   const picker = React.useMemo(() => createUploadPicker(), []);
   const [internalError, setInternalError] = React.useState<string | undefined>();
-  const [uploading, setUploading] = React.useState(false);
-  const [removing, setRemoving] = React.useState(false);
+  const [internalUploading, setUploading] = React.useState(false);
+  const [internalRemoving, setRemoving] = React.useState(false);
+  const uploading = internalUploading || uploadState === 'uploading';
+  const removing = internalRemoving || uploadState === 'removing';
   const [progress, setProgress] = React.useState<number | null>(null);
   const [previewOpen, setPreviewOpen] = React.useState(false);
   const mountedRef = React.useRef<boolean | null>(null);
   const resolvedAccept = resolveUploadAccept(type, accept);
   const actionsDisabled = disabled || readOnly;
   const effectiveError = errorText ?? internalError;
+  const notifyValue = React.useCallback(
+    (next: UploadAsset | null) => {
+      onChange?.(next);
+      onValueChange?.(next);
+    },
+    [onChange, onValueChange],
+  );
 
   React.useEffect(() => {
     mountedRef.current = true;
@@ -93,10 +108,12 @@ function UploaderInner({
       });
       if (validationError) {
         setInternalError(validationError);
+        onValidationError?.({ message: validationError });
         return;
       }
 
-      onChange(picked);
+      notifyValue(picked);
+      onUploadRequest?.({ asset: picked });
       if (!onUpload) {
         return;
       }
@@ -110,7 +127,7 @@ function UploaderInner({
           return;
         }
 
-        onChange(uploaded);
+        notifyValue(uploaded);
         setUploading(false);
         setProgress(null);
       } catch (error) {
@@ -131,7 +148,9 @@ function UploaderInner({
     actionsDisabled,
     isMounted,
     maxSizeBytes,
-    onChange,
+    notifyValue,
+    onUploadRequest,
+    onValidationError,
     onUpload,
     passive,
     picker,
@@ -149,8 +168,12 @@ function UploaderInner({
     }
 
     setInternalError(undefined);
+    if (onRemoveRequest) {
+      onRemoveRequest({ asset: value });
+      return;
+    }
     if (!onRemove) {
-      onChange(null);
+      notifyValue(null);
       return;
     }
 
@@ -158,7 +181,7 @@ function UploaderInner({
     try {
       await onRemove(value);
       if (isMounted()) {
-        onChange(null);
+        notifyValue(null);
         setRemoving(false);
       }
     } catch (error) {
@@ -167,7 +190,17 @@ function UploaderInner({
         setRemoving(false);
       }
     }
-  }, [actionsDisabled, isMounted, onChange, onRemove, passive, removing, uploading, value]);
+  }, [
+    actionsDisabled,
+    isMounted,
+    notifyValue,
+    onRemove,
+    onRemoveRequest,
+    passive,
+    removing,
+    uploading,
+    value,
+  ]);
 
   const canPreviewImage = type === 'image' && resolveRenderableAssetUrl(value) !== null;
 
@@ -208,7 +241,9 @@ function UploaderInner({
               <Text emphasis="muted" variant="caption">
                 Uploading…
               </Text>
-              {progress !== null ? <Progress max={1} value={progress} /> : null}
+              {uploadProgress !== undefined || progress !== null ? (
+                <Progress max={1} value={clampProgress(uploadProgress ?? progress) ?? 0} />
+              ) : null}
             </Stack>
           ) : null}
 

package/src/features/uploader/uploaderMeta.ts

@@ -0,0 +1,68 @@
+import type { ZoraComponentMeta } from '../../metadata/types';
+
+export const uploaderMeta = {
+  name: 'Uploader',
+  category: 'pattern',
+  directManifestNode: true,
+  allowedChildren: [],
+  description:
+    'Selects files with Expo pickers; bind upload and removal requests to application actions.',
+  bindings: {
+    props: {
+      value: {
+        value: {
+          type: 'object',
+          fields: [
+            { path: 'kind', type: 'string' },
+            { path: 'uri', type: 'string' },
+            { path: 'url', type: 'string' },
+            { path: 'fileName', type: 'string' },
+            { path: 'contentType', type: 'string' },
+            { path: 'sizeBytes', type: 'number' },
+            { path: 'bucket', type: 'string' },
+            { path: 'path', type: 'string' },
+            { path: 'publicUrl', type: 'string' },
+          ],
+        },
+        acceptsFallback: true,
+      },
+    },
+  },
+  events: {
+    valueChange: {
+      label: 'Value change',
+      eventType: 'uploader.valueChange',
+      payloadFields: [{ path: 'value', type: 'object' }],
+    },
+    uploadRequest: {
+      label: 'Upload request',
+      eventType: 'uploader.uploadRequest',
+      payloadFields: [{ path: 'asset', type: 'object' }],
+    },
+    removeRequest: {
+      label: 'Remove request',
+      eventType: 'uploader.removeRequest',
+      payloadFields: [{ path: 'asset', type: 'object' }],
+    },
+    validationError: {
+      label: 'Validation error',
+      eventType: 'uploader.validationError',
+      payloadFields: [{ path: 'message', type: 'string' }],
+    },
+  },
+  props: {
+    type: { type: 'enum', category: 'Selection', enum: ['image', 'video', 'document', 'file'] },
+    accept: { type: 'string', category: 'Validation' },
+    maxSizeBytes: { type: 'number', category: 'Validation' },
+    required: { type: 'boolean', category: 'Validation' },
+    disabled: { type: 'boolean', category: 'State' },
+    readOnly: { type: 'boolean', category: 'State' },
+    label: { type: 'string', category: 'Content' },
+    description: { type: 'string', category: 'Content' },
+    helperText: { type: 'string', category: 'Content' },
+    errorText: { type: 'string', category: 'State' },
+    uploadState: { type: 'enum', category: 'State', enum: ['idle', 'uploading', 'removing'] },
+    uploadProgress: { type: 'number', category: 'State' },
+    aspectRatio: { type: 'number', category: 'Layout' },
+  },
+} as const satisfies ZoraComponentMeta;

package/src/foundation/index.test.ts

@@ -9,16 +9,11 @@ const rootIndex = readFileSync(join(import.meta.dir, '..', 'index.ts'), 'utf8');
 describe('foundation exports', () => {
   it('defines a narrow ZORA foundation export layer', () => {
     expect(foundationIndex).toMatch(/export type \{/);
-    expect(foundationIndex).toMatch(/BoxProps/);
-    expect(foundationIndex).toMatch(/ContainerProps/);
-    expect(foundationIndex).toMatch(/GridProps/);
-    expect(foundationIndex).toMatch(/StackProps/);
-    expect(foundationIndex).toMatch(/SurfaceProps/);
-    expect(foundationIndex).toMatch(/Box/);
-    expect(foundationIndex).toMatch(/Container/);
-    expect(foundationIndex).toMatch(/Grid/);
-    expect(foundationIndex).toMatch(/Stack/);
-    expect(foundationIndex).toMatch(/Surface/);
+    expect(foundationIndex).toMatch(/CenterProps/);
+    expect(foundationIndex).toMatch(/InlineProps/);
+    expect(foundationIndex).toMatch(/ShowProps/);
+    expect(foundationIndex).toMatch(/SpacerProps/);
+    expect(foundationIndex).not.toMatch(/Box|Container|Grid|Stack|Surface/);
     expect(foundationIndex).not.toMatch(/@ankhorage\/surface/);
     expect(foundationIndex).not.toMatch(/Heading/);
     expect(foundationIndex).not.toMatch(/Text/);

package/src/foundation/index.ts

@@ -1,20 +1,8 @@
-export type { BoxProps } from './Box';
-export { Box } from './Box';
 export type { CenterProps } from './Center';
 export { Center } from './Center';
-export type { ContainerProps } from './Container';
-export { Container } from './Container';
-export type { DividerProps } from './Divider';
-export { Divider } from './Divider';
-export type { GridProps } from './Grid';
-export { Grid } from './Grid';
 export type { InlineProps } from './Inline';
 export { Inline } from './Inline';
 export type { ShowProps } from './Show';
 export { Show } from './Show';
 export type { SpacerProps } from './Spacer';
 export { Spacer } from './Spacer';
-export type { StackProps } from './Stack';
-export { Stack } from './Stack';
-export type { SurfaceProps, SurfaceVariant } from './Surface';
-export { Surface } from './Surface';

package/src/foundation/meta.ts

@@ -1,15 +1,6 @@
 import type { ZoraComponentMetaRegistry } from '../metadata';
-import { CONTAINER_ALLOWED_CHILDREN } from '../metadata/allowedChildren';
 
 export const foundationMetas = {
-  Box: {
-    name: 'Box',
-    category: 'foundation',
-    directManifestNode: true,
-    allowedChildren: [...CONTAINER_ALLOWED_CHILDREN],
-    blueprint: { label: 'Box' },
-    props: {},
-  },
   Center: {
     name: 'Center',
     category: 'foundation',
@@ -18,30 +9,6 @@ export const foundationMetas = {
     note: 'Layout helper component; not represented as a manifest node in v1.',
     props: {},
   },
-  Container: {
-    name: 'Container',
-    category: 'foundation',
-    directManifestNode: true,
-    allowedChildren: [...CONTAINER_ALLOWED_CHILDREN],
-    blueprint: { label: 'Container' },
-    props: {},
-  },
-  Divider: {
-    name: 'Divider',
-    category: 'foundation',
-    directManifestNode: true,
-    allowedChildren: [],
-    blueprint: { label: 'Divider' },
-    props: {},
-  },
-  Grid: {
-    name: 'Grid',
-    category: 'foundation',
-    directManifestNode: true,
-    allowedChildren: [...CONTAINER_ALLOWED_CHILDREN],
-    blueprint: { label: 'Grid' },
-    props: {},
-  },
   Inline: {
     name: 'Inline',
     category: 'foundation',
@@ -66,20 +33,4 @@ export const foundationMetas = {
     note: 'Spacing utility component; not represented as a manifest node in v1.',
     props: {},
   },
-  Stack: {
-    name: 'Stack',
-    category: 'foundation',
-    directManifestNode: true,
-    allowedChildren: [...CONTAINER_ALLOWED_CHILDREN],
-    blueprint: { label: 'Stack' },
-    props: {},
-  },
-  Surface: {
-    name: 'Surface',
-    category: 'foundation',
-    directManifestNode: false,
-    allowedChildren: [],
-    note: 'Low-level surface wrapper; not represented as a manifest node in v1.',
-    props: {},
-  },
 } as const satisfies ZoraComponentMetaRegistry;

package/src/index.ts

@@ -1,40 +1,9 @@
 export type { AppBarMode, AppBarOverflowAction, AppBarProps } from './components/app-bar';
 export { AppBar } from './components/app-bar';
-export type { AvatarProps, AvatarShape, AvatarSize } from './components/avatar';
-export { Avatar, resolveAvatarInitials } from './components/avatar';
-export type { AvatarGroupItem, AvatarGroupProps } from './components/avatar-group';
-export { AvatarGroup } from './components/avatar-group';
-export type { BadgeProps } from './components/badge';
-export { Badge } from './components/badge';
 export type { BreadcrumbItem, BreadcrumbsProps } from './components/breadcrumbs';
 export { Breadcrumbs } from './components/breadcrumbs';
-export type { ButtonProps } from './components/button';
-export { Button } from './components/button';
-export type {
-  ButtonGroupAlign,
-  ButtonGroupOrientation,
-  ButtonGroupProps,
-} from './components/button-group';
-export { ButtonGroup } from './components/button-group';
-export type { CardProps } from './components/card';
-export { Card } from './components/card';
 export type { CheckboxGroupOption, CheckboxGroupProps, CheckboxProps } from './components/checkbox';
 export { Checkbox, CheckboxGroup } from './components/checkbox';
-export type { ChipProps } from './components/chip';
-export { Chip } from './components/chip';
-export type { ChipGroupItem, ChipGroupProps } from './components/chip-group';
-export { ChipGroup } from './components/chip-group';
-export type {
-  DataTableCellContext,
-  DataTableColumn,
-  DataTableColumnAlign,
-  DataTableDensity,
-  DataTableProps,
-  DataTableRowAction,
-  DataTableSortDirection,
-  DataTableSortState,
-} from './components/data-table';
-export { DataTable } from './components/data-table';
 export type { DatePickerProps, DatePickerValue } from './components/date-picker';
 export { DatePicker } from './components/date-picker';
 export type {
@@ -75,30 +44,10 @@ export type {
   GradientRendererProviderProps,
 } from './components/gradient';
 export { Gradient, GradientRendererProvider } from './components/gradient';
-export type {
-  HeadingAlign,
-  HeadingColor,
-  HeadingEmphasis,
-  HeadingLevel,
-  HeadingProps,
-  HeadingSize,
-  HeadingWeight,
-} from './components/heading';
-export { Heading } from './components/heading';
-export type { IconProps } from './components/icon';
-export { Icon } from './components/icon';
-export type { IconButtonProps } from './components/icon-button';
-export { IconButton } from './components/icon-button';
-export type { ImageFit, ImageProps, SurfaceImageSource } from './components/image';
-export { Image } from './components/image';
 export type { InputProps, InputTrailingAction } from './components/input';
 export { Input } from './components/input';
-export type { MediaCardImageProps, MediaCardProps } from './components/media-card';
-export { MediaCard } from './components/media-card';
 export type { DropdownMenuProps, MenuAction, MenuActionIntent, MenuProps } from './components/menu';
 export { DropdownMenu, Menu } from './components/menu';
-export type { MetricCardProps } from './components/metric-card';
-export { MetricCard } from './components/metric-card';
 export type { ModalProps } from './components/modal';
 export { Modal } from './components/modal';
 export type { PaginationProps } from './components/pagination';
@@ -123,19 +72,8 @@ export type {
   SkeletonTextProps,
 } from './components/skeleton';
 export { Skeleton, SkeletonCard, SkeletonList, SkeletonText } from './components/skeleton';
-export type { SplashScreenLogoShape, SplashScreenProps } from './components/splash-screen';
-export { SplashScreen } from './components/splash-screen';
 export type { TabItem, TabsProps, TabsVariant } from './components/tabs';
 export { Tabs } from './components/tabs';
-export type {
-  TextAlign,
-  TextColor,
-  TextEmphasis,
-  TextProps,
-  TextVariant,
-  TextWeight,
-} from './components/text';
-export { Text } from './components/text';
 export type { TextareaProps } from './components/textarea';
 export { Textarea } from './components/textarea';
 export type { TimePickerProps, TimePickerValue } from './components/time-picker';
@@ -146,6 +84,106 @@ export type { ToolbarActionProps, ToolbarPosition, ToolbarProps } from './compon
 export { Toolbar, ToolbarAction } from './components/toolbar';
 export { ZORA_CORE_PLUGIN } from './corePlugin';
 export { ZORA_CORE_PLUGIN_METADATA } from './corePluginMetadata';
+export type { AvatarProps, AvatarShape, AvatarSize } from './features/avatar/public';
+export type { AvatarGroupItem, AvatarGroupProps } from './features/avatar/public';
+export { Avatar, resolveAvatarInitials } from './features/avatar/public';
+export { AvatarGroup } from './features/avatar/public';
+export type { BadgeProps } from './features/badge/public';
+export { Badge } from './features/badge/public';
+export type { BottomSheetProps } from './features/bottom-sheet/public';
+export { BottomSheet } from './features/bottom-sheet/public';
+export type { ButtonProps } from './features/button/public';
+export type {
+  ButtonGroupAlign,
+  ButtonGroupOrientation,
+  ButtonGroupProps,
+} from './features/button/public';
+export type { IconButtonProps } from './features/button/public';
+export { Button } from './features/button/public';
+export { ButtonGroup } from './features/button/public';
+export { IconButton } from './features/button/public';
+export type { CardProps } from './features/card/public';
+export type { MediaCardImageProps, MediaCardProps } from './features/card/public';
+export type { MetricCardProps } from './features/card/public';
+export type {
+  PostAction,
+  PostAuthor,
+  PostAuthorAvatar,
+  PostCardMedia,
+  PostCardProps,
+} from './features/card/public';
+export type { ProductCardProps } from './features/card/public';
+export { Card } from './features/card/public';
+export { MediaCard } from './features/card/public';
+export { MetricCard } from './features/card/public';
+export { PostCard } from './features/card/public';
+export { ProductCard } from './features/card/public';
+export type { ChipProps } from './features/chip/public';
+export type { ChipGroupItem, ChipGroupProps } from './features/chip/public';
+export { Chip } from './features/chip/public';
+export { ChipGroup } from './features/chip/public';
+export type {
+  DataTableCellContext,
+  DataTableColumn,
+  DataTableColumnAlign,
+  DataTableDensity,
+  DataTableProps,
+  DataTableRowAction,
+  DataTableSortDirection,
+  DataTableSortState,
+} from './features/data-table/public';
+export { DataTable } from './features/data-table/public';
+export type { IconProps } from './features/icon/public';
+export { Icon } from './features/icon/public';
+export type { ImageFit, ImageProps, SurfaceImageSource } from './features/image/public';
+export { Image } from './features/image/public';
+export type {
+  BoxProps,
+  ContainerProps,
+  DividerProps,
+  GridProps,
+  StackProps,
+} from './features/layout/public';
+export type {
+  ContentRailControlPressEvent,
+  ContentRailDirection,
+  ContentRailItemSize,
+  ContentRailMotion,
+  ContentRailProps,
+  ContentRailSpacing,
+  ContentRailVisibleRangeChangeEvent,
+} from './features/layout/public';
+export { Box, Container, Divider, Grid, Stack } from './features/layout/public';
+export { ContentRail } from './features/layout/public';
+export type {
+  ManifestListProps,
+  ManifestListSection,
+  ManifestSectionListProps,
+} from './features/list/public';
+export { FlatList, SectionList } from './features/list/public';
+export type { SplashScreenLogoShape, SplashScreenProps } from './features/splash-screen/public';
+export { SplashScreen } from './features/splash-screen/public';
+export type { SurfaceProps, SurfaceVariant } from './features/surface/public';
+export { Surface } from './features/surface/public';
+export type {
+  HeadingAlign,
+  HeadingColor,
+  HeadingEmphasis,
+  HeadingLevel,
+  HeadingProps,
+  HeadingSize,
+  HeadingWeight,
+} from './features/typography/public';
+export type {
+  TextAlign,
+  TextColor,
+  TextEmphasis,
+  TextProps,
+  TextVariant,
+  TextWeight,
+} from './features/typography/public';
+export { Heading } from './features/typography/public';
+export { Text } from './features/typography/public';
 export type {
   UploadAsset,
   UploadAssetBase,
@@ -155,31 +193,8 @@ export type {
   ValidateUploadAssetInput,
 } from './features/uploader/public';
 export { Uploader, validateUploadAsset } from './features/uploader/public';
-export type {
-  BoxProps,
-  CenterProps,
-  ContainerProps,
-  DividerProps,
-  GridProps,
-  InlineProps,
-  ShowProps,
-  SpacerProps,
-  StackProps,
-  SurfaceProps,
-  SurfaceVariant,
-} from './foundation';
-export {
-  Box,
-  Center,
-  Container,
-  Divider,
-  Grid,
-  Inline,
-  Show,
-  Spacer,
-  Stack,
-  Surface,
-} from './foundation';
+export type { CenterProps, InlineProps, ShowProps, SpacerProps } from './foundation';
+export { Center, Inline, Show, Spacer } from './foundation';
 export type {
   ZoraColor,
   ZoraEmphasis,
@@ -275,16 +290,6 @@ export type {
 export { CollectionEditor } from './patterns/collection-editor';
 export type { ConfirmDialogProps } from './patterns/confirm-dialog';
 export { ConfirmDialog } from './patterns/confirm-dialog';
-export type {
-  ContentRailControlPressEvent,
-  ContentRailDirection,
-  ContentRailItemSize,
-  ContentRailMotion,
-  ContentRailProps,
-  ContentRailSpacing,
-  ContentRailVisibleRangeChangeEvent,
-} from './patterns/content-rail';
-export { ContentRail } from './patterns/content-rail';
 export type { DisclosureSectionProps } from './patterns/disclosure-section';
 export { DisclosureSection } from './patterns/disclosure-section';
 export type { EmptyStateAction, EmptyStateProps } from './patterns/empty-state';
@@ -317,16 +322,6 @@ export type { NoticeProps } from './patterns/notice';
 export { Notice } from './patterns/notice';
 export type { PanelProps } from './patterns/panel';
 export { Panel } from './patterns/panel';
-export type {
-  PostAction,
-  PostAuthor,
-  PostAuthorAvatar,
-  PostCardMedia,
-  PostCardProps,
-} from './patterns/post-card';
-export { PostCard } from './patterns/post-card';
-export type { ProductCardProps } from './patterns/product-card';
-export { ProductCard } from './patterns/product-card';
 export type {
   ReaderColorScheme,
   ReaderDocumentFormat,

package/src/interactionPolicy.test.ts

@@ -41,7 +41,7 @@ describe('InteractionPolicy declaration', () => {
       readComponent('breadcrumbs', 'types.ts'),
       readPattern('empty-state', 'types.ts'),
       readPattern('hero', 'types.ts'),
-      readPattern('product-card', 'types.ts'),
+      readSource('types/product-card.ts'),
       readPattern('reader', 'types.ts'),
       readPattern('scanner', 'types.ts'),
       readComponent('select', 'types.ts'),
@@ -66,7 +66,7 @@ describe('InteractionPolicy declaration', () => {
 
 describe('Surface wrapper propagation', () => {
   test('foundation Surface forwards interactionPolicy to Surface', () => {
-    const source = readSource('foundation/Surface.tsx');
+    const source = readSource('features/surface/adapters/inbound/Surface.tsx');
 
     expect(source).toContain('interactionPolicy: _interactionPolicy,');
     expect(source).toContain('<SurfaceSurface');
@@ -135,7 +135,7 @@ describe('Hero', () => {
 
 describe('ProductCard', () => {
   test('types extend ZoraBaseProps instead of duplicating InteractionPolicy', () => {
-    const source = readPattern('product-card', 'types.ts');
+    const source = readSource('types/product-card.ts');
 
     expect(source).not.toMatch(
       /import type \{\s*InteractionPolicy\s*\} from '@ankhorage\/surface';/,
@@ -145,7 +145,7 @@ describe('ProductCard', () => {
   });
 
   test('forwards interactionPolicy to internal Buttons', () => {
-    const source = readPattern('product-card', 'ProductCard.tsx');
+    const source = readSource('features/card/adapters/inbound/ProductCard.tsx');
 
     expect(source).toMatch(
       /<Button[\s\S]*?interactionPolicy=\{interactionPolicy\}[\s\S]*?onPress=\{onPrimaryAction/,
@@ -187,14 +187,14 @@ describe('ReaderSurface', () => {
 
 describe('ContentRail', () => {
   test('types extend ZoraBaseProps instead of duplicating InteractionPolicy', () => {
-    const source = readPattern('content-rail', 'types.ts');
+    const source = readSource('types/content-rail.ts');
 
     expect(source).toMatch(/export interface ContentRailProps extends ZoraBaseProps/);
     expect(source).not.toMatch(/interactionPolicy\?: InteractionPolicy;/);
   });
 
   test('suppresses scrolling and forwards interactionPolicy to owned controls', () => {
-    const source = readPattern('content-rail', 'ContentRail.tsx');
+    const source = readSource('features/layout/adapters/inbound/ContentRail.tsx');
 
     expect(source).not.toMatch(/interactionPolicy:\s*_interactionPolicy/);
     expect(source).toContain('scrollEnabled={!passive}');

package/src/layout/app-shell/AppShell.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import { StyleSheet, View } from 'react-native';
 
-import { Box } from '../../foundation';
+import { Box } from '../../features/layout/public';
 import { withZoraThemeScope } from '../../theme/withZoraThemeScope';
 import type { AppShellProps } from './types';
 

package/src/layout/screen/Screen.tsx

@@ -1,7 +1,7 @@
 import { ScrollArea } from '@ankhorage/surface';
 import React from 'react';
 
-import { Box, Container, Stack } from '../../foundation';
+import { Box, Container, Stack } from '../../features/layout/public';
 import { resolvePageMaxWidth } from '../../internal/recipes';
 import { withZoraThemeScope } from '../../theme/withZoraThemeScope';
 import type { ScreenProps } from './types';

package/src/layout/screen-section/ScreenSection.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 
-import { Stack } from '../../foundation';
+import { Stack } from '../../features/layout/public';
 import { SectionHeader } from '../../patterns/section-header';
 import { withZoraThemeScope } from '../../theme/withZoraThemeScope';
 import type { ScreenSectionProps } from './types';