@dxos/react-ui-form 0.7.2 → 0.7.3-staging.0905f03

package/dist/lib/browser/index.mjs

@@ -91,7 +91,7 @@ import { pipe } from "effect";
 import { capitalize } from "effect/String";
 import React5, { useEffect as useEffect2, useMemo as useMemo2 } from "react";
 import { AST, S } from "@dxos/echo-schema";
-import { findNode, getDiscriminatedType, isDiscriminatedUnion } from "@dxos/effect";
+import { findNode, getDiscriminatedType, isDiscriminatedUnion, SimpleType } from "@dxos/effect";
 import { log as log2 } from "@dxos/log";
 import { IconButton, useTranslation as useTranslation2 } from "@dxos/react-ui";
 import { mx } from "@dxos/react-ui-theme";
@@ -122,11 +122,11 @@ var InputHeader = ({ children, error }) => {
 };
 
 // packages/ui/react-ui-form/src/components/Form/Defaults.tsx
-var TextInput = ({ property, type, label, disabled, placeholder, getStatus, getValue, onValueChange, onBlur }) => {
+var TextInput = ({ property, type, label, inputOnly, disabled, placeholder, getStatus, getValue, onValueChange, onBlur }) => {
   const { status, error } = getStatus?.(property);
   return /* @__PURE__ */ React3.createElement(Input2.Root, {
     validationValence: status
-  }, /* @__PURE__ */ React3.createElement(InputHeader, {
+  }, !inputOnly && /* @__PURE__ */ React3.createElement(InputHeader, {
     error
   }, /* @__PURE__ */ React3.createElement(Input2.Label, null, label)), /* @__PURE__ */ React3.createElement(Input2.TextInput, {
     disabled,
@@ -134,13 +134,13 @@ var TextInput = ({ property, type, label, disabled, placeholder, getStatus, getV
     value: getValue(property) ?? "",
     onChange: (event) => onValueChange(property, type, event.target.value),
     onBlur
-  }));
+  }), inputOnly && /* @__PURE__ */ React3.createElement(Input2.Validation, null, error));
 };
-var NumberInput = ({ property, type, label, disabled, placeholder, getStatus, getValue, onValueChange, onBlur }) => {
+var NumberInput = ({ property, type, label, inputOnly, disabled, placeholder, getStatus, getValue, onValueChange, onBlur }) => {
   const { status, error } = getStatus?.(property);
   return /* @__PURE__ */ React3.createElement(Input2.Root, {
     validationValence: status
-  }, /* @__PURE__ */ React3.createElement(InputHeader, {
+  }, !inputOnly && /* @__PURE__ */ React3.createElement(InputHeader, {
     error
   }, /* @__PURE__ */ React3.createElement(Input2.Label, null, label)), /* @__PURE__ */ React3.createElement(Input2.TextInput, {
     type: "number",
@@ -149,24 +149,24 @@ var NumberInput = ({ property, type, label, disabled, placeholder, getStatus, ge
     value: getValue(property) ?? 0,
     onChange: (event) => onValueChange(property, type, event.target.value),
     onBlur
-  }));
+  }), inputOnly && /* @__PURE__ */ React3.createElement(Input2.DescriptionAndValidation, null, error));
 };
-var BooleanInput = ({ property, type, label, getStatus, getValue, onValueChange }) => {
+var BooleanInput = ({ property, type, label, inputOnly, getStatus, getValue, onValueChange }) => {
   const { status, error } = getStatus?.(property);
   return /* @__PURE__ */ React3.createElement(Input2.Root, {
     validationValence: status
-  }, /* @__PURE__ */ React3.createElement(InputHeader, {
+  }, !inputOnly && /* @__PURE__ */ React3.createElement(InputHeader, {
     error
   }, /* @__PURE__ */ React3.createElement(Input2.Label, null, label)), /* @__PURE__ */ React3.createElement(Input2.Switch, {
     checked: getValue(property),
     onCheckedChange: (value) => onValueChange(property, type, value)
-  }));
+  }), inputOnly && /* @__PURE__ */ React3.createElement(Input2.DescriptionAndValidation, null, error));
 };
-var SelectInput = ({ property, type, label, disabled, placeholder, options, getStatus, getValue, onValueChange }) => {
+var SelectInput = ({ property, type, label, inputOnly, disabled, placeholder, options, getStatus, getValue, onValueChange }) => {
   const { status, error } = getStatus?.(property);
   return /* @__PURE__ */ React3.createElement(Input2.Root, {
     validationValence: status
-  }, /* @__PURE__ */ React3.createElement(InputHeader, {
+  }, !inputOnly && /* @__PURE__ */ React3.createElement(InputHeader, {
     error
   }, /* @__PURE__ */ React3.createElement(Input2.Label, null, label)), /* @__PURE__ */ React3.createElement(Select.Root, {
     value: getValue(property),
@@ -181,7 +181,7 @@ var SelectInput = ({ property, type, label, disabled, placeholder, options, getS
       key: String(value),
       value: String(value)
     }, label2 ?? String(value))
-  )))))));
+  )))))), inputOnly && /* @__PURE__ */ React3.createElement(Input2.DescriptionAndValidation, null, error));
 };
 
 // packages/ui/react-ui-form/src/components/Form/factory.tsx
