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

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";
@@ -214,11 +213,11 @@ var CommentContainer = ({ thread, detached, context, current, autoFocusTextbox,
 };
 
 // packages/plugins/plugin-thread/src/components/CommentsContainer.tsx
-import { ChatText, Quotes } from "@phosphor-icons/react";
+import { ChatText } from "@phosphor-icons/react";
 import React3, { useEffect as useEffect2 } 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 { useTranslation as useTranslation3, Icon, Trans } from "@dxos/react-ui";
+import { PlankHeading } from "@dxos/react-ui-deck";
 import { descriptionText, mx as mx2 } from "@dxos/react-ui-theme";
 var CommentsHeading = ({ attendableId }) => {
   const { t } = useTranslation3(THREAD_PLUGIN);
@@ -227,7 +226,10 @@ var CommentsHeading = ({ attendableId }) => {
     className: "flex items-center"
   }, /* @__PURE__ */ React3.createElement(PlankHeading.Button, {
     attendableId
-  }, /* @__PURE__ */ React3.createElement(Quotes, plankHeadingIconProps)), /* @__PURE__ */ React3.createElement(PlankHeading.Label, {
+  }, /* @__PURE__ */ React3.createElement(Icon, {
+    icon: "ph--quotes--regular",
+    size: 5
+  })), /* @__PURE__ */ React3.createElement(PlankHeading.Label, {
     attendableId
   }, t("comments heading")));
 };
@@ -283,8 +285,8 @@ 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";
@@ -457,7 +459,6 @@ var ThreadPlugin = () => {
     }
     return viewStore[subjectId];
   };
-  let attentionPlugin;
   let navigationPlugin;
   let intentPlugin;
   const unsubscribeCallbacks = [];
@@ -470,38 +471,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 +488,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,27 +547,33 @@ 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));
+                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: object,
                   properties: {
-                    icon: meta_default.iconComponent,
+                    icon: meta.icon,
                     label,
                     showResolvedThreads: viewState.showResolvedThreads
                   }
@@ -639,7 +615,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 +660,7 @@ var ThreadPlugin = () => {
                           ns: THREAD_PLUGIN
                         }
                       ],
-                      icon: (props) => /* @__PURE__ */ React6.createElement(Chat, props),
-                      iconSymbol: "ph--chat--regular",
+                      icon: "ph--chat--regular",
                       testId: "threadPlugin.createObject"
                     }
                   }
@@ -764,7 +739,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,14 +765,6 @@ var ThreadPlugin = () => {
                   data: thread,
                   intents: [
                     [
-                      {
-                        action: NavigationAction.OPEN,
-                        data: {
-                          activeParts: {
-                            complementary: `${subjectId}${SLUG_PATH_SEPARATOR}comments${SLUG_COLLECTION_INDICATOR}`
-                          }
-                        }
-                      },
                       {
                         action: ThreadAction.SELECT,
                         data: {