@dxos/plugin-space 0.8.4-main.7ace549 → 0.8.4-main.8360d9e660

package/src/containers/InlineSyncStatus/index.ts

@@ -0,0 +1,7 @@
+//
+// Copyright 2024 DXOS.org
+//
+
+import { InlineSyncStatus } from './InlineSyncStatus';
+
+export default InlineSyncStatus;

package/src/{components → containers}/JoinDialog/JoinDialog.tsx

@@ -4,26 +4,29 @@
 
 import React, { useCallback } from 'react';
 
-import { LayoutAction, createIntent } from '@dxos/app-framework';
-import { useAppGraph, useIntentDispatcher } from '@dxos/app-framework/react';
+import { useOperationInvoker } from '@dxos/app-framework/ui';
+import { LayoutOperation, getSpacePath } from '@dxos/app-toolkit';
+import { useAppGraph } from '@dxos/app-toolkit/ui';
 import { Trigger } from '@dxos/async';
-import { ObservabilityAction } from '@dxos/plugin-observability/types';
+import { Graph } from '@dxos/plugin-graph';
+import { ObservabilityOperation } from '@dxos/plugin-observability/types';
 import { useClient } from '@dxos/react-client';
 import { type Space } from '@dxos/react-client/echo';
 import { type InvitationResult } from '@dxos/react-client/invitations';
 import { Dialog, useTranslation } from '@dxos/react-ui';
 import { JoinPanel, type JoinPanelProps } from '@dxos/shell/react';
+import { osTranslations } from '@dxos/ui-theme';
 
 import { meta } from '../../meta';
 
