@dxos/plugin-preview 0.8.4-main.70d3990 → 0.8.4-main.74a063c4e0

package/src/cards/OrganizationCard.tsx

@@ -4,31 +4,26 @@
 
 import React from 'react';
 
-import { Card } from '@dxos/react-ui-stack';
+import { type AppSurface } from '@dxos/app-toolkit/ui';
+import { Card } from '@dxos/react-ui';
 import { type Organization } from '@dxos/types';
 
-import { CardHeader, CardLink } from '../components';
-import { type CardPreviewProps } from '../types';
-
-export const OrganizationCard = ({
-  children,
-  subject,
-  role,
-  activeSpace,
-}: CardPreviewProps<Organization.Organization>) => {
+export const OrganizationCard = ({ subject }: AppSurface.ObjectCardProps<Organization.Organization>) => {
   const { name, image, description, website } = subject;
 
   return (
-    <Card.SurfaceRoot id={subject.id} role={role}>
+    <Card.Content>
       <Card.Poster
         alt={name ?? ''}
         {...(image ? { image } : { icon: 'ph--building-office--regular' })}
         classNames={!image && 'opacity-50'}
       />
-      <CardHeader label={name} subject={subject} activeSpace={activeSpace} />
-      {description && <Card.Text classNames='line-clamp-2'>{description}</Card.Text>}
-      {website && <CardLink label={website} href={website} />}
-      {children}
-    </Card.SurfaceRoot>
+      {description && (
+        <Card.Row>
+          <Card.Text variant='description'>{description}</Card.Text>
+        </Card.Row>
+      )}
+      {website && <Card.Link label={website} href={website} />}
+    </Card.Content>
   );
 };

package/src/cards/PersonCard.tsx

@@ -2,62 +2,64 @@
 // Copyright 2025 DXOS.org
 //
 
-import React, { Fragment } from 'react';
+import * as Effect from 'effect/Effect';
+import React, { useCallback } from 'react';
 
-import { Avatar, Icon } from '@dxos/react-ui';
-import { Card, cardHeading, cardText } from '@dxos/react-ui-stack';
-import { mx } from '@dxos/react-ui-theme';
+import { useOperationInvoker } from '@dxos/app-framework/ui';
+import { LayoutOperation, getObjectPathFromObject, getSpacePath } from '@dxos/app-toolkit';
+import { type AppSurface } from '@dxos/app-toolkit/ui';
+import { Obj } from '@dxos/echo';
+import { runAndForwardErrors } from '@dxos/effect';
+import { Avatar } from '@dxos/react-ui';
+import { Card } from '@dxos/react-ui';
 import { type Person } from '@dxos/types';
 
-import { CardRow, CardSubjectMenu, gridRow } from '../components';
-import { type CardPreviewProps } from '../types';
+export const PersonCard = ({ subject }: AppSurface.ObjectCardProps<Person.Person>) => {
+  const { invoke } = useOperationInvoker();
+  const { image, organization: { target: organization } = {}, emails = [] } = subject;
 
-export const PersonCard = ({ children, role, subject, activeSpace, onSelect }: CardPreviewProps<Person.Person>) => {
-  const { fullName, image, organization: { target: organization } = {}, emails = [] } = subject;
+  const handleOrganizationClick = useCallback(() => {
+    if (!organization) {
+      return;
+    }
+
+    return Effect.gen(function* () {
+      const organizationPath = getObjectPathFromObject(organization);
+      const db = Obj.getDatabase(organization);
+      yield* invoke(LayoutOperation.UpdatePopover, { state: false, anchorId: '' });
+      yield* invoke(LayoutOperation.Open, {
+        subject: [organizationPath],
+        workspace: db ? getSpacePath(db.spaceId) : undefined,
+      });
+    }).pipe(runAndForwardErrors);
+  }, [invoke, organization]);
 
   return (
-    <Card.SurfaceRoot id={subject.id} role={role}>
+    <Card.Content>
       <Avatar.Root>
-        <Card.Text role='group' classNames={mx('grid gap-2 grid-cols-[1fr_min-content]')}>
-          <div role='none' className={mx(gridRow, 'grid-rows-2')}>
-            {activeSpace ? <CardSubjectMenu subject={subject} activeSpace={activeSpace} /> : <div />}
-            <Avatar.Label asChild>
-              <h2 className={mx(cardHeading, 'grow truncate')}>{fullName}</h2>
-            </Avatar.Label>
-          </div>
-          <Avatar.Content
-            imgSrc={image}
-            icon='ph--user--regular'
-            size={16}
-            classNames={['text-subdued', !image && 'opacity-50']}
-            hue='neutral'
-            variant='square'
-          />
-        </Card.Text>
+        {image && (
+          <Card.Row className='py-1'>
+            <Avatar.Content
+              imgSrc={image}
+              icon='ph--user--regular'
+              size={20}
+              classNames={!image && 'opacity-50'}
+              hue='neutral'
+              variant='square'
+            />
+          </Card.Row>
+        )}
+        {organization?.name && (
+          <Card.Action icon='ph--buildings--regular' label={organization.name} onClick={handleOrganizationClick} />
+        )}
+        {emails.map(({ value }) => (
+          <Card.Row key={value} icon='ph--at--regular'>
+            <Card.Text truncate className='text-primary-text'>
+              {value}
+            </Card.Text>
+          </Card.Row>
+        ))}
       </Avatar.Root>
-      {organization?.name && (
-        <CardRow
-          icon='ph--buildings--regular'
-          label={organization.name}
-          onClick={onSelect ? () => onSelect(organization) : undefined}
-        />
-      )}
-      {emails.length > 0 && (
-        <dl className={mx(cardText, gridRow, '[&_dt]:text-subdued [&_dt]:pbs-0.5 [&_dd]:min-is-0')}>
-          {emails.map(({ label, value }) => (
-            <Fragment key={value}>
-              <dt>
-                <span className='sr-only'>{label}</span>
-                <Icon icon='ph--at--regular' size={5} />
-              </dt>
-              <dd key={value} className='col-span-2 break-words'>
-                {value}
-              </dd>
-            </Fragment>
-          ))}
-        </dl>
-      )}
-      {children}
-    </Card.SurfaceRoot>
+    </Card.Content>
   );
 };

package/src/cards/ProjectCard.tsx

@@ -4,21 +4,19 @@
 
 import React from 'react';
 
+import { type AppSurface } from '@dxos/app-toolkit/ui';
 import { Obj } from '@dxos/echo';
-import { Card } from '@dxos/react-ui-stack';
-import { type Project } from '@dxos/types';
+import { Card } from '@dxos/react-ui';
+import { type Pipeline } from '@dxos/types';
 
-import { CardHeader } from '../components';
-import { type CardPreviewProps } from '../types';
-
-export const ProjectCard = ({ subject, role, activeSpace }: CardPreviewProps<Project.Project>) => {
-  const { name, image, description } = subject;
+export const ProjectCard = ({ subject }: AppSurface.ObjectCardProps<Pipeline.Pipeline>) => {
+  const { image, description } = subject;
 
   return (
-    <Card.SurfaceRoot id={subject.id} role={role}>
+    <Card.Content>
       {image && <Card.Poster image={image} alt={Obj.getLabel(subject) ?? ''} aspect='auto' />}
-      <CardHeader label={name} subject={subject} activeSpace={activeSpace} />
-      {description && <Card.Text classNames='line-clamp-2'>{description}</Card.Text>}
-    </Card.SurfaceRoot>
+      {/* <CardHeader label={name} subject={subject} db={db} /> */}
+      {description && <Card.Text variant='description'>{description}</Card.Text>}
+    </Card.Content>
   );
 };

package/src/cards/TaskCard.tsx

@@ -5,42 +5,40 @@
 import * as SchemaAST from 'effect/SchemaAST';
 import React from 'react';
 
+import { type AppSurface } from '@dxos/app-toolkit/ui';
 import { type PropertyMetaAnnotation, PropertyMetaAnnotationId } from '@dxos/echo/internal';
-import { Card, cardNoSpacing, cardSpacing } from '@dxos/react-ui-stack';
-import { mx } from '@dxos/react-ui-theme';
+import { Card } from '@dxos/react-ui';
 import { Task } from '@dxos/types';
 
-import { CardSubjectMenu } from '../components';
-import { type CardPreviewProps } from '../types';
+export const TaskCard = ({ subject }: AppSurface.ObjectCardProps<Task.Task>) => {
+  const { title, status } = subject;
+  const statusOption = getActiveStatusOption(status);
+
+  return (
+    <Card.Content>
+      <Card.Row>
+        {statusOption && (
+          <div>
+            <span className='dx-tag' data-hue={statusOption.color}>
+              {statusOption.title}
+            </span>
+          </div>
+        )}
+      </Card.Row>
+    </Card.Content>
+  );
+};
 
 // TODO(thure): Should this move upstream as a helper? Is there an easier way to get options?
 const getActiveStatusOption = (status?: string) => {
   const properties = SchemaAST.getPropertySignatures(Task.Task.ast);
   const statusProperty = properties.find((p) => p.name === 'status');
+  // TODO(thure): Typescript asserts `.type` doesn’t have `.types`, but in runtime it does.
   const statusMeta = SchemaAST.getAnnotation<PropertyMetaAnnotation>(PropertyMetaAnnotationId)(
-    // TODO(thure): Typescript asserts `.type` doesn’t have `.types`, but in runtime it does.
     (statusProperty!.type as any).types[0],
   );
-  const options = // TODO(thure): Typescript asserts `statusMeta` doesn’t have `.value`, but in runtime it does.
-    (statusMeta as any).value.singleSelect.options as { id: string; title: string; color: string }[];
-  return options.find(({ id }) => id === status);
-};
 
-export const TaskCard = ({ subject, role, activeSpace }: CardPreviewProps<Task.Task>) => {
-  const { title, status } = subject;
-  const statusOption = getActiveStatusOption(status);
-
-  return (
-    <Card.SurfaceRoot id={subject.id} role={role}>
-      <div role='none' className={mx('flex items-center gap-2', cardSpacing)}>
-        <Card.Heading classNames={[cardNoSpacing, 'min-is-0 flex-1 truncate']}>{title}</Card.Heading>
-        {statusOption && (
-          <span className='dx-tag' data-hue={statusOption.color}>
-            {statusOption.title}
-          </span>
-        )}
-        <CardSubjectMenu subject={subject} activeSpace={activeSpace} />
-      </div>
-    </Card.SurfaceRoot>
-  );
+  // TODO(thure): Typescript asserts `statusMeta` doesn’t have `.value`, but in runtime it does.
+  const options = (statusMeta as any).value.singleSelect.options as { id: string; title: string; color: string }[];
+  return options.find(({ id }) => id === status);
 };

package/src/cards/index.ts

@@ -2,6 +2,8 @@
 // Copyright 2025 DXOS.org
 //
 
+export * from './FormCard';
+export * from './JsonCard';
 export * from './OrganizationCard';
 export * from './PersonCard';
 export * from './ProjectCard';

package/src/index.ts

@@ -3,6 +3,5 @@
 //
 
 export * from './meta';
-export type * from './types';
 
 export * from './PreviewPlugin';

package/src/meta.ts

@@ -2,11 +2,11 @@
 // Copyright 2023 DXOS.org
 //
 
-import { type PluginMeta } from '@dxos/app-framework';
+import { type Plugin } from '@dxos/app-framework';
 import { trim } from '@dxos/util';
 
-export const meta: PluginMeta = {
-  id: 'dxos.org/plugin/preview',
+export const meta: Plugin.Meta = {
+  id: 'org.dxos.plugin.preview',
   name: 'Preview',
   description: trim`
     Rich preview panel for viewing object content without opening full editors.

package/src/stories/Card.stories.tsx

@@ -3,60 +3,105 @@
 //
 
 import { type Meta, type StoryObj } from '@storybook/react-vite';
+import React from 'react';
 
-import { IntentPlugin } from '@dxos/app-framework';
 import { withPluginManager } from '@dxos/app-framework/testing';
-import { faker } from '@dxos/random';
-import { withTheme } from '@dxos/react-ui/testing';
+import { corePlugins } from '@dxos/plugin-testing';
+import { random } from '@dxos/random';
+import { Card } from '@dxos/react-ui';
+import { withLayout } from '@dxos/react-ui/testing';
+import { type Organization, type Person, type Pipeline, type Task } from '@dxos/types';
 
+import { FormCard, JsonCard, OrganizationCard, PersonCard, ProjectCard, TaskCard } from '../cards';
 import { translations } from '../translations';
+import { DefaultStory, createOrganization, createPerson, createProject, createTask } from './testing';
 
-import { Defaultstory, createCards } from './testing';
-
-faker.seed(999);
+random.seed(999);
 
 const meta = {
-  title: 'plugins/plugin-preview/Card',
-  render: Defaultstory,
+  title: 'plugins/plugin-preview/cards/Card',
+  render: DefaultStory,
   decorators: [
-    withTheme,
+    withLayout({ layout: 'fullscreen' }),
     // TODO(wittjosiah): Try to write story which does not depend on plugin manager.
-    withPluginManager({ plugins: [IntentPlugin()] }),
+    withPluginManager({ plugins: corePlugins() }),
   ],
   parameters: {
+    layout: 'fullscreen',
     translations,
   },
   tags: ['cards'],
-} satisfies Meta<typeof Defaultstory>;
+} satisfies Meta<typeof DefaultStory>;
 
 export default meta;
 
-type Story = StoryObj<typeof meta>;
+export const _Form: StoryObj<typeof DefaultStory<Person.Person>> = {
+  args: {
+    Component: FormCard,
+    createObject: createPerson,
+    image: true,
+  },
+};
 
-export const Popover: Story = {
+export const _Person: StoryObj<typeof DefaultStory<Person.Person>> = {
   args: {
-    role: 'card--popover',
-    cards: createCards(),
+    Component: PersonCard,
+    createObject: createPerson,
+    image: true,
   },
 };
 
-export const Intrinsic: Story = {
+export const _Organization: StoryObj<typeof DefaultStory<Organization.Organization>> = {
   args: {
-    role: 'card--intrinsic',
-    cards: createCards(),
+    Component: OrganizationCard,
+    createObject: createOrganization,
+    image: true,
   },
 };
 
-export const Extrinsic: Story = {
+export const _Project: StoryObj<typeof DefaultStory<Pipeline.Pipeline>> = {
   args: {
-    role: 'card--extrinsic',
-    cards: createCards(),
+    Component: ProjectCard,
+    createObject: createProject,
+    image: true,
   },
 };
 
-export const ExtrinsicNoImage: Story = {
+export const _Task: StoryObj<typeof DefaultStory<Task.Task>> = {
   args: {
-    role: 'card--extrinsic',
-    cards: createCards(false),
+    Component: TaskCard,
+    createObject: createTask,
+    image: true,
+  },
+};
+
+export const _Json = {
+  render: () => {
+    const data = {
+      subject: {
+        id: random.string.uuid(),
+        name: random.person.fullName(),
+        email: random.internet.email(),
+        tags: [random.lorem.word(), random.lorem.word(), random.lorem.word()],
+        nested: {
+          count: random.number.int({ max: 100 }),
+          active: random.datatype.boolean(),
+        },
+      },
+    };
+
+    return (
+      <div className='flex justify-center p-16'>
+        <div className='dx-card-min-width dx-card-max-width'>
+          <Card.Root>
+            <Card.Toolbar>
+              <Card.IconBlock />
+              <Card.Title>JSON</Card.Title>
+            </Card.Toolbar>
+            <JsonCard data={data} />
+          </Card.Root>
+        </div>
+      </div>
+    );
   },
 };

package/src/stories/testing.tsx

@@ -2,113 +2,90 @@
 // Copyright 2025 DXOS.org
 //
 
-import React, { type FC } from 'react';
+import React, { type FC, useMemo } from 'react';
 
+import { type AppSurface } from '@dxos/app-toolkit/ui';
 import { Obj, Ref } from '@dxos/echo';
-import { faker } from '@dxos/random';
-import { CardContainer } from '@dxos/react-ui-stack/testing';
-import { Organization, Person, Task } from '@dxos/types';
-import { Project } from '@dxos/types';
+import { random } from '@dxos/random';
+import { Card } from '@dxos/react-ui';
+import { CardContainer, type CardContainerProps } from '@dxos/react-ui-mosaic/testing';
+import { Organization, Person, Pipeline, Task } from '@dxos/types';
 
-import { OrganizationCard, PersonCard, ProjectCard, TaskCard } from '../cards';
-import { type CardPreviewProps } from '../types';
-
-type CardProps<T extends Obj.Any> = {
-  Component: FC<CardPreviewProps<T>>;
-  subject: T;
-  icon?: string;
+export type DefaultStoryProps<T extends Obj.Any> = {
+  Component: FC<AppSurface.ObjectCardProps<T>>;
+  createObject: () => T;
   image?: boolean;
 };
 
-export type DefaultstoryProps = {
-  role: 'card--popover' | 'card--intrinsic' | 'card--extrinsic' | 'card--transclusion';
-  cards: CardProps<any>[];
-};
+export const DefaultStory = <T extends Obj.Any>({ Component, createObject, image }: DefaultStoryProps<T>) => {
+  const object = useMemo(() => createObject(), [createObject]);
+  const roles: CardContainerProps['role'][] = ['intrinsic', 'popover'];
 
-export const Defaultstory = ({ role, cards }: DefaultstoryProps) => {
   return (
-    <div className='flex bs-full'>
-      <div className='flex shrink-0 gap-8 overflow-x-auto pbe-4'>
-        {cards.map(({ Component, icon, image, subject }, i) => (
-          <div key={i} className='flex is-[24rem] justify-center'>
-            <CardContainer icon={icon} role={role}>
-              <Component role={role} subject={image ? subject : omitImage(subject)} />
+    <div className='h-full w-full grid grid-cols-2 py-16 gap-8'>
+      {roles.map((role, i) => (
+        <div key={i} className='flex h-full justify-center overflow-hidden'>
+          <div className='flex flex-col gap-4 w-full items-center'>
+            <span className='text-sm text-description'>{role}</span>
+            <CardContainer role={role}>
+              <Card.Root border={false}>
+                <Card.Toolbar>
+                  <Card.DragHandle />
+                  <Card.Title>{Obj.getLabel(object)}</Card.Title>
+                  <Card.Menu />
+                </Card.Toolbar>
+                <Component role={role ?? 'card--content'} subject={image ? object : omitImage(object)} />
+              </Card.Root>
             </CardContainer>
           </div>
-        ))}
-      </div>
+        </div>
+      ))}
     </div>
   );
 };
 
 export const omitImage = ({ image: _, ...rest }: any) => rest;
 
-// TODO(burdon): Test data should exercise the standard data generators.
-export const createCards = (image = true): CardProps<any>[] => {
-  const organization = Obj.make(Organization.Organization, {
-    name: faker.company.name(),
+/**
+ * Factory functions for creating test objects at render time.
+ */
+export const createOrganization = (): Organization.Organization => {
+  return Obj.make(Organization.Organization, {
+    name: random.company.name(),
     image:
       'https://plus.unsplash.com/premium_photo-1672116452571-896980a801c8?q=80&w=2671&auto=format&fit=crop&ixlib=rb-4.0.3&ixid=M3wxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8fA%3D%3D',
-    website: faker.internet.url(),
-    description: faker.lorem.paragraph(),
+    website: random.internet.url(),
+    description: random.lorem.paragraph(),
   });
+};
 
-  const contact = Obj.make(Person.Person, {
-    fullName: faker.person.fullName(),
+export const createPerson = (): Person.Person => {
+  const organization = createOrganization();
+  return Obj.make(Person.Person, {
+    fullName: random.person.fullName(),
     image:
       'https://plus.unsplash.com/premium_photo-1664536392779-049ba8fde933?q=80&w=2574&auto=format&fit=crop&ixlib=rb-4.0.3&ixid=M3wxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8fA%3D%3D',
     organization: Ref.make(organization),
     emails: [
-      {
-        label: 'Work',
-        value: faker.internet.email(),
-      },
-      {
-        label: 'Work',
-        value: faker.internet.email(),
-      },
-      {
-        label: 'Work',
-        value: faker.internet.email(),
-      },
+      { label: 'Work', value: random.internet.email() },
+      { label: 'Work', value: random.internet.email() },
+      { label: 'Work', value: random.internet.email() },
     ],
   });
+};
 
-  const project = Project.make({
-    name: faker.person.fullName(),
+export const createProject = (): Pipeline.Pipeline => {
+  return Obj.make(Pipeline.Pipeline, {
+    name: random.person.fullName(),
     image: 'https://dxos.network/dxos-logotype-blue.png',
-    description: faker.lorem.paragraph(),
+    description: random.lorem.paragraph(),
+    columns: [],
   });
+};
 
-  const task = Obj.make(Task.Task, {
-    title: faker.lorem.sentence(),
-    status: faker.helpers.arrayElement(['todo', 'in-progress', 'done']),
+export const createTask = (): Task.Task => {
+  return Obj.make(Task.Task, {
+    title: random.lorem.sentence(),
+    status: random.helpers.arrayElement(['todo', 'in-progress', 'done'] as const),
   });
-
-  return [
-    {
-      Component: OrganizationCard,
-      subject: organization,
-      icon: 'ph--building-office--regular',
-      image,
-    },
-    {
-      Component: PersonCard,
-      subject: contact,
-      icon: 'ph--user--regular',
-      image,
-    },
-    {
-      Component: ProjectCard,
-      subject: project,
-      icon: 'ph--building--regular',
-      image,
-    },
-    {
-      Component: TaskCard,
-      subject: task,
-      icon: 'ph--list-checks--regular',
-      image,
-    },
-  ];
 };

package/src/translations.ts

@@ -4,19 +4,19 @@
 
 import { type Resource } from '@dxos/react-ui';
 
-import { meta } from './meta';
+import { meta } from '#meta';
 
 export const translations = [
   {
     'en-US': {
       [meta.id]: {
-        'unable to create preview message': 'No preview',
-        'todo label': 'To do',
-        'in-progress label': 'In progress',
-        'done label': 'Done',
-        'open object label': 'Open',
-        'add object to space label': 'Add to space',
-        'more options label': 'More options',
+        'unable-to-create-preview.message': 'No preview',
+        'todo.label': 'To do',
+        'in-progress.label': 'In progress',
+        'done.label': 'Done',
+        'open-object.label': 'Open',
+        'add-object-to-space.label': 'Add to space',
+        'more-options.label': 'More options',
       },
     },
   },

package/dist/lib/browser/chunk-CEWM5LJG.mjs

@@ -1,17 +0,0 @@
-// src/meta.ts
-import { trim } from "@dxos/util";
-var meta = {
-  id: "dxos.org/plugin/preview",
-  name: "Preview",
-  description: trim`
-    Rich preview panel for viewing object content without opening full editors.
-    Quick peek at documents, images, and data with inline rendering.
-  `,
-  icon: "ph--eye--regular",
-  source: "https://github.com/dxos/dxos/tree/main/packages/plugins/plugin-preview"
-};
-
-export {
-  meta
-};
-//# sourceMappingURL=chunk-CEWM5LJG.mjs.map

package/dist/lib/browser/chunk-CEWM5LJG.mjs.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../../src/meta.ts"],
-  "sourcesContent": ["//\n// Copyright 2023 DXOS.org\n//\n\nimport { type PluginMeta } from '@dxos/app-framework';\nimport { trim } from '@dxos/util';\n\nexport const meta: PluginMeta = {\n  id: 'dxos.org/plugin/preview',\n  name: 'Preview',\n  description: trim`\n    Rich preview panel for viewing object content without opening full editors.\n    Quick peek at documents, images, and data with inline rendering.\n  `,\n  icon: 'ph--eye--regular',\n  source: 'https://github.com/dxos/dxos/tree/main/packages/plugins/plugin-preview',\n};\n"],
-  "mappings": ";AAKA,SAASA,YAAY;AAEd,IAAMC,OAAmB;EAC9BC,IAAI;EACJC,MAAM;EACNC,aAAaC;;;;EAIbC,MAAM;EACNC,QAAQ;AACV;",
-  "names": ["trim", "meta", "id", "name", "description", "trim", "icon", "source"]
-}