@dxos/plugin-thread 0.6.12-main.5cc132e → 0.6.12-main.7907542

package/dist/lib/node-esm/index.mjs

@@ -1,6 +1,7 @@
+import { createRequire } from 'node:module';const require = createRequire(import.meta.url);
 import {
   ThreadAction
-} from "./chunk-U5UVX4ZP.mjs";
+} from "./chunk-YO46JGAE.mjs";
 import {
   ChatContainer,
   ChatHeading,
@@ -10,29 +11,27 @@ import {
   useAnalyticsCallback,
   useOnEditAnalytics,
   useStatus
-} from "./chunk-AVC4CGJM.mjs";
+} from "./chunk-A44C4MTQ.mjs";
 import {
   THREAD_ITEM,
   THREAD_PLUGIN,
   meta_default
-} from "./chunk-5IBJO53M.mjs";
+} from "./chunk-Y475KZTX.mjs";
 
 // packages/plugins/plugin-thread/src/ThreadPlugin.tsx
-import { Chat } from "@phosphor-icons/react";
 import { computed, effect } from "@preact/signals-core";
 import React6 from "react";
-import { LayoutAction as LayoutAction2, NavigationAction, parseIntentPlugin, parseNavigationPlugin, resolvePlugin, parseGraphPlugin, SLUG_PATH_SEPARATOR, SLUG_COLLECTION_INDICATOR, isLayoutParts, parseMetadataResolverPlugin } from "@dxos/app-framework";
+import { LayoutAction as LayoutAction2, NavigationAction, parseIntentPlugin, parseNavigationPlugin, resolvePlugin, isLayoutParts, parseMetadataResolverPlugin } from "@dxos/app-framework";
 import { getTypename } from "@dxos/echo-schema";
 import { create as create2 } from "@dxos/echo-schema";
 import { LocalStorageStore } from "@dxos/local-storage";
 import { log } from "@dxos/log";
-import { parseAttentionPlugin } from "@dxos/plugin-attention";
 import { parseClientPlugin } from "@dxos/plugin-client";
-import { createExtension, isActionGroup } from "@dxos/plugin-graph";
+import { createExtension, isActionGroup, toSignal } from "@dxos/plugin-graph";
 import { ObservabilityAction } from "@dxos/plugin-observability/meta";
 import { SpaceAction } from "@dxos/plugin-space";
 import { ThreadType, MessageType as MessageType2, ChannelType } from "@dxos/plugin-space/types";
-import { getSpace as getSpace2, getTextInRange, Filter, createDocAccessor, fullyQualifiedId as fullyQualifiedId4, loadObjectReferences } from "@dxos/react-client/echo";
+import { getSpace as getSpace2, getTextInRange, createDocAccessor, fullyQualifiedId as fullyQualifiedId4, loadObjectReferences } from "@dxos/react-client/echo";
 import { comments, createExternalCommentSync, listener as listener2 } from "@dxos/react-ui-editor";
 import { translations as threadTranslations } from "@dxos/react-ui-thread";
 import { nonNullable as nonNullable3 } from "@dxos/util";
@@ -56,7 +55,7 @@ var ThreadSettings = ({ settings }) => {
 
 // packages/plugins/plugin-thread/src/components/CommentContainer.tsx
 import { CheckCircle, X } from "@phosphor-icons/react";
-import React2, { useCallback, useEffect, useMemo, useRef, useState } from "react";
+import React2, { useCallback, useMemo, useRef, useState } from "react";
 import { create } from "@dxos/echo-schema";
 import { MessageType } from "@dxos/plugin-space/types";
 import { fullyQualifiedId, getSpace, useMembers } from "@dxos/react-client/echo";
@@ -112,14 +111,13 @@ var DeleteThreadButton = ({ onDelete }) => {
     classNames: "z-[21]"
   }, label, /* @__PURE__ */ React2.createElement(Tooltip.Arrow, null))));
 };