-export const JOIN_DIALOG = `${meta.id}/JoinDialog`;
+export const JOIN_DIALOG = `${meta.id}.JoinDialog`;
 
 export type JoinDialogProps = JoinPanelProps & {
   navigableCollections?: boolean;
 };
 
 export const JoinDialog = ({ navigableCollections, onDone, ...props }: JoinDialogProps) => {
-  const { dispatchPromise: dispatch } = useIntentDispatcher();
+  const { invokePromise } = useOperationInvoker();
   const client = useClient();
   const { graph } = useAppGraph();
   const { t } = useTranslation(meta.id);
@@ -36,25 +39,13 @@ export const JoinDialog = ({ navigableCollections, onDone, ...props }: JoinDialo
       }
 
       await Promise.all([
-        dispatch(
-          createIntent(LayoutAction.AddToast, {
-            part: 'toast',
-            subject: {
-              id: `${meta.id}/join-success`,
-              duration: 5_000,
-              title: ['join success label', { ns: meta.id }],
-              closeLabel: ['dismiss label', { ns: meta.id }],
-            },
-          }),
-        ),
-        dispatch(
-          createIntent(LayoutAction.UpdateDialog, {
-            part: 'dialog',
-            options: {
-              state: false,
-            },
-          }),
-        ),
+        invokePromise(LayoutOperation.AddToast, {
+          id: `${meta.id}.join-success`,
+          duration: 5_000,
+          title: ['join success label', { ns: meta.id }],
+          closeLabel: ['dismiss label', { ns: meta.id }],
+        }),
+        invokePromise(LayoutOperation.UpdateDialog, { state: false }),
       ]);
 
       let space = client.spaces.get(spaceKey);
@@ -70,12 +61,7 @@ export const JoinDialog = ({ navigableCollections, onDone, ...props }: JoinDialo
         space = await trigger.wait();
       }
 
-      await dispatch(
-        createIntent(LayoutAction.SwitchWorkspace, {
-          part: 'workspace',
-          subject: space.id,
-        }),
-      );
+      await invokePromise(LayoutOperation.SwitchWorkspace, { subject: getSpacePath(space.id) });
 
       // TODO(wittjosiah): If navigableCollections is false and there's no target,
       //   should try to navigate to the first object of the space replicates.
@@ -84,42 +70,30 @@ export const JoinDialog = ({ navigableCollections, onDone, ...props }: JoinDialo
       if (target) {
         // Wait before navigating to the target node.
         // If the target has not yet replicated, this will trigger a loading toast.
-        await graph.waitForPath({ target }).catch(() => {});
+        await Graph.waitForPath(graph, { target }).catch(() => {});
         await Promise.all([
-          dispatch(
-            createIntent(LayoutAction.Open, {
-              part: 'main',
-              subject: [target],
-            }),
-          ),
-          dispatch(
-            createIntent(LayoutAction.Expose, {
-              part: 'navigation',
-              subject: target,
-            }),
-          ),
+          invokePromise(LayoutOperation.Open, { subject: [target] }),
+          invokePromise(LayoutOperation.Expose, { subject: target }),
         ]);
       }
 
       await onDone?.(result);
 
       if (space) {
-        await dispatch(
-          createIntent(ObservabilityAction.SendEvent, {
-            name: 'space.join',
-            properties: {
-              spaceId: space.id,
-            },
-          }),
-        );
+        await invokePromise(ObservabilityOperation.SendEvent, {
+          name: 'space.join',
+          properties: {
+            spaceId: space.id,
+          },
+        });
       }
     },
-    [dispatch, client, graph],
+    [invokePromise, client, graph, navigableCollections, onDone],
   );
 
   return (
     <Dialog.Content>
-      <Dialog.Title classNames='sr-only'>{t('join space label', { ns: 'os' })}</Dialog.Title>
+      <Dialog.Title classNames='sr-only'>{t('join space label', { ns: osTranslations })}</Dialog.Title>
       <JoinPanel
         {...props}
         exitActionParent={<Dialog.Close asChild />}

package/src/containers/JoinDialog/index.ts

@@ -0,0 +1,6 @@
+//
+// Copyright 2024 DXOS.org
+//
+
+export { JoinDialog, type JoinDialogProps } from './JoinDialog';
+export { JoinDialog as default } from './JoinDialog';

package/src/{components → containers}/MembersContainer/MembersContainer.tsx

@@ -5,17 +5,15 @@
 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 { Collection } 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 { Collection } from '@dxos/schema';
+import { Settings } from '@dxos/react-ui-form';
 import {
   type ActionMenuItem,
   AuthCode,
@@ -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 mb-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 mb-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 mt-4 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,14 +222,14 @@ 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 (
     <>
       <p className='text-description'>{t('qr code description', { ns: meta.id })}</p>
-      <div role='group' className='grid grid-cols-[1fr_min-content] mlb-2 gap-2'>
-        <div role='none' className='is-full aspect-square relative text-description'>
+      <div role='group' className='grid grid-cols-[1fr_min-content] my-2 gap-2'>
+        <div role='none' className='w-full aspect-square relative text-description'>
           <QR
             rounding={100}
             backgroundColor='transparent'
@@ -262,15 +257,15 @@ 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 (
     <>
       <p className='text-description'>{t('auth other device emoji message')}</p>
-      {emoji && <Emoji text={emoji} className='mli-auto mlb-2 text-center' />}
+      {emoji && <Emoji text={emoji} className='mx-auto my-2 text-center' />}
       <p className='text-description'>{t('auth code message')}</p>
-      <AuthCode code={code} large classNames='mli-auto mlb-2 text-center grow' />
+      <AuthCode code={code} large classNames='mx-auto my-2 text-center grow' />
       <Button variant='ghost' onClick={onCancel}>
         {t('cancel label')}
       </Button>

package/src/containers/MembersContainer/index.ts

@@ -0,0 +1,7 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { MembersContainer } from './MembersContainer';
+
+export default MembersContainer;

package/src/{components → containers/MenuFooter}/MenuFooter.tsx

@@ -9,10 +9,10 @@ import { type Obj } from '@dxos/echo';
 import { useClient } from '@dxos/react-client';
 import { DropdownMenu, Icon, toLocalizedString, useTranslation } from '@dxos/react-ui';
 
-import { meta } from '../meta';
-import { getSpaceDisplayName } from '../util';
+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);
@@ -21,10 +21,10 @@ export const MenuFooter = ({ object }: { object: Obj.Any }) => {
     <>
       <DropdownMenu.Separator />
       <DropdownMenu.GroupLabel>{t('menu footer label')}</DropdownMenu.GroupLabel>
-      <dl className='pis-2 mbe-2 text-xs grid grid-cols-[max-content_1fr] gap-2'>
-        <dt className='uppercase text-[.75em] tracking-wide font-medium mbs-px self-start'>{t('location label')}</dt>
+      <dl className='ps-2 mb-2 text-xs grid grid-cols-[max-content_1fr] gap-2'>
+        <dt className='uppercase text-[.75em] tracking-wide font-medium mt-px self-start'>{t('location label')}</dt>
         <dd className='line-clamp-3'>
-          <Icon icon='ph--planet--regular' classNames='inline-block mie-1' />
+          <Icon icon='ph--planet--regular' classNames='inline-block me-1' />
           {toLocalizedString(spaceName, t)}
         </dd>
       </dl>

package/src/containers/MenuFooter/index.ts

@@ -0,0 +1,7 @@
+//
+// Copyright 2024 DXOS.org
+//
+
+import { MenuFooter } from './MenuFooter';
+
+export default MenuFooter;

package/src/containers/ObjectCardStack/ObjectCardStack.tsx

@@ -0,0 +1,82 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import React, { forwardRef, useState } from 'react';
+
+import { Obj } from '@dxos/echo';
+import { type View } from '@dxos/echo';
+import { Filter, useQuery, useSchema } from '@dxos/react-client/echo';
+import { Card, Message, Panel, ScrollArea, Toolbar, useTranslation } from '@dxos/react-ui';
+import { useSelected } from '@dxos/react-ui-attention';
+import { Mosaic } from '@dxos/react-ui-mosaic';
+import { getTypenameFromQuery } from '@dxos/schema';
+import { isNonNullable } from '@dxos/util';
+
+import { ObjectForm } from '../../components';
+import { meta } from '../../meta';
+
+export type ObjectCardStackProps = {
+  view: View.View;
+  objectId: string;
+};
+
+/**
+ * @deprecated Use Mosaic Board components.
+ */
+export const ObjectCardStack = forwardRef<HTMLDivElement, ObjectCardStackProps>(({ objectId, view }, forwardedRef) => {
+  const { t } = useTranslation(meta.id);
+  const db = Obj.getDatabase(view);
+  const typename = view.query ? getTypenameFromQuery(view.query.ast) : undefined;
+  const schema = useSchema(db, typename);
+
+  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);
+
+  const [viewport, setViewport] = useState<HTMLElement | null>(null);
+
+  if (!schema) {
+    return null;
+  }
+
+  return (
+    <Panel.Root className='dx-document' ref={forwardedRef}>
+      <Panel.Toolbar asChild>
+        <Toolbar.Root />
+      </Panel.Toolbar>
+      <Panel.Content>
+        {selectedObjects.length === 0 ? (
+          <Message.Root>
+            <Message.Title>{t('row details no selection label')}</Message.Title>
+          </Message.Root>
+        ) : (
+          <Mosaic.Root>
+            <Mosaic.Container
+              asChild
+              orientation='vertical'
+              autoScroll={viewport}
+              eventHandler={{ id: objectId, canDrop: () => true }}
+            >
+              <ScrollArea.Root orientation='vertical'>
+                <ScrollArea.Viewport ref={setViewport}>
+                  <Mosaic.Stack
+                    items={selectedObjects}
+                    getId={(obj) => obj.id}
+                    Tile={({ ...props }) => (
+                      <Mosaic.Tile {...props}>
+                        <Card.Root>
+                          <ObjectForm object={props.data} schema={schema} />
+                        </Card.Root>
+                      </Mosaic.Tile>
+                    )}
+                  />
+                </ScrollArea.Viewport>
+              </ScrollArea.Root>
+            </Mosaic.Container>
+          </Mosaic.Root>
+        )}
+      </Panel.Content>
+    </Panel.Root>
+  );
+});

package/src/containers/ObjectCardStack/index.ts

@@ -0,0 +1,7 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { ObjectCardStack } from './ObjectCardStack';
+
+export default ObjectCardStack;

package/src/containers/ObjectDetails/ObjectDetails.tsx

@@ -0,0 +1,36 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import React, { forwardRef, useMemo } from 'react';
+
+import { Surface } from '@dxos/app-framework/ui';
+import { type SurfaceComponentProps } from '@dxos/app-toolkit/ui';
+import { type Obj } from '@dxos/echo';
+import { Panel, Toolbar } from '@dxos/react-ui';
+
+import { BaseObjectSettings } from '../../components';
+
+export type ObjectDetailsProps = SurfaceComponentProps<Obj.Unknown>;
+
+export const ObjectDetails = forwardRef<HTMLDivElement, ObjectDetailsProps>(
+  ({ role, subject: object }, forwardedRef) => {
+    const data = useMemo(() => ({ subject: object }), [object]);
+
+    return (
+      <Panel.Root role={role} className='dx-document' ref={forwardedRef}>
+        <Panel.Toolbar asChild>
+          <Toolbar.Root />
+        </Panel.Toolbar>
+        <Panel.Content asChild>
+          <BaseObjectSettings object={object}>
+            <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>
+        </Panel.Content>
+      </Panel.Root>
+    );
+  },
+);

package/src/containers/ObjectDetails/index.ts

@@ -0,0 +1,7 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { ObjectDetails } from './ObjectDetails';
+
+export default ObjectDetails;

package/src/{components → containers}/ObjectRenamePopover/ObjectRenamePopover.tsx

@@ -4,35 +4,31 @@
 
 import React, { useCallback, useRef, useState } from 'react';
 
-import { LayoutAction, createIntent } from '@dxos/app-framework';
-import { useIntentDispatcher } from '@dxos/app-framework/react';
+import { useOperationInvoker } from '@dxos/app-framework/ui';
+import { LayoutOperation } from '@dxos/app-toolkit';
 import { Obj } from '@dxos/echo';
 import { log } from '@dxos/log';
 import { Button, Input, useTranslation } from '@dxos/react-ui';
+import { osTranslations } from '@dxos/ui-theme';
 
 import { meta } from '../../meta';
 
-export const OBJECT_RENAME_POPOVER = `${meta.id}/ObjectRenamePopover`;
+export const OBJECT_RENAME_POPOVER = `${meta.id}.ObjectRenamePopover`;
 
-export const ObjectRenamePopover = ({ object }: { object: Obj.Any }) => {
+export const ObjectRenamePopover = ({ object }: { object: Obj.Unknown }) => {
   const { t } = useTranslation(meta.id);
   const doneButton = useRef<HTMLButtonElement>(null);
   const [name, setName] = useState(Obj.getLabel(object));
-  const { dispatchPromise: dispatch } = useIntentDispatcher();
+  const { invokePromise } = useOperationInvoker();
 
   const handleDone = useCallback(() => {
     try {
-      name && Obj.setLabel(object, name);
+      name && Obj.change(object, () => Obj.setLabel(object, name));
     } catch (err) {
       log.error('Failed to rename object', { err });
     }
-    void dispatch(
-      createIntent(LayoutAction.UpdatePopover, {
-        part: 'popover',
-        options: { variant: 'react', anchorId: '', state: false },
-      }),
-    );
-  }, [object, name]);
+    void invokePromise(LayoutOperation.UpdatePopover, { anchorId: '', state: false });
+  }, [object, name, invokePromise]);
 
   return (
     <div role='none' className='p-2 flex gap-2'>
@@ -49,7 +45,7 @@ export const ObjectRenamePopover = ({ object }: { object: Obj.Any }) => {
         </Input.Root>
       </div>
       <Button ref={doneButton} classNames='self-stretch' onClick={handleDone}>
-        {t('done label', { ns: 'os' })}
+        {t('done label', { ns: osTranslations })}
       </Button>
     </div>
   );