@blocklet/discuss-kit-ux 2.0.98 → 2.0.100

package/dist/components/hooks/session.d.ts

@@ -14,8 +14,10 @@ interface Session {
     initialized: boolean;
     user: SessionContextUser;
     login: (...args: any[]) => void;
+    switchPassport: (...args: any[]) => void;
 }
 export declare const useSessionContext: () => {
+    isAuthenticated: boolean;
     isAdmin: boolean;
     isMember: boolean;
     isBlogEditor: boolean;

package/dist/components/utils.d.ts

@@ -19,3 +19,5 @@ export declare const mergeSx: (initial: SystemStyleObject<Theme>, sx?: SxProps<T
 export declare const discussKitMountPoint: string | undefined;
 export declare const isInDiscussKitApp: boolean | "" | undefined;
 export declare const openProfile: (did: string, newTab?: boolean) => void;
+export declare const randomId: () => string;
+export declare const getDiscussKitClientId: () => string;

package/dist/{editor-DYjHI-qS.mjs → editor-DI-qfaZA.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-8LMyNkyB.mjs";
+import { i as inferInitialEditorState, I as ImagePathFixerPlugin, V as VideoPathFixerPlugin, a as isEmptyContent, s as stringify, g as getExcerptSync } from "./index-BQ_vgrJf.mjs";
 const BlockletEditor = lazy(() => import("@blocklet/editor"));
 const Root = styled(Box)`
   .be-editable,

package/dist/{index-8LMyNkyB.mjs → index-BQ_vgrJf.mjs}

@@ -4,7 +4,7 @@ var __publicField = (obj, key, value) => {
   __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
   return value;
 };
-var _a, _b, _c;
+var _a, _b, _c, _d;
 import { Labels2, LabelPicker } from "@blocklet/labels";
 import { jsx, jsxs, Fragment } from "react/jsx-runtime";
 import { useTheme, ThemeProvider, styled } from "@mui/material/styles";
@@ -349,12 +349,23 @@ const openProfile = (did, newTab) => {
     window.open(withQuery(joinURL(discussKitMountPoint || "/", "profile"), { did }), newTab ? "_blank" : "_self");
   }
 };
+const randomId = () => {
+  var _a2;
+  return ((_a2 = crypto == null ? void 0 : crypto.randomUUID) == null ? void 0 : _a2.call(crypto)) || Math.random().toString(36).substring(2);
+};
+const getDiscussKitClientId = () => {
+  if (!window.__discuss_kit_client_id__) {
+    window.__discuss_kit_client_id__ = randomId();
+  }
+  return window.__discuss_kit_client_id__;
+};
 const utils = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   blockletExists,
   copy,
   discussKitMountPoint,
   getBlockletMountPointInfo,
+  getDiscussKitClientId,
   getDraftSessionKeyPrefix,
   getExcerptFromLexicalContent,
   getLastItem,
@@ -366,6 +377,7 @@ const utils = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.definePropert
   minDelay,
   openProfile,
   protectLogin,
+  randomId,
   repairBase64Avatar,
   sleep,
   tryParseJSONObject
@@ -1041,15 +1053,16 @@ function Badge({
   ] }) : null;
 }
 const useSessionContext = () => {
-  var _a2, _b2, _c2, _d;
+  var _a2, _b2, _c2, _d2, _e;
   const ctx = useContext(SessionContext) || {};
   const loginRole = (_b2 = (_a2 = ctx == null ? void 0 : ctx.session) == null ? void 0 : _a2.user) == null ? void 0 : _b2.role;
   const permissionSet = useMemo(() => {
     var _a3, _b3;
     return new Set(((_b3 = (_a3 = ctx.session) == null ? void 0 : _a3.user) == null ? void 0 : _b3.permissions) || []);
-  }, [(_d = (_c2 = ctx.session) == null ? void 0 : _c2.user) == null ? void 0 : _d.permissions]);
+  }, [(_d2 = (_c2 = ctx.session) == null ? void 0 : _c2.user) == null ? void 0 : _d2.permissions]);
   return {
     ...ctx,
+    isAuthenticated: !!((_e = ctx.session) == null ? void 0 : _e.user),
     isAdmin: ["admin", "owner"].includes(loginRole),
     isMember: ["member"].includes(loginRole),
     isBlogEditor: ["blogEditor"].includes(loginRole),
@@ -2223,7 +2236,7 @@ const preferences = {
   maxDiscussionLength: parseInt(`${prefs.maxDiscussionLength}`, 10),
   maxPinLimit: parseInt(`${prefs.maxPinLimit}`, 10),
   maxFeaturedLimit: parseInt(`${prefs.maxFeaturedLimit}`, 10),
-  assignmentAuthorizedPassports: prefs.assignmentAuthorizedPassports.split(",").map((x) => x.trim())
+  assignmentAuthorizedPassports: (_d = prefs.assignmentAuthorizedPassports) == null ? void 0 : _d.split(",").map((x) => x.trim())
 };
 function Confirm({
   open,
@@ -4296,7 +4309,7 @@ function NotificationMessage({ chat, message, prevMessage }) {
     return null;
   };
   const render = () => {
-    var _a2, _b2, _c2, _d;
+    var _a2, _b2, _c2, _d2;
     const baseCardSx = {
       py: 1.5,
       px: 2,
@@ -4439,7 +4452,7 @@ function NotificationMessage({ chat, message, prevMessage }) {
                 ]
               }
             ),
-            /* @__PURE__ */ jsx(Typography, { variant: "body1", sx: { fontSize: 16 }, children: (_d = (_b2 = message == null ? void 0 : message.comment) == null ? void 0 : _b2.excerpt) == null ? void 0 : _d.replace((_c2 = session == null ? void 0 : session.user) == null ? void 0 : _c2.fullName, "") }),
+            /* @__PURE__ */ jsx(Typography, { variant: "body1", sx: { fontSize: 16 }, children: (_d2 = (_b2 = message == null ? void 0 : message.comment) == null ? void 0 : _b2.excerpt) == null ? void 0 : _d2.replace((_c2 = session == null ? void 0 : session.user) == null ? void 0 : _c2.fullName, "") }),
             renderQuote(message.post)
           ]
         }
@@ -4762,7 +4775,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-DYjHI-qS.mjs"));
+const Editor = lazy(() => import("./editor-DI-qfaZA.mjs"));
 function LazyEditor(props) {
   const fallback2 = /* @__PURE__ */ jsxs(Box, { sx: { px: 3 }, children: [
     /* @__PURE__ */ jsx(Skeleton, {}),
@@ -5656,7 +5669,7 @@ function Empty({ sx }) {
   ] });
 }
 function ChatListInWallet({ sx, ...rest }) {
-  var _a2, _b2, _c2, _d;
+  var _a2, _b2, _c2, _d2;
   const { session } = useSessionContext();
   const { initialized, chats, activeChatId } = useChatContext();
   const { unread } = useUnreadNotification();
@@ -5757,7 +5770,7 @@ function ChatListInWallet({ sx, ...rest }) {
                 sx: {
                   width: 1,
                   height: 1,
-                  ...((_d = window.chatInWallet) == null ? void 0 : _d.safeAreaInsetTop) && {
+                  ...((_d2 = window.chatInWallet) == null ? void 0 : _d2.safeAreaInsetTop) && {
                     pt: `${window.chatInWallet.safeAreaInsetTop}px`
                   }
                 },
@@ -11868,14 +11881,14 @@ function create(prefix2) {
     }
   });
 }
-function getWsClient(prefix2 = ((_d) => (_d = window.blocklet) == null ? void 0 : _d.prefix)() || "/") {
+function getWsClient(prefix2 = ((_e) => (_e = window.blocklet) == null ? void 0 : _e.prefix)() || "/") {
   if (!client) {
     client = create(prefix2);
   }
   return client;
 }
 const useSubscription = (event, cb = () => {
-}, deps = [], prefix2 = ((_e) => (_e = window.blocklet) == null ? void 0 : _e.prefix)() || "/") => {
+}, deps = [], prefix2 = ((_f) => (_f = window.blocklet) == null ? void 0 : _f.prefix)() || "/") => {
   useEffect(() => {
     if (event) {
       if (!client) {
@@ -11942,7 +11955,7 @@ function PointUp({ points }) {
   );
 }
 function PointUpProvider({ children }) {
-  var _a2, _b2, _c2, _d;
+  var _a2, _b2, _c2, _d2;
   const state = useReactive({
     pointsList: [],
     visible: false,
@@ -11993,10 +12006,16 @@ function PointUpProvider({ children }) {
       state.visible = false;
     }
   }, [JSON.stringify(state.pointsList)]);
-  useSubscription((_d = session == null ? void 0 : session.user) == null ? void 0 : _d.did, ({ event, data }) => {
-    var _a3;
-    return (_a3 = handlers[event]) == null ? void 0 : _a3.call(handlers, data);
-  }, []);
+  useSubscription(
+    (_d2 = session == null ? void 0 : session.user) == null ? void 0 : _d2.did,
+    ({ event, clientId, data }) => {
+      var _a3;
+      if (clientId === getDiscussKitClientId()) {
+        (_a3 = handlers[event]) == null ? void 0 : _a3.call(handlers, data);
+      }
+    },
+    []
+  );
   return /* @__PURE__ */ jsxs(PointUpContext.Provider, { value, children: [
     (pointUpComponent == null ? void 0 : pointUpComponent.mountPoint) && createPortal(
       /* @__PURE__ */ jsx(

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-8LMyNkyB.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-BQ_vgrJf.mjs";
 import "react/jsx-runtime";
 import "react";
 import "@mui/material/Box";

package/dist/index.umd.js

@@ -8,7 +8,7 @@ var __publicField = (obj, key, value) => {
   return value;
 };
 
-  var _a, _b, _c;
+  var _a, _b, _c, _d;
   const typography = {
     h1: {
       fontSize: "1.875rem",
@@ -275,12 +275,23 @@ var __publicField = (obj, key, value) => {
       window.open(ufo.withQuery(ufo.joinURL(discussKitMountPoint || "/", "profile"), { did }), newTab ? "_blank" : "_self");
     }
   };
+  const randomId = () => {
+    var _a2;
+    return ((_a2 = crypto == null ? void 0 : crypto.randomUUID) == null ? void 0 : _a2.call(crypto)) || Math.random().toString(36).substring(2);
+  };
+  const getDiscussKitClientId = () => {
+    if (!window.__discuss_kit_client_id__) {
+      window.__discuss_kit_client_id__ = randomId();
+    }
+    return window.__discuss_kit_client_id__;
+  };
   const utils = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
     __proto__: null,
     blockletExists,
     copy,
     discussKitMountPoint,
     getBlockletMountPointInfo,
+    getDiscussKitClientId,
     getDraftSessionKeyPrefix,
     getExcerptFromLexicalContent,
     getLastItem,
@@ -292,6 +303,7 @@ var __publicField = (obj, key, value) => {
     minDelay,
     openProfile,
     protectLogin,
+    randomId,
     repairBase64Avatar,
     sleep,
     tryParseJSONObject
@@ -967,15 +979,16 @@ var __publicField = (obj, key, value) => {
     ] }) : null;
   }
   const useSessionContext = () => {
-    var _a2, _b2, _c2, _d;
+    var _a2, _b2, _c2, _d2, _e;
     const ctx = react.useContext(Session.SessionContext) || {};
     const loginRole = (_b2 = (_a2 = ctx == null ? void 0 : ctx.session) == null ? void 0 : _a2.user) == null ? void 0 : _b2.role;
     const permissionSet = react.useMemo(() => {
       var _a3, _b3;
       return new Set(((_b3 = (_a3 = ctx.session) == null ? void 0 : _a3.user) == null ? void 0 : _b3.permissions) || []);
-    }, [(_d = (_c2 = ctx.session) == null ? void 0 : _c2.user) == null ? void 0 : _d.permissions]);
+    }, [(_d2 = (_c2 = ctx.session) == null ? void 0 : _c2.user) == null ? void 0 : _d2.permissions]);
     return {
       ...ctx,
+      isAuthenticated: !!((_e = ctx.session) == null ? void 0 : _e.user),
       isAdmin: ["admin", "owner"].includes(loginRole),
       isMember: ["member"].includes(loginRole),
       isBlogEditor: ["blogEditor"].includes(loginRole),
@@ -2149,7 +2162,7 @@ var __publicField = (obj, key, value) => {
     maxDiscussionLength: parseInt(`${prefs.maxDiscussionLength}`, 10),
     maxPinLimit: parseInt(`${prefs.maxPinLimit}`, 10),
     maxFeaturedLimit: parseInt(`${prefs.maxFeaturedLimit}`, 10),
-    assignmentAuthorizedPassports: prefs.assignmentAuthorizedPassports.split(",").map((x) => x.trim())
+    assignmentAuthorizedPassports: (_d = prefs.assignmentAuthorizedPassports) == null ? void 0 : _d.split(",").map((x) => x.trim())
   };
   function Confirm({
     open,
@@ -4222,7 +4235,7 @@ var __publicField = (obj, key, value) => {
       return null;
     };
     const render = () => {
-      var _a2, _b2, _c2, _d;
+      var _a2, _b2, _c2, _d2;
       const baseCardSx = {
         py: 1.5,
         px: 2,
@@ -4365,7 +4378,7 @@ var __publicField = (obj, key, value) => {
                   ]
                 }
               ),
-              /* @__PURE__ */ jsxRuntime.jsx(Typography, { variant: "body1", sx: { fontSize: 16 }, children: (_d = (_b2 = message == null ? void 0 : message.comment) == null ? void 0 : _b2.excerpt) == null ? void 0 : _d.replace((_c2 = session == null ? void 0 : session.user) == null ? void 0 : _c2.fullName, "") }),
+              /* @__PURE__ */ jsxRuntime.jsx(Typography, { variant: "body1", sx: { fontSize: 16 }, children: (_d2 = (_b2 = message == null ? void 0 : message.comment) == null ? void 0 : _b2.excerpt) == null ? void 0 : _d2.replace((_c2 = session == null ? void 0 : session.user) == null ? void 0 : _c2.fullName, "") }),
               renderQuote(message.post)
             ]
           }
@@ -5582,7 +5595,7 @@ var __publicField = (obj, key, value) => {
     ] });
   }
   function ChatListInWallet({ sx, ...rest }) {
-    var _a2, _b2, _c2, _d;
+    var _a2, _b2, _c2, _d2;
     const { session } = useSessionContext();
     const { initialized, chats, activeChatId } = useChatContext();
     const { unread } = useUnreadNotification();
@@ -5683,7 +5696,7 @@ var __publicField = (obj, key, value) => {
                   sx: {
                     width: 1,
                     height: 1,
-                    ...((_d = window.chatInWallet) == null ? void 0 : _d.safeAreaInsetTop) && {
+                    ...((_d2 = window.chatInWallet) == null ? void 0 : _d2.safeAreaInsetTop) && {
                       pt: `${window.chatInWallet.safeAreaInsetTop}px`
                     }
                   },
@@ -11794,14 +11807,14 @@ var __publicField = (obj, key, value) => {
       }
     });
   }
-  function getWsClient(prefix2 = ((_d) => (_d = window.blocklet) == null ? void 0 : _d.prefix)() || "/") {
+  function getWsClient(prefix2 = ((_e) => (_e = window.blocklet) == null ? void 0 : _e.prefix)() || "/") {
     if (!client) {
       client = create(prefix2);
     }
     return client;
   }
   const useSubscription = (event, cb = () => {
-  }, deps = [], prefix2 = ((_e) => (_e = window.blocklet) == null ? void 0 : _e.prefix)() || "/") => {
+  }, deps = [], prefix2 = ((_f) => (_f = window.blocklet) == null ? void 0 : _f.prefix)() || "/") => {
     react.useEffect(() => {
       if (event) {
         if (!client) {
@@ -11868,7 +11881,7 @@ var __publicField = (obj, key, value) => {
     );
   }
   function PointUpProvider({ children }) {
-    var _a2, _b2, _c2, _d;
+    var _a2, _b2, _c2, _d2;
     const state = ahooks.useReactive({
       pointsList: [],
       visible: false,
@@ -11919,10 +11932,16 @@ var __publicField = (obj, key, value) => {
         state.visible = false;
       }
     }, [JSON.stringify(state.pointsList)]);
-    useSubscription((_d = session == null ? void 0 : session.user) == null ? void 0 : _d.did, ({ event, data }) => {
-      var _a3;
-      return (_a3 = handlers[event]) == null ? void 0 : _a3.call(handlers, data);
-    }, []);
+    useSubscription(
+      (_d2 = session == null ? void 0 : session.user) == null ? void 0 : _d2.did,
+      ({ event, clientId, data }) => {
+        var _a3;
+        if (clientId === getDiscussKitClientId()) {
+          (_a3 = handlers[event]) == null ? void 0 : _a3.call(handlers, data);
+        }
+      },
+      []
+    );
     return /* @__PURE__ */ jsxRuntime.jsxs(PointUpContext.Provider, { value, children: [
       (pointUpComponent == null ? void 0 : pointUpComponent.mountPoint) && ReactDOM.createPortal(
         /* @__PURE__ */ jsxRuntime.jsx(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/discuss-kit-ux",
-  "version": "2.0.98",
+  "version": "2.0.100",
   "files": [
     "dist"
   ],
@@ -31,8 +31,8 @@
     "@arcblock/bridge": "^2.10.12",
     "@arcblock/react-hooks": "^2.10.12",
     "@arcblock/ws": "^1.18.128",
-    "@blocklet/editor": "2.0.98",
-    "@blocklet/labels": "2.0.98",
+    "@blocklet/editor": "2.0.100",
+    "@blocklet/labels": "2.0.100",
     "@blocklet/uploader": "^0.1.20",
     "@emotion/css": "^11.10.5",
     "@emotion/react": "^11.10.5",
@@ -100,5 +100,5 @@
   "resolutions": {
     "react": "^18.2.0"
   },
-  "gitHead": "48f5be0c9040037f11ba939b63b4d78dab0ea220"
+  "gitHead": "843130ec0c98f4dc0cc08ac7b92fe24d148b884a"
 }