-var CommentContainer = ({ thread, detached, context, current, autoFocusTextbox, onAttend, onThreadDelete, onMessageDelete, onResolve, onComment }) => {
+var CommentContainer = ({ thread, detached, context, current, onAttend, onThreadDelete, onMessageDelete, onResolve, onComment }) => {
   const identity = useIdentity();
   const space = getSpace(thread);
   const members = useMembers(space?.key);
   const activity = useStatus(space, fullyQualifiedId(thread));
   const { t } = useTranslation2(THREAD_PLUGIN);
   const threadScrollRef = useRef(null);
-  const [autoFocus, setAutoFocus] = useState(!!autoFocusTextbox);
   const { themeMode } = useThemeContext();
   const textboxMetadata = getMessageMetadata(fullyQualifiedId(thread), identity);
   const [_count, _setCount] = useState(0);
@@ -139,11 +137,6 @@ var CommentContainer = ({ thread, detached, context, current, autoFocusTextbox,
   ], [
     _count
   ]);
-  useEffect(() => {
-    setAutoFocus(!!autoFocusTextbox);
-  }, [
-    autoFocusTextbox
-  ]);
   const scrollToEnd = (behavior) => setTimeout(() => threadScrollRef.current?.scrollIntoView({
     behavior,
     block: "end"
@@ -162,7 +155,6 @@ var CommentContainer = ({ thread, detached, context, current, autoFocusTextbox,
     }));
     onComment?.(thread);
     messageRef.current = "";
-    setAutoFocus(true);
     scrollToEnd("instant");
     rerenderEditor();
     return true;
@@ -201,7 +193,6 @@ var CommentContainer = ({ thread, detached, context, current, autoFocusTextbox,
     onDelete: (id) => onMessageDelete?.(id)
   })), /* @__PURE__ */ React2.createElement(MessageTextbox, {
     extensions,
-    autoFocus,
     onSend: handleCreate,
     ...textboxMetadata
   }), /* @__PURE__ */ React2.createElement(ThreadFooter, {
@@ -214,27 +205,15 @@ var CommentContainer = ({ thread, detached, context, current, autoFocusTextbox,
 };
 
 // packages/plugins/plugin-thread/src/components/CommentsContainer.tsx
-import { ChatText, Quotes } from "@phosphor-icons/react";
-import React3, { useEffect as useEffect2 } from "react";
+import { ChatText } from "@phosphor-icons/react";
+import React3, { useEffect } from "react";
 import { fullyQualifiedId as fullyQualifiedId2 } from "@dxos/react-client/echo";
 import { useTranslation as useTranslation3, Trans } from "@dxos/react-ui";
-import { PlankHeading, plankHeadingIconProps } from "@dxos/react-ui-deck";
 import { descriptionText, mx as mx2 } from "@dxos/react-ui-theme";
-var CommentsHeading = ({ attendableId }) => {
-  const { t } = useTranslation3(THREAD_PLUGIN);
-  return /* @__PURE__ */ React3.createElement("div", {
-    role: "none",
-    className: "flex items-center"
-  }, /* @__PURE__ */ React3.createElement(PlankHeading.Button, {
-    attendableId
-  }, /* @__PURE__ */ React3.createElement(Quotes, plankHeadingIconProps)), /* @__PURE__ */ React3.createElement(PlankHeading.Label, {
-    attendableId
-  }, t("comments heading")));
-};
-var CommentsContainer = ({ threads, detached = [], currentId, autoFocusCurrentTextbox, showResolvedThreads, onThreadAttend, onThreadDelete, onMessageDelete, onThreadToggleResolved, ...props }) => {
+var CommentsContainer = ({ threads, detached = [], currentId, showResolvedThreads, onThreadAttend, onThreadDelete, onMessageDelete, onThreadToggleResolved, ...props }) => {
   const { t } = useTranslation3(THREAD_PLUGIN);
   const filteredThreads = showResolvedThreads ? threads : threads.filter((thread) => !(thread?.status === "resolved"));
-  useEffect2(() => {
+  useEffect(() => {
     if (currentId) {
       document.getElementById(currentId)?.scrollIntoView({
         behavior: "smooth",
@@ -251,7 +230,6 @@ var CommentsContainer = ({ threads, detached = [], currentId, autoFocusCurrentTe
       thread,
       current: currentId === threadId,
       detached: detached.includes(threadId),
-      autoFocusTextbox: autoFocusCurrentTextbox && currentId === threadId,
       ...onThreadAttend && {
         onAttend: () => onThreadAttend(thread)
       },
@@ -283,18 +261,18 @@ var CommentsContainer = ({ threads, detached = [], currentId, autoFocusCurrentTe
 };
 
 // packages/plugins/plugin-thread/src/components/index.ts
-var ThreadMain = React4.lazy(() => import("./ThreadMain-DU6LBSN3.mjs"));
-var ThreadArticle = React4.lazy(() => import("./ThreadArticle-6L6BGE4Z.mjs"));
+var ThreadMain = React4.lazy(() => import("./ThreadMain-2A3VQLCW.mjs"));
+var ThreadArticle = React4.lazy(() => import("./ThreadArticle-NKI5F4W5.mjs"));
 
 // packages/plugins/plugin-thread/src/components/ThreadComplementary.tsx
-import React5, { useEffect as useEffect3, useMemo as useMemo2 } from "react";
+import React5, { useEffect as useEffect2, useMemo as useMemo2 } from "react";
 import { LayoutAction, useIntentDispatcher, useResolvePlugins } from "@dxos/app-framework";
 import { fullyQualifiedId as fullyQualifiedId3 } from "@dxos/react-client/echo";
 import { ScrollArea } from "@dxos/react-ui";
-import { createAttendableAttributes, useAttentionContext } from "@dxos/react-ui-attention";
+import { useAttended } from "@dxos/react-ui-attention";
 import { nonNullable as nonNullable2 } from "@dxos/util";
 var providesThreadsConfig = (plugin) => "thread" in plugin.provides ? plugin : void 0;
-var ThreadComplementary = ({ role, subject, stagedThreads, current, focus, showResolvedThreads }) => {
+var ThreadComplementary = ({ role, subject, stagedThreads, current, showResolvedThreads }) => {
   const dispatch = useIntentDispatcher();
   const threadsIntegrators = useResolvePlugins(providesThreadsConfig);
   const threadProvides = useMemo2(() => threadsIntegrators.map((p) => p.provides.thread), [
@@ -319,7 +297,7 @@ var ThreadComplementary = ({ role, subject, stagedThreads, current, focus, showR
   }, [
     threads
   ]);
-  useEffect3(() => {
+  useEffect2(() => {
     if (!sort) {
       return;
     }
@@ -328,22 +306,17 @@ var ThreadComplementary = ({ role, subject, stagedThreads, current, focus, showR
     sort,
     threads
   ]);
-  const { attended } = useAttentionContext("Thread Complementary");
+  const attended = useAttended();
   const qualifiedSubjectId = fullyQualifiedId3(subject);
-  const attendableAttrs = createAttendableAttributes(qualifiedSubjectId);
   return /* @__PURE__ */ React5.createElement("div", {
     role: "none",
-    className: "contents group/attention",
-    ...attendableAttrs
-  }, role === "complementary" && /* @__PURE__ */ React5.createElement(CommentsHeading, {
-    attendableId: qualifiedSubjectId
-  }), /* @__PURE__ */ React5.createElement(ScrollArea.Root, {
+    className: "contents"
+  }, /* @__PURE__ */ React5.createElement(ScrollArea.Root, {
     classNames: "row-span-2"
   }, /* @__PURE__ */ React5.createElement(ScrollArea.Viewport, null, /* @__PURE__ */ React5.createElement(CommentsContainer, {
     threads,
     detached: detachedIds,
-    currentId: attended.has(qualifiedSubjectId) ? current : void 0,
-    autoFocusCurrentTextbox: focus,
+    currentId: attended.includes(qualifiedSubjectId) ? current : void 0,
     showResolvedThreads,
     onThreadAttend: (thread) => {
       const threadId = fullyQualifiedId3(thread);
@@ -457,7 +430,6 @@ var ThreadPlugin = () => {
     }
     return viewStore[subjectId];
   };
-  let attentionPlugin;
   let navigationPlugin;
   let intentPlugin;
   const unsubscribeCallbacks = [];
@@ -470,38 +442,8 @@ var ThreadPlugin = () => {
           allowUndefined: true
         })
       });
-      attentionPlugin = resolvePlugin(plugins, parseAttentionPlugin);
       navigationPlugin = resolvePlugin(plugins, parseNavigationPlugin);
       intentPlugin = resolvePlugin(plugins, parseIntentPlugin);
-      const graphPlugin = resolvePlugin(plugins, parseGraphPlugin);
-      const client = resolvePlugin(plugins, parseClientPlugin)?.provides.client;
-      if (!client) {
-        return;
-      }
-      const channelsQuery = client.spaces.query(Filter.schema(ChannelType));
-      const queryUnsubscribe = channelsQuery.subscribe();
-      const unsubscribe = effect(() => {
-        const attention = attentionPlugin?.provides.attention;
-        if (!attention?.attended) {
-          return;
-        }
-        const firstAttendedNodeWithComments = Array.from(attention.attended).map((id) => graphPlugin?.provides.graph.findNode(id)).find((node) => {
-          const data = node?.data;
-          return Array.isArray(data?.threads) && data.threads.length > 0;
-        });
-        if (firstAttendedNodeWithComments) {
-          void intentPlugin?.provides.intent.dispatch({
-            action: NavigationAction.OPEN,
-            data: {
-              activeParts: {
-                complementary: `${firstAttendedNodeWithComments.id}${SLUG_PATH_SEPARATOR}comments`
-              }
-            }
-          });
-        }
-      });
-      unsubscribeCallbacks.push(queryUnsubscribe);
-      unsubscribeCallbacks.push(unsubscribe);
     },
     unload: async () => {
       unsubscribeCallbacks.forEach((unsubscribe) => unsubscribe());
@@ -517,8 +459,7 @@ var ThreadPlugin = () => {
                 ns: THREAD_PLUGIN
               }
             ],
-            icon: (props) => /* @__PURE__ */ React6.createElement(Chat, props),
-            iconSymbol: "ph--chat--regular",
+            icon: "ph--chat--regular",
             // TODO(wittjosiah): Move out of metadata.
             loadReferences: (channel) => loadObjectReferences(channel, (channel2) => channel2.threads)
           },
@@ -577,29 +518,36 @@ var ThreadPlugin = () => {
                 if (!id.endsWith("~comments")) {
                   return;
                 }
-                const docId = id.split("~").at(0);
-                const [spaceId, objectId] = docId?.split(":") ?? [];
+                const subjectId = id.split("~").at(0);
+                const [spaceId, objectId] = subjectId?.split(":") ?? [];
                 const space = client.spaces.get().find((space2) => space2.id === spaceId);
-                const doc = space?.db.getObjectById(objectId);
-                if (!doc || !docId) {
+                const object = toSignal((onChange) => {
+                  const timeout = setTimeout(async () => {
+                    await space?.db.loadObjectById(objectId);
+                    onChange();
+                  });
+                  return () => clearTimeout(timeout);
+                }, () => space?.db.getObjectById(objectId), subjectId);
+                if (!object || !subjectId) {
                   return;
                 }
-                const docMeta = metadataResolver(getTypename(doc) ?? "");
-                const label = docMeta.label?.(doc) || doc.name || docMeta.placeholder || [
+                const meta = metadataResolver(getTypename(object) ?? "");
+                const label = meta.label?.(object) || object.name || meta.placeholder || [
                   "unnamed object threads label",
                   {
                     ns: THREAD_PLUGIN
                   }
                 ];
-                const viewState = getViewState(docId);
+                const viewState = getViewState(subjectId);
                 return {
                   id,
                   type: "orphan-comments-for-subject",
-                  data: doc,
+                  data: null,
                   properties: {
-                    icon: meta_default.iconComponent,
+                    icon: "ph--chat-text--regular",
                     label,
-                    showResolvedThreads: viewState.showResolvedThreads
+                    showResolvedThreads: viewState.showResolvedThreads,
+                    object
                   }
                 };
               },
@@ -639,7 +587,7 @@ var ThreadPlugin = () => {
                       menuItemType: "toggle",
                       isChecked: viewState.showResolvedThreads,
                       testId: "threadPlugin.toggleShowResolved",
-                      iconSymbol: viewState.showResolvedThreads ? "ph--eye-slash--regular" : "ph--eye--regular"
+                      icon: viewState.showResolvedThreads ? "ph--eye-slash--regular" : "ph--eye--regular"
                     }
                   }
                 ];
@@ -684,8 +632,7 @@ var ThreadPlugin = () => {
                           ns: THREAD_PLUGIN
                         }
                       ],
-                      icon: (props) => /* @__PURE__ */ React6.createElement(Chat, props),
-                      iconSymbol: "ph--chat--regular",
+                      icon: "ph--chat--regular",
                       testId: "threadPlugin.createObject"
                     }
                   }
@@ -743,7 +690,6 @@ var ThreadPlugin = () => {
                   subject: data.subject,
                   stagedThreads: state.staging[fullyQualifiedId4(data.subject)],
                   current: state.current,
-                  focus: true,
                   showResolvedThreads
                 });
               }
@@ -764,7 +710,7 @@ var ThreadPlugin = () => {
                   } catch (e) {
                     log.error("Subject does not support threads array", subject?.typename, {
                       F: __dxlog_file,
-                      L: 369,
+                      L: 331,
                       S: void 0,
                       C: (f, a) => f(...a)
                     });
@@ -790,19 +736,10 @@ var ThreadPlugin = () => {
                   data: thread,
                   intents: [
                     [
-                      {
-                        action: NavigationAction.OPEN,
-                        data: {
-                          activeParts: {
-                            complementary: `${subjectId}${SLUG_PATH_SEPARATOR}comments${SLUG_COLLECTION_INDICATOR}`
-                          }
-                        }
-                      },
                       {
                         action: ThreadAction.SELECT,
                         data: {
-                          current: fullyQualifiedId4(thread),
-                          focus: true
+                          current: fullyQualifiedId4(thread)
                         }
                       },
                       {
@@ -829,7 +766,6 @@ var ThreadPlugin = () => {
               }
             }
             case ThreadAction.SELECT: {
-              state.focus = intent.data?.current === state.current ? state.focus : intent.data?.focus;
               state.current = intent.data?.current;
               return {
                 data: true
@@ -1089,12 +1025,12 @@ var ThreadPlugin = () => {
                 });
               }
             }),
-            createExternalCommentSync(doc.id, (sink) => effect(() => sink()), () => threads.value.filter((thread) => thread?.anchor).map((thread) => ({
+            createExternalCommentSync(fullyQualifiedId4(doc), (sink) => effect(() => sink()), () => threads.value.filter((thread) => thread?.anchor).map((thread) => ({
               id: fullyQualifiedId4(thread),
               cursor: thread.anchor
             }))),
             comments({
-              id: doc.id,
+              id: fullyQualifiedId4(doc),
               onCreate: ({ cursor }) => {
                 const [start, end] = cursor.split(":");
                 const name = doc.content && getTextInRange(createDocAccessor(doc.content, [