@arcblock/ux 2.1.30 → 2.1.33

package/lib/Footer/index.js

@@ -11,6 +11,8 @@ var _styledComponents = _interopRequireDefault(require("styled-components"));
 
 var _Typography = _interopRequireDefault(require("@mui/material/Typography"));
 
+var _Container = _interopRequireDefault(require("@mui/material/Container"));
+
 var _Util = require("../Util");
 
 var _Logo = _interopRequireDefault(require("../Logo"));
@@ -35,32 +37,35 @@ function Footer(props) {
     className: className,
     style: style,
     dark: dark,
-    children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Typography.default, {
-      component: "div",
-      className: "footer",
-      children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)(_Typography.default, {
-        component: "p",
-        className: "footer-item",
-        children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)("span", {
-          className: "footer-copy",
-          children: ["Copyright \xA9 ", copyYear, " "]
-        }), /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
-          className: "footer-brand",
-          children: brand
-        })]
-      }), /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Typography.default, {
-        component: "p",
-        className: "footer-item",
-        style: {
-          justifyContent: 'flex-end',
-          flexShrink: 0
-        },
-        children: ["Powered by", /*#__PURE__*/(0, _jsxRuntime.jsx)(_Logo.default, {
-          mode: dark ? 'light' : 'dark',
-          layout: "horizontal",
-          className: "logo-container"
+    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Container.default, {
+      maxWidth: false,
+      children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Typography.default, {
+        component: "div",
+        className: "footer",
+        children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)(_Typography.default, {
+          component: "p",
+          className: "footer-item",
+          children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)("span", {
+            className: "footer-copy",
+            children: ["Copyright \xA9 ", copyYear, " "]
+          }), /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+            className: "footer-brand",
+            children: brand
+          })]
+        }), /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Typography.default, {
+          component: "p",
+          className: "footer-item",
+          style: {
+            justifyContent: 'flex-end',
+            flexShrink: 0
+          },
+          children: ["Powered by", /*#__PURE__*/(0, _jsxRuntime.jsx)(_Logo.default, {
+            mode: dark ? 'light' : 'dark',
+            layout: "horizontal",
+            className: "logo-container"
+          })]
         })]
-      })]
+      })
     })
   });
 }
@@ -83,4 +88,10 @@ Footer.defaultProps = {
 const Container = _styledComponents.default.div.withConfig({
   displayName: "Footer__Container",
   componentId: "sc-1qpifuv-0"
-})(["margin-top:64px;padding:24px 0 32px;border-top:1px solid ", ";box-sizing:border-box;width:100%;@media (max-width:540px){padding:8px 0;}.footer{display:flex;align-items:center;justify-content:space-between;.footer-item{color:", ";display:flex;align-items:center;flex-wrap:wrap;font-size:0.9rem;}.footer-brand{margin-left:8px;margin-right:8px;}.logo-container{margin:0 24px;width:90px;opacity:0.5;}@media (max-width:540px){.footer-item{font-size:0.7rem;}.logo-container{margin:0 0 0 16px;width:70px;height:40px;}}@media (max-width:380px){.footer-item{font-size:0.65rem;}.logo-container{margin:0 0 0 8px;height:24px;}}}"], props => props.dark ? props.theme.palette.grey[900] : '#dee2e7', props => props.theme.palette.grey[900]);
+})(["margin-top:64px;padding:24px 0 32px;border-top:1px solid ", ";box-sizing:border-box;width:100%;@media (max-width:540px){padding:8px 0;}.footer{display:flex;align-items:center;justify-content:space-between;.footer-item{color:", ";display:flex;align-items:center;flex-wrap:wrap;font-size:0.9rem;}.footer-brand{margin-left:8px;margin-right:8px;}.logo-container{margin-left:24px;width:90px;opacity:0.5;}@media (max-width:540px){.footer-item{font-size:0.7rem;}.logo-container{margin:0 0 0 16px;width:70px;height:40px;}}@media (max-width:380px){.footer-item{font-size:0.65rem;}.logo-container{margin:0 0 0 8px;height:24px;}}}"], props => props.dark ? props.theme.palette.grey[900] : '#dee2e7', _ref => {
+  let {
+    theme,
+    dark
+  } = _ref;
+  return dark ? theme.palette.grey[500] : theme.palette.grey[900];
+});

