@ankhorage/zora 8.0.0 → 9.0.0

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

@@ -1,7 +1,6 @@
 import React from 'react';
 
 import { Modal } from '../../../../components/modal';
-import { Progress } from '../../../../components/progress';
 import { FormField } from '../../../../patterns/form-field';
 import { withZoraThemeScope } from '../../../../theme/withZoraThemeScope';
 import type { UploadAsset, UploaderProps, UploadType } from '../../../../types/upload';
@@ -9,6 +8,7 @@ import { Button } from '../../../button/public';
 import { Icon } from '../../../icon/public';
 import { Image } from '../../../image/public';
 import { Box, Stack } from '../../../layout/public';
+import { Progress } from '../../../progress/public';
 import { Text } from '../../../typography/public';
 import { validateUploadAsset } from '../../application/use-cases/validateUploadAsset';
 import { createUploadPicker } from '../../composition/createUploadPicker';

package/src/index.ts

@@ -2,8 +2,6 @@ export type { AppBarMode, AppBarOverflowAction, AppBarProps } from './components
 export { AppBar } from './components/app-bar';
 export type { BreadcrumbItem, BreadcrumbsProps } from './components/breadcrumbs';
 export { Breadcrumbs } from './components/breadcrumbs';
-export type { CheckboxGroupOption, CheckboxGroupProps, CheckboxProps } from './components/checkbox';
-export { Checkbox, CheckboxGroup } from './components/checkbox';
 export type { DatePickerProps, DatePickerValue } from './components/date-picker';
 export { DatePicker } from './components/date-picker';
 export type {
@@ -44,18 +42,12 @@ export type {
   GradientRendererProviderProps,
 } from './components/gradient';
 export { Gradient, GradientRendererProvider } from './components/gradient';
-export type { InputProps, InputTrailingAction } from './components/input';
-export { Input } from './components/input';
 export type { DropdownMenuProps, MenuAction, MenuActionIntent, MenuProps } from './components/menu';
 export { DropdownMenu, Menu } from './components/menu';
 export type { ModalProps } from './components/modal';
 export { Modal } from './components/modal';
 export type { PaginationProps } from './components/pagination';
 export { Pagination } from './components/pagination';
-export type { ProgressProps, ProgressRingProps } from './components/progress';
-export { Progress, ProgressRing } from './components/progress';
-export type { RadioGroupOption, RadioGroupProps, RadioProps } from './components/radio';
-export { Radio, RadioGroup } from './components/radio';
 export type { RatingProps } from './components/rating';
 export { Rating } from './components/rating';
 export type { SearchBarProps } from './components/search-bar';
@@ -74,8 +66,6 @@ export type {
 export { Skeleton, SkeletonCard, SkeletonList, SkeletonText } from './components/skeleton';
 export type { TabItem, TabsProps, TabsVariant } from './components/tabs';
 export { Tabs } from './components/tabs';
-export type { TextareaProps } from './components/textarea';
-export { Textarea } from './components/textarea';
 export type { TimePickerProps, TimePickerValue } from './components/time-picker';
 export { TimePicker } from './components/time-picker';
 export type { ToastOptions, ToastProps, ToastProviderProps, ToastStatus } from './components/toast';
@@ -84,6 +74,10 @@ 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 {
+  ActivityIndicator,
+  type ActivityIndicatorProps,
+} from './features/activity-indicator/public';
 export type { AvatarProps, AvatarShape, AvatarSize } from './features/avatar/public';
 export type { AvatarGroupItem, AvatarGroupProps } from './features/avatar/public';
 export { Avatar, resolveAvatarInitials } from './features/avatar/public';
@@ -133,6 +127,30 @@ export type {
   DataTableSortState,
 } from './features/data-table/public';
 export { DataTable } from './features/data-table/public';
+export {
+  EmptyState,
+  type EmptyStateAction,
+  type EmptyStateProps,
+} from './features/empty-state/public';
+export {
+  Checkbox,
+  CheckboxGroup,
+  type CheckboxGroupOption,
+  type CheckboxGroupProps,
+  type CheckboxProps,
+} from './features/form/checkbox/public';
+export {
+  Radio,
+  RadioGroup,
+  type RadioGroupOption,
+  type RadioGroupProps,
+  type RadioProps,
+} from './features/form/radio/public';
+export {
+  TextInput,
+  type TextInputProps,
+  type TextInputTrailingAction,
+} from './features/form/text-input/public';
 export type { IconProps } from './features/icon/public';
 export { Icon } from './features/icon/public';
 export type { ImageFit, ImageProps, SurfaceImageSource } from './features/image/public';
@@ -161,6 +179,12 @@ export type {
   ManifestSectionListProps,
 } from './features/list/public';
 export { FlatList, SectionList } from './features/list/public';
+export {
+  Progress,
+  type ProgressProps,
+  ProgressRing,
+  type ProgressRingProps,
+} from './features/progress/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';
@@ -292,8 +316,6 @@ export type { ConfirmDialogProps } from './patterns/confirm-dialog';
 export { ConfirmDialog } from './patterns/confirm-dialog';
 export type { DisclosureSectionProps } from './patterns/disclosure-section';
 export { DisclosureSection } from './patterns/disclosure-section';
-export type { EmptyStateAction, EmptyStateProps } from './patterns/empty-state';
-export { EmptyState } from './patterns/empty-state';
 export type { FilterBarProps } from './patterns/filter-bar';
 export { FilterBar } from './patterns/filter-bar';
 export type { HeroAction, HeroAlign, HeroLayout, HeroProps, HeroTone } from './patterns/hero';

package/src/interactionPolicy.test.ts

@@ -39,7 +39,7 @@ describe('InteractionPolicy declaration', () => {
       readSource('theme/ZoraBaseProps.ts'),
       readComponent('app-bar', 'types.ts'),
       readComponent('breadcrumbs', 'types.ts'),
-      readPattern('empty-state', 'types.ts'),
+      readSource('types/empty-state.ts'),
       readPattern('hero', 'types.ts'),
       readSource('types/product-card.ts'),
       readPattern('reader', 'types.ts'),
@@ -100,7 +100,7 @@ describe('Breadcrumbs', () => {
 
 describe('EmptyState', () => {
   test('forwards interactionPolicy to Card and internal Buttons', () => {
-    const source = readPattern('empty-state', 'EmptyState.tsx');
+    const source = readSource('features/empty-state/adapters/inbound/EmptyState.tsx');
 
     expect(source).not.toMatch(/interactionPolicy:\s*_interactionPolicy/);
     expect(source).toMatch(/<Card[\s\S]*?interactionPolicy=\{interactionPolicy\}/);

package/src/metadata/allowedChildren.ts

@@ -1,4 +1,5 @@
 export const CONTAINER_ALLOWED_CHILDREN = [
+  'ActivityIndicator',
   'Surface',
   'Avatar',
   'AvatarGroup',
@@ -28,8 +29,7 @@ export const CONTAINER_ALLOWED_CHILDREN = [
   'ButtonGroup',
   'RadioGroup',
   'ThemeModeToggle',
-  'Input',
-  'Textarea',
+  'TextInput',
   'FormField',
   'Card',
   'Panel',

package/src/metadata/bindableComponentMeta.test.ts

@@ -11,7 +11,7 @@ describe('ZORA bindable component metadata', () => {
     expect(registry.Text?.bindings?.props?.text?.value.type).toBe('string');
     expect(registry.Heading?.bindings?.props?.text?.value.type).toBe('string');
     expect(registry.Button?.bindings?.props?.children?.value.type).toBe('string');
-    expect(registry.Input?.bindings?.props?.value?.value.type).toBe('string');
+    expect(registry.TextInput?.bindings?.props?.value?.value.type).toBe('string');
     expect(registry.Select?.bindings?.props?.value?.value.type).toBe('string');
     expect(registry.Image?.bindings?.props?.source?.value.type).toBe('imageAsset');
     expect(registry.DataTable?.bindings?.props?.rows?.value.type).toBe('array');

package/src/metadata/bindableComponentMeta.ts

@@ -131,24 +131,24 @@ export const ZORA_BINDABLE_COMPONENT_META = {
       },
     },
   },
-  Input: {
-    name: 'Input',
+  TextInput: {
+    name: 'TextInput',
     category: 'component',
-    description: 'Captures a single-line string value.',
+    description: 'Captures a string value in single-line, multiline, or secure-entry modes.',
     directManifestNode: true,
     allowedChildren: [],
     bindings: {
       props: {
         value: {
           label: 'Value',
-          description: 'Current input value.',
+          description: 'Current text input value.',
           value: { type: 'string' },
           acceptsFallback: true,
           acceptsTransforms: true,
         },
         disabled: {
           label: 'Disabled',
-          description: 'Whether the input is disabled.',
+          description: 'Whether the text input is disabled.',
           value: { type: 'boolean' },
           acceptsFallback: true,
           acceptsTransforms: true,
@@ -159,7 +159,7 @@ export const ZORA_BINDABLE_COMPONENT_META = {
           label: 'Change text',
           description: 'Runs when the input value changes.',
           payload: {
-            eventType: 'input.changeText',
+            eventType: 'textInput.changeText',
             fields: [{ path: 'value', type: 'string', label: 'Value' }],
           },
         },
@@ -168,7 +168,7 @@ export const ZORA_BINDABLE_COMPONENT_META = {
     events: {
       changeText: {
         label: 'Change text',
-        eventType: 'input.changeText',
+        eventType: 'textInput.changeText',
         description: 'Emitted when the input value changes.',
         payloadFields: [{ path: 'value', type: 'string', label: 'Value' }],
       },
@@ -186,61 +186,6 @@ export const ZORA_BINDABLE_COMPONENT_META = {
       },
     },
   },
-  Textarea: {
-    name: 'Textarea',
-    category: 'component',
-    description: 'Captures a multiline string value.',
-    directManifestNode: true,
-    allowedChildren: [],
-    bindings: {
-      props: {
-        value: {
-          label: 'Value',
-          description: 'Current textarea value.',
-          value: { type: 'string' },
-          acceptsFallback: true,
-          acceptsTransforms: true,
-        },
-        disabled: {
-          label: 'Disabled',
-          description: 'Whether the textarea is disabled.',
-          value: { type: 'boolean' },
-          acceptsFallback: true,
-          acceptsTransforms: true,
-        },
-      },
-      events: {
-        changeText: {
-          label: 'Change text',
-          description: 'Runs when the textarea value changes.',
-          payload: {
-            eventType: 'textarea.changeText',
-            fields: [{ path: 'value', type: 'string', label: 'Value' }],
-          },
-        },
-      },
-    },
-    events: {
-      changeText: {
-        label: 'Change text',
-        eventType: 'textarea.changeText',
-        description: 'Emitted when the textarea value changes.',
-        payloadFields: [{ path: 'value', type: 'string', label: 'Value' }],
-      },
-    },
-    props: {
-      value: {
-        type: 'string',
-        category: 'Content',
-        label: 'Value',
-      },
-      disabled: {
-        type: 'boolean',
-        category: 'State',
-        label: 'Disabled',
-      },
-    },
-  },
   Select: {
     name: 'Select',
     category: 'component',

package/src/metadata/componentMeta.test.ts

@@ -121,6 +121,7 @@ describe('ZORA_COMPONENT_META invariants', () => {
 
   test('direct manifest node leaf/container rules', () => {
     const expectedLeafNodes = new Set([
+      'ActivityIndicator',
       'Avatar',
       'AvatarGroup',
       'Badge',
@@ -135,10 +136,12 @@ describe('ZORA_COMPONENT_META invariants', () => {
       'EmptyState',
       'Hero',
       'Button',
+      'Checkbox',
+      'CheckboxGroup',
+      'Radio',
       'RadioGroup',
       'ThemeModeToggle',
-      'Input',
-      'Textarea',
+      'TextInput',
       'Text',
       'Heading',
       'Icon',

package/src/metadata/componentMeta.ts

@@ -1,15 +1,11 @@
 import { appBarMeta } from '../components/app-bar/meta';
 import { breadcrumbsMeta } from '../components/breadcrumbs/meta';
-import { checkboxGroupMeta, checkboxMeta } from '../components/checkbox/meta';
 import { datePickerMeta } from '../components/date-picker/meta';
 import { formActionsMeta, formErrorMeta, formFieldMeta, formMeta } from '../components/form/meta';
 import { gradientMeta } from '../components/gradient/meta';
-import { inputMeta } from '../components/input/meta';
 import { dropdownMenuMeta, menuMeta } from '../components/menu/meta';
 import { modalMeta } from '../components/modal/meta';
 import { paginationMeta } from '../components/pagination/meta';
-import { progressMeta, progressRingMeta } from '../components/progress/meta';
-import { radioGroupMeta, radioMeta } from '../components/radio/meta';
 import { ratingMeta } from '../components/rating/meta';
 import { searchBarMeta } from '../components/search-bar/meta';
 import { selectMeta } from '../components/select/meta';
@@ -20,10 +16,10 @@ import {
   skeletonTextMeta,
 } from '../components/skeleton/meta';
 import { tabsMeta } from '../components/tabs/meta';
-import { textareaMeta } from '../components/textarea/meta';
 import { timePickerMeta } from '../components/time-picker/meta';
 import { toastMeta, toastProviderMeta } from '../components/toast/meta';
 import { toolbarActionMeta, toolbarMeta } from '../components/toolbar/meta';
+import { activityIndicatorMeta } from '../features/activity-indicator/activityIndicatorMeta';
 import { avatarGroupMeta } from '../features/avatar/avatarGroupMeta';
 import { avatarMeta } from '../features/avatar/avatarMeta';
 import { badgeMeta } from '../features/badge/badgeMeta';
@@ -39,6 +35,10 @@ import { productCardMeta } from '../features/card/productCardMeta';
 import { chipGroupMeta } from '../features/chip/chipGroupMeta';
 import { chipMeta } from '../features/chip/chipMeta';
 import { dataTableMeta } from '../features/data-table/dataTableMeta';
+import { emptyStateMeta } from '../features/empty-state/emptyStateMeta';
+import { checkboxGroupMeta, checkboxMeta } from '../features/form/checkbox/checkboxMeta';
+import { radioGroupMeta, radioMeta } from '../features/form/radio/radioMeta';
+import { textInputMeta } from '../features/form/text-input/textInputMeta';
 import { iconMeta } from '../features/icon/iconMeta';
 import { imageMeta } from '../features/image/imageMeta';
 import { boxMeta } from '../features/layout/boxMeta';
@@ -49,6 +49,7 @@ import { gridMeta } from '../features/layout/gridMeta';
 import { stackMeta } from '../features/layout/stackMeta';
 import { flatListMeta } from '../features/list/flatListMeta';
 import { sectionListMeta } from '../features/list/sectionListMeta';
+import { progressMeta, progressRingMeta } from '../features/progress/progressMeta';
 import { splashScreenMeta } from '../features/splash-screen/splashScreenMeta';
 import { surfaceMeta } from '../features/surface/surfaceMeta';
 import { headingMeta } from '../features/typography/headingMeta';
@@ -73,7 +74,6 @@ import { chatListItemMeta } from '../patterns/chat-list-item/meta';
 import { collectionEditorMeta } from '../patterns/collection-editor/meta';
 import { confirmDialogMeta } from '../patterns/confirm-dialog/meta';
 import { disclosureSectionMeta } from '../patterns/disclosure-section/meta';
-import { emptyStateMeta } from '../patterns/empty-state/meta';
 import { filterBarMeta } from '../patterns/filter-bar/meta';
 import { heroMeta } from '../patterns/hero/meta';
 import { inspectorFieldMeta } from '../patterns/inspector-field/meta';
@@ -102,6 +102,7 @@ import type { ZoraComponentMetaRegistry } from './types';
 
 export const ZORA_COMPONENT_META: ZoraComponentMetaRegistry = finalizeFeatureMetadata({
   ...foundationMetas,
+  ActivityIndicator: activityIndicatorMeta,
   Box: boxMeta,
   Container: containerMeta,
   Stack: stackMeta,
@@ -132,7 +133,7 @@ export const ZORA_COMPONENT_META: ZoraComponentMetaRegistry = finalizeFeatureMet
   Icon: iconMeta,
   IconButton: iconButtonMeta,
   Image: imageMeta,
-  Input: inputMeta,
+  TextInput: textInputMeta,
   MediaCard: mediaCardMeta,
   Menu: menuMeta,
   MetricCard: metricCardMeta,
@@ -152,7 +153,6 @@ export const ZORA_COMPONENT_META: ZoraComponentMetaRegistry = finalizeFeatureMet
   SplashScreen: splashScreenMeta,
   Tabs: tabsMeta,
   Text: textMeta,
-  Textarea: textareaMeta,
   TimePicker: timePickerMeta,
   Toast: toastMeta,
   ToastProvider: toastProviderMeta,

package/src/metadata/themeRecipeMeta.ts

@@ -1,6 +1,6 @@
-import { radioGroupThemeRecipeMeta } from '../components/radio/themeRecipeMeta';
 import { buttonThemeRecipeMeta } from '../features/button/utils/themeRecipeMeta';
 import { cardThemeRecipeMeta } from '../features/card/utils/themeRecipeMeta';
+import { radioGroupThemeRecipeMeta } from '../features/form/radio/themeRecipeMeta';
 import { headingThemeRecipeMeta } from '../features/typography/utils/headingThemeRecipeMeta';
 import { textThemeRecipeMeta } from '../features/typography/utils/textThemeRecipeMeta';
 import { panelThemeRecipeMeta } from '../patterns/panel/themeRecipeMeta';

package/src/patterns/reader/ReaderSurface.tsx

@@ -1,9 +1,9 @@
 import React from 'react';
 
 import { AppBar } from '../../components/app-bar';
-import { Progress } from '../../components/progress';
 import { IconButton } from '../../features/button/public';
 import { Box, Stack } from '../../features/layout/public';
+import { Progress } from '../../features/progress/public';
 import { Surface } from '../../features/surface/public';
 import { Text } from '../../features/typography/public';
 import { Center, Inline } from '../../foundation';

package/src/patterns/theme-composer/ThemeComposer.tsx

@@ -3,12 +3,12 @@ import type { AppCategory } from '@ankhorage/contracts';
 import { APP_CATEGORIES } from '@ankhorage/contracts';
 import React from 'react';
 
-import { Input } from '../../components/input';
 import { Select } from '../../components/select';
 import { Tabs } from '../../components/tabs';
 import { Badge } from '../../features/badge/public';
 import { Button } from '../../features/button/public';
 import { Card } from '../../features/card/public';
+import { TextInput } from '../../features/form/text-input/public';
 import { Box, Stack } from '../../features/layout/public';
 import { Heading } from '../../features/typography/public';
 import { Text } from '../../features/typography/public';
@@ -140,7 +140,7 @@ function ThemeComposerInner({
         <Stack gap="m">
           <Stack gap="xs">
             <Text variant="label">Name</Text>
-            <Input
+            <TextInput
               value={nameDraft.inputValue}
               onChangeText={handleNameChange}
               placeholder="My theme"
@@ -182,7 +182,7 @@ function ThemeComposerInner({
         <Stack gap="m">
           <Stack direction="row" gap="m" align="center">
             <Box flex={1}>
-              <Input
+              <TextInput
                 value={hexDraft.inputValue}
                 onChangeText={handleHexChange}
                 placeholder={HEX_INPUT_PLACEHOLDER}

package/src/registry.ts

@@ -3,25 +3,21 @@ import type React from 'react';
 
 import { AppBar } from './components/app-bar';
 import { Breadcrumbs } from './components/breadcrumbs';
-import { Checkbox, CheckboxGroup } from './components/checkbox';
 import { DatePicker } from './components/date-picker';
 import { Form, FormActions, FormError, FormField } from './components/form';
 import { Gradient } from './components/gradient';
-import { Input } from './components/input';
 import { DropdownMenu, Menu } from './components/menu';
 import { Modal } from './components/modal';
 import { Pagination } from './components/pagination';
-import { Progress, ProgressRing } from './components/progress';
-import { Radio, RadioGroup } from './components/radio';
 import { Rating } from './components/rating';
 import { SearchBar } from './components/search-bar';
 import { Select } from './components/select';
 import { Skeleton, SkeletonCard, SkeletonList, SkeletonText } from './components/skeleton';
 import { Tabs } from './components/tabs';
-import { Textarea } from './components/textarea';
 import { TimePicker } from './components/time-picker';
 import { Toast } from './components/toast';
 import { Toolbar, ToolbarAction } from './components/toolbar';
+import { ActivityIndicator } from './features/activity-indicator/public';
 import { Avatar } from './features/avatar/public';
 import { AvatarGroup } from './features/avatar/public';
 import { Badge } from './features/badge/public';
@@ -37,11 +33,16 @@ import { ProductCard } from './features/card/public';
 import { Chip } from './features/chip/public';
 import { ChipGroup } from './features/chip/public';
 import { DataTable } from './features/data-table/public';
+import { EmptyState } from './features/empty-state/public';
+import { Checkbox, CheckboxGroup } from './features/form/checkbox/public';
+import { Radio, RadioGroup } from './features/form/radio/public';
+import { TextInput } from './features/form/text-input/public';
 import { Icon } from './features/icon/public';
 import { Image } from './features/image/public';
 import { Box, Container, Divider, Grid, Stack } from './features/layout/public';
 import { ContentRail } from './features/layout/public';
 import { FlatList, SectionList } from './features/list/public';
+import { Progress, ProgressRing } from './features/progress/public';
 import { SplashScreen } from './features/splash-screen/public';
 import { Surface } from './features/surface/public';
 import { Heading } from './features/typography/public';
@@ -66,7 +67,6 @@ import { ChatListItem } from './patterns/chat-list-item';
 import { CollectionEditor } from './patterns/collection-editor';
 import { ConfirmDialog } from './patterns/confirm-dialog';
 import { DisclosureSection } from './patterns/disclosure-section';
-import { EmptyState } from './patterns/empty-state';
 import { FilterBar } from './patterns/filter-bar';
 import { Hero } from './patterns/hero';
 import { InspectorField } from './patterns/inspector-field';
@@ -113,6 +113,7 @@ type _RegistryInteractionPolicyCheck = _AssertTrue<
 >;
 
 const _ZORA_COMPONENT_REGISTRY = {
+  ActivityIndicator,
   AppBar,
   Avatar,
   AvatarGroup,
@@ -137,7 +138,7 @@ const _ZORA_COMPONENT_REGISTRY = {
   Icon,
   IconButton,
   Image,
-  Input,
+  TextInput,
   MediaCard,
   Menu,
   MetricCard,
@@ -157,7 +158,6 @@ const _ZORA_COMPONENT_REGISTRY = {
   SplashScreen,
   Tabs,
   Text,
-  Textarea,
   TimePicker,
   Toast,
   Toolbar,

package/src/showcaseCoverage.test.ts

@@ -36,7 +36,7 @@ const REQUIRED_SHOWCASE_COVERAGE = {
     'Icon',
     'IconButton',
     'Image',
-    'Input',
+    'TextInput',
     'MediaCard',
     'MetricCard',
     'Modal',
@@ -49,7 +49,6 @@ const REQUIRED_SHOWCASE_COVERAGE = {
     'Select',
     'Tabs',
     'Text',
-    'Textarea',
     'Toolbar',
     'ToolbarAction',
   ],

package/src/theme/themeScopeStructure.test.ts

@@ -63,8 +63,8 @@ const scopedComponentFiles = [
   join(srcDir, 'features', 'card', 'adapters', 'inbound', 'Card.tsx'),
   join(srcDir, 'features', 'card', 'adapters', 'inbound', 'MediaCard.tsx'),
   join(srcDir, 'features', 'card', 'adapters', 'inbound', 'MetricCard.tsx'),
-  join(srcDir, 'components', 'checkbox', 'Checkbox.tsx'),
-  join(srcDir, 'components', 'checkbox', 'CheckboxGroup.tsx'),
+  join(srcDir, 'features', 'form', 'checkbox', 'adapters', 'inbound', 'Checkbox.tsx'),
+  join(srcDir, 'features', 'form', 'checkbox', 'adapters', 'inbound', 'CheckboxGroup.tsx'),
   join(srcDir, 'components', 'form', 'Form.tsx'),
   join(srcDir, 'components', 'form', 'FormActions.tsx'),
   join(srcDir, 'components', 'form', 'FormError.tsx'),
@@ -72,16 +72,15 @@ const scopedComponentFiles = [
   join(srcDir, 'features', 'typography', 'adapters', 'inbound', 'Heading.tsx'),
   join(srcDir, 'features', 'icon', 'adapters', 'inbound', 'Icon.tsx'),
   join(srcDir, 'features', 'button', 'adapters', 'inbound', 'IconButton.tsx'),
-  join(srcDir, 'components', 'input', 'Input.tsx'),
+  join(srcDir, 'features', 'form', 'text-input', 'adapters', 'inbound', 'TextInput.tsx'),
   join(srcDir, 'components', 'modal', 'Modal.tsx'),
-  join(srcDir, 'components', 'progress', 'Progress.tsx'),
-  join(srcDir, 'components', 'radio', 'Radio.tsx'),
-  join(srcDir, 'components', 'radio', 'RadioGroup.tsx'),
+  join(srcDir, 'features', 'progress', 'adapters', 'inbound', 'Progress.tsx'),
+  join(srcDir, 'features', 'form', 'radio', 'adapters', 'inbound', 'Radio.tsx'),
+  join(srcDir, 'features', 'form', 'radio', 'adapters', 'inbound', 'RadioGroup.tsx'),
   join(srcDir, 'components', 'rating', 'Rating.tsx'),
   join(srcDir, 'components', 'select', 'Select.tsx'),
   join(srcDir, 'components', 'tabs', 'Tabs.tsx'),
   join(srcDir, 'features', 'typography', 'adapters', 'inbound', 'Text.tsx'),
-  join(srcDir, 'components', 'textarea', 'Textarea.tsx'),
   join(srcDir, 'components', 'toolbar', 'Toolbar.tsx'),
   join(srcDir, 'components', 'toolbar', 'ToolbarAction.tsx'),
 
@@ -99,7 +98,7 @@ const scopedComponentFiles = [
   join(srcDir, 'patterns', 'collection-editor', 'CollectionEditor.tsx'),
   join(srcDir, 'patterns', 'confirm-dialog', 'ConfirmDialog.tsx'),
   join(srcDir, 'patterns', 'disclosure-section', 'DisclosureSection.tsx'),
-  join(srcDir, 'patterns', 'empty-state', 'EmptyState.tsx'),
+  join(srcDir, 'features', 'empty-state', 'adapters', 'inbound', 'EmptyState.tsx'),
   join(srcDir, 'patterns', 'form-field', 'FormField.tsx'),
   join(srcDir, 'patterns', 'inspector-field', 'InspectorField.tsx'),
   join(srcDir, 'patterns', 'list', 'List.tsx'),
@@ -136,20 +135,19 @@ const scopedPropTypeFiles = [
   join(srcDir, 'types', 'card.ts'),
   join(srcDir, 'types', 'media-card.ts'),
   join(srcDir, 'types', 'metric-card.ts'),
-  join(srcDir, 'components', 'checkbox', 'types.ts'),
+  join(srcDir, 'types', 'checkbox.ts'),
   join(srcDir, 'components', 'form', 'types.ts'),
   join(srcDir, 'types', 'heading.ts'),
   join(srcDir, 'types', 'icon.ts'),
   join(srcDir, 'types', 'icon-button.ts'),
-  join(srcDir, 'components', 'input', 'types.ts'),
+  join(srcDir, 'types', 'text-input.ts'),
   join(srcDir, 'components', 'modal', 'types.ts'),
-  join(srcDir, 'components', 'progress', 'types.ts'),
-  join(srcDir, 'components', 'radio', 'types.ts'),
+  join(srcDir, 'types', 'progress.ts'),
+  join(srcDir, 'types', 'radio.ts'),
   join(srcDir, 'components', 'rating', 'types.ts'),
   join(srcDir, 'components', 'select', 'types.ts'),
   join(srcDir, 'components', 'tabs', 'types.ts'),
   join(srcDir, 'types', 'text.ts'),
-  join(srcDir, 'components', 'textarea', 'types.ts'),
   join(srcDir, 'components', 'toolbar', 'types.ts'),
 
   join(srcDir, 'layout', 'app-shell', 'types.ts'),
@@ -163,7 +161,7 @@ const scopedPropTypeFiles = [
   join(srcDir, 'patterns', 'collection-editor', 'types.ts'),
   join(srcDir, 'patterns', 'confirm-dialog', 'types.ts'),
   join(srcDir, 'patterns', 'disclosure-section', 'types.ts'),
-  join(srcDir, 'patterns', 'empty-state', 'types.ts'),
+  join(srcDir, 'types', 'empty-state.ts'),
   join(srcDir, 'patterns', 'form-field', 'types.ts'),
   join(srcDir, 'patterns', 'inspector-field', 'types.ts'),
   join(srcDir, 'patterns', 'list', 'types.ts'),

package/src/types/activity-indicator.ts

@@ -0,0 +1,8 @@
+import type { ActivityIndicatorProps as ReactNativeActivityIndicatorProps } from 'react-native';
+
+import type { ZoraBaseProps } from '../theme/ZoraBaseProps';
+
+export interface ActivityIndicatorProps
+  extends ZoraBaseProps, Omit<ReactNativeActivityIndicatorProps, 'color'> {
+  color?: ReactNativeActivityIndicatorProps['color'];
+}

package/src/{components/checkbox/types.ts → types/checkbox.ts}

@@ -1,7 +1,7 @@
 import type { CheckboxProps as SurfaceCheckboxProps } from '@ankhorage/surface';
 import type React from 'react';
 
-import type { ZoraBaseProps } from '../../theme/ZoraBaseProps';
+import type { ZoraBaseProps } from '../theme/ZoraBaseProps';
 
 export interface CheckboxProps
   extends ZoraBaseProps, Omit<SurfaceCheckboxProps, 'mode' | 'themeId'> {}

package/src/{patterns/empty-state/types.ts → types/empty-state.ts}

@@ -1,7 +1,7 @@
 import type React from 'react';
 
-import type { ZoraButtonVariant, ZoraColor } from '../../internal/recipes';
-import type { ZoraBaseProps } from '../../theme/ZoraBaseProps';
+import type { ZoraButtonVariant, ZoraColor } from '../internal/recipes';
+import type { ZoraBaseProps } from '../theme/ZoraBaseProps';
 
 export interface EmptyStateAction {
   label: React.ReactNode;

package/src/{components/progress/types.ts → types/progress.ts}

@@ -1,7 +1,7 @@
 import type { RoleSemantics, SurfaceTheme } from '@ankhorage/surface';
 
-import type { ZoraColor, ZoraControlSize } from '../../internal/recipes';
-import type { ZoraBaseProps } from '../../theme/ZoraBaseProps';
+import type { ZoraColor, ZoraControlSize } from '../internal/recipes';
+import type { ZoraBaseProps } from '../theme/ZoraBaseProps';
 
 export interface ProgressProps extends ZoraBaseProps {
   value: number;