@blocklet/discuss-kit-ux 2.0.83 → 2.0.85

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--h9pxj.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-DL2IN0gQ.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-DL2IN0gQ.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);
     }
   };
@@ -4755,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--h9pxj.mjs"));
+const Editor = lazy(() => import("./editor-C5zNpwwt.mjs"));
 function LazyEditor(props) {
   const fallback2 = /* @__PURE__ */ jsxs(Box, { sx: { px: 3 }, children: [
     /* @__PURE__ */ jsx(Skeleton, {}),
@@ -5723,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-DL2IN0gQ.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);
       }
     };
@@ -5649,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.83",
+  "version": "2.0.85",
   "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.83",
-    "@blocklet/labels": "2.0.83",
+    "@blocklet/editor": "2.0.85",
+    "@blocklet/labels": "2.0.85",
     "@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": "ffe6740390580b8e886bb350a92c30c0b86fa62a"
+  "gitHead": "a59a345501aeab25f6c71c1aeacfb94fd2e55de5"
 }