@dxos/plugin-thread 0.6.11-staging.e6894a4 → 0.6.11

package/dist/types/src/components/Chat.stories.d.ts

@@ -38,7 +38,6 @@ declare const _default: {
                 };
             };
         }[];
-        layout: string;
     };
 };
 export default _default;

package/dist/types/src/components/Chat.stories.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Chat.stories.d.ts","sourceRoot":"","sources":["../../../../src/components/Chat.stories.tsx"],"names":[],"mappings":"AAIA,OAAO,aAAa,CAAC;AAErB,OAAO,KAA8B,MAAM,OAAO,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA4DnD,wBAOE;AAEF,eAAO,MAAM,OAAO,IAAK,CAAC"}
+{"version":3,"file":"Chat.stories.d.ts","sourceRoot":"","sources":["../../../../src/components/Chat.stories.tsx"],"names":[],"mappings":"AAIA,OAAO,aAAa,CAAC;AAErB,OAAO,KAA8B,MAAM,OAAO,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA4DnD,wBAOE;AAEF,eAAO,MAAM,OAAO,IAAK,CAAC"}

package/dist/types/src/components/Comments.stories.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Comments.stories.d.ts","sourceRoot":"","sources":["../../../../src/components/Comments.stories.tsx"],"names":[],"mappings":"AAIA,OAAO,aAAa,CAAC;AAErB,OAAO,KAA8B,MAAM,OAAO,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAmDnD,wBAME;AAEF,eAAO,MAAM,OAAO,IAAK,CAAC"}
+{"version":3,"file":"Comments.stories.d.ts","sourceRoot":"","sources":["../../../../src/components/Comments.stories.tsx"],"names":[],"mappings":"AAIA,OAAO,aAAa,CAAC;AAErB,OAAO,KAA8B,MAAM,OAAO,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA8CnD,wBAME;AAEF,eAAO,MAAM,OAAO,IAAK,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-thread",
-  "version": "0.6.11-staging.e6894a4",
+  "version": "0.6.11",
   "description": "DXOS Threads Surface plugin",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -51,28 +51,28 @@
     "@preact/signals-core": "^1.6.0",
     "date-fns": "^3.3.1",
     "lodash.get": "^4.4.2",
-    "@dxos/async": "0.6.11-staging.e6894a4",
-    "@dxos/display-name": "0.6.11-staging.e6894a4",
-    "@dxos/echo-schema": "0.6.11-staging.e6894a4",
-    "@dxos/invariant": "0.6.11-staging.e6894a4",
-    "@dxos/local-storage": "0.6.11-staging.e6894a4",
-    "@dxos/log": "0.6.11-staging.e6894a4",
-    "@dxos/plugin-attention": "0.6.11-staging.e6894a4",
-    "@dxos/plugin-client": "0.6.11-staging.e6894a4",
-    "@dxos/plugin-graph": "0.6.11-staging.e6894a4",
-    "@dxos/app-framework": "0.6.11-staging.e6894a4",
-    "@dxos/plugin-markdown": "0.6.11-staging.e6894a4",
-    "@dxos/plugin-observability": "0.6.11-staging.e6894a4",
-    "@dxos/plugin-settings": "0.6.11-staging.e6894a4",
-    "@dxos/plugin-space": "0.6.11-staging.e6894a4",
-    "@dxos/react-client": "0.6.11-staging.e6894a4",
-    "@dxos/react-ui-attention": "0.6.11-staging.e6894a4",
-    "@dxos/react-ui-deck": "0.6.11-staging.e6894a4",
-    "@dxos/react-ui-editor": "0.6.11-staging.e6894a4",
-    "@dxos/react-ui-theme": "0.6.11-staging.e6894a4",
-    "@dxos/react-ui-mosaic": "0.6.11-staging.e6894a4",
-    "@dxos/react-ui-thread": "0.6.11-staging.e6894a4",
-    "@dxos/util": "0.6.11-staging.e6894a4"
+    "@dxos/async": "0.6.11",
+    "@dxos/display-name": "0.6.11",
+    "@dxos/app-framework": "0.6.11",
+    "@dxos/echo-schema": "0.6.11",
+    "@dxos/invariant": "0.6.11",
+    "@dxos/local-storage": "0.6.11",
+    "@dxos/log": "0.6.11",
+    "@dxos/plugin-graph": "0.6.11",
+    "@dxos/plugin-markdown": "0.6.11",
+    "@dxos/plugin-attention": "0.6.11",
+    "@dxos/plugin-client": "0.6.11",
+    "@dxos/plugin-observability": "0.6.11",
+    "@dxos/plugin-settings": "0.6.11",
+    "@dxos/plugin-space": "0.6.11",
+    "@dxos/react-client": "0.6.11",
+    "@dxos/react-ui-deck": "0.6.11",
+    "@dxos/react-ui-attention": "0.6.11",
+    "@dxos/react-ui-editor": "0.6.11",
+    "@dxos/react-ui-mosaic": "0.6.11",
+    "@dxos/react-ui-theme": "0.6.11",
+    "@dxos/react-ui-thread": "0.6.11",
+    "@dxos/util": "0.6.11"
   },
   "devDependencies": {
     "@phosphor-icons/react": "^2.1.5",
@@ -82,16 +82,16 @@
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
     "vite": "^5.3.4",
-    "@dxos/react-ui": "0.6.11-staging.e6894a4",
-    "@dxos/random": "0.6.11-staging.e6894a4",
-    "@dxos/storybook-utils": "0.6.11-staging.e6894a4"
+    "@dxos/random": "0.6.11",
+    "@dxos/react-ui": "0.6.11",
+    "@dxos/storybook-utils": "0.6.11"
   },
   "optionalDependencies": {
     "@phosphor-icons/react": "^2.1.5",
     "react": "^18.0.0",
     "react-dom": "^18.0.0",
-    "@dxos/react-ui": "0.6.11-staging.e6894a4",
-    "@dxos/react-ui-theme": "0.6.11-staging.e6894a4"
+    "@dxos/react-ui-theme": "0.6.11",
+    "@dxos/react-ui": "0.6.11"
   },
   "publishConfig": {
     "access": "public"

package/src/ThreadPlugin.tsx

@@ -4,7 +4,7 @@
 
 import { Chat, type IconProps } from '@phosphor-icons/react';
 import { computed, effect } from '@preact/signals-core';
-import React, { useCallback } from 'react';
+import React from 'react';
 
 import {
   type IntentPluginProvides,
@@ -73,6 +73,10 @@ type SubjectId = string;
 const initialViewState = { showResolvedThreads: false };
 type ViewStore = Record<SubjectId, typeof initialViewState>;
 
+// TODO(Zan): More robust runtime check.
+const providesThreadsConfig = (plugin: any): Plugin<ThreadProvides<any>> | undefined =>
+  'thread' in plugin.provides ? (plugin as Plugin<ThreadProvides<any>>) : undefined;
+
 // TODO(Zan): Every instance of `cursor` should be replaced with `anchor`.
 export const ThreadPlugin = (): PluginDefinition<ThreadPluginProvides> => {
   const settings = new LocalStorageStore<ThreadSettingsProps>(THREAD_PLUGIN);
@@ -199,7 +203,6 @@ export const ThreadPlugin = (): PluginDefinition<ThreadPluginProvides> => {
                 const [spaceId, objectId] = docId?.split(':') ?? [];
                 const space = client.spaces.get().find((space) => space.id === spaceId);
                 const doc = space?.db.getObjectById(objectId);
-
                 if (!doc || !docId) {
                   return;
                 }
@@ -225,7 +228,6 @@ export const ThreadPlugin = (): PluginDefinition<ThreadPluginProvides> => {
               },
               actions: ({ node }) => {
                 const dataId = node.id.split('~').at(0);
-
                 if (!node.id.endsWith('~comments') || !dataId) {
                   return;
                 }
@@ -312,14 +314,6 @@ export const ThreadPlugin = (): PluginDefinition<ThreadPluginProvides> => {
             case 'article':
             case 'complementary': {
               const location = navigationPlugin?.provides.location;
-
-              const providesThreadsConfig = useCallback(
-                (plugin: any): Plugin<ThreadProvides<any>> | undefined =>
-                  // TODO(Zan): More robust runtime check.
-                  'thread' in plugin.provides ? (plugin as Plugin<ThreadProvides<any>>) : undefined,
-                [],
-              );
-
               const threadsIntegrators = useResolvePlugins(providesThreadsConfig);
               const threadProvides = threadsIntegrators.map((p) => p.provides.thread);
 
@@ -328,9 +322,7 @@ export const ThreadPlugin = (): PluginDefinition<ThreadPluginProvides> => {
                 // TODO(zan): Maybe we should have utility for positional main object ids.
                 if (isLayoutParts(location?.active) && location.active.main) {
                   const layoutEntries = location.active.main;
-
                   const currentPosition = layoutEntries.findIndex((entry) => channel.id === entry.id);
-
                   if (currentPosition > 0) {
                     const objectToTheLeft = layoutEntries[currentPosition - 1];
                     const context = getSpace(data.object)?.db.getObjectById(objectToTheLeft.id);
@@ -452,7 +444,6 @@ export const ThreadPlugin = (): PluginDefinition<ThreadPluginProvides> => {
 
                 const subjectId = fullyQualifiedId(subject);
                 const thread = create(ThreadType, { name, anchor: cursor, messages: [], status: 'staged' });
-
                 const stagingArea = state.staging[subjectId];
                 if (stagingArea) {
                   stagingArea.push(thread);

package/src/components/Chat.stories.tsx

@@ -15,7 +15,7 @@ import { useIdentity } from '@dxos/react-client/halo';
 import { ClientRepeater } from '@dxos/react-client/testing';
 import { Mosaic } from '@dxos/react-ui-mosaic';
 import { Thread } from '@dxos/react-ui-thread';
-import { withTheme } from '@dxos/storybook-utils';
+import { withLayout, withTheme } from '@dxos/storybook-utils';
 
 import { ChatContainer } from './ChatContainer';
 import { createChatThread } from './testing';
@@ -69,8 +69,8 @@ export default {
   component: Thread,
   // TODO(wittjosiah): Register schemas.
   render: () => <ClientRepeater component={Story} createIdentity createSpace types={[ThreadType]} />,
-  decorators: [withTheme],
-  parameters: { translations, layout: 'fullscreen' },
+  decorators: [withTheme, withLayout({ fullscreen: true })],
+  parameters: { translations },
 };
 
 export const Default = {};

package/src/components/Comments.stories.tsx

@@ -8,12 +8,10 @@ import React, { useEffect, useState } from 'react';
 
 import { MessageType, ThreadType } from '@dxos/plugin-space/types';
 import { faker } from '@dxos/random';
-import { type PublicKey } from '@dxos/react-client';
 import { Filter, useQuery, useSpace } from '@dxos/react-client/echo';
 import { useIdentity } from '@dxos/react-client/halo';
-import { ClientRepeater } from '@dxos/react-client/testing';
-import { Tooltip } from '@dxos/react-ui';
-import { withFullscreen, withTheme } from '@dxos/storybook-utils';
+import { type ClientRepeatedComponentProps, ClientRepeater } from '@dxos/react-client/testing';
+import { withLayout, withTheme } from '@dxos/storybook-utils';
 
 import { CommentsContainer } from './CommentsContainer';
 import { createCommentThread } from './testing';
@@ -21,7 +19,7 @@ import translations from '../translations';
 
 faker.seed(1);
 
-const Story = ({ spaceKey }: { spaceKey: PublicKey }) => {
+const Story = ({ spaceKey }: ClientRepeatedComponentProps) => {
   const identity = useIdentity();
   const space = useSpace(spaceKey);
   const threads = useQuery(space, Filter.schema(ThreadType));
@@ -43,15 +41,12 @@ const Story = ({ spaceKey }: { spaceKey: PublicKey }) => {
     return null;
   }
 
-  // TODO(wittjosiah): Include Tooltip.Provider in `withTheme` decorator?
   return (
-    <Tooltip.Provider>
-      <div className='flex justify-center overflow-y-auto bg-white dark:bg-black'>
-        <div className='flex flex-col w-[400px]'>
-          <CommentsContainer threads={threads} detached={detached} onThreadDelete={console.log} />
-        </div>
+    <div className='flex justify-center overflow-y-auto bg-white dark:bg-black'>
+      <div className='flex flex-col w-[400px]'>
+        <CommentsContainer threads={threads} detached={detached} onThreadDelete={console.log} />
       </div>
-    </Tooltip.Provider>
+    </div>
   );
 };
 
@@ -59,7 +54,7 @@ export default {
   title: 'plugin-thread/Comments',
   // TODO(wittjosiah): Register schemas.
   render: () => <ClientRepeater component={Story} createIdentity createSpace types={[ThreadType, MessageType]} />,
-  decorators: [withTheme, withFullscreen()],
+  decorators: [withTheme, withLayout({ fullscreen: true, tooltips: true })],
   parameters: { translations },
 };