@ankhorage/zora 9.0.1 → 11.0.0

package/src/metadata/allowedChildren.ts

@@ -10,7 +10,6 @@ export const CONTAINER_ALLOWED_CHILDREN = [
   'ChipGroup',
   'DataTable',
   'IconButton',
-  'SplashScreen',
   'Uploader',
   'FlatList',
   'SectionList',
@@ -25,12 +24,13 @@ export const CONTAINER_ALLOWED_CHILDREN = [
   'Heading',
   'Icon',
   'Image',
+  'KeyboardAvoidingView',
   'Button',
   'ButtonGroup',
   'RadioGroup',
   'ThemeModeToggle',
   'TextInput',
-  'FormField',
+  'Form',
   'Card',
   'Panel',
   'Notice',

package/src/metadata/componentMeta.test.ts

@@ -51,7 +51,7 @@ describe('ZORA_COMPONENT_META event metadata', () => {
     const eventType: ZoraComponentEventPayloadKind = event?.eventType ?? 'form.submit';
 
     expect(eventType).toBe('form.submit');
-    expect(event?.payloadFields?.map((field) => field.path)).toEqual(['payload.values']);
+    expect(event?.payloadFields).toEqual([]);
   });
 
   test('declares button event metadata', () => {
@@ -100,6 +100,21 @@ describe('ZORA_COMPONENT_META requirement metadata', () => {
 });
 
 describe('ZORA_COMPONENT_META invariants', () => {
+  test('keeps form nodes in their canonical hierarchy', () => {
+    expect(ZORA_COMPONENT_META.Form.allowedChildren).toEqual(['FormError', 'FormField']);
+    expect(ZORA_COMPONENT_META.FormField.allowedChildren).toEqual([
+      'Checkbox',
+      'CheckboxGroup',
+      'RadioGroup',
+      'TextInput',
+    ]);
+    for (const [name, meta] of Object.entries(ZORA_COMPONENT_META)) {
+      if (name === 'Form') continue;
+      expect(meta.allowedChildren).not.toContain('FormError');
+      expect(meta.allowedChildren).not.toContain('FormField');
+    }
+  });
+
   test('every key matches meta.name', () => {
     for (const [key, meta] of Object.entries(ZORA_COMPONENT_META)) {
       expect(meta.name).toBe(key);
@@ -136,6 +151,7 @@ describe('ZORA_COMPONENT_META invariants', () => {
       'EmptyState',
       'Hero',
       'Button',
+      'FormError',
       'Checkbox',
       'CheckboxGroup',
       'Radio',
@@ -158,12 +174,13 @@ describe('ZORA_COMPONENT_META invariants', () => {
     ]);
 
     const expectedContainerNodes = new Set([
+      'Form',
       'Surface',
       'MediaCard',
-      'SplashScreen',
       'FlatList',
       'SectionList',
       'BottomSheet',
+      'KeyboardAvoidingView',
       'FormField',
       'ButtonGroup',
       'Screen',
@@ -244,6 +261,19 @@ describe('ZORA_COMPONENT_META invariants', () => {
     expect(ZORA_COMPONENT_META.ThemeModeToggle.blueprint?.defaultProps).toEqual({ size: 'm' });
   });
 
+  test('KeyboardAvoidingView is a direct manifest container with native behavior props', () => {
+    const keyboardAvoidingView = ZORA_COMPONENT_META.KeyboardAvoidingView;
+
+    expect(keyboardAvoidingView.directManifestNode).toBe(true);
+    expect(keyboardAvoidingView.allowedChildren.length).toBeGreaterThan(0);
+    expect(keyboardAvoidingView.blueprint?.defaultProps).toEqual({
+      behavior: 'padding',
+      enabled: true,
+      keyboardVerticalOffset: 0,
+    });
+    expect(keyboardAvoidingView.props.behavior?.enum).toEqual(['height', 'position', 'padding']);
+  });
+
   test('Progress is a direct manifest leaf with serializable defaults', () => {
     expect(ZORA_COMPONENT_META.Progress.directManifestNode).toBe(true);
     expect(ZORA_COMPONENT_META.Progress.allowedChildren).toEqual([]);

package/src/metadata/componentMeta.ts

@@ -1,7 +1,6 @@
 import { appBarMeta } from '../components/app-bar/meta';
 import { breadcrumbsMeta } from '../components/breadcrumbs/meta';
 import { datePickerMeta } from '../components/date-picker/meta';
-import { formActionsMeta, formErrorMeta, formFieldMeta, formMeta } from '../components/form/meta';
 import { gradientMeta } from '../components/gradient/meta';
 import { dropdownMenuMeta, menuMeta } from '../components/menu/meta';
 import { modalMeta } from '../components/modal/meta';
@@ -37,10 +36,15 @@ 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 { formActionsMeta } from '../features/form/formActionsMeta';
+import { formErrorMeta } from '../features/form/formErrorMeta';
+import { formFieldMeta } from '../features/form/formFieldMeta';
+import { formMeta } from '../features/form/formMeta';
 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 { keyboardAvoidingViewMeta } from '../features/keyboard-avoiding-view/keyboardAvoidingViewMeta';
 import { boxMeta } from '../features/layout/boxMeta';
 import { containerMeta } from '../features/layout/containerMeta';
 import { contentRailMeta } from '../features/layout/contentRailMeta';
@@ -50,7 +54,6 @@ 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';
 import { textMeta } from '../features/typography/textMeta';
@@ -133,6 +136,7 @@ export const ZORA_COMPONENT_META: ZoraComponentMetaRegistry = finalizeFeatureMet
   Icon: iconMeta,
   IconButton: iconButtonMeta,
   Image: imageMeta,
+  KeyboardAvoidingView: keyboardAvoidingViewMeta,
   TextInput: textInputMeta,
   MediaCard: mediaCardMeta,
   Menu: menuMeta,
@@ -150,7 +154,6 @@ export const ZORA_COMPONENT_META: ZoraComponentMetaRegistry = finalizeFeatureMet
   SkeletonCard: skeletonCardMeta,
   SkeletonList: skeletonListMeta,
   SkeletonText: skeletonTextMeta,
-  SplashScreen: splashScreenMeta,
   Tabs: tabsMeta,
   Text: textMeta,
   TimePicker: timePickerMeta,

package/src/patterns/auth/AuthForm.tsx

@@ -0,0 +1,68 @@
+import React from 'react';
+
+import { FormActions, FormError, useFormController } from '../../features/form/public';
+import { Stack } from '../../features/layout/public';
+import type { ZoraBaseProps } from '../../theme/ZoraBaseProps';
+import type { FormErrors, FormFieldConfig, FormValues } from '../../types/form';
+import { AuthFormField } from './AuthFormField';
+
+interface AuthFormProps<TName extends string> {
+  fields: readonly FormFieldConfig<TName>[];
+  values: FormValues<TName>;
+  onChange: (values: FormValues<TName>) => void;
+  onSubmit: (values: FormValues<TName>) => void | Promise<void>;
+  errors?: FormErrors<TName>;
+  error?: React.ReactNode;
+  loading?: boolean;
+  disabled?: boolean;
+  submitLabel?: React.ReactNode;
+  actions?: React.ReactNode;
+  testID?: string;
+  interactionPolicy?: ZoraBaseProps['interactionPolicy'];
+}
+
+/*** Keeps config-driven field orchestration private to the auth patterns that own it. */
+export function AuthForm<TName extends string>({
+  fields,
+  values,
+  onChange,
+  onSubmit,
+  errors,
+  error,
+  loading = false,
+  disabled = false,
+  submitLabel = 'Submit',
+  actions,
+  testID,
+  interactionPolicy,
+}: AuthFormProps<TName>) {
+  const controller = useFormController({ fields, values, errors, onChange, onSubmit });
+  return (
+    <Stack gap="m" testID={testID}>
+      <FormError error={error} />
+      {fields.map((field) => (
+        <AuthFormField
+          key={field.name}
+          disabled={disabled}
+          error={controller.errors[field.name]}
+          field={field}
+          interactionPolicy={interactionPolicy}
+          loading={loading}
+          onChange={controller.setFieldValue}
+          value={values[field.name]}
+        />
+      ))}
+      <FormActions
+        disabled={disabled}
+        interactionPolicy={interactionPolicy}
+        loading={loading}
+        onSubmit={() => {
+          if (interactionPolicy !== 'passive') void controller.handleSubmit();
+        }}
+        submitLabel={submitLabel}
+      >
+        {actions}
+      </FormActions>
+    </Stack>
+  );
+}

package/src/patterns/auth/AuthFormField.tsx

@@ -0,0 +1,81 @@
+import React from 'react';
+
+import { FormField, hasRequiredRule } from '../../features/form/public';
+import { TextInput } from '../../features/form/text-input/public';
+import type { ZoraBaseProps } from '../../theme/ZoraBaseProps';
+import type { FormFieldConfig, FormFieldValue } from '../../types/form';
+
+interface AuthFormFieldProps<TName extends string> {
+  field: FormFieldConfig<TName>;
+  value: FormFieldValue;
+  onChange: (name: TName, value: FormFieldValue) => void;
+  error?: React.ReactNode;
+  disabled?: boolean;
+  loading?: boolean;
+  interactionPolicy?: ZoraBaseProps['interactionPolicy'];
+}
+
+/*** Adapts an auth field configuration to the public compositional form primitives. */
+export function AuthFormField<TName extends string>({
+  field,
+  value,
+  onChange,
+  error,
+  disabled = false,
+  loading = false,
+  interactionPolicy,
+}: AuthFormFieldProps<TName>) {
+  const fieldDisabled = disabled || loading || field.disabled;
+  return (
+    <FormField
+      description={field.description}
+      disabled={fieldDisabled}
+      errorText={error}
+      helperText={field.helperText}
+      invalid={Boolean(error)}
+      label={field.label}
+      readOnly={field.readOnly}
+      required={field.required ?? hasRequiredRule(field.rules)}
+      testID={field.testID}
+    >
+      <TextInput
+        accessibilityLabel={typeof field.label === 'string' ? field.label : undefined}
+        autoCapitalize={
+          field.autoCapitalize ??
+          (['email', 'password', 'url'].includes(field.type ?? 'text') ? 'none' : undefined)
+        }
+        autoComplete={field.autoComplete}
+        disabled={fieldDisabled}
+        interactionPolicy={interactionPolicy}
+        invalid={Boolean(error)}
+        keyboardType={resolveKeyboardType(field)}
+        maxLength={field.maxLength}
+        onChangeText={(nextValue) => onChange(field.name, nextValue)}
+        placeholder={field.placeholder}
+        readOnly={field.readOnly}
+        secureTextEntry={field.secureTextEntry ?? field.type === 'password'}
+        textContentType={resolveTextContentType(field)}
+        value={value}
+      />
+    </FormField>
+  );
+}
+
+/*** Resolves the native keyboard for an auth field configuration. */
+function resolveKeyboardType(field: FormFieldConfig) {
+  if (field.keyboardType) return field.keyboardType;
+  if (field.type === 'email') return 'email-address';
+  if (field.type === 'number' || field.type === 'otp') return 'number-pad';
+  if (field.type === 'tel') return 'phone-pad';
+  if (field.type === 'url') return 'url';
+  return undefined;
+}
+
+/*** Resolves platform text-content hints for an auth field configuration. */
+function resolveTextContentType(field: FormFieldConfig) {
+  if (field.textContentType) return field.textContentType;
+  if (field.type === 'email') return 'emailAddress';
+  if (field.type === 'password') return 'password';
+  if (field.type === 'otp') return 'oneTimeCode';
+  return undefined;
+}

package/src/patterns/auth/ForgotPasswordForm.tsx

@@ -1,9 +1,10 @@
 import React from 'react';
 
-import { Form, type FormFieldConfig, type FormValues } from '../../components/form';
 import { Button } from '../../features/button/public';
 import { Stack } from '../../features/layout/public';
 import { withZoraThemeScope } from '../../theme/withZoraThemeScope';
+import type { FormFieldConfig, FormValues } from '../../types/form';
+import { AuthForm } from './AuthForm';
 import type { ForgotPasswordFormProps } from './types';
 import {
   defaultIdentifiers,
@@ -56,7 +57,7 @@ function ForgotPasswordFormInner({
   );
 
   return (
-    <Form
+    <AuthForm
       actions={
         onSignIn ? (
           <Stack direction="row" gap="s" wrap="wrap">

package/src/patterns/auth/OtpForm.tsx

@@ -1,9 +1,10 @@
 import React from 'react';
 
-import { Form, type FormFieldConfig, type FormValues } from '../../components/form';
 import { Button } from '../../features/button/public';
 import { Stack } from '../../features/layout/public';
 import { withZoraThemeScope } from '../../theme/withZoraThemeScope';
+import type { FormFieldConfig, FormValues } from '../../types/form';
+import { AuthForm } from './AuthForm';
 import type { OtpFormProps } from './types';
 
 type OtpFieldName = 'otp';
@@ -51,7 +52,7 @@ function OtpFormInner({
   );
 
   return (
-    <Form
+    <AuthForm
       actions={
         onResend ? (
           <Stack direction="row" gap="s" wrap="wrap">

package/src/patterns/auth/SignInForm.tsx

@@ -1,9 +1,10 @@
 import React from 'react';
 
-import { Form, type FormFieldConfig, type FormValues } from '../../components/form';
 import { Button } from '../../features/button/public';
 import { Stack } from '../../features/layout/public';
 import { withZoraThemeScope } from '../../theme/withZoraThemeScope';
+import type { FormFieldConfig, FormValues } from '../../types/form';
+import { AuthForm } from './AuthForm';
 import type { SignInFormProps } from './types';
 import {
   defaultIdentifiers,
@@ -68,7 +69,7 @@ function SignInFormInner({
   );
 
   return (
-    <Form
+    <AuthForm
       actions={
         hasActions ? (
           <Stack direction="row" gap="s" wrap="wrap">

package/src/patterns/auth/SignUpForm.tsx

@@ -1,9 +1,10 @@
 import React from 'react';
 
-import { Form, type FormFieldConfig, type FormValues } from '../../components/form';
 import { Button } from '../../features/button/public';
 import { Stack } from '../../features/layout/public';
 import { withZoraThemeScope } from '../../theme/withZoraThemeScope';
+import type { FormFieldConfig, FormValues } from '../../types/form';
+import { AuthForm } from './AuthForm';
 import type { SignUpFormProps } from './types';
 
 const defaultSignUpFields = [
@@ -48,7 +49,7 @@ function SignUpFormInner({
   const [values, setValues] = React.useState<FormValues>(() => createValues(fields));
 
   return (
-    <Form
+    <AuthForm
       actions={
         onSignIn ? (
           <Stack direction="row" gap="s" wrap="wrap">

package/src/patterns/auth/types.ts

@@ -1,9 +1,9 @@
 import type { ButtonIconSpec } from '@ankhorage/surface';
 import type React from 'react';
 
-import type { FormFieldConfig, FormValues } from '../../components/form';
 import type { ButtonProps } from '../../features/button/public';
 import type { ZoraBaseProps } from '../../theme/ZoraBaseProps';
+import type { FormFieldConfig, FormValues } from '../../types/form';
 
 export type AuthIdentifierKind = 'email' | 'phone' | 'username';
 

package/src/patterns/auth/utils.ts

@@ -1,4 +1,4 @@
-import type { FormFieldConfig, ValidationRule } from '../../components/form';
+import type { FormFieldConfig, ValidationRule } from '../../types/form';
 import type { AuthIdentifierKind } from './types';
 
 export const defaultIdentifiers = ['email'] as const satisfies readonly AuthIdentifierKind[];

package/src/patterns/inspector-field/InspectorField.tsx

@@ -1,8 +1,8 @@
 import React from 'react';
 
+import { FormField } from '../../features/form/public';
 import { Box, Stack } from '../../features/layout/public';
 import { withZoraThemeScope } from '../../theme/withZoraThemeScope';
-import { FormField } from '../form-field';
 import type { InspectorFieldProps } from './types';
 
 function InspectorFieldInner({

package/src/platformAcceptance.test.ts

@@ -9,6 +9,6 @@ test('passes the isolated Surface 4 and RN Web 0.21 acceptance suite', () => {
   const output = `${subprocess.stdout.toString()}\n${subprocess.stderr.toString()}`;
 
   expect(subprocess.exitCode, output).toBe(0);
-  expect(output).toContain('9 pass');
+  expect(output).toContain('10 pass');
   expect(output).toContain('0 fail');
 });

package/src/registry.ts

@@ -4,7 +4,6 @@ import type React from 'react';
 import { AppBar } from './components/app-bar';
 import { Breadcrumbs } from './components/breadcrumbs';
 import { DatePicker } from './components/date-picker';
-import { Form, FormActions, FormError, FormField } from './components/form';
 import { Gradient } from './components/gradient';
 import { DropdownMenu, Menu } from './components/menu';
 import { Modal } from './components/modal';
@@ -35,15 +34,16 @@ 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 { Form, FormActions, FormError, FormField } from './features/form/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 { KeyboardAvoidingView } from './features/keyboard-avoiding-view/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';
 import { Text } from './features/typography/public';
@@ -138,6 +138,7 @@ const _ZORA_COMPONENT_REGISTRY = {
   Icon,
   IconButton,
   Image,
+  KeyboardAvoidingView,
   TextInput,
   MediaCard,
   Menu,
@@ -155,7 +156,6 @@ const _ZORA_COMPONENT_REGISTRY = {
   SkeletonCard,
   SkeletonList,
   SkeletonText,
-  SplashScreen,
   Tabs,
   Text,
   TimePicker,

package/src/showcaseCoverage.test.ts

@@ -36,6 +36,7 @@ const REQUIRED_SHOWCASE_COVERAGE = {
     'Icon',
     'IconButton',
     'Image',
+    'KeyboardAvoidingView',
     'TextInput',
     'MediaCard',
     'MetricCard',

package/src/theme/themeScopeStructure.test.ts

@@ -65,10 +65,10 @@ const scopedComponentFiles = [
   join(srcDir, 'features', 'card', 'adapters', 'inbound', 'MetricCard.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'),
-  join(srcDir, 'components', 'form', 'FormField.tsx'),
+  join(srcDir, 'features', 'form', 'adapters', 'inbound', 'Form.tsx'),
+  join(srcDir, 'features', 'form', 'adapters', 'inbound', 'FormActions.tsx'),
+  join(srcDir, 'features', 'form', 'adapters', 'inbound', 'FormError.tsx'),
+  join(srcDir, 'features', 'form', 'adapters', 'inbound', 'FormField.tsx'),
   join(srcDir, 'features', 'typography', 'adapters', 'inbound', 'Heading.tsx'),
   join(srcDir, 'features', 'icon', 'adapters', 'inbound', 'Icon.tsx'),
   join(srcDir, 'features', 'button', 'adapters', 'inbound', 'IconButton.tsx'),
@@ -99,7 +99,6 @@ const scopedComponentFiles = [
   join(srcDir, 'patterns', 'confirm-dialog', 'ConfirmDialog.tsx'),
   join(srcDir, 'patterns', 'disclosure-section', 'DisclosureSection.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'),
   join(srcDir, 'patterns', 'list', 'ListRow.tsx'),
@@ -136,7 +135,7 @@ const scopedPropTypeFiles = [
   join(srcDir, 'types', 'media-card.ts'),
   join(srcDir, 'types', 'metric-card.ts'),
   join(srcDir, 'types', 'checkbox.ts'),
-  join(srcDir, 'components', 'form', 'types.ts'),
+  join(srcDir, 'types', 'form.ts'),
   join(srcDir, 'types', 'heading.ts'),
   join(srcDir, 'types', 'icon.ts'),
   join(srcDir, 'types', 'icon-button.ts'),
@@ -162,7 +161,6 @@ const scopedPropTypeFiles = [
   join(srcDir, 'patterns', 'confirm-dialog', 'types.ts'),
   join(srcDir, 'patterns', 'disclosure-section', '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'),
   join(srcDir, 'patterns', 'notice', 'types.ts'),

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

@@ -1,20 +1,18 @@
 import type { FieldProps as SurfaceFieldProps } from '@ankhorage/surface';
 import type React from 'react';
 
-import type { ZoraBaseProps } from '../../theme/ZoraBaseProps';
-import type { TextInputProps } from '../../types/text-input';
+import type { ZoraBaseProps } from '../theme/ZoraBaseProps';
+import type { TextInputProps } from './text-input';
 
 export type ValidationRule =
   | { kind: 'required'; message?: string }
   | { kind: 'email'; message?: string }
   | { kind: 'minLength'; value: number; message?: string }
   | { kind: 'pattern'; value: string; message?: string };
-
 export type FormFieldValue = string;
 export type FormValues<TName extends string = string> = Record<TName, FormFieldValue>;
 export type FormErrors<TName extends string = string> = Partial<Record<TName, React.ReactNode>>;
 export type FormValidationErrors<TName extends string = string> = Partial<Record<TName, string>>;
-
 export type FormFieldInputType = 'email' | 'number' | 'otp' | 'password' | 'tel' | 'text' | 'url';
 
 export interface FormFieldConfig<TName extends string = string> {
@@ -37,7 +35,16 @@ export interface FormFieldConfig<TName extends string = string> {
   testID?: string;
 }
 
-interface FormFieldWrapperProps
+export interface FormProps extends ZoraBaseProps {
+  children?: React.ReactNode;
+  onSubmit?: () => void | Promise<void>;
+  loading?: boolean;
+  disabled?: boolean;
+  submitLabel?: React.ReactNode;
+  actions?: React.ReactNode;
+}
+
+export interface FormFieldProps
   extends
     ZoraBaseProps,
     Pick<
@@ -49,18 +56,6 @@ interface FormFieldWrapperProps
   helperText?: React.ReactNode;
 }
 
-export interface FormFieldControlProps<TName extends string = string> extends ZoraBaseProps {
-  field: FormFieldConfig<TName>;
-  value: FormFieldValue;
-  onChange: (name: TName, value: FormFieldValue) => void;
-  error?: React.ReactNode;
-  disabled?: boolean;
-  loading?: boolean;
-}
-
-export type FormFieldProps<TName extends string = string> =
-  FormFieldControlProps<TName> | FormFieldWrapperProps;
-
 export interface FormActionsProps extends ZoraBaseProps {
   submitLabel?: React.ReactNode;
   loading?: boolean;
@@ -68,31 +63,13 @@ export interface FormActionsProps extends ZoraBaseProps {
   onSubmit?: () => void;
   children?: React.ReactNode;
 }
-
 export interface FormErrorProps extends ZoraBaseProps {
   error?: React.ReactNode;
 }
-
-export interface FormProps<TName extends string = string> extends ZoraBaseProps {
-  fields: readonly FormFieldConfig<TName>[];
-  values: FormValues<TName>;
-  onChange: (values: FormValues<TName>) => void;
-  onSubmit: (values: FormValues<TName>) => void | Promise<void>;
-  errors?: FormErrors<TName>;
-  error?: React.ReactNode;
-  loading?: boolean;
-  disabled?: boolean;
-  submitLabel?: React.ReactNode;
-  actions?: React.ReactNode;
-  footer?: React.ReactNode;
-  validateOnChange?: boolean;
-}
-
 export interface FormValidationResult<TName extends string = string> {
   errors: FormValidationErrors<TName>;
   valid: boolean;
 }
-
 export interface UseFormControllerOptions<TName extends string = string> {
   fields: readonly FormFieldConfig<TName>[];
   initialValues?: Partial<FormValues<TName>>;
@@ -102,7 +79,6 @@ export interface UseFormControllerOptions<TName extends string = string> {
   onSubmit?: (values: FormValues<TName>) => void | Promise<void>;
   validateOnChange?: boolean;
 }
-
 export interface UseFormControllerResult<TName extends string = string> {
   values: FormValues<TName>;
   errors: FormErrors<TName>;

package/src/types/keyboard-avoiding-view.ts

@@ -0,0 +1,10 @@
+import type { KeyboardAvoidingViewProps as SurfaceKeyboardAvoidingViewProps } from '@ankhorage/surface';
+
+import type { ZoraBaseProps } from '../theme/ZoraBaseProps';
+
+export type KeyboardAvoidingViewBehavior = NonNullable<
+  SurfaceKeyboardAvoidingViewProps['behavior']
+>;
+
+export interface KeyboardAvoidingViewProps
+  extends ZoraBaseProps, Omit<SurfaceKeyboardAvoidingViewProps, keyof ZoraBaseProps> {}

package/dist/components/form/Form.d.ts

@@ -1,7 +0,0 @@
-import React from 'react';
-import type { FormProps } from './types';
-/***
- * Composes fields and actions into a validated form layout.
- */
-export declare const Form: <TName extends string = string>(props: FormProps<TName>) => React.ReactElement | null;
-//# sourceMappingURL=Form.d.ts.map

package/dist/components/form/Form.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"Form.d.ts","sourceRoot":"","sources":["../../../src/components/form/Form.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAO1B,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AA+DzC;;GAEG;AACH,eAAO,MAAM,IAAI,GA/DE,KAAK,SAAS,MAAM,gEA+DU,CAAC"}