@dxos/react-ui-form 0.8.3-staging.0fa589b → 0.8.4-main.3a94e84

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/react-ui-form",
-  "version": "0.8.3-staging.0fa589b",
+  "version": "0.8.4-main.3a94e84",
   "description": "Data components.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -29,50 +29,48 @@
     "@radix-ui/react-context": "1.1.1",
     "date-fns": "^3.3.1",
     "jsonpath": "^1.1.1",
-    "@dxos/debug": "0.8.3-staging.0fa589b",
-    "@dxos/echo-db": "0.8.3-staging.0fa589b",
-    "@dxos/async": "0.8.3-staging.0fa589b",
-    "@dxos/echo": "0.8.3-staging.0fa589b",
-    "@dxos/echo-schema": "0.8.3-staging.0fa589b",
-    "@dxos/effect": "0.8.3-staging.0fa589b",
-    "@dxos/invariant": "0.8.3-staging.0fa589b",
-    "@dxos/keys": "0.8.3-staging.0fa589b",
-    "@dxos/lit-ui": "0.8.3-staging.0fa589b",
-    "@dxos/live-object": "0.8.3-staging.0fa589b",
-    "@dxos/log": "0.8.3-staging.0fa589b",
-    "@dxos/react-ui-pickers": "0.8.3-staging.0fa589b",
-    "@dxos/react-ui-list": "0.8.3-staging.0fa589b",
-    "@dxos/react-client": "0.8.3-staging.0fa589b",
-    "@dxos/react-ui-stack": "0.8.3-staging.0fa589b",
-    "@dxos/react-ui-tag-picker": "0.8.3-staging.0fa589b",
-    "@dxos/react-ui-types": "0.8.3-staging.0fa589b",
-    "@dxos/schema": "0.8.3-staging.0fa589b",
-    "@dxos/util": "0.8.3-staging.0fa589b"
+    "@dxos/async": "0.8.4-main.3a94e84",
+    "@dxos/debug": "0.8.4-main.3a94e84",
+    "@dxos/echo": "0.8.4-main.3a94e84",
+    "@dxos/echo-schema": "0.8.4-main.3a94e84",
+    "@dxos/effect": "0.8.4-main.3a94e84",
+    "@dxos/echo-db": "0.8.4-main.3a94e84",
+    "@dxos/invariant": "0.8.4-main.3a94e84",
+    "@dxos/keys": "0.8.4-main.3a94e84",
+    "@dxos/lit-ui": "0.8.4-main.3a94e84",
+    "@dxos/live-object": "0.8.4-main.3a94e84",
+    "@dxos/log": "0.8.4-main.3a94e84",
+    "@dxos/react-client": "0.8.4-main.3a94e84",
+    "@dxos/react-ui-list": "0.8.4-main.3a94e84",
+    "@dxos/react-ui-pickers": "0.8.4-main.3a94e84",
+    "@dxos/react-ui-stack": "0.8.4-main.3a94e84",
+    "@dxos/react-ui-tag-picker": "0.8.4-main.3a94e84",
+    "@dxos/schema": "0.8.4-main.3a94e84",
+    "@dxos/react-ui-types": "0.8.4-main.3a94e84",
+    "@dxos/util": "0.8.4-main.3a94e84"
   },
   "devDependencies": {
-    "@phosphor-icons/react": "^2.1.5",
     "@types/jsonpath": "^0.2.4",
     "@types/react": "~18.2.0",
     "@types/react-dom": "~18.2.0",
-    "effect": "3.14.21",
+    "effect": "3.17.0",
     "fast-check": "^3.19.0",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
     "vite": "5.4.7",
-    "@dxos/echo-signals": "0.8.3-staging.0fa589b",
-    "@dxos/random": "0.8.3-staging.0fa589b",
-    "@dxos/react-ui-syntax-highlighter": "0.8.3-staging.0fa589b",
-    "@dxos/react-ui": "0.8.3-staging.0fa589b",
-    "@dxos/react-ui-theme": "0.8.3-staging.0fa589b",
-    "@dxos/storybook-utils": "0.8.3-staging.0fa589b"
+    "@dxos/echo-signals": "0.8.4-main.3a94e84",
+    "@dxos/random": "0.8.4-main.3a94e84",
+    "@dxos/react-ui": "0.8.4-main.3a94e84",
+    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.3a94e84",
+    "@dxos/react-ui-theme": "0.8.4-main.3a94e84",
+    "@dxos/storybook-utils": "0.8.4-main.3a94e84"
   },
   "peerDependencies": {
-    "@phosphor-icons/react": "^2.1.5",
-    "effect": "3.13.3",
+    "effect": "^3.13.3",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
-    "@dxos/react-ui-theme": "0.8.3-staging.0fa589b",
-    "@dxos/react-ui": "0.8.3-staging.0fa589b"
+    "@dxos/react-ui": "0.8.4-main.3a94e84",
+    "@dxos/react-ui-theme": "0.8.4-main.3a94e84"
   },
   "publishConfig": {
     "access": "public"

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

@@ -4,14 +4,14 @@
 
 import '@dxos-theme';
 
-import { type Meta, type StoryObj } from '@storybook/react';
+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 { ControlPage, ControlSection, type ControlSectionProps } from './ControlSection';
-import translations from '../../translations';
+import { translations } from '../../translations';
 
 const meta: Meta<ControlSectionProps> = {
   title: 'ui/react-ui-form/ControlSection',

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

@@ -4,29 +4,28 @@
 
 import '@dxos-theme';
 
-import { type Meta, type StoryObj } from '@storybook/react';
+import { type Meta, type StoryObj } from '@storybook/react-vite';
 import React, { useMemo, useEffect } from 'react';
 
 import { createEchoSchema } from '@dxos/live-object/testing';
 import { log } from '@dxos/log';
-import { ViewProjection } from '@dxos/schema';
+import { ProjectionModel } from '@dxos/schema';
 import { TestSchema, testView } from '@dxos/schema/testing';
 import { withLayout, withTheme } from '@dxos/storybook-utils';
 
 import { FieldEditor, type FieldEditorProps } from './FieldEditor';
-import translations from '../../translations';
+import { translations } from '../../translations';
 import { TestLayout, TestPanel, FIELD_EDITOR_DEBUG_SYMBOL } from '../testing';
 
 // Type definition for debug objects exposed to tests.
 export type FieldEditorDebugObjects = {
   props: FieldEditorProps;
-  projection: ViewProjection;
+  projection: ProjectionModel;
 };
 
 type StoryProps = FieldEditorProps;
 
 const DefaultStory = (props: FieldEditorProps) => {
-  const projection = useMemo(() => new ViewProjection(createEchoSchema(TestSchema).jsonSchema, testView), []);
   const handleComplete: FieldEditorProps['onSave'] = () => {
     log.info('onClose', { props });
   };
@@ -34,20 +33,23 @@ const DefaultStory = (props: FieldEditorProps) => {
   // 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: props.projection,
+      } satisfies FieldEditorDebugObjects;
     }
-  }, [props, projection]);
+  }, [props, props.projection]);
 
   // NOTE(ZaymonFC): This looks awkward but it resolves an infinite parsing issue with sb.
   const json = useMemo(
-    () => JSON.parse(JSON.stringify({ props, projection })),
-    [JSON.stringify(props), JSON.stringify(projection)],
+    () => JSON.parse(JSON.stringify({ props, projection: props.projection })),
+    [JSON.stringify(props), JSON.stringify(props.projection)],
   );
 
   return (
     <TestLayout json={json}>
       <TestPanel>
-        <FieldEditor {...props} projection={projection} onSave={handleComplete} />
+        <FieldEditor {...props} onSave={handleComplete} />
       </TestPanel>
     </TestLayout>
   );
