@arcblock/ux 1.16.61 → 1.16.64

package/src/BlockletNFT/index.js

@@ -0,0 +1,379 @@
+import React, { useRef } from 'react';
+import styled from 'styled-components';
+import PropTypes from 'prop-types';
+import Portal from '@material-ui/core/Portal';
+import Typography from '@material-ui/core/Typography';
+import CircularProgress from '@material-ui/core/CircularProgress';
+import useMediaQuery from '@material-ui/core/useMediaQuery';
+import useTheme from '@material-ui/core/styles/useTheme';
+import Avatar from '@arcblock/did-connect/lib/Avatar';
+
+import Icon from '../Icon';
+import Button from '../Button';
+import Img from '../Img';
+
+/**
+ * 美化数字 1000-->1k
+ * @param {*} _size
+ * @param {*} digits
+ * @returns
+ */
+function prettySize(_size, digits = 1) {
+  let size = _size;
+  const list = ['', 'k', 'm', 'b'];
+  let index = 0;
+  while (size > 1000 && index < list.length - 1) {
+    size = (size / 1000).toFixed(digits);
+    index += 1;
+  }
+  return _size && `${size}${list[index]}`;
+}
+
+const Div = styled.div`
+  &.arcblock-blocklet {
+    padding: 0 16px;
+    background: ${props => props.theme.palette.common.white};
+    overflow: hidden;
+    box-shadow: 0px 0px 8px #f0f0f0;
+    &:hover {
+      box-shadow: 0px 2px 12px #f0f0f0;
+    }
+  }
+  .arcblock-blocklet__content {
+    padding: 16px 0 0 0;
+  }
+  .arcblock-blocklet__content--main {
+    display: flex;
+    align-items: center;
+    cursor: pointer;
+  }
+  .arcblock-blocklet__content--body {
+    overflow: hidden;
+    flex: 1;
+    display: flex;
+    align-items: flex-start;
+  }
+  .arcblock-blocklet__addons {
+    padding: 16px 0;
+  }
+  .arcblock-blocklet__cover {
+    width: 80px;
+    height: 80px;
+    margin-right: 12px;
+    overflow: hidden;
+    border-radius: 12px;
+    /* see: https://stackoverflow.com/questions/49066011/overflow-hidden-with-border-radius-not-working-on-safari */
+    transform: translateZ(0);
+  }
+  .arcblock-blocklet__button--hover {
+    &:not(.Mui-disabled) {
+      position: relative;
+      z-index: 1;
+      &::before {
+        content: '';
+        position: absolute;
+        height: 100%;
+        width: 100%;
+        left: 0;
+        top: 0;
+        transition: opacity 0.3s;
+      }
+      &:hover::before {
+        opacity: 0;
+      }
+      &::after {
+        content: '';
+        position: absolute;
+        height: 100%;
+        width: 100%;
+        background-color: ${props => props.theme.palette.primary.main};
+        transform: scale(0.1);
+        opacity: 0;
+        z-index: -1;
+        transition: transform 0.3s, opacity 0.3s, background-color 0.3s;
+      }
+      &:hover::after {
+        opacity: 1;
+        transform-origin: center;
+        transform: scale(1);
+      }
+    }
+
+    &:not(.Mui-disabled) {
+      background-color: transparent !important;
+      color: ${props => props.theme.palette.primary.main};
+    }
+    &:not(.Mui-disabled) {
+      &:hover {
+        color: ${props => props.theme.palette.common.white};
+      }
+    }
+  }
+  .arcblock-blocklet__info {
+    flex: 1;
+    overflow: hidden;
+    .arcblock-blocklet__button {
+      margin-top: 16px;
+      display: inline-block;
+    }
+  }
+  .arcblock-blocklet__title {
+    margin: 0;
+    font-size: 18px;
+    font-weight: 600;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+  .arcblock-blocklet__describe {
+    margin: 0 0 2px 0;
+    color: #999;
+    font-size: 14px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+
+  .arcblock-blocklet__addons {
+    display: flex;
+    justify-content: space-between;
+    color: #999;
+    font-size: 14px;
+    position: relative;
+  }
+  .arcblock-blocklet__addons--item {
+    white-space: nowrap;
+  }
+  &.arcblock-blocklet--size-md {
+    &:hover {
+      position: relative;
+    }
+    .arcblock-blocklet__title {
+      height: 2.3em;
+      margin-bottom: 3px;
+      display: -webkit-box;
+      -webkit-box-orient: vertical;
+      -webkit-line-clamp: 2;
+      overflow: hidden;
+      text-overflow: initial;
+      white-space: initial;
+      word-break: break-all;
+    }
+    .arcblock-blocklet__describe {
+      white-space: normal;
+      height: 2.86em;
+    }
+    .arcblock-blocklet__button {
+      margin-top: 5px;
+    }
+  }
+  &.arcblock-blocklet--size-sm,
+  &.arcblock-blocklet--size-xs {
+    .arcblock-blocklet__cover {
+      width: 40px;
+      height: 40px;
+      border-radius: 6px;
+    }
+    .arcblock-blocklet__content {
+      padding: 16px 0;
+    }
+    .arcblock-blocklet__addons {
+      padding: 8px 0;
+      .arcblock-blocklet__addons--item {
+        font-size: 12px;
+      }
+    }
+  }
+  &.arcblock-blocklet--size-xs {
+    .arcblock-blocklet__addons {
+      display: none !important;
+    }
+  }
+`;
+function BlockletIcon({ name }) {
+  return <Icon name={name} color="inherit" size={15} style={{ marginRight: 8 }} />;
+}
+BlockletIcon.propTypes = {
+  name: PropTypes.string.isRequired,
+};
+
+export default function BlockletNFT({
+  title,
+  did,
+  description,
+  cover,
+  size,
+  addons,
+  button,
+  buttonText,
+  buttonDisabled,
+  buttonLoading,
+  isStickyButton,
+  onButtonClick,
+  onMainClick,
+  onTagClick,
+  className,
+  scaleClickZone,
+  ...rest
+}) {
+  const wrapHandler =
+    (handler, stopFn = () => false) =>
+    (e, ...args) => {
+      if (stopFn()) {
+        e.preventDefault();
+        e.stopPropagation();
+      } else if (handler instanceof Function) {
+        e.preventDefault();
+        e.stopPropagation();
+        handler(...args);
+      }
+    };
+  const _onButtonClick = wrapHandler(onButtonClick, () => {
+    // stop click while custom button or buttonDisabled or buttondLoading
+    if (button || buttonDisabled || buttonLoading) {
+      return true;
+    }
+    return false;
+  });
+  const _onMainClick = wrapHandler(onMainClick);
+
+  const theme = useTheme();
+  const isDownSm = useMediaQuery(theme.breakpoints.down('sm'));
+  const isDownMd = useMediaQuery(theme.breakpoints.down('md'));
+  const isUpLg = useMediaQuery(theme.breakpoints.up('lg'));
+
+  // If size is auto, need calculate actual size according to screen size
+  // eslint-disable-next-line no-nested-ternary
+  const actualSize = size === 'auto' ? (isDownSm ? 'xs' : isDownMd ? 'sm' : 'md') : size;
+  // eslint-disable-next-line no-nested-ternary
+  const didAvatarSize = size === 'auto' ? (isUpLg ? 80 : 40) : size === 'md' ? 80 : 40;
+  const container = useRef(null);
+
+  return (
+    <Div
+      {...rest}
+      scaleClickZone={scaleClickZone}
+      className={`${className} arcblock-blocklet arcblock-blocklet--size-${actualSize}`}>
+      <div className="arcblock-blocklet__content">
+        <div className="arcblock-blocklet__content--main" onClick={_onMainClick} ref={container}>
+          <div className="arcblock-blocklet__content--body">
+            {cover ? (
+              <div className="arcblock-blocklet__cover">
+                <Img src={cover} />
+              </div>
+            ) : (
+              did && (
+                <div className="arcblock-blocklet__cover">
+                  <Avatar did={did} size={didAvatarSize} />
+                </div>
+              )
+            )}
+            <div className="arcblock-blocklet__info">
+              <Typography
+                component="h3"
+                variant="h3"
+                className="arcblock-blocklet__title"
+                title={title}>
+                {title}
+              </Typography>
+              {description && (
+                <Typography
+                  component="div"
+                  variant="body2"
+                  className="arcblock-blocklet__describe"
+                  title={description}>
+                  {description}
+                </Typography>
+              )}
+              {['md', 'sm', 'xs'].includes(actualSize) && (
+                <Portal container={container.current} disablePortal={actualSize === 'md'}>
+                  <div
+                    className="arcblock-blocklet__button"
+                    onClick={_onButtonClick}
+                    style={{ display: isStickyButton ? 'block' : '' }}>
+                    {button ||
+                      (onButtonClick && (
+                        <Button
+                          className="arcblock-blocklet__button--hover"
+                          variant="outlined"
+                          color="primary"
+                          size="small"
+                          disabled={buttonDisabled || buttonLoading}
+                          style={
+                            actualSize === 'md'
+                              ? { padding: '3px 20px', fontSize: '14px' }
+                              : { padding: '3px 15px', minWidth: '54px', fontSize: '13px' }
+                          }>
+                          {buttonLoading && (
+                            <CircularProgress
+                              size={actualSize === 'md' ? 15 : 13}
+                              style={{ marginRight: 3, color: 'inherit' }}
+                            />
+                          )}
+                          {buttonText}
+                        </Button>
+                      ))}
+                  </div>
+                </Portal>
+              )}
+            </div>
+          </div>
+        </div>
+      </div>
+      <div className="arcblock-blocklet__addons">
+        {addons.map((item, index) => (
+          <Typography
+            component="span"
+            variant="caption"
+            className="arcblock-blocklet__addons--item"
+            // eslint-disable-next-line react/no-array-index-key
+            key={index}
+            title={item.title}>
+            {item.empty ? null : (
+              <>
+                <BlockletIcon name={item.icon} />
+                {item.pretty ? prettySize(item.value) : item.value}
+              </>
+            )}
+          </Typography>
+        ))}
+      </div>
+    </Div>
+  );
+}
+BlockletNFT.propTypes = {
+  title: PropTypes.string.isRequired,
+  did: PropTypes.string,
+  isStickyButton: PropTypes.bool,
+  description: PropTypes.string,
+  cover: PropTypes.string,
+  buttonText: PropTypes.string,
+  buttonDisabled: PropTypes.bool,
+  buttonLoading: PropTypes.bool,
+  button: PropTypes.element,
+  addons: PropTypes.arrayOf(PropTypes.object),
+  size: PropTypes.oneOf(['xs', 'sm', 'md', 'auto']),
+  onButtonClick: PropTypes.func,
+  onMainClick: PropTypes.func,
+  onTagClick: PropTypes.func,
+  className: PropTypes.string,
+  scaleClickZone: PropTypes.number,
+};
+
+BlockletNFT.defaultProps = {
+  description: null,
+  cover: null,
+  did: null,
+  isStickyButton: false,
+  buttonText: 'Install',
+  buttonDisabled: false,
+  buttonLoading: false,
+  button: null,
+  size: 'auto',
+  addons: [],
+  onButtonClick: null,
+  onMainClick: null,
+  onTagClick: null,
+  className: null,
+  scaleClickZone: 1.5,
+};

