@blocklet/discuss-kit-ux 2.0.82 → 2.0.84

package/dist/components/posts/comment-list/context.d.ts

@@ -21,6 +21,7 @@ interface CommentsProviderProps {
     containerRef: React.RefObject<HTMLDivElement>;
     renderComments?: CommentsRender;
     renderDonation?: (post: Post) => React.ReactNode;
+    renderActions?: (post: Post) => React.ReactNode;
 }
 interface State {
     comments: Post[];
@@ -59,8 +60,9 @@ interface CommentsContextValue {
     findById: (id: string) => Post | undefined;
     renderComments?: CommentsRender;
     renderDonation?: (post: Post) => React.ReactNode;
+    renderActions?: (post: Post) => React.ReactNode;
 }
 export declare const CommentsContext: React.Context<CommentsContextValue>;
 export declare const useCommentsContext: () => CommentsContextValue;
-export declare function CommentsProvider({ target, api, flatView, children, order, autoLoadComments, autoCollapse, allowCopyLink, showProfileCard, interactive, containerRef, renderComments, renderDonation, }: CommentsProviderProps): import("react/jsx-runtime").JSX.Element;
+export declare function CommentsProvider({ target, api, flatView, children, order, autoLoadComments, autoCollapse, allowCopyLink, showProfileCard, interactive, containerRef, renderComments, renderDonation, renderActions, }: CommentsProviderProps): import("react/jsx-runtime").JSX.Element;
 export {};

package/dist/components/posts/comment.d.ts

@@ -8,6 +8,6 @@ export interface CommentProps {
     onReply: CommentAPI['reply'];
     onLoadMoreReplies: (rootId: string) => void;
     renderDonation?: (post: Post) => React.ReactNode;
-    actions?: React.ReactNode;
+    renderActions?: (post: Post) => React.ReactNode;
 }
-export default function Comment({ onDelete, onRate, onUnrate, onReply, onContentUpdate, onLoadMoreReplies, renderDonation, actions, ...rest }: PostProps & CommentProps): import("react/jsx-runtime").JSX.Element;
+export default function Comment({ onDelete, onRate, onUnrate, onReply, onContentUpdate, onLoadMoreReplies, renderDonation, renderActions, ...rest }: PostProps & CommentProps): import("react/jsx-runtime").JSX.Element;

package/dist/components/utils.d.ts

@@ -17,4 +17,5 @@ export declare const getDraftSessionKeyPrefix: () => string;
 export declare const getExcerptFromLexicalContent: (content: any, size?: number) => string;
 export declare const mergeSx: (initial: SystemStyleObject<Theme>, sx?: SxProps<Theme>) => any[];
 export declare const discussKitMountPoint: string | undefined;
-export declare const openProfileInNewTab: (did: string) => void;
+export declare const isInDiscussKitApp: boolean | "" | undefined;
+export declare const openProfile: (did: string, newTab?: boolean) => void;

package/dist/{editor-C_9ooELE.mjs → editor-C5zNpwwt.mjs}

@@ -4,7 +4,7 @@ import { OnContentChangePlugin } from "@blocklet/editor/lib/ext/OnContentChangeP
 import { CtrlsShortcutPlugin } from "@blocklet/editor/lib/ext/ShortcutPlugin";
 import { SafeAreaPlugin } from "@blocklet/editor/lib/ext/SafeAreaPlugin";
 import { lazy } from "react";
-import { i as inferInitialEditorState, I as ImagePathFixerPlugin, V as VideoPathFixerPlugin, a as isEmptyContent, s as stringify, g as getExcerptSync } from "./index-usvR3B2J.mjs";
+import { i as inferInitialEditorState, I as ImagePathFixerPlugin, V as VideoPathFixerPlugin, a as isEmptyContent, s as stringify, g as getExcerptSync } from "./index-D7n269m9.mjs";
 const BlockletEditor = lazy(() => import("@blocklet/editor"));
 const Root = styled(Box)`
   .be-editable,

package/dist/{index-usvR3B2J.mjs → index-D7n269m9.mjs}

@@ -16,8 +16,7 @@ import { useEditorConfig, EditorConfigProvider } from "@blocklet/editor/lib/conf
 import { lazyWithPreload } from "react-lazy-with-preload";
 import { $getRoot, $createParagraphNode, $createTextNode, KEY_ENTER_COMMAND, COMMAND_PRIORITY_LOW, $getSelection } from "lexical";
 import { $isRootTextContentEmpty } from "@lexical/text";
-import { resolvePath, Link, useNavigate, useMatch, useLocation, useParams, Outlet, useSearchParams, useBlocker } from "react-router-dom";
-import { joinURL } from "ufo";
+import { withTrailingSlash, withQuery, joinURL } from "ufo";
 import joinUrl from "url-join";
 import { useLexicalComposerContext } from "@lexical/react/LexicalComposerContext";
 import { ImageNode } from "@blocklet/editor/lib/main/nodes/ImageNode";
@@ -36,6 +35,7 @@ import { grey, green, amber } from "@mui/material/colors";
 import useMediaQuery$1 from "@mui/material/useMediaQuery";
 import DID from "@arcblock/ux/lib/DID";
 import Tooltip, { tooltipClasses } from "@mui/material/Tooltip";
+import { Link, useNavigate, useMatch, useLocation, useParams, Outlet, useSearchParams, useBlocker } from "react-router-dom";
 import { useBrowser } from "@arcblock/react-hooks";
 import UxRelativeTime from "@arcblock/ux/lib/RelativeTime";
 import Chip from "@mui/material/Chip";
@@ -343,10 +343,10 @@ const mergeSx = (initial, sx) => {
   return mergedSx;
 };
 const discussKitMountPoint = (_a = getBlockletMountPointInfo("did-comments")) == null ? void 0 : _a.mountPoint;
-const openProfileInNewTab = (did) => {
+const isInDiscussKitApp = discussKitMountPoint && withTrailingSlash(window.blocklet.prefix) === withTrailingSlash(discussKitMountPoint);
+const openProfile = (did, newTab) => {
   if (did) {
-    const { pathname } = resolvePath(`/profile/${did}`);
-    window.open(joinURL(discussKitMountPoint || "/", pathname), "_blank");
+    window.open(withQuery(joinURL(discussKitMountPoint || "/", "profile"), { did }), newTab ? "_blank" : "_self");
   }
 };
 const utils = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
@@ -361,9 +361,10 @@ const utils = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.definePropert
   getPreference,
   getResizedAvatar,
   inferDiscussKitApiPrefix,
+  isInDiscussKitApp,
   mergeSx,
   minDelay,
-  openProfileInNewTab,
+  openProfile,
   protectLogin,
   repairBase64Avatar,
   sleep,
@@ -1323,10 +1324,14 @@ function AuthorInfo({
     (_b2 = e == null ? void 0 : e.preventDefault) == null ? void 0 : _b2.call(e);
     setOpen(false);
     if (chatInWallet) {
-      openProfileInNewTab(user == null ? void 0 : user.did);
+      openProfile(user == null ? void 0 : user.did, true);
     } else {
       setTimeout(() => {
-        navigate(`/profile/${user == null ? void 0 : user.did}`);
+        if (isInDiscussKitApp) {
+          navigate(`/profile?did=${user == null ? void 0 : user.did}`);
+        } else {
+          openProfile(user == null ? void 0 : user.did);
+        }
       }, 100);
     }
   };
@@ -2318,7 +2323,7 @@ function Comment({
   onContentUpdate,
   onLoadMoreReplies,
   renderDonation,
-  actions,
+  renderActions,
   ...rest
 }) {
   const { session } = useSessionContext();
@@ -2384,7 +2389,7 @@ function Comment({
             ] })
           }
         ),
-        actions
+        renderActions == null ? void 0 : renderActions(post)
       ] }),
       inputVisible && /* @__PURE__ */ jsx(Box$1, { my: 2, children: /* @__PURE__ */ jsx(
         CommentInput,
@@ -2417,7 +2422,7 @@ function Comment({
               interactive: rest.interactive,
               authorInfoAppend: rest.authorInfoAppend,
               renderDonation,
-              actions
+              renderActions
             },
             item.id
           );
@@ -2532,7 +2537,8 @@ function CommentsProvider({
   interactive,
   containerRef,
   renderComments,
-  renderDonation
+  renderDonation,
+  renderActions
 }) {
   var _a2;
   const [state, setState] = useSetState(getInitialState(order ? { order } : {}));
@@ -2734,7 +2740,8 @@ function CommentsProvider({
       loadMoreReplies,
       findById,
       renderComments,
-      renderDonation
+      renderDonation,
+      renderActions
     }),
     // eslint-disable-next-line react-hooks/exhaustive-deps
     [target, state]
@@ -2841,7 +2848,8 @@ function CommentList(props) {
     loadMoreReplies,
     api,
     renderComments,
-    renderDonation
+    renderDonation,
+    renderActions
   } = useCommentsContext();
   if (highlighted) {
     return /* @__PURE__ */ jsx(SegmentalList, { ...props });
@@ -2861,6 +2869,7 @@ function CommentList(props) {
       showProfileCard,
       interactive,
       renderDonation,
+      renderActions,
       ...restProps
     },
     comment.id
@@ -4751,7 +4760,7 @@ function Back({ url, fallbackUrl, iconOnly, sx, ...rest }) {
 }
 const tablerSend = (props) => /* @__PURE__ */ jsx("svg", { viewBox: "0 0 24 24", "data-iconify": "tabler", width: "1.2em", height: "1.2em", ...props, children: /* @__PURE__ */ jsx("path", { fill: "none", stroke: "currentColor", strokeLinecap: "round", strokeLinejoin: "round", strokeWidth: 2, d: "M10 14L21 3m0 0l-6.5 18a.55.55 0 0 1-1 0L10 14l-7-3.5a.55.55 0 0 1 0-1z" }) });
 const tablerLetterCase = (props) => /* @__PURE__ */ jsx("svg", { viewBox: "0 0 24 24", "data-iconify": "tabler", width: "1.2em", height: "1.2em", ...props, children: /* @__PURE__ */ jsx("path", { fill: "none", stroke: "currentColor", strokeLinecap: "round", strokeLinejoin: "round", strokeWidth: 2, d: "M14 15.5a3.5 3.5 0 1 0 7 0a3.5 3.5 0 1 0-7 0M3 19V8.5a3.5 3.5 0 0 1 7 0V19m-7-6h7m11-1v7" }) });
-const Editor = lazy(() => import("./editor-C_9ooELE.mjs"));
+const Editor = lazy(() => import("./editor-C5zNpwwt.mjs"));
 function LazyEditor(props) {
   const fallback2 = /* @__PURE__ */ jsxs(Box, { sx: { px: 3 }, children: [
     /* @__PURE__ */ jsx(Skeleton, {}),
@@ -5719,7 +5728,7 @@ function ChatListInWallet({ sx, ...rest }) {
                     variant: "circle",
                     onClick: () => {
                       var _a3;
-                      return openProfileInNewTab((_a3 = session == null ? void 0 : session.user) == null ? void 0 : _a3.did);
+                      return openProfile((_a3 = session == null ? void 0 : session.user) == null ? void 0 : _a3.did, true);
                     }
                   }
                 )

package/dist/index.es.js

@@ -1,5 +1,5 @@
 export * from "@blocklet/labels";
-import { T, n, W, A, m, ad, B, F, K, J, L, ap, Y, X, $, Z, _, a1, w, C, x, y, E, a5, a6, ah, a8, O, Q, ac, D, ag, af, H, G, b, k, ae, M, P, ao, v, q, R, S, a9, aq, o, a2, a4, ai, al, ak, am, ar, N, as, l, f, p, r, j, t, h, aa, U, c, a0, z, a7, ab, u, an, d, at, a3, aj, e } from "./index-usvR3B2J.mjs";
+import { T, n, W, A, m, ad, B, F, K, J, L, ap, Y, X, $, Z, _, a1, w, C, x, y, E, a5, a6, ah, a8, O, Q, ac, D, ag, af, H, G, b, k, ae, M, P, ao, v, q, R, S, a9, aq, o, a2, a4, ai, al, ak, am, ar, N, as, l, f, p, r, j, t, h, aa, U, c, a0, z, a7, ab, u, an, d, at, a3, aj, e } from "./index-D7n269m9.mjs";
 import "react/jsx-runtime";
 import "react";
 import "@mui/material/Box";

package/dist/index.umd.js

@@ -269,10 +269,10 @@ var __publicField = (obj, key, value) => {
     return mergedSx;
   };
   const discussKitMountPoint = (_a = getBlockletMountPointInfo("did-comments")) == null ? void 0 : _a.mountPoint;
-  const openProfileInNewTab = (did) => {
+  const isInDiscussKitApp = discussKitMountPoint && ufo.withTrailingSlash(window.blocklet.prefix) === ufo.withTrailingSlash(discussKitMountPoint);
+  const openProfile = (did, newTab) => {
     if (did) {
-      const { pathname } = reactRouterDom.resolvePath(`/profile/${did}`);
-      window.open(ufo.joinURL(discussKitMountPoint || "/", pathname), "_blank");
+      window.open(ufo.withQuery(ufo.joinURL(discussKitMountPoint || "/", "profile"), { did }), newTab ? "_blank" : "_self");
     }
   };
   const utils = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
@@ -287,9 +287,10 @@ var __publicField = (obj, key, value) => {
     getPreference,
     getResizedAvatar,
     inferDiscussKitApiPrefix,
+    isInDiscussKitApp,
     mergeSx,
     minDelay,
-    openProfileInNewTab,
+    openProfile,
     protectLogin,
     repairBase64Avatar,
     sleep,
@@ -1249,10 +1250,14 @@ var __publicField = (obj, key, value) => {
       (_b2 = e == null ? void 0 : e.preventDefault) == null ? void 0 : _b2.call(e);
       setOpen(false);
       if (chatInWallet) {
-        openProfileInNewTab(user == null ? void 0 : user.did);
+        openProfile(user == null ? void 0 : user.did, true);
       } else {
         setTimeout(() => {
-          navigate(`/profile/${user == null ? void 0 : user.did}`);
+          if (isInDiscussKitApp) {
+            navigate(`/profile?did=${user == null ? void 0 : user.did}`);
+          } else {
+            openProfile(user == null ? void 0 : user.did);
+          }
         }, 100);
       }
     };
@@ -2244,7 +2249,7 @@ var __publicField = (obj, key, value) => {
     onContentUpdate,
     onLoadMoreReplies,
     renderDonation,
-    actions,
+    renderActions,
     ...rest
   }) {
     const { session } = useSessionContext();
@@ -2310,7 +2315,7 @@ var __publicField = (obj, key, value) => {
               ] })
             }
           ),
-          actions
+          renderActions == null ? void 0 : renderActions(post)
         ] }),
         inputVisible && /* @__PURE__ */ jsxRuntime.jsx(Box, { my: 2, children: /* @__PURE__ */ jsxRuntime.jsx(
           CommentInput,
@@ -2343,7 +2348,7 @@ var __publicField = (obj, key, value) => {
                 interactive: rest.interactive,
                 authorInfoAppend: rest.authorInfoAppend,
                 renderDonation,
-                actions
+                renderActions
               },
               item.id
             );
@@ -2458,7 +2463,8 @@ var __publicField = (obj, key, value) => {
     interactive,
     containerRef,
     renderComments,
-    renderDonation
+    renderDonation,
+    renderActions
   }) {
     var _a2;
     const [state, setState] = ahooks.useSetState(getInitialState(order ? { order } : {}));
@@ -2660,7 +2666,8 @@ var __publicField = (obj, key, value) => {
         loadMoreReplies,
         findById,
         renderComments,
-        renderDonation
+        renderDonation,
+        renderActions
       }),
       // eslint-disable-next-line react-hooks/exhaustive-deps
       [target, state]
@@ -2767,7 +2774,8 @@ var __publicField = (obj, key, value) => {
       loadMoreReplies,
       api,
       renderComments,
-      renderDonation
+      renderDonation,
+      renderActions
     } = useCommentsContext();
     if (highlighted) {
       return /* @__PURE__ */ jsxRuntime.jsx(SegmentalList, { ...props });
@@ -2787,6 +2795,7 @@ var __publicField = (obj, key, value) => {
         showProfileCard,
         interactive,
         renderDonation,
+        renderActions,
         ...restProps
       },
       comment.id
@@ -5645,7 +5654,7 @@ var __publicField = (obj, key, value) => {
                       variant: "circle",
                       onClick: () => {
                         var _a3;
-                        return openProfileInNewTab((_a3 = session == null ? void 0 : session.user) == null ? void 0 : _a3.did);
+                        return openProfile((_a3 = session == null ? void 0 : session.user) == null ? void 0 : _a3.did, true);
                       }
                     }
                   )

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/discuss-kit-ux",
-  "version": "2.0.82",
+  "version": "2.0.84",
   "files": [
     "dist"
   ],
@@ -31,8 +31,8 @@
     "@arcblock/bridge": "^2.10.6",
     "@arcblock/react-hooks": "^2.10.6",
     "@arcblock/ws": "^1.18.126",
-    "@blocklet/editor": "2.0.82",
-    "@blocklet/labels": "2.0.82",
+    "@blocklet/editor": "2.0.84",
+    "@blocklet/labels": "2.0.84",
     "@blocklet/uploader": "^0.1.19",
     "@emotion/css": "^11.10.5",
     "@emotion/react": "^11.10.5",
@@ -100,5 +100,5 @@
   "resolutions": {
     "react": "^18.2.0"
   },
-  "gitHead": "3726449a47f54674d489b95b6ae6895412c3ebc2"
+  "gitHead": "616816e0b718c1281dc04a8f25b898c4c023cb80"
 }