@dxos/react-ui-form 0.7.5-main.9d2a38b → 0.7.5-main.e9bb01b

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/react-ui-form",
-  "version": "0.7.5-main.9d2a38b",
+  "version": "0.7.5-main.e9bb01b",
   "description": "Data components.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -25,24 +25,25 @@
     "@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.12.1",
     "jsonpath": "^1.1.1",
-    "@dxos/async": "0.7.5-main.9d2a38b",
-    "@dxos/debug": "0.7.5-main.9d2a38b",
-    "@dxos/echo-db": "0.7.5-main.9d2a38b",
-    "@dxos/echo-schema": "0.7.5-main.9d2a38b",
-    "@dxos/effect": "0.7.5-main.9d2a38b",
-    "@dxos/keys": "0.7.5-main.9d2a38b",
-    "@dxos/invariant": "0.7.5-main.9d2a38b",
-    "@dxos/live-object": "0.7.5-main.9d2a38b",
-    "@dxos/log": "0.7.5-main.9d2a38b",
-    "@dxos/react-client": "0.7.5-main.9d2a38b",
-    "@dxos/react-ui-list": "0.7.5-main.9d2a38b",
-    "@dxos/schema": "0.7.5-main.9d2a38b",
-    "@dxos/react-ui-types": "0.7.5-main.9d2a38b",
-    "@dxos/util": "0.7.5-main.9d2a38b"
+    "@dxos/async": "0.7.5-main.e9bb01b",
+    "@dxos/debug": "0.7.5-main.e9bb01b",
+    "@dxos/echo-db": "0.7.5-main.e9bb01b",
+    "@dxos/effect": "0.7.5-main.e9bb01b",
+    "@dxos/invariant": "0.7.5-main.e9bb01b",
+    "@dxos/keys": "0.7.5-main.e9bb01b",
+    "@dxos/echo-schema": "0.7.5-main.e9bb01b",
+    "@dxos/live-object": "0.7.5-main.e9bb01b",
+    "@dxos/log": "0.7.5-main.e9bb01b",
+    "@dxos/react-client": "0.7.5-main.e9bb01b",
+    "@dxos/react-ui-pickers": "0.7.5-main.e9bb01b",
+    "@dxos/react-ui-list": "0.7.5-main.e9bb01b",
+    "@dxos/react-ui-types": "0.7.5-main.e9bb01b",
+    "@dxos/util": "0.7.5-main.e9bb01b",
+    "@dxos/schema": "0.7.5-main.e9bb01b"
   },
   "devDependencies": {
     "@phosphor-icons/react": "^2.1.5",
@@ -53,12 +54,12 @@
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
     "vite": "5.4.7",
-    "@dxos/echo-signals": "0.7.5-main.9d2a38b",
-    "@dxos/react-ui": "0.7.5-main.9d2a38b",
-    "@dxos/random": "0.7.5-main.9d2a38b",
-    "@dxos/react-ui-syntax-highlighter": "0.7.5-main.9d2a38b",
-    "@dxos/react-ui-theme": "0.7.5-main.9d2a38b",
-    "@dxos/storybook-utils": "0.7.5-main.9d2a38b"
+    "@dxos/echo-signals": "0.7.5-main.e9bb01b",
+    "@dxos/react-ui": "0.7.5-main.e9bb01b",
+    "@dxos/react-ui-syntax-highlighter": "0.7.5-main.e9bb01b",
+    "@dxos/react-ui-theme": "0.7.5-main.e9bb01b",
+    "@dxos/random": "0.7.5-main.e9bb01b",
+    "@dxos/storybook-utils": "0.7.5-main.e9bb01b"
   },
   "peerDependencies": {
     "@effect/schema": "^0.75.5",
@@ -66,8 +67,8 @@
     "effect": "^3.9.2",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
-    "@dxos/react-ui": "0.7.5-main.9d2a38b",
-    "@dxos/react-ui-theme": "0.7.5-main.9d2a38b"
+    "@dxos/react-ui": "0.7.5-main.e9bb01b",
+    "@dxos/react-ui-theme": "0.7.5-main.e9bb01b"
   },
   "publishConfig": {
     "access": "public"

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

@@ -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,
   },

package/src/components/FieldEditor/FieldEditor.tsx

@@ -20,7 +20,7 @@ import {
 } from '@dxos/schema';
 
 import { translationKey } from '../../translations';
-import { Form, type FormProps, type InputComponent, SelectInput } from '../Form';
+import { Form, type FormProps, type InputComponent, SelectInput, SelectOptionInput } from '../Form';
 
 export type FieldEditorProps = {
   view: ViewType;
@@ -95,7 +95,7 @@ export const FieldEditor = ({ view, projection, field, registry, onSave, onCance
           return { ...props, ..._props, type };
         }
 
-        return props;
+        return _props as PropertyType;
       });
     },
     [schemas, props.format, props.referenceSchema],
