@ankhorage/zora 18.0.1 → 19.0.1

package/src/features/date-picker/adapters/inbound/DatePicker.native.tsx

@@ -1,8 +1,8 @@
 import React from 'react';
 
-import { withZoraThemeScope } from '../../../../theme/withZoraThemeScope';
 import type { DatePickerProps } from '../../../../types/date-picker';
 import { useBottomSheet } from '../../../bottom-sheet/public';
+import { withZoraThemeScope } from '../../../theme/adapters/inbound/withZoraThemeScope';
 import { DatePickerContent } from '../../composition/DatePickerContent';
 import { DatePickerField } from '../../composition/DatePickerField';
 import { DatePickerTrigger } from '../../composition/DatePickerTrigger';

package/src/features/date-picker/adapters/inbound/DatePicker.web.tsx

@@ -1,9 +1,9 @@
 import { Popover } from '@ankhorage/surface';
 import React from 'react';
 
-import { withZoraThemeScope } from '../../../../theme/withZoraThemeScope';
 import type { DatePickerProps } from '../../../../types/date-picker';
 import { Surface } from '../../../surface/public';
+import { withZoraThemeScope } from '../../../theme/adapters/inbound/withZoraThemeScope';
 import { DatePickerContent } from '../../composition/DatePickerContent';
 import { DatePickerField } from '../../composition/DatePickerField';
 import { DatePickerTrigger } from '../../composition/DatePickerTrigger';

package/src/features/date-picker/datePickerMeta.ts

