@arcblock/ux 2.13.15 → 2.13.17

package/lib/SessionUser/components/user-info.js

@@ -24,7 +24,10 @@ export default function UserInfo({
     return translate(translations, key, locale, 'en', data);
   });
   const avatar = getUserAvatar(session.user?.avatar?.replace(/\s/g, encodeURIComponent(' ')), 64);
-  const currentRole = useCreation(() => session.user?.passports?.find(item => item.name === session.user.role), [session?.user?.passports, session?.user?.role]);
+  const currentRole = useCreation(() => {
+    // FIXME: @zhanghan 感觉应该把 name 的判断去掉？
+    return session.user?.passports?.find(item => item.name === session.user.role || item.role === session.user.role);
+  }, [session?.user?.passports, session?.user?.role]);
   const hasBindWallet = useCreation(() => {
     return getWallet(session?.user);
   }, [session?.user]);

package/lib/SharedBridge/index.js

@@ -20,6 +20,7 @@ const SharedBridge = /*#__PURE__*/memo(function SharedBridge({
   const refId = useId();
   const dataId = `shared-bridge_${refId}`;
   const currentState = useReactive({
+    hasInited: undefined,
     open: false,
     hasStorageAccess: false,
     get origin() {
@@ -72,10 +73,22 @@ const SharedBridge = /*#__PURE__*/memo(function SharedBridge({
       value
     }) => {
       currentState.hasStorageAccess = value;
+      currentState.hasInited = true;
     });
+    setTimeout(() => {
+      if (currentState.hasInited === undefined) {
+        currentState.hasInited = false;
+      }
+    }, 1000);
     onLoad();
   });
-  return currentState.hasStorageAccess ? null : /*#__PURE__*/_jsxs(_Fragment, {
+  if (currentState.hasInited === false) {
+    return null;
+  }
+  if (currentState.hasStorageAccess) {
+    return null;
+  }
+  return /*#__PURE__*/_jsxs(_Fragment, {
     children: [/*#__PURE__*/_jsx(DialogComponent, {
       popup: true,
       locale: locale,
@@ -101,7 +114,8 @@ const SharedBridge = /*#__PURE__*/memo(function SharedBridge({
         left: 0,
         width: '100%',
         height: '100%',
-        cursor: 'pointer'
+        cursor: 'pointer',
+        opacity: 0
       }, sx)
     })]
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arcblock/ux",
-  "version": "2.13.15",
+  "version": "2.13.17",
   "description": "Common used react components for arcblock products",
   "keywords": [
     "react",
@@ -71,14 +71,14 @@
     "react": ">=18.2.0",
     "react-router-dom": ">=6.22.3"
   },
-  "gitHead": "94d15cfb22e13272502bb40863c5b059cb13eab5",
+  "gitHead": "cd775f10e9f90ed9813c8fd401fdae7c327c9c44",
   "dependencies": {
     "@arcblock/did-motif": "^1.1.13",
-    "@arcblock/icons": "^2.13.15",
-    "@arcblock/nft-display": "^2.13.15",
-    "@arcblock/react-hooks": "^2.13.15",
+    "@arcblock/icons": "^2.13.17",
+    "@arcblock/nft-display": "^2.13.17",
+    "@arcblock/react-hooks": "^2.13.17",
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
-    "@blocklet/theme": "^2.13.15",
+    "@blocklet/theme": "^2.13.17",
     "@fontsource/roboto": "~5.1.1",
     "@fontsource/ubuntu-mono": "^5.0.18",
     "@iconify-icons/logos": "^1.2.36",

package/src/SessionUser/components/user-info.tsx

@@ -36,10 +36,12 @@ export default function UserInfo({
     return translate(translations, key, locale, 'en', data);
   });
   const avatar = getUserAvatar(session.user?.avatar?.replace(/\s/g, encodeURIComponent(' ')), 64);
-  const currentRole = useCreation(
-    () => session.user?.passports?.find((item: $TSFixMe) => item.name === session.user.role),
-    [session?.user?.passports, session?.user?.role]
-  );
+  const currentRole = useCreation(() => {
+    // FIXME: @zhanghan 感觉应该把 name 的判断去掉？
+    return session.user?.passports?.find(
+      (item: $TSFixMe) => item.name === session.user.role || item.role === session.user.role
+    );
+  }, [session?.user?.passports, session?.user?.role]);
 
   const hasBindWallet = useCreation(() => {
     return getWallet(session?.user);

package/src/SharedBridge/index.tsx

@@ -29,7 +29,14 @@ const SharedBridge = memo(function SharedBridge({
   const _iframeRef = useRef<HTMLIFrameElement>(null);
   const refId = useId();
   const dataId = `shared-bridge_${refId}`;
-  const currentState = useReactive({
+  const currentState = useReactive<{
+    hasInited?: boolean;
+    open: boolean;
+    hasStorageAccess: boolean;
+    origin: string;
+    host: string;
+  }>({
+    hasInited: undefined,
     open: false,
     hasStorageAccess: false,
     get origin() {
@@ -80,11 +87,25 @@ const SharedBridge = memo(function SharedBridge({
   const handleLoad = useMemoizedFn(() => {
     callIframe(targetIframeRef.current as HTMLIFrameElement, 'hasStorageAccess').then(({ value }) => {
       currentState.hasStorageAccess = value;
+      currentState.hasInited = true;
     });
+    setTimeout(() => {
+      if (currentState.hasInited === undefined) {
+        currentState.hasInited = false;
+      }
+    }, 1000);
     onLoad();
   });
 
-  return currentState.hasStorageAccess ? null : (
+  if (currentState.hasInited === false) {
+    return null;
+  }
+
+  if (currentState.hasStorageAccess) {
+    return null;
+  }
+
+  return (
     <>
       <DialogComponent
         popup
@@ -112,6 +133,7 @@ const SharedBridge = memo(function SharedBridge({
             width: '100%',
             height: '100%',
             cursor: 'pointer',
+            opacity: 0,
           },
           sx
         )}