@ankhorage/zora 18.0.0 → 19.0.0

package/dist/{patterns/tree-view/types.d.ts → types/tree-view.d.ts}

@@ -1,6 +1,6 @@
 import type { ButtonIconSpec } from '@ankhorage/surface';
 import type { ReactNode } from 'react';
-import type { ZoraBaseProps } from '../../theme/ZoraBaseProps';
+import type { ZoraBaseProps } from '../theme/ZoraBaseProps';
 export interface TreeItemNode<TId extends string = string> {
     id: TId;
     label: ReactNode;
@@ -26,4 +26,4 @@ export interface TreeViewProps<TId extends string = string> extends ZoraBaseProp
     onExpandedChange?: (ids: readonly TId[]) => void;
     renderItem?: (props: TreeItemRenderProps<TId>) => ReactNode;
 }
-//# sourceMappingURL=types.d.ts.map
+//# sourceMappingURL=tree-view.d.ts.map

package/dist/types/tree-view.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tree-view.d.ts","sourceRoot":"","sources":["../../src/types/tree-view.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACzD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAEvC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAE5D,MAAM,WAAW,YAAY,CAAC,GAAG,SAAS,MAAM,GAAG,MAAM;IACvD,EAAE,EAAE,GAAG,CAAC;IACR,KAAK,EAAE,SAAS,CAAC;IACjB,IAAI,CAAC,EAAE,cAAc,CAAC;IACtB,QAAQ,CAAC,EAAE,SAAS,YAAY,CAAC,GAAG,CAAC,EAAE,CAAC;IACxC,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,IAAI,CAAC,EAAE,SAAS,CAAC;IACjB,OAAO,CAAC,EAAE,SAAS,CAAC;CACrB;AAED,MAAM,WAAW,mBAAmB,CAAC,GAAG,SAAS,MAAM,GAAG,MAAM;IAC9D,IAAI,EAAE,YAAY,CAAC,GAAG,CAAC,CAAC;IACxB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,OAAO,CAAC;IAClB,QAAQ,EAAE,OAAO,CAAC;IAClB,WAAW,EAAE,OAAO,CAAC;CACtB;AAED,MAAM,WAAW,aAAa,CAAC,GAAG,SAAS,MAAM,GAAG,MAAM,CAAE,SAAQ,aAAa;IAC/E,KAAK,EAAE,SAAS,YAAY,CAAC,GAAG,CAAC,EAAE,CAAC;IACpC,UAAU,CAAC,EAAE,GAAG,CAAC;IACjB,WAAW,CAAC,EAAE,SAAS,GAAG,EAAE,CAAC;IAC7B,kBAAkB,CAAC,EAAE,SAAS,GAAG,EAAE,CAAC;IACpC,QAAQ,CAAC,EAAE,CAAC,EAAE,EAAE,GAAG,KAAK,IAAI,CAAC;IAC7B,gBAAgB,CAAC,EAAE,CAAC,GAAG,EAAE,SAAS,GAAG,EAAE,KAAK,IAAI,CAAC;IACjD,UAAU,CAAC,EAAE,CAAC,KAAK,EAAE,mBAAmB,CAAC,GAAG,CAAC,KAAK,SAAS,CAAC;CAC7D"}

package/dist/types/tree-view.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=tree-view.js.map

package/dist/types/tree-view.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"tree-view.js","sourceRoot":"","sources":["../../src/types/tree-view.ts"],"names":[],"mappings":"","sourcesContent":["import type { ButtonIconSpec } from '@ankhorage/surface';\nimport type { ReactNode } from 'react';\n\nimport type { ZoraBaseProps } from '../theme/ZoraBaseProps';\n\nexport interface TreeItemNode<TId extends string = string> {\n  id: TId;\n  label: ReactNode;\n  icon?: ButtonIconSpec;\n  children?: readonly TreeItemNode<TId>[];\n  disabled?: boolean;\n  meta?: ReactNode;\n  actions?: ReactNode;\n}\n\nexport interface TreeItemRenderProps<TId extends string = string> {\n  node: TreeItemNode<TId>;\n  depth: number;\n  selected: boolean;\n  expanded: boolean;\n  hasChildren: boolean;\n}\n\nexport interface TreeViewProps<TId extends string = string> extends ZoraBaseProps {\n  nodes: readonly TreeItemNode<TId>[];\n  selectedId?: TId;\n  expandedIds?: readonly TId[];\n  defaultExpandedIds?: readonly TId[];\n  onSelect?: (id: TId) => void;\n  onExpandedChange?: (ids: readonly TId[]) => void;\n  renderItem?: (props: TreeItemRenderProps<TId>) => ReactNode;\n}\n"]}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ankhorage/zora",
   "type": "module",
