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

package/src/components/testing.tsx

@@ -5,18 +5,17 @@
 import React, { type PropsWithChildren } from 'react';
 
 import { type ThemedClassName } from '@dxos/react-ui';
-import { Card } from '@dxos/react-ui-mosaic';
 import { JsonFilter } from '@dxos/react-ui-syntax-highlighter';
-import { textBlockWidth } from '@dxos/ui-theme';
+import { mx } from '@dxos/ui-theme';
 
 type TestLayoutProps = ThemedClassName<PropsWithChildren<{ json?: any }>>;
 
 export const TestLayout = ({ classNames, children, json }: TestLayoutProps) => {
   return (
-    <div className='is-full bs-full grid grid-cols-[1fr_1fr] p-4 gap-4 overflow-hidden'>
-      <TestPanel classNames={['flex flex-col bs-full overflow-y-auto', classNames]}>{children}</TestPanel>
+    <div className='w-full h-full grid grid-cols-[1fr_1fr] p-4 gap-4 overflow-hidden'>
+      <TestPanel classNames={['flex flex-col h-full overflow-y-auto', classNames]}>{children}</TestPanel>
       <TestPanel classNames={'overflow-hidden'}>
-        <JsonFilter testId='debug' data={json} classNames='bs-full text-xs' />
+        <JsonFilter testId='debug' data={json} classNames='h-full text-xs' />
       </TestPanel>
     </div>
   );
@@ -25,7 +24,11 @@ export const TestLayout = ({ classNames, children, json }: TestLayoutProps) => {
 type TestPanelProps = ThemedClassName<PropsWithChildren>;
 
 const TestPanel = ({ classNames, children }: TestPanelProps) => {
-  return <Card.Root classNames={['bs-full overflow-y-auto', textBlockWidth, classNames]}>{children}</Card.Root>;
+  return (
+    <div role='none' className={mx(['dx-document h-full bg-modal-surface rounded-md', classNames])}>
+      {children}
+    </div>
+  );
 };
 
 // Symbol for accessing debug objects in tests.

package/src/hooks/useFormHandler.ts

@@ -7,22 +7,13 @@ import type * as Schema from 'effect/Schema';
 import type * as SchemaAST from 'effect/SchemaAST';
 import { useCallback, useEffect, useMemo, useState } from 'react';
 
-import { Obj } from '@dxos/echo';
 import { type AnyProperties } from '@dxos/echo/internal';
-import {
-  type JsonPath,
-  createJsonPath,
-  fromEffectValidationPath,
-  getValue as getValue$,
-  setValue as setValue$,
-} from '@dxos/effect';
+import { type JsonPath, createJsonPath, fromEffectValidationPath, getValue as getValue$ } from '@dxos/effect';
 import { log } from '@dxos/log';
 import { useDefaultValue } from '@dxos/react-ui';
 import { type ValidationError, validateSchema } from '@dxos/schema';
 import { type MaybePromise } from '@dxos/util';
 
-import { setValueEchoAware } from '../util';
-
 export type FormFieldStatus = {
   status?: 'error';
   error?: string;
@@ -139,11 +130,15 @@ export const useFormHandler = <T extends AnyProperties>({
     prop: valuesProp,
     defaultProp: defaultValues,
     onChange: () => {
-      setValues(valuesProp ?? defaultValues);
-      setChanged({});
-      setTouched({});
-      setErrors({});
-      setSaving(false);
+      // Only reset when controlled: parent passed new values.
+      // Uncontrolled updates come from setValues in onValueChange.
+      if (valuesProp !== undefined) {
+        setValues(valuesProp ?? defaultValues);
+        setChanged({});
+        setTouched({});
+        setErrors({});
+        setSaving(false);
+      }
     },
   });
   // TODO(wittjosiah): Upgrade @radix-ui/react-use-controllable-state.
@@ -259,6 +254,7 @@ export const useFormHandler = <T extends AnyProperties>({
       log('onValueChange', { path, value });
 
       const jsonPath = createJsonPath(path);
+      const pathArray = path;
       let parsedValue = value as any;
       try {
         if (type._tag === 'NumberKeyword') {
@@ -269,24 +265,25 @@ export const useFormHandler = <T extends AnyProperties>({
         parsedValue = undefined;
       }
 
-      // Update.
-      // For ECHO objects, mutate in place via Obj.change(); for plain objects, spread to create new reference.
-      const newValues = Obj.isObject(values)
-        ? (setValueEchoAware(values, jsonPath, parsedValue), values)
-        : { ...setValue$(values, jsonPath, parsedValue) };
-      setValues(newValues);
+      // Create merged values for validation and callback. Form never mutates; parent applies via onValuesChanged.
+      const newValues = mergeAtPath(values, pathArray as (string | number)[], parsedValue) as Partial<T>;
 
       // TODO(burdon): Check value has changed from original.
       const newChanged = { [jsonPath]: true };
-      setChanged({ ...changed, ...newChanged });
+      setChanged((prev) => ({ ...prev, ...newChanged }));
 
       // Validate.
       const isValid = validate(newValues);
 
-      // Callback.
+      // Notify parent; parent is responsible for applying the change.
       onValuesChanged?.(newValues, { isValid, changed: newChanged });
+
+      // For uncontrolled mode, update internal state. Controlled mode relies on parent to pass new values.
+      if (valuesProp === undefined) {
+        setValues(newValues);
+      }
     },
-    [values, changed, validate, onValuesChanged],
+    [values, validate, onValuesChanged, valuesProp],
   );
 
   const onBlur = useCallback(
@@ -347,6 +344,27 @@ export const useFormHandler = <T extends AnyProperties>({
   );
 };
 
+/**
+ * Creates a new object with value at path. Does not mutate source.
+ * Preserves arrays when path segments are numeric indices.
+ */
+const mergeAtPath = (obj: any, path: readonly (string | number)[], value: any): any => {
+  if (path.length === 0) {
+    return value;
+  }
+
+  const [head, ...rest] = path;
+  const child = rest.length === 0 ? value : mergeAtPath(obj?.[head], rest, value);
+
+  if (Array.isArray(obj)) {
+    const copy = [...obj];
+    copy[head as number] = child;
+    return copy;
+  }
+
+  return { ...obj, [head]: child };
+};
+
 const flatMap = (errors: ValidationError[]) => {
   return errors.reduce(
     (result, { path, message }) => {

package/src/util/index.ts

@@ -2,7 +2,6 @@
 // Copyright 2025 DXOS.org
 //
 
-export * from './echo';
 export * from './field';
 export * from './formatting';
 export * from './properties';

package/dist/types/src/components/ControlSection/ControlSection.d.ts

@@ -1,23 +0,0 @@
-import React, { type ComponentPropsWithoutRef, type PropsWithChildren } from 'react';
-import { type ButtonProps, type Label, type ThemedClassName } from '@dxos/react-ui';
-export type ControlPageParams = ThemedClassName<ComponentPropsWithoutRef<'div'>>;
-export declare const ControlPage: ({ children, classNames, ...props }: ControlPageParams) => React.JSX.Element;
-export type ControlSectionProps = PropsWithChildren<{
-    title: Label;
-    description?: Label;
-}>;
-export declare const ControlSection: ({ title, description, children }: ControlSectionProps) => React.JSX.Element;
-export declare const ControlSectionHeading: ({ title, description }: Omit<ControlSectionProps, "children">) => React.JSX.Element;
-export declare const ControlGroupButton: ({ classNames, ...props }: ButtonProps) => React.JSX.Element;
-export type ControlGroupProps = ThemedClassName<PropsWithChildren>;
-export declare const ControlGroup: ({ children, classNames }: ControlGroupProps) => React.JSX.Element;
-export declare const ControlFrame: ({ children }: ControlGroupProps) => React.JSX.Element;
-export declare const controlItemClasses: string;
-export type ControlItemProps = PropsWithChildren<{
-    title: Label;
-    description?: Label;
-}>;
-export declare const ControlItem: ({ title, description, children }: ControlItemProps) => React.JSX.Element;
-export declare const ControlItemInput: ({ title, description, children }: ControlItemProps) => React.JSX.Element;
-export declare const ControlFrameItem: ({ title, description, children }: ControlItemProps) => React.JSX.Element;
-//# sourceMappingURL=ControlSection.d.ts.map

package/dist/types/src/components/ControlSection/ControlSection.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"ControlSection.d.ts","sourceRoot":"","sources":["../../../../../src/components/ControlSection/ControlSection.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,EAAE,KAAK,wBAAwB,EAAE,KAAK,iBAAiB,EAAE,MAAM,OAAO,CAAC;AAErF,OAAO,EAEL,KAAK,WAAW,EAEhB,KAAK,KAAK,EACV,KAAK,eAAe,EAGrB,MAAM,gBAAgB,CAAC;AAMxB,MAAM,MAAM,iBAAiB,GAAG,eAAe,CAAC,wBAAwB,CAAC,KAAK,CAAC,CAAC,CAAC;AAEjF,eAAO,MAAM,WAAW,GAAI,oCAAoC,iBAAiB,sBAQhF,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG,iBAAiB,CAAC;IAClD,KAAK,EAAE,KAAK,CAAC;IACb,WAAW,CAAC,EAAE,KAAK,CAAC;CACrB,CAAC,CAAC;AAEH,eAAO,MAAM,cAAc,GAAI,kCAAkC,mBAAmB,sBAOnF,CAAC;AAEF,eAAO,MAAM,qBAAqB,GAAI,wBAAwB,IAAI,CAAC,mBAAmB,EAAE,UAAU,CAAC,sBAYlG,CAAC;AAEF,eAAO,MAAM,kBAAkB,GAAI,0BAA0B,WAAW,sBAEvE,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG,eAAe,CAAC,iBAAiB,CAAC,CAAC;AAEnE,eAAO,MAAM,YAAY,GAAI,0BAA0B,iBAAiB,sBAWvE,CAAC;AAEF,eAAO,MAAM,YAAY,GAAI,cAAc,iBAAiB,sBAU3D,CAAC;AAEF,eAAO,MAAM,kBAAkB,QAK7B,CAAC;AAKH,MAAM,MAAM,gBAAgB,GAAG,iBAAiB,CAAC;IAC/C,KAAK,EAAE,KAAK,CAAC;IACb,WAAW,CAAC,EAAE,KAAK,CAAC;CACrB,CAAC,CAAC;AAEH,eAAO,MAAM,WAAW,GAAI,kCAAkC,gBAAgB,sBAY7E,CAAC;AAEF,eAAO,MAAM,gBAAgB,GAAI,kCAAkC,gBAAgB,sBAoBlF,CAAC;AAEF,eAAO,MAAM,gBAAgB,GAAI,kCAAkC,gBAAgB,sBAUlF,CAAC"}

package/dist/types/src/components/ControlSection/ControlSection.stories.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"ControlSection.stories.d.ts","sourceRoot":"","sources":["../../../../../src/components/ControlSection/ControlSection.stories.tsx"],"names":[],"mappings":"AAIA,OAAO,EAAa,KAAK,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjE,OAAO,KAAK,MAAM,OAAO,CAAC;AAQ1B,QAAA,MAAM,IAAI;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAa6B,CAAC;AAExC,eAAe,IAAI,CAAC;AAEpB,KAAK,KAAK,GAAG,QAAQ,CAAC,OAAO,IAAI,CAAC,CAAC;AAEnC,eAAO,MAAM,OAAO,EAAE,KAKrB,CAAC"}

package/dist/types/src/components/ControlSection/index.d.ts

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

package/dist/types/src/components/ControlSection/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/components/ControlSection/index.ts"],"names":[],"mappings":"AAIA,cAAc,kBAAkB,CAAC"}

package/dist/types/src/components/Form/Form-old.stories.d.ts

@@ -1,131 +0,0 @@
-import { type StoryObj } from '@storybook/react-vite';
-import * as Schema from 'effect/Schema';
-import React from 'react';
-import { type AnyProperties } from '@dxos/echo/internal';
-import { type FormRootProps } from './Form';
-type StoryProps<T extends AnyProperties> = {
-    debug?: boolean;
-    schema: Schema.Schema.AnyNoContext;
-} & FormRootProps<T>;
-declare const meta: {
-    title: string;
-    component: any;
-    render: <T extends AnyProperties = any>({ debug, schema, values: valuesProp, ...props }: StoryProps<T>) => React.JSX.Element;
-    decorators: import("@storybook/react").Decorator[];
-    parameters: {
-        layout: string;
-        translations: [{
-            readonly 'en-US': {
-                readonly "@dxos/react-ui-form": {
-                    readonly 'fields label': "Fields";
-                    readonly 'hidden fields label': "Hidden Fields";
-                    readonly 'empty readonly ref field label': "(none)";
-                    readonly 'add property button label': "Add property";
-                    readonly 'field property label': "Property";
-                    readonly 'field property placeholder': "Property name";
-                    readonly 'field format label': "Type";
-                    readonly 'field path label': "Field path";
-                    readonly 'add field': "Add field";
-                    readonly 'delete field': "Delete field";
-                    readonly 'field limit reached': "Maximum number of fields reached";
-                    readonly 'boolean input true value': "Yes";
-                    readonly 'boolean input false value': "No";
-                    readonly 'show field label': "Show field";
-                    readonly 'hide field label': "Hide field";
-                    readonly 'delete field label': "Delete field";
-                    readonly 'ref field combobox input placeholder': "Search…";
-                    readonly 'ref field placeholder_one': "Select…";
-                    readonly 'ref field placeholder_other': "Select items…";
-                    readonly 'example placeholder': "Example";
-                    readonly 'latitude placeholder': "Latitude (e.g., 40.7128)";
-                    readonly 'longitude placeholder': "Longitude (e.g., -74.0060)";
-                    readonly 'cancel button label': "Cancel";
-                    readonly 'save button label': "Save";
-                    readonly 'format boolean': "Boolean";
-                    readonly 'format currency': "Currency";
-                    readonly 'format date': "Date";
-                    readonly 'format date-time': "DateTime";
-                    readonly 'format did': "DID";
-                    readonly 'format duration': "Duration";
-                    readonly 'format dxn': "DXN";
-                    readonly 'format email': "Email";
-                    readonly 'format formula': "Formula";
-                    readonly 'format hostname': "Hostname";
-                    readonly 'format integer': "Integer";
-                    readonly 'format json': "JSON";
-                    readonly 'format lnglat': "Geopoint";
-                    readonly 'format markdown': "Markdown";
-                    readonly 'format percent': "Percent";
-                    readonly 'format ref': "Reference";
-                    readonly 'format regex': "RegExp";
-                    readonly 'format string': "String";
-                    readonly 'format single-select': "Select";
-                    readonly 'format multi-select': "Multi-select";
-                    readonly 'format text': "Long text";
-                    readonly 'format time': "Time";
-                    readonly 'format timestamp': "Timestamp";
-                    readonly 'format user': "User";
-                    readonly 'format number': "Number";
-                    readonly 'format uri': "URI";
-                    readonly 'format url': "URL";
-                    readonly 'format uuid': "UUID";
-                    readonly 'latitude label': "Latitude";
-                    readonly 'longitude label': "Longitude";
-                    readonly 'select option label': "Label";
-                    readonly 'select option label placeholder': "Option label";
-                    readonly 'select option color': "Color";
-                    readonly 'select option delete': "Delete";
-                    readonly 'select option add': "Add option";
-                    readonly 'system schema title': "System type";
-                    readonly 'system schema description': "System type: cannot add or remove fields.";
-                };
-            };
-        }];
-    };
-    argTypes: {
-        readonly: {
-            control: "boolean";
-            description: string;
-        };
-    };
-};
-export default meta;
-type Story = StoryObj<typeof meta>;
-export declare const Default: Story;
-export declare const Organization: Story;
-export declare const OrganizationAutoSave: Story;
-export declare const Person: Story;
-declare const ShapeSchema: Schema.mutable<Schema.Struct<{
-    shape: Schema.optional<Schema.Union<[Schema.Struct<{
-        type: Schema.Literal<["circle"]>;
-        radius: Schema.optional<Schema.SchemaClass<number, number, never>>;
-    }>, Schema.Struct<{
-        type: Schema.Literal<["square"]>;
-        size: Schema.optional<Schema.refine<number, typeof Schema.Number>>;
-    }>]>>;
-}>>;
-type ShapeSchema = Schema.Schema.Type<typeof ShapeSchema>;
-export declare const DiscriminatedShape: StoryObj<StoryProps<ShapeSchema>>;
-declare const ArraysSchema: Schema.mutable<Schema.Struct<{
-    names: Schema.Array$<Schema.filter<typeof Schema.String>>;
-    addresses: Schema.Array$<Schema.Struct<{
-        street: Schema.optional<Schema.SchemaClass<string, string, never>>;
-        city: Schema.optional<Schema.SchemaClass<string, string, never>>;
-        zip: Schema.optional<Schema.refine<string, typeof Schema.String>>;
-        location: Schema.optional<Schema.Tuple<[Schema.filter<Schema.transform<Schema.SchemaClass<number, number, never>, Schema.filter<Schema.SchemaClass<number, number, never>>>>, Schema.filter<Schema.transform<Schema.SchemaClass<number, number, never>, Schema.filter<Schema.SchemaClass<number, number, never>>>>, Schema.Element<typeof Schema.Number, "?">]>>;
-    }>>;
-}>>;
-type ArraysSchema = Schema.Schema.Type<typeof ArraysSchema>;
-export declare const Arrays: StoryObj<StoryProps<ArraysSchema>>;
-declare const TupleSchema: Schema.mutable<Schema.Struct<{
-    tuple: Schema.Tuple<[typeof Schema.Number, typeof Schema.String, typeof Schema.Boolean]>;
-    geopoint: Schema.Tuple<[Schema.filter<Schema.transform<Schema.SchemaClass<number, number, never>, Schema.filter<Schema.SchemaClass<number, number, never>>>>, Schema.filter<Schema.transform<Schema.SchemaClass<number, number, never>, Schema.filter<Schema.SchemaClass<number, number, never>>>>, Schema.Element<typeof Schema.Number, "?">]>;
-}>>;
-type TupleSchema = Schema.Schema.Type<typeof TupleSchema>;
-export declare const Tuple: StoryObj<StoryProps<TupleSchema>>;
-declare const ColorSchema: Schema.mutable<Schema.Struct<{
-    color: Schema.Union<[Schema.Literal<["red"]>, Schema.Literal<["green"]>, Schema.Literal<["blue"]>]>;
-}>>;
-type ColorType = Schema.Schema.Type<typeof ColorSchema>;
-export declare const Enum: StoryObj<StoryProps<ColorType>>;
-//# sourceMappingURL=Form-old.stories.d.ts.map

package/dist/types/src/components/Form/Form-old.stories.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"Form-old.stories.d.ts","sourceRoot":"","sources":["../../../../../src/components/Form/Form-old.stories.tsx"],"names":[],"mappings":"AAIA,OAAO,EAAa,KAAK,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjE,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAgC,MAAM,OAAO,CAAC;AAGrD,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,qBAAqB,CAAC;AASzD,OAAO,EAAQ,KAAK,aAAa,EAAE,MAAM,QAAQ,CAAC;AAIlD,KAAK,UAAU,CAAC,CAAC,SAAS,aAAa,IAAI;IACzC,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC;CACpC,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC;AAuErB,QAAA,MAAM,IAAI;;eAEgB,GAAG;aAvEP,CAAC,SAAS,aAAa,yDAK1C,UAAU,CAAC,CAAC,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA+EiB,CAAC;AAElC,eAAe,IAAI,CAAC;AAEpB,KAAK,KAAK,GAAG,QAAQ,CAAC,OAAO,IAAI,CAAC,CAAC;AAEnC,eAAO,MAAM,OAAO,EAAE,KAYrB,CAAC;AAEF,eAAO,MAAM,YAAY,EAAE,KAU1B,CAAC;AAEF,eAAO,MAAM,oBAAoB,EAAE,KAWlC,CAAC;AAKF,eAAO,MAAM,MAAM,EAAE,KAQpB,CAAC;AAMF,QAAA,MAAM,WAAW;;;;;;;;GAaM,CAAC;AAExB,KAAK,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,WAAW,CAAC,CAAC;AAE1D,eAAO,MAAM,kBAAkB,EAAE,QAAQ,CAAC,UAAU,CAAC,WAAW,CAAC,CAuBhE,CAAC;AAMF,QAAA,MAAM,YAAY;;;;;;;;GAGK,CAAC;AAExB,KAAK,YAAY,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,YAAY,CAAC,CAAC;AAE5D,eAAO,MAAM,MAAM,EAAE,QAAQ,CAAC,UAAU,CAAC,YAAY,CAAC,CAUrD,CAAC;AAOF,QAAA,MAAM,WAAW;;;GAGM,CAAC;AAExB,KAAK,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,WAAW,CAAC,CAAC;AAE1D,eAAO,MAAM,KAAK,EAAE,QAAQ,CAAC,UAAU,CAAC,WAAW,CAAC,CAUnD,CAAC;AAMF,QAAA,MAAM,WAAW;;GAIM,CAAC;AAExB,KAAK,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,WAAW,CAAC,CAAC;AAExD,eAAO,MAAM,IAAI,EAAE,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC,CAShD,CAAC"}

package/dist/types/src/util/echo.d.ts

@@ -1,6 +0,0 @@
-import { type JsonPath } from '@dxos/effect';
-/**
- * Sets a value on an object, using Obj.change() if it's an ECHO object.
- */
-export declare const setValueEchoAware: <T extends object>(obj: T, path: JsonPath, value: any) => T;
-//# sourceMappingURL=echo.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"echo.d.ts","sourceRoot":"","sources":["../../../../src/util/echo.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,KAAK,QAAQ,EAA4C,MAAM,cAAc,CAAC;AAEvF;;GAEG;AAOH,eAAO,MAAM,iBAAiB,GAAI,CAAC,SAAS,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,QAAQ,EAAE,OAAO,GAAG,KAAG,CAQxF,CAAC"}

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

@@ -1,38 +0,0 @@
-//
-// Copyright 2024 DXOS.org
-//
-
-import { type Meta, type StoryObj } from '@storybook/react-vite';
-import React from 'react';
-
-import { withTheme } from '@dxos/react-ui/testing';
-
-import { translations } from '../../translations';
-
-import { ControlPage, ControlSection } from './ControlSection';
-
-const meta = {
-  title: 'ui/react-ui-form/ControlSection',
-  component: ControlSection,
-  render: (args) => (
-    <ControlPage classNames='is-[40rem]'>
-      <ControlSection {...args} />
-    </ControlPage>
-  ),
-  decorators: [withTheme],
-  parameters: {
-    layout: 'centered',
-    translations,
-  },
-} satisfies Meta<typeof ControlSection>;
-
-export default meta;
-
-type Story = StoryObj<typeof meta>;
-
-export const Default: Story = {
-  args: {
-    title: 'Control Section',
-    description: 'This is a control section',
-  },
-};

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>
-  );
-};