@blocklet/ui-react 3.1.5 → 3.1.6

package/lib/Footer/index.d.ts

@@ -1,6 +1,6 @@
 declare const _default: import('react').ComponentType<{
     [x: string]: any;
     meta?: {} | undefined;
-    theme?: null | undefined;
+    theme?: {} | undefined;
 }>;
 export default _default;

package/lib/Footer/index.js

@@ -9,11 +9,11 @@ import L from "@arcblock/ux/lib/hooks/use-blocklet-logo";
 import j from "lodash/omit";
 import C from "./internal-footer.js";
 import { mapRecursive as E } from "../utils.js";
-import { formatBlockletInfo as I, getLocalizedNavigation as a } from "../blocklets.js";
+import { formatBlockletInfo as I, getLocalizedNavigation as l } from "../blocklets.js";
 import { BlockletMetaProps as P } from "../types.js";
 import z from "../libs/with-hide-when-embed.js";
-function d({ meta: o = {}, theme: t = null, ...n }) {
-  const { locale: l } = N() || {}, c = x(), r = s(() => {
+function d({ meta: o = {}, theme: t = {}, ...n }) {
+  const { locale: i } = N() || {}, c = x(), r = s(() => {
     const e = Object.assign({}, window.blocklet, o);
     try {
       return I(e);
@@ -28,18 +28,18 @@ function d({ meta: o = {}, theme: t = null, ...n }) {
   });
   if (!r.appName)
     return null;
-  const { appName: b, appDescription: k, description: u, copyright: g } = r, h = m.palette.background.default, i = {
-    footerNav: a(r?.navigation?.footer, l) || [],
-    socialMedia: a(r?.navigation?.social, l) || [],
-    links: a(r?.navigation?.bottom, l) || []
+  const { appName: b, appDescription: k, description: g, copyright: u } = r, h = m.palette.background.default, a = {
+    footerNav: l(r?.navigation?.footer, i) || [],
+    socialMedia: l(r?.navigation?.social, i) || [],
+    links: l(r?.navigation?.bottom, i) || []
   }, y = {
     brand: {
       name: b,
-      description: k || u,
+      description: k || g,
       logo: f
     },
     navigation: E(
-      i.footerNav,
+      a.footerNav,
       (e) => ({
         ...e,
         label: e.title,
@@ -47,9 +47,9 @@ function d({ meta: o = {}, theme: t = null, ...n }) {
       }),
       "items"
     ),
-    copyright: g,
-    socialMedia: i.socialMedia,
-    links: i.links.map((e) => ({ ...e, label: e.title }))
+    copyright: u,
+    socialMedia: a.socialMedia,
+    links: a.links.map((e) => ({ ...e, label: e.title }))
   };
   return /* @__PURE__ */ p(B, { theme: m, children: /* @__PURE__ */ p(D, { ...y, ...j(n, ["bordered"]), $bordered: n?.bordered, $bgcolor: h }) });
 }

package/lib/Header/index.js

@@ -59,7 +59,7 @@ function Y({
     showRole: !0
   },
   homeLink: c = q,
-  theme: l = void 0,
+  theme: l = {},
   hideNavMenu: p = !1,
   showDomainWarningDialog: e = !0,
   ...i

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/ui-react",
-  "version": "3.1.5",
+  "version": "3.1.6",
   "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.5",
-    "@arcblock/icons": "3.1.5",
-    "@arcblock/react-hooks": "3.1.5",
+    "@arcblock/bridge": "3.1.6",
+    "@arcblock/icons": "3.1.6",
+    "@arcblock/react-hooks": "3.1.6",
     "@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.5",
+    "@arcblock/did-connect-react": "3.1.6",
     "@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": "1ed5a2051033d58cbdbfea5a439f49c7508b97f6"
+  "gitHead": "d3267421c4d35038b226d34edc0e7bc943c5c926"
 }

package/src/Footer/index.jsx

@@ -16,7 +16,7 @@ import withHideWhenEmbed from '../libs/with-hide-when-embed';
 /**
  * 专门用于 (composable) blocklet 的 Footer 组件, 基于 blocklet meta 中的数据渲染
  */
-function Footer({ meta = {}, theme: themeOverrides = null, ...rest }) {
+function Footer({ meta = {}, theme: themeOverrides = {}, ...rest }) {
   const { locale } = useLocaleContext() || {};
   const parentTheme = useTheme();
   const formattedBlocklet = useMemo(() => {

package/src/Header/index.tsx

@@ -10,7 +10,7 @@ import { translate } from '@arcblock/ux/lib/Locale/util';
 import useBlockletLogo from '@arcblock/ux/lib/hooks/use-blocklet-logo';
 import omit from 'lodash/omit';
 import isFinite from 'lodash/isFinite';
-import type { BoxProps, Breakpoint } from '@mui/material';
+import type { BoxProps, Breakpoint, Theme } from '@mui/material';
 import clsx from 'clsx';
 
 import Icon from '../Icon';
@@ -107,7 +107,7 @@ function Header({
     showRole: true,
   },
   homeLink = publicPath,
-  theme: themeOverrides = undefined,
+  theme: themeOverrides = {},
   hideNavMenu = false,
   showDomainWarningDialog = true,
   ...rest
@@ -127,7 +127,7 @@ function Header({
       return blocklet;
     }
   }, [meta]);
-  const mergeTheme = useMemo(() => deepmerge(parentTheme, themeOverrides), [parentTheme, themeOverrides]);
+  const mergeTheme = useMemo(() => deepmerge(parentTheme, themeOverrides), [parentTheme, themeOverrides]) as Theme;
   const appLogo = useBlockletLogo({
     meta,
     theme: themeOverrides,