-  "version": "18.0.0",
+  "version": "19.0.0",
   "description": "Opinionated React Native and React Native Web UI kit built on @ankhorage/surface.",
   "homepage": "https://github.com/ankhorage/zora#readme",
   "bugs": {
@@ -41,7 +41,7 @@
   "dependencies": {
     "@ankhorage/color-theory": "^0.3.0",
     "@ankhorage/contracts": "^12.0.1",
-    "@ankhorage/surface": "^7.0.0",
+    "@ankhorage/surface": "^8.0.0",
     "@ankhorage/utility": "^0.8.0",
     "expo-document-picker": "~57.0.1",
     "expo-image-picker": "~57.0.16"

package/src/audit.test.ts

@@ -120,16 +120,16 @@ describe('Plan 5 audit — no showcase bridge or direct Surface imports in examp
 
 describe('Plan 5 audit — product-facing src imports ZORA layout primitives, not Surface directly', () => {
   /**
-   * Features and patterns that compose ZORA layout primitives should import them from ZORA,
+   * Product-facing features that compose ZORA layout primitives should import them from ZORA,
    * not directly from @ankhorage/surface. The feature-owned layout adapters are the deliberate
    * Surface foundation boundary.
    */
   const SURFACE_FOUNDATION_BOUNDARY = join(SRC_ROOT, 'features', 'layout');
-  const PRODUCT_FACING_DIRS = [join(SRC_ROOT, 'features'), join(SRC_ROOT, 'patterns')];
+  const PRODUCT_FACING_DIRS = [join(SRC_ROOT, 'features')];
   const FOUNDATION_PRIMITIVES_PATTERN =
     /import \{[^}]*\b(View|ScrollView|Grid|Divider)\b[^}]*\} from '@ankhorage\/surface'/;
 
-  test('feature, layout, and pattern files do not import foundation primitives directly from @ankhorage/surface', () => {
+  test('product-facing feature files do not import foundation primitives directly from @ankhorage/surface', () => {
     for (const dir of PRODUCT_FACING_DIRS) {
       for (const filePath of listFiles(dir)) {
         if (isPathWithin(filePath, SURFACE_FOUNDATION_BOUNDARY)) continue;

package/src/constants.ts

@@ -28,7 +28,8 @@ export const FEATURE_MANIFEST_ELEMENTS = {
   image: ['Image'],
   'keyboard-avoiding-view': ['KeyboardAvoidingView'],
   'content-rail': ['ContentRail'],
-  layout: ['Divider', 'Grid', 'Screen', 'ScreenSection', 'ScrollView', 'View'],
+  layout: ['Divider', 'Grid', 'Screen', 'ScrollView', 'View'],
+  section: ['ScreenSection', 'SectionHeader'],
   list: ['FlatList', 'SectionList'],
   pagination: ['Pagination'],
   rating: ['Rating'],

package/src/corePluginMetadata.ts

@@ -6,17 +6,13 @@ import type { ZoraComponentMetaRegistry } from './metadata/types';
 import type { ZoraPluginMetadata } from './pluginComposition';
 
 const CORE_EXTENSION_HOSTS = [
-  'Box',
   'Card',
-  'Container',
   'Grid',
   'MessageBubble',
-  'Notice',
-  'Panel',
   'PostCard',
   'Screen',
   'ScreenSection',
-  'Stack',
+  'View',
 ] as const;
 
 export const ZORA_CORE_PLUGIN_METADATA: ZoraPluginMetadata = {

package/src/featureManifest.test.ts

@@ -21,8 +21,9 @@ test('every selected feature element is directly authorable through its canonica
   }
 });
 
-test('feature ownership has no remaining legacy components directory', () => {
+test('feature ownership has no remaining legacy ownership roots', () => {
   expect(existsSync('src/components')).toBe(false);
+  expect(existsSync('src/patterns')).toBe(false);
 });
 
 test('form composition has one canonical feature owner', () => {

package/src/features/bottom-sheet/public.test.ts

@@ -10,7 +10,7 @@ describe('ZORA BottomSheet public contract', () => {
     const source = await Bun.file('src/features/bottom-sheet/public.ts').text();
 
     expect(packageJson.exports['./bottom-sheet']).toBeDefined();
-    expect(packageJson.dependencies['@ankhorage/surface']).toMatch(/^\^7\./u);
+    expect(packageJson.dependencies['@ankhorage/surface']).toMatch(/^\^\d+\.\d+\.\d+$/u);
     expect(source).toContain("from '@ankhorage/surface/bottom-sheet'");
     for (const name of [
       'BottomSheetFlatList',

package/src/{patterns/chat-list-item → features/chat/adapters/inbound}/ChatListItem.test.tsx

@@ -1,6 +1,6 @@
 import { describe, expect, test } from 'bun:test';
 
-import { ZORA_COMPONENT_META } from '../../metadata';
+import { ZORA_COMPONENT_META } from '../../../../metadata';
 
 describe('ChatListItem', () => {
   test('is registered as a public ZORA pattern', () => {

package/src/{patterns/chat-list-item → features/chat/adapters/inbound}/ChatListItem.tsx

@@ -1,13 +1,13 @@
-import { ButtonBase } from '@ankhorage/surface';
+import { Pressable } from '@ankhorage/surface';
 import React from 'react';
 
-import { Avatar } from '../../features/avatar/public';
-import { Badge } from '../../features/badge/public';
-import { View } from '../../features/layout/public';
-import { Text } from '../../features/typography/public';
-import { useZoraTheme } from '../../theme/useZoraTheme';
-import { withZoraThemeScope } from '../../theme/withZoraThemeScope';
-import type { ChatListAvatar, ChatListItemProps } from './types';
+import { useZoraTheme } from '../../../../theme/useZoraTheme';
+import { withZoraThemeScope } from '../../../../theme/withZoraThemeScope';
+import type { ChatListAvatar, ChatListItemProps } from '../../../../types/chat';
+import { Avatar } from '../../../avatar/public';
+import { Badge } from '../../../badge/public';
+import { View } from '../../../layout/public';
+import { Text } from '../../../typography/public';
 
 function resolveAvatarName({
   avatar,
@@ -199,7 +199,7 @@ function ChatListItemInner({
   }
 
   return (
-    <ButtonBase
+    <Pressable
       accessibilityLabel={accessibilityLabel}
       accessibilityRole="button"
       accessibilityState={{ disabled, selected }}
@@ -215,7 +215,7 @@ function ChatListItemInner({
           hovered: state.hovered,
         })
       }
-    </ButtonBase>
+    </Pressable>
   );
 }
 

package/src/{patterns/message-bubble → features/chat/adapters/inbound}/MessageBubble.tsx

@@ -1,17 +1,17 @@
-import { ButtonBase } from '@ankhorage/surface';
+import { Pressable } from '@ankhorage/surface';
 import React from 'react';
 
-import { Avatar } from '../../features/avatar/public';
-import { View } from '../../features/layout/public';
-import { Text } from '../../features/typography/public';
-import { useZoraTheme } from '../../theme/useZoraTheme';
-import { withZoraThemeScope } from '../../theme/withZoraThemeScope';
+import { useZoraTheme } from '../../../../theme/useZoraTheme';
+import { withZoraThemeScope } from '../../../../theme/withZoraThemeScope';
 import type {
   MessageBubbleAvatar,
   MessageBubbleDirection,
   MessageBubbleProps,
   MessageBubbleStatus,
-} from './types';
+} from '../../../../types/chat';
+import { Avatar } from '../../../avatar/public';
+import { View } from '../../../layout/public';
+import { Text } from '../../../typography/public';
 
 function resolveAvatarName({
   avatar,
@@ -221,7 +221,7 @@ function MessageBubbleInner({
   };
 
   const bubbleContent = isInteractive ? (
-    <ButtonBase
+    <Pressable
       accessibilityLabel={accessibilityLabel}
       accessibilityRole="button"
       accessibilityState={{ disabled, selected }}
@@ -232,7 +232,7 @@ function MessageBubbleInner({
       testID={testID}
     >
       {(state) => renderBubble({ pressed: state.pressed, hovered: state.hovered })}
-    </ButtonBase>
+    </Pressable>
   ) : (
     <View testID={testID}>{renderBubble({ pressed: false, hovered: false })}</View>
   );

package/src/features/chat/public.ts

@@ -0,0 +1,11 @@
+export type {
+  ChatListAvatar,
+  ChatListItemProps,
+  MessageBubbleAuthor,
+  MessageBubbleAvatar,
+  MessageBubbleDirection,
+  MessageBubbleProps,
+  MessageBubbleStatus,
+} from '../../types/chat';
+export { ChatListItem } from './adapters/inbound/ChatListItem';
+export { MessageBubble } from './adapters/inbound/MessageBubble';

package/src/features/chip/adapters/inbound/Chip.tsx

@@ -1,4 +1,4 @@
-import { ButtonBase } from '@ankhorage/surface';
+import { Pressable } from '@ankhorage/surface';
 import React from 'react';
 
 import { resolveIconSize } from '../../../../internal/recipes';
@@ -83,7 +83,7 @@ function ChipInner({
   }
 
   return (
-    <ButtonBase
+    <Pressable
       disabled={disabled}
       interactionPolicy={interactionPolicy}
       onPress={onPress}
@@ -91,6 +91,6 @@ function ChipInner({
       testID={testID}
     >
       {(state) => renderContent(state)}
-    </ButtonBase>
+    </Pressable>
   );
 }

package/src/{patterns/collection-editor → features/collection-editor/adapters/inbound}/CollectionEditor.tsx

@@ -1,12 +1,12 @@
 import React from 'react';
 
-import { Button } from '../../features/button/public';
-import { IconButton } from '../../features/button/public';
-import { View } from '../../features/layout/public';
-import { Text } from '../../features/typography/public';
-import { withZoraThemeScope } from '../../theme/withZoraThemeScope';
-import { Panel } from '../panel';
-import type { CollectionEditorProps } from './types';
+import { withZoraThemeScope } from '../../../../theme/withZoraThemeScope';
+import type { CollectionEditorProps } from '../../../../types/collection-editor';
+import { Button } from '../../../button/public';
+import { IconButton } from '../../../button/public';
+import { Card } from '../../../card/public';
+import { View } from '../../../layout/public';
+import { Text } from '../../../typography/public';
 
 function CollectionEditorInner<TItem>({
   themeId: _themeId,
@@ -27,7 +27,7 @@ function CollectionEditorInner<TItem>({
   const isEmpty = items.length === 0;
 
   return (
-    <Panel
+    <Card
       compact
       description={description}
       interactionPolicy={interactionPolicy}
@@ -110,7 +110,7 @@ function CollectionEditorInner<TItem>({
           ))
         )}
       </View>
-    </Panel>
+    </Card>
   );
 }
 

package/src/features/collection-editor/public.ts

@@ -0,0 +1,5 @@
+export type {
+  CollectionEditorProps,
+  CollectionEditorRenderItemProps,
+} from '../../types/collection-editor';
+export { CollectionEditor } from './adapters/inbound/CollectionEditor';

package/src/features/form/field/meta.ts

@@ -10,6 +10,7 @@ export const fieldMeta = {
     'RadioGroup',
     'SearchInput',
     'Select',
+    'Switch',
     'TextInput',
   ],
   blueprint: { label: 'Field', defaultProps: { label: 'Label' } },

package/src/features/form/switch/adapters/inbound/Switch.tsx

@@ -0,0 +1,12 @@
+import { Switch as SurfaceSwitch } from '@ankhorage/surface';
+import React from 'react';
+
+import { withZoraThemeScope } from '../../../../../theme/withZoraThemeScope';
+import type { SwitchProps } from '../../../../../types/switch';
+
+/*** Renders the ZORA switch while preserving the canonical Surface switch contract. */
+export const Switch = withZoraThemeScope(SwitchInner);
+
+function SwitchInner({ themeId: _themeId, mode: _mode, interactionPolicy, ...props }: SwitchProps) {
+  return <SurfaceSwitch {...props} interactionPolicy={interactionPolicy} />;
+}

package/src/features/form/switch/public.ts

@@ -0,0 +1,2 @@
+export type { SwitchProps } from '../../../types/switch';
+export { Switch } from './adapters/inbound/Switch';

package/src/features/form/switch/switchMeta.ts

@@ -0,0 +1,14 @@
+import type { ZoraComponentMeta } from '../../../metadata';
+
+export const switchMeta = {
+  name: 'Switch',
+  category: 'component',
+  directManifestNode: true,
+  allowedChildren: [],
+  blueprint: { label: 'Switch', defaultProps: { children: 'Option', checked: false } },
+  props: {
+    children: { type: 'string', category: 'Content', label: 'Label' },
+    checked: { type: 'boolean', category: 'State', label: 'Checked', default: false },
+    disabled: { type: 'boolean', category: 'State', label: 'Disabled', default: false },
+  },
+} as const satisfies ZoraComponentMeta;

package/src/features/layout/public.test.ts

@@ -23,15 +23,7 @@ const removedPublicNames = [
 
 describe('canonical layout boundary', () => {
   test('exports only the current layout primitives and semantic screen composition', () => {
-    for (const name of [
-      'AppShell',
-      'Divider',
-      'Grid',
-      'Screen',
-      'ScreenSection',
-      'ScrollView',
-      'View',
-    ]) {
+    for (const name of ['AppShell', 'Divider', 'Grid', 'Screen', 'ScrollView', 'View']) {
       expect(publicSource).toMatch(new RegExp(`\\b${name}\\b`, 'u'));
     }
 
@@ -44,12 +36,12 @@ describe('canonical layout boundary', () => {
   test('does not retain the legacy layout or foundation ownership roots', () => {
     expect(existsSync(join(srcDir, 'layout'))).toBe(false);
     expect(existsSync(join(srcDir, 'foundation'))).toBe(false);
-    expect(existsSync(join(srcDir, 'patterns', 'settings-row'))).toBe(false);
-    expect(existsSync(join(srcDir, 'patterns', 'tile-grid'))).toBe(false);
+    expect(existsSync(join(srcDir, 'patterns'))).toBe(false);
   });
 
   test('keeps moved capabilities with their singular feature owners', () => {
     expect(existsSync(join(srcDir, 'features', 'content-rail', 'public.ts'))).toBe(true);
     expect(existsSync(join(srcDir, 'features', 'palette-item', 'public.ts'))).toBe(true);
+    expect(existsSync(join(srcDir, 'features', 'section', 'public.ts'))).toBe(true);
   });
 });

package/src/features/layout/public.ts

@@ -3,7 +3,6 @@ export type {
   DividerProps,
   GridProps,
   ScreenProps,
-  ScreenSectionProps,
   ScrollViewProps,
   ViewProps,
 } from '../../types/layout';
@@ -11,6 +10,5 @@ export { AppShell } from './adapters/inbound/AppShell';
 export { Divider } from './adapters/inbound/Divider';
 export { Grid } from './adapters/inbound/Grid';
 export { Screen } from './adapters/inbound/Screen';
-export { ScreenSection } from './adapters/inbound/ScreenSection';
 export { ScrollView } from './adapters/inbound/ScrollView';
 export { View } from './adapters/inbound/View';

package/src/features/list/adapters/inbound/ListSection.tsx

@@ -1,9 +1,9 @@
 import React from 'react';
 
-import { SectionHeader } from '../../../../patterns/section-header';
 import { withZoraThemeScope } from '../../../../theme/withZoraThemeScope';
 import type { ListSectionProps } from '../../../../types/list';
 import { View } from '../../../layout/public';
+import { SectionHeader } from '../../../section/public';
 import { List } from './List';
 
 function ListSectionInner({

package/src/features/missing-element/MissingElement.test.ts

@@ -13,7 +13,7 @@ describe('MissingElement draft contract', () => {
       availability: 'draft-only',
       releaseGate: 'blocked',
     });
-    expect(ZORA_COMPONENT_META.Notice.manifestPolicy).toBeUndefined();
+    expect(ZORA_COMPONENT_META.Card.manifestPolicy).toBeUndefined();
     expect(ZORA_COMPONENT_META.EmptyState.manifestPolicy).toBeUndefined();
   });
 
@@ -63,6 +63,6 @@ describe('MissingElement draft contract', () => {
     expect(types).toContain('MissingElementProps extends ZoraBaseProps');
     expect(source).toContain('interactionPolicy: _interactionPolicy');
     expect(source).not.toMatch(/onPress|onLongPress|onChange|onSubmit/);
-    expect(source).not.toMatch(/<Button|<IconButton|<Notice|<EmptyState/);
+    expect(source).not.toMatch(/<Button|<IconButton|<EmptyState/);
   });
 });

package/src/{patterns/reader → features/reader/adapters/inbound}/ReaderSurface.test.ts

@@ -1,6 +1,6 @@
 import { describe, expect, test } from 'bun:test';
 
-import type { ReaderErrorEvent, ReaderLocationChangeEvent, ReaderSurfaceProps } from '../..';
+import type { ReaderErrorEvent, ReaderLocationChangeEvent, ReaderSurfaceProps } from '../../../..';
 
 describe('ReaderSurface public contract', () => {
   test('exports the component and serializable adapter events from the package root', () => {
@@ -29,12 +29,12 @@ describe('ReaderSurface public contract', () => {
   test('exports the reader API from the package root', async () => {
     const source = await Bun.file('src/index.ts').text();
 
-    expect(source).toContain("from './patterns/reader';");
+    expect(source).toContain("from './features/reader/public';");
     expect(source).toContain('ReaderSurface, resolveReaderProgress');
   });
 
   test('keeps parsing, fetching, persistence, and platform APIs outside ZORA', async () => {
-    const source = await Bun.file('src/patterns/reader/ReaderSurface.tsx').text();
+    const source = await Bun.file('src/features/reader/adapters/inbound/ReaderSurface.tsx').text();
 
     expect(source).not.toContain('expo-');
     expect(source).not.toContain('pdfjs');

package/src/{patterns/reader → features/reader/adapters/inbound}/ReaderSurface.tsx

@@ -1,15 +1,15 @@
 import React from 'react';
 
-import { AppBar } from '../../features/app-bar/public';
-import { IconButton } from '../../features/button/public';
-import { View } from '../../features/layout/public';
-import { Progress } from '../../features/progress/public';
-import { Surface } from '../../features/surface/public';
-import { Text } from '../../features/typography/public';
-import { useZoraTheme } from '../../theme/useZoraTheme';
-import { withZoraThemeScope } from '../../theme/withZoraThemeScope';
-import { resolveReaderProgress } from './resolveReaderProgress';
-import type { ReaderStatus, ReaderSurfaceProps } from './types';
+import { useZoraTheme } from '../../../../theme/useZoraTheme';
+import { withZoraThemeScope } from '../../../../theme/withZoraThemeScope';
+import type { ReaderStatus, ReaderSurfaceProps } from '../../../../types/reader';
+import { AppBar } from '../../../app-bar/public';
+import { IconButton } from '../../../button/public';
+import { View } from '../../../layout/public';
+import { Progress } from '../../../progress/public';
+import { Surface } from '../../../surface/public';
+import { Text } from '../../../typography/public';
+import { resolveReaderProgress } from '../../utils/resolveReaderProgress';
 
 function resolvePageLabel(page: number | undefined, pageCount: number | undefined): string | null {
   if (page === undefined || !Number.isFinite(page)) return null;

package/src/{patterns/reader/index.ts → features/reader/public.ts}

@@ -1,5 +1,3 @@
-export { ReaderSurface } from './ReaderSurface';
-export { resolveReaderProgress } from './resolveReaderProgress';
 export type {
   ReaderColorScheme,
   ReaderDocumentFormat,
@@ -12,4 +10,6 @@ export type {
   ReaderResolvedSource,
   ReaderStatus,
   ReaderSurfaceProps,
-} from './types';
+} from '../../types/reader';
+export { ReaderSurface } from './adapters/inbound/ReaderSurface';
+export { resolveReaderProgress } from './utils/resolveReaderProgress';

package/src/{patterns/scanner → features/scanner/adapters/inbound}/BarcodeScannerView.tsx

@@ -1,14 +1,14 @@
 import React from 'react';
 import { StyleSheet } from 'react-native';
 
-import { Card } from '../../features/card/public';
-import { View } from '../../features/layout/public';
-import { Text } from '../../features/typography/public';
-import { useZoraTheme } from '../../theme/useZoraTheme';
-import { withZoraThemeScope } from '../../theme/withZoraThemeScope';
+import { useZoraTheme } from '../../../../theme/useZoraTheme';
+import { withZoraThemeScope } from '../../../../theme/withZoraThemeScope';
+import type { BarcodeScannerViewProps } from '../../../../types/scanner';
+import { Card } from '../../../card/public';
+import { View } from '../../../layout/public';
+import { Text } from '../../../typography/public';
 import { CameraPermissionView } from './CameraPermissionView';
 import { ScanOverlay } from './ScanOverlay';
-import type { BarcodeScannerViewProps } from './types';
 
 function BarcodeScannerViewInner({
   themeId: _themeId,

package/src/{patterns/scanner → features/scanner/adapters/inbound}/CameraPermissionView.tsx

@@ -1,11 +1,11 @@
 import React from 'react';
 
-import { Button } from '../../features/button/public';
-import { Card } from '../../features/card/public';
-import { View } from '../../features/layout/public';
-import { Text } from '../../features/typography/public';
-import { withZoraThemeScope } from '../../theme/withZoraThemeScope';
-import type { CameraPermissionViewProps } from './types';
+import { withZoraThemeScope } from '../../../../theme/withZoraThemeScope';
+import type { CameraPermissionViewProps } from '../../../../types/scanner';
+import { Button } from '../../../button/public';
+import { Card } from '../../../card/public';
+import { View } from '../../../layout/public';
+import { Text } from '../../../typography/public';
 
 function resolvePermissionCopy(status: CameraPermissionViewProps['status']) {
   if (status === 'denied') {

package/src/{patterns/scanner → features/scanner/adapters/inbound}/ScanOverlay.tsx

@@ -1,12 +1,12 @@
 import React from 'react';
 import { StyleSheet } from 'react-native';
 
-import { Badge } from '../../features/badge/public';
-import { View } from '../../features/layout/public';
-import { Text } from '../../features/typography/public';
-import { useZoraTheme } from '../../theme/useZoraTheme';
-import { withZoraThemeScope } from '../../theme/withZoraThemeScope';
-import type { ScanOverlayProps } from './types';
+import { useZoraTheme } from '../../../../theme/useZoraTheme';
+import { withZoraThemeScope } from '../../../../theme/withZoraThemeScope';
+import type { ScanOverlayProps } from '../../../../types/scanner';
+import { Badge } from '../../../badge/public';
+import { View } from '../../../layout/public';
+import { Text } from '../../../typography/public';
 
 function ScanOverlayInner({
   themeId: _themeId,

package/src/features/scanner/public.ts

@@ -0,0 +1,10 @@
+export type {
+  BarcodeScannerViewProps,
+  BarcodeScanResult,
+  CameraPermissionStatus,
+  CameraPermissionViewProps,
+  ScanOverlayProps,
+} from '../../types/scanner';
+export { BarcodeScannerView } from './adapters/inbound/BarcodeScannerView';
+export { CameraPermissionView } from './adapters/inbound/CameraPermissionView';
+export { ScanOverlay } from './adapters/inbound/ScanOverlay';

package/src/features/{layout → section}/adapters/inbound/ScreenSection.tsx

@@ -1,9 +1,9 @@
 import React from 'react';
 
-import { SectionHeader } from '../../../../patterns/section-header';
 import { withZoraThemeScope } from '../../../../theme/withZoraThemeScope';
-import type { ScreenSectionProps } from '../../../../types/layout';
-import { View } from './View';
+import type { ScreenSectionProps } from '../../../../types/section';
+import { View } from '../../../layout/public';
+import { SectionHeader } from './SectionHeader';
 
 function ScreenSectionInner({
   themeId: _themeId,

package/src/{patterns/section-header → features/section/adapters/inbound}/SectionHeader.tsx

@@ -1,10 +1,10 @@
 import React from 'react';
 
-import { View } from '../../features/layout/public';
-import { Heading } from '../../features/typography/public';
-import { Text } from '../../features/typography/public';
-import { withZoraThemeScope } from '../../theme/withZoraThemeScope';
-import type { SectionHeaderProps } from './types';
+import { withZoraThemeScope } from '../../../../theme/withZoraThemeScope';
+import type { SectionHeaderProps } from '../../../../types/section';
+import { View } from '../../../layout/public';
+import { Heading } from '../../../typography/public';
+import { Text } from '../../../typography/public';
 
 function SectionHeaderInner({
   themeId: _themeId,

package/src/features/section/public.ts

@@ -0,0 +1,3 @@
+export type { ScreenSectionProps, SectionHeaderProps } from '../../types/section';
+export { ScreenSection } from './adapters/inbound/ScreenSection';
+export { SectionHeader } from './adapters/inbound/SectionHeader';