@arcblock/ux 3.1.15 → 3.1.17

package/lib/DIDConnect/auth-apps/auth-apps-info.js

@@ -1,9 +1,9 @@
 import { jsxs as r, jsx as t } from "react/jsx-runtime";
 import { Box as e, Typography as l } from "@mui/material";
-import i from "../../Img/index.js";
+import o from "../../Img/index.js";
 function m({
   requestAppInfo: a,
-  currentAppInfo: o
+  currentAppInfo: i
 }) {
   return /* @__PURE__ */ r(
     e,
@@ -25,7 +25,7 @@ function m({
               justifyContent: "center"
             },
             children: [
-              /* @__PURE__ */ t(i, { src: o.appLogo, alt: "Server", width: 48, height: 48, useProxyFallback: !0 }),
+              /* @__PURE__ */ t(o, { src: i.appLogo, alt: "Server", width: 48, height: 48, useProxyFallback: !0 }),
               /* @__PURE__ */ r(
                 e,
                 {
@@ -37,7 +37,7 @@ function m({
                       width: 8,
                       height: 8,
                       borderRadius: "50%",
-                      bgcolor: "divider",
+                      bgcolor: "grey.500",
                       mx: 0.5
                     }
                   },
@@ -48,7 +48,7 @@ function m({
                   ]
                 }
               ),
-              /* @__PURE__ */ t(i, { src: a.appLogo, alt: a.appName, width: 48, height: 48, useProxyFallback: !0 })
+              /* @__PURE__ */ t(o, { src: a.appLogo, alt: a.appName, width: 48, height: 48, useProxyFallback: !0 })
             ]
           }
         ),

package/lib/Result/result.js

@@ -1,36 +1,36 @@
-import { jsxs as f, jsx as e } from "react/jsx-runtime";
-import { Box as n } from "@mui/material";
-import { styled as c } from "../Theme/index.js";
-function g({ icon: r = null, title: t = "", description: o = "", extra: i = null, ...l }) {
-  return /* @__PURE__ */ f(s, { ...l, children: [
-    r,
-    typeof t == "string" ? /* @__PURE__ */ e(
-      n,
+import { jsxs as c, jsx as n } from "react/jsx-runtime";
+import { Box as r } from "@mui/material";
+import { styled as x } from "../Theme/index.js";
+function a({ icon: t = null, title: e = "", description: o = "", extra: i = null, ...l }) {
+  return /* @__PURE__ */ c(s, { ...l, children: [
+    t,
+    typeof e == "string" ? /* @__PURE__ */ n(
+      r,
       {
         sx: {
           mt: 3,
           fontSize: 22,
           fontWeight: 400,
-          color: "#47494E",
+          color: "text.primary",
           textAlign: "center"
         },
-        children: t
+        children: e
       }
-    ) : t,
-    typeof o == "string" ? /* @__PURE__ */ e(
-      n,
+    ) : e,
+    typeof o == "string" ? /* @__PURE__ */ n(
+      r,
       {
         sx: {
           mt: 1,
           fontSize: 14,
-          color: "#7F828B",
+          color: "text.secondary",
           textAlign: "center"
         },
         children: o
       }
     ) : o,
-    /* @__PURE__ */ e(
-      n,
+    /* @__PURE__ */ n(
+      r,
       {
         sx: {
           mt: 3
@@ -40,7 +40,7 @@ function g({ icon: r = null, title: t = "", description: o = "", extra: i = null
     )
   ] });
 }
-const s = c("div")`
+const s = x("div")`
   box-sizing: border-box;
   display: flex;
   flex-direction: column;
@@ -49,8 +49,8 @@ const s = c("div")`
   height: 100%;
   padding: 16px;
 
-  background-color: #f7f8fb;
+  background-color: ${({ theme: t }) => t.palette?.background?.default || "#F7F8F8"};
 `;
 export {
-  g as default
+  a as default
 };

package/lib/Util/federated.js

@@ -7,7 +7,10 @@ function s(e = window.blocklet) {
   return (e?.settings?.federated || {}).config;
 }
 function d(e = window.blocklet) {
-  return !e || i(e).appPid === e.appPid ? !1 : s(e)?.status === "approved";
+  if (!e)
+    return !1;
+  const p = i(e);
+  return !p || p.appPid === e.appPid ? !1 : s(e)?.status === "approved";
 }
 function w(e = window.blocklet) {
   return i(e)?.appPid;
@@ -56,24 +59,24 @@ function u(e = window.blocklet) {
   }) : null;
 }
 function g(e) {
-  const p = [], r = c(e), t = u(e), n = d(e);
-  return t && p.push(t), r && r?.appId !== t?.appId && n && p.push(r), p.reverse();
+  const p = [], r = c(e), n = u(e), t = d(e);
+  return n && p.push(n), r && r?.appId !== n?.appId && t && p.push(r), p.reverse();
 }
-async function m(e, p = !1) {
+async function l(e, p = !1) {
   if (!p && a[e])
     return a[e];
   try {
     const r = new URL("__blocklet__.js", e);
     r.searchParams.set("type", "json");
-    const n = await (await fetch(r.href)).json();
-    return a[e] = n, n;
+    const t = await (await fetch(r.href)).json();
+    return a[e] = t, t;
   } catch (r) {
     return console.error(`Failed to get blocklet data: ${e}`, r), null;
   }
 }
 export {
   g as getApps,
-  m as getBlockletData,
+  l as getBlockletData,
   s as getConfig,
   u as getCurrentApp,
   c as getFederatedApp,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arcblock/ux",
-  "version": "3.1.15",
+  "version": "3.1.17",
   "description": "Common used react components for arcblock products",
   "keywords": [
     "react",
@@ -66,16 +66,16 @@
     "react": "^19.0.0",
     "react-router-dom": "^6.22.3"
   },
-  "gitHead": "18d5ccbb8f712ce559d3a4f4758b185b196b858c",
+  "gitHead": "5b5551ce69cf45e2bed8cc06fbb3592020b7618c",
   "dependencies": {
-    "@arcblock/bridge": "3.1.15",
+    "@arcblock/bridge": "3.1.17",
     "@arcblock/did": "^1.21.3",
     "@arcblock/did-motif": "^1.1.14",
-    "@arcblock/icons": "3.1.15",
-    "@arcblock/nft-display": "3.1.15",
-    "@arcblock/react-hooks": "3.1.15",
+    "@arcblock/icons": "3.1.17",
+    "@arcblock/nft-display": "3.1.17",
+    "@arcblock/react-hooks": "3.1.17",
     "@blocklet/js-sdk": "^1.16.48",
-    "@blocklet/theme": "3.1.15",
+    "@blocklet/theme": "3.1.17",
     "@fontsource/roboto": "~5.1.1",
     "@fontsource/ubuntu-mono": "^5.2.6",
     "@iconify-icons/logos": "^1.2.36",

package/src/DIDConnect/auth-apps/auth-apps-info.tsx

@@ -47,7 +47,7 @@ export default function AuthAppsInfo({
               width: 8,
               height: 8,
               borderRadius: '50%',
-              bgcolor: 'divider',
+              bgcolor: 'grey.500',
               mx: 0.5,
             },
           }}>

package/src/Result/result.tsx

@@ -19,7 +19,7 @@ function Result({ icon = null, title = '', description = '', extra = null, ...re
             mt: 3,
             fontSize: 22,
             fontWeight: 400,
-            color: '#47494E',
+            color: 'text.primary',
             textAlign: 'center',
           }}>
           {title}
@@ -32,7 +32,7 @@ function Result({ icon = null, title = '', description = '', extra = null, ...re
           sx={{
             mt: 1,
             fontSize: 14,
-            color: '#7F828B',
+            color: 'text.secondary',
             textAlign: 'center',
           }}>
           {description}
@@ -59,7 +59,7 @@ const Root = styled('div')`
   height: 100%;
   padding: 16px;
 
-  background-color: #f7f8fb;
+  background-color: ${({ theme }) => theme.palette?.background?.default || '#F7F8F8'};
 `;
 
 export default Result;

package/src/Util/federated.ts

@@ -19,7 +19,7 @@ export function getFederatedEnabled(blocklet = window.blocklet) {
   }
   const master = getMaster(blocklet);
   // 如果当前应用是 master，则代表未开启统一登录
-  if (master.appPid === blocklet.appPid) {
+  if (!master || master.appPid === blocklet.appPid) {
     return false;
   }