@dxos/react-ui-form 0.7.4 → 0.7.5-labs.071a3e2

package/dist/types/src/hooks/useForm.d.ts

@@ -1,45 +1,43 @@
-import { type FocusEvent } from 'react';
-import { type BaseObject, type PropertyKey } from '@dxos/echo-schema';
-import { type SimpleType, type S } from '@dxos/effect';
+import { type BaseObject } from '@dxos/echo-schema';
+import { type S, type SimpleType, type JsonPath } from '@dxos/effect';
 import { type ValidationError } from '@dxos/schema';
 import { type MaybePromise } from '@dxos/util';
-export type FormPath<T extends object = {}> = PropertyKey<T> | `${PropertyKey<T>}.${number}`;
 /**
  * Return type from `useForm` hook.
  */
 export type FormHandler<T extends BaseObject> = {
-    values: T;
-    errors: Record<FormPath<T>, string>;
-    touched: Record<FormPath<T>, boolean>;
-    changed: Record<FormPath<T>, boolean>;
+    values: Partial<T>;
+    errors: Record<JsonPath, string>;
+    touched: Record<JsonPath, boolean>;
+    changed: Record<JsonPath, boolean>;
     canSave: boolean;
     handleSave: () => void;
-    getStatus: (property: FormPath<T>) => {
+    getStatus: (path: string | (string | number)[]) => {
         status?: 'error';
         error?: string;
     };
-    getValue: <V>(property: FormPath<T>) => V;
-    onValueChange: <V>(property: FormPath<T>, type: SimpleType, value: V) => void;
-    onBlur: (event: FocusEvent<HTMLInputElement | HTMLTextAreaElement>) => void;
+    getValue: <V>(path: (string | number)[]) => V | undefined;
+    onValueChange: <V>(path: (string | number)[], type: SimpleType, value: V) => void;
+    onTouched: (path: (string | number)[]) => void;
 };
 /**
  * Hook options.
  */
 export interface FormOptions<T extends BaseObject> {
     /**
-     * Effect schema.
+     * Effect schema (Type literal).
      */
     schema: S.Schema<T>;
     /**
      * Initial values (which may not pass validation).
      */
-    initialValues: T;
+    initialValues: Partial<T>;
     /**
      * Callback for value changes. Note: This is called even when values are invalid.
      * Sometimes the parent component may want to know about changes even if the form is
      * in an invalid state.
      */
-    onValuesChanged?: (values: T) => void;
+    onValuesChanged?: (values: Partial<T>) => void;
     /**
      * Custom validation function that runs only after schema validation passes.
      * Use this for complex validation logic that can't be expressed in the schema.

package/dist/types/src/hooks/useForm.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useForm.d.ts","sourceRoot":"","sources":["../../../../src/hooks/useForm.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,UAAU,EAA6C,MAAM,OAAO,CAAC;AAEnF,OAAO,EAAE,KAAK,UAAU,EAAE,KAAK,WAAW,EAAE,MAAM,mBAAmB,CAAC;AACtE,OAAO,EAAE,KAAK,UAAU,EAAE,KAAK,CAAC,EAAE,MAAM,cAAc,CAAC;AAGvD,OAAO,EAAkB,KAAK,eAAe,EAAE,MAAM,cAAc,CAAC;AACpE,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,YAAY,CAAC;AAG/C,MAAM,MAAM,QAAQ,CAAC,CAAC,SAAS,MAAM,GAAG,EAAE,IAAI,WAAW,CAAC,CAAC,CAAC,GAAG,GAAG,WAAW,CAAC,CAAC,CAAC,IAAI,MAAM,EAAE,CAAC;AAE7F;;GAEG;AACH,MAAM,MAAM,WAAW,CAAC,CAAC,SAAS,UAAU,IAAI;IAK9C,MAAM,EAAE,CAAC,CAAC;IACV,MAAM,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;IACpC,OAAO,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;IACtC,OAAO,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;IACtC,OAAO,EAAE,OAAO,CAAC;IACjB,UAAU,EAAE,MAAM,IAAI,CAAC;IAMvB,SAAS,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,KAAK;QAAE,MAAM,CAAC,EAAE,OAAO,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAC3E,QAAQ,EAAE,CAAC,CAAC,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;IAC1C,aAAa,EAAE,CAAC,CAAC,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC,KAAK,IAAI,CAAC;IAC9E,MAAM,EAAE,CAAC,KAAK,EAAE,UAAU,CAAC,gBAAgB,GAAG,mBAAmB,CAAC,KAAK,IAAI,CAAC;CAC7E,CAAC;AAEF;;GAEG;AACH,MAAM,WAAW,WAAW,CAAC,CAAC,SAAS,UAAU;IAC/C;;OAEG;IAEH,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IAEpB;;OAEG;IAEH,aAAa,EAAE,CAAC,CAAC;IAEjB;;;;OAIG;IACH,eAAe,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAK,IAAI,CAAC;IAEtC;;;;OAIG;IAEH,UAAU,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAK,eAAe,EAAE,GAAG,SAAS,CAAC;IAE1D;;OAEG;IACH,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE;QAAE,OAAO,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAA;KAAE,KAAK,IAAI,CAAC;IAE5E;;OAEG;IACH,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE;QAAE,OAAO,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAA;KAAE,KAAK,YAAY,CAAC,IAAI,CAAC,CAAC;CAC1F;AAED;;;GAGG;AACH,eAAO,MAAM,OAAO,GAAI,CAAC,SAAS,UAAU,4EAOzC,WAAW,CAAC,CAAC,CAAC,KAAG,WAAW,CAAC,CAAC,CAwIhC,CAAC"}
+{"version":3,"file":"useForm.d.ts","sourceRoot":"","sources":["../../../../src/hooks/useForm.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,KAAK,UAAU,EAAsB,MAAM,mBAAmB,CAAC;AACxE,OAAO,EAAO,KAAK,CAAC,EAAE,KAAK,UAAU,EAAE,KAAK,QAAQ,EAA4C,MAAM,cAAc,CAAC;AAGrH,OAAO,EAAkB,KAAK,eAAe,EAAE,MAAM,cAAc,CAAC;AACpE,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,YAAY,CAAC;AAE/C;;GAEG;AACH,MAAM,MAAM,WAAW,CAAC,CAAC,SAAS,UAAU,IAAI;IAK9C,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IACjC,OAAO,EAAE,MAAM,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IACnC,OAAO,EAAE,MAAM,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IACnC,OAAO,EAAE,OAAO,CAAC;IACjB,UAAU,EAAE,MAAM,IAAI,CAAC;IAMvB,SAAS,EAAE,CAAC,IAAI,EAAE,MAAM,GAAG,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,KAAK;QAAE,MAAM,CAAC,EAAE,OAAO,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACxF,QAAQ,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,KAAK,CAAC,GAAG,SAAS,CAAC;IAC1D,aAAa,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC,KAAK,IAAI,CAAC;IAClF,SAAS,EAAE,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,KAAK,IAAI,CAAC;CAChD,CAAC;AAEF;;GAEG;AACH,MAAM,WAAW,WAAW,CAAC,CAAC,SAAS,UAAU;IAC/C;;OAEG;IACH,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IAEpB;;OAEG;IACH,aAAa,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;IAE1B;;;;OAIG;IACH,eAAe,CAAC,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC;IAE/C;;;;OAIG;IAEH,UAAU,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAK,eAAe,EAAE,GAAG,SAAS,CAAC;IAE1D;;OAEG;IACH,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE;QAAE,OAAO,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAA;KAAE,KAAK,IAAI,CAAC;IAE5E;;OAEG;IACH,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE;QAAE,OAAO,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAA;KAAE,KAAK,YAAY,CAAC,IAAI,CAAC,CAAC;CAC1F;AAED;;;GAGG;AACH,eAAO,MAAM,OAAO,GAAI,CAAC,SAAS,UAAU,4EAOzC,WAAW,CAAC,CAAC,CAAC,KAAG,WAAW,CAAC,CAAC,CA8IhC,CAAC"}

package/dist/types/src/translations.d.ts

@@ -30,6 +30,7 @@ declare const _default: {
             'format ref': string;
             'format regex': string;
             'format string': string;
+            'format single-select': string;
             'format text': string;
             'format time': string;
             'format timestamp': string;
@@ -39,6 +40,11 @@ declare const _default: {
             'format uuid': string;
             'placeholder latitude': string;
             'placeholder longitude': string;
+            'select option label': string;
+            'select option label placeholder': string;
+            'select option color': string;
+            'select option delete': string;
+            'select option add': string;
         };
     };
 }[];

package/dist/types/src/translations.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"translations.d.ts","sourceRoot":"","sources":["../../../src/translations.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,cAAc,kBAAkB,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAE9C,wBAoDE"}
+{"version":3,"file":"translations.d.ts","sourceRoot":"","sources":["../../../src/translations.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,cAAc,kBAAkB,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAE9C,wBA4DE"}

package/dist/types/tsconfig.tsbuildinfo

@@ -0,0 +1 @@
+{"version":"5.7.3"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/react-ui-form",
-  "version": "0.7.4",
+  "version": "0.7.5-labs.071a3e2",
   "description": "Data components.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -25,49 +25,50 @@
     "@atlaskit/pragmatic-drag-and-drop": "^1.4.0",
     "@atlaskit/pragmatic-drag-and-drop-hitbox": "^1.0.3",
     "@effect/schema": "^0.75.5",
-    "@radix-ui/react-context": "^1.0.0",
+    "@radix-ui/react-context": "1.1.1",
     "date-fns": "^3.3.1",
-    "effect": "^3.9.2",
     "jsonpath": "^1.1.1",
-    "@dxos/async": "0.7.4",
-    "@dxos/echo-db": "0.7.4",
-    "@dxos/debug": "0.7.4",
-    "@dxos/echo-schema": "0.7.4",
-    "@dxos/invariant": "0.7.4",
-    "@dxos/effect": "0.7.4",
-    "@dxos/live-object": "0.7.4",
-    "@dxos/keys": "0.7.4",
-    "@dxos/log": "0.7.4",
-    "@dxos/react-client": "0.7.4",
-    "@dxos/react-ui-list": "0.7.4",
-    "@dxos/schema": "0.7.4",
-    "@dxos/react-ui-types": "0.7.4",
-    "@dxos/util": "0.7.4"
+    "@dxos/async": "0.7.5-labs.071a3e2",
+    "@dxos/debug": "0.7.5-labs.071a3e2",
+    "@dxos/echo-db": "0.7.5-labs.071a3e2",
+    "@dxos/echo-schema": "0.7.5-labs.071a3e2",
+    "@dxos/effect": "0.7.5-labs.071a3e2",
+    "@dxos/keys": "0.7.5-labs.071a3e2",
+    "@dxos/invariant": "0.7.5-labs.071a3e2",
+    "@dxos/live-object": "0.7.5-labs.071a3e2",
+    "@dxos/log": "0.7.5-labs.071a3e2",
+    "@dxos/react-client": "0.7.5-labs.071a3e2",
+    "@dxos/react-ui-list": "0.7.5-labs.071a3e2",
+    "@dxos/react-ui-pickers": "0.7.5-labs.071a3e2",
+    "@dxos/react-ui-types": "0.7.5-labs.071a3e2",
+    "@dxos/schema": "0.7.5-labs.071a3e2",
+    "@dxos/util": "0.7.5-labs.071a3e2"
   },
   "devDependencies": {
     "@phosphor-icons/react": "^2.1.5",
-    "@types/jsonpath": "~0.2.4",
+    "@types/jsonpath": "^0.2.4",
     "@types/react": "~18.2.0",
     "@types/react-dom": "~18.2.0",
+    "effect": "^3.12.3",
     "fast-check": "^3.19.0",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
     "vite": "5.4.7",
-    "@dxos/echo-signals": "0.7.4",
-    "@dxos/react-ui": "0.7.4",
-    "@dxos/react-ui-syntax-highlighter": "0.7.4",
-    "@dxos/random": "0.7.4",
-    "@dxos/react-ui-theme": "0.7.4",
-    "@dxos/storybook-utils": "0.7.4"
+    "@dxos/random": "0.7.5-labs.071a3e2",
+    "@dxos/echo-signals": "0.7.5-labs.071a3e2",
+    "@dxos/react-ui-syntax-highlighter": "0.7.5-labs.071a3e2",
+    "@dxos/react-ui-theme": "0.7.5-labs.071a3e2",
+    "@dxos/react-ui": "0.7.5-labs.071a3e2",
+    "@dxos/storybook-utils": "0.7.5-labs.071a3e2"
   },
   "peerDependencies": {
     "@effect/schema": "^0.75.5",
     "@phosphor-icons/react": "^2.1.5",
-    "effect": "^3.9.2",
+    "effect": "^3.12.3",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
-    "@dxos/react-ui": "0.7.4",
-    "@dxos/react-ui-theme": "0.7.4"
+    "@dxos/react-ui": "0.7.5-labs.071a3e2",
+    "@dxos/react-ui-theme": "0.7.5-labs.071a3e2"
   },
   "publishConfig": {
     "access": "public"

package/src/components/FieldEditor/FieldEditor.stories.tsx

@@ -7,7 +7,7 @@ import '@dxos-theme';
 import { type Meta, type StoryObj } from '@storybook/react';
 import React from 'react';
 
-import { createMutableSchema } from '@dxos/live-object/testing';
+import { createEchoSchema } from '@dxos/live-object/testing';
 import { log } from '@dxos/log';
 import { ViewProjection } from '@dxos/schema';
 import { TestSchema, testView } from '@dxos/schema/testing';
@@ -37,7 +37,7 @@ const meta: Meta<StoryProps> = {
   title: 'ui/react-ui-form/FieldEditor',
   component: FieldEditor,
   render: DefaultStory,
-  decorators: [withLayout({ fullscreen: true }), withTheme],
+  decorators: [withLayout({ fullscreen: true, tooltips: true }), withTheme],
   parameters: {
     translations,
   },
@@ -49,7 +49,7 @@ type Story = StoryObj<StoryProps>;
 
 export const Default: Story = {
   args: {
-    projection: new ViewProjection(createMutableSchema(TestSchema), testView),
+    projection: new ViewProjection(createEchoSchema(TestSchema), testView),
     view: testView,
     field: testView.fields[0],
   },

package/src/components/FieldEditor/FieldEditor.tsx

@@ -2,10 +2,10 @@
 // Copyright 2024 DXOS.org
 //
 
-import React, { useCallback, useEffect, useState } from 'react';
+import React, { useCallback, useEffect, useMemo, useState } from 'react';
 
-import { type SchemaResolver } from '@dxos/echo-db';
-import { FormatEnum, FormatEnums, formatToType, type MutableSchema } from '@dxos/echo-schema';
+import { type SchemaRegistry } from '@dxos/echo-db';
+import { FormatEnum, FormatEnums, formatToType, type EchoSchema } from '@dxos/echo-schema';
 import { log } from '@dxos/log';
 import { useTranslation } from '@dxos/react-ui';
 import {
@@ -16,16 +16,17 @@ import {
   type PropertyType,
   type ViewType,
   type ViewProjection,
+  type SchemaProperty,
 } from '@dxos/schema';
 
 import { translationKey } from '../../translations';
-import { Form, type FormProps, SelectInput } from '../Form';
+import { Form, type FormProps, type InputComponent, SelectInput, SelectOptionInput } from '../Form';
 
 export type FieldEditorProps = {
   view: ViewType;
   projection: ViewProjection;
   field: FieldType;
-  registry?: SchemaResolver;
+  registry?: SchemaRegistry;
   onSave: () => void;
   onCancel?: () => void;
 };
@@ -38,15 +39,17 @@ export const FieldEditor = ({ view, projection, field, registry, onSave, onCance
   const [props, setProps] = useState<PropertyType>(projection.getFieldProjection(field.id).props);
   useEffect(() => setProps(projection.getFieldProjection(field.id).props), [field, projection]);
 
-  const [schemas, setSchemas] = useState<MutableSchema[]>([]);
+  const [schemas, setSchemas] = useState<EchoSchema[]>([]);
   useEffect(() => {
     if (!registry) {
       return;
     }
 
-    const subscription = registry.subscribe(setSchemas);
+    const subscription = registry.query().subscribe((query) => setSchemas(query.results), { fire: true });
+
+    // TODO(dmaretskyi): This shouldn't be needed.
     const t = setTimeout(async () => {
-      const schemas = await registry.query();
+      const schemas = await registry.query().run();
       setSchemas(schemas);
     });
     return () => {
@@ -55,24 +58,36 @@ export const FieldEditor = ({ view, projection, field, registry, onSave, onCance
     };
   }, [registry]);
 
-  const [schema, setSchema] = useState<MutableSchema>();
+  const [referenceSchema, setReferenceSchema] = useState<EchoSchema>();
   useEffect(() => {
-    setSchema(schemas.find((schema) => schema.typename === props?.referenceSchema));
+    setReferenceSchema(schemas.find((schema) => schema.typename === props?.referenceSchema));
   }, [schemas, props?.referenceSchema]);
 
   // TODO(burdon): Need to wrap otherwise throws error:
   //  Class constructor SchemaClass cannot be invoked without 'new'.
   const [{ fieldSchema }, setFieldSchema] = useState({ fieldSchema: getFormatSchema(props?.format) });
+
   const handleValuesChanged = useCallback<NonNullable<FormProps<PropertyType>['onValuesChanged']>>(
     (_props) => {
-      // Update schema if format changed.
       // TODO(burdon): Callback should pass `changed` to indicate which fields have changed.
-      if (_props.format !== props.format) {
-        setFieldSchema({ fieldSchema: getFormatSchema(_props.format) });
-      }
-      if (_props.referenceSchema !== props.referenceSchema) {
-        setSchema(schemas.find((schema) => schema.typename === _props.referenceSchema));
-      }
+      // TODO(Zaymon): Workout why old and new format values are the same sometimes even when
+      //   selecting novel format values.
+      setFieldSchema((prev) => {
+        const fieldSchema = getFormatSchema(_props.format);
+        if (prev.fieldSchema === fieldSchema) {
+          return prev;
+        }
+        return { fieldSchema };
+      });
+      setReferenceSchema((prev) => {
+        if (_props.referenceSchema !== prev?.typename) {
+          const newSchema = schemas.find((schema) => schema.typename === _props.referenceSchema);
+          if (newSchema) {
+            return newSchema;
+          }
+        }
+        return prev;
+      });
 
       setProps((props) => {
         const type = formatToType[_props.format as keyof typeof formatToType];
@@ -80,10 +95,10 @@ export const FieldEditor = ({ view, projection, field, registry, onSave, onCance
           return { ...props, ..._props, type };
         }
 
-        return props;
+        return _props as PropertyType;
       });
     },
-    [schemas, props],
+    [schemas, props.format, props.referenceSchema],
   );
 
   const handleValidate = useCallback<NonNullable<FormProps<PropertyType>['onValidate']>>(
@@ -114,6 +129,47 @@ export const FieldEditor = ({ view, projection, field, registry, onSave, onCance
     onSave();
   }, [onSave]);
 
+  const Custom: Partial<Record<string, InputComponent>> = useMemo(
+    () => ({
+      ['format' satisfies keyof PropertyType]: (props) => (
+        <SelectInput
+          {...props}
+          options={FormatEnums.filter((value) => value !== FormatEnum.None).map((value) => ({
+            value,
+            label: t(`format ${value}`),
+          }))}
+        />
+      ),
+      ['referenceSchema' satisfies keyof PropertyType]: (props) => (
+        <SelectInput
+          {...props}
+          options={schemas.map((schema) => ({
+            value: schema.typename,
+          }))}
+        />
+      ),
+      ['referencePath' satisfies keyof PropertyType]: (props) => (
+        <SelectInput
+          {...props}
+          options={
+            referenceSchema
+              ? getSchemaProperties(referenceSchema.ast)
+                  .sort(sortProperties)
+                  .map((p) => ({ value: p.name }))
+              : []
+          }
+        />
+      ),
+      ['options' satisfies keyof PropertyType]: (props) => <SelectOptionInput {...props} />,
+    }),
+    [t, schemas, referenceSchema],
+  );
+
+  const propIsNotType = useCallback(
+    (props: SchemaProperty<PropertyType>[]) => props.filter((p) => p.name !== 'type'),
+    [],
+  );
+
   if (!fieldSchema) {
     log.warn('invalid format', { props });
     return null;
@@ -125,43 +181,13 @@ export const FieldEditor = ({ view, projection, field, registry, onSave, onCance
       autoFocus
       values={props}
       schema={fieldSchema}
-      filter={(props) => props.filter((p) => p.name !== 'type')}
+      filter={propIsNotType}
       sort={['property', 'format']}
       onValuesChanged={handleValuesChanged}
       onValidate={handleValidate}
       onSave={handleSave}
       onCancel={handleCancel}
-      Custom={{
-        ['format' satisfies keyof PropertyType]: (props) => (
-          <SelectInput<PropertyType>
-            {...props}
-            options={FormatEnums.filter((value) => value !== FormatEnum.None).map((value) => ({
-              value,
-              label: t(`format ${value}`),
-            }))}
-          />
-        ),
-        ['referenceSchema' satisfies keyof PropertyType]: (props) => (
-          <SelectInput<PropertyType>
-            {...props}
-            options={schemas.map((schema) => ({
-              value: schema.typename,
-            }))}
-          />
-        ),
-        ['referencePath' satisfies keyof PropertyType]: (props) => (
-          <SelectInput<PropertyType>
-            {...props}
-            options={
-              schema
-                ? getSchemaProperties(schema.schema.ast)
-                    .sort(sortProperties)
-                    .map((p) => ({ value: p.name }))
-                : []
-            }
-          />
-        ),
-      }}
+      Custom={Custom}
     />
   );
 };

package/src/components/Form/ArrayField.tsx

@@ -0,0 +1,111 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { pipe } from 'effect';
+import { capitalize } from 'effect/String';
+import React, { useCallback, useMemo } from 'react';
+
+import { AST } from '@dxos/echo-schema';
+import { findNode, getDiscriminatedType, isDiscriminatedUnion, SimpleType } from '@dxos/effect';
+import { invariant } from '@dxos/invariant';
+import { IconButton, useTranslation } from '@dxos/react-ui';
+import { mx } from '@dxos/react-ui-theme';
+import { getSchemaProperties, type SchemaProperty } from '@dxos/schema';
+
+import { type ComponentLookup } from './Form';
+import { FormField } from './FormContent';
+import { useFormValues, type FormInputStateProps } from './FormContext';
+import { InputHeader, type InputComponent } from './Input';
+import { translationKey } from '../../translations';
+
+const padding = 'px-2';
+
+type ArrayFieldProps = {
+  property: SchemaProperty<any>;
+  readonly?: boolean;
+  inputProps: FormInputStateProps;
+  path?: (string | number)[];
+  Custom?: Partial<Record<string, InputComponent>>;
+  lookupComponent?: ComponentLookup;
+};
+
+export const ArrayField = ({ property, readonly, path, inputProps, Custom, lookupComponent }: ArrayFieldProps) => {
+  const { t } = useTranslation(translationKey);
+  const { ast, name, type, title } = property;
+  const values = useFormValues(path ?? []) as any[];
+  invariant(Array.isArray(values), `Values at path ${path?.join('.')} must be an array.`);
+  const label = title ?? pipe(name, capitalize);
+
+  const tupleType = findNode(ast, AST.isTupleType);
+  const elementType = (tupleType as AST.TupleType | undefined)?.rest[0]?.type;
+
+  const getDefaultObjectValue = (typeNode: AST.AST): any => {
+    const baseNode = findNode(typeNode, isDiscriminatedUnion);
+    const typeLiteral = baseNode ? getDiscriminatedType(baseNode, {}) : findNode(typeNode, AST.isTypeLiteral);
+    if (!typeLiteral) {
+      return {};
+    }
+
+    return Object.fromEntries(getSchemaProperties(typeLiteral, {}).map((prop) => [prop.name, prop.defaultValue]));
+  };
+
+  const newValue = useMemo(() => {
+    if (type === 'object' && elementType) {
+      return getDefaultObjectValue(elementType);
+    } else {
+      return SimpleType.getDefaultValue(type);
+    }
+  }, [type, elementType]);
+
+  const handleAdd = useCallback(() => {
+    inputProps.onValueChange(type, [...values, newValue]);
+  }, [type, elementType, inputProps, newValue, values]);
+
+  const handleRemove = useCallback(
+    (index: number) => {
+      const newValues = values.filter((_, i) => i !== index);
+      inputProps.onValueChange(type, newValues);
+    },
+    [type, inputProps, values],
+  );
+
+  if (!elementType) {
+    return null;
+  }
+
+  return (
+    <div role='none' className={mx(padding)}>
+      <InputHeader>{label}</InputHeader>
+      <div role='none' className='flex flex-col gap-1'>
+        {values.map((_value, index) => (
+          <div key={index} role='none' className='flex items-center gap-1'>
+            <div role='none' className='flex-1'>
+              <FormField
+                property={{
+                  ...property,
+                  array: false, // NOTE(ZaymonFC): This breaks arrays of arrays but ¯\_(ツ)_/¯. Ping me if you need that.
+                  ast: elementType,
+                }}
+                path={[...(path ?? []), index]}
+                readonly={readonly}
+                inline
+                Custom={Custom}
+                lookupComponent={lookupComponent}
+              />
+            </div>
+            <IconButton
+              icon='ph--trash--regular'
+              iconOnly
+              label={t('button remove')}
+              onClick={() => handleRemove(index)}
+            />
+          </div>
+        ))}
+      </div>
+      <div role='none' className='flex justify-between items-center plb-1'>
+        <IconButton icon='ph--plus--regular' iconOnly label={t('button add')} onClick={handleAdd} />
+      </div>
+    </div>
+  );
+};

package/src/components/Form/Defaults.tsx

@@ -4,13 +4,11 @@
 
 import React from 'react';
 
-import { type BaseObject } from '@dxos/echo-schema';
 import { Input, Select } from '@dxos/react-ui';
 
 import { type InputProps, InputHeader } from './Input';
 
-export const TextInput = <T extends BaseObject>({
-  property,
+export const TextInput = ({
   type,
   label,
   inputOnly,
@@ -20,8 +18,8 @@ export const TextInput = <T extends BaseObject>({
   getValue,
   onValueChange,
   onBlur,
-}: InputProps<T>) => {
-  const { status, error } = getStatus?.(property);
+}: InputProps) => {
+  const { status, error } = getStatus();
 
   return (
     <Input.Root validationValence={status}>
@@ -33,8 +31,8 @@ export const TextInput = <T extends BaseObject>({
       <Input.TextInput
         disabled={disabled}
         placeholder={placeholder}
-        value={getValue(property) ?? ''}
-        onChange={(event) => onValueChange(property, type, event.target.value)}
+        value={getValue() ?? ''}
+        onChange={(event) => onValueChange(type, event.target.value)}
         onBlur={onBlur}
       />
       {inputOnly && <Input.Validation>{error}</Input.Validation>}
@@ -42,8 +40,7 @@ export const TextInput = <T extends BaseObject>({
   );
 };
 
-export const NumberInput = <T extends BaseObject>({
-  property,
+export const NumberInput = ({
   type,
   label,
   inputOnly,
@@ -53,8 +50,8 @@ export const NumberInput = <T extends BaseObject>({
   getValue,
   onValueChange,
   onBlur,
-}: InputProps<T>) => {
-  const { status, error } = getStatus?.(property);
+}: InputProps) => {
+  const { status, error } = getStatus();
 
   return (
     <Input.Root validationValence={status}>
@@ -67,8 +64,8 @@ export const NumberInput = <T extends BaseObject>({
         type='number'
         disabled={disabled}
         placeholder={placeholder}
-        value={getValue(property) ?? 0}
-        onChange={(event) => onValueChange(property, type, event.target.value)}
+        value={getValue() ?? 0}
+        onChange={(event) => onValueChange(type, event.target.value)}
         onBlur={onBlur}
       />
       {inputOnly && <Input.DescriptionAndValidation>{error}</Input.DescriptionAndValidation>}
@@ -76,17 +73,11 @@ export const NumberInput = <T extends BaseObject>({
   );
 };
 
-export const BooleanInput = <T extends BaseObject>({
-  property,
-  type,
-  label,
-  inputOnly,
-  getStatus,
-  getValue,
-  onValueChange,
-}: InputProps<T>) => {
-  const { status, error } = getStatus?.(property);
+export const BooleanInput = ({ type, label, inputOnly, getStatus, getValue, onValueChange }: InputProps) => {
+  const { status, error } = getStatus();
 
+  // TODO(burdon): Runtime error:
+  //  Warning: Unknown event handler property `onCheckedChange`. It will be ignored.
   return (
     <Input.Root validationValence={status}>
       {!inputOnly && (
@@ -94,21 +85,17 @@ export const BooleanInput = <T extends BaseObject>({
           <Input.Label>{label}</Input.Label>
         </InputHeader>
       )}
-      <Input.Switch
-        checked={getValue<boolean>(property)}
-        onCheckedChange={(value) => onValueChange(property, type, value)}
-      />
+      <Input.Switch checked={getValue()} onCheckedChange={(value) => onValueChange(type, value)} />
       {inputOnly && <Input.DescriptionAndValidation>{error}</Input.DescriptionAndValidation>}
     </Input.Root>
   );
 };
 
-export type SelectInputOptions<T extends BaseObject> = InputProps<T> & {
+export type SelectInputOptions = InputProps & {
   options?: Array<{ value: string | number; label?: string }>;
 };
 
-export const SelectInput = <T extends BaseObject>({
-  property,
+export const SelectInput = ({
   type,
   label,
   inputOnly,
@@ -118,8 +105,8 @@ export const SelectInput = <T extends BaseObject>({
   getStatus,
   getValue,
   onValueChange,
-}: SelectInputOptions<T>) => {
-  const { status, error } = getStatus?.(property);
+}: SelectInputOptions) => {
+  const { status, error } = getStatus();
 
   return (
     <Input.Root validationValence={status}>
@@ -128,7 +115,7 @@ export const SelectInput = <T extends BaseObject>({
           <Input.Label>{label}</Input.Label>
         </InputHeader>
       )}
-      <Select.Root value={getValue(property)} onValueChange={(value) => onValueChange(property, type, value)}>
+      <Select.Root value={getValue()} onValueChange={(value) => onValueChange(type, value)}>
         {/* TODO(burdon): Placeholder not working? */}
         <Select.TriggerButton classNames='is-full' disabled={disabled} placeholder={placeholder} />
         <Select.Portal>