@dxos/react-ui-form 0.8.1 → 0.8.2-main.2f9c567

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

@@ -1,2 +1,3 @@
 export * from './useForm';
+export * from './useRefQueryLookupHandler';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/hooks/index.ts"],"names":[],"mappings":"AAIA,cAAc,WAAW,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/hooks/index.ts"],"names":[],"mappings":"AAIA,cAAc,WAAW,CAAC;AAC1B,cAAc,4BAA4B,CAAC"}

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

@@ -1,4 +1,4 @@
-import { type Schema as S } from 'effect';
+import { type Schema } from 'effect';
 import { type BaseObject } from '@dxos/echo-schema';
 import { type SimpleType, type JsonPath } from '@dxos/effect';
 import { type ValidationError } from '@dxos/schema';
@@ -29,7 +29,7 @@ export interface FormOptions<T extends BaseObject> {
     /**
      * Effect schema (Type literal).
      */
-    schema: S.Schema<T>;
+    schema: Schema.Schema<T, any>;
     /**
      * Initial values (which may not pass validation).
      */

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,EAAoB,KAAK,MAAM,IAAI,CAAC,EAAE,MAAM,QAAQ,CAAC;AAG5D,OAAO,EAAE,KAAK,UAAU,EAAsB,MAAM,mBAAmB,CAAC;AACxE,OAAO,EAAE,KAAK,UAAU,EAAE,KAAK,QAAQ,EAA4C,MAAM,cAAc,CAAC;AAGxG,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,WAAW,EAAE,OAAO,CAAC;IACrB,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,CAmLhC,CAAC"}
+{"version":3,"file":"useForm.d.ts","sourceRoot":"","sources":["../../../../src/hooks/useForm.ts"],"names":[],"mappings":"AAIA,OAAO,EAAa,KAAK,MAAM,EAAE,MAAM,QAAQ,CAAC;AAGhD,OAAO,EAAE,KAAK,UAAU,EAAsB,MAAM,mBAAmB,CAAC;AACxE,OAAO,EAAE,KAAK,UAAU,EAAE,KAAK,QAAQ,EAA4C,MAAM,cAAc,CAAC;AAGxG,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,WAAW,EAAE,OAAO,CAAC;IACrB,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,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;IAE9B;;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,CAmLhC,CAAC"}

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

@@ -0,0 +1,8 @@
+import { type Space } from '@dxos/react-client/echo';
+import { type QueryRefOptions } from '../components';
+type UseRefQueryLookupProps = {
+    space?: Space;
+};
+export declare const useRefQueryLookupHandler: ({ space }: UseRefQueryLookupProps) => QueryRefOptions;
+export {};
+//# sourceMappingURL=useRefQueryLookupHandler.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"useRefQueryLookupHandler.d.ts","sourceRoot":"","sources":["../../../../src/hooks/useRefQueryLookupHandler.ts"],"names":[],"mappings":"AAOA,OAAO,EAAU,KAAK,KAAK,EAAE,MAAM,yBAAyB,CAAC;AAG7D,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,eAAe,CAAC;AAErD,KAAK,sBAAsB,GAAG;IAC5B,KAAK,CAAC,EAAE,KAAK,CAAC;CACf,CAAC;AAEF,eAAO,MAAM,wBAAwB,cAAe,sBAAsB,KAAG,eA0B5E,CAAC"}

package/dist/types/src/util/formatting.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"formatting.d.ts","sourceRoot":"","sources":["../../../../src/util/formatting.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,UAAU,EAAe,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAEtE,KAAK,gBAAgB,GAAG;IACtB,IAAI,EAAE,QAAQ,CAAC;IACf,MAAM,CAAC,EAAE,UAAU,GAAG,SAAS,CAAC;IAChC,KAAK,EAAE,GAAG,CAAC;IACX,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC7B,CAAC;AAEF;;;GAGG;AAGH,eAAO,MAAM,gBAAgB,oCAAiD,gBAAgB,KAAG,MAyEhG,CAAC;AAEF,eAAO,MAAM,gBAAgB,oCAAiD,gBAAgB,KAAG,MA8DhG,CAAC"}
+{"version":3,"file":"formatting.d.ts","sourceRoot":"","sources":["../../../../src/util/formatting.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,UAAU,EAAe,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAEtE,KAAK,gBAAgB,GAAG;IACtB,IAAI,EAAE,QAAQ,CAAC;IACf,MAAM,CAAC,EAAE,UAAU,GAAG,SAAS,CAAC;IAChC,KAAK,EAAE,GAAG,CAAC;IACX,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC7B,CAAC;AAEF;;;GAGG;AAGH,eAAO,MAAM,gBAAgB,oCAAiD,gBAAgB,KAAG,MAqFhG,CAAC;AAEF,eAAO,MAAM,gBAAgB,oCAAiD,gBAAgB,KAAG,MA8DhG,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/react-ui-form",
-  "version": "0.8.1",
+  "version": "0.8.2-main.2f9c567",
   "description": "Data components.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -28,46 +28,46 @@
     "@radix-ui/react-context": "1.1.1",
     "date-fns": "^3.3.1",
     "jsonpath": "^1.1.1",
-    "@dxos/async": "0.8.1",
-    "@dxos/echo-db": "0.8.1",
-    "@dxos/debug": "0.8.1",
-    "@dxos/echo-schema": "0.8.1",
-    "@dxos/effect": "0.8.1",
-    "@dxos/invariant": "0.8.1",
-    "@dxos/live-object": "0.8.1",
-    "@dxos/log": "0.8.1",
-    "@dxos/keys": "0.8.1",
-    "@dxos/react-client": "0.8.1",
-    "@dxos/react-ui-pickers": "0.8.1",
-    "@dxos/react-ui-types": "0.8.1",
-    "@dxos/schema": "0.8.1",
-    "@dxos/react-ui-list": "0.8.1",
-    "@dxos/util": "0.8.1"
+    "@dxos/debug": "0.8.2-main.2f9c567",
+    "@dxos/echo-schema": "0.8.2-main.2f9c567",
+    "@dxos/async": "0.8.2-main.2f9c567",
+    "@dxos/echo-db": "0.8.2-main.2f9c567",
+    "@dxos/effect": "0.8.2-main.2f9c567",
+    "@dxos/invariant": "0.8.2-main.2f9c567",
+    "@dxos/live-object": "0.8.2-main.2f9c567",
+    "@dxos/react-client": "0.8.2-main.2f9c567",
+    "@dxos/keys": "0.8.2-main.2f9c567",
+    "@dxos/react-ui-list": "0.8.2-main.2f9c567",
+    "@dxos/react-ui-pickers": "0.8.2-main.2f9c567",
+    "@dxos/log": "0.8.2-main.2f9c567",
+    "@dxos/react-ui-types": "0.8.2-main.2f9c567",
+    "@dxos/util": "0.8.2-main.2f9c567",
+    "@dxos/schema": "0.8.2-main.2f9c567"
   },
   "devDependencies": {
     "@phosphor-icons/react": "^2.1.5",
     "@types/jsonpath": "^0.2.4",
     "@types/react": "~18.2.0",
     "@types/react-dom": "~18.2.0",
-    "effect": "3.13.3",
+    "effect": "3.14.21",
     "fast-check": "^3.19.0",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
     "vite": "5.4.7",
-    "@dxos/random": "0.8.1",
-    "@dxos/react-ui-syntax-highlighter": "0.8.1",
-    "@dxos/echo-signals": "0.8.1",
-    "@dxos/react-ui": "0.8.1",
-    "@dxos/react-ui-theme": "0.8.1",
-    "@dxos/storybook-utils": "0.8.1"
+    "@dxos/echo-signals": "0.8.2-main.2f9c567",
+    "@dxos/random": "0.8.2-main.2f9c567",
+    "@dxos/react-ui": "0.8.2-main.2f9c567",
+    "@dxos/react-ui-syntax-highlighter": "0.8.2-main.2f9c567",
+    "@dxos/storybook-utils": "0.8.2-main.2f9c567",
+    "@dxos/react-ui-theme": "0.8.2-main.2f9c567"
   },
   "peerDependencies": {
     "@phosphor-icons/react": "^2.1.5",
     "effect": "3.13.3",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
-    "@dxos/react-ui": "0.8.1",
-    "@dxos/react-ui-theme": "0.8.1"
+    "@dxos/react-ui-theme": "0.8.2-main.2f9c567",
+    "@dxos/react-ui": "0.8.2-main.2f9c567"
   },
   "publishConfig": {
     "access": "public"

package/src/components/ControlSection/ControlSection.stories.tsx

@@ -0,0 +1,29 @@
+//
+// Copyright 2024 DXOS.org
+//
+
+import '@dxos-theme';
+
+import { type Meta, type StoryObj } from '@storybook/react';
+
+import { withLayout, withTheme } from '@dxos/storybook-utils';
+
+import { ControlSection, type ControlSectionProps } from './ControlSection';
+import translations from '../../translations';
+
+const meta: Meta<ControlSectionProps> = {
+  title: 'ui/react-ui-form/ControlSection',
+  component: ControlSection,
+  decorators: [withLayout({ tooltips: true }), withTheme],
+  parameters: {
+    translations,
+  },
+};
+
+export default meta;
+
+type Story = StoryObj<ControlSectionProps>;
+
+export const Default: Story = {
+  args: {},
+};

package/src/components/{ControlSection.tsx → ControlSection/ControlSection.tsx}

@@ -2,19 +2,45 @@
 // Copyright 2025 DXOS.org
 //
 
-import React, { type PropsWithChildren } from 'react';
+import React, { type ComponentPropsWithoutRef, type PropsWithChildren } from 'react';
 
-import { type Label, toLocalizedString, useTranslation, Input } from '@dxos/react-ui';
+import {
+  Button,
+  type ButtonProps,
+  type Label,
+  Input,
+  type ThemedClassName,
+  toLocalizedString,
+  useTranslation,
+} from '@dxos/react-ui';
+import { mx } from '@dxos/react-ui-theme';
 
-import { translationKey } from '../translations';
+import { translationKey } from '../../translations';
 
-// TODO(wittjosiah): Copied from @dxos/plugin-client. Reconcile/factor out.
+export type ControlPageProps = ThemedClassName<ComponentPropsWithoutRef<'div'>>;
+
+export const ControlPage = ({ children, classNames, ...props }: ControlPageProps) => {
+  return (
+    <div role='none' className={mx('pli-2', classNames)} {...props}>
+      {children}
+    </div>
+  );
+};
 
 export type ControlSectionProps = PropsWithChildren<{
   title: Label;
   description?: Label;
 }>;
 
+export const ControlSection = ({ title, description, children }: ControlSectionProps) => {
+  return (
+    <>
+      <ControlSectionHeading title={title} description={description} />
+      {children}
+    </>
+  );
+};
+
 export const ControlSectionHeading = ({ title, description }: Omit<ControlSectionProps, 'children'>) => {
   const { t } = useTranslation(translationKey);
   return (
@@ -27,19 +53,17 @@ export const ControlSectionHeading = ({ title, description }: Omit<ControlSectio
   );
 };
 
-export const ControlSection = ({ title, description, children }: ControlSectionProps) => {
-  return (
-    <>
-      <ControlSectionHeading title={title} description={description} />
-      {children}
-    </>
-  );
+export const ControlGroupButton = ({ classNames, ...props }: ButtonProps) => {
+  return <Button {...props} classNames={['md:col-span-2', classNames]} />;
 };
 
-export type ControlGroupProps = PropsWithChildren<{}>;
+export type ControlGroupProps = ThemedClassName<PropsWithChildren<{}>>;
 
-export const ControlGroup = ({ children }: ControlGroupProps) => (
-  <div role='none' className='group container-max-width grid grid-cols-1 md:grid-cols-[1fr_min-content] gap-4'>
+export const ControlGroup = ({ children, classNames }: ControlGroupProps) => (
+  <div
+    role='none'
+    className={mx('group container-max-width grid grid-cols-1 md:grid-cols-[1fr_min-content] gap-4', classNames)}
+  >
     {children}
   </div>
 );

package/src/components/ControlSection/index.ts

@@ -0,0 +1,5 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+export * from './ControlSection';

package/src/components/Form/ArrayField.tsx

@@ -2,11 +2,10 @@
 // Copyright 2025 DXOS.org
 //
 
-import { pipe } from 'effect';
+import { SchemaAST, 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';
@@ -33,16 +32,18 @@ type ArrayFieldProps = {
 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[];
+  // TODO(wittjosiah): The fallback to an empty array stops the form from crashing but isn't immediately live.
+  //  It doesn't become live until another field is touched, but that's better than the whole form crashing.
+  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 tupleType = findNode(ast, SchemaAST.isTupleType);
+  const elementType = (tupleType as SchemaAST.TupleType | undefined)?.rest[0]?.type;
 
-  const getDefaultObjectValue = (typeNode: AST.AST): any => {
+  const getDefaultObjectValue = (typeNode: SchemaAST.AST): any => {
     const baseNode = findNode(typeNode, isDiscriminatedUnion);
-    const typeLiteral = baseNode ? getDiscriminatedType(baseNode, {}) : findNode(typeNode, AST.isTypeLiteral);
+    const typeLiteral = baseNode ? getDiscriminatedType(baseNode, {}) : findNode(typeNode, SchemaAST.isTypeLiteral);
     if (!typeLiteral) {
       return {};
     }

package/src/components/Form/Defaults.tsx

@@ -107,6 +107,9 @@ export const SelectInput = ({
 }: SelectInputOptions) => {
   const { status, error } = getStatus();
 
+  const value = getValue() as string | undefined;
+  const handleValueChange = useCallback((value: string | number) => onValueChange(type, value), [type, onValueChange]);
+
   return (
     <Input.Root validationValence={status}>
       {!inputOnly && (
@@ -114,7 +117,7 @@ export const SelectInput = ({
           <Input.Label>{label}</Input.Label>
         </InputHeader>
       )}
-      <Select.Root value={getValue()} onValueChange={(value) => onValueChange(type, value)}>
+      <Select.Root value={value} onValueChange={handleValueChange}>
         {/* TODO(burdon): Placeholder not working? */}
         <Select.TriggerButton classNames='is-full' disabled={disabled} placeholder={placeholder} />
         <Select.Portal>

package/src/components/Form/Form.stories.tsx

@@ -5,9 +5,12 @@
 import '@dxos-theme';
 
 import { type Meta, type StoryObj } from '@storybook/react';
+import { Schema, SchemaAST } from 'effect';
 import React, { useCallback, useState } from 'react';
 
-import { AST, type BaseObject, Format, S } from '@dxos/echo-schema';
+import { ContactType } from '@dxos/client/testing';
+import { type BaseObject, Expando, Format, getDXN, Ref, type TypeAnnotation } from '@dxos/echo-schema';
+import { live } from '@dxos/live-object';
 import { Testing } from '@dxos/schema/testing';
 import { withLayout, withTheme } from '@dxos/storybook-utils';
 
@@ -16,25 +19,27 @@ import { Form, type FormProps } from './Form';
 import translations from '../../translations';
 import { TestLayout, TestPanel } from '../testing';
 
-const AddressSchema = S.Struct({
-  street: S.optional(S.String.annotations({ [AST.TitleAnnotationId]: 'Street' })),
-  city: S.optional(S.String.annotations({ [AST.TitleAnnotationId]: 'City' })),
-  zip: S.optional(S.String.pipe(S.pattern(/^\d{5}(-\d{4})?$/)).annotations({ [AST.TitleAnnotationId]: 'ZIP' })),
-  location: S.optional(Format.GeoPoint.annotations({ [AST.TitleAnnotationId]: 'Location' })),
-}).annotations({ [AST.TitleAnnotationId]: 'Address' });
+const AddressSchema = Schema.Struct({
+  street: Schema.optional(Schema.String.annotations({ [SchemaAST.TitleAnnotationId]: 'Street' })),
+  city: Schema.optional(Schema.String.annotations({ [SchemaAST.TitleAnnotationId]: 'City' })),
+  zip: Schema.optional(
+    Schema.String.pipe(Schema.pattern(/^\d{5}(-\d{4})?$/)).annotations({ [SchemaAST.TitleAnnotationId]: 'ZIP' }),
+  ),
+  location: Schema.optional(Format.GeoPoint.annotations({ [SchemaAST.TitleAnnotationId]: 'Location' })),
+}).annotations({ [SchemaAST.TitleAnnotationId]: 'Address' });
 
 // TODO(burdon): Translations?
-const TestSchema = S.Struct({
-  name: S.optional(S.String.annotations({ [AST.TitleAnnotationId]: 'Name' })),
-  active: S.optional(S.Boolean.annotations({ [AST.TitleAnnotationId]: 'Active' })),
-  rank: S.optional(S.Number.annotations({ [AST.TitleAnnotationId]: 'Rank' })),
-  website: S.optional(Format.URL.annotations({ [AST.TitleAnnotationId]: 'Website' })),
-  address: S.optional(AddressSchema),
-}).pipe(S.mutable);
+const TestSchema = Schema.Struct({
+  name: Schema.optional(Schema.String.annotations({ [SchemaAST.TitleAnnotationId]: 'Name' })),
+  active: Schema.optional(Schema.Boolean.annotations({ [SchemaAST.TitleAnnotationId]: 'Active' })),
+  rank: Schema.optional(Schema.Number.annotations({ [SchemaAST.TitleAnnotationId]: 'Rank' })),
+  website: Schema.optional(Format.URL.annotations({ [SchemaAST.TitleAnnotationId]: 'Website' })),
+  address: Schema.optional(AddressSchema),
+}).pipe(Schema.mutable);
 
-type TestType = S.Schema.Type<typeof TestSchema>;
+type TestType = Schema.Schema.Type<typeof TestSchema>;
 
-type StoryProps<T extends BaseObject> = { schema: S.Schema<T> } & FormProps<T>;
+type StoryProps<T extends BaseObject> = { schema: Schema.Schema<T> } & FormProps<T>;
 
 const DefaultStory = <T extends BaseObject>({ schema, values: initialValues, ...props }: StoryProps<T>) => {
   const [values, setValues] = useState(initialValues);
@@ -78,9 +83,9 @@ export const Default: Story<TestType> = {
   },
 };
 
-export const Org: Story<Testing.Org> = {
+export const Organization: Story<Testing.Organization> = {
   args: {
-    schema: Testing.OrgSchema,
+    schema: Testing.OrganizationSchema,
     values: {
       name: 'DXOS',
       // website: 'https://dxos.org',
@@ -88,9 +93,9 @@ export const Org: Story<Testing.Org> = {
   },
 };
 
-export const OrgAutoSave: Story<Testing.Org> = {
+export const OrganizationAutoSave: Story<Testing.Organization> = {
   args: {
-    schema: Testing.OrgSchema,
+    schema: Testing.OrganizationSchema,
     values: {
       name: 'DXOS',
       // website: 'https://dxos.org',
@@ -115,22 +120,24 @@ export const OrgAutoSave: Story<Testing.Org> = {
 // TODO(burdon): Move into separate storybook and use test types.
 //
 
-const ShapeSchema = S.Struct({
-  shape: S.optional(
-    S.Union(
-      S.Struct({
-        type: S.Literal('circle').annotations({ [AST.TitleAnnotationId]: 'Type' }),
-        radius: S.optional(S.Number.annotations({ [AST.TitleAnnotationId]: 'Radius' })),
+const ShapeSchema = Schema.Struct({
+  shape: Schema.optional(
+    Schema.Union(
+      Schema.Struct({
+        type: Schema.Literal('circle').annotations({ [SchemaAST.TitleAnnotationId]: 'Type' }),
+        radius: Schema.optional(Schema.Number.annotations({ [SchemaAST.TitleAnnotationId]: 'Radius' })),
       }),
-      S.Struct({
-        type: S.Literal('square').annotations({ [AST.TitleAnnotationId]: 'Type' }),
-        size: S.optional(S.Number.pipe(S.nonNegative()).annotations({ [AST.TitleAnnotationId]: 'Size' })),
+      Schema.Struct({
+        type: Schema.Literal('square').annotations({ [SchemaAST.TitleAnnotationId]: 'Type' }),
+        size: Schema.optional(
+          Schema.Number.pipe(Schema.nonNegative()).annotations({ [SchemaAST.TitleAnnotationId]: 'Size' }),
+        ),
       }),
-    ).annotations({ [AST.TitleAnnotationId]: 'Shape' }),
+    ).annotations({ [SchemaAST.TitleAnnotationId]: 'Shape' }),
   ),
-}).pipe(S.mutable);
+}).pipe(Schema.mutable);
 
-type ShapeType = S.Schema.Type<typeof ShapeSchema>;
+type ShapeType = Schema.Schema.Type<typeof ShapeSchema>;
 
 type DiscriminatedUnionStoryProps = FormProps<ShapeType>;
 
@@ -176,12 +183,12 @@ export const DiscriminatedShape: StoryObj<DiscriminatedUnionStoryProps> = {
   },
 };
 
-const ArraysSchema = S.Struct({
-  names: S.Array(S.String.pipe(S.nonEmptyString())),
-  addresses: S.Array(AddressSchema),
-}).pipe(S.mutable);
+const ArraysSchema = Schema.Struct({
+  names: Schema.Array(Schema.String.pipe(Schema.nonEmptyString())),
+  addresses: Schema.Array(AddressSchema),
+}).pipe(Schema.mutable);
 
-type ArraysType = S.Schema.Type<typeof ArraysSchema>;
+type ArraysType = Schema.Schema.Type<typeof ArraysSchema>;
 
 const ArraysStory = ({ values: initialValues }: FormProps<ArraysType>) => {
   const [values, setValues] = useState(initialValues);
@@ -208,13 +215,13 @@ export const Arrays: StoryObj<FormProps<ArraysType>> = {
   },
 };
 
-const ColorSchema = S.Struct({
-  color: S.Union(S.Literal('red'), S.Literal('green'), S.Literal('blue')).annotations({
-    [AST.TitleAnnotationId]: 'Color',
+const ColorSchema = Schema.Struct({
+  color: Schema.Union(Schema.Literal('red'), Schema.Literal('green'), Schema.Literal('blue')).annotations({
+    [SchemaAST.TitleAnnotationId]: 'Color',
   }),
-}).pipe(S.mutable);
+}).pipe(Schema.mutable);
 
-type ColorType = S.Schema.Type<typeof ColorSchema>;
+type ColorType = Schema.Schema.Type<typeof ColorSchema>;
 
 const EnumStory = ({ values: initialValues }: FormProps<ColorType>) => {
   const [values, setValues] = useState(initialValues);
@@ -239,3 +246,44 @@ export const Enum: StoryObj<FormProps<ColorType>> = {
     },
   },
 };
+
+const RefSchema = Schema.Struct({
+  contact: Ref(ContactType).annotations({ title: 'Contact Reference' }),
+  optionalContact: Schema.optional(Ref(ContactType).annotations({ title: 'Optional Contact Reference' })),
+  unknownExpando: Schema.optional(Ref(Expando).annotations({ title: 'Optional Ref to an Expando (DXN Input)' })),
+});
+
+const RefStory = ({ values: initialValues }: FormProps<any>) => {
+  const [values, setValues] = useState(initialValues);
+  const handleSave = useCallback<NonNullable<FormProps<any>['onSave']>>((values) => {
+    setValues(values);
+  }, []);
+
+  const contact1 = live(ContactType, { identifiers: [] });
+  const contact2 = live(ContactType, { identifiers: [] });
+
+  const onQueryRefOptions = useCallback((typeInfo: TypeAnnotation) => {
+    switch (typeInfo.typename) {
+      case ContactType.typename:
+        return [
+          { dxn: getDXN(contact1)!, label: 'John Coltraine' },
+          { dxn: getDXN(contact2)!, label: 'Erykah Badu' },
+        ];
+      default:
+        return [];
+    }
+  }, []);
+
+  return (
+    <TestLayout json={{ values, schema: RefSchema.ast.toJSON() }}>
+      <TestPanel>
+        <Form schema={RefSchema} values={values} onSave={handleSave} onQueryRefOptions={onQueryRefOptions} />
+      </TestPanel>
+    </TestLayout>
+  );
+};
+
+export const Refs: StoryObj<FormProps<ContactType>> = {
+  render: RefStory,
+  args: { values: {} },
+};

package/src/components/Form/Form.tsx

@@ -2,9 +2,10 @@
 // Copyright 2024 DXOS.org
 //
 
+import { type Schema } from 'effect';
 import React, { type ReactElement, useEffect, useMemo, useRef } from 'react';
 
-import { type BaseObject, type S, type PropertyKey } from '@dxos/echo-schema';
+import { type BaseObject, type PropertyKey } from '@dxos/echo-schema';
 import { type ThemedClassName } from '@dxos/react-ui';
 import { mx } from '@dxos/react-ui-theme';
 import { type SchemaProperty } from '@dxos/schema';
@@ -13,13 +14,14 @@ import { FormActions } from './FormActions';
 import { FormFields } from './FormContent';
 import { FormProvider } from './FormContext';
 import { type InputProps, type InputComponent } from './Input';
+import { type QueryRefOptions } from './RefField';
 import { type FormOptions } from '../../hooks';
 
 export type PropsFilter<T extends BaseObject> = (props: SchemaProperty<T>[]) => SchemaProperty<T>[];
 
 export type ComponentLookup = (args: {
   prop: string;
-  schema: S.Schema<any>;
+  schema: Schema.Schema<any>;
   inputProps: InputProps;
 }) => ReactElement | undefined;
 
@@ -41,6 +43,7 @@ export type FormProps<T extends BaseObject> = ThemedClassName<
     autoSave?: boolean;
     testId?: string;
     onCancel?: () => void;
+    onQueryRefOptions?: QueryRefOptions;
     lookupComponent?: ComponentLookup;
     /**
      * Map of custom renderers for specific properties.
@@ -65,6 +68,7 @@ export const Form = <T extends BaseObject>({
   onValidate,
   onSave,
   onCancel,
+  onQueryRefOptions,
   lookupComponent,
   Custom,
 }: FormProps<T>) => {
@@ -100,6 +104,7 @@ export const Form = <T extends BaseObject>({
           readonly={readonly}
           filter={filter}
           sort={sort}
+          onQueryRefOptions={onQueryRefOptions}
           lookupComponent={lookupComponent}
           Custom={Custom}
         />