@blocklet/ui-react 3.0.38 → 3.0.41

package/lib/Dashboard/index.js

@@ -1,52 +1,52 @@
 import { jsx as i } from "react/jsx-runtime";
 import "iconify-icon";
-import { use as I, useMemo as b, useLayoutEffect as v } from "react";
+import { use as I, useMemo as v, useLayoutEffect as w } from "react";
 import t from "prop-types";
 import { SessionContext as R } from "@arcblock/did-connect/lib/Session";
 import { useLocaleContext as T } from "@arcblock/ux/lib/Locale/context";
-import C from "@arcblock/ux/lib/Img";
-import D from "@arcblock/ux/lib/Layout/dashboard";
-import M from "@arcblock/ux/lib/hooks/use-blocklet-logo";
-import { SessionManagerProps as A, BlockletMetaProps as O } from "../types.js";
-import { mapRecursive as j, flatRecursive as H, matchPaths as S } from "../utils.js";
-import { formatBlockletInfo as E, getLocalizedNavigation as U, filterNavByRole as _, publicPath as h } from "../blocklets.js";
-import q from "../common/header-addons.js";
-import { useWalletHiddenTopbar as F } from "../common/wallet-hidden-topbar.js";
-function G({
+import z from "@arcblock/ux/lib/Img";
+import A from "@arcblock/ux/lib/Layout/dashboard";
+import C from "@arcblock/ux/lib/hooks/use-blocklet-logo";
+import { SessionManagerProps as D, BlockletMetaProps as M } from "../types.js";
+import { mapRecursive as O, flatRecursive as j, matchPaths as H } from "../utils.js";
+import { formatBlockletInfo as S, getLocalizedNavigation as _, filterNavByRole as E, publicPath as m } from "../blocklets.js";
+import U from "../common/header-addons.js";
+import { useWalletHiddenTopbar as q } from "../common/wallet-hidden-topbar.js";
+function F({
   meta: s = {},
-  fallbackUrl: a = h,
+  fallbackUrl: a = m,
   invalidPathFallback: l = null,
   headerAddons: k = void 0,
   sessionManagerProps: L = {
     showRole: !0,
     // dashboard 默认退出登录行为: 跳转到 (root) blocklet 首页
     onLogout: () => {
-      window.location.href = h;
+      window.location.href = m;
     }
   },
   links: c = [],
-  showDomainWarningDialog: P = !0,
-  ...d
+  showDomainWarningDialog: N = !0,
+  ...h
 }) {
-  F();
-  const f = I(R)?.session?.user, g = f?.role, { locale: x } = T() || {}, r = b(() => {
+  q();
+  const d = I(R)?.session?.user, g = d?.role, { locale: x } = T() || {}, r = v(() => {
     const e = Object.assign({}, window.blocklet, s);
     try {
-      return E(e);
+      return S(e);
     } catch (n) {
       return console.error("Failed to format blocklet info", n, e), e;
     }
-  }, [s]), { localizedNav: w, flattened: p, matchedIndex: y } = b(() => {
-    let e = U(r?.navigation?.dashboard, x) || [];
-    e = _(e, g), e = j(
+  }, [s]), { localizedNav: y, flattened: f, matchedIndex: b } = v(() => {
+    let e = _(r?.navigation?.dashboard, x) || [];
+    e = E(e, g), e = O(
       e,
       (o) => {
-        let m = null;
-        return o.icon && (o.icon.startsWith("http") || o.icon.startsWith("data:") ? m = /* @__PURE__ */ i(C, { src: o.icon }) : m = /* @__PURE__ */ i("iconify-icon", { height: "100%", width: "100%", icon: o.icon })), {
+        let u = null;
+        return o.icon && (o.icon.startsWith("http") || o.icon.startsWith("data:") ? u = /* @__PURE__ */ i(z, { src: o.icon }) : u = /* @__PURE__ */ i("iconify-icon", { height: "100%", width: "100%", icon: o.icon })), {
           id: o.id,
           title: o.title,
           url: o.link,
-          icon: m,
+          icon: u,
           // https://github.com/ArcBlock/ux/issues/755#issuecomment-1208692620
           external: !0,
           children: o.items
@@ -54,56 +54,55 @@ function G({
       },
       "items"
     );
-    const n = H(e).filter((o) => !!o.url), u = S(n.map((o) => o.url));
-    return u !== -1 && (n[u].active = !0), { localizedNav: e, flattened: n, matchedIndex: u };
-  }, [r, x, g]), W = typeof c == "function" ? c(w) : [...w, ...c], N = M({
+    const n = j(e).filter((o) => !!o.url), p = H(n.map((o) => o.url));
+    return p !== -1 && (n[p].active = !0), { localizedNav: e, flattened: n, matchedIndex: p };
+  }, [r, x, g]), P = typeof c == "function" ? c(y) : [...y, ...c], W = C({
     meta: s
   });
-  if (v(() => {
-    f && !p?.length && a && (window.location.href = a);
-  }, [a]), v(() => {
-    f && p?.length && y === -1 && l && l();
-  }, [l, p, y]), !r.appName)
+  if (w(() => {
+    d && !f?.length && a && (window.location.href = a);
+  }, [a]), w(() => {
+    d && f?.length && b === -1 && l && l();
+  }, [l, f, b]), !r.appName)
     return null;
-  const { appName: z } = r, B = /* @__PURE__ */ i(
-    q,
-    {
-      formattedBlocklet: r,
-      addons: k,
-      sessionManagerProps: L,
-      showDomainWarningDialog: P,
-      showWizard: d.headerProps?.showWizard
-    }
-  );
+  const { appName: B } = r;
   return /* @__PURE__ */ i(
-    D,
+    A,
     {
-      title: z,
+      title: B,
       fullWidth: !0,
       sidebarWidth: 128,
       legacy: !1,
-      links: W,
-      ...d,
+      links: P,
+      ...h,
       headerProps: {
-        homeLink: h,
-        logo: /* @__PURE__ */ i("img", { src: N, alt: "logo" }),
-        addons: B,
-        ...d.headerProps
+        homeLink: m,
+        logo: /* @__PURE__ */ i("img", { src: W, alt: "logo" }),
+        addons: /* @__PURE__ */ i(
+          U,
+          {
+            formattedBlocklet: r,
+            addons: k,
+            sessionManagerProps: L,
+            showDomainWarningDialog: N
+          }
+        ),
+        ...h.headerProps
       }
     }
   );
 }
-G.propTypes = {
-  meta: O,
+F.propTypes = {
+  meta: M,
   // 如果当前用户没有权限访问任何导航菜单, 则自动跳转到 fallbackUrl, 默认值为 publicPath, 设置为 null 表示禁用自动跳转
   fallbackUrl: t.string,
   // 当前路径未匹配任何 nav links 时的 fallback, 默认行为跳转到首个可用的 nav link
   invalidPathFallback: t.func,
   headerAddons: t.oneOfType([t.func, t.node]),
-  sessionManagerProps: A,
+  sessionManagerProps: D,
   links: t.oneOfType([t.array, t.func]),
   showDomainWarningDialog: t.bool
 };
 export {
-  G as default
+  F as default
 };

package/lib/Footer/links.js

@@ -11,7 +11,7 @@ import C from "../Icon/index.js";
 import A from "../hooks/use-mobile.js";
 import { splitNavColumns as E } from "../utils.js";
 function F({ links: e = [], flowLayout: d = !1, columns: u, ...x }) {
-  const [g, b] = N(-1), y = A({ key: "md" }), h = e.some((t) => t.items?.length), k = !y && h && j(u) && u > 1, p = ({ label: t, link: o, icon: i, render: a, props: n }) => {
+  const [g, b] = N(-1), w = A({ key: "md" }), h = e.some((t) => t.items?.length), k = !w && h && j(u) && u > 1, p = ({ label: t, link: o, icon: i, render: a, props: n }) => {
     let s = t;
     if (a)
       s = a({ label: t, link: o, props: n });
@@ -33,7 +33,7 @@ function F({ links: e = [], flowLayout: d = !1, columns: u, ...x }) {
       i && /* @__PURE__ */ r(C, { icon: i, size: 20, sx: { mr: 0.5 } }),
       s
     ] });
-  }, w = $(() => e?.length ? d ? e.map((t, o) => /* @__PURE__ */ r("span", { className: "footer-links-item", children: p(t) }, o)) : k ? E(e, { columns: u }).map((t, o) => /* @__PURE__ */ r("div", { className: "footer-links-column", children: t.filter((i) => i.group).map((i, a) => {
+  }, y = $(() => e?.length ? d ? e.map((t, o) => /* @__PURE__ */ r("span", { className: "footer-links-item", children: p(t) }, o)) : k ? E(e, { columns: u }).map((t, o) => /* @__PURE__ */ r("div", { className: "footer-links-column", children: t.filter((i) => i.group).map((i, a) => {
     const { items: n } = i;
     return /* @__PURE__ */ m("div", { className: "footer-links-group", children: [
       /* @__PURE__ */ r("span", { className: "footer-links-item", children: p(i) }),
@@ -82,7 +82,7 @@ function F({ links: e = [], flowLayout: d = !1, columns: u, ...x }) {
         "footer-links--flow": d,
         "footer-links--columns": k
       }),
-      children: /* @__PURE__ */ r("div", { className: "footer-links-inner", children: w })
+      children: /* @__PURE__ */ r("div", { className: "footer-links-inner", children: y })
     }
   ) : null;
 }
@@ -131,6 +131,7 @@ const R = z("div")`
     position: relative;
     padding: 6px 8px;
     font-size: 14px;
+    white-space: nowrap;
     &--new::after {
       content: 'New';
       color: ${({ theme: e }) => e.palette.info.main};

package/lib/Header/index.d.ts

@@ -18,7 +18,6 @@ type HeaderProps = {
     align?: 'left' | 'right';
     maxWidth?: false | Breakpoint;
     showDomainWarningDialog?: boolean;
-    showWizard?: boolean;
 };
 declare const _default: import('react').ComponentType<HeaderProps & Omit<BoxProps, keyof HeaderProps>>;
 export default _default;

package/lib/Header/index.js

@@ -1,21 +1,21 @@
-import { jsx as n } from "react/jsx-runtime";
-import { useMemo as v } from "react";
+import { jsx as a } from "react/jsx-runtime";
+import { useMemo as f } from "react";
 import { useMemoizedFn as N } from "ahooks";
-import { withErrorBoundary as H } from "react-error-boundary";
-import { ErrorFallback as y } from "@arcblock/ux/lib/ErrorBoundary";
-import { styled as C, useTheme as T, deepmerge as _, ThemeProvider as E } from "@arcblock/ux/lib/Theme";
+import { withErrorBoundary as $ } from "react-error-boundary";
+import { ErrorFallback as C } from "@arcblock/ux/lib/ErrorBoundary";
+import { styled as H, useTheme as _, deepmerge as w, ThemeProvider as A } from "@arcblock/ux/lib/Theme";
 import { ResponsiveHeader as B } from "@arcblock/ux/lib/Header";
-import F, { Products as L } from "@arcblock/ux/lib/NavMenu";
-import { useLocaleContext as P } from "@arcblock/ux/lib/Locale/context";
-import { translate as R } from "@arcblock/ux/lib/Locale/util";
-import z from "@arcblock/ux/lib/hooks/use-blocklet-logo";
-import A from "lodash/omit";
-import M from "lodash/isFinite";
-import W from "clsx";
-import j from "../Icon/index.js";
-import { mapRecursive as S, flatRecursive as U, matchPaths as K } from "../utils.js";
-import { formatBlockletInfo as O, getLocalizedNavigation as q, publicPath as D } from "../blocklets.js";
-import G from "../common/header-addons.js";
+import L, { Products as R } from "@arcblock/ux/lib/NavMenu";
+import { useLocaleContext as F } from "@arcblock/ux/lib/Locale/context";
+import { translate as M } from "@arcblock/ux/lib/Locale/util";
+import O from "@arcblock/ux/lib/hooks/use-blocklet-logo";
+import P from "lodash/omit";
+import I from "lodash/isFinite";
+import z from "clsx";
+import W from "../Icon/index.js";
+import { mapRecursive as S, flatRecursive as U, matchPaths as j } from "../utils.js";
+import { formatBlockletInfo as G, getLocalizedNavigation as K, publicPath as q } from "../blocklets.js";
+import D from "../common/header-addons.js";
 import { useWalletHiddenTopbar as J } from "../common/wallet-hidden-topbar.js";
 import Q from "../libs/with-hide-when-embed.js";
 const V = {
@@ -25,119 +25,129 @@ const V = {
   zh: {
     products: "产品"
   }
-}, X = (e) => {
-  if (!e?.length)
+}, X = (r) => {
+  if (!r?.length)
     return { navItems: [], activeId: null };
-  let r = 1;
-  const i = S(e, (o) => {
-    const d = o.icon ? /* @__PURE__ */ n(j, { icon: o.icon }) : null;
-    if (o.items)
+  let t = 1;
+  const c = S(r, (e) => {
+    const i = e.icon ? /* @__PURE__ */ a(W, { icon: e.icon }) : null;
+    if (e.items)
       return {
-        id: `${r++}`,
-        label: o.title,
-        icon: d,
-        children: o.items
+        id: `${t++}`,
+        label: e.title,
+        icon: i,
+        children: e.items
       };
-    let l = {};
-    return (o.link?.startsWith("http") || o.link?.startsWith("//")) && (l = {
+    let s = {};
+    return (e.link?.startsWith("http") || e.link?.startsWith("//")) && (s = {
       target: "_blank",
       rel: "noreferrer"
     }), {
-      id: `${r++}`,
-      label: /* @__PURE__ */ n("a", { href: o.link, ...l, children: o.title }),
-      icon: d,
-      description: o.description,
-      link: o.link
+      id: `${t++}`,
+      label: /* @__PURE__ */ a("a", { href: e.link, ...s, children: e.title }),
+      icon: i,
+      description: e.description,
+      link: e.link
     };
-  }, "items"), a = U(i), s = K(a.map((o) => o.link));
-  return { navItems: i, activeId: s >= 0 ? a[s].id : null };
+  }, "items"), l = U(c), p = j(l.map((e) => e.link));
+  return { navItems: c, activeId: p >= 0 ? l[p].id : null };
 };
 function Y({
-  meta: e = {},
-  addons: r = void 0,
-  sessionManagerProps: u = {
+  meta: r = {},
+  addons: t = void 0,
+  sessionManagerProps: h = {
     showRole: !0
   },
-  homeLink: i = D,
-  theme: a = void 0,
-  hideNavMenu: s = !1,
-  showDomainWarningDialog: o = !0,
-  showWizard: d = !1,
-  ...l
+  homeLink: c = q,
+  theme: l = void 0,
+  hideNavMenu: p = !1,
+  showDomainWarningDialog: e = !0,
+  ...i
 }) {
   J();
-  const h = T(), { locale: b } = P() || {}, x = N((t, f = {}) => R(V, t, b, "en", f)), m = v(() => {
-    const t = Object.assign({}, window.blocklet, e);
+  const s = _(), { locale: b } = F() || {}, x = N((o, n = {}) => M(V, o, b, "en", n)), d = f(() => {
+    const o = Object.assign({}, window.blocklet, r);
     try {
-      return O(t);
-    } catch (f) {
-      return console.error("Failed to format blocklet info", f, t), t;
+      return G(o);
+    } catch (n) {
+      return console.error("Failed to format blocklet info", n, o), o;
     }
-  }, [e]), c = v(() => _(h, a), [h, a]), I = z({
-    meta: e,
-    theme: a
-  });
-  if (!m.appName)
+  }, [r]), m = f(() => w(s, l), [s, l]), y = O({
+    meta: r,
+    theme: l
+  }), { productsOrder: g, productsType: k } = f(() => {
+    let { USE_ARCBLOCK_THEME: o, USE_AIGNE_THEME: n } = d;
+    return o = parseInt(o, 10), n = parseInt(n, 10), I(n) ? {
+      productsOrder: n,
+      productsType: "AIGNE"
+    } : I(o) ? {
+      productsOrder: o,
+      productsType: "ARCBLOCK"
+    } : {
+      productsOrder: null,
+      productsType: null
+    };
+  }, [d]);
+  if (!d.appName)
     return null;
-  const w = q(m?.navigation?.header, b), g = X(w), { navItems: p, activeId: $ } = g, k = parseInt(window.blocklet?.USE_ARCBLOCK_THEME, 10);
-  return M(k) && p.splice(k, 0, {
+  const T = K(d?.navigation?.header, b), v = X(T), { navItems: u, activeId: E } = v;
+  return k && Number.isInteger(g) && u.splice(g, 0, {
     label: x("products"),
     // eslint-disable-next-line react/no-unstable-nested-components
-    children: ({ isOpen: t }) => /* @__PURE__ */ n(L, { isOpen: t })
-  }), /* @__PURE__ */ n(E, { theme: c, children: /* @__PURE__ */ n(
+    children: () => /* @__PURE__ */ a(R, { type: k })
+  }), /* @__PURE__ */ a(A, { theme: m, children: /* @__PURE__ */ a(
     Z,
     {
-      homeLink: i,
-      logo: /* @__PURE__ */ n("img", { src: I, alt: "logo" }),
+      homeLink: c,
+      logo: /* @__PURE__ */ a("img", { src: y, alt: "logo" }),
       addons: (
         // @ts-ignore
-        /* @__PURE__ */ n(
-          G,
+        /* @__PURE__ */ a(
+          D,
           {
-            formattedBlocklet: m,
-            addons: typeof r == "function" ? (t) => r(t, { navigation: g }) : r,
-            sessionManagerProps: u,
-            showDomainWarningDialog: o,
-            showWizard: d
+            formattedBlocklet: d,
+            addons: typeof t == "function" ? (o) => t(o, { navigation: v }) : t,
+            sessionManagerProps: h,
+            showDomainWarningDialog: e
           }
         )
       ),
-      ...A(l, ["bordered"]),
-      $bordered: l?.bordered,
-      $bgcolor: c.palette.background.default,
-      className: W("blocklet__header", l.className),
-      children: s || !p?.length ? null : ({ isMobile: t }) => (
+      ...P(i, ["bordered"]),
+      $bordered: i?.bordered,
+      $bgcolor: m.palette.background.default,
+      className: z("blocklet__header", i.className),
+      children: p || !u?.length ? null : ({ isMobile: o }) => (
         // @ts-ignore
-        /* @__PURE__ */ n(
-          F,
+        /* @__PURE__ */ a(
+          L,
           {
-            mode: t ? "inline" : "horizontal",
-            activeId: $,
-            items: p,
+            mode: o ? "inline" : "horizontal",
+            activeId: E,
+            items: u,
             className: "header-nav",
             bgColor: "transparent",
-            textColor: c.palette.grey[500],
-            activeTextColor: c.palette.text.primary
+            textColor: m.palette.grey[500],
+            activeTextColor: m.palette.text.primary
           }
         )
       )
     }
   ) });
 }
-const Z = C(B)`
-  ${({ $bgcolor: e }) => `background-color: ${e || "#fff"};`}
+const Z = H(B)`
+  ${({ $bgcolor: r }) => `background-color: ${r || "#fff"};`}
   .header-logo {
     min-width: 44px;
   }
-  ${({ $bordered: e, theme: r }) => e ? `border-bottom: 1px solid ${r.palette.divider};` : ""}
-  ${(e) => e.theme.breakpoints.down("md")} {
+  ${({ $bordered: r, theme: t }) => r ? `border-bottom: 1px solid ${t.palette.divider};` : ""}
+  ${(r) => r.theme.breakpoints.down("md")} {
     .header-logo {
       min-width: 32px;
     }
   }
-`, $o = H(Q(Y), {
-  FallbackComponent: y
+`, ye = $(Q(Y), {
+  FallbackComponent: C
 });
 export {
-  $o as default
+  ye as default
 };

package/lib/common/header-addons.d.ts

@@ -1,13 +1,12 @@
 import { default as PropTypes } from 'prop-types';
 import { SessionManagerProps } from '../types';
-declare function HeaderAddons({ formattedBlocklet, addons, showDomainWarningDialog, sessionManagerProps, showWizard, }: {
+declare function HeaderAddons({ formattedBlocklet, addons, showDomainWarningDialog, sessionManagerProps, }: {
     formattedBlocklet: any;
     addons?: null | undefined;
     showDomainWarningDialog?: boolean | undefined;
     sessionManagerProps?: {
         showRole: boolean;
     } | undefined;
-    showWizard?: boolean | undefined;
 }): import('react').FunctionComponentElement<import('react').FragmentProps>;
 declare namespace HeaderAddons {
     namespace propTypes {
@@ -15,7 +14,6 @@ declare namespace HeaderAddons {
         export let addons: PropTypes.Requireable<NonNullable<((...args: any[]) => any) | PropTypes.ReactNodeLike>>;
         export { SessionManagerProps as sessionManagerProps };
         export let showDomainWarningDialog: PropTypes.Requireable<boolean>;
-        export let showWizard: PropTypes.Requireable<boolean>;
     }
 }
 export default HeaderAddons;