@blocklet/ui-react 2.4.38 → 2.4.40

package/lib/Dashboard/index.js

@@ -15,10 +15,6 @@ var _context = require("@arcblock/ux/lib/Locale/context");
 
 var _dashboard = _interopRequireDefault(require("@arcblock/ux/lib/Layout/dashboard"));
 
-var _Address = _interopRequireDefault(require("@arcblock/did-connect/lib/Address"));
-
-var _Avatar = _interopRequireDefault(require("@arcblock/did-connect/lib/Avatar"));
-
 var _types = require("../types");
 
 var _utils = require("../utils");
@@ -138,7 +134,6 @@ function Dashboard(_ref) {
   }
 
   const {
-    appId: did,
     appLogo,
     appName
   } = formattedBlocklet;
@@ -157,33 +152,10 @@ function Dashboard(_ref) {
     links: localizedNav
   }, rest), {}, {
     headerProps: _objectSpread({
-      brand: /*#__PURE__*/(0, _jsxRuntime.jsx)("a", {
-        href: _blocklets.publicPath,
-        children: appName
-      }),
-      description: /*#__PURE__*/(0, _jsxRuntime.jsx)("a", {
-        href: _blocklets.publicPath,
-        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Address.default, {
-          compact: true,
-          responsive: false,
-          copyable: false,
-          showCopyButtonInTooltip: true,
-          prepend: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Avatar.default, {
-            did: did,
-            size: 16,
-            style: {
-              marginRight: 4
-            }
-          }),
-          children: did
-        })
-      }),
-      logo: /*#__PURE__*/(0, _jsxRuntime.jsx)("a", {
-        href: _blocklets.publicPath,
-        children: /*#__PURE__*/(0, _jsxRuntime.jsx)("img", {
-          src: appLogo,
-          alt: "logo"
-        })
+      homeLink: _blocklets.publicPath,
+      logo: /*#__PURE__*/(0, _jsxRuntime.jsx)("img", {
+        src: appLogo,
+        alt: "logo"
       }),
       addons: _headerAddons
     }, rest.headerProps)

package/lib/Header/index.js

@@ -21,10 +21,6 @@ var _NavMenu = _interopRequireDefault(require("@arcblock/ux/lib/NavMenu"));
 
 var _context = require("@arcblock/ux/lib/Locale/context");
 
-var _Address = _interopRequireDefault(require("@arcblock/did-connect/lib/Address"));
-
-var _Avatar = _interopRequireDefault(require("@arcblock/did-connect/lib/Avatar"));
-
 var _Icon = _interopRequireDefault(require("../Icon"));
 
 var _overridableThemeProvider = _interopRequireDefault(require("../common/overridable-theme-provider"));
@@ -150,9 +146,7 @@ function Header(_ref) {
   }
 
   const {
-    appId: did,
     appLogo,
-    appName,
     theme
   } = formattedBlocklet;
   const navigation = (0, _blocklets.getLocalizedNavigation)(formattedBlocklet === null || formattedBlocklet === void 0 ? void 0 : (_formattedBlocklet$na = formattedBlocklet.navigation) === null || _formattedBlocklet$na === void 0 ? void 0 : _formattedBlocklet$na.header, locale);
@@ -174,34 +168,11 @@ function Header(_ref) {
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_overridableThemeProvider.default, {
     theme: themeOverrides,
     children: /*#__PURE__*/(0, _jsxRuntime.jsx)(StyledUxHeader, _objectSpread(_objectSpread({
-      logo: /*#__PURE__*/(0, _jsxRuntime.jsx)("a", {
-        href: homeLink,
-        children: /*#__PURE__*/(0, _jsxRuntime.jsx)("img", {
-          src: appLogo,
-          alt: "logo"
-        })
-      }),
-      brand: /*#__PURE__*/(0, _jsxRuntime.jsx)("a", {
-        href: homeLink,
-        children: appName
+      homeLink: homeLink,
+      logo: /*#__PURE__*/(0, _jsxRuntime.jsx)("img", {
+        src: appLogo,
+        alt: "logo"
       }),
-      description: did ? /*#__PURE__*/(0, _jsxRuntime.jsx)("a", {
-        href: homeLink,
-        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Address.default, {
-          compact: true,
-          responsive: false,
-          copyable: false,
-          showCopyButtonInTooltip: true,
-          prepend: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Avatar.default, {
-            did: did,
-            size: 16,
-            style: {
-              marginRight: 4
-            }
-          }),
-          children: did
-        })
-      }) : null,
       addons: headerAddons
     }, rest), {}, {
       $bgcolor: theme === null || theme === void 0 ? void 0 : (_theme$background = theme.background) === null || _theme$background === void 0 ? void 0 : _theme$background.header,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/ui-react",
-  "version": "2.4.38",
+  "version": "2.4.40",
   "description": "Some useful front-end web components that can be used in Blocklets.",
   "keywords": [
     "react",
@@ -30,8 +30,8 @@
     "url": "https://github.com/ArcBlock/ux/issues"
   },
   "dependencies": {
-    "@arcblock/did-connect": "^2.4.38",
-    "@arcblock/ux": "^2.4.38",
+    "@arcblock/did-connect": "^2.4.40",
+    "@arcblock/ux": "^2.4.40",
     "@emotion/react": "^11.10.4",
     "@emotion/styled": "^11.10.4",
     "@iconify/iconify": "^2.2.1",
@@ -53,5 +53,5 @@
     "eslint-plugin-react-hooks": "^4.6.0",
     "jest": "^28.1.3"
   },
-  "gitHead": "d5db89486d5c862c2f11c26991ac515e701ac7d3"
+  "gitHead": "c26da2c4ed0c311c2dceab75db245f0290344860"
 }

package/src/Dashboard/index.js

@@ -4,8 +4,6 @@ import PropTypes from 'prop-types';
 import { SessionContext } from '@arcblock/did-connect/lib/Session';
 import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
 import UxDashboard from '@arcblock/ux/lib/Layout/dashboard';
-import DidAddress from '@arcblock/did-connect/lib/Address';
-import DidAvatar from '@arcblock/did-connect/lib/Avatar';
 import { blockletMetaProps, sessionManagerProps } from '../types';
 import { mapRecursive, flatRecursive, matchPaths } from '../utils';
 import { publicPath, formatBlockletInfo, getLocalizedNavigation, filterNavByRole } from '../blocklets';
@@ -79,7 +77,7 @@ function Dashboard({ meta, fallbackUrl, invalidPathFallback, headerAddons, sessi
   if (!formattedBlocklet.appName) {
     return null;
   }
-  const { appId: did, appLogo, appName } = formattedBlocklet;
+  const { appLogo, appName } = formattedBlocklet;
   const _headerAddons = (
     <HeaderAddons
       formattedBlocklet={formattedBlocklet}
@@ -97,24 +95,8 @@ function Dashboard({ meta, fallbackUrl, invalidPathFallback, headerAddons, sessi
       links={localizedNav}
       {...rest}
       headerProps={{
-        brand: <a href={publicPath}>{appName}</a>,
-        description: (
-          <a href={publicPath}>
-            <DidAddress
-              compact
-              responsive={false}
-              copyable={false}
-              showCopyButtonInTooltip
-              prepend={<DidAvatar did={did} size={16} style={{ marginRight: 4 }} />}>
-              {did}
-            </DidAddress>
-          </a>
-        ),
-        logo: (
-          <a href={publicPath}>
-            <img src={appLogo} alt="logo" />
-          </a>
-        ),
+        homeLink: publicPath,
+        logo: <img src={appLogo} alt="logo" />,
         addons: _headerAddons,
         ...rest.headerProps,
       }}

package/src/Header/index.js

@@ -6,8 +6,6 @@ import { styled } from '@arcblock/ux/lib/Theme';
 import { ResponsiveHeader } from '@arcblock/ux/lib/Header';
 import NavMenu from '@arcblock/ux/lib/NavMenu';
 import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
-import DidAddress from '@arcblock/did-connect/lib/Address';
-import DidAvatar from '@arcblock/did-connect/lib/Avatar';
 import Icon from '../Icon';
 import OverridableThemeProvider from '../common/overridable-theme-provider';
 
@@ -75,7 +73,7 @@ function Header({ meta, addons, sessionManagerProps, homeLink, theme: themeOverr
   if (!formattedBlocklet.appName) {
     return null;
   }
-  const { appId: did, appLogo, appName, theme } = formattedBlocklet;
+  const { appLogo, theme } = formattedBlocklet;
   const navigation = getLocalizedNavigation(formattedBlocklet?.navigation?.header, locale);
   const parsedNavigation = parseNavigation(navigation);
   const { navItems, activeId } = parsedNavigation;
@@ -89,26 +87,8 @@ function Header({ meta, addons, sessionManagerProps, homeLink, theme: themeOverr
   return (
     <OverridableThemeProvider theme={themeOverrides}>
       <StyledUxHeader
-        logo={
-          <a href={homeLink}>
-            <img src={appLogo} alt="logo" />
-          </a>
-        }
-        brand={<a href={homeLink}>{appName}</a>}
-        description={
-          did ? (
-            <a href={homeLink}>
-              <DidAddress
-                compact
-                responsive={false}
-                copyable={false}
-                showCopyButtonInTooltip
-                prepend={<DidAvatar did={did} size={16} style={{ marginRight: 4 }} />}>
-                {did}
-              </DidAddress>
-            </a>
-          ) : null
-        }
+        homeLink={homeLink}
+        logo={<img src={appLogo} alt="logo" />}
         addons={headerAddons}
         {...rest}
         $bgcolor={theme?.background?.header}>