@dxos/react-ui-form 0.8.4-main.bc674ce → 0.8.4-main.bcb3aa67d6

package/src/components/ControlSection/ControlSection.tsx

@@ -1,153 +0,0 @@
-//
-// Copyright 2025 DXOS.org
-//
-
-import React, { type ComponentPropsWithoutRef, type PropsWithChildren } from 'react';
-
-import {
-  Button,
-  type ButtonProps,
-  Input,
-  type Label,
-  type ThemedClassName,
-  toLocalizedString,
-  useTranslation,
-} from '@dxos/react-ui';
-import { Layout } from '@dxos/react-ui-mosaic';
-import { mx } from '@dxos/ui-theme';
-
-import { translationKey } from '../../translations';
-
-export type ControlPageParams = ThemedClassName<ComponentPropsWithoutRef<'div'>>;
-
-export const ControlPage = ({ children, classNames, ...props }: ControlPageParams) => {
-  return (
-    <Layout.Container scrollable classNames='[--control-spacing:var(--dx-trimMd)]'>
-      <div role='none' className={mx('pli-cardSpacingInline pbe-trimMd', classNames)} {...props}>
-        {children}
-      </div>
-    </Layout.Container>
-  );
-};
-
-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 (
-    <>
-      <h2 className='pli-trimMd container-max-width text-xl mbs-trimMd mbe-trimMd'>{toLocalizedString(title, t)}</h2>
-      {description && (
-        <p className='pli-trimMd mlb-trimMd container-max-width text-description'>
-          {toLocalizedString(description, t)}
-        </p>
-      )}
-    </>
-  );
-};
-
-export const ControlGroupButton = ({ classNames, ...props }: ButtonProps) => {
-  return <Button {...props} classNames={['md:col-span-2', classNames]} />;
-};
-
-export type ControlGroupProps = ThemedClassName<PropsWithChildren>;
-
-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-trimMd',
-      '[--control-spacing:0px] [&_input]:justify-self-end [&_button]:justify-self-end',
-      classNames,
-    )}
-  >
-    {children}
-  </div>
-);
-
-export const ControlFrame = ({ children }: ControlGroupProps) => (
-  <div
-    role='none'
-    className={mx(
-      'container-max-width grid grid-cols-1 md:grid-cols-[1fr_1fr] gap-trimSm md:gap-trimMd p-trimMd',
-      'border border-separator rounded-md',
-    )}
-  >
-    {children}
-  </div>
-);
-
-export const controlItemClasses = mx([
-  'container-max-width grid md:col-span-2 grid-cols-subgrid gap-trimSm items-center',
-  // TODO(burdon): Use grid gap consistently or apply margins consistently?
-  'mlb-[--control-spacing] *:first:!mbs-0 *:last:!mbe-0 pli-trimMd plb-trimMd',
-  'border border-separator rounded-md',
-]);
-
-const controlItemTitleClasses = 'mbe-0 text-lg text-baseText font-normal';
-const controlItemDescriptionClasses = 'mlb-trimSm md:mbe-0 text-base text-description';
-
-export type ControlItemProps = PropsWithChildren<{
-  title: Label;
-  description?: Label;
-}>;
-
-export const ControlItem = ({ title, description, children }: ControlItemProps) => {
-  const { t } = useTranslation(translationKey);
-
-  return (
-    <div className={controlItemClasses}>
-      <div role='none'>
-        <h3 className={controlItemTitleClasses}>{toLocalizedString(title, t)}</h3>
-        {description && <p className={controlItemDescriptionClasses}>{toLocalizedString(description, t)}</p>}
-      </div>
-      {children}
-    </div>
-  );
-};
-
-export const ControlItemInput = ({ title, description, children }: ControlItemProps) => {
-  const { t } = useTranslation(translationKey);
-
-  return (
-    <Input.Root>
-      <div className={controlItemClasses}>
-        <div role='none'>
-          <Input.Label classNames={controlItemTitleClasses}>{toLocalizedString(title, t)}</Input.Label>
-          {description && (
-            <Input.DescriptionAndValidation>
-              <Input.Description classNames={controlItemDescriptionClasses}>
-                {toLocalizedString(description, t)}
-              </Input.Description>
-            </Input.DescriptionAndValidation>
-          )}
-        </div>
-        {children}
-      </div>
-    </Input.Root>
-  );
-};
-
-export const ControlFrameItem = ({ title, description, children }: ControlItemProps) => {
-  const { t } = useTranslation(translationKey);
-
-  return (
-    <div role='group' className='min-is-0'>
-      <h3 className='text-lg mbe-2'>{toLocalizedString(title, t)}</h3>
-      {description && <p className='mlb-trimSm md:mbe-0 text-description'>{toLocalizedString(description, t)}</p>}
-      {children}
-    </div>
-  );
-};

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

