@dxos/plugin-space 0.8.4-main.84f28bd → 0.8.4-main.ae835ea

package/src/components/MembersContainer.tsx

@@ -2,19 +2,17 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Check, X } from '@phosphor-icons/react';
 import React, { type Dispatch, type SetStateAction, useCallback, useMemo, useState } from 'react';
 import { QR } from 'react-qr-rounded';
 
 import { createIntent, useIntentDispatcher } from '@dxos/app-framework';
 import { log } from '@dxos/log';
 import { useConfig } from '@dxos/react-client';
-import { fullyQualifiedId, useSpaceInvitations, type Space } from '@dxos/react-client/echo';
+import { type Space, fullyQualifiedId, 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 { ControlPage, ControlSection, ControlFrame, ControlFrameItem, ControlItemInput } from '@dxos/react-ui-form';
+import { ControlFrame, ControlFrameItem, ControlItemInput, ControlPage, ControlSection } from '@dxos/react-ui-form';
 import { StackItem } from '@dxos/react-ui-stack';
-import { getSize, mx } from '@dxos/react-ui-theme';
 import { DataType } from '@dxos/schema';
 import {
   type ActionMenuItem,
@@ -28,7 +26,7 @@ import {
 } from '@dxos/shell/react';
 import { hexToEmoji } from '@dxos/util';
 
-import { SPACE_PLUGIN } from '../meta';
+import { meta } from '../meta';
 import { SpaceAction } from '../types';
 import { COMPOSER_SPACE_LOCK } from '../util';
 
@@ -43,14 +41,13 @@ const handleInvitationEvent = (invitation: Invitation, subscription: ZenObservab
   }
 };
 
-export const MembersContainer = ({
-  space,
-  createInvitationUrl,
-}: {
+export type MembersContainerProps = {
   space: Space;
   createInvitationUrl: (invitationCode: string) => string;
-}) => {
-  const { t } = useTranslation(SPACE_PLUGIN);
+};
+
+export const MembersContainer = ({ space, createInvitationUrl }: MembersContainerProps) => {
+  const { t } = useTranslation(meta.id);
   const config = useConfig();
   const { dispatchPromise: dispatch } = useIntentDispatcher();
   const invitations = useSpaceInvitations(space.key);
@@ -78,7 +75,7 @@ export const MembersContainer = ({
       inviteOne: {
         label: t('invite one label', { ns: 'os' }),
         description: t('invite one description', { ns: 'os' }),
-        icon: () => <Icon icon='ph--user-plus--regular' size={5} />,
+        icon: 'ph--user-plus--regular',
         testId: 'membersContainer.inviteOne',
         onClick: async () => {
           const { data: invitation } = await dispatch(
@@ -100,7 +97,7 @@ export const MembersContainer = ({
       inviteMany: {
         label: t('invite many label', { ns: 'os' }),
         description: t('invite many description', { ns: 'os' }),
-        icon: () => <Icon icon='ph--users-three--regular' size={5} />,
+        icon: 'ph--users-three--regular',
         testId: 'membersContainer.inviteMany',
         onClick: async () => {
           const { data: invitation } = await dispatch(
@@ -133,7 +130,7 @@ export const MembersContainer = ({
 
   return (
     <Clipboard.Provider>
-      <StackItem.Content classNames='block overflow-y-auto'>
+      <StackItem.Content scrollable>
         <ControlPage>
           <ControlSection title={t('members verbose label')} description={t('members description')}>
             <ControlFrame>
@@ -170,7 +167,7 @@ export const MembersContainer = ({
               )}
             </ControlFrame>
             {/* TODO(wittjosiah): Make ControlItemInput & ControlFrame compatible. */}
-            <div className='justify-center gap-4 p-0 mbs-4 container-max-width grid grid-cols-1 md:grid-cols-[1fr_min-content]'>
+            <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>
@@ -233,7 +230,7 @@ const InvitationQR = ({ id, url, onCancel }: { id: string; url: string; onCancel
   const emoji = hexToEmoji(id);
   return (
     <>
-      <p className='text-description'>{t('qr code description', { ns: SPACE_PLUGIN })}</p>
+      <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'>
           <QR
@@ -280,5 +277,9 @@ const InvitationAuthCode = ({ id, code, onCancel }: { id: string; code: string;
 };
 
 const InvitationComplete = ({ statusValue }: { statusValue: number }) => {
-  return statusValue > 0 ? <Check className={mx('m-1.5', getSize(6))} /> : <X className={mx('m-1.5', getSize(6))} />;
+  return statusValue > 0 ? (
+    <Icon icon='ph--check--regular' size={6} classNames='m-1.5' />
+  ) : (
+    <Icon icon='ph--x--regular' size={6} classNames='m-1.5' />
+  );
 };

package/src/components/MenuFooter.tsx

@@ -2,19 +2,18 @@
 // Copyright 2024 DXOS.org
 //
 
-import { Planet } from '@phosphor-icons/react';
 import React from 'react';
 
 import { getSpace } from '@dxos/client/echo';
 import { type Obj } from '@dxos/echo';
 import { useClient } from '@dxos/react-client';
-import { DropdownMenu, toLocalizedString, useTranslation } from '@dxos/react-ui';
+import { DropdownMenu, Icon, toLocalizedString, useTranslation } from '@dxos/react-ui';
 
-import { SPACE_PLUGIN } from '../meta';
+import { meta } from '../meta';
 import { getSpaceDisplayName } from '../util';
 
 export const MenuFooter = ({ object }: { object: Obj.Any }) => {
-  const { t } = useTranslation(SPACE_PLUGIN);
+  const { t } = useTranslation(meta.id);
   const client = useClient();
   const space = getSpace(object);
   const spaceName = space ? getSpaceDisplayName(space, { personal: client.spaces.default === space }) : '';
@@ -25,7 +24,7 @@ export const MenuFooter = ({ object }: { object: Obj.Any }) => {
       <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>
         <dd className='line-clamp-3'>
-          <Planet className='inline-block mie-1' />
+          <Icon icon='ph--planet--regular' classNames='inline-block mie-1' />
           {toLocalizedString(spaceName, t)}
         </dd>
       </dl>

package/src/components/ObjectDetailsPanel/ObjectDetailsPanel.tsx

@@ -0,0 +1,52 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import React from 'react';
+
+import { useClient } from '@dxos/react-client';
+import { Filter, getSpace, useQuery, useSchema } from '@dxos/react-client/echo';
+import { Callout, useTranslation } from '@dxos/react-ui';
+import { useSelected } from '@dxos/react-ui-attention';
+import { type DataType } from '@dxos/schema';
+import { getTypenameFromQuery } from '@dxos/schema';
+import { isNonNullable } from '@dxos/util';
+
+import { meta } from '../../meta';
+
+import { ObjectForm } from './ObjectForm';
+
+type RowDetailsPanelProps = { objectId: string; view: DataType.View };
+
+export const ObjectDetailsPanel = ({ objectId, view }: RowDetailsPanelProps) => {
+  const { t } = useTranslation(meta.id);
+  const client = useClient();
+  const space = getSpace(view);
+  const typename = view.query ? getTypenameFromQuery(view.query.ast) : undefined;
+  const schema = useSchema(client, space, typename);
+
+  const queriedObjects = useQuery(space, schema ? Filter.type(schema) : Filter.nothing());
+  const selectedRows = useSelected(objectId, 'multi');
+  const selectedObjects = selectedRows.map((id) => queriedObjects.find((obj) => obj.id === id)).filter(isNonNullable);
+
+  if (selectedObjects.length === 0) {
+    return (
+      <div role='none' className='plb-cardSpacingBlock pli-cardSpacingInline'>
+        <Callout.Root classNames='is-full'>
+          <Callout.Title>{t('row details no selection label')}</Callout.Title>
+        </Callout.Root>
+      </div>
+    );
+  }
+
+  return (
+    <div role='none' className='bs-full is-full flex flex-col p-2 gap-1 overflow-y-auto'>
+      {schema &&
+        selectedObjects.map((object) => (
+          <div key={object.id} className='border border-separator rounded'>
+            <ObjectForm object={object} schema={schema} />
+          </div>
+        ))}
+    </div>
+  );
+};

package/src/components/ObjectDetailsPanel/ObjectForm.tsx

@@ -0,0 +1,75 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Schema from 'effect/Schema';
+import React, { useCallback, useMemo } from 'react';
+
+import { DXN, Obj, Tag, Type } from '@dxos/echo';
+import { type JsonPath, setValue } from '@dxos/echo/internal';
+import { invariant } from '@dxos/invariant';
+import { getSpace } from '@dxos/react-client/echo';
+import { Form, useRefQueryLookupHandler } from '@dxos/react-ui-form';
+
+import { meta as pluginMeta } from '../../meta';
+
+const TagSchema = Tag.Tag.pipe(Schema.omit('id'));
+
+type ObjectFormProps = { object: Obj.Any; schema: Schema.Schema.AnyNoContext };
+
+export const ObjectForm = ({ object, schema }: ObjectFormProps) => {
+  const space = getSpace(object);
+  const handleRefQueryLookup = useRefQueryLookupHandler({ space });
+
+  const formSchema = useMemo(
+    () => Schema.Struct({ tag: Type.Ref(Tag.Tag).pipe(Schema.optional) }).pipe(Schema.extend(schema)),
+    [schema],
+  );
+
+  const meta = Obj.getMeta(object);
+  const tag = meta.tags?.[0] ? space?.db.ref(DXN.parse(meta.tags?.[0])) : undefined;
+  const values = useMemo(() => ({ tag, ...object }), [object, tag]);
+
+  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 = [Obj.getDXN(tag).toString()];
+  }, []);
+
+  const handleSave = useCallback(
+    (values: any, { changed }: { changed: Record<JsonPath, boolean> }) => {
+      const changedPaths = Object.keys(changed).filter((path) => changed[path as JsonPath]) as JsonPath[];
+      for (const path of changedPaths) {
+        if (path === 'tag') {
+          const tag = values[path];
+          const meta = Obj.getMeta(object);
+          const currentTag = meta.tags?.[0];
+          if (currentTag !== tag?.dxn.toString()) {
+            meta.tags = tag ? [tag.dxn.toString()] : [];
+          }
+          continue;
+        }
+
+        const value = values[path];
+        setValue(object, path, value);
+      }
+    },
+    [object],
+  );
+
+  return (
+    <Form
+      autoSave
+      schema={formSchema}
+      values={values}
+      createSchema={TagSchema}
+      createOptionIcon='ph--plus--regular'
+      createOptionLabel={['add tag label', { ns: pluginMeta.id }]}
+      createInitialValuePath='label'
+      onCreate={handleCreateTag}
+      onSave={handleSave}
+      onQueryRefOptions={handleRefQueryLookup}
+    />
+  );
+};

package/src/components/ObjectDetailsPanel/index.ts

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

package/src/components/ObjectSettings/AdvancedObjectSettings.tsx

@@ -5,12 +5,13 @@
 import React, { useCallback, useState } from 'react';
 
 import { Obj } from '@dxos/echo';
-import { ForeignKey } from '@dxos/echo-schema';
+import { ForeignKey } from '@dxos/echo/internal';
 import { IconButton, useTranslation } from '@dxos/react-ui';
 import { Form } from '@dxos/react-ui-form';
 
+import { meta } from '../../meta';
+
 import { ForeignKeys } from './ForeignKeys';
-import { SPACE_PLUGIN } from '../../meta';
 
 const initialValues = {
   source: '',
@@ -22,7 +23,7 @@ export type AdvancedObjectSettingsProps = {
 };
 
 export const AdvancedObjectSettings = ({ object }: AdvancedObjectSettingsProps) => {
-  const { t } = useTranslation(SPACE_PLUGIN);
+  const { t } = useTranslation(meta.id);
   const [adding, setAdding] = useState(false);
   const { keys } = Obj.getMeta(object);
 

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

@@ -0,0 +1,63 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+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 { withTheme } from '@dxos/react-ui/testing';
+import { DataType } from '@dxos/schema';
+import { render } from '@dxos/storybook-utils';
+
+import { translations } from '../../translations';
+
+import { BaseObjectSettings } from './BaseObjectSettings';
+
+const DefaultStory = () => {
+  const { space } = useClientProvider();
+  const [object, setObject] = useState<Obj.Any>();
+
+  useEffect(() => {
+    if (space && !object) {
+      const object = space.db.add(DataType.makeProject());
+      setObject(object as Obj.Any);
+    }
+  }, [space, object]);
+
+  if (!object) {
+    return null;
+  }
+
+  return <BaseObjectSettings object={object} classNames='is-[20rem]' />;
+};
+
+const meta = {
+  title: 'plugins/plugin-space/BaseObjectSettings',
+  component: BaseObjectSettings as any,
+  render: render(DefaultStory),
+  decorators: [
+    withTheme,
+    withClientProvider({
+      createIdentity: true,
+      createSpace: true,
+      types: [DataType.Project, Tag.Tag],
+      onCreateSpace: async ({ space }) => {
+        space.db.add(Tag.make({ label: 'Tag 1' }));
+        space.db.add(Tag.make({ label: 'Tag 2' }));
+        space.db.add(Tag.make({ label: 'Tag 3' }));
+      },
+    }),
+  ],
+  parameters: {
+    layout: 'centered',
+    translations,
+  },
+} satisfies Meta<typeof DefaultStory>;
+
+export default meta;
+
+type Story = StoryObj<typeof meta>;
+
+export const Default: Story = {};

package/src/components/ObjectSettings/BaseObjectSettings.tsx

@@ -2,12 +2,28 @@
 // Copyright 2024 DXOS.org
 //
 
-import React, { type PropsWithChildren, useRef } from 'react';
+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 { type Obj } from '@dxos/echo';
-import { Input, type ThemedClassName, useTranslation } from '@dxos/react-ui';
+import { DXN, Obj, Tag, Type } from '@dxos/echo';
+import { invariant } from '@dxos/invariant';
+import { getSpace } from '@dxos/react-client/echo';
+import { type ThemedClassName } from '@dxos/react-ui';
+import { Form, useRefQueryLookupHandler } from '@dxos/react-ui-form';
 
-import { meta } from '../../meta';
+import { meta as pluginMeta } from '../../meta';
+
+// TODO(wittjosiah): Would be nice to control order when extending so this isn't always first/last.
+const BaseSchema = Schema.Struct({
+  // TODO(wittjosiah): Support multiple tags.
+  tag: 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<{
@@ -15,32 +31,76 @@ export type BaseObjectSettingsProps = ThemedClassName<
   }>
 >;
 
+// TODO(wittjosiah): Reconcile w/ ObjectDetailsPanel.
 export const BaseObjectSettings = ({ classNames, children, object }: BaseObjectSettingsProps) => {
-  const { t } = useTranslation(meta.id);
-  const inputRef = useRef<HTMLInputElement>(null);
+  const space = getSpace(object);
+  const handleRefQueryLookup = useRefQueryLookupHandler({ space });
+
+  const formSchema = useMemo(() => {
+    return Function.pipe(
+      Obj.getSchema(object),
+      Option.fromNullable,
+      Option.map((schema) => BaseSchema.pipe(Schema.extend(schema))),
+      Option.getOrUndefined,
+    );
+  }, [object]);
+
+  const meta = Obj.getMeta(object);
+  const tag = meta.tags?.[0] ? space?.db.ref(DXN.parse(meta.tags?.[0])) : undefined;
+  const values = useMemo(
+    () => ({
+      tag,
+      ...object,
+    }),
+    [object, tag],
+  );
+
+  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 = [Obj.getDXN(tag).toString()];
+  }, []);
+
+  const handleSave = useCallback(
+    ({ tag, ...values }: Schema.Schema.Type<typeof formSchema>) => {
+      batch(() => {
+        const meta = Obj.getMeta(object);
+        const currentTag = meta.tags?.[0];
+        if (tag !== undefined && currentTag !== tag?.dxn.toString()) {
+          meta.tags = [tag.dxn.toString()];
+        }
+
+        Object.entries(values).forEach(([key, value]) => {
+          if (value !== undefined && value !== object[key as keyof Obj.Any]) {
+            Object.defineProperty(object, key, { value });
+          }
+        });
+      });
+    },
+    [object],
+  );
+
+  if (!formSchema) {
+    return null;
+  }
 
-  // TODO(wittjosiah): This should be a form based on the schema of the object.
-  //  The form should only include fields with a specific settings annotation.
-  //  Perhaps also including the field of the title annotation as well.
   return (
     <>
-      <Input.Root>
-        <Input.Label>{t('name label')}</Input.Label>
-        <Input.TextInput
-          ref={inputRef}
-          placeholder={t('name placeholder')}
-          // TODO(burdon): Use annotation to get the name field.
-          value={(object as any).name ?? ''}
-          onChange={(event) => {
-            (object as any).name = event.target.value;
-          }}
-          onKeyDown={(event) => {
-            if (event.key === 'Enter') {
-              inputRef.current?.blur();
-            }
-          }}
-        />
-      </Input.Root>
+      <Form
+        classNames={classNames}
+        outerSpacing={false}
+        autoSave
+        schema={formSchema}
+        values={values}
+        createSchema={TagSchema}
+        createOptionIcon='ph--plus--regular'
+        createOptionLabel={['add tag label', { ns: pluginMeta.id }]}
+        createInitialValuePath='label'
+        onCreate={handleCreateTag}
+        onSave={handleSave}
+        onQueryRefOptions={handleRefQueryLookup}
+      />
       {children}
     </>
   );

package/src/components/ObjectSettings/ForeignKeys.tsx

@@ -4,10 +4,10 @@
 
 import React, { useCallback } from 'react';
 
-import { type ForeignKey } from '@dxos/echo-schema';
+import { type ForeignKey } from '@dxos/echo/internal';
 import { IconButton, List, ListItem, useTranslation } from '@dxos/react-ui';
 
-import { SPACE_PLUGIN } from '../../meta';
+import { meta } from '../../meta';
 
 export type ForeignKeysProps = {
   keys: ForeignKey[];
@@ -31,7 +31,7 @@ type KeyItemProps = {
 };
 
 const KeyItem = ({ forignKey, onDelete }: KeyItemProps) => {
-  const { t } = useTranslation(SPACE_PLUGIN);
+  const { t } = useTranslation(meta.id);
 
   const handleDelete = useCallback(() => {
     onDelete?.(forignKey);

package/src/components/ObjectSettings/ObjectSettingsContainer.tsx

@@ -6,7 +6,7 @@ import React, { useMemo } from 'react';
 
 import { Surface } from '@dxos/app-framework';
 import { type Obj } from '@dxos/echo';
-import { Clipboard } from '@dxos/react-ui';
+import { Clipboard, Toolbar } from '@dxos/react-ui';
 import { StackItem } from '@dxos/react-ui-stack';
 
 import { BaseObjectSettings } from './BaseObjectSettings';
@@ -21,7 +21,8 @@ export const ObjectSettingsContainer = ({ object, role }: ObjectSettingsContaine
 
   return (
     <Clipboard.Provider>
-      <StackItem.Content toolbar={false}>
+      <StackItem.Content toolbar>
+        <Toolbar.Root></Toolbar.Root>
         <div role='none' className='overflow-y-auto pli-cardSpacingInline plb-cardSpacingBlock'>
           <BaseObjectSettings object={object}>
             <Surface role='base-object-settings' data={data} />

package/src/components/ObjectSettings/index.ts

@@ -2,4 +2,6 @@
 // Copyright 2025 DXOS.org
 //
 
-export * from './ObjectSettingsContainer';
+import { ObjectSettingsContainer } from './ObjectSettingsContainer';
+
+export default ObjectSettingsContainer;

package/src/components/PersistenceStatus.tsx

@@ -2,15 +2,14 @@
 // Copyright 2024 DXOS.org
 //
 
-import { ArrowsCounterClockwise, CheckCircle, Warning } from '@phosphor-icons/react';
 import React, { useEffect, useState } from 'react';
 
 import { debounce } from '@dxos/async';
 import { type EchoDatabase } from '@dxos/react-client/echo';
-import { Tooltip, useTranslation } from '@dxos/react-ui';
-import { getSize, mx, staticPlaceholderText, warningText } from '@dxos/react-ui-theme';
+import { Icon, Tooltip, useTranslation } from '@dxos/react-ui';
+import { mx, staticPlaceholderText, warningText } from '@dxos/react-ui-theme';
 
-import { SPACE_PLUGIN } from '../meta';
+import { meta } from '../meta';
 
 enum Status {
   PERSISTED_LOCALLY = 0,
@@ -20,7 +19,7 @@ enum Status {
 
 // TODO(zan): This now has no usages. Remove it?
 export const PersistenceStatus = ({ db }: { db: EchoDatabase }) => {
-  const { t } = useTranslation(SPACE_PLUGIN);
+  const { t } = useTranslation(meta.id);
   const [displayMessage, setDisplayMessage] = useState(false);
   const [status, naturalSetStatus] = useState<Status>(Status.PERSISTED_LOCALLY);
   const [prevStatus, setPrevStatus] = useState<Status>(Status.PERSISTED_LOCALLY);
@@ -54,14 +53,14 @@ export const PersistenceStatus = ({ db }: { db: EchoDatabase }) => {
     case Status.ERROR:
       return (
         <div className='flex items-center'>
-          <Warning className={mx(getSize(4), 'me-1')} />
+          <Icon icon='ph--warning--regular' size={4} classNames='me-1' />
           <span className={mx('text-sm', warningText)}>{t('persistence error label')}</span>
         </div>
       );
     case Status.PENDING:
       return (
         <div className='flex items-center'>
-          <ArrowsCounterClockwise className={mx(getSize(4), 'me-1')} />
+          <Icon icon='ph--arrows-counter-clockwise--regular' size={4} classNames='me-1' />
           <span className={mx('text-sm', staticPlaceholderText)}>{t('persistence pending label')}</span>
         </div>
       );
@@ -74,7 +73,7 @@ export const PersistenceStatus = ({ db }: { db: EchoDatabase }) => {
           content={t('persisted locally message')}
           className='flex items-center'
         >
-          <CheckCircle className={mx(getSize(4), 'me-1')} />
+          <Icon icon='ph--check-circle--regular' size={4} classNames='me-1' />
           {displayMessage && (
             <span className={mx('text-sm', staticPlaceholderText)}>{t('persisted locally label')}</span>
           )}

package/src/components/PopoverRenameObject.tsx

@@ -4,33 +4,27 @@
 
 import React, { useCallback, useRef, useState } from 'react';
 
-import { createIntent, LayoutAction, useIntentDispatcher } from '@dxos/app-framework';
+import { LayoutAction, createIntent, useIntentDispatcher } from '@dxos/app-framework';
+import { Obj } from '@dxos/echo';
 import { type Live } from '@dxos/live-object';
 import { log } from '@dxos/log';
 import { Button, Input, useTranslation } from '@dxos/react-ui';
 
-import { SPACE_PLUGIN } from '../meta';
+import { meta } from '../meta';
 
-export const POPOVER_RENAME_OBJECT = `${SPACE_PLUGIN}/PopoverRenameObject`;
+export const POPOVER_RENAME_OBJECT = `${meta.id}/PopoverRenameObject`;
 
-export const PopoverRenameObject = ({ object: obj }: { object: Live<any> }) => {
-  const { t } = useTranslation(SPACE_PLUGIN);
+export const PopoverRenameObject = ({ object }: { object: Live<any> }) => {
+  const { t } = useTranslation(meta.id);
   const doneButton = useRef<HTMLButtonElement>(null);
-  // TODO(wittjosiah): Use schema here.
-  const object = obj as any;
-  // TODO(burdon): Field should not be hardcoded field.
-  const [name, setName] = useState(object.name || object.title || '');
+  const [name, setName] = useState(Obj.getLabel(object));
   const { dispatchPromise: dispatch } = useIntentDispatcher();
 
   const handleDone = useCallback(() => {
     try {
-      object.name = name;
-    } catch {
-      try {
-        object.title = name;
-      } catch (err) {
-        log.error('Failed to rename object', { err });
-      }
+      name && Obj.setLabel(object, name);
+    } catch (err) {
+      log.error('Failed to rename object', { err });
     }
     void dispatch(
       createIntent(LayoutAction.UpdatePopover, {

package/src/components/PopoverRenameSpace.tsx

@@ -4,16 +4,16 @@
 
 import React, { useCallback, useRef, useState } from 'react';
 
-import { createIntent, LayoutAction, useIntentDispatcher } from '@dxos/app-framework';
+import { LayoutAction, createIntent, useIntentDispatcher } from '@dxos/app-framework';
 import { type Space } from '@dxos/react-client/echo';
 import { Button, Input, Popover, useTranslation } from '@dxos/react-ui';
 
-import { SPACE_PLUGIN } from '../meta';
+import { meta } from '../meta';
 
-export const POPOVER_RENAME_SPACE = `${SPACE_PLUGIN}/PopoverRenameSpace`;
+export const POPOVER_RENAME_SPACE = `${meta.id}/PopoverRenameSpace`;
 
 export const PopoverRenameSpace = ({ space }: { space: Space }) => {
-  const { t } = useTranslation(SPACE_PLUGIN);
+  const { t } = useTranslation(meta.id);
   const doneButton = useRef<HTMLButtonElement>(null);
   const [name, setName] = useState(space.properties.name ?? '');
   const { dispatchPromise: dispatch } = useIntentDispatcher();