@@ -69,8 +71,8 @@ type Story = StoryObj<StoryProps>;
 
 export const Default: Story = {
   args: {
-    view: testView,
-    field: testView.fields[0],
+    projection: new ProjectionModel(createEchoSchema(TestSchema).jsonSchema, testView.projection),
+    field: testView.projection.fields[0],
   },
   parameters: { controls: { disabled: true } },
 };

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

@@ -6,7 +6,7 @@ import { composeStories } from '@storybook/react';
 import { screen, cleanup, fireEvent, act } from '@testing-library/react';
 import { afterEach, describe, expect, test } from 'vitest';
 
-import { ViewProjection } from '@dxos/schema';
+import { ProjectionModel } from '@dxos/schema';
 
 import * as stories from './FieldEditor.stories';
 import { type FieldEditorDebugObjects } from './FieldEditor.stories';
@@ -14,14 +14,6 @@ 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 +25,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 +41,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;
+};

package/src/components/FieldEditor/FieldEditor.tsx

@@ -14,8 +14,7 @@ import {
   sortProperties,
   type FieldType,
   type PropertyType,
-  type ViewType,
-  type ViewProjection,
+  type ProjectionModel,
   type SchemaProperty,
 } from '@dxos/schema';
 
@@ -23,8 +22,7 @@ import { translationKey } from '../../translations';
 import { Form, type FormProps, type InputComponent, SelectInput, SelectOptionInput } from '../Form';
 
 export type FieldEditorProps = {
-  view: ViewType;
-  projection: ViewProjection;
+  projection: ProjectionModel;
   field: FieldType;
   registry?: SchemaRegistry;
   onSave: () => void;
@@ -34,15 +32,7 @@ export type FieldEditorProps = {
 /**
  * Displays a Form representing the metadata for a given `Field` and `View`.
  */
-export const FieldEditor = ({
-  view,
-  projection,
-  field,
-  registry,
-  onSave,
-  onCancel,
-  outerSpacing,
-}: FieldEditorProps) => {
+export const FieldEditor = ({ projection, field, registry, onSave, onCancel, outerSpacing }: FieldEditorProps) => {
   const { t } = useTranslation(translationKey);
   const [props, setProps] = useState<PropertyType>(projection.getFieldProjection(field.id).props);
   useEffect(() => setProps(projection.getFieldProjection(field.id).props), [field, projection]);
@@ -112,7 +102,7 @@ export const FieldEditor = ({
 
   const handleValidate = useCallback<NonNullable<FormProps<PropertyType>['onValidate']>>(
     ({ property }) => {
-      if (property && view.fields.find((f) => f.path === property && f.path !== field.path)) {
+      if (property && projection.fields.find((f) => f.path === property && f.path !== field.path)) {
         return [
           {
             path: 'property',
@@ -121,7 +111,7 @@ export const FieldEditor = ({
         ];
       }
     },
-    [view.fields, field],
+    [projection.fields, field],
   );
 
   const handleSave = useCallback<NonNullable<FormProps<PropertyType>['onSave']>>(

package/src/components/Form/ArrayField.tsx

@@ -113,7 +113,7 @@ export const ArrayField = ({ property, readonly, path, inputProps, Custom, looku
       </div>
       {!readonly && (
         <IconButton
-          classNames='is-full mlb-1 flex'
+          classNames='is-full mlb-cardSpacingBlock flex'
           icon='ph--plus--regular'
           label={t('add field')}
           onClick={handleAdd}

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

@@ -4,7 +4,7 @@
 
 import '@dxos-theme';
 
-import { type Meta, type StoryObj } from '@storybook/react';
+import { type Meta, type StoryObj } from '@storybook/react-vite';
 import { Schema } from 'effect';
 import React, { useCallback, useState } from 'react';
 
@@ -17,7 +17,7 @@ import { withLayout, withTheme } from '@dxos/storybook-utils';
 
 import { SelectInput } from './Defaults';
 import { Form, type FormProps } from './Form';
-import translations from '../../translations';
+import { translations } from '../../translations';
 import { TestLayout, TestPanel } from '../testing';
 
 const AddressSchema = Schema.Struct({

package/src/components/Form/RefField.tsx

@@ -156,7 +156,7 @@ export const RefField = ({
             onBlur={(event) => onBlur(event as unknown as FocusEvent<HTMLElement>)}
             onUpdate={handleUpdate}
             onSearch={handleSearch}
-            classNames='rounded-sm bg-inputSurface p-1.5'
+            classNames='bg-inputSurface p-1.5 rounded-sm'
           />
         )}
       </div>

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

@@ -4,7 +4,7 @@
 
 import '@dxos-theme';
 
-import { type Meta, type StoryObj } from '@storybook/react';
+import { type Meta, type StoryObj } from '@storybook/react-vite';
 import { Schema } from 'effect';
 import React, { useState } from 'react';
 
@@ -12,7 +12,7 @@ import { SelectOptionSchema, type SelectOption } from '@dxos/echo-schema';
 import { withLayout, withTheme } from '@dxos/storybook-utils';
 
 import { SelectOptionInput } from './SelectOptionsInput';
-import translations from '../../../translations';
+import { translations } from '../../../translations';
 import { TestLayout, TestPanel } from '../../testing';
 import { Form } from '../Form';
 

package/src/components/Form/custom/SelectOptionsInput.tsx

@@ -123,7 +123,7 @@ export const SelectOptionInput = ({ type, label, disabled, getStatus, getValue,
                     <List.Item
                       role='button'
                       item={item}
-                      classNames={mx('p-1 plb-2', 'flex flex-col', 'cursor-pointer', 'hover:bg-hoverOverlay')}
+                      classNames={['p-1 plb-2', 'flex flex-col', 'cursor-pointer', 'hover:bg-hoverOverlay']}
                       aria-expanded={selected === item.id}
                     >
                       <div className='flex items-center'>

package/src/components/ViewEditor/ViewEditor.stories.tsx

@@ -4,26 +4,27 @@
 
 import '@dxos-theme';
 
-import { type Meta, type StoryObj } from '@storybook/react';
+import { type Meta, type StoryObj } from '@storybook/react-vite';
 import { Schema } from 'effect';
 import React, { useCallback, useMemo, useState, useEffect } from 'react';
 
+import { Obj, Type } from '@dxos/echo';
 import { Format, type EchoSchema, toJsonSchema, TypedObject } from '@dxos/echo-schema';
 import { Filter, useQuery, useSpace } from '@dxos/react-client/echo';
 import { withClientProvider } from '@dxos/react-client/testing';
 import { useAsyncEffect } from '@dxos/react-ui';
-import { ViewProjection, ViewType, createView } from '@dxos/schema';
+import { DataType, ProjectionModel, createView } from '@dxos/schema';
 import { withTheme, withLayout } from '@dxos/storybook-utils';
 
 import { ViewEditor, type ViewEditorProps } from './ViewEditor';
-import translations from '../../translations';
+import { translations } from '../../translations';
 import { TestLayout, TestPanel, VIEW_EDITOR_DEBUG_SYMBOL } from '../testing';
 
 // Type definition for debug objects exposed to tests.
 export type ViewEditorDebugObjects = {
   schema: EchoSchema;
-  view: ViewType;
-  projection: ViewProjection;
+  view: DataType.View;
+  projection: ProjectionModel;
 };
 
 type StoryProps = Pick<ViewEditorProps, 'readonly'>;
@@ -31,8 +32,8 @@ type StoryProps = Pick<ViewEditorProps, 'readonly'>;
 const DefaultStory = (props: StoryProps) => {
   const space = useSpace();
   const [schema, setSchema] = useState<EchoSchema>();
-  const [view, setView] = useState<ViewType>();
-  const [projection, setProjection] = useState<ViewProjection>();
+  const [view, setView] = useState<DataType.View>();
+  const [projection, setProjection] = useState<ProjectionModel>();
   useAsyncEffect(async () => {
     if (space) {
       class TestSchema extends TypedObject({ typename: 'example.com/type/Test', version: '0.1.0' })({
@@ -42,8 +43,13 @@ const DefaultStory = (props: StoryProps) => {
       }) {}
 
       const [schema] = await space.db.schemaRegistry.register([TestSchema]);
-      const view = createView({ name: 'Test', typename: schema.typename, jsonSchema: toJsonSchema(TestSchema) });
-      const projection = new ViewProjection(schema.jsonSchema, view);
+      const view = createView({
+        name: 'Test',
+        typename: schema.typename,
+        jsonSchema: toJsonSchema(TestSchema),
+        presentation: Obj.make(Type.Expando, {}),
+      });
+      const projection = new ProjectionModel(schema.jsonSchema, view.projection);
 
       setSchema(schema);
       setView(view);
@@ -51,7 +57,7 @@ const DefaultStory = (props: StoryProps) => {
     }
   }, [space]);
 
-  const views = useQuery(space, Filter.type(ViewType));
+  const views = useQuery(space, Filter.type(DataType.View));
   const currentTypename = useMemo(() => view?.query?.typename, [view]);
   const updateViewTypename = useCallback(
     (newTypename: string) => {

package/src/components/ViewEditor/ViewEditor.test.tsx

@@ -6,8 +6,8 @@ import { composeStories } from '@storybook/react';
 import { screen, cleanup, fireEvent, waitFor } from '@testing-library/react';
 import { afterEach, describe, expect, test } from 'vitest';
 
-import { EchoSchema } from '@dxos/echo-schema';
-import { ViewProjection, ViewType } from '@dxos/schema';
+import { EchoSchema, isInstanceOf } from '@dxos/echo-schema';
+import { DataType, ProjectionModel } from '@dxos/schema';
 
 import * as stories from './ViewEditor.stories';
 import { type ViewEditorDebugObjects } from './ViewEditor.stories';
@@ -19,8 +19,8 @@ const getViewEditorDebugObjects = (): ViewEditorDebugObjects => {
   const debugObjects = (window as any)[VIEW_EDITOR_DEBUG_SYMBOL] as ViewEditorDebugObjects;
   expect(debugObjects).toBeDefined();
   expect(debugObjects.schema).toBeInstanceOf(EchoSchema);
-  expect(debugObjects.view).toBeInstanceOf(ViewType);
-  expect(debugObjects.projection).toBeInstanceOf(ViewProjection);
+  expect(isInstanceOf(DataType.View, debugObjects.view)).toBeTruthy();
+  expect(debugObjects.projection).toBeInstanceOf(ProjectionModel);
   return debugObjects;
 };
 
@@ -41,7 +41,7 @@ describe('ViewEditor', () => {
   test('renders view editor', async () => {
     await Default.run();
     await waitForViewEditor();
-    expect(screen.getByText('View')).toBeInTheDocument();
+    expect(screen.getByText('Typename')).toBeInTheDocument();
   });
 
   test('change property name', async () => {
@@ -58,7 +58,7 @@ describe('ViewEditor', () => {
 
     fireEvent.click(screen.getByTestId('save-button'));
 
-    // Wait for the changes to propagate to both UI and schema
+    // Wait for the changes to propagate to both UI and schema.
     await waitFor(() => {
       expect(screen.getByText('new_property')).toBeInTheDocument();
     });
@@ -66,18 +66,18 @@ describe('ViewEditor', () => {
     // Access the live objects directly from window using symbol.
     const debugObjects = getViewEditorDebugObjects();
 
-    // Check schema contains new_property
+    // Check schema contains new_property.
     const schemaProperties = debugObjects.schema.jsonSchema.properties;
     expect(schemaProperties).toBeDefined();
     expect(schemaProperties!.new_property).toBeDefined();
     expect(schemaProperties!.name).toBeUndefined();
 
-    // Check view contains new_property field
-    const newPropertyField = debugObjects.view.fields.find((field: any) => field.path === 'new_property');
+    // Check view contains new_property field.
+    const newPropertyField = debugObjects.view.projection.fields.find((field: any) => field.path === 'new_property');
     expect(newPropertyField).toBeDefined();
     expect(newPropertyField!.path).toBe('new_property');
 
-    // Check projection contains new_property
+    // Check projection contains new_property.
     const fieldProjections = debugObjects.projection.getFieldProjections();
     const newPropertyProjection = fieldProjections.find((proj: any) => proj.field.path === 'new_property');
     expect(newPropertyProjection).toBeDefined();
@@ -88,25 +88,25 @@ describe('ViewEditor', () => {
     await Default.run();
     await waitForViewEditor();
 
-    // Click the add property button
+    // Click the add property button.
     const addButton = screen.getByText('Add property');
     fireEvent.click(addButton);
 
-    // Fill out the property field
+    // Fill out the property field.
     const fieldInput = screen.getByPlaceholderText('Field name.');
     fireEvent.change(fieldInput, { target: { value: 'added_property' } });
 
-    // Click the format combo box and select the first option
+    // Click the format combo box and select the first option.
     const formatCombo = screen.getByRole('combobox');
     fireEvent.click(formatCombo);
 
     const firstOption = screen.getAllByRole('option')[0];
     fireEvent.click(firstOption);
 
-    // Save the changes
+    // Save the changes.
     fireEvent.click(screen.getByTestId('save-button'));
 
-    // Wait for the changes to propagate
+    // Wait for the changes to propagate.
     await waitFor(() => {
       expect(screen.getByText('added_property')).toBeInTheDocument();
     });
@@ -114,17 +114,19 @@ describe('ViewEditor', () => {
     // Access the live objects directly from window using symbol.
     const debugObjects = getViewEditorDebugObjects();
 
-    // Check schema contains added_property
+    // Check schema contains added_property.
     const schemaProperties = debugObjects.schema.jsonSchema.properties;
     expect(schemaProperties).toBeDefined();
     expect(schemaProperties!.added_property).toBeDefined();
 
-    // Check view contains added_property field
-    const addedPropertyField = debugObjects.view.fields.find((field: any) => field.path === 'added_property');
+    // Check view contains added_property field.
+    const addedPropertyField = debugObjects.view.projection.fields.find(
+      (field: any) => field.path === 'added_property',
+    );
     expect(addedPropertyField).toBeDefined();
     expect(addedPropertyField!.path).toBe('added_property');
 
-    // Check projection contains added_property
+    // Check projection contains added_property.
     const fieldProjections = debugObjects.projection.getFieldProjections();
     const addedPropertyProjection = fieldProjections.find((proj: any) => proj.field.path === 'added_property');
     expect(addedPropertyProjection).toBeDefined();
@@ -135,7 +137,7 @@ describe('ViewEditor', () => {
     await Default.run();
     await waitForViewEditor();
 
-    // Find the delete button for the 'name' property
+    // Find the delete button for the 'name' property.
     const nameProperty = screen.getByText('name');
     const propertyRow = nameProperty.closest('[role="listitem"]');
     const deleteButton = propertyRow?.querySelector('button:last-child');
@@ -144,10 +146,10 @@ describe('ViewEditor', () => {
       throw new Error('Delete button not found');
     }
 
-    // Click the delete button
+    // Click the delete button.
     fireEvent.click(deleteButton);
 
-    // Wait for the changes to propagate
+    // Wait for the changes to propagate.
     await waitFor(() => {
       expect(screen.queryByText('name')).not.toBeInTheDocument();
     });
@@ -155,16 +157,16 @@ describe('ViewEditor', () => {
     // Access the live objects directly from window using symbol.
     const debugObjects = getViewEditorDebugObjects();
 
-    // Check schema no longer contains the name property
+    // Check schema no longer contains the name property.
     const schemaProperties = debugObjects.schema.jsonSchema.properties;
     expect(schemaProperties).toBeDefined();
     expect(schemaProperties!.name).toBeUndefined();
 
-    // Check view no longer contains the name field
-    const nameField = debugObjects.view.fields.find((field: any) => field.path === 'name');
+    // Check view no longer contains the name field.
+    const nameField = debugObjects.view.projection.fields.find((field: any) => field.path === 'name');
     expect(nameField).toBeUndefined();
 
-    // Check projection no longer contains the name property
+    // Check projection no longer contains the name property.
     const fieldProjections = debugObjects.projection.getFieldProjections();
     const nameProjection = fieldProjections.find((proj: any) => proj.field.path === 'name');
     expect(nameProjection).toBeUndefined();
@@ -174,11 +176,11 @@ describe('ViewEditor', () => {
     await Default.run();
     await waitForViewEditor();
 
-    // Click the first hide button
+    // Click the first hide button.
     const hideButtons = screen.getAllByTestId('hide-field-button');
     fireEvent.click(hideButtons[0]);
 
-    // Check that hiddenFields is non-empty
+    // Check that hiddenFields is non-empty.
     await waitFor(() => {
       expect(screen.getByTestId('show-field-button')).toBeInTheDocument();
     });
@@ -186,19 +188,19 @@ describe('ViewEditor', () => {
     // Access the live objects directly from window using symbol.
     const debugObjects = getViewEditorDebugObjects();
 
-    // Check that hiddenFields is non-empty
-    expect(debugObjects.view.hiddenFields).toBeDefined();
-    expect(debugObjects.view.hiddenFields!.length).toBeGreaterThan(0);
+    // Check that hiddenFields is non-empty.
+    expect(debugObjects.view.projection.hiddenFields).toBeDefined();
+    expect(debugObjects.view.projection.hiddenFields!.length).toBeGreaterThan(0);
 
     // Click the show button
     fireEvent.click(screen.getByTestId('show-field-button'));
 
-    // Wait for the data to update and check that hiddenFields is empty
+    // Wait for the data to update and check that hiddenFields is empty.
     await waitFor(() => {
-      expect(debugObjects.view.hiddenFields!.length).toBe(0);
+      expect(debugObjects.view.projection.hiddenFields!.length).toBe(0);
     });
 
-    // Also verify that the field is back in the visible fields list
-    expect(debugObjects.view.fields.length).toBeGreaterThan(0);
+    // Also verify that the field is back in the visible fields list.
+    expect(debugObjects.view.projection.fields.length).toBeGreaterThan(0);
   });
 });