@@ -1,314 +0,0 @@
-//
-// Copyright 2024 DXOS.org
-//
-
-import { type Meta, type StoryObj } from '@storybook/react-vite';
-import * as Schema from 'effect/Schema';
-import React, { useCallback, useState } from 'react';
-
-import { Format } from '@dxos/echo';
-import { type AnyProperties } from '@dxos/echo/internal';
-import { Tooltip } from '@dxos/react-ui';
-import { withLayoutVariants, withTheme } from '@dxos/react-ui/testing';
-import { TestSchema } from '@dxos/schema/testing';
-
-import { translations } from '../../translations';
-import { TestLayout } from '../testing';
-
-import { SelectField } from './fields';
-import { Form, type FormRootProps } from './Form';
-
-// TODO(burdon): Extract into Form.stories.tsx
-
-type StoryProps<T extends AnyProperties> = {
-  debug?: boolean;
-  schema: Schema.Schema.AnyNoContext;
-} & FormRootProps<T>;
-
-const DefaultStory = <T extends AnyProperties = any>({
-  debug,
-  schema,
-  values: valuesProp,
-  ...props
-}: StoryProps<T>) => {
-  const [values, setValues] = useState(valuesProp);
-  const handleSave = useCallback<NonNullable<FormRootProps<T>['onSave']>>((values) => {
-    setValues(values);
-  }, []);
-
-  if (debug) {
-    return (
-      <Tooltip.Provider>
-        <TestLayout json={{ values, schema: schema.ast }}>
-          <Form.Root<T> schema={schema} values={values} onSave={handleSave} {...props}>
-            <Form.Content>
-              <Form.FieldSet />
-              <Form.Actions />
-            </Form.Content>
-          </Form.Root>
-        </TestLayout>
-      </Tooltip.Provider>
-    );
-  }
-
-  return (
-    <Form.Root<T> schema={schema} values={values} onSave={handleSave} {...props}>
-      <Form.Content>
-        <Form.FieldSet />
-        <Form.Actions />
-      </Form.Content>
-    </Form.Root>
-  );
-};
-
-// const RefStory = <T extends AnyProperties = any>(props: StoryProps<T>) => {
-//   const onQueryRefOptions = useCallback<NonNullable<FormRootProps<T>['onQueryRefOptions']>>(({ typename }) => {
-//     switch (typename) {
-//       case TestSchema.Person.typename:
-//         return [
-//           { dxn: Obj.getDXN(contact1), label: 'Alice' },
-//           { dxn: Obj.getDXN(contact2), label: 'Bob' },
-//         ];
-//       default:
-//         return [];
-//     }
-//   }, []);
-
-//   return <DefaultStory<T> onQueryRefOptions={onQueryRefOptions} {...props} />;
-// };
-
-const AddressSchema = Schema.Struct({
-  street: Schema.optional(Schema.String.annotations({ title: 'Street' })),
-  city: Schema.optional(Schema.String.annotations({ title: 'City' })),
-  zip: Schema.optional(Schema.String.pipe(Schema.pattern(/^\d{5}(-\d{4})?$/)).annotations({ title: 'ZIP' })),
-  location: Schema.optional(Format.GeoPoint.annotations({ title: 'Location' })),
-}).annotations({ title: 'Address' });
-
-const PersonSchema = Schema.Struct({
-  name: Schema.optional(Schema.String.annotations({ title: 'Name' })),
-  active: Schema.optional(Schema.Boolean.annotations({ title: 'Active' })),
-  rank: Schema.optional(Schema.Number.annotations({ title: 'Rank' })),
-  website: Schema.optional(Format.URL.annotations({ title: 'Website' })),
-  address: Schema.optional(AddressSchema),
-}).pipe(Schema.mutable);
-
-type PersonSchema = Schema.Schema.Type<typeof PersonSchema>;
-
-const meta = {
-  title: 'ui/react-ui-form/Form-Old',
-  component: Form.Root as any,
-  render: DefaultStory,
-  decorators: [withTheme, withLayoutVariants()],
-  parameters: {
-    layout: 'fullscreen',
-    translations,
-  },
-  argTypes: {
-    readonly: {
-      control: 'boolean',
-      description: 'Readonly',
-    },
-  },
-} satisfies Meta<StoryProps<any>>;
-
-export default meta;
-
-type Story = StoryObj<typeof meta>;
-
-export const Default: Story = {
-  args: {
-    schema: PersonSchema,
-    values: {
-      name: 'DXOS',
-      active: true,
-      address: {
-        zip: '11205',
-      },
-    },
-    readonly: false,
-  },
-};
-
-export const Organization: Story = {
-  args: {
-    debug: true,
-    schema: TestSchema.OrganizationSchema,
-    values: {
-      name: 'DXOS',
-      website: 'https://dxos.org',
-    },
-    readonly: false,
-  },
-};
-
-export const OrganizationAutoSave: Story = {
-  args: {
-    debug: true,
-    schema: TestSchema.OrganizationSchema,
-    values: {
-      name: 'DXOS',
-      website: 'https://dxos.org',
-    },
-    autoSave: true,
-    readonly: false,
-  },
-};
-
-// TODO(burdon): Type issue with employer reference.
-// TODO(burdon): Test table/form with compound values (e.g., address).
-// Property name is missing in type EncodedReference but required in type
-export const Person: Story = {
-  args: {
-    debug: true,
-    schema: TestSchema.Person,
-    values: {
-      name: 'Bot',
-    },
-  },
-};
-
-//
-// Union
-//
-
-const ShapeSchema = Schema.Struct({
-  shape: Schema.optional(
-    Schema.Union(
-      Schema.Struct({
-        type: Schema.Literal('circle').annotations({ title: 'Type' }),
-        radius: Schema.optional(Schema.Number.annotations({ title: 'Radius' })),
-      }),
-      Schema.Struct({
-        type: Schema.Literal('square').annotations({ title: 'Type' }),
-        size: Schema.optional(Schema.Number.pipe(Schema.nonNegative()).annotations({ title: 'Size' })),
-      }),
-    ).annotations({ title: 'Shape' }),
-  ),
-}).pipe(Schema.mutable);
-
-type ShapeSchema = Schema.Schema.Type<typeof ShapeSchema>;
-
-export const DiscriminatedShape: StoryObj<StoryProps<ShapeSchema>> = {
-  args: {
-    debug: true,
-    schema: ShapeSchema,
-    readonly: false,
-    values: {
-      shape: {
-        type: 'circle',
-        radius: 5,
-      },
-    },
-    fieldMap: {
-      ['shape.type' as const]: (props) => (
-        <SelectField
-          {...props}
-          options={['circle', 'square'].map((value) => ({
-            value,
-            label: value,
-          }))}
-        />
-      ),
-    },
-  },
-};
-
-//
-// Arrays
-//
-
-const ArraysSchema = Schema.Struct({
-  names: Schema.Array(Schema.String.pipe(Schema.nonEmptyString())),
-  addresses: Schema.Array(AddressSchema),
-}).pipe(Schema.mutable);
-
-type ArraysSchema = Schema.Schema.Type<typeof ArraysSchema>;
-
-export const Arrays: StoryObj<StoryProps<ArraysSchema>> = {
-  args: {
-    debug: true,
-    schema: ArraysSchema,
-    readonly: false,
-    values: {
-      names: ['Alice', 'Bob'],
-      addresses: [],
-    },
-  },
-};
-
-//
-// Tuple
-//
-
-// TODO(wittjosiah): Only GeoPoint is works currently.
-const TupleSchema = Schema.Struct({
-  tuple: Schema.Tuple(Schema.Number, Schema.String, Schema.Boolean),
-  geopoint: Format.GeoPoint,
-}).pipe(Schema.mutable);
-
-type TupleSchema = Schema.Schema.Type<typeof TupleSchema>;
-
-export const Tuple: StoryObj<StoryProps<TupleSchema>> = {
-  args: {
-    debug: true,
-    schema: TupleSchema,
-    readonly: false,
-    values: {
-      tuple: [1, 'a', true],
-      geopoint: [-122.41941, 37.77492],
-    },
-  },
-};
-
-//
-// Enum
-//
-
-const ColorSchema = Schema.Struct({
-  color: Schema.Union(Schema.Literal('red'), Schema.Literal('green'), Schema.Literal('blue')).annotations({
-    title: 'Color',
-  }),
-}).pipe(Schema.mutable);
-
-type ColorType = Schema.Schema.Type<typeof ColorSchema>;
-
-export const Enum: StoryObj<StoryProps<ColorType>> = {
-  args: {
-    debug: true,
-    schema: ColorSchema,
-    readonly: false,
-    values: {
-      color: 'red',
-    },
-  },
-};
-
-//
-// Refs
-//
-
-// const RefSchema = Schema.Struct({
-//   contact: Type.Ref(TestSchema.Person).annotations({ title: 'Contact Reference' }),
-//   optionalContact: Schema.optional(Type.Ref(TestSchema.Person).annotations({ title: 'Optional Contact Reference' })),
-//   refArray: Schema.optional(Schema.Array(Type.Ref(TestSchema.Person))),
-//   unknownExpando: Schema.optional(
-//     Type.Ref(TestSchema.Expando).annotations({ title: 'Optional Ref to an Expando (DXN Input)' }),
-//   ),
-// });
-
-// type RefSchema = Schema.Schema.Type<typeof RefSchema>;
-
-// const contact1 = Obj.make(TestSchema.Person, { name: 'Alice' });
-// const contact2 = Obj.make(TestSchema.Person, { name: 'Bob' });
-
-// export const Refs: StoryObj<StoryProps<RefSchema>> = {
-//   render: RefStory,
-//   args: {
-//     debug: true,
-//     schema: RefSchema,
-//     readonly: false,
-//     values: {
-//       refArray: [Ref.make(contact1), Ref.make(contact2)],
-//     },
-//   },
-// };

package/src/util/echo.ts

@@ -1,25 +0,0 @@
-//
-// Copyright 2025 DXOS.org
-//
-
-import { Obj } from '@dxos/echo';
-import { type JsonPath, setValue as setValuePlain, splitJsonPath } from '@dxos/effect';
-
-/**
- * Sets a value on an object, using Obj.change() if it's an ECHO object.
- */
-// TODO(wittjosiah): Consider refactoring Form to not know about ECHO at all.
-//   Instead of directly mutating the values object, Form could work with a plain
-//   object copy and communicate all mutations through callbacks (e.g., onValuesChanged).
-//   The caller would then be responsible for applying changes to ECHO objects via
-//   Obj.change(). This would keep Form agnostic to the underlying data layer and
-//   avoid coupling react-ui-form to @dxos/echo.
-export const setValueEchoAware = <T extends object>(obj: T, path: JsonPath, value: any): T => {
-  if (Obj.isObject(obj)) {
-    Obj.change(obj, (mutableObj) => {
-      Obj.setValue(mutableObj, splitJsonPath(path), value);
-    });
-    return obj;
-  }
-  return setValuePlain(obj, path, value);
-};