package/lib/Layout/dashboard/index.js

@@ -131,9 +131,7 @@ function Dashboard(_ref2) {
           maxWidth: false
         }), {}, {
           children: children
-        })), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Footer.default, {
-          className: "dashboard-footer"
-        })]
+        })), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Footer.default, {})]
       })]
     })]
   }));
@@ -155,7 +153,7 @@ Dashboard.defaultProps = {
 const Wrapper = _styledComponents.default.div.withConfig({
   displayName: "dashboard__Wrapper",
   componentId: "sc-arvc7q-0"
-})(["&.dashboard{display:flex;flex-direction:column;height:100vh;}.dashboard-body{overflow:hidden;flex:1;}.dashboard-sidebar{box-sizing:border-box;flex:0 0 auto;width:104px;&:hover{overflow-y:auto;}}.dashboard-main{display:flex;flex-direction:column;overflow:auto;flex:1;}.dashboard-content{flex:1;}.dashboard-footer{padding-left:30px;}"]);
+})(["&.dashboard{display:flex;flex-direction:column;height:100vh;}.dashboard-body{overflow:hidden;flex:1;}.dashboard-sidebar{box-sizing:border-box;flex:0 0 auto;width:104px;&:hover{overflow-y:auto;}}.dashboard-main{display:flex;flex-direction:column;overflow:auto;flex:1;}.dashboard-content{flex:1;}"]);
 
 const StyledUxHeader = (0, _styledComponents.default)(_Header.ResponsiveHeader).withConfig({
   displayName: "dashboard__StyledUxHeader",

package/lib/Layout/dashboard-legacy/index.js

@@ -46,7 +46,7 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 const Wrapper = _styledComponents.default.div.withConfig({
   displayName: "dashboard-legacy__Wrapper",
   componentId: "sc-z8z10v-0"
-})(["&.dashboard{display:flex;flex-direction:column;height:100vh;}.dashboard__body{overflow:hidden;flex:1;}.dashboard__main{display:flex;flex-direction:column;overflow:auto;flex:1;}.dashboard__content{flex:1;}.dashboard__footer{padding-left:30px;}.drawerPaper{position:relative;white-space:nowrap;width:120px;background:", ";box-shadow:2px 16px 10px 0 rgba(0,0,0,", ");border:0;}"], props => props.theme.palette.background.default, props => props.theme.mode === 'light' ? 0.05 : 0.5);
+})(["&.dashboard{display:flex;flex-direction:column;height:100vh;}.dashboard__body{overflow:hidden;flex:1;}.dashboard__main{display:flex;flex-direction:column;overflow:auto;flex:1;}.dashboard__content{flex:1;}.drawerPaper{position:relative;white-space:nowrap;width:120px;background:", ";box-shadow:2px 16px 10px 0 rgba(0,0,0,", ");border:0;}"], props => props.theme.palette.background.default, props => props.theme.mode === 'light' ? 0.05 : 0.5);
 
 function Dashboard(_ref) {
   let {
@@ -126,9 +126,7 @@ function Dashboard(_ref) {
           maxWidth: isFullWidth ? false : 'lg',
           className: "dashboard__content",
           children: children
-        }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Footer.default, {
-          className: "dashboard__footer"
-        })]
+        }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Footer.default, {})]
       })]
     })]
   }));

package/lib/Locale/selector.js

@@ -41,7 +41,7 @@ var _globeLight = _interopRequireDefault(require("./images/globe-light.png"));
 
 var _jsxRuntime = require("react/jsx-runtime");
 