@@ -129,10 +129,10 @@ export const FieldEditor = ({ view, projection, field, registry, onSave, onCance
     onSave();
   }, [onSave]);
 
-  const Custom: Partial<Record<string, InputComponent<PropertyType>>> = useMemo(
+  const Custom: Partial<Record<string, InputComponent>> = useMemo(
     () => ({
       ['format' satisfies keyof PropertyType]: (props) => (
-        <SelectInput<PropertyType>
+        <SelectInput
           {...props}
           options={FormatEnums.filter((value) => value !== FormatEnum.None).map((value) => ({
             value,
@@ -141,7 +141,7 @@ export const FieldEditor = ({ view, projection, field, registry, onSave, onCance
         />
       ),
       ['referenceSchema' satisfies keyof PropertyType]: (props) => (
-        <SelectInput<PropertyType>
+        <SelectInput
           {...props}
           options={schemas.map((schema) => ({
             value: schema.typename,
@@ -149,7 +149,7 @@ export const FieldEditor = ({ view, projection, field, registry, onSave, onCance
         />
       ),
       ['referencePath' satisfies keyof PropertyType]: (props) => (
-        <SelectInput<PropertyType>
+        <SelectInput
           {...props}
           options={
             referenceSchema
@@ -160,6 +160,7 @@ export const FieldEditor = ({ view, projection, field, registry, onSave, onCance
           }
         />
       ),
+      ['options' satisfies keyof PropertyType]: (props) => <SelectOptionInput {...props} />,
     }),
     [t, schemas, referenceSchema],
   );

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,16 +73,8 @@ 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();
 
   return (
     <Input.Root validationValence={status}>
@@ -94,21 +83,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 +103,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 +113,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>

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

@@ -36,7 +36,7 @@ type TestType = S.Schema.Type<typeof TestSchema>;
 
 type StoryProps<T extends BaseObject> = { schema: S.Schema<T> } & FormProps<T>;
 
-const DefaultStory = <T extends BaseObject>({ schema, values: initialValues }: StoryProps<T>) => {
+const DefaultStory = <T extends BaseObject>({ schema, values: initialValues, ...props }: StoryProps<T>) => {
   const [values, setValues] = useState(initialValues);
   const handleSave = useCallback<NonNullable<FormProps<T>['onSave']>>((values) => {
     setValues(values);
@@ -45,7 +45,7 @@ const DefaultStory = <T extends BaseObject>({ schema, values: initialValues }: S
   return (
     <TestLayout json={{ values, schema: schema.ast.toJSON() }}>
       <TestPanel>
-        <Form<T> schema={schema} values={values} onSave={handleSave} />
+        <Form<T> schema={schema} values={values} onSave={handleSave} {...props} />
       </TestPanel>
     </TestLayout>
   );
@@ -78,7 +78,6 @@ export const Default: Story<TestType> = {
   },
 };
 
-// TODO(burdon): Should accept partial values.
 export const Org: Story<Testing.OrgSchemaType> = {
   args: {
     schema: Testing.OrgSchema,
@@ -89,6 +88,17 @@ export const Org: Story<Testing.OrgSchemaType> = {
   },
 };
 
+export const OrgAutoSave: Story<Testing.OrgSchemaType> = {
+  args: {
+    schema: Testing.OrgSchema,
+    values: {
+      name: 'DXOS',
+      // website: 'https://dxos.org',
+    },
+    autoSave: true,
+  },
+};
+
 // TODO(burdon): Type issue with employer reference.
 // TODO(burdon): Test table/form with compound values (e.g., address).
 // export const Contact: Story<Testing.ContactSchemaType> = {
@@ -114,7 +124,7 @@ const ShapeSchema = S.Struct({
       }),
       S.Struct({
         type: S.Literal('square').annotations({ [AST.TitleAnnotationId]: 'Type' }),
-        size: S.optional(S.Number.annotations({ [AST.TitleAnnotationId]: 'Size' })),
+        size: S.optional(S.Number.pipe(S.nonNegative()).annotations({ [AST.TitleAnnotationId]: 'Size' })),
       }),
     ).annotations({ [AST.TitleAnnotationId]: 'Shape' }),
   ),
@@ -139,7 +149,7 @@ const DiscriminatedUnionStory = ({ values: initialValues }: DiscriminatedUnionSt
           onSave={handleSave}
           Custom={{
             ['shape.type' as const]: (props) => (
-              <SelectInput<ShapeType>
+              <SelectInput
                 {...props}
                 options={['circle', 'square'].map((value) => ({
                   value,