@dxos/react-ui-form 0.8.4-main.84f28bd → 0.8.4-main.9735255

package/package.json

@@ -1,14 +1,19 @@
 {
   "name": "@dxos/react-ui-form",
-  "version": "0.8.4-main.84f28bd",
+  "version": "0.8.4-main.9735255",
   "description": "Data components.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/dxos/dxos"
+  },
   "license": "MIT",
   "author": "DXOS.org",
   "type": "module",
   "exports": {
     ".": {
+      "source": "./src/index.ts",
       "types": "./dist/types/src/index.d.ts",
       "browser": "./dist/lib/browser/index.mjs",
       "node": "./dist/lib/node-esm/index.mjs"
@@ -23,54 +28,60 @@
     "src"
   ],
   "dependencies": {
-    "@atlaskit/pragmatic-drag-and-drop": "^1.4.0",
-    "@atlaskit/pragmatic-drag-and-drop-hitbox": "^1.0.3",
-    "@preact-signals/safe-react": "^0.9.0",
+    "@atlaskit/pragmatic-drag-and-drop": "1.7.7",
+    "@atlaskit/pragmatic-drag-and-drop-hitbox": "1.1.0",
+    "@effect-atom/atom-react": "^0.4.6",
+    "@fluentui/react-tabster": "9.26.11",
     "@radix-ui/react-context": "1.1.1",
+    "@radix-ui/react-use-controllable-state": "1.1.0",
     "date-fns": "^3.3.1",
     "jsonpath": "^1.1.1",
-    "@dxos/async": "0.8.4-main.84f28bd",
-    "@dxos/debug": "0.8.4-main.84f28bd",
-    "@dxos/echo": "0.8.4-main.84f28bd",
-    "@dxos/echo-db": "0.8.4-main.84f28bd",
-    "@dxos/echo-schema": "0.8.4-main.84f28bd",
-    "@dxos/effect": "0.8.4-main.84f28bd",
-    "@dxos/invariant": "0.8.4-main.84f28bd",
-    "@dxos/keys": "0.8.4-main.84f28bd",
-    "@dxos/lit-ui": "0.8.4-main.84f28bd",
-    "@dxos/live-object": "0.8.4-main.84f28bd",
-    "@dxos/log": "0.8.4-main.84f28bd",
-    "@dxos/react-client": "0.8.4-main.84f28bd",
-    "@dxos/react-ui-list": "0.8.4-main.84f28bd",
-    "@dxos/react-ui-pickers": "0.8.4-main.84f28bd",
-    "@dxos/react-ui-stack": "0.8.4-main.84f28bd",
-    "@dxos/react-ui-tag-picker": "0.8.4-main.84f28bd",
-    "@dxos/react-ui-types": "0.8.4-main.84f28bd",
-    "@dxos/schema": "0.8.4-main.84f28bd",
-    "@dxos/util": "0.8.4-main.84f28bd"
+    "tabster": "^8.5.5",
+    "@dxos/async": "0.8.4-main.9735255",
+    "@dxos/debug": "0.8.4-main.9735255",
+    "@dxos/echo": "0.8.4-main.9735255",
+    "@dxos/echo-query": "0.8.4-main.9735255",
+    "@dxos/echo-react": "0.8.4-main.9735255",
+    "@dxos/invariant": "0.8.4-main.9735255",
+    "@dxos/keys": "0.8.4-main.9735255",
+    "@dxos/lit-ui": "0.8.4-main.9735255",
+    "@dxos/react-client": "0.8.4-main.9735255",
+    "@dxos/log": "0.8.4-main.9735255",
+    "@dxos/react-ui-components": "0.8.4-main.9735255",
+    "@dxos/react-ui-editor": "0.8.4-main.9735255",
+    "@dxos/react-ui-mosaic": "0.8.4-main.9735255",
+    "@dxos/react-ui-list": "0.8.4-main.9735255",
+    "@dxos/react-ui-pickers": "0.8.4-main.9735255",
+    "@dxos/react-ui-searchlist": "0.8.4-main.9735255",
+    "@dxos/react-ui-stack": "0.8.4-main.9735255",
+    "@dxos/schema": "0.8.4-main.9735255",
+    "@dxos/types": "0.8.4-main.9735255",
+    "@dxos/ui-types": "0.8.4-main.9735255",
+    "@dxos/effect": "0.8.4-main.9735255",
+    "@dxos/util": "0.8.4-main.9735255"
   },
   "devDependencies": {
     "@types/jsonpath": "^0.2.4",
-    "@types/react": "~18.2.0",
-    "@types/react-dom": "~18.2.0",
-    "effect": "3.16.13",
+    "@types/react": "~19.2.7",
+    "@types/react-dom": "~19.2.3",
+    "effect": "3.19.11",
     "fast-check": "^3.19.0",
-    "react": "~18.2.0",
-    "react-dom": "~18.2.0",
-    "vite": "5.4.7",
-    "@dxos/echo-signals": "0.8.4-main.84f28bd",
-    "@dxos/random": "0.8.4-main.84f28bd",
-    "@dxos/react-ui": "0.8.4-main.84f28bd",
-    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.84f28bd",
-    "@dxos/react-ui-theme": "0.8.4-main.84f28bd",
-    "@dxos/storybook-utils": "0.8.4-main.84f28bd"
+    "react": "~19.2.3",
+    "react-dom": "~19.2.3",
+    "vite": "7.1.9",
+    "@dxos/random": "0.8.4-main.9735255",
+    "@dxos/react-client": "0.8.4-main.9735255",
+    "@dxos/react-ui": "0.8.4-main.9735255",
+    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.9735255",
+    "@dxos/ui-theme": "0.8.4-main.9735255",
+    "@dxos/storybook-utils": "0.8.4-main.9735255"
   },
   "peerDependencies": {
-    "effect": "^3.13.3",
-    "react": "~18.2.0",
-    "react-dom": "~18.2.0",
-    "@dxos/react-ui": "0.8.4-main.84f28bd",
-    "@dxos/react-ui-theme": "0.8.4-main.84f28bd"
+    "effect": "3.19.11",
+    "react": "~19.2.3",
+    "react-dom": "~19.2.3",
+    "@dxos/react-ui": "0.8.4-main.9735255",
+    "@dxos/ui-theme": "0.8.4-main.9735255"
   },
   "publishConfig": {
     "access": "public"

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

@@ -2,36 +2,33 @@
 // Copyright 2024 DXOS.org
 //
 
-import '@dxos-theme';
-
 import { type Meta, type StoryObj } from '@storybook/react-vite';
 import React from 'react';
 
-import { StackItem } from '@dxos/react-ui-stack';
-import { withLayout, withTheme } from '@dxos/storybook-utils';
+import { withTheme } from '@dxos/react-ui/testing';
 
-import { ControlPage, ControlSection, type ControlSectionProps } from './ControlSection';
 import { translations } from '../../translations';
 
-const meta: Meta<ControlSectionProps> = {
+import { ControlPage, ControlSection } from './ControlSection';
+
+const meta = {
   title: 'ui/react-ui-form/ControlSection',
   component: ControlSection,
   render: (args) => (
-    <StackItem.Content classNames='w-[40rem]'>
-      <ControlPage>
-        <ControlSection {...args} />
-      </ControlPage>
-    </StackItem.Content>
+    <ControlPage classNames='is-[40rem]'>
+      <ControlSection {...args} />
+    </ControlPage>
   ),
-  decorators: [withLayout({ fullscreen: true, classNames: 'justify-center' }), withTheme],
+  decorators: [withTheme],
   parameters: {
+    layout: 'centered',
     translations,
   },
-};
+} satisfies Meta<typeof ControlSection>;
 
 export default meta;
 
-type Story = StoryObj<ControlSectionProps>;
+type Story = StoryObj<typeof meta>;
 
 export const Default: Story = {
   args: {

package/src/components/ControlSection/ControlSection.tsx

@@ -13,17 +13,20 @@ import {
   toLocalizedString,
   useTranslation,
 } from '@dxos/react-ui';
-import { mx } from '@dxos/react-ui-theme';
+import { Layout } from '@dxos/react-ui-mosaic';
+import { mx } from '@dxos/ui-theme';
 
 import { translationKey } from '../../translations';
 
-export type ControlPageProps = ThemedClassName<ComponentPropsWithoutRef<'div'>>;
+export type ControlPageParams = ThemedClassName<ComponentPropsWithoutRef<'div'>>;
 
-export const ControlPage = ({ children, classNames, ...props }: ControlPageProps) => {
+export const ControlPage = ({ children, classNames, ...props }: ControlPageParams) => {
   return (
-    <div role='none' className={mx('pli-cardSpacingInline', classNames)} {...props}>
-      {children}
-    </div>
+    <Layout.Container scrollable classNames='[--control-spacing:var(--dx-trimMd)]'>
+      <div role='none' className={mx('pli-cardSpacingInline pbe-trimMd', classNames)} {...props}>
+        {children}
+      </div>
+    </Layout.Container>
   );
 };
 
@@ -45,7 +48,7 @@ export const ControlSectionHeading = ({ title, description }: Omit<ControlSectio
   const { t } = useTranslation(translationKey);
   return (
     <>
-      <h2 className='pli-trimMd container-max-width text-xl mbs-trimLg mbe-trimMd'>{toLocalizedString(title, t)}</h2>
+      <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)}
@@ -59,12 +62,16 @@ export const ControlGroupButton = ({ classNames, ...props }: ButtonProps) => {
   return <Button {...props} classNames={['md:col-span-2', classNames]} />;
 };
 
-export type ControlGroupProps = ThemedClassName<PropsWithChildren<{}>>;
+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', classNames)}
+    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>
@@ -73,23 +80,30 @@ export const ControlGroup = ({ children, classNames }: ControlGroupProps) => (
 export const ControlFrame = ({ children }: ControlGroupProps) => (
   <div
     role='none'
-    className='p-trimMd container-max-width grid grid-cols-1 md:grid-cols-[1fr_1fr] gap-trimSm md:gap-trimMd border border-separator rounded-md'
+    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 controlItemClasses =
-  'pli-trimMd plb-trimMd container-max-width grid md:col-span-2 grid-cols-subgrid items-center gap-trimSm border border-separator rounded-md *:first:!mbs-0 *:last:!mbe-0';
-
-const controlItemTitleClasses = 'text-lg font-normal';
-const controlItemDescriptionClasses = 'text-base mlb-trimSm md:mbe-0 text-description';
-
 export const ControlItem = ({ title, description, children }: ControlItemProps) => {
   const { t } = useTranslation(translationKey);
 

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

@@ -2,39 +2,66 @@
 // Copyright 2024 DXOS.org
 //
 
-import '@dxos-theme';
-
 import { type Meta, type StoryObj } from '@storybook/react-vite';
-import React, { useMemo, useEffect } from 'react';
+import React, { useEffect, useMemo } from 'react';
 
-import { createEchoSchema } from '@dxos/live-object/testing';
+import { Filter, Query } from '@dxos/echo';
+import { createEchoSchema } from '@dxos/echo/testing';
 import { log } from '@dxos/log';
-import { ViewProjection } from '@dxos/schema';
-import { TestSchema, testView } from '@dxos/schema/testing';
-import { withLayout, withTheme } from '@dxos/storybook-utils';
+import { withTheme } from '@dxos/react-ui/testing';
+import { ProjectionModel, View, createEchoChangeCallback } from '@dxos/schema';
+import { Example } from '@dxos/schema/testing';
 
-import { FieldEditor, type FieldEditorProps } from './FieldEditor';
 import { translations } from '../../translations';
-import { TestLayout, TestPanel, FIELD_EDITOR_DEBUG_SYMBOL } from '../testing';
+import { FIELD_EDITOR_DEBUG_SYMBOL, TestLayout } from '../testing';
+
+import { FieldEditor, type FieldEditorProps } from './FieldEditor';
 
 // Type definition for debug objects exposed to tests.
 export type FieldEditorDebugObjects = {
   props: FieldEditorProps;
-  projection: ViewProjection;
+  projection: ProjectionModel;
+};
+
+// TODO(wittjosiah): ECHO objects don't work when passed via Storybook args.
+const useTestProjection = () => {
+  return useMemo(() => {
+    const schema = createEchoSchema(Example);
+    const view = View.make({
+      name: 'Test',
+      query: Query.select(Filter.type(Example)),
+      jsonSchema: schema.jsonSchema,
+    });
+    const projection = new ProjectionModel({
+      view,
+      baseSchema: schema.jsonSchema,
+      change: createEchoChangeCallback(view, schema),
+    });
+    projection.normalizeView();
+    return { view, projection };
+  }, []);
 };
 
-type StoryProps = FieldEditorProps;
+const DefaultStory = () => {
+  const { view, projection } = useTestProjection();
 
-const DefaultStory = (props: FieldEditorProps) => {
-  const projection = useMemo(() => new ViewProjection(createEchoSchema(TestSchema).jsonSchema, testView), []);
   const handleComplete: FieldEditorProps['onSave'] = () => {
-    log.info('onClose', { props });
+    log.info('onClose');
+  };
+
+  const props: FieldEditorProps = {
+    projection,
+    field: view.projection.fields[0],
+    onSave: handleComplete,
   };
 
   // Expose objects on window for test access.
   useEffect(() => {
     if (typeof window !== 'undefined') {
-      (window as any)[FIELD_EDITOR_DEBUG_SYMBOL] = { props, projection } satisfies FieldEditorDebugObjects;
+      (window as any)[FIELD_EDITOR_DEBUG_SYMBOL] = {
+        props,
+        projection,
+      } satisfies FieldEditorDebugObjects;
     }
   }, [props, projection]);
 
@@ -46,31 +73,27 @@ const DefaultStory = (props: FieldEditorProps) => {
 
   return (
     <TestLayout json={json}>
-      <TestPanel>
-        <FieldEditor {...props} projection={projection} onSave={handleComplete} />
-      </TestPanel>
+      <FieldEditor {...props} />
     </TestLayout>
   );
 };
 
-const meta: Meta<StoryProps> = {
+const meta = {
   title: 'ui/react-ui-form/FieldEditor',
-  component: FieldEditor,
+  component: FieldEditor as any,
   render: DefaultStory,
-  decorators: [withLayout({ fullscreen: true }), withTheme],
+  decorators: [withTheme],
   parameters: {
+    layout: 'fullscreen',
     translations,
+    controls: {
+      disabled: true,
+    },
   },
-};
+} satisfies Meta<typeof DefaultStory>;
 
 export default meta;
 
-type Story = StoryObj<StoryProps>;
+type Story = StoryObj<typeof meta>;
 
-export const Default: Story = {
-  args: {
-    view: testView,
-    field: testView.fields[0],
-  },
-  parameters: { controls: { disabled: true } },
-};
+export const Default: Story = {};

package/src/components/FieldEditor/FieldEditor.test.tsx

@@ -3,25 +3,18 @@
 //
 
 import { composeStories } from '@storybook/react';
-import { screen, cleanup, fireEvent, act } from '@testing-library/react';
+import { act, cleanup, fireEvent, screen } from '@testing-library/react';
 import { afterEach, describe, expect, test } from 'vitest';
 
-import { ViewProjection } from '@dxos/schema';
+import { ProjectionModel } from '@dxos/schema';
+
+import { FIELD_EDITOR_DEBUG_SYMBOL } from '../testing';
 
 import * as stories from './FieldEditor.stories';
 import { type FieldEditorDebugObjects } from './FieldEditor.stories';
-import { FIELD_EDITOR_DEBUG_SYMBOL } from '../testing';
 
 const { Default } = composeStories(stories);
 
-const getFieldEditorDebugObjects = (): FieldEditorDebugObjects => {
-  const debugObjects = (window as any)[FIELD_EDITOR_DEBUG_SYMBOL] as FieldEditorDebugObjects;
-  expect(debugObjects).toBeDefined();
-  expect(debugObjects.props).toBeInstanceOf(Object); // Props object
-  expect(debugObjects.projection).toBeInstanceOf(ViewProjection);
-  return debugObjects;
-};
-
 describe('FieldEditor', () => {
   afterEach(() => {
     cleanup();
@@ -33,7 +26,7 @@ describe('FieldEditor', () => {
     expect(screen.getByText('Type format')).toBeInTheDocument();
     expect(screen.getByText('String')).toBeInTheDocument();
 
-    // Verify the initial field shows as String type
+    // Verify the initial field shows as String type.
     expect(screen.getByText('String')).toBeInTheDocument();
 
     fireEvent.click(screen.getByRole('combobox'));
@@ -49,9 +42,17 @@ describe('FieldEditor', () => {
     // Access the live objects directly from window using symbol.
     const debugObjects = getFieldEditorDebugObjects();
 
-    const name = debugObjects.projection.schema.properties!.name;
+    const name = debugObjects.projection.baseSchema.properties!.name;
     expect(name.type).toBe('number');
     expect(name.format).toBe('number');
     expect(name.description).toBe('Full name.');
   });
 });
+
+const getFieldEditorDebugObjects = (): FieldEditorDebugObjects => {
+  const debugObjects = (window as any)[FIELD_EDITOR_DEBUG_SYMBOL] as FieldEditorDebugObjects;
+  expect(debugObjects).toBeDefined();
+  expect(debugObjects.props).toBeInstanceOf(Object); // Props object
+  expect(debugObjects.projection).toBeInstanceOf(ProjectionModel);
+  return debugObjects;
+};