-const _excluded = ["dark", "showText", "popperProps"];
+const _excluded = ["dark", "showText", "popperProps", "popperType", "icon"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -59,7 +59,9 @@ function LocaleSelector(props) {
   const {
     dark,
     showText,
-    popperProps
+    popperProps,
+    popperType,
+    icon: Icon
   } = props,
         rest = _objectWithoutProperties(props, _excluded);
 
@@ -88,23 +90,39 @@ function LocaleSelector(props) {
   }
 
   const ButtonComponent = showText ? _Button.default : _IconButton.default;
-  return /*#__PURE__*/(0, _jsxRuntime.jsxs)(Div, _objectSpread(_objectSpread({
+  const handleEventProps = popperType === 'hover' ? {
+    onMouseEnter: () => {
+      setOpen(true);
+    },
+    onMouseLeave: onClose
+  } : {
+    onClick: () => {
+      setOpen(!open);
+    }
+  };
+  const renderIcon = (0, _react.useMemo)(() => {
+    if (Icon) {
+      return /*#__PURE__*/(0, _jsxRuntime.jsx)(Icon, {});
+    }
+
+    return /*#__PURE__*/(0, _jsxRuntime.jsx)("img", {
+      src: dark ? _globeDark.default : _globeLight.default,
+      className: "trigger-image",
+      alt: "globe"
+    });
+  }, [Icon, dark]);
+  return /*#__PURE__*/(0, _jsxRuntime.jsxs)(Div, _objectSpread(_objectSpread(_objectSpread({
     component: "div",
     dark: dark,
     theme: theme
-  }, rest), {}, {
+  }, rest), handleEventProps), {}, {
     children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(ButtonComponent, {
       ref: anchorEl,
       className: "trigger",
-      onClick: () => setOpen(!open),
       children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
         display: "flex",
         alignItems: "center",
-        children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("img", {
-          src: dark ? _globeDark.default : _globeLight.default,
-          className: "trigger-image",
-          alt: "globe"
-        }), showText ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_Typography.default, {
+        children: [renderIcon, showText ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_Typography.default, {
           component: "strong",
           className: "trigger-text",
           children: _context.languages.find(x => x.value === locale).text
@@ -146,14 +164,18 @@ LocaleSelector.propTypes = {
   size: _propTypes.default.number,
   showText: _propTypes.default.bool,
   popperProps: _propTypes.default.object,
-  onChange: _propTypes.default.func
+  onChange: _propTypes.default.func,
+  popperType: _propTypes.default.oneOf(['hover', 'click']),
+  icon: _propTypes.default.any
 };
 LocaleSelector.defaultProps = {
   dark: false,
   showText: true,
   size: 24,
   popperProps: {},
-  onChange: () => {}
+  onChange: () => {},
+  popperType: 'click',
+  icon: null
 };
 var _default = LocaleSelector;
 exports.default = _default;

package/lib/NavMenu/style.js

@@ -12,7 +12,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 const NavMenuBase = _styledComponents.default.nav.withConfig({
   displayName: "style__NavMenuBase",
   componentId: "sc-2g7isz-0"
-})(["background-color:", ";font-size:14px;ul{list-style:none;margin:0;padding:0;}.navmenu-item,.navmenu-sub{display:flex;align-items:center;}a{color:inherit;}.navmenu-item,.navmenu-sub{color:", ";}.navmenu-item--active,.navmenu-item:hover,.navmenu-sub--opened{color:", ";}.navmenu-item{position:relative;cursor:pointer;transition:color 0.2s ease-in-out;a{text-decoration:none;white-space:nowrap;}a::before{position:absolute;top:0;right:0;bottom:0;left:0;background-color:transparent;content:'';}}.navmenu-sub{position:relative;cursor:pointer;}.navmenu-item-icon,.navmenu-sub-icon,.navmenu-sub-expand-icon{display:flex;line-height:1;}.navmenu-item-icon,.navmenu-sub-icon{margin-right:4px;}.navmenu-item-icon > *,.navmenu-sub-icon > *{font-size:1.5em;}.navmenu-sub-expand-icon{margin-left:8px;> *{width:0.8em;height:0.8em;transition:transform 0.2s ease-in-out;}}"], props => props.$bgColor, props => props.$textColor, props => props.$activeTextColor);
+})(["background-color:", ";font-size:14px;ul{list-style:none;margin:0;padding:0;}.navmenu-item,.navmenu-sub{display:flex;align-items:center;}a{color:inherit;}.navmenu-item,.navmenu-sub{color:", ";}.navmenu-item--active,.navmenu-item:hover,.navmenu-sub--opened{color:", ";}.navmenu-item{position:relative;cursor:pointer;transition:color 0.2s ease-in-out;a{text-decoration:none;white-space:nowrap;}a::before{position:absolute;top:0;right:0;bottom:0;left:0;background-color:transparent;content:'';}}.navmenu-sub{position:relative;cursor:pointer;}.navmenu-item-icon,.navmenu-sub-icon,.navmenu-sub-expand-icon{display:flex;line-height:1;}.navmenu-item-icon,.navmenu-sub-icon{margin-right:4px;}.navmenu-item-icon > *,.navmenu-sub-icon > *{width:auto;max-height:20px;font-size:1.5em;}.navmenu-sub-expand-icon{margin-left:8px;> *{width:0.8em;height:0.8em;transition:transform 0.2s ease-in-out;}}"], props => props.$bgColor, props => props.$textColor, props => props.$activeTextColor);
 
 const HorizontalStyle = (0, _styledComponents.default)(NavMenuBase).withConfig({
   displayName: "style__HorizontalStyle",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arcblock/ux",
-  "version": "2.1.30",
+  "version": "2.1.33",
   "description": "Common used react components for arcblock products",
   "keywords": [
     "react",
@@ -52,10 +52,10 @@
     "react": ">=18.1.0",
     "react-ga": "^2.7.0"
   },
-  "gitHead": "16c9e4b3d8664ef14440b248bdf34b46fc8396d1",
+  "gitHead": "616c11e20c48d33f153258bcf00eba030dabf648",
   "dependencies": {
-    "@arcblock/icons": "^2.1.30",
-    "@arcblock/react-hooks": "^2.1.30",
+    "@arcblock/icons": "^2.1.33",
+    "@arcblock/react-hooks": "^2.1.33",
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
     "@emotion/react": "^11.9.0",
     "@emotion/styled": "^11.8.1",

package/src/Footer/index.js

@@ -2,6 +2,7 @@
 import PropTypes from 'prop-types';
 import styled from 'styled-components';
 import Typography from '@mui/material/Typography';
+import MuiContainer from '@mui/material/Container';
 
 import { mergeProps } from '../Util';
 import Logo from '../Logo';
@@ -15,16 +16,18 @@ export default function Footer(props) {
 
   return (
     <Container className={className} style={style} dark={dark}>
-      <Typography component="div" className="footer">
-        <Typography component="p" className="footer-item">
-          <span className="footer-copy">Copyright &copy; {copyYear} </span>
-          <span className="footer-brand">{brand}</span>
+      <MuiContainer maxWidth={false}>
+        <Typography component="div" className="footer">
+          <Typography component="p" className="footer-item">
+            <span className="footer-copy">Copyright &copy; {copyYear} </span>
+            <span className="footer-brand">{brand}</span>
+          </Typography>
+          <Typography component="p" className="footer-item" style={{ justifyContent: 'flex-end', flexShrink: 0 }}>
+            Powered by
+            <Logo mode={dark ? 'light' : 'dark'} layout="horizontal" className="logo-container" />
+          </Typography>
         </Typography>
-        <Typography component="p" className="footer-item" style={{ justifyContent: 'flex-end', flexShrink: 0 }}>
-          Powered by
-          <Logo mode={dark ? 'light' : 'dark'} layout="horizontal" className="logo-container" />
-        </Typography>
-      </Typography>
+      </MuiContainer>
     </Container>
   );
 }
@@ -62,7 +65,7 @@ const Container = styled.div`
     justify-content: space-between;
 
     .footer-item {
-      color: ${(props) => props.theme.palette.grey[900]};
+      color: ${({ theme, dark }) => (dark ? theme.palette.grey[500] : theme.palette.grey[900])};
       display: flex;
       align-items: center;
       flex-wrap: wrap;
@@ -75,7 +78,7 @@ const Container = styled.div`
     }
 
     .logo-container {
-      margin: 0 24px;
+      margin-left: 24px;
       width: 90px;
       opacity: 0.5;
     }

package/src/Layout/dashboard/index.js

@@ -69,7 +69,7 @@ function Dashboard({ children, title, headerProps, links, fullWidth, ...rest })
           <Container className="dashboard-content" {...(fullWidth && { maxWidth: false })}>
             {children}
           </Container>
-          <Footer className="dashboard-footer" />
+          <Footer />
         </Box>
       </Box>
     </Wrapper>
@@ -117,9 +117,6 @@ const Wrapper = styled.div`
   .dashboard-content {
     flex: 1;
   }
-  .dashboard-footer {
-    padding-left: 30px;
-  }
 `;
 
 const StyledUxHeader = styled(ResponsiveHeader)`

package/src/Layout/dashboard-legacy/index.js

@@ -30,9 +30,6 @@ const Wrapper = styled.div`
   .dashboard__content {
     flex: 1;
   }
-  .dashboard__footer {
-    padding-left: 30px;
-  }
 
   .drawerPaper {
     position: relative;
@@ -105,7 +102,7 @@ export default function Dashboard({
           <Container maxWidth={isFullWidth ? false : 'lg'} className="dashboard__content">
             {children}
           </Container>
-          <Footer className="dashboard__footer" />
+          <Footer />
         </Box>
       </Box>
     </Wrapper>

package/src/Locale/selector.js

@@ -1,5 +1,5 @@
 /* eslint-disable react/jsx-no-bind */
-import { useState, useContext, useRef } from 'react';
+import { useState, useContext, useRef, useMemo } from 'react';
 import PropTypes from 'prop-types';
 import styled from 'styled-components';
 
@@ -22,7 +22,7 @@ import globeDark from './images/globe-dark.png';
 import globeLight from './images/globe-light.png';
 
 function LocaleSelector(props) {
-  const { dark, showText, popperProps, ...rest } = props;
+  const { dark, showText, popperProps, popperType, icon: Icon, ...rest } = props;
   const { locale, changeLocale } = useContext(LocaleContext);
   const anchorEl = useRef(null);
   const [open, setOpen] = useState(false);
@@ -43,11 +43,34 @@ function LocaleSelector(props) {
 
   const ButtonComponent = showText ? Button : IconButton;
 
+  const handleEventProps =
+    popperType === 'hover'
+      ? {
+          onMouseEnter: () => {
+            setOpen(true);
+          },
+          onMouseLeave: onClose,
+        }
+      : {
+          onClick: () => {
+            setOpen(!open);
+          },
+        };
+
+  const renderIcon = useMemo(() => {
+    if (Icon) {
+      return <Icon />;
+    }
+
+    return <img src={dark ? globeDark : globeLight} className="trigger-image" alt="globe" />;
+  }, [Icon, dark]);
+
   return (
-    <Div component="div" dark={dark} theme={theme} {...rest}>
-      <ButtonComponent ref={anchorEl} className="trigger" onClick={() => setOpen(!open)}>
+    <Div component="div" dark={dark} theme={theme} {...rest} {...handleEventProps}>
+      <ButtonComponent ref={anchorEl} className="trigger">
         <Box display="flex" alignItems="center">
-          <img src={dark ? globeDark : globeLight} className="trigger-image" alt="globe" />
+          {renderIcon}
+
           {showText ? (
             <Typography component="strong" className="trigger-text">
               {languages.find((x) => x.value === locale).text}
@@ -57,6 +80,7 @@ function LocaleSelector(props) {
           )}
         </Box>
       </ButtonComponent>
+
       <Popper open={open} anchorEl={anchorEl.current} {...popperProps} disablePortal>
         <div className="locales">
           <ClickAwayListener onClickAway={onClose}>
@@ -84,6 +108,8 @@ LocaleSelector.propTypes = {
   showText: PropTypes.bool,
   popperProps: PropTypes.object,
   onChange: PropTypes.func,
+  popperType: PropTypes.oneOf(['hover', 'click']),
+  icon: PropTypes.any,
 };
 
 LocaleSelector.defaultProps = {
@@ -92,6 +118,8 @@ LocaleSelector.defaultProps = {
   size: 24,
   popperProps: {},
   onChange: () => {},
+  popperType: 'click',
+  icon: null,
 };
 
 export default LocaleSelector;
@@ -102,10 +130,12 @@ const Div = styled.div`
     flex-direction: column;
     justify-content: center;
     font-size: 14px;
+
     .trigger-image {
       width: ${(props) => props.size}px;
       height: ${(props) => props.size}px;
     }
+
     .trigger-text {
       margin-left: 5px;
       font-size: 14px;

package/src/NavMenu/style.js

@@ -63,6 +63,8 @@ const NavMenuBase = styled.nav`
   }
   .navmenu-item-icon > *,
   .navmenu-sub-icon > * {
+    width: auto;
+    max-height: 20px;
     font-size: 1.5em;
   }
   .navmenu-sub-expand-icon {