@@ -1,4 +1,4 @@
-import type { ZoraComponentMeta } from '../../metadata';
+import type { ZoraComponentMeta } from '../authoring';
 
 export const datePickerMeta = {
   name: 'DatePicker',

package/src/features/date-picker/public.test.ts

@@ -1,6 +1,6 @@
 import { expect, test } from 'bun:test';
 
-import { ZORA_COMPONENT_META } from '../../metadata/componentMeta';
+import { ZORA_COMPONENT_META } from '../authoring/componentMeta';
 
 test('DatePicker keeps one manifest contract across native and web presentation hosts', async () => {
   const nativeSource = await Bun.file(

package/src/features/dialog/adapters/inbound/Dialog.tsx

@@ -2,11 +2,11 @@ import { Modal as SurfaceModal } from '@ankhorage/surface';
 import React from 'react';
 import { StyleSheet } from 'react-native';
 
-import { resolveDialogWidth } from '../../../../internal/recipes';
-import { withZoraThemeScope } from '../../../../theme/withZoraThemeScope';
 import type { DialogProps } from '../../../../types/dialog';
 import { View } from '../../../layout/public';
+import { withZoraThemeScope } from '../../../theme/adapters/inbound/withZoraThemeScope';
 import { Heading, Text } from '../../../typography/public';
+import { resolveDialogWidth } from '../../utils/resolveDialogWidth';
 
 /*** Renders the product-level dialog composition on top of the Surface modal primitive. */
 export const Dialog = withZoraThemeScope(DialogInner);

package/src/features/dialog/dialogMeta.ts

@@ -1,5 +1,5 @@
-import { CONTAINER_ALLOWED_CHILDREN } from '../../metadata/allowedChildren';
-import type { ZoraComponentMeta } from '../../metadata/types';
+import type { ZoraComponentMeta } from '../../types/authoring';
+import { CONTAINER_ALLOWED_CHILDREN } from '../authoring/allowedChildren';
 
 export const dialogMeta = {
   name: 'Dialog',

package/src/features/dialog/utils/resolveDialogWidth.test.ts

@@ -0,0 +1,10 @@
+import { describe, expect, test } from 'bun:test';
+
+import { resolveDialogWidth } from './resolveDialogWidth';
+
+describe('resolveDialogWidth', () => {
+  test('keeps dialog width presets ordered', () => {
+    expect(resolveDialogWidth('narrow')).toBeLessThan(resolveDialogWidth('default'));
+    expect(resolveDialogWidth('wide')).toBeGreaterThanOrEqual(resolveDialogWidth('default'));
+  });
+});

package/src/features/dialog/utils/resolveDialogWidth.ts

@@ -0,0 +1,13 @@
+import type { ZoraContentWidth } from '../../../types/layout';
+
+export function resolveDialogWidth(width: ZoraContentWidth = 'default'): number {
+  switch (width) {
+    case 'narrow':
+      return 420;
+    case 'wide':
+      return 560;
+    case 'default':
+    default:
+      return 520;
+  }
+}

package/src/features/empty-state/adapters/inbound/EmptyState.tsx

@@ -1,10 +1,10 @@
 import React from 'react';
 
-import { withZoraThemeScope } from '../../../../theme/withZoraThemeScope';
 import type { EmptyStateProps } from '../../../../types/empty-state';
 import { Button } from '../../../button/public';
 import { Card } from '../../../card/public';
 import { View } from '../../../layout/public';
+import { withZoraThemeScope } from '../../../theme/adapters/inbound/withZoraThemeScope';
 
 function EmptyStateInner({
   themeId: _themeId,

package/src/features/empty-state/emptyStateMeta.ts

@@ -1,4 +1,4 @@
-import type { ZoraComponentMeta } from '../../metadata';
+import type { ZoraComponentMeta } from '../authoring';
 
 export const emptyStateMeta = {
   name: 'EmptyState',

package/src/features/form/adapters/inbound/Form.tsx

@@ -1,8 +1,8 @@
 import React from 'react';
 
-import { withZoraThemeScope } from '../../../../theme/withZoraThemeScope';
 import type { FormProps } from '../../../../types/form';
 import { View } from '../../../layout/public';
+import { withZoraThemeScope } from '../../../theme/adapters/inbound/withZoraThemeScope';
 import { FormActions } from './FormActions';
 
 function FormInner({

package/src/features/form/adapters/inbound/FormActions.tsx

@@ -1,9 +1,9 @@
 import React from 'react';
 
-import { withZoraThemeScope } from '../../../../theme/withZoraThemeScope';
 import type { FormActionsProps } from '../../../../types/form';
 import { Button } from '../../../button/public';
 import { View } from '../../../layout/public';
+import { withZoraThemeScope } from '../../../theme/adapters/inbound/withZoraThemeScope';
 
 function FormActionsInner({
   themeId: _themeId,

package/src/features/form/adapters/inbound/FormError.tsx

@@ -1,9 +1,9 @@
 import React from 'react';
 
-import { useZoraTheme } from '../../../../theme/useZoraTheme';
-import { withZoraThemeScope } from '../../../../theme/withZoraThemeScope';
 import type { FormErrorProps } from '../../../../types/form';
 import { View } from '../../../layout/public';
+import { withZoraThemeScope } from '../../../theme/adapters/inbound/withZoraThemeScope';
+import { useZoraTheme } from '../../../theme/composition/useZoraTheme';
 import { Text } from '../../../typography/public';
 
 function FormErrorInner({ themeId: _themeId, mode: _mode, error, testID }: FormErrorProps) {

package/src/features/form/checkbox/adapters/inbound/Checkbox.tsx

@@ -1,8 +1,8 @@
 import { Checkbox as SurfaceCheckbox } from '@ankhorage/surface';
 import React from 'react';
 
-import { withZoraThemeScope } from '../../../../../theme/withZoraThemeScope';
 import type { CheckboxProps } from '../../../../../types/checkbox';
+import { withZoraThemeScope } from '../../../../theme/adapters/inbound/withZoraThemeScope';
 
 function CheckboxInner({
   themeId: _themeId,

package/src/features/form/checkbox/adapters/inbound/CheckboxGroup.tsx

@@ -1,9 +1,9 @@
 import { Checkbox } from '@ankhorage/surface';
 import React from 'react';
 
-import { withZoraThemeScope } from '../../../../../theme/withZoraThemeScope';
 import type { CheckboxGroupOption, CheckboxGroupProps } from '../../../../../types/checkbox';
 import { View } from '../../../../layout/public';
+import { withZoraThemeScope } from '../../../../theme/adapters/inbound/withZoraThemeScope';
 import { Text } from '../../../../typography/public';
 
 function CheckboxGroupInner<TValue extends string>({

package/src/features/form/checkbox/checkboxMeta.ts

@@ -1,4 +1,4 @@
-import type { ZoraComponentMeta } from '../../../metadata';
+import type { ZoraComponentMeta } from '../../authoring';
 
 export const checkboxMeta = {
   name: 'Checkbox',

package/src/features/form/field/adapters/inbound/Field.tsx

@@ -1,9 +1,9 @@
 import { Field as SurfaceField } from '@ankhorage/surface';
 import React from 'react';
 
-import { withZoraThemeScope } from '../../../../../theme/withZoraThemeScope';
 import type { FieldProps } from '../../../../../types/form';
 import { View } from '../../../../layout/public';
+import { withZoraThemeScope } from '../../../../theme/adapters/inbound/withZoraThemeScope';
 import { Text } from '../../../../typography/public';
 
 function FieldInner({

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

@@ -1,4 +1,4 @@
-import type { ZoraComponentMeta } from '../../../metadata';
+import type { ZoraComponentMeta } from '../../authoring';
 
 export const fieldMeta = {
   name: 'Field',
@@ -10,6 +10,7 @@ export const fieldMeta = {
     'RadioGroup',
     'SearchInput',
     'Select',
+    'Switch',
     'TextInput',
   ],
   blueprint: { label: 'Field', defaultProps: { label: 'Label' } },

package/src/features/form/formActionsMeta.ts

@@ -1,4 +1,4 @@
-import type { ZoraComponentMeta } from '../../metadata';
+import type { ZoraComponentMeta } from '../authoring';
 export const formActionsMeta = {
   name: 'FormActions',
   category: 'component',

package/src/features/form/formErrorMeta.ts

@@ -1,4 +1,4 @@
-import type { ZoraComponentMeta } from '../../metadata';
+import type { ZoraComponentMeta } from '../authoring';
 export const formErrorMeta = {
   name: 'FormError',
   category: 'component',

package/src/features/form/formMeta.ts

@@ -1,4 +1,4 @@
-import type { ZoraComponentMeta } from '../../metadata';
+import type { ZoraComponentMeta } from '../authoring';
 export const formMeta = {
   name: 'Form',
   category: 'component',

package/src/features/form/radio/adapters/inbound/Radio.tsx

@@ -1,8 +1,8 @@
 import { Radio as SurfaceRadio } from '@ankhorage/surface';
 import React from 'react';
 
-import { withZoraThemeScope } from '../../../../../theme/withZoraThemeScope';
 import type { RadioProps } from '../../../../../types/radio';
+import { withZoraThemeScope } from '../../../../theme/adapters/inbound/withZoraThemeScope';
 
 function RadioInner({ themeId: _themeId, mode: _mode, interactionPolicy, ...props }: RadioProps) {
   return <SurfaceRadio {...props} interactionPolicy={interactionPolicy} />;

package/src/features/form/radio/adapters/inbound/RadioGroup.tsx

@@ -2,10 +2,10 @@ import { Radio } from '@ankhorage/surface';
 import React from 'react';
 import { StyleSheet } from 'react-native';
 
-import { useZoraThemeRecipe } from '../../../../../theme/useZoraThemeRecipe';
-import { withZoraThemeScope } from '../../../../../theme/withZoraThemeScope';
 import type { RadioGroupProps } from '../../../../../types/radio';
 import { View } from '../../../../layout/public';
+import { withZoraThemeScope } from '../../../../theme/adapters/inbound/withZoraThemeScope';
+import { useZoraThemeRecipe } from '../../../../theme/composition/useZoraThemeRecipe';
 import { Text } from '../../../../typography/public';
 import { resolveRadioGroupThemeRecipe } from '../../utils/resolveRadioGroupThemeRecipe';
 import { RadioOptionControl } from './RadioOptionControl';

package/src/features/form/radio/radioMeta.ts

@@ -1,5 +1,5 @@
-import { ZORA_COLORS } from '../../../internal/colorModel';
-import type { ZoraComponentMeta } from '../../../metadata';
+import type { ZoraComponentMeta } from '../../authoring';
+import { ZORA_COLORS } from '../../theme/colorModel';
 
 const themeAuthoring = {
   authority: 'theme',

package/src/features/form/radio/themeRecipeMeta.ts

@@ -1,5 +1,5 @@
-import { ZORA_COLORS } from '../../../internal/colorModel';
-import type { ZoraThemeRecipeMeta } from '../../../metadata/themeRecipeTypes';
+import type { ZoraThemeRecipeMeta } from '../../../types/theme-recipe';
+import { ZORA_COLORS } from '../../theme/colorModel';
 
 export const radioGroupThemeRecipeMeta = {
   name: 'RadioGroup',

package/src/features/form/radio/utils/handleRadioOptionKeyDown.test.ts

@@ -1,7 +1,7 @@
 import { expect, test } from 'bun:test';
 import type { KeyboardEvent } from 'react';
 
-import { DIRECTION_MODIFIERS } from '../../../../constants/keyboard';
+import { DIRECTION_MODIFIERS } from '../constants';
 import {
   handleRadioOptionKeyDown,
   type RadioOptionKeyboardTarget,

package/src/features/form/radio/utils/handleRadioOptionKeyDown.ts

@@ -1,6 +1,6 @@
 import type { KeyboardEvent } from 'react';
 
-import { DIRECTION_MODIFIERS } from '../../../../constants/keyboard';
+import { DIRECTION_MODIFIERS } from '../constants';
 
 /*** Support Space and directional navigation for web radio options without affecting native presses. */
 export function handleRadioOptionKeyDown(

package/src/features/form/radio/utils/resolveRadioGroupThemeRecipe.ts

@@ -1,7 +1,7 @@
 import type { ThemeRecipeOverrideValue } from '@ankhorage/contracts';
 
-import type { ZoraColor } from '../../../../internal/colorModel';
 import type { RadioGroupProps } from '../../../../types/radio';
+import type { ZoraColor } from '../../../theme/colorModel';
 
 type RadioGroupGap = NonNullable<RadioGroupProps<string>['gap']>;
 type RadioGroupSize = NonNullable<RadioGroupProps<string>['size']>;

package/src/features/form/search-input/adapters/inbound/SearchInput.tsx

@@ -1,5 +1,5 @@
-import { withZoraThemeScope } from '../../../../../theme/withZoraThemeScope';
 import type { SearchInputProps } from '../../../../../types/search-input';
+import { withZoraThemeScope } from '../../../../theme/adapters/inbound/withZoraThemeScope';
 import { TextInput, type TextInputTrailingAction } from '../../../text-input/public';
 
 /*** Renders a search-focused text input with clear and submit behavior. */

package/src/features/form/search-input/searchInputMeta.ts

@@ -1,4 +1,4 @@
-import type { ZoraComponentMeta } from '../../../metadata/types';
+import type { ZoraComponentMeta } from '../../../types/authoring';
 
 export const searchInputMeta = {
   name: 'SearchInput',

package/src/features/form/select/adapters/inbound/Select.native.tsx

@@ -1,9 +1,9 @@
 import React from 'react';
 import { type ListRenderItemInfo, StyleSheet } from 'react-native';
 
-import { withZoraThemeScope } from '../../../../../theme/withZoraThemeScope';
 import type { SelectOption, SelectProps } from '../../../../../types/select';
 import { BottomSheetFlatList, useBottomSheet } from '../../../../bottom-sheet/public';
+import { withZoraThemeScope } from '../../../../theme/adapters/inbound/withZoraThemeScope';
 import { SelectField } from '../../composition/SelectField';
 import { SelectOptionRow } from '../../composition/SelectOptionRow';
 import { SelectTrigger } from '../../composition/SelectTrigger';

package/src/features/form/select/adapters/inbound/Select.web.tsx

@@ -1,10 +1,10 @@
 import { Popover } from '@ankhorage/surface';
 import React from 'react';
 
-import { withZoraThemeScope } from '../../../../../theme/withZoraThemeScope';
 import type { SelectProps } from '../../../../../types/select';
 import { View } from '../../../../layout/public';
 import { Surface } from '../../../../surface/public';
+import { withZoraThemeScope } from '../../../../theme/adapters/inbound/withZoraThemeScope';
 import { SelectField } from '../../composition/SelectField';
 import { SelectOptionRow } from '../../composition/SelectOptionRow';
 import { SelectTrigger } from '../../composition/SelectTrigger';

package/src/features/form/select/selectMeta.ts

@@ -1,4 +1,4 @@
-import type { ZoraComponentMeta } from '../../../metadata';
+import type { ZoraComponentMeta } from '../../authoring';
 
 export const selectMeta = {
   name: 'Select',

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 type { SwitchProps } from '../../../../../types/switch';
+import { withZoraThemeScope } from '../../../../theme/adapters/inbound/withZoraThemeScope';
+
+/*** 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 '../../authoring';
+
+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/form/text-input/adapters/inbound/TextInput.tsx

@@ -1,11 +1,11 @@
 import * as Surface from '@ankhorage/surface';
 import React from 'react';
 
-import { resolveIconSize } from '../../../../../internal/recipes';
-import { useZoraTheme } from '../../../../../theme/useZoraTheme';
-import { withZoraThemeScope } from '../../../../../theme/withZoraThemeScope';
 import type { TextInputProps } from '../../../../../types/text-input';
 import { IconButton } from '../../../../button/public';
+import { resolveIconSize } from '../../../../icon/utils/resolveIconSize';
+import { withZoraThemeScope } from '../../../../theme/adapters/inbound/withZoraThemeScope';
+import { useZoraTheme } from '../../../../theme/composition/useZoraTheme';
 
 function TextInputInner({
   themeId: _themeId,

package/src/features/form/text-input/textInputMeta.ts

@@ -1,4 +1,4 @@
-import type { ZoraComponentMeta } from '../../../metadata';
+import type { ZoraComponentMeta } from '../../authoring';
 
 export const textInputMeta = {
   name: 'TextInput',

package/src/features/gradient/adapters/inbound/Gradient.tsx

@@ -1,8 +1,8 @@
 import React from 'react';
 
-import { withZoraThemeScope } from '../../../../theme/withZoraThemeScope';
 import type { GradientProps } from '../../../../types/gradient';
 import { View } from '../../../layout/public';
+import { withZoraThemeScope } from '../../../theme/adapters/inbound/withZoraThemeScope';
 import { useGradientRenderer } from './GradientRendererContext';
 
 function GradientInner({

package/src/features/gradient/gradientMeta.ts

@@ -1,5 +1,5 @@
-import type { ZoraComponentMeta } from '../../metadata';
-import { CONTAINER_ALLOWED_CHILDREN } from '../../metadata/allowedChildren';
+import type { ZoraComponentMeta } from '../authoring';
+import { CONTAINER_ALLOWED_CHILDREN } from '../authoring/allowedChildren';
 
 export const gradientMeta = {
   name: 'Gradient',

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

@@ -1,6 +1,6 @@
 import { expect, test } from 'bun:test';
 
-import { ZORA_COMPONENT_META } from '../../metadata/componentMeta';
+import { ZORA_COMPONENT_META } from '../authoring/componentMeta';
 
 test('Gradient is a direct manifest container with serializable colors', () => {
   const meta = ZORA_COMPONENT_META.Gradient;

package/src/features/hero/adapters/inbound/Hero.tsx

@@ -1,10 +1,10 @@
 import React from 'react';
 
-import { withZoraThemeScope } from '../../../../theme/withZoraThemeScope';
 import type { HeroAction, HeroAlign, HeroProps } from '../../../../types/hero';
 import { Button } from '../../../button/public';
 import { Card } from '../../../card/public';
 import { Grid, View } from '../../../layout/public';
+import { withZoraThemeScope } from '../../../theme/adapters/inbound/withZoraThemeScope';
 import { Heading, Text } from '../../../typography/public';
 
 function HeroInner({

package/src/features/hero/heroMeta.ts

@@ -1,4 +1,4 @@
-import type { ZoraComponentMeta } from '../../metadata';
+import type { ZoraComponentMeta } from '../authoring';
 
 export const heroMeta = {
   name: 'Hero',

package/src/features/icon/adapters/inbound/Icon.tsx

@@ -1,8 +1,8 @@
 import { Icon as SurfaceIcon } from '@ankhorage/surface';
 import React from 'react';
 
-import { withZoraThemeScope } from '../../../../theme/withZoraThemeScope';
 import type { IconProps } from '../../../../types/icon';
+import { withZoraThemeScope } from '../../../theme/adapters/inbound/withZoraThemeScope';
 
 /*** Adapts the themed Surface Icon primitive to ZORA scope and interaction props. */
 export const Icon = withZoraThemeScope(IconInner);

package/src/features/icon/iconMeta.ts

@@ -1,4 +1,4 @@
-import type { ZoraComponentMeta } from '../../metadata';
+import type { ZoraComponentMeta } from '../authoring';
 
 export const iconMeta = {
   name: 'Icon',

package/src/features/icon/utils/meta.test.ts

@@ -1,6 +1,6 @@
 import { expect, test } from 'bun:test';
 
-import { ZORA_COMPONENT_META } from '../../../metadata/componentMeta';
+import { ZORA_COMPONENT_META } from '../../authoring/componentMeta';
 
 test('permits media-backed Icon and Image content in ordinary screen containers', () => {
   const icon = ZORA_COMPONENT_META.Icon;

package/src/features/icon/utils/resolveIconSize.test.ts

@@ -0,0 +1,11 @@
+import { describe, expect, test } from 'bun:test';
+
+import { resolveIconSize } from './resolveIconSize';
+
+describe('resolveIconSize', () => {
+  test('keeps icon sizes aligned with control sizes', () => {
+    expect(resolveIconSize('s')).toBe(16);
+    expect(resolveIconSize('m')).toBe(18);
+    expect(resolveIconSize('l')).toBe(20);
+  });
+});

package/src/features/icon/utils/resolveIconSize.ts

@@ -0,0 +1,13 @@
+import type { ZoraControlSize } from '../../../types/control';
+
+export function resolveIconSize(size: ZoraControlSize = 'l'): number {
+  switch (size) {
+    case 's':
+      return 16;
+    case 'm':
+      return 18;
+    case 'l':
+    default:
+      return 20;
+  }
+}

package/src/features/image/adapters/inbound/Image.tsx

@@ -1,12 +1,12 @@
 import { Image as SurfaceImage, type SurfaceImageSource } from '@ankhorage/surface';
 import React from 'react';
 
-import { useZoraTheme } from '../../../../theme/useZoraTheme';
-import { withZoraThemeScope } from '../../../../theme/withZoraThemeScope';
 import type { ImageProps } from '../../../../types/image';
 import type { UploadAsset } from '../../../../types/upload';
 import { Icon } from '../../../icon/public';
 import { View } from '../../../layout/public';
+import { withZoraThemeScope } from '../../../theme/adapters/inbound/withZoraThemeScope';
+import { useZoraTheme } from '../../../theme/composition/useZoraTheme';
 
 /*** Displays an image asset and owns its missing, unrenderable, and failed presentation states. */
 export const Image = withZoraThemeScope(ImageInner);

package/src/features/image/imageMeta.ts

@@ -1,4 +1,4 @@
-import type { ZoraComponentMeta } from '../../metadata';
+import type { ZoraComponentMeta } from '../authoring';
 
 export const imageMeta = {
   name: 'Image',

package/src/features/keyboard-avoiding-view/adapters/inbound/KeyboardAvoidingView.tsx

@@ -1,8 +1,8 @@
 import { KeyboardAvoidingView as SurfaceKeyboardAvoidingView } from '@ankhorage/surface';
 import React from 'react';
 
-import { withZoraThemeScope } from '../../../../theme/withZoraThemeScope';
 import type { KeyboardAvoidingViewProps } from '../../../../types/keyboard-avoiding-view';
+import { withZoraThemeScope } from '../../../theme/adapters/inbound/withZoraThemeScope';
 
 /*** Native keyboard-aware container exposed through the canonical ZORA feature boundary. */
 export const KeyboardAvoidingView = withZoraThemeScope(KeyboardAvoidingViewInner);

package/src/features/keyboard-avoiding-view/keyboardAvoidingViewMeta.ts

@@ -1,5 +1,5 @@
-import { CONTAINER_ALLOWED_CHILDREN } from '../../metadata/allowedChildren';
-import type { ZoraComponentMeta } from '../../metadata/types';
+import type { ZoraComponentMeta } from '../../types/authoring';
+import { CONTAINER_ALLOWED_CHILDREN } from '../authoring/allowedChildren';
 
 export const keyboardAvoidingViewMeta = {
   name: 'KeyboardAvoidingView',

package/src/features/layout/adapters/inbound/AppShell.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 
-import { withZoraThemeScope } from '../../../../theme/withZoraThemeScope';
 import type { AppShellProps } from '../../../../types/layout';
+import { withZoraThemeScope } from '../../../theme/adapters/inbound/withZoraThemeScope';
 import { View } from './View';
 
 function AppShellInner({

package/src/features/layout/adapters/inbound/Divider.tsx

@@ -1,8 +1,8 @@
 import { Divider as SurfaceDivider } from '@ankhorage/surface';
 import React from 'react';
 
-import { withZoraThemeScope } from '../../../../theme/withZoraThemeScope';
 import type { DividerProps } from '../../../../types/layout';
+import { withZoraThemeScope } from '../../../theme/adapters/inbound/withZoraThemeScope';
 
 /*** Adapts the themed Surface Divider primitive to ZORA scope and interaction props. */
 export const Divider = withZoraThemeScope(DividerInner);

package/src/features/layout/adapters/inbound/Grid.tsx

@@ -1,8 +1,8 @@
 import { Grid as SurfaceGrid } from '@ankhorage/surface';
 import React from 'react';
 
-import { withZoraThemeScope } from '../../../../theme/withZoraThemeScope';
 import type { GridProps } from '../../../../types/layout';
+import { withZoraThemeScope } from '../../../theme/adapters/inbound/withZoraThemeScope';
 
 /*** Adapts the themed Surface Grid primitive to ZORA scope and interaction props. */
 export const Grid = withZoraThemeScope(GridInner);

package/src/features/layout/adapters/inbound/Screen.tsx

@@ -1,8 +1,8 @@
 import React from 'react';
 
-import { resolvePageMaxWidth } from '../../../../internal/recipes';
-import { withZoraThemeScope } from '../../../../theme/withZoraThemeScope';
 import type { ScreenProps } from '../../../../types/layout';
+import { withZoraThemeScope } from '../../../theme/adapters/inbound/withZoraThemeScope';
+import { resolvePageMaxWidth } from '../../utils/resolvePageMaxWidth';
 import { ScrollView } from './ScrollView';
 import { View } from './View';
 

package/src/features/layout/adapters/inbound/ScrollView.tsx

@@ -1,8 +1,8 @@
 import { ScrollView as SurfaceScrollView } from '@ankhorage/surface';
 import React from 'react';
 
-import { withZoraThemeScope } from '../../../../theme/withZoraThemeScope';
 import type { ScrollViewProps } from '../../../../types/layout';
+import { withZoraThemeScope } from '../../../theme/adapters/inbound/withZoraThemeScope';
 
 /*** Adapts the token-aware Surface ScrollView primitive to ZORA theme scope. */
 export const ScrollView = withZoraThemeScope(ScrollViewInner);