@@ -252,7 +252,7 @@ import { invariant } from "@dxos/invariant";
 import { log } from "@dxos/log";
 import { validateSchema } from "@dxos/schema";
 var __dxlog_file = "/home/runner/work/dxos/dxos/packages/ui/react-ui-form/src/hooks/useForm.ts";
-var useForm = ({ schema, initialValues, onValuesChanged, onValidate, onValid, onSubmit }) => {
+var useForm = ({ schema, initialValues, onValuesChanged, onValidate, onValid, onSave }) => {
   const [values, setValues] = useState(initialValues);
   useEffect(() => {
     setValues(initialValues);
@@ -262,6 +262,7 @@ var useForm = ({ schema, initialValues, onValuesChanged, onValidate, onValid, on
   const [touched, setTouched] = useState(createKeySet(initialValues, false));
   const [changed, setChanged] = useState(createKeySet(initialValues, false));
   const [errors, setErrors] = useState({});
+  const [saving, setSaving] = useState(false);
   const validate = useCallback((values2) => {
     let errors2 = validateSchema(schema, values2) ?? [];
     if (errors2.length === 0 && onValidate) {
@@ -286,21 +287,27 @@ var useForm = ({ schema, initialValues, onValuesChanged, onValidate, onValid, on
     values,
     schemaDirty
   ]);
-  const canSubmit = useMemo(() => Object.keys(values).every((property) => touched[property] === false || !errors[property]), [
+  const canSave = useMemo(() => !saving && Object.keys(values).every((property) => touched[property] === false || !errors[property]), [
     values,
     touched,
-    errors
+    errors,
+    saving
   ]);
-  const handleSubmit = useCallback(() => {
+  const handleSave = useCallback(async () => {
     if (validate(values)) {
-      onSubmit?.(values, {
-        changed
-      });
+      setSaving(true);
+      try {
+        await onSave?.(values, {
+          changed
+        });
+      } finally {
+        setSaving(false);
+      }
     }
   }, [
     values,
     validate,
-    onSubmit
+    onSave
   ]);
   const getStatus = useCallback((property) => ({
     status: errors[property] ? "error" : void 0,
@@ -310,7 +317,7 @@ var useForm = ({ schema, initialValues, onValuesChanged, onValidate, onValid, on
     errors
   ]);
   const getValue = (property) => {
-    return values[property];
+    return getByPath(values, property);
   };
   const onValueChange = (property, type, value) => {
     let parsedValue = value;
@@ -321,16 +328,13 @@ var useForm = ({ schema, initialValues, onValuesChanged, onValidate, onValid, on
     } catch (err) {
       log.catch(err, void 0, {
         F: __dxlog_file,
-        L: 165,
+        L: 183,
         S: void 0,
         C: (f, a) => f(...a)
       });
       parsedValue = void 0;
     }
-    const newValues = {
-      ...values,
-      [property]: parsedValue
-    };
+    const newValues = setByPath(values, property, parsedValue);
     setValues(newValues);
     setChanged((prev) => ({
       ...prev,
@@ -364,8 +368,8 @@ var useForm = ({ schema, initialValues, onValuesChanged, onValidate, onValid, on
     errors,
     touched,
     changed,
-    canSubmit,
-    handleSubmit,
+    canSave,
+    handleSave,
     // Field utils.
     getStatus,
     getValue,
@@ -376,7 +380,7 @@ var useForm = ({ schema, initialValues, onValuesChanged, onValidate, onValid, on
 var createKeySet = (obj, value) => {
   invariant(obj, void 0, {
     F: __dxlog_file,
-    L: 216,
+    L: 234,
     S: void 0,
     A: [
       "obj",
@@ -396,23 +400,36 @@ var flatMap = (errors) => {
     return result;
   }, {});
 };
+var getByPath = (obj, path) => {
+  const [key, index] = path.split(".");
+  return index === void 0 ? obj[key] : obj[key][parseInt(index)];
+};
+var setByPath = (obj, path, value) => {
+  const [key, index] = path.split(".");
+  const newValue = index === void 0 ? value : [
+    ...obj[key]
+  ].map((v, i) => i === parseInt(index) ? value : v);
+  return {
+    ...obj,
+    [key]: newValue
+  };
+};
 
 // packages/ui/react-ui-form/src/components/Form/Form.tsx
 var __dxlog_file2 = "/home/runner/work/dxos/dxos/packages/ui/react-ui-form/src/components/Form/Form.tsx";
 var padding = "px-2";
-var Form = ({ classNames, schema, values: initialValues, path = [], readonly, filter, sort, autoSave, onValuesChanged, onValidate, onSubmit, onCancel, Custom }) => {
-  const { t } = useTranslation2(translationKey);
-  const onValid = useMemo2(() => autoSave ? onSubmit : void 0, [
+var Form = ({ classNames, schema, values: initialValues, path = [], readonly, filter, sort, autoSave, testId, onValuesChanged, onValidate, onSave, onCancel, Custom }) => {
+  const onValid = useMemo2(() => autoSave ? onSave : void 0, [
     autoSave,
-    onSubmit
+    onSave
   ]);
-  const { canSubmit, values, errors, handleSubmit, ...inputProps } = useForm({
+  const { canSave, values, errors, handleSave, ...inputProps } = useForm({
     schema,
     initialValues,
     onValuesChanged,
     onValidate,
     onValid,
-    onSubmit
+    onSave
   });
   const properties = useMemo2(() => {
     const props = getSchemaProperties(schema.ast, values);
@@ -433,7 +450,7 @@ var Form = ({ classNames, schema, values: initialValues, path = [], readonly, fi
         errors
       }, {
         F: __dxlog_file2,
-        L: 96,
+        L: 100,
         S: void 0,
         C: (f, a) => f(...a)
       });
@@ -443,14 +460,15 @@ var Form = ({ classNames, schema, values: initialValues, path = [], readonly, fi
   ]);
   return /* @__PURE__ */ React5.createElement("div", {
     role: "form",
-    className: mx("flex flex-col w-full gap-2 py-2", classNames)
+    className: mx("flex flex-col w-full gap-2 py-2", classNames),
+    "data-testid": testId
   }, properties.map((property) => {
-    const { ast, name, type, format, title, description, examples, options } = property;
+    const { ast, name, type, format, title, description, examples, options, array } = property;
     const key = [
       ...path,
       name
     ];
-    const label = pipe(title ?? name, capitalize);
+    const label = title ?? pipe(name, capitalize);
     const placeholder = examples?.length ? `Example: "${examples[0]}"` : description;
     let InputComponent = Custom?.[key.join(".")];
     if (!InputComponent) {
@@ -474,6 +492,22 @@ var Form = ({ classNames, schema, values: initialValues, path = [], readonly, fi
         }));
       }
       InputComponent = getInputComponent(type, format);
+      if (array) {
+        return /* @__PURE__ */ React5.createElement(ArrayField, {
+          key: name,
+          name,
+          type,
+          array: true,
+          label,
+          ast,
+          values,
+          format,
+          readonly,
+          placeholder,
+          inputProps,
+          Custom
+        });
+      }
     }
     if (!InputComponent) {
       if (type === "object") {
@@ -502,7 +536,7 @@ var Form = ({ classNames, schema, values: initialValues, path = [], readonly, fi
         type
       }, {
         F: __dxlog_file2,
-        L: 160,
+        L: 185,
         S: void 0,
         C: (f, a) => f(...a)
       });
@@ -521,28 +555,163 @@ var Form = ({ classNames, schema, values: initialValues, path = [], readonly, fi
       placeholder,
       ...inputProps
     }));
-  }).filter(isNotFalsy), (onCancel || onSubmit) && !autoSave && /* @__PURE__ */ React5.createElement("div", {
+  }).filter(isNotFalsy), (onCancel || onSave) && !autoSave && /* @__PURE__ */ React5.createElement(FormActions, {
+    onCancel,
+    onSubmit: handleSave,
+    canSubmit: canSave,
+    readonly
+  }));
+};
+var ArrayField = ({ name, type, label, ast, values, format, readonly, placeholder, inputProps, Custom }) => {
+  const { t } = useTranslation2(translationKey);
+  const arrayValues = values[name] ?? [];
+  const key = [
+    name
+  ];
+  const tupleType = findNode(ast, AST.isTupleType);
+  const elementType = tupleType?.rest[0]?.type;
+  if (type === "object" && elementType) {
+    const baseNode = findNode(elementType, isDiscriminatedUnion);
+    const typeLiteral = baseNode ? getDiscriminatedType(baseNode, values[name]) : findNode(elementType, AST.isTypeLiteral);
+    if (typeLiteral) {
+      const schema = S.make(typeLiteral);
+      return /* @__PURE__ */ React5.createElement("div", {
+        key: name,
+        role: "none",
+        className: mx(padding)
+      }, /* @__PURE__ */ React5.createElement(InputHeader, null, label), /* @__PURE__ */ React5.createElement("div", {
+        role: "none",
+        className: "flex flex-col gap-1"
+      }, arrayValues.map((value, index) => {
+        return /* @__PURE__ */ React5.createElement("div", {
+          key: index,
+          role: "none",
+          className: "flex items-center gap-1"
+        }, /* @__PURE__ */ React5.createElement("div", {
+          role: "none",
+          className: "flex-1"
+        }, /* @__PURE__ */ React5.createElement(Form, {
+          schema,
+          path: [
+            ...key,
+            index.toString()
+          ],
+          values: value,
+          onValuesChanged: (childValues) => {
+            const newValues = [
+              ...arrayValues
+            ];
+            newValues[index] = childValues;
+            inputProps.onValueChange(name, "object", newValues);
+          },
+          Custom
+        })), /* @__PURE__ */ React5.createElement(IconButton, {
+          icon: "ph--trash--regular",
+          iconOnly: true,
+          label: t("button remove"),
+          onClick: () => {
+            const newValues = arrayValues.filter((_, i) => i !== index);
+            inputProps.onValueChange(name, type, newValues);
+          }
+        }));
+      })), /* @__PURE__ */ React5.createElement("div", {
+        role: "none",
+        className: "flex justify-between items-center plb-1"
+      }, /* @__PURE__ */ React5.createElement(IconButton, {
+        icon: "ph--plus--regular",
+        iconOnly: true,
+        label: t("button add"),
+        onClick: () => {
+          const newValues = [
+            ...arrayValues,
+            {}
+          ];
+          inputProps.onValueChange(name, type, newValues);
+        }
+      })));
+    }
+    return /* @__PURE__ */ React5.createElement("div", {
+      key: name,
+      role: "none"
+    }, "Nested form not supported in arrays, yet.");
+  }
+  const InputComponent = getInputComponent(type, format);
+  if (!InputComponent) {
+    return null;
+  }
+  return /* @__PURE__ */ React5.createElement("div", {
+    role: "none",
+    key: "meta-input",
+    className: mx(padding)
+  }, /* @__PURE__ */ React5.createElement(InputHeader, null, label), /* @__PURE__ */ React5.createElement("div", {
+    role: "none",
+    className: "flex flex-col gap-1"
+  }, arrayValues.map((_, index) => /* @__PURE__ */ React5.createElement("div", {
+    key: index,
+    role: "none",
+    className: "flex items-start gap-1"
+  }, /* @__PURE__ */ React5.createElement("div", {
+    role: "none",
+    className: "flex-1"
+  }, /* @__PURE__ */ React5.createElement(InputComponent, {
+    type,
+    format,
+    label,
+    inputOnly: true,
+    property: `${name}.${index}`,
+    disabled: readonly,
+    placeholder,
+    ...inputProps
+  })), /* @__PURE__ */ React5.createElement(IconButton, {
+    icon: "ph--trash--regular",
+    iconOnly: true,
+    label: t("button remove"),
+    onClick: () => {
+      const newValues = arrayValues.filter((_2, i) => i !== index);
+      inputProps.onValueChange(name, type, newValues);
+    }
+  })))), /* @__PURE__ */ React5.createElement("div", {
+    role: "none",
+    className: "flex justify-between items-center plb-1"
+  }, /* @__PURE__ */ React5.createElement(IconButton, {
+    icon: "ph--plus--regular",
+    iconOnly: true,
+    label: t("button add"),
+    onClick: () => {
+      const newValues = [
+        ...arrayValues,
+        SimpleType.getDefaultValue(type)
+      ];
+      inputProps.onValueChange(name, type, newValues);
+    }
+  })));
+};
+var FormActions = ({ onCancel, onSubmit, canSubmit, readonly }) => {
+  const { t } = useTranslation2(translationKey);
+  return /* @__PURE__ */ React5.createElement("div", {
     role: "none",
     className: "flex justify-center"
   }, /* @__PURE__ */ React5.createElement("div", {
     role: "none",
     className: mx(onCancel && !readonly && "grid grid-cols-2 gap-2")
   }, onCancel && !readonly && /* @__PURE__ */ React5.createElement(IconButton, {
+    "data-testid": "cancel-button",
     icon: "ph--x--regular",
     label: t("button cancel"),
     onClick: onCancel
   }), onSubmit && /* @__PURE__ */ React5.createElement(IconButton, {
     type: "submit",
+    "data-testid": "save-button",
     disabled: !canSubmit,
     icon: "ph--check--regular",
     label: t("button save"),
-    onClick: handleSubmit
-  }))));
+    onClick: onSubmit
+  })));
 };
 
 // packages/ui/react-ui-form/src/components/FieldEditor/FieldEditor.tsx
 var __dxlog_file3 = "/home/runner/work/dxos/dxos/packages/ui/react-ui-form/src/components/FieldEditor/FieldEditor.tsx";
-var FieldEditor = ({ view, projection, field, registry, onClose, onCancel }) => {
+var FieldEditor = ({ view, projection, field, registry, onSave, onCancel }) => {
   const { t } = useTranslation3(translationKey);
   const [props, setProps] = useState2(projection.getFieldProjection(field.id).props);
   useEffect3(() => setProps(projection.getFieldProjection(field.id).props), [
@@ -613,22 +782,22 @@ var FieldEditor = ({ view, projection, field, registry, onClose, onCancel }) =>
     view.fields,
     field
   ]);
-  const handleSubmit = useCallback2((props2) => {
+  const handleSave = useCallback2((props2) => {
     projection.setFieldProjection({
       field,
       props: props2
     });
-    onClose();
+    onSave();
   }, [
     projection,
     field,
-    onClose
+    onSave
   ]);
   const handleCancel = useCallback2(() => {
     requestAnimationFrame(() => onCancel?.());
-    onClose();
+    onSave();
   }, [
-    onClose
+    onSave
   ]);
   if (!fieldSchema) {
     log3.warn("invalid format", {
@@ -653,7 +822,7 @@ var FieldEditor = ({ view, projection, field, registry, onClose, onCancel }) =>
     ],
     onValuesChanged: handleValuesChanged,
     onValidate: handleValidate,
-    onSubmit: handleSubmit,
+    onSave: handleSave,
     onCancel: handleCancel,
     Custom: {
       ["format"]: (props2) => /* @__PURE__ */ React6.createElement(SelectInput, {
@@ -692,7 +861,7 @@ var ViewMetaSchema = S2.Struct({
   name: S2.String.annotations({
     [AST2.TitleAnnotationId]: "View"
   }),
-  type: Format.DXN.annotations({
+  typename: Format.DXN.annotations({
     [AST2.TitleAnnotationId]: "Typename"
   })
 }).pipe(S2.mutable);
@@ -708,16 +877,16 @@ var ViewEditor = ({ classNames, schema, view, registry, readonly, showHeading =
       name: view.name,
       // TODO(burdon): Need to warn user of possible consequences of editing.
       // TODO(burdon): Settings should have domain name owned by user.
-      type: view.query.type
+      typename: view.query.type
     };
   }, [
     view
   ]);
-  const handleViewUpdate = useCallback3(({ name, type }) => {
+  const handleViewUpdate = useCallback3(({ name, typename }) => {
     requestAnimationFrame(() => {
       view.name = name;
-      view.query.type = type;
-      schema.updateTypename(type);
+      view.query.type = typename;
+      schema.updateTypename(typename);
     });
   }, [
     view,
@@ -746,7 +915,7 @@ var ViewEditor = ({ classNames, schema, view, registry, readonly, showHeading =
     autoSave: true,
     schema: ViewMetaSchema,
     values: viewValues,
-    onSubmit: handleViewUpdate
+    onSave: handleViewUpdate
   }), /* @__PURE__ */ React7.createElement("div", null, /* @__PURE__ */ React7.createElement("div", {
     role: "none",
     className: "p-2"
@@ -780,7 +949,7 @@ var ViewEditor = ({ classNames, schema, view, registry, readonly, showHeading =
     projection,
     field,
     registry,
-    onClose: handleClose
+    onSave: handleClose
   }), !readonly && !field && /* @__PURE__ */ React7.createElement("div", {
     className: "flex p-2 justify-center"
   }, /* @__PURE__ */ React7.createElement(IconButton2, {
@@ -1016,6 +1185,7 @@ export {
   DeprecatedFormInput,
   FieldEditor,
   Form,
+  FormActions,
   GeiPointInput,
   InputHeader,
   NumberInput,