@dxos/plugin-space 0.8.4-main.3c1ae3b → 0.8.4-main.3eb6e50203

package/src/components/MembersContainer/MembersContainer.tsx

@@ -5,16 +5,14 @@
 import React, { type Dispatch, type SetStateAction, useCallback, useMemo, useState } from 'react';
 import { QR } from 'react-qr-rounded';
 
-import { createIntent } from '@dxos/app-framework';
-import { useIntentDispatcher } from '@dxos/app-framework/react';
+import { useOperationInvoker } from '@dxos/app-framework/ui';
 import { Obj } from '@dxos/echo';
 import { log } from '@dxos/log';
 import { useConfig } from '@dxos/react-client';
 import { type Space, useSpaceInvitations } from '@dxos/react-client/echo';
 import { type CancellableInvitationObservable, Invitation, InvitationEncoder } from '@dxos/react-client/invitations';
 import { Button, Clipboard, Icon, Input, useId, useTranslation } from '@dxos/react-ui';
-import { ControlFrame, ControlFrameItem, ControlItemInput, ControlPage, ControlSection } from '@dxos/react-ui-form';
-import { StackItem } from '@dxos/react-ui-stack';
+import { Settings } from '@dxos/react-ui-form';
 import { Collection } from '@dxos/schema';
 import {
   type ActionMenuItem,
@@ -25,11 +23,12 @@ import {
   InvitationList,
   SpaceMemberList,
   Viewport,
+  translationKey as shellTranslationKey,
 } from '@dxos/shell/react';
 import { hexToEmoji } from '@dxos/util';
 
 import { meta } from '../../meta';
-import { SpaceAction } from '../../types';
+import { SpaceOperation } from '../../types';
 import { COMPOSER_SPACE_LOCK } from '../../util';
 
 // TODO(wittjosiah): Copied from Shell.
@@ -51,7 +50,7 @@ export type MembersContainerProps = {
 export const MembersContainer = ({ space, createInvitationUrl }: MembersContainerProps) => {
   const { t } = useTranslation(meta.id);
   const config = useConfig();
-  const { dispatchPromise: dispatch } = useIntentDispatcher();
+  const { invokePromise } = useOperationInvoker();
   const invitations = useSpaceInvitations(space.key);
   const visibleInvitations = invitations?.filter(
     (invitation) => ![Invitation.State.CANCELLED].includes(invitation.get().state),
@@ -69,57 +68,55 @@ export const MembersContainer = ({ space, createInvitationUrl }: MembersContaine
 
   const locked = space.properties[COMPOSER_SPACE_LOCK];
   const handleChangeLocked = useCallback(() => {
-    space.properties[COMPOSER_SPACE_LOCK] = !locked;
+    Obj.change(space.properties, (p) => {
+      p[COMPOSER_SPACE_LOCK] = !locked;
+    });
   }, [locked, space]);
 
   const inviteActions = useMemo(
     (): Record<string, ActionMenuItem> => ({
       inviteOne: {
-        label: t('invite one label', { ns: 'os' }),
-        description: t('invite one description', { ns: 'os' }),
+        label: t('invite one label', { ns: shellTranslationKey }),
+        description: t('invite one description', { ns: shellTranslationKey }),
         icon: 'ph--user-plus--regular',
         testId: 'membersContainer.inviteOne',
         onClick: async () => {
-          const { data: invitation } = await dispatch(
-            createIntent(SpaceAction.Share, {
-              space,
-              type: Invitation.Type.INTERACTIVE,
-              authMethod: Invitation.AuthMethod.SHARED_SECRET,
-              multiUse: false,
-              target: target && Obj.getDXN(target).toString(),
-            }),
-          );
+          const { data: invitation } = await invokePromise(SpaceOperation.Share, {
+            space,
+            type: Invitation.Type.INTERACTIVE,
+            authMethod: Invitation.AuthMethod.SHARED_SECRET,
+            multiUse: false,
+            target: target && Obj.getDXN(target).toString(),
+          });
           if (invitation && config.values.runtime?.app?.env?.DX_ENVIRONMENT !== 'production') {
-            const subscription: ZenObservable.Subscription = invitation.subscribe((invitation) =>
-              handleInvitationEvent(invitation, subscription),
+            const subscription: ZenObservable.Subscription = (invitation as CancellableInvitationObservable).subscribe(
+              (invitation: Invitation) => handleInvitationEvent(invitation, subscription),
             );
           }
         },
       },
       inviteMany: {
-        label: t('invite many label', { ns: 'os' }),
-        description: t('invite many description', { ns: 'os' }),
+        label: t('invite many label', { ns: shellTranslationKey }),
+        description: t('invite many description', { ns: shellTranslationKey }),
         icon: 'ph--users-three--regular',
         testId: 'membersContainer.inviteMany',
         onClick: async () => {
-          const { data: invitation } = await dispatch(
-            createIntent(SpaceAction.Share, {
-              space,
-              type: Invitation.Type.DELEGATED,
-              authMethod: Invitation.AuthMethod.KNOWN_PUBLIC_KEY,
-              multiUse: true,
-              target: target && Obj.getDXN(target).toString(),
-            }),
-          );
+          const { data: invitation } = await invokePromise(SpaceOperation.Share, {
+            space,
+            type: Invitation.Type.DELEGATED,
+            authMethod: Invitation.AuthMethod.KNOWN_PUBLIC_KEY,
+            multiUse: true,
+            target: target && Obj.getDXN(target).toString(),
+          });
           if (invitation && config.values.runtime?.app?.env?.DX_ENVIRONMENT !== 'production') {
-            const subscription: ZenObservable.Subscription = invitation.subscribe((invitation) =>
-              handleInvitationEvent(invitation, subscription),
+            const subscription: ZenObservable.Subscription = (invitation as CancellableInvitationObservable).subscribe(
+              (invitation: Invitation) => handleInvitationEvent(invitation, subscription),
             );
           }
         },
       },
     }),
-    [t, space, target],
+    [t, space, target, invokePromise],
   );
 
   const [selectedInvitation, setSelectedInvitation] = useState<CancellableInvitationObservable | null>(null);
@@ -132,51 +129,49 @@ export const MembersContainer = ({ space, createInvitationUrl }: MembersContaine
 
   return (
     <Clipboard.Provider>
-      <StackItem.Content scrollable>
-        <ControlPage>
-          <ControlSection title={t('members verbose label')} description={t('members description')}>
-            <ControlFrame>
-              <ControlFrameItem title={t('members label')}>
-                <SpaceMemberList spaceKey={space.key} includeSelf />
-              </ControlFrameItem>
-              {locked && (
-                <ControlFrameItem title={t('invitations label')}>
-                  <p className='text-description mbe-2'>{t('locked space description')}</p>
-                </ControlFrameItem>
-              )}
-              {!locked && (
-                <ControlFrameItem title={t('invitations label')}>
-                  {selectedInvitation && <InvitationSection {...selectedInvitation} onBack={handleBack} />}
-                  {!selectedInvitation && (
-                    <>
-                      <p className='text-description mbe-2'>{t('space invitation description')}</p>
-                      <InvitationList
-                        className='mb-2'
-                        send={handleSend}
-                        invitations={visibleInvitations ?? []}
-                        onClickRemove={(invitation) => invitation.cancel()}
-                        createInvitationUrl={createInvitationUrl}
-                      />
-                      <BifurcatedAction
-                        actions={inviteActions}
-                        activeAction={activeAction}
-                        onChangeActiveAction={setActiveAction as Dispatch<SetStateAction<string>>}
-                        data-testid='membersContainer.createInvitation'
-                      />
-                    </>
-                  )}
-                </ControlFrameItem>
-              )}
-            </ControlFrame>
-            {/* TODO(wittjosiah): Make ControlItemInput & ControlFrame compatible. */}
-            <div className='justify-center p-0 mbs-4 container-max-width grid grid-cols-1 md:grid-cols-[1fr_min-content]'>
-              <ControlItemInput title={t('space locked label')} description={t('space locked description')}>
-                <Input.Switch checked={locked} onCheckedChange={handleChangeLocked} classNames='justify-self-end' />
-              </ControlItemInput>
-            </div>
-          </ControlSection>
-        </ControlPage>
-      </StackItem.Content>
+      <Settings.Root>
+        <Settings.Section title={t('members verbose label')} description={t('members description')}>
+          <Settings.Frame>
+            <Settings.FrameItem title={t('members label')}>
+              <SpaceMemberList spaceKey={space.key} includeSelf />
+            </Settings.FrameItem>
+            {locked && (
+              <Settings.FrameItem title={t('invitations label')}>
+                <p className='text-description mbe-2'>{t('locked space description')}</p>
+              </Settings.FrameItem>
+            )}
+            {!locked && (
+              <Settings.FrameItem title={t('invitations label')}>
+                {selectedInvitation && <InvitationSection {...selectedInvitation} onBack={handleBack} />}
+                {!selectedInvitation && (
+                  <>
+                    <p className='text-description mbe-2'>{t('space invitation description')}</p>
+                    <InvitationList
+                      className='mb-2'
+                      send={handleSend}
+                      invitations={visibleInvitations ?? []}
+                      onClickRemove={(invitation) => invitation.cancel()}
+                      createInvitationUrl={createInvitationUrl}
+                    />
+                    <BifurcatedAction
+                      actions={inviteActions}
+                      activeAction={activeAction}
+                      onChangeActiveAction={setActiveAction as Dispatch<SetStateAction<string>>}
+                      data-testid='membersContainer.createInvitation'
+                    />
+                  </>
+                )}
+              </Settings.FrameItem>
+            )}
+          </Settings.Frame>
+          {/* TODO(wittjosiah): Make Settings.ItemInput & Settings.Frame compatible. */}
+          <div className='justify-center p-0 mbs-4 container-max-width grid grid-cols-1 md:grid-cols-[1fr_min-content]'>
+            <Settings.ItemInput title={t('space locked label')} description={t('space locked description')}>
+              <Input.Switch checked={locked} onCheckedChange={handleChangeLocked} classNames='justify-self-end' />
+            </Settings.ItemInput>
+          </div>
+        </Settings.Section>
+      </Settings.Root>
     </Clipboard.Provider>
   );
 };
@@ -227,7 +222,7 @@ const InvitationSection = ({
 };
 
 const InvitationQR = ({ id, url, onCancel }: { id: string; url: string; onCancel?: () => void }) => {
-  const { t } = useTranslation('os');
+  const { t } = useTranslation(shellTranslationKey);
   const qrLabel = useId('members-container__qr-code');
   const emoji = hexToEmoji(id);
   return (
@@ -262,7 +257,7 @@ const InvitationQR = ({ id, url, onCancel }: { id: string; url: string; onCancel
 };
 
 const InvitationAuthCode = ({ id, code, onCancel }: { id: string; code: string; onCancel?: () => void }) => {
-  const { t } = useTranslation('os');
+  const { t } = useTranslation(shellTranslationKey);
   const emoji = hexToEmoji(id);
 
   return (

package/src/components/MenuFooter.tsx

@@ -12,7 +12,7 @@ import { DropdownMenu, Icon, toLocalizedString, useTranslation } from '@dxos/rea
 import { meta } from '../meta';
 import { getSpaceDisplayName } from '../util';
 
-export const MenuFooter = ({ object }: { object: Obj.Any }) => {
+export const MenuFooter = ({ object }: { object: Obj.Unknown }) => {
   const { t } = useTranslation(meta.id);
   const client = useClient();
   const space = getSpace(object);

package/src/components/ObjectCardStack/ObjectCardStack.tsx

@@ -4,10 +4,13 @@
 
 import React, { forwardRef } from 'react';
 
-import { Filter, getSpace, useQuery, useSchema } from '@dxos/react-client/echo';
+import { Obj } from '@dxos/echo';
+import { Filter, useQuery, useSchema } from '@dxos/react-client/echo';
 import { Callout, Toolbar, useTranslation } from '@dxos/react-ui';
+import { Layout } from '@dxos/react-ui';
 import { useSelected } from '@dxos/react-ui-attention';
-import { Card, CardStack, StackItem } from '@dxos/react-ui-stack';
+import { Card } from '@dxos/react-ui-mosaic';
+import { CardStack, StackItem } from '@dxos/react-ui-stack';
 import { type View, getTypenameFromQuery } from '@dxos/schema';
 import { isNonNullable } from '@dxos/util';
 
@@ -16,17 +19,17 @@ import { meta } from '../../meta';
 import { ObjectForm } from './ObjectForm';
 
 export type ObjectCardStackProps = {
-  objectId: string;
   view: View.View;
+  objectId: string;
 };
 
 export const ObjectCardStack = forwardRef<HTMLDivElement, ObjectCardStackProps>(({ objectId, view }, forwardedRef) => {
   const { t } = useTranslation(meta.id);
-  const space = getSpace(view);
+  const db = Obj.getDatabase(view);
   const typename = view.query ? getTypenameFromQuery(view.query.ast) : undefined;
-  const schema = useSchema(space, typename);
+  const schema = useSchema(db, typename);
 
-  const queriedObjects = useQuery(space, schema ? Filter.type(schema) : Filter.nothing());
+  const queriedObjects = useQuery(db, schema ? Filter.type(schema) : Filter.nothing());
   const selectedRows = useSelected(objectId, 'multi');
   const selectedObjects = selectedRows.map((id) => queriedObjects.find((obj) => obj.id === id)).filter(isNonNullable);
 
@@ -35,7 +38,7 @@ export const ObjectCardStack = forwardRef<HTMLDivElement, ObjectCardStackProps>(
   }
 
   return (
-    <StackItem.Content toolbar ref={forwardedRef}>
+    <Layout.Main toolbar ref={forwardedRef}>
       <Toolbar.Root></Toolbar.Root>
       <CardStack.Root asChild>
         <CardStack.Content>
@@ -50,15 +53,15 @@ export const ObjectCardStack = forwardRef<HTMLDivElement, ObjectCardStackProps>(
             {selectedObjects.map((object) => (
               <CardStack.Item key={object.id} asChild>
                 <StackItem.Root item={object}>
-                  <Card.StaticRoot>
+                  <Card.Root>
                     <ObjectForm object={object} schema={schema} />
-                  </Card.StaticRoot>
+                  </Card.Root>
                 </StackItem.Root>
               </CardStack.Item>
             ))}
           </CardStack.Stack>
         </CardStack.Content>
       </CardStack.Root>
-    </StackItem.Content>
+    </Layout.Main>
   );
 });

package/src/components/ObjectCardStack/ObjectForm.tsx

@@ -6,23 +6,20 @@ import * as Schema from 'effect/Schema';
 import React, { useCallback, useMemo } from 'react';
 
 import { DXN, Obj, type Ref, Tag, Type } from '@dxos/echo';
-import { type JsonPath, setValue } from '@dxos/echo/internal';
+import { type JsonPath, splitJsonPath } from '@dxos/echo/internal';
 import { invariant } from '@dxos/invariant';
-import { getSpace } from '@dxos/react-client/echo';
-import { Form, omitId, useRefQueryOptions } from '@dxos/react-ui-form';
+import { Form, omitId } from '@dxos/react-ui-form';
 import { isNonNullable } from '@dxos/util';
 
 import { meta as pluginMeta } from '../../meta';
 
-const TagSchema = Tag.Tag.pipe(Schema.omit('id'));
-
 export type ObjectFormProps = {
   schema: Schema.Schema.AnyNoContext;
-  object: Obj.Any;
+  object: Obj.Unknown;
 };
 
 export const ObjectForm = ({ object, schema }: ObjectFormProps) => {
-  const space = getSpace(object);
+  const db = Obj.getDatabase(object);
 
   const formSchema = useMemo(
     () =>
@@ -33,16 +30,18 @@ export const ObjectForm = ({ object, schema }: ObjectFormProps) => {
   );
 
   const meta = Obj.getMeta(object);
-  const tags = (meta.tags ?? []).map((tag) => space?.db.makeRef(DXN.parse(tag))).filter(isNonNullable);
+  const tags = (meta.tags ?? []).map((tag) => db?.makeRef(DXN.parse(tag))).filter(isNonNullable);
   const values = useMemo(() => ({ tags, ...object }), [object, tags]);
 
-  const handleRefQueryLookup = useRefQueryOptions({ space });
-
-  const handleCreateTag = useCallback((values: Schema.Schema.Type<typeof TagSchema>) => {
-    invariant(space);
-    const tag = space.db.add(Tag.make(values));
-    const meta = Obj.getMeta(object);
-    meta.tags = [...(meta.tags ?? []), Obj.getDXN(tag).toString()];
+  const handleCreate = useCallback((schema: Type.Entity.Any, values: any) => {
+    invariant(db);
+    invariant(Type.isObjectSchema(schema));
+    const newObject = db.add(Obj.make(schema, values));
+    if (Obj.instanceOf(Tag.Tag, newObject)) {
+      Obj.change(object, (obj) => {
+        Obj.getMeta(obj).tags = [...(Obj.getMeta(obj).tags ?? []), Obj.getDXN(newObject).toString()];
+      });
+    }
   }, []);
 
   // TODO(wittjosiah): Use FormRootProps type.
@@ -53,16 +52,25 @@ export const ObjectForm = ({ object, schema }: ObjectFormProps) => {
       }
 
       const changedPaths = Object.keys(changed).filter((path) => changed[path as JsonPath]) as JsonPath[];
-      for (const path of changedPaths) {
-        // TODO(wittjosiah): This doesn't handle array paths well.
-        if (path.startsWith('tags')) {
-          const meta = Obj.getMeta(object);
-          meta.tags = tags?.map((tag: Ref.Ref<Tag.Tag>) => tag.dxn.toString()) ?? [];
-          continue;
-        }
 
-        const value = values[path];
-        setValue(object, path, value);
+      // Handle tags separately using Obj.change.
+      const hasTagsChange = changedPaths.some((path) => splitJsonPath(path)[0] === 'tags');
+      if (hasTagsChange) {
+        Obj.change(object, (obj) => {
+          Obj.getMeta(obj).tags = tags?.map((tag: Ref.Ref<Tag.Tag>) => tag.dxn.toString()) ?? [];
+        });
+      }
+
+      // Handle other property changes.
+      const nonTagPaths = changedPaths.filter((path) => splitJsonPath(path)[0] !== 'tags');
+      if (nonTagPaths.length > 0) {
+        Obj.change(object, () => {
+          for (const path of nonTagPaths) {
+            const parts = splitJsonPath(path);
+            const value = Obj.getValue(values, parts);
+            Obj.setValue(object, parts, value);
+          }
+        });
       }
     },
     [object],
@@ -72,13 +80,12 @@ export const ObjectForm = ({ object, schema }: ObjectFormProps) => {
     <Form.Root
       schema={omitId(formSchema)}
       values={values}
-      createSchema={TagSchema}
       createOptionIcon='ph--plus--regular'
       createOptionLabel={['add tag label', { ns: pluginMeta.id }]}
       createInitialValuePath='label'
+      db={db}
       onValuesChanged={handleChange}
-      onCreate={handleCreateTag}
-      onQueryRefOptions={handleRefQueryLookup}
+      onCreate={handleCreate}
     >
       <Form.Viewport>
         <Form.Content>

package/src/components/ObjectDetails/BaseObjectSettings.stories.tsx

@@ -6,23 +6,23 @@ import { type Meta, type StoryObj } from '@storybook/react-vite';
 import React, { useEffect, useState } from 'react';
 
 import { type Obj, Tag } from '@dxos/echo';
-import { useClientProvider, withClientProvider } from '@dxos/react-client/testing';
+import { useClientStory, withClientProvider } from '@dxos/react-client/testing';
 import { withTheme } from '@dxos/react-ui/testing';
 import { render } from '@dxos/storybook-utils';
-import { Project } from '@dxos/types';
+import { Pipeline } from '@dxos/types';
 
 import { translations } from '../../translations';
 
 import { BaseObjectSettings } from './BaseObjectSettings';
 
 const DefaultStory = () => {
-  const { space } = useClientProvider();
-  const [object, setObject] = useState<Obj.Any>();
+  const { space } = useClientStory();
+  const [object, setObject] = useState<Obj.Unknown>();
 
   useEffect(() => {
     if (space && !object) {
-      const object = space.db.add(Project.make());
-      setObject(object as Obj.Any);
+      const object = space.db.add(Pipeline.make());
+      setObject(object);
     }
   }, [space, object]);
 
@@ -38,11 +38,11 @@ const meta = {
   component: BaseObjectSettings as any,
   render: render(DefaultStory),
   decorators: [
-    withTheme,
+    withTheme(),
     withClientProvider({
       createIdentity: true,
       createSpace: true,
-      types: [Project.Project, Tag.Tag],
+      types: [Pipeline.Pipeline, Tag.Tag],
       onCreateSpace: async ({ space }) => {
         space.db.add(Tag.make({ label: 'Tag 1' }));
         space.db.add(Tag.make({ label: 'Tag 2' }));

package/src/components/ObjectDetails/BaseObjectSettings.tsx

@@ -2,18 +2,16 @@
 // Copyright 2024 DXOS.org
 //
 
-import { batch } from '@preact/signals-core';
 import * as Function from 'effect/Function';
 import * as Option from 'effect/Option';
 import * as Schema from 'effect/Schema';
 import React, { type PropsWithChildren, useCallback, useMemo } from 'react';
 
 import { DXN, Obj, type Ref, Tag, Type } from '@dxos/echo';
-import { type JsonPath, setValue } from '@dxos/echo/internal';
+import { type JsonPath, splitJsonPath } from '@dxos/echo/internal';
 import { invariant } from '@dxos/invariant';
-import { getSpace } from '@dxos/react-client/echo';
 import { type ThemedClassName } from '@dxos/react-ui';
-import { Form, omitId, useRefQueryOptions } from '@dxos/react-ui-form';
+import { Form, omitId } from '@dxos/react-ui-form';
 import { isNonNullable } from '@dxos/util';
 
 import { meta as pluginMeta } from '../../meta';
@@ -23,19 +21,15 @@ const BaseSchema = Schema.Struct({
   tags: Schema.Array(Type.Ref(Tag.Tag)).pipe(Schema.optional),
 });
 
-// TODO(wittjosiah): Better way to support validation of object schemas?
-const TagSchema = Tag.Tag.pipe(Schema.omit('id'));
-
 export type BaseObjectSettingsProps = ThemedClassName<
   PropsWithChildren<{
-    object: Obj.Any;
+    object: Obj.Unknown;
   }>
 >;
 
 // TODO(wittjosiah): Reconcile w/ ObjectDetailsPanel.
 export const BaseObjectSettings = ({ classNames, children, object }: BaseObjectSettingsProps) => {
-  const space = getSpace(object);
-  const handleRefQueryLookup = useRefQueryOptions({ space });
+  const db = Obj.getDatabase(object);
 
   const formSchema = useMemo(() => {
     return Function.pipe(
@@ -47,7 +41,7 @@ export const BaseObjectSettings = ({ classNames, children, object }: BaseObjectS
   }, [object]);
 
   const meta = Obj.getMeta(object);
-  const tags = (meta.tags ?? []).map((tag) => space?.db.makeRef(DXN.parse(tag))).filter(isNonNullable);
+  const tags = (meta.tags ?? []).map((tag) => db?.makeRef(DXN.parse(tag))).filter(isNonNullable);
   const values = useMemo(
     () => ({
       tags,
@@ -56,11 +50,15 @@ export const BaseObjectSettings = ({ classNames, children, object }: BaseObjectS
     [object, tags],
   );
 
-  const handleCreateTag = useCallback((values: Schema.Schema.Type<typeof TagSchema>) => {
-    invariant(space);
-    const tag = space.db.add(Tag.make(values));
-    const meta = Obj.getMeta(object);
-    meta.tags = [...(meta.tags ?? []), Obj.getDXN(tag).toString()];
+  const handleCreate = useCallback((schema: Type.Entity.Any, values: any) => {
+    invariant(db);
+    invariant(Type.isObjectSchema(schema));
+    const newObject = db.add(Obj.make(schema, values));
+    if (Obj.instanceOf(Tag.Tag, newObject)) {
+      Obj.change(object, (obj) => {
+        Obj.getMeta(obj).tags = [...(Obj.getMeta(obj).tags ?? []), Obj.getDXN(newObject).toString()];
+      });
+    }
   }, []);
 
   // TODO(wittjosiah): Use FormRootProps type.
@@ -74,19 +72,26 @@ export const BaseObjectSettings = ({ classNames, children, object }: BaseObjectS
       }
 
       const changedPaths = Object.keys(changed).filter((path) => changed[path as JsonPath]) as JsonPath[];
-      batch(() => {
-        for (const path of changedPaths) {
-          // TODO(wittjosiah): This doesn't handle array paths well.
-          if (path.startsWith('tags')) {
-            const meta = Obj.getMeta(object);
-            meta.tags = tags?.map((tag: Ref.Ref<Tag.Tag>) => tag.dxn.toString()) ?? [];
-            continue;
-          }
 
-          const value = values[path];
-          setValue(object, path, value);
-        }
-      });
+      // Handle tags separately using Obj.change.
+      const hasTagsChange = changedPaths.some((path) => splitJsonPath(path)[0] === 'tags');
+      if (hasTagsChange) {
+        Obj.change(object, (obj) => {
+          Obj.getMeta(obj).tags = tags?.map((tag: Ref.Ref<Tag.Tag>) => tag.dxn.toString()) ?? [];
+        });
+      }
+
+      // Handle other property changes.
+      const nonTagPaths = changedPaths.filter((path) => splitJsonPath(path)[0] !== 'tags');
+      if (nonTagPaths.length > 0) {
+        Obj.change(object, () => {
+          for (const path of nonTagPaths) {
+            const parts = splitJsonPath(path);
+            const value = Obj.getValue(values, parts);
+            Obj.setValue(object, parts, value);
+          }
+        });
+      }
     },
     [object],
   );
@@ -99,13 +104,12 @@ export const BaseObjectSettings = ({ classNames, children, object }: BaseObjectS
     <Form.Root
       schema={omitId(formSchema)}
       values={values}
-      createSchema={TagSchema}
       createOptionIcon='ph--plus--regular'
       createOptionLabel={['add tag label', { ns: pluginMeta.id }]}
       createInitialValuePath='label'
+      db={db}
       onValuesChanged={handleChange}
-      onCreate={handleCreateTag}
-      onQueryRefOptions={handleRefQueryLookup}
+      onCreate={handleCreate}
     >
       <Form.Viewport>
         <Form.Content classNames={classNames}>

package/src/components/ObjectDetails/ObjectDetails.tsx

@@ -4,32 +4,30 @@
 
 import React, { forwardRef, useMemo } from 'react';
 
-import { Surface } from '@dxos/app-framework/react';
+import { Surface } from '@dxos/app-framework/ui';
+import { type SurfaceComponentProps } from '@dxos/app-toolkit/ui';
 import { type Obj } from '@dxos/echo';
 import { Toolbar } from '@dxos/react-ui';
-import { StackItem } from '@dxos/react-ui-stack';
+import { Layout } from '@dxos/react-ui';
 
 import { BaseObjectSettings } from './BaseObjectSettings';
 
-export type ObjectDetailsProps = {
-  object: Obj.Any;
-  role: string;
-};
+export type ObjectDetailsProps = SurfaceComponentProps<Obj.Unknown>;
 
 export const ObjectDetails = forwardRef<HTMLDivElement, ObjectDetailsProps>(
-  ({ object }: ObjectDetailsProps, forwardedRef) => {
+  ({ role, subject: object }, forwardedRef) => {
     const data = useMemo(() => ({ subject: object }), [object]);
 
     return (
-      <StackItem.Content ref={forwardedRef} toolbar>
+      <Layout.Main toolbar role={role} ref={forwardedRef}>
         <Toolbar.Root />
         <BaseObjectSettings object={object}>
-          <Surface role='base-object-settings' data={data} />
-          <Surface role='object-settings' data={data} />
+          <Surface.Surface role='base-object-settings' data={data} />
+          <Surface.Surface role='object-settings' data={data} />
           {/* TODO(wittjosiah): Remove (or add as surface)? */}
           {/* <AdvancedObjectSettings object={object} /> */}
         </BaseObjectSettings>
-      </StackItem.Content>
+      </Layout.Main>
     );
   },
 );