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

package/src/components/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 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>
   );

package/src/components/RecordArticle.stories.tsx

@@ -5,14 +5,15 @@
 import { type Meta, type StoryObj } from '@storybook/react-vite';
 import React from 'react';
 
-import { Capabilities, contributes, createSurface } from '@dxos/app-framework';
+import { Capabilities, Capability } from '@dxos/app-framework';
 import { withPluginManager } from '@dxos/app-framework/testing';
+import { Surface } from '@dxos/app-framework/ui';
 import { Filter, Obj, Ref, Relation, type Type } from '@dxos/echo';
 import { faker } from '@dxos/random';
 import { useQuery } from '@dxos/react-client/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 { Card } from '@dxos/react-ui-stack';
+import { Card } from '@dxos/react-ui-mosaic';
 import { Json } from '@dxos/react-ui-syntax-highlighter';
 import { type ValueGenerator, createAsyncGenerator } from '@dxos/schema/testing';
 import { translations as shellTranslations } from '@dxos/shell/react';
@@ -27,8 +28,8 @@ faker.seed(1);
 const generator: ValueGenerator = faker as any;
 
 const DefaultStory = () => {
-  const { space } = useClientProvider();
-  const [object] = useQuery(space, Filter.type(Organization.Organization));
+  const { space } = useClientStory();
+  const [object] = useQuery(space?.db, Filter.type(Organization.Organization));
   if (!object) {
     return null;
   }
@@ -41,27 +42,27 @@ const meta = {
   component: RecordArticle as any,
   render: render(DefaultStory),
   decorators: [
-    withTheme,
+    withTheme(),
     // TODO(wittjosiah): Try to write story which does not depend on plugin manager.
     withPluginManager({
       capabilities: [
-        contributes(Capabilities.ReactSurface, [
-          createSurface({
+        Capability.contributes(Capabilities.ReactSurface, [
+          Surface.create({
             id: 'section',
             role: 'section',
             component: ({ data }) => (
-              <Card.SurfaceRoot>
+              <Card.Root>
                 <Json classNames='text-sm' data={data} />
-              </Card.SurfaceRoot>
+              </Card.Root>
             ),
           }),
-          createSurface({
+          Surface.create({
             id: 'card',
             role: 'card',
             component: ({ data }) => (
-              <Card.SurfaceRoot>
+              <Card.Root>
                 <Json classNames='text-sm' data={data} />
-              </Card.SurfaceRoot>
+              </Card.Root>
             ),
           }),
         ]),

package/src/components/RecordArticle.tsx

@@ -4,63 +4,73 @@
 
 import React, { useMemo } from 'react';
 
-import { Surface } from '@dxos/app-framework/react';
-import { type SurfaceComponentProps } from '@dxos/app-framework/react';
-import { type Entity, Filter, type Obj, Ref, Relation } from '@dxos/echo';
-import { type Space, getSpace, useQuery } from '@dxos/react-client/echo';
-import { useTranslation } from '@dxos/react-ui';
+import { Surface } from '@dxos/app-framework/ui';
+import { type SurfaceComponentProps } from '@dxos/app-toolkit/ui';
+import { type Database, Entity, Filter, Obj, Ref, Relation } from '@dxos/echo';
+import { useQuery } from '@dxos/react-client/echo';
+import { Layout, ScrollArea, useTranslation } from '@dxos/react-ui';
 import { Masonry } from '@dxos/react-ui-masonry';
-import { StackItem } from '@dxos/react-ui-stack';
-import { mx } from '@dxos/react-ui-theme';
+import { Card as MosaicCard } from '@dxos/react-ui-mosaic';
+import { mx } from '@dxos/ui-theme';
 import { isNonNullable } from '@dxos/util';
 
 import { meta } from '../meta';
 
-export const RecordArticle = ({ subject }: SurfaceComponentProps) => {
+export const RecordArticle = ({ role, subject }: SurfaceComponentProps) => {
   const { t } = useTranslation(meta.id);
-  const space = getSpace(subject);
+  const db = Obj.getDatabase(subject);
   const data = useMemo(() => ({ subject }), [subject]);
-  const related = useRelatedObjects(space, subject, {
+  const related = useRelatedObjects(db, subject, {
     references: true,
     relations: true,
   });
   const singleColumn = related.length === 1;
 
   return (
-    <StackItem.Content>
-      <div role='none' className={mx('flex flex-col gap-4 p-4 is-full overflow-y-auto')}>
-        <div role='none' className={mx('flex is-full card-max-width')}>
-          <Surface role='section' data={data} limit={1} />
-        </div>
-
-        {related.length > 0 && (
-          <div role='none' className={mx('flex flex-col gap-1', singleColumn ? 'card-max-width' : 'is-full')}>
-            <label className='mbs-2 text-sm text-description'>{t('related objects label')}</label>
-            <Masonry.Root<Entity.Unknown>
-              items={related}
-              render={Card}
-              columnCount={singleColumn ? 1 : undefined}
-              intrinsicHeight
-            />
+    <Layout.Main role={role}>
+      <ScrollArea.Root orientation='vertical'>
+        <ScrollArea.Viewport classNames={mx('p-4 gap-4')}>
+          <div role='none' className={mx('flex is-full card-max-width')}>
+            <Surface.Surface role='section' data={data} limit={1} />
           </div>
-        )}
-      </div>
-    </StackItem.Content>
+
+          {related.length > 0 && (
+            <div role='none' className={mx('flex flex-col gap-1', singleColumn ? 'card-max-width' : 'is-full')}>
+              <label className='mbs-2 text-sm text-description'>{t('related objects label')}</label>
+              <Masonry.Root<Entity.Unknown>
+                items={related}
+                render={Card}
+                columnCount={singleColumn ? 1 : undefined}
+                intrinsicHeight
+              />
+            </div>
+          )}
+        </ScrollArea.Viewport>
+      </ScrollArea.Root>
+    </Layout.Main>
   );
 };
 
 const Card = ({ data: subject }: { data: Entity.Unknown }) => {
   const data = useMemo(() => ({ subject }), [subject]);
-  return <Surface role='card' data={data} limit={1} />;
+  return (
+    <MosaicCard.Root>
+      <MosaicCard.Toolbar>
+        <span />
+        <MosaicCard.Title>{Entity.getLabel(subject)}</MosaicCard.Title>
+      </MosaicCard.Toolbar>
+      <Surface.Surface role='card--content' data={data} limit={1} />
+    </MosaicCard.Root>
+  );
 };
 
 // TODO(wittjosiah): This is a hack. ECHO needs to have a back reference index to easily query for related objects.
 const useRelatedObjects = (
-  space?: Space,
-  record?: Obj.Any,
+  db?: Database.Database,
+  record?: Obj.Unknown,
   options: { references?: boolean; relations?: boolean } = {},
 ) => {
-  const objects = useQuery(space, Filter.everything());
+  const objects = useQuery(db, Filter.everything());
   return useMemo(() => {
     if (!record) {
       return [];
@@ -70,10 +80,10 @@ const useRelatedObjects = (
 
     // TODO(burdon): Change Person => Organization to relations.
     if (options.references) {
-      const getReferences = (obj: Entity.Unknown): Ref.Any[] => {
+      const getReferences = (obj: Entity.Unknown): Ref.Unknown[] => {
         return Object.getOwnPropertyNames(obj)
-          .map((name) => obj[name as keyof Obj.Any])
-          .filter((value) => Ref.isRef(value)) as Ref.Any[];
+          .map((name) => obj[name as keyof Obj.Unknown])
+          .filter((value) => Ref.isRef(value)) as Ref.Unknown[];
       };
 
       const references = getReferences(record);
@@ -88,7 +98,7 @@ const useRelatedObjects = (
 
     if (options.relations) {
       // TODO(dmaretskyi): Workaround until https://github.com/dxos/dxos/pull/10100 lands.
-      const isValidRelation = (obj: Relation.Any) => {
+      const isValidRelation = (obj: Relation.Unknown) => {
         try {
           return Relation.isRelation(obj) && Relation.getSource(obj) && Relation.getTarget(obj);
         } catch {
@@ -96,7 +106,7 @@ const useRelatedObjects = (
         }
       };
 
-      const relations = objects.filter((obj) => Relation.isRelation(obj)).filter((obj) => isValidRelation(obj));
+      const relations = objects.filter(Relation.isRelation).filter((obj) => isValidRelation(obj));
       const targetObjects = relations
         .filter((relation) => Relation.getTarget(relation) === record)
         .map((relation) => Relation.getSource(relation));

package/src/components/SchemaContainer.tsx

@@ -7,33 +7,36 @@ import React, { useEffect, useState } from 'react';
 import { type Type } from '@dxos/echo';
 import { type Space } from '@dxos/react-client/echo';
 import { useTranslation } from '@dxos/react-ui';
-import { ControlPage, ControlSection, controlItemClasses } from '@dxos/react-ui-form';
-import { StackItem } from '@dxos/react-ui-stack';
+import { Settings } from '@dxos/react-ui-form';
+import { mx } from '@dxos/ui-theme';
 
 import { meta } from '../meta';
 
 type SchemaPanelProps = { space: Space };
 
+const itemClasses = mx([
+  'container-max-width grid md:col-span-2 grid-cols-subgrid gap-trimSm items-center',
+  '*:first:!mbs-0 *:last:!mbe-0 pli-trimMd plb-trimMd',
+  'border border-separator rounded-md',
+]);
+
 export const SchemaContainer = ({ space }: SchemaPanelProps) => {
   const { t } = useTranslation(meta.id);
   const schemas = useQuerySpaceSchemas(space);
 
-  // TODO(ZaymonFC): Support deleting Schema (DangerZone section).
   return (
-    <StackItem.Content scrollable>
-      <ControlPage>
-        <ControlSection title={t('schema verbose label')} description={t('schema description')}>
-          <div role='none' className={controlItemClasses}>
-            {schemas.length === 0 && <div className='text-center plb-4'>{t('no schemas found message')}</div>}
-            {schemas.map((schema) => (
-              <div role='none' key={schema.id}>
-                {schema.typename}
-              </div>
-            ))}
-          </div>
-        </ControlSection>
-      </ControlPage>
-    </StackItem.Content>
+    <Settings.Root>
+      <Settings.Section title={t('schema verbose label')} description={t('schema description')}>
+        <div role='none' className={itemClasses}>
+          {schemas.length === 0 && <div className='text-center plb-4'>{t('no schemas found message')}</div>}
+          {schemas.map((schema) => (
+            <div role='none' key={schema.id}>
+              {schema.typename}
+            </div>
+          ))}
+        </div>
+      </Settings.Section>
+    </Settings.Root>
   );
 };
 

package/src/components/SpacePluginSettings.tsx

@@ -4,55 +4,62 @@
 
 import React from 'react';
 
-import { createIntent } from '@dxos/app-framework';
-import { useIntentDispatcher } from '@dxos/app-framework/react';
+import { useOperationInvoker } from '@dxos/app-framework/ui';
 import { useClient } from '@dxos/react-client';
 import { useSpaces } from '@dxos/react-client/echo';
 import { IconButton, Input, List, ListItem, toLocalizedString, useTranslation } from '@dxos/react-ui';
-import { ControlGroup, ControlItemInput, ControlPage, ControlSection, controlItemClasses } from '@dxos/react-ui-form';
+import { Settings } from '@dxos/react-ui-form';
 
 import { meta } from '../meta';
-import { SpaceAction, type SpaceSettingsProps } from '../types';
+import { SpaceOperation, type SpaceSettingsProps } from '../types';
 import { getSpaceDisplayName } from '../util';
 
-export const SpacePluginSettings = ({ settings }: { settings: SpaceSettingsProps }) => {
+export type SpacePluginSettingsComponentProps = {
+  settings: SpaceSettingsProps;
+  onSettingsChange: (fn: (current: SpaceSettingsProps) => SpaceSettingsProps) => void;
+};
+
+export const SpacePluginSettings = ({ settings, onSettingsChange }: SpacePluginSettingsComponentProps) => {
   const { t } = useTranslation(meta.id);
   const client = useClient();
   const spaces = useSpaces({ all: settings.showHidden });
-  const { dispatchPromise: dispatch } = useIntentDispatcher();
+  const { invokePromise } = useOperationInvoker();
 
   return (
-    <ControlPage>
-      <ControlSection title={t('space settings label')} description={t('space settings description')}>
-        <ControlGroup>
-          <ControlItemInput title={t('show hidden spaces label')}>
+    <Settings.Root>
+      <Settings.Section title={t('space settings label')} description={t('space settings description')}>
+        <Settings.Group>
+          <Settings.ItemInput title={t('show hidden spaces label')}>
             <Input.Switch
               checked={settings.showHidden}
-              onCheckedChange={(checked) => (settings.showHidden = !!checked)}
+              onCheckedChange={(checked) => onSettingsChange((state) => ({ ...state, showHidden: !!checked }))}
             />
-          </ControlItemInput>
-        </ControlGroup>
-        <List classNames={[controlItemClasses, 'flex flex-col gap-trimSm']}>
-          {spaces.map((space) => (
-            <ListItem.Root key={space.id} classNames='is-full items-center'>
-              {/* TODO(burdon): Should auto center and truncate; NOTE truncate doesn't work with flex grow. */}
-              <ListItem.Heading classNames='grow truncate !min-bs-0'>
-                {toLocalizedString(
-                  getSpaceDisplayName(space, {
-                    personal: space === client.spaces.default,
-                  }),
-                  t,
-                )}
-              </ListItem.Heading>
-              <IconButton
-                icon='ph--faders--regular'
-                onClick={() => dispatch(createIntent(SpaceAction.OpenSettings, { space }))}
-                label={t('open space settings label')}
-              />
-            </ListItem.Root>
-          ))}
-        </List>
-      </ControlSection>
-    </ControlPage>
+          </Settings.ItemInput>
+        </Settings.Group>
+
+        <Settings.Container>
+          <List classNames='flex flex-col gap-trimSm'>
+            {spaces.map((space) => (
+              <ListItem.Root key={space.id} classNames='is-full items-center'>
+                {/* TODO(burdon): Should auto center and truncate; NOTE truncate doesn't work with flex grow. */}
+                <ListItem.Heading classNames='grow truncate !min-bs-0'>
+                  {toLocalizedString(
+                    getSpaceDisplayName(space, {
+                      personal: space === client.spaces.default,
+                    }),
+                    t,
+                  )}
+                </ListItem.Heading>
+                <IconButton
+                  icon='ph--faders--regular'
+                  onClick={() => invokePromise(SpaceOperation.OpenSettings, { space })}
+                  label={t('open space settings label')}
+                />
+              </ListItem.Root>
+            ))}
+          </List>
+        </Settings.Container>
+      </Settings.Section>
+    </Settings.Root>
   );
 };

package/src/components/SpacePresence/SpacePresence.stories.tsx

@@ -24,7 +24,7 @@ const viewers = (n: number, currentlyAttended = true): Member[] =>
 
 const meta = {
   title: 'plugins/plugin-space/SpacePresence',
-  decorators: [withTheme],
+  decorators: [withTheme()],
   parameters: {
     translations,
   },

package/src/components/SpacePresence/SpacePresence.tsx

@@ -5,11 +5,12 @@
 import * as Option from 'effect/Option';
 import React, { forwardRef, useCallback, useEffect, useState } from 'react';
 
-import { useAppGraph, useCapability } from '@dxos/app-framework/react';
+import { useAtomCapability } from '@dxos/app-framework/ui';
+import { useAppGraph } from '@dxos/app-toolkit/ui';
 import { generateName } from '@dxos/display-name';
-import { Obj } from '@dxos/echo';
-import { PublicKey, useClient } from '@dxos/react-client';
-import { type SpaceMember, getSpace, useMembers } from '@dxos/react-client/echo';
+import { type Key, Obj } from '@dxos/echo';
+import { PublicKey } from '@dxos/react-client';
+import { type SpaceMember, useMembers, useSpace } from '@dxos/react-client/echo';
 import { type Identity, useIdentity } from '@dxos/react-client/halo';
 import {
   Avatar,
@@ -27,10 +28,9 @@ import {
 import { AttentionGlyph, type AttentionGlyphProps, useAttended, useAttention } from '@dxos/react-ui-attention';
 import { ComplexMap, keyToFallback } from '@dxos/util';
 
-import { SpaceCapabilities } from '../../capabilities';
 import { usePath } from '../../hooks';
 import { meta } from '../../meta';
-import { type ObjectViewerProps } from '../../types';
+import { type ObjectViewerProps, SpaceCapabilities } from '../../types';
 
 // TODO(thure): Get/derive these values from protocol
 const REFRESH_INTERVAL = 5000;
@@ -43,17 +43,16 @@ const noViewers = new ComplexMap<PublicKey, ObjectViewerProps>(PublicKey.hash);
 const getName = (identity: Identity) => identity.profile?.displayName ?? generateName(identity.identityKey.toHex());
 
 export type SpacePresenceProps = {
-  object: Obj.Any;
-  spaceKey?: PublicKey;
+  object: Obj.Unknown;
+  spaceId?: Key.SpaceId;
 };
 
-export const SpacePresence = ({ object, spaceKey }: SpacePresenceProps) => {
-  // TODO(wittjosiah): Doesn't need to be mutable but readonly type messes with ComplexMap.
-  const spaceState = useCapability(SpaceCapabilities.MutableState);
-  const client = useClient();
+export const SpacePresence = ({ object, spaceId }: SpacePresenceProps) => {
+  const ephemeral = useAtomCapability(SpaceCapabilities.EphemeralState);
   const identity = useIdentity();
-  const space = spaceKey ? client.spaces.get(spaceKey) : getSpace(object);
-  const spaceMembers = useMembers(space?.key);
+  const db = Obj.getDatabase(object);
+  const space = useSpace(spaceId ?? db?.spaceId);
+  const spaceMembers = useMembers(spaceId ?? db?.spaceId);
 
   const [_moment, setMoment] = useState(Date.now());
 
@@ -71,11 +70,11 @@ export const SpacePresence = ({ object, spaceKey }: SpacePresenceProps) => {
 
   // TODO(thure): Could it be a smell to return early when there are interactions with `deepSignal` later, since it
   //  prevents reactivity?
-  if (!identity || !spaceState || !space) {
+  if (!identity || !ephemeral || !space) {
     return null;
   }
 
-  const currentObjectViewers = spaceState.viewersByObject[Obj.getDXN(object).toString()] ?? noViewers;
+  const currentObjectViewers = ephemeral.viewersByObject[Obj.getDXN(object).toString()] ?? noViewers;
 
   const membersForObject = spaceMembers
     .filter((member) => memberOnline(member) && memberIsNotSelf(member))

package/src/components/SpaceRenamePopover/SpaceRenamePopover.tsx

@@ -4,10 +4,12 @@
 
 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 { type Space } from '@dxos/client/echo';
+import { Obj } from '@dxos/echo';
 import { Button, Input, Popover, useTranslation } from '@dxos/react-ui';
+import { osTranslations } from '@dxos/ui-theme';
 
 import { meta } from '../../meta';
 
@@ -17,17 +19,14 @@ export const SpaceRenamePopover = ({ space }: { space: Space }) => {
   const { t } = useTranslation(meta.id);
   const doneButton = useRef<HTMLButtonElement>(null);
   const [name, setName] = useState(space.properties.name ?? '');
-  const { dispatchPromise: dispatch } = useIntentDispatcher();
+  const { invokePromise } = useOperationInvoker();
 
   const handleDone = useCallback(() => {
-    space.properties.name = name;
-    void dispatch(
-      createIntent(LayoutAction.UpdatePopover, {
-        part: 'popover',
-        options: { variant: 'react', anchorId: '', state: false },
-      }),
-    );
-  }, [space, name]);
+    Obj.change(space.properties, (p) => {
+      p.name = name;
+    });
+    void invokePromise(LayoutOperation.UpdatePopover, { anchorId: '', state: false });
+  }, [space, name, invokePromise]);
 
   // TODO(thure): Why does the input value need to be uncontrolled to work?
   return (
@@ -47,7 +46,7 @@ export const SpaceRenamePopover = ({ space }: { space: Space }) => {
       </div>
       <Popover.Close asChild>
         <Button ref={doneButton} classNames='self-stretch' onClick={handleDone}>
-          {t('done label', { ns: 'os' })}
+          {t('done label', { ns: osTranslations })}
         </Button>
       </Popover.Close>
     </div>

package/src/components/SpaceSettings/SpaceSettingsContainer.stories.tsx

@@ -5,9 +5,9 @@
 import { type Meta, type StoryObj } from '@storybook/react-vite';
 import React from 'react';
 
-import { IntentPlugin } from '@dxos/app-framework';
+import { OperationPlugin } from '@dxos/app-framework';
 import { withPluginManager } from '@dxos/app-framework/testing';
-import { useClientProvider, withClientProvider } from '@dxos/react-client/testing';
+import { useClientStory, withClientProvider } from '@dxos/react-client/testing';
 import { withTheme } from '@dxos/react-ui/testing';
 
 import { translations } from '../../translations';
@@ -15,7 +15,7 @@ import { translations } from '../../translations';
 import { SpaceSettingsContainer, type SpaceSettingsContainerProps } from './SpaceSettingsContainer';
 
 const Story = (props: Partial<SpaceSettingsContainerProps>) => {
-  const { space } = useClientProvider();
+  const { space } = useClientStory();
   return (
     <div role='none' className='p-2 border border-primary-500 rounded'>
       <SpaceSettingsContainer {...props} space={space!} />
@@ -28,10 +28,10 @@ const meta = {
   component: SpaceSettingsContainer,
   render: Story,
   decorators: [
-    withTheme,
+    withTheme(),
     withClientProvider({ createIdentity: true, createSpace: true }),
     // TODO(wittjosiah): Try to write story which does not depend on plugin manager.
-    withPluginManager({ plugins: [IntentPlugin()] }),
+    withPluginManager({ plugins: [OperationPlugin()] }),
   ],
   parameters: {
     translations,