package/src/Layout/dashboard/header.js

@@ -6,6 +6,7 @@ import AppBar from '@material-ui/core/AppBar';
 import Toolbar from '@material-ui/core/Toolbar';
 import Box from '@material-ui/core/Box';
 import Typography from '@material-ui/core/Typography';
+import Hidden from '@material-ui/core/Hidden';
 import MenuIcon from '@material-ui/icons/Menu';
 import { Link } from 'react-router-dom';
 
@@ -70,19 +71,7 @@ const StyledAppBar = styled(AppBar)`
   .header-menu {
     display: none;
   }
-  @media (max-width: ${props => props.theme.breakpoints.values.md}px) {
-    /*
-      以下样式用来替代 display:none, 如果为 logo prop 传入一个自定义的 svg, 并且 svg 中的元素通过 id 引用了 defs 中的元素 (比如 linearGradient),
-      这种情况下因为 header 和 sidebar 中会各有一个相同的 svg, defs 中元素的 id 会出现冲突,
-      当屏幕很窄的情况, header 会通过设置 display:none 将 svg logo 隐藏,
-      这会导致 svg defs 中的元素不能被正常引用 (比如 fill 引用的 color 失效), 这会进一步导致 sidebar 中的 logo 不能正常显示
-    */
-    .header-logo {
-      position: absolute;
-      width: 0;
-      height: 0;
-      overflow: hidden;
-    }
+  ${props => props.theme.breakpoints.down('sm')} {
     .header-title {
       display: none;
     }
@@ -95,6 +84,15 @@ const StyledAppBar = styled(AppBar)`
   }
 `;
 
+/*
+  自定义 logo 相关:
+  如果为 logo prop 传入一个自定义的 svg, 并且 svg 中的元素通过 id 引用了 defs 中的元素 (比如 linearGradient),
+  这种情况下因为 header 和 sidebar 中会各有一个相同的 svg, defs 中元素的 id 会出现冲突,
+  当屏幕较窄时, header 会通过设置 display:none 将 svg logo 隐藏,
+  这会导致 svg defs 中的元素不能被正常引用 (比如 fill 引用的 color 失效), 这会进一步导致 sidebar 中的 logo 不能正常显示.
+  考虑到上述问题, 目前使用 Hidden 组件控制 logo 的显示/隐藏
+  参考: https://blog.patw.me/archives/1820/inline-svg-same-id-and-display-none-issue/
+*/
 export default function Header({
   children,
   brand,
@@ -118,7 +116,9 @@ export default function Header({
           <MenuIcon />
         </Button>
         <Link to={homeUrl} className="header-link">
-          <div className="header-logo">{logo || <Logo showText={false} />}</div>
+          <Hidden smDown>
+            <div className="header-logo">{logo || <Logo showText={false} />}</div>
+          </Hidden>
           <div className="header-title">
             <Typography component="h2" noWrap className="header-title__primary">
               {brand}

package/src/Layout/dashboard/index.js

@@ -64,11 +64,11 @@ export default function Dashboard({
 }) {
   const breakpoint = 960;
   const { width } = useWindowSize();
-  const [drawerMode, setDrawerMode] = useState(width > breakpoint ? 'permanent' : 'temporary');
+  const [drawerMode, setDrawerMode] = useState(width >= breakpoint ? 'permanent' : 'temporary');
   const [drawerOpen, setDrawerOpen] = useState(drawerMode === 'permanent');
 
   useEffect(() => {
-    const newMode = width > breakpoint ? 'permanent' : 'temporary';
+    const newMode = width >= breakpoint ? 'permanent' : 'temporary';
     setDrawerMode(newMode);
     setDrawerOpen(newMode !== 'temporary');
   }, [width]);

package/src/Layout/dashboard/sidebar.js

@@ -77,7 +77,7 @@ const MenuItems = React.memo(styled.div`
     text-align: center;
     font-size: 0;
   }
-  @media (max-width: ${props => props.theme.breakpoints.values.md}px) {
+  ${props => props.theme.breakpoints.down('sm')} {
     && .sidebar-logo {
       display: block;
     }

package/src/Layout/index.js

@@ -264,7 +264,7 @@ const Div = styled.div`
     }
   }
 
-  @media (min-width: ${props => props.theme.breakpoints.values.md}px) {
+  ${props => props.theme.breakpoints.up('md')} {
     .toolbar {
       .menu-button {
         display: none;
@@ -278,7 +278,7 @@ const Div = styled.div`
     }
   }
 
-  @media (max-width: ${props => props.theme.breakpoints.values.md - 1}px) {
+  ${props => props.theme.breakpoints.down('sm')} {
     .toolbar {
       .nav-links,
       .menu-logo,