@arcblock/ux 2.4.14 → 2.4.15

package/lib/ClickToCopy/index.js

@@ -17,8 +17,6 @@ var _useWindowSize = _interopRequireDefault(require("react-use/lib/useWindowSize
 
 var _Tooltip = _interopRequireDefault(require("@mui/material/Tooltip"));
 
-var _Typography = _interopRequireDefault(require("@mui/material/Typography"));
-
 var _hook = _interopRequireDefault(require("./hook"));
 
 var _Toast = _interopRequireWildcard(require("../Toast"));
@@ -31,9 +29,9 @@ var _jsxRuntime = require("react/jsx-runtime");
 
 var _copyButton = _interopRequireDefault(require("./copy-button"));
 
-var _templateObject;
+var _templateObject, _templateObject2;
 
-const _excluded = ["children", "content", "tip", "copiedTip", "tipPlacement", "locale", "style"];
+const _excluded = ["children", "content", "tip", "copiedTip", "tipPlacement", "locale", "style", "unstyled"];
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
@@ -63,7 +61,8 @@ function ClickToCopy(props) {
     copiedTip,
     tipPlacement,
     locale,
-    style
+    style,
+    unstyled
   } = newProps,
         rest = _objectWithoutProperties(newProps, _excluded);
 
@@ -93,20 +92,16 @@ function ClickToCopy(props) {
     }
   };
 
+  const ContainerComponent = unstyled ? UnstyledContainer : Container;
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_Toast.ToastProvider, {
     children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Tooltip.default, _objectSpread(_objectSpread({
       title: copied ? _copiedTip : _tip
     }, rest), {}, {
       placement: tipPlacement,
       disableFocusListener: true,
-      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(Container, {
+      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(ContainerComponent, {
         ref: containerRef,
-        component: "span",
-        style: Object.assign({
-          fontSize: 'inherit',
-          color: 'inherit',
-          fontWeight: 'inherit'
-        }, style),
+        style: style,
         onClick: onCopy,
         children: children || content
       })
@@ -121,7 +116,9 @@ ClickToCopy.propTypes = {
   tipPlacement: _propTypes.default.string,
   copiedTip: _propTypes.default.string,
   locale: _propTypes.default.oneOf(['en', 'zh']),
-  style: _propTypes.default.object
+  style: _propTypes.default.object,
+  // 仅提供点击复制功能, 不提供样式
+  unstyled: _propTypes.default.bool
 };
 ClickToCopy.defaultProps = {
   content: '',
@@ -129,6 +126,8 @@ ClickToCopy.defaultProps = {
   copiedTip: '',
   tipPlacement: 'right',
   locale: 'en',
-  style: {}
+  style: {},
+  unstyled: false
 };
-const Container = (0, _Theme.styled)(_Typography.default)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  display: inline;\n  white-space: pre-wrap;\n  word-wrap: break-word;\n  overflow-wrap: break-word;\n  align-items: center;\n  justify-content: start;\n  border-radius: 15px;\n  padding: 1px 12px;\n  background-color: rgba(0, 0, 0, 0.08);\n  cursor: pointer;\n"])));
+const Container = (0, _Theme.styled)('span')(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  display: inline;\n  white-space: pre-wrap;\n  word-wrap: break-word;\n  overflow-wrap: break-word;\n  align-items: center;\n  justify-content: start;\n  border-radius: 15px;\n  padding: 1px 12px;\n  background-color: rgba(0, 0, 0, 0.08);\n  cursor: pointer;\n"])));
+const UnstyledContainer = (0, _Theme.styled)('span')(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  cursor: pointer;\n"])));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arcblock/ux",
-  "version": "2.4.14",
+  "version": "2.4.15",
   "description": "Common used react components for arcblock products",
   "keywords": [
     "react",
@@ -47,10 +47,10 @@
     "react": ">=18.1.0",
     "react-ga": "^2.7.0"
   },
-  "gitHead": "3bc65e4ac9040d63f8b1a732c647c24d3156f20b",
+  "gitHead": "c07a38a4575a4f41e116743b2450e468c19d55f3",
   "dependencies": {
-    "@arcblock/icons": "^2.4.14",
-    "@arcblock/react-hooks": "^2.4.14",
+    "@arcblock/icons": "^2.4.15",
+    "@arcblock/react-hooks": "^2.4.15",
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
     "@emotion/react": "^11.10.0",
     "@emotion/styled": "^11.10.0",

package/src/ClickToCopy/index.js

@@ -1,7 +1,6 @@
 import PropTypes from 'prop-types';
 import useWindowSize from 'react-use/lib/useWindowSize';
 import Tooltip from '@mui/material/Tooltip';
-import Typography from '@mui/material/Typography';
 
 import useCopy from './hook';
 import Toast, { ToastProvider } from '../Toast';
@@ -12,7 +11,7 @@ export { default as CopyButton } from './copy-button';
 
 export default function ClickToCopy(props) {
   const newProps = mergeProps(props, ClickToCopy, ['style']);
-  const { children, content, tip, copiedTip, tipPlacement, locale, style, ...rest } = newProps;
+  const { children, content, tip, copiedTip, tipPlacement, locale, style, unstyled, ...rest } = newProps;
   const { containerRef, copied, copy, texts } = useCopy({ content, locale });
   const _tip = tip || texts.copy;
   const _copiedTip = copiedTip || texts.copied;
@@ -26,16 +25,14 @@ export default function ClickToCopy(props) {
     }
   };
 
+  const ContainerComponent = unstyled ? UnstyledContainer : Container;
+
   return (
     <ToastProvider>
       <Tooltip title={copied ? _copiedTip : _tip} {...rest} placement={tipPlacement} disableFocusListener>
-        <Container
-          ref={containerRef}
-          component="span"
-          style={Object.assign({ fontSize: 'inherit', color: 'inherit', fontWeight: 'inherit' }, style)}
-          onClick={onCopy}>
+        <ContainerComponent ref={containerRef} style={style} onClick={onCopy}>
           {children || content}
-        </Container>
+        </ContainerComponent>
       </Tooltip>
     </ToastProvider>
   );
@@ -49,6 +46,8 @@ ClickToCopy.propTypes = {
   copiedTip: PropTypes.string,
   locale: PropTypes.oneOf(['en', 'zh']),
   style: PropTypes.object,
+  // 仅提供点击复制功能, 不提供样式
+  unstyled: PropTypes.bool,
 };
 
 ClickToCopy.defaultProps = {
@@ -58,9 +57,10 @@ ClickToCopy.defaultProps = {
   tipPlacement: 'right',
   locale: 'en',
   style: {},
+  unstyled: false,
 };
 
-const Container = styled(Typography)`
+const Container = styled('span')`
   display: inline;
   white-space: pre-wrap;
   word-wrap: break-word;
@@ -72,3 +72,7 @@ const Container = styled(Typography)`
   background-color: rgba(0, 0, 0, 0.08);
   cursor: pointer;
 `;
+
+const UnstyledContainer = styled('span')`
+  cursor: pointer;
+`;