@blocklet/ui-react 3.2.15 → 3.2.16

package/lib/common/notification-addon.js

@@ -1,73 +1,77 @@
-import { jsx as s } from "react/jsx-runtime";
-import U from "prop-types";
-import { useMemo as y, useCallback as I, useEffect as $ } from "react";
-import { IconButton as g, Badge as B } from "@mui/material";
-import { useSnackbar as D } from "notistack";
-import P from "@arcblock/icons/lib/Notification";
-import { useCreation as c } from "ahooks";
-import { WELLKNOWN_SERVICE_PATH_PREFIX as S, EVENTS as L } from "@abtnode/constant";
-import V from "@arcblock/react-hooks/lib/useBrowser";
-import { compareVersions as x } from "@arcblock/ux/lib/Util";
-import { joinURL as j, withQuery as A } from "ufo";
-import { useListenWsClient as F } from "./ws.js";
-import H from "../Notifications/Snackbar.js";
-const E = j(S, "user", "notifications"), K = (o) => A(E, {
-  id: o.id,
-  severity: o.severity || "all",
-  componentDid: o.source === "system" ? "system" : o.componentDid || "all"
+import { jsx as c } from "react/jsx-runtime";
+import S from "prop-types";
+import { useMemo as L, useCallback as T, useEffect as $ } from "react";
+import { IconButton as B, Badge as P } from "@mui/material";
+import { useSnackbar as V } from "notistack";
+import x from "@arcblock/icons/lib/Notification";
+import { useCreation as s } from "ahooks";
+import { WELLKNOWN_SERVICE_PATH_PREFIX as W, ROLES as A, EVENTS as O } from "@abtnode/constant";
+import j from "@arcblock/react-hooks/lib/useBrowser";
+import { compareVersions as F } from "@arcblock/ux/lib/Util";
+import { joinURL as H, withQuery as R } from "ufo";
+import { useListenWsClient as K } from "./ws.js";
+import M from "../Notifications/Snackbar.js";
+const E = H(W, "user", "notifications"), z = (r) => R(E, {
+  id: r.id,
+  severity: r.severity || "all",
+  componentDid: r.source === "system" ? "system" : r.componentDid || "all"
 });
-function W({ session: o = {} }) {
-  const { unReadCount: l, user: n, setUnReadCount: i } = o, e = c(() => n?.did, [n]), { enqueueSnackbar: k } = D(), d = V(), u = y(() => !e || n?.isPreviewUser || e === window.blocklet.did, [e, n]), N = y(() => d.arcSphere || d.wallet, [d]), T = c(() => window.blocklet?.serverVersion, []), t = F("user"), a = c(
-    () => `${window.blocklet.did}/${e}/${L.NOTIFICATION_BLOCKLET_CREATE}`,
+function q({ session: r = {} }) {
+  const { unReadCount: l, user: t, setUnReadCount: i } = r, e = s(() => t?.did, [t]), h = s(() => t?.role && [A.ADMIN, A.OWNER].includes(t?.role), [t?.role]), { enqueueSnackbar: N } = V(), d = j(), u = L(() => !e || t?.isPreviewUser || e === window.blocklet.did, [e, t]), k = L(() => d.arcSphere || d.wallet, [d]), y = s(() => window.blocklet?.serverVersion, []), n = K("user"), a = s(
+    () => `${window.blocklet.did}/${e}/${O.NOTIFICATION_BLOCKLET_CREATE}`,
     [e]
-  ), m = c(
-    () => `${window.blocklet.did}/${e}/${L.NOTIFICATION_BLOCKLET_READ}`,
+  ), m = s(
+    () => `${window.blocklet.did}/${e}/${O.NOTIFICATION_BLOCKLET_READ}`,
     [e]
-  ), f = I(
-    (r) => {
-      const { receivers: v } = r ?? {}, { receiver: w } = v[0] ?? {};
-      if (w === e) {
+  ), p = T(
+    (o) => {
+      const { receivers: v, source: w } = o ?? {}, { receiver: C } = v[0] ?? {};
+      if (C === e && (h || w !== "system")) {
         i((b) => b + 1);
-        const C = x(T, "1.16.42-beta-20250407");
-        if (!N && r.source === "component" && C) {
-          const b = K(r), { severity: h, description: R } = r || {}, O = ["error", "warning"].includes(h) || r.sticky;
-          k(R, {
-            variant: h,
-            autoHideDuration: O ? null : 5e3,
+        const U = F(y, "1.16.42-beta-20250407");
+        if (!k && o.source === "component" && U) {
+          const b = z(o), { severity: I, description: _ } = o || {}, g = ["error", "warning"].includes(I) || o.sticky;
+          N(_, {
+            variant: I,
+            autoHideDuration: g ? null : 5e3,
+            anchorOrigin: {
+              vertical: "top",
+              horizontal: "center"
+            },
             // eslint-disable-next-line react/no-unstable-nested-components
-            content: (_) => /* @__PURE__ */ s(H, { viewAllUrl: b, keyId: _, notification: r })
+            content: (D) => /* @__PURE__ */ c(M, { viewAllUrl: b, keyId: D, notification: o })
           });
         }
       }
     },
-    [e, i, k, T, N]
-  ), p = I(
-    (r) => {
-      const { receiver: v, readCount: w } = r ?? {};
+    [e, i, N, y, k, h]
+  ), f = T(
+    (o) => {
+      const { receiver: v, readCount: w } = o ?? {};
       v === e && i((C) => Math.max(C - w, 0));
     },
     [e, i]
   );
-  return $(() => (t && !u && (t.on(a, f), t.on(m, p)), () => {
-    t && !u && (t.off(a, f), t.off(m, p));
-  }), [t, i, f, a, p, m, u]), !o.user || !E ? null : /* @__PURE__ */ s(
-    g,
+  return $(() => (n && !u && (n.on(a, p), n.on(m, f)), () => {
+    n && !u && (n.off(a, p), n.off(m, f));
+  }), [n, i, p, a, f, m, u]), !r.user || !E ? null : /* @__PURE__ */ c(
+    B,
     {
       size: "medium",
       variant: "outlined",
-      href: A(E, { read: l <= 0 }),
+      href: R(E, { read: l <= 0 }),
       sx: {
         "&:hover": {
           borderRadius: "50%"
         }
       },
-      children: /* @__PURE__ */ s(B, { badgeContent: l, color: "error", invisible: l === 0, children: /* @__PURE__ */ s(P, { style: { width: "auto", height: 24 } }) })
+      children: /* @__PURE__ */ c(P, { badgeContent: l, color: "error", invisible: l === 0, children: /* @__PURE__ */ c(x, { style: { width: "auto", height: 24 } }) })
     }
   );
 }
-W.propTypes = {
-  session: U.object
+q.propTypes = {
+  session: S.object
 };
 export {
-  W as default
+  q as default
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/ui-react",
-  "version": "3.2.15",
+  "version": "3.2.16",
   "description": "Some useful front-end web components that can be used in Blocklets.",
   "keywords": [
     "react",
@@ -35,9 +35,9 @@
   "dependencies": {
     "@abtnode/constant": "^1.17.5",
     "@abtnode/util": "^1.17.5",
-    "@arcblock/bridge": "3.2.15",
-    "@arcblock/icons": "3.2.15",
-    "@arcblock/react-hooks": "3.2.15",
+    "@arcblock/bridge": "3.2.16",
+    "@arcblock/icons": "3.2.16",
+    "@arcblock/react-hooks": "3.2.16",
     "@arcblock/ws": "^1.27.15",
     "@blocklet/did-space-react": "^1.2.10",
     "@iconify-icons/logos": "^1.2.36",
@@ -82,7 +82,7 @@
     "access": "public"
   },
   "devDependencies": {
-    "@arcblock/did-connect-react": "3.2.15",
+    "@arcblock/did-connect-react": "3.2.16",
     "@types/dompurify": "^3.2.0",
     "@types/ua-parser-js": "^0.7.39",
     "@types/validator": "^13.15.2",
@@ -90,5 +90,5 @@
     "jest": "^29.7.0",
     "unbuild": "^2.0.0"
   },
-  "gitHead": "b58ce4d5e4db14f8ece4a980206521ea8c0d6909"
+  "gitHead": "cc7ec117370b11df3e5e1b60120af8f5e2e82cb7"
 }

package/src/common/notification-addon.jsx

@@ -4,7 +4,7 @@ import { IconButton, Badge } from '@mui/material';
 import { useSnackbar } from 'notistack';
 import NotificationsOutlinedIcon from '@arcblock/icons/lib/Notification';
 import { useCreation } from 'ahooks';
-import { EVENTS, WELLKNOWN_SERVICE_PATH_PREFIX } from '@abtnode/constant';
+import { EVENTS, WELLKNOWN_SERVICE_PATH_PREFIX, ROLES } from '@abtnode/constant';
 import useBrowser from '@arcblock/react-hooks/lib/useBrowser';
 import { compareVersions } from '@arcblock/ux/lib/Util';
 import { joinURL, withQuery } from 'ufo';
@@ -25,6 +25,8 @@ export default function NotificationAddon({ session = {} }) {
   const { unReadCount, user, setUnReadCount } = session;
   const userDid = useCreation(() => user?.did, [user]);
 
+  const isAdmin = useCreation(() => user?.role && [ROLES.ADMIN, ROLES.OWNER].includes(user?.role), [user?.role]);
+
   const { enqueueSnackbar } = useSnackbar();
   const browser = useBrowser();
 
@@ -54,11 +56,11 @@ export default function NotificationAddon({ session = {} }) {
 
   const listenCallback = useCallback(
     (notification) => {
-      const { receivers } = notification ?? {};
+      const { receivers, source } = notification ?? {};
 
       const { receiver: notificationReceiver } = receivers[0] ?? {};
-
-      if (notificationReceiver === userDid) {
+      const shouldUpdate = isAdmin || source !== 'system';
+      if (notificationReceiver === userDid && shouldUpdate) {
         setUnReadCount((x) => x + 1);
         // 显示通知, 如果是系统通知则不需要显示, 如果是移动端不需要显示
         // 兼容代码，如果 server 没有升级那么不需要提示
@@ -70,13 +72,17 @@ export default function NotificationAddon({ session = {} }) {
           enqueueSnackbar(description, {
             variant: severity,
             autoHideDuration: disableAutoHide ? null : 5000,
+            anchorOrigin: {
+              vertical: 'top',
+              horizontal: 'center',
+            },
             // eslint-disable-next-line react/no-unstable-nested-components
             content: (key) => <NotificationSnackbar viewAllUrl={link} keyId={key} notification={notification} />,
           });
         }
       }
     },
-    [userDid, setUnReadCount, enqueueSnackbar, serverVersion, hiddenNotificationToast]
+    [userDid, setUnReadCount, enqueueSnackbar, serverVersion, hiddenNotificationToast, isAdmin]
   );
 
   const readListenCallback = useCallback(