@arcblock/ux 1.15.29 → 1.15.33
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/Blocklet/index.js +6 -3
- package/lib/CookieConsent/index.js +1 -1
- package/lib/Locale/context.js +12 -1
- package/lib/Locale/selector.js +6 -2
- package/lib/Util/index.js +1 -1
- package/package.json +4 -4
package/lib/Blocklet/index.js
CHANGED
|
@@ -42,7 +42,7 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
|
|
|
42
42
|
const Div = _styledComponents.default.div.withConfig({
|
|
43
43
|
displayName: "Blocklet__Div",
|
|
44
44
|
componentId: "sc-3dga5l-0"
|
|
45
|
-
})(["&.arcblock-blocklet{border:1px solid #f2f2f2;padding:0 16px;border-radius:12px;background:#fff;overflow:hidden;&:hover{filter:drop-shadow(0px 4px 12px rgba(92,92,92,0.04));}}.arcblock-blocklet__content{padding:16px 0;}.arcblock-blocklet__content--main{display:flex;align-items:
|
|
45
|
+
})(["&.arcblock-blocklet{border:1px solid #f2f2f2;padding:0 16px;border-radius:12px;background:#fff;overflow:hidden;&:hover{filter:drop-shadow(0px 4px 12px rgba(92,92,92,0.04));}}.arcblock-blocklet__content{padding:16px 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;border-top:1px solid #f2f2f2;}.arcblock-blocklet__cover{width:100px;height:100px;margin-right:16px;overflow:hidden;border-radius:12px;}.arcblock-blocklet__info{flex:1;overflow:hidden;.arcblock-blocklet__button{margin-top:16px;display:inline-block;}}.arcblock-blocklet__button{& > *{position:relative;&::before{content:'';position:absolute;display:block;left:50%;top:50%;height:", "%;width:", "%;transform:translate(-50%,-50%);}}& > *:not(.Mui-disabled){background-color:rgba(79,106,246,0.06);color:", ";}}.arcblock-blocklet__title{margin:0;font-size:18px;font-weight:600;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;}.arcblock-blocklet__describe{margin:2px 0 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{margin-bottom:3px;}.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__content{padding:12px 0;}.arcblock-blocklet__cover{width:48px;height:48px;border-radius:6px;}.arcblock-blocklet__addons{padding:8px 0;.arcblock-blocklet__addons--item{font-size:12px;}}}&.arcblock-blocklet--size-xs{.arcblock-blocklet__addons{display:none !important;}}"], props => props.scaleClickZone * 100, props => props.scaleClickZone * 100, props => props.theme.palette.primary.main);
|
|
46
46
|
|
|
47
47
|
function BlockletIcon(_ref) {
|
|
48
48
|
let {
|
|
@@ -142,6 +142,8 @@ function Blocklet(_ref2) {
|
|
|
142
142
|
className: "arcblock-blocklet__content--main",
|
|
143
143
|
onClick: _onMainClick,
|
|
144
144
|
ref: container
|
|
145
|
+
}, /*#__PURE__*/_react.default.createElement("div", {
|
|
146
|
+
className: "arcblock-blocklet__content--body"
|
|
145
147
|
}, cover && /*#__PURE__*/_react.default.createElement("div", {
|
|
146
148
|
className: "arcblock-blocklet__cover"
|
|
147
149
|
}, /*#__PURE__*/_react.default.createElement(_Img.default, {
|
|
@@ -187,14 +189,15 @@ function Blocklet(_ref2) {
|
|
|
187
189
|
marginRight: 3,
|
|
188
190
|
color: 'inherit'
|
|
189
191
|
}
|
|
190
|
-
}), buttonText)))))), /*#__PURE__*/_react.default.createElement("div", {
|
|
192
|
+
}), buttonText))))))), /*#__PURE__*/_react.default.createElement("div", {
|
|
191
193
|
className: "arcblock-blocklet__addons"
|
|
192
194
|
}, addons.map((item, index) => /*#__PURE__*/_react.default.createElement(_Typography.default, {
|
|
193
195
|
component: "span",
|
|
194
196
|
variant: "caption",
|
|
195
197
|
className: "arcblock-blocklet__addons--item" // eslint-disable-next-line react/no-array-index-key
|
|
196
198
|
,
|
|
197
|
-
key: index
|
|
199
|
+
key: index,
|
|
200
|
+
title: item.title
|
|
198
201
|
}, item.empty ? null : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(BlockletIcon, {
|
|
199
202
|
name: item.icon
|
|
200
203
|
}), item.pretty ? prettySize(item.value) : item.value)))));
|
|
@@ -95,4 +95,4 @@ DefaultCookieConsent.defaultProps = {
|
|
|
95
95
|
const Wrapper = _styledComponents.default.div.withConfig({
|
|
96
96
|
displayName: "CookieConsent__Wrapper",
|
|
97
97
|
componentId: "sc-xilwg4-0"
|
|
98
|
-
})(["box-sizing:border-box;position:
|
|
98
|
+
})(["box-sizing:border-box;position:fixed;right:20px;bottom:20px;z-index:999;max-width:440px;padding:16px 24px;font-size:16px;color:#666;background:#fff;border-radius:6px;box-shadow:0 0 18px rgba(0,0,0,0.2);&:empty{display:none;}button{min-width:200px;}@media screen and (max-width:480px){left:16px;right:16px;bottom:16px;width:auto;button{display:block;width:100%;}}"]);
|
package/lib/Locale/context.js
CHANGED
|
@@ -47,9 +47,20 @@ exports.languages = languages;
|
|
|
47
47
|
const langParams = {
|
|
48
48
|
languages: ['zh', 'en'],
|
|
49
49
|
fallback: 'en'
|
|
50
|
+
}; // 跨应用传递多语言选择的方式是在 query string 中添加 locale 参数，LocaleSelector 要高优先级遵守这个参数
|
|
51
|
+
|
|
52
|
+
const getLocaleFromSearchParams = function getLocaleFromSearchParams() {
|
|
53
|
+
let url = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : window.location.href;
|
|
54
|
+
const locale = new URL(url).searchParams.get('locale');
|
|
55
|
+
|
|
56
|
+
if (languages.find(x => x.value === locale)) {
|
|
57
|
+
return locale;
|
|
58
|
+
}
|
|
59
|
+
|
|
60
|
+
return null;
|
|
50
61
|
};
|
|
51
62
|
|
|
52
|
-
const getLocale = locale => locale || _jsCookie.default.get(cookieName) || (0, _browserLang.default)(langParams);
|
|
63
|
+
const getLocale = locale => locale || getLocaleFromSearchParams() || _jsCookie.default.get(cookieName) || (0, _browserLang.default)(langParams);
|
|
53
64
|
|
|
54
65
|
exports.getLocale = getLocale;
|
|
55
66
|
|
package/lib/Locale/selector.js
CHANGED
|
@@ -11,6 +11,8 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
|
|
|
11
11
|
|
|
12
12
|
var _styledComponents = _interopRequireDefault(require("styled-components"));
|
|
13
13
|
|
|
14
|
+
var _styles = require("@material-ui/core/styles");
|
|
15
|
+
|
|
14
16
|
var _Button = _interopRequireDefault(require("@material-ui/core/Button"));
|
|
15
17
|
|
|
16
18
|
var _Typography = _interopRequireDefault(require("@material-ui/core/Typography"));
|
|
@@ -27,7 +29,7 @@ var _MenuList = _interopRequireDefault(require("@material-ui/core/MenuList"));
|
|
|
27
29
|
|
|
28
30
|
var _Check = _interopRequireDefault(require("@material-ui/icons/Check"));
|
|
29
31
|
|
|
30
|
-
var _Util = require("
|
|
32
|
+
var _Util = require("../Util");
|
|
31
33
|
|
|
32
34
|
var _context = require("./context");
|
|
33
35
|
|
|
@@ -61,6 +63,7 @@ function LocaleSelector(props) {
|
|
|
61
63
|
} = (0, _react.useContext)(_context.LocaleContext);
|
|
62
64
|
const [anchorEl, setAnchorEl] = (0, _react.useState)(null);
|
|
63
65
|
const [open, setOpen] = (0, _react.useState)(false);
|
|
66
|
+
const theme = (0, _styles.useTheme)();
|
|
64
67
|
|
|
65
68
|
const onSelect = newLocale => {
|
|
66
69
|
changeLocale(newLocale);
|
|
@@ -79,7 +82,8 @@ function LocaleSelector(props) {
|
|
|
79
82
|
const ButtonComponent = showText ? _Button.default : _IconButton.default;
|
|
80
83
|
return /*#__PURE__*/_react.default.createElement(Div, Object.assign({
|
|
81
84
|
component: "div",
|
|
82
|
-
dark: dark
|
|
85
|
+
dark: dark,
|
|
86
|
+
theme: theme
|
|
83
87
|
}, rest), /*#__PURE__*/_react.default.createElement(ButtonComponent, {
|
|
84
88
|
buttonRef: node => setAnchorEl(node),
|
|
85
89
|
className: "trigger",
|
package/lib/Util/index.js
CHANGED
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@arcblock/ux",
|
|
3
|
-
"version": "1.15.
|
|
3
|
+
"version": "1.15.33",
|
|
4
4
|
"description": "Common used react components for arcblock products",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"react",
|
|
@@ -52,10 +52,10 @@
|
|
|
52
52
|
"react": ">=16.12.0",
|
|
53
53
|
"react-ga": "^2.7.0"
|
|
54
54
|
},
|
|
55
|
-
"gitHead": "
|
|
55
|
+
"gitHead": "fe1be3671e78e3e985c66ac21d5d10b2a882a133",
|
|
56
56
|
"dependencies": {
|
|
57
|
-
"@arcblock/icons": "^1.15.
|
|
58
|
-
"@arcblock/react-hooks": "^1.15.
|
|
57
|
+
"@arcblock/icons": "^1.15.33",
|
|
58
|
+
"@arcblock/react-hooks": "^1.15.33",
|
|
59
59
|
"@babel/plugin-syntax-dynamic-import": "^7.8.3",
|
|
60
60
|
"@material-ui/core": "^4.12.3",
|
|
61
61
|
"@material-ui/icons": "4.11.2",
|