@blocklet/ui-react 3.1.7 → 3.1.8

package/lib/common/wizard-modal.js

@@ -1,34 +1,34 @@
-import { jsxs as v, jsx as a } from "react/jsx-runtime";
-import { useLocaleContext as j } from "@arcblock/ux/lib/Locale/context";
-import { Dialog as C, useTheme as D, useMediaQuery as E, Box as R, CircularProgress as M, Typography as A } from "@mui/material";
-import F from "lodash/merge";
+import { jsxs as x, jsx as a } from "react/jsx-runtime";
+import { useLocaleContext as T } from "@arcblock/ux/lib/Locale/context";
+import { Dialog as R, useTheme as j, useMediaQuery as D, Box as v, CircularProgress as E, Typography as M } from "@mui/material";
+import P from "lodash/merge";
 import t from "prop-types";
-import { useState as b, useRef as y, useEffect as s } from "react";
-import { withQuery as B, joinURL as Q } from "ufo";
-const _ = "/.well-known/service/onboard/bind-account";
-function H({
-  onFinished: z = () => {
+import { useState as h, useRef as b, useEffect as s } from "react";
+import { withQuery as A, joinURL as F } from "ufo";
+const B = "/.well-known/service/onboard/bind-account";
+function Q({
+  onFinished: y = () => {
   },
   show: n = !1,
-  onChangeVisible: k = () => {
+  onChangeVisible: C = () => {
   },
   loadingText: l = "",
-  defaultPath: c = _,
+  defaultPath: c = B,
   ...d
 }) {
-  const [r, i] = b(n), [u, f] = b(!1), [I, m] = b(() => {
+  const [r, i] = h(n), [u, f] = h(!1), [k, m] = h(() => {
     const e = localStorage.getItem("wizard-current-url");
     return e?.includes("/.well-known/service/onboard") ? e : c;
-  }), x = y(z), p = y(), w = y(null), { locale: L } = j(), S = D(), g = E(S.breakpoints.down("sm"));
-  if (x.current = z, p.current = () => {
-    if (w.current?.contentWindow)
+  }), z = b(y), p = b(), g = b(null), { locale: I } = T(), L = j(), w = D(L.breakpoints.down("sm"));
+  if (z.current = y, p.current = () => {
+    if (g.current?.contentWindow)
       try {
-        const o = new URL(w.current.contentWindow.location.href).pathname;
+        const o = new URL(g.current.contentWindow.location.href).pathname;
         localStorage.setItem("wizard-current-url", o), m(o);
       } catch (e) {
         m(c), console.warn("Failed to save wizard URL:", e);
       }
-    localStorage.setItem("wizard-completed", "true"), i(!1), k(!1);
+    localStorage.setItem("wizard-completed", "true"), i(!1), C(!1);
   }, s(() => {
     n !== r && i(n);
   }, [n]), s(() => {
@@ -37,17 +37,13 @@ function H({
     const e = (o) => {
       if (o.origin !== window.location.origin)
         return;
-      const { type: W, data: T } = o.data || {};
-      switch (W) {
+      const { type: U, data: W } = o.data || {};
+      switch (U) {
         case "wizard.loaded":
           f(!0);
           break;
         case "wizard.finished": {
-          i(!1), m(c), localStorage.removeItem("wizard-current-url"), localStorage.setItem("wizard-completed", "true");
-          const h = x.current?.(T);
-          h instanceof Promise ? h.then((P) => {
-            P !== !1 && window.location.reload();
-          }) : h !== !1 && window.location.reload();
+          i(!1), m(c), localStorage.removeItem("wizard-current-url"), localStorage.setItem("wizard-completed", "true"), z.current?.(W);
           break;
         }
         case "wizard.close": {
@@ -63,20 +59,20 @@ function H({
     localStorage.getItem("wizard-completed") || i(!0);
   }, []), !r)
     return null;
-  const U = B(Q(window.location.origin, I), {
-    locale: L
+  const S = A(F(window.location.origin, k), {
+    locale: I
   });
-  return /* @__PURE__ */ v(
-    C,
+  return /* @__PURE__ */ x(
+    R,
     {
       id: "wizard-dialog",
       open: r,
       onClose: () => p.current(),
       fullWidth: !0,
-      maxWidth: g ? !1 : "md",
-      fullScreen: g,
+      maxWidth: w ? !1 : "md",
+      fullScreen: w,
       ...d,
-      slotProps: F(
+      slotProps: P(
         {},
         {
           paper: {
@@ -85,7 +81,7 @@ function H({
               borderRadius: 0,
               position: "relative",
               overflow: "hidden",
-              ...g ? { borderRadius: 0 } : {
+              ...w ? { borderRadius: 0 } : {
                 borderRadius: 1,
                 height: "720px"
               }
@@ -104,9 +100,9 @@ function H({
         /* @__PURE__ */ a(
           "iframe",
           {
-            ref: w,
+            ref: g,
             id: "wizard-iframe",
-            src: U,
+            src: S,
             title: "Setup Wizard",
             style: {
               width: "100%",
@@ -121,7 +117,7 @@ function H({
           }
         ),
         u ? null : /* @__PURE__ */ a(
-          R,
+          v,
           {
             sx: {
               position: "absolute",
@@ -134,9 +130,9 @@ function H({
               alignItems: "center",
               bgcolor: "background.paper"
             },
-            children: /* @__PURE__ */ v(R, { sx: { display: "flex", alignItems: "center", flexDirection: "column", gap: 1 }, children: [
-              /* @__PURE__ */ a(M, {}),
-              typeof l == "string" ? /* @__PURE__ */ a(A, { variant: "body1", children: l }) : l
+            children: /* @__PURE__ */ x(v, { sx: { display: "flex", alignItems: "center", flexDirection: "column", gap: 1 }, children: [
+              /* @__PURE__ */ a(E, {}),
+              typeof l == "string" ? /* @__PURE__ */ a(M, { variant: "body1", children: l }) : l
             ] })
           }
         )
@@ -144,14 +140,14 @@ function H({
     }
   );
 }
-H.propTypes = {
+Q.propTypes = {
   onFinished: t.func,
   show: t.bool,
   onChangeVisible: t.func,
   loadingText: t.node,
   defaultPath: t.string,
-  ...C.propTypes
+  ...R.propTypes
 };
 export {
-  H as default
+  Q as default
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/ui-react",
-  "version": "3.1.7",
+  "version": "3.1.8",
   "description": "Some useful front-end web components that can be used in Blocklets.",
   "keywords": [
     "react",
@@ -35,9 +35,9 @@
   "dependencies": {
     "@abtnode/constant": "^1.16.47",
     "@abtnode/util": "^1.16.47",
-    "@arcblock/bridge": "3.1.7",
-    "@arcblock/icons": "3.1.7",
-    "@arcblock/react-hooks": "3.1.7",
+    "@arcblock/bridge": "3.1.8",
+    "@arcblock/icons": "3.1.8",
+    "@arcblock/react-hooks": "3.1.8",
     "@arcblock/ws": "^1.21.2",
     "@blocklet/constant": "^1.16.47",
     "@blocklet/did-space-react": "^1.1.14",
@@ -84,7 +84,7 @@
     "access": "public"
   },
   "devDependencies": {
-    "@arcblock/did-connect-react": "3.1.7",
+    "@arcblock/did-connect-react": "3.1.8",
     "@types/dompurify": "^3.2.0",
     "@types/ua-parser-js": "^0.7.39",
     "@types/validator": "^13.15.2",
@@ -92,5 +92,5 @@
     "jest": "^29.7.0",
     "unbuild": "^2.0.0"
   },
-  "gitHead": "8f0b8300d7c73a1d82f7b76d3e7c293f921b260c"
+  "gitHead": "bb291c7f0f1afa39ca3dc07471c63b118a377cbe"
 }

package/src/common/wizard-modal.jsx

@@ -82,16 +82,7 @@ export default function WizardModal({
           setCurrentUrl(defaultPath);
           localStorage.removeItem('wizard-current-url');
           localStorage.setItem('wizard-completed', 'true');
-          const result = onFinishedRef.current?.(data);
-          if (result instanceof Promise) {
-            result.then((reload) => {
-              if (reload !== false) {
-                window.location.reload();
-              }
-            });
-          } else if (result !== false) {
-            window.location.reload();
-          }
+          onFinishedRef.current?.(data);
           break;
         }
         case 'wizard.close': {