@arcblock/ux 1.17.21 → 2.0.0

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.
Files changed (99) hide show
  1. package/lib/ActionButton/index.js +1 -1
  2. package/lib/ActivityIndicator/index.js +2 -2
  3. package/lib/Alert/index.js +2 -2
  4. package/lib/Async/index.js +1 -1
  5. package/lib/Badge/index.js +1 -1
  6. package/lib/Blocklet/blocklet.js +5 -5
  7. package/lib/BlockletNFT/index.js +7 -7
  8. package/lib/Button/index.js +1 -1
  9. package/lib/Button/wrap.js +2 -21
  10. package/lib/ButtonGroup/index.js +2 -2
  11. package/lib/ClickToCopy/index.js +2 -2
  12. package/lib/CodeBlock/index.js +3 -3
  13. package/lib/ContactForm/index.js +3 -3
  14. package/lib/CookieConsent/index.js +7 -3
  15. package/lib/Dialog/dialog.js +10 -9
  16. package/lib/Footer/index.js +1 -1
  17. package/lib/Header/header.js +4 -4
  18. package/lib/Header/responsive-header.js +7 -7
  19. package/lib/Icon/index.js +1 -1
  20. package/lib/Img/index.js +12 -7
  21. package/lib/InfoRow/index.js +1 -1
  22. package/lib/Layout/dashboard/header.js +9 -9
  23. package/lib/Layout/dashboard/index.js +3 -3
  24. package/lib/Layout/dashboard/sidebar.js +6 -6
  25. package/lib/Layout/index.js +19 -16
  26. package/lib/Locale/selector.js +16 -11
  27. package/lib/NFTDisplay/broken.js +1 -1
  28. package/lib/NavMenu/nav-menu.js +1 -1
  29. package/lib/PageScroller/index.js +6 -2
  30. package/lib/PricingTable/PricingPlan.js +4 -4
  31. package/lib/PricingTable/index.js +2 -2
  32. package/lib/Result/common.js +3 -3
  33. package/lib/Result/index.js +3 -6
  34. package/lib/Result/result.js +3 -2
  35. package/lib/Spinner/index.js +2 -2
  36. package/lib/SplitButton/index.js +8 -8
  37. package/lib/Switch/index.js +3 -3
  38. package/lib/Tabs/index.js +26 -17
  39. package/lib/Tag/index.js +2 -2
  40. package/lib/TextCollapse/index.js +1 -1
  41. package/lib/Theme/index.js +51 -67
  42. package/lib/Toast/index.js +12 -11
  43. package/lib/Video/index.js +1 -1
  44. package/lib/Wallet/Action.js +1 -1
  45. package/lib/Wallet/Download.js +1 -1
  46. package/lib/Wallet/Open.js +1 -1
  47. package/lib/WechatPrompt/index.js +2 -2
  48. package/lib/withTheme/index.js +3 -3
  49. package/package.json +10 -8
  50. package/src/ActionButton/index.js +1 -1
  51. package/src/ActivityIndicator/index.js +2 -2
  52. package/src/Alert/index.js +2 -2
  53. package/src/Async/index.js +1 -1
  54. package/src/Badge/index.js +1 -1
  55. package/src/Blocklet/blocklet.js +4 -4
  56. package/src/BlockletNFT/index.js +7 -7
  57. package/src/Button/index.js +1 -1
  58. package/src/Button/wrap.js +2 -9
  59. package/src/ButtonGroup/index.js +2 -2
  60. package/src/ClickToCopy/index.js +2 -2
  61. package/src/CodeBlock/index.js +3 -3
  62. package/src/ContactForm/index.js +3 -3
  63. package/src/CookieConsent/index.js +4 -3
  64. package/src/Dialog/dialog.js +12 -9
  65. package/src/Footer/index.js +1 -1
  66. package/src/Header/header.js +5 -5
  67. package/src/Header/responsive-header.js +7 -7
  68. package/src/Icon/index.js +1 -0
  69. package/src/Img/index.js +12 -6
  70. package/src/InfoRow/index.js +1 -1
  71. package/src/Layout/dashboard/header.js +10 -10
  72. package/src/Layout/dashboard/index.js +3 -3
  73. package/src/Layout/dashboard/sidebar.js +10 -13
  74. package/src/Layout/index.js +18 -16
  75. package/src/Locale/selector.js +22 -17
  76. package/src/NFTDisplay/broken.js +1 -1
  77. package/src/NavMenu/nav-menu.js +1 -1
  78. package/src/PageScroller/index.js +4 -2
  79. package/src/PricingTable/PricingPlan.js +4 -4
  80. package/src/PricingTable/index.js +2 -2
  81. package/src/Result/common.js +3 -3
  82. package/src/Result/index.js +0 -2
  83. package/src/Result/result.js +3 -2
  84. package/src/Spinner/index.js +2 -2
  85. package/src/SplitButton/index.js +8 -8
  86. package/src/Switch/index.js +3 -3
  87. package/src/Tabs/index.js +16 -10
  88. package/src/Tag/index.js +2 -2
  89. package/src/TextCollapse/index.js +1 -1
  90. package/src/Theme/index.js +44 -57
  91. package/src/Toast/index.js +11 -11
  92. package/src/Video/index.js +1 -1
  93. package/src/Wallet/Action.js +1 -1
  94. package/src/Wallet/Download.js +1 -1
  95. package/src/Wallet/Open.js +1 -1
  96. package/src/WechatPrompt/index.js +2 -2
  97. package/src/withTheme/index.js +2 -2
  98. package/lib/Theme/responsiveFontSizes.js +0 -83
  99. package/src/Theme/responsiveFontSizes.js +0 -94
@@ -13,29 +13,29 @@ var _styledComponents = _interopRequireDefault(require("styled-components"));
13
13
 
14
14
  var _reactHelmet = _interopRequireDefault(require("react-helmet"));
15
15
 
16
- var _Link = _interopRequireDefault(require("@material-ui/core/Link"));
16
+ var _Link = _interopRequireDefault(require("@mui/material/Link"));
17
17
 
18
- var _AppBar = _interopRequireDefault(require("@material-ui/core/AppBar"));
18
+ var _AppBar = _interopRequireDefault(require("@mui/material/AppBar"));
19
19
 
20
- var _Container = _interopRequireDefault(require("@material-ui/core/Container"));
20
+ var _Container = _interopRequireDefault(require("@mui/material/Container"));
21
21
 
22
- var _Drawer = _interopRequireDefault(require("@material-ui/core/Drawer"));
22
+ var _Drawer = _interopRequireDefault(require("@mui/material/Drawer"));
23
23
 
24
- var _Divider = _interopRequireDefault(require("@material-ui/core/Divider"));
24
+ var _Divider = _interopRequireDefault(require("@mui/material/Divider"));
25
25
 
26
- var _Toolbar = _interopRequireDefault(require("@material-ui/core/Toolbar"));
26
+ var _Toolbar = _interopRequireDefault(require("@mui/material/Toolbar"));
27
27
 
28
- var _Typography = _interopRequireDefault(require("@material-ui/core/Typography"));
28
+ var _Typography = _interopRequireDefault(require("@mui/material/Typography"));
29
29
 
30
- var _List = _interopRequireDefault(require("@material-ui/core/List"));
30
+ var _List = _interopRequireDefault(require("@mui/material/List"));
31
31
 
32
- var _ListItem = _interopRequireDefault(require("@material-ui/core/ListItem"));
32
+ var _ListItem = _interopRequireDefault(require("@mui/material/ListItem"));
33
33
 
34
- var _ListItemText = _interopRequireDefault(require("@material-ui/core/ListItemText"));
34
+ var _ListItemText = _interopRequireDefault(require("@mui/material/ListItemText"));
35
35
 
36
- var _IconButton = _interopRequireDefault(require("@material-ui/core/IconButton"));
36
+ var _IconButton = _interopRequireDefault(require("@mui/material/IconButton"));
37
37
 
38
- var _Menu = _interopRequireDefault(require("@material-ui/icons/Menu"));
38
+ var _Menu = _interopRequireDefault(require("@mui/icons-material/Menu"));
39
39
 
40
40
  var _Footer = _interopRequireDefault(require("../Footer"));
41
41
 
@@ -104,7 +104,8 @@ function Layout(_ref) {
104
104
  }, brand)), /*#__PURE__*/_react.default.createElement(_Divider.default, null), /*#__PURE__*/_react.default.createElement(_List.default, null, links.map(x => /*#__PURE__*/_react.default.createElement(_Link.default, {
105
105
  className: "nav-link",
106
106
  key: x.url,
107
- href: x.url
107
+ href: x.url,
108
+ underline: "hover"
108
109
  }, /*#__PURE__*/_react.default.createElement(_ListItem.default, {
109
110
  button: true,
110
111
  className: activeLink === x.url ? 'drawer-highlight-nav' : ''
@@ -135,7 +136,8 @@ function Layout(_ref) {
135
136
  "aria-label": "open drawer",
136
137
  edge: "start",
137
138
  onClick: onToggleDrawer,
138
- className: "menu-button"
139
+ className: "menu-button",
140
+ size: "large"
139
141
  }, /*#__PURE__*/_react.default.createElement(_Menu.default, null)), showLogo ? /*#__PURE__*/_react.default.createElement("div", {
140
142
  className: "menu-logo"
141
143
  }, logo) : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null), /*#__PURE__*/_react.default.createElement(_Typography.default, {
@@ -162,7 +164,8 @@ function Layout(_ref) {
162
164
  key: x.url,
163
165
  href: x.url,
164
166
  className: "nav-link ".concat(activeLink === x.url ? 'highlight-nav' : ''),
165
- color: x.color
167
+ color: x.color,
168
+ underline: "hover"
166
169
  }, x.icon && /*#__PURE__*/_react.default.createElement(_Icon.default, {
167
170
  name: x.icon,
168
171
  size: 20 * (x.iconZoom || 1),
@@ -232,7 +235,7 @@ Layout.defaultProps = {
232
235
  const Div = _styledComponents.default.div.withConfig({
233
236
  displayName: "Layout__Div",
234
237
  componentId: "sc-12bllvc-0"
235
- })(["width:100%;min-height:100vh;display:flex;flex-direction:column;.appbar{&.appbar--border{box-shadow:none;&::before{content:'';position:absolute;left:0;right:0;height:1px;bottom:-1px;display:block;background-color:rgba(0,0,0,0.12);}}}.toolbar{min-height:56px;background:inherit;white-space:nowrap;.menu-logo{font-size:0;margin-right:8px;}.nav-links{display:flex;align-items:center;.nav-link{margin:8px 12px;font-size:16px;display:flex;align-items:center;}.highlight-nav{font-weight:bolder;}}.brand{cursor:pointer;text-decoration:none;overflow:hidden;text-overflow:ellipsis;flex-shrink:1;}.description{color:#999;font-size:15px;margin-left:10px;font-weight:normal;flex-shrink:999999;}}", "{.toolbar{.menu-button{display:none;}.menu-logo{& + .brand{padding-left:45px;margin-left:-45px;}}}}", "{.toolbar{.nav-links,.menu-logo,.description{display:none;}}}"], props => props.theme.breakpoints.up('md'), props => props.theme.breakpoints.down('sm'));
238
+ })(["width:100%;min-height:100vh;display:flex;flex-direction:column;.appbar{&.appbar--border{box-shadow:none;&::before{content:'';position:absolute;left:0;right:0;height:1px;bottom:-1px;display:block;background-color:rgba(0,0,0,0.12);}}}.toolbar{min-height:56px;background:inherit;white-space:nowrap;.menu-logo{font-size:0;margin-right:8px;}.nav-links{display:flex;align-items:center;.nav-link{margin:8px 12px;font-size:16px;display:flex;align-items:center;}.highlight-nav{font-weight:bolder;}}.brand{cursor:pointer;text-decoration:none;overflow:hidden;text-overflow:ellipsis;flex-shrink:1;}.description{color:#999;font-size:15px;margin-left:10px;font-weight:normal;flex-shrink:999999;}}", "{.toolbar{.menu-button{display:none;}.menu-logo{& + .brand{padding-left:45px;margin-left:-45px;}}}}", "{.toolbar{.nav-links,.menu-logo,.description{display:none;}}}"], props => props.theme.breakpoints.up('md'), props => props.theme.breakpoints.down('md'));
236
239
 
237
240
  const DrawerDiv = _styledComponents.default.nav.withConfig({
238
241
  displayName: "Layout__DrawerDiv",
@@ -11,23 +11,25 @@ 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");
14
+ var _styles = require("@mui/styles");
15
15
 
16
- var _Button = _interopRequireDefault(require("@material-ui/core/Button"));
16
+ var _Button = _interopRequireDefault(require("@mui/material/Button"));
17
17
 
18
- var _Typography = _interopRequireDefault(require("@material-ui/core/Typography"));
18
+ var _Typography = _interopRequireDefault(require("@mui/material/Typography"));
19
19
 
20
- var _IconButton = _interopRequireDefault(require("@material-ui/core/IconButton"));
20
+ var _IconButton = _interopRequireDefault(require("@mui/material/IconButton"));
21
21
 
22
- var _ClickAwayListener = _interopRequireDefault(require("@material-ui/core/ClickAwayListener"));
22
+ var _ClickAwayListener = _interopRequireDefault(require("@mui/material/ClickAwayListener"));
23
23
 
24
- var _Popper = _interopRequireDefault(require("@material-ui/core/Popper"));
24
+ var _Popper = _interopRequireDefault(require("@mui/material/Popper"));
25
25
 
26
- var _MenuItem = _interopRequireDefault(require("@material-ui/core/MenuItem"));
26
+ var _MenuItem = _interopRequireDefault(require("@mui/material/MenuItem"));
27
27
 
28
- var _MenuList = _interopRequireDefault(require("@material-ui/core/MenuList"));
28
+ var _MenuList = _interopRequireDefault(require("@mui/material/MenuList"));
29
29
 
30
- var _Check = _interopRequireDefault(require("@material-ui/icons/Check"));
30
+ var _Box = _interopRequireDefault(require("@mui/material/Box"));
31
+
32
+ var _Check = _interopRequireDefault(require("@mui/icons-material/Check"));
31
33
 
32
34
  var _Util = require("../Util");
33
35
 
@@ -90,6 +92,9 @@ function LocaleSelector(props) {
90
92
  ref: anchorEl,
91
93
  className: "trigger",
92
94
  onClick: () => setOpen(!open)
95
+ }, /*#__PURE__*/_react.default.createElement(_Box.default, {
96
+ display: "flex",
97
+ alignItems: "center"
93
98
  }, /*#__PURE__*/_react.default.createElement("img", {
94
99
  src: dark ? _globeDark.default : _globeLight.default,
95
100
  className: "trigger-image",
@@ -97,7 +102,7 @@ function LocaleSelector(props) {
97
102
  }), showText ? /*#__PURE__*/_react.default.createElement(_Typography.default, {
98
103
  component: "strong",
99
104
  className: "trigger-text"
100
- }, _context.languages.find(x => x.value === locale).text) : ''), /*#__PURE__*/_react.default.createElement(_Popper.default, Object.assign({
105
+ }, _context.languages.find(x => x.value === locale).text) : '')), /*#__PURE__*/_react.default.createElement(_Popper.default, Object.assign({
101
106
  open: open,
102
107
  anchorEl: anchorEl.current
103
108
  }, popperProps, {
@@ -142,4 +147,4 @@ exports.default = _default;
142
147
  const Div = _styledComponents.default.div.withConfig({
143
148
  displayName: "selector__Div",
144
149
  componentId: "sc-wfz3sf-0"
145
- })([".trigger{display:flex;flex-direction:column;justify-content:center;font-size:14px;.trigger-image{width:", "px;height:", "px;}.trigger-text{margin-left:5px;font-size:14px;}}.locales{background:", ";}.locale-item{font-size:16px;font-style:normal;font-stretch:normal;line-height:normal;letter-spacing:2px;text-align:center;color:", ";cursor:pointer;display:flex;padding:16px;align-items:center;.check-icon{visibility:hidden;margin-right:4px;}.check-icon-visible{visibility:visible;}}"], props => props.size, props => props.size, props => (0, _Util.getBackground)(props), props => (0, _Util.getColor)(props));
150
+ })([".trigger{display:flex;flex-direction:column;justify-content:center;font-size:14px;.trigger-image{width:", "px;height:", "px;}.trigger-text{margin-left:5px;font-size:14px;color:", ";}}.locales{background:", ";}.locale-item{font-size:16px;font-style:normal;font-stretch:normal;line-height:normal;letter-spacing:2px;text-align:center;color:", ";cursor:pointer;display:flex;padding:16px;align-items:center;.check-icon{visibility:hidden;margin-right:4px;}.check-icon-visible{visibility:visible;}}"], props => props.size, props => props.size, props => (0, _Util.getColor)(props), props => (0, _Util.getBackground)(props), props => (0, _Util.getColor)(props));
@@ -9,7 +9,7 @@ var _react = _interopRequireDefault(require("react"));
9
9
 
10
10
  var _styledComponents = _interopRequireDefault(require("styled-components"));
11
11
 
12
- var _BrokenImage = _interopRequireDefault(require("@material-ui/icons/BrokenImage"));
12
+ var _BrokenImage = _interopRequireDefault(require("@mui/icons-material/BrokenImage"));
13
13
 
14
14
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
15
15
 
@@ -11,7 +11,7 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
11
11
 
12
12
  var _clsx = _interopRequireDefault(require("clsx"));
13
13
 
14
- var _ExpandMore = _interopRequireDefault(require("@material-ui/icons/ExpandMore"));
14
+ var _ExpandMore = _interopRequireDefault(require("@mui/icons-material/ExpandMore"));
15
15
 
16
16
  var _style = require("./style");
17
17
 
@@ -202,8 +202,12 @@ const PageScroller = _ref => {
202
202
  pageContainer.current.addEventListener(Events.TOUCHMOVE, touchMove);
203
203
  pageContainer.current.addEventListener(Events.KEYDOWN, keyPress);
204
204
  return () => {
205
- pageContainer.current.removeEventListener(Events.TOUCHMOVE, touchMove);
206
- pageContainer.current.removeEventListener(Events.KEYDOWN, keyPress);
205
+ var _pageContainer$curren;
206
+
207
+ if ((_pageContainer$curren = pageContainer.current) !== null && _pageContainer$curren !== void 0 && _pageContainer$curren.removeEventListener) {
208
+ pageContainer.current.removeEventListener(Events.TOUCHMOVE, touchMove);
209
+ pageContainer.current.removeEventListener(Events.KEYDOWN, keyPress);
210
+ }
207
211
  };
208
212
  }, [touchMove, keyPress]);
209
213
  (0, _react.useEffect)(() => {
@@ -11,13 +11,13 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
11
11
 
12
12
  var _styledComponents = _interopRequireDefault(require("styled-components"));
13
13
 
14
- var _Card = _interopRequireDefault(require("@material-ui/core/Card"));
14
+ var _Card = _interopRequireDefault(require("@mui/material/Card"));
15
15
 
16
- var _Button = _interopRequireDefault(require("@material-ui/core/Button"));
16
+ var _Button = _interopRequireDefault(require("@mui/material/Button"));
17
17
 
18
- var _CardContent = _interopRequireDefault(require("@material-ui/core/CardContent"));
18
+ var _CardContent = _interopRequireDefault(require("@mui/material/CardContent"));
19
19
 
20
- var _Typography = _interopRequireDefault(require("@material-ui/core/Typography"));
20
+ var _Typography = _interopRequireDefault(require("@mui/material/Typography"));
21
21
 
22
22
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
23
23
 
@@ -11,7 +11,7 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
11
11
 
12
12
  var _styledComponents = _interopRequireDefault(require("styled-components"));
13
13
 
14
- var _Grid = _interopRequireDefault(require("@material-ui/core/Grid"));
14
+ var _Grid = _interopRequireDefault(require("@mui/material/Grid"));
15
15
 
16
16
  var _PricingPlan = _interopRequireDefault(require("./PricingPlan"));
17
17
 
@@ -28,7 +28,7 @@ const PricingTable = _ref => {
28
28
  }, /*#__PURE__*/_react.default.createElement(_Grid.default, {
29
29
  container: true,
30
30
  spacing: 2,
31
- justify: "center"
31
+ justifyContent: "center"
32
32
  }, plans.map(x => /*#__PURE__*/_react.default.createElement(_Grid.default, {
33
33
  item: true,
34
34
  className: "plan-item",
@@ -7,11 +7,11 @@ exports.PageNotFound = exports.Maintenance = exports.InternalServerError = expor
7
7
 
8
8
  var _react = _interopRequireDefault(require("react"));
9
9
 
10
- var _useTheme = _interopRequireDefault(require("@material-ui/core/styles/useTheme"));
10
+ var _useTheme = _interopRequireDefault(require("@mui/styles/useTheme"));
11
11
 
12
- var _Info = _interopRequireDefault(require("@material-ui/icons/Info"));
12
+ var _Info = _interopRequireDefault(require("@mui/icons-material/Info"));
13
13
 
14
- var _CancelRounded = _interopRequireDefault(require("@material-ui/icons/CancelRounded"));
14
+ var _CancelRounded = _interopRequireDefault(require("@mui/icons-material/CancelRounded"));
15
15
 
16
16
  var _result = _interopRequireDefault(require("./result"));
17
17
 
@@ -53,14 +53,11 @@ const ResultWrapper = _ref => {
53
53
  return /*#__PURE__*/_react.default.createElement(_result.default, rest);
54
54
  };
55
55
 
56
- ResultWrapper.propTypes = _objectSpread(_objectSpread({
56
+ ResultWrapper.propTypes = _objectSpread({
57
57
  status: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.number])
58
- }, _result.default.propTypes), {}, {
59
- title: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.element])
60
- });
58
+ }, _result.default.propTypes);
61
59
  ResultWrapper.defaultProps = {
62
- status: '',
63
- title: ''
60
+ status: ''
64
61
  };
65
62
  var _default = ResultWrapper;
66
63
  exports.default = _default;
@@ -11,7 +11,7 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
11
11
 
12
12
  var _styledComponents = _interopRequireDefault(require("styled-components"));
13
13
 
14
- var _Box = _interopRequireDefault(require("@material-ui/core/Box"));
14
+ var _Box = _interopRequireDefault(require("@mui/material/Box"));
15
15
 
16
16
  const _excluded = ["icon", "title", "description", "extra"];
17
17
 
@@ -48,13 +48,14 @@ const Result = _ref => {
48
48
 
49
49
  Result.propTypes = {
50
50
  icon: _propTypes.default.element,
51
- title: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.element]).isRequired,
51
+ title: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.element]),
52
52
  description: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.element]),
53
53
  actions: _propTypes.default.any,
54
54
  extra: _propTypes.default.element
55
55
  };
56
56
  Result.defaultProps = {
57
57
  icon: undefined,
58
+ title: '',
58
59
  description: '',
59
60
  actions: null,
60
61
  extra: undefined
@@ -7,7 +7,7 @@ exports.default = Spinner;
7
7
 
8
8
  var _react = _interopRequireDefault(require("react"));
9
9
 
10
- var _CircularProgress = _interopRequireDefault(require("@material-ui/core/CircularProgress"));
10
+ var _CircularProgress = _interopRequireDefault(require("@mui/material/CircularProgress"));
11
11
 
12
12
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
13
13
 
@@ -20,7 +20,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
20
20
  /**
21
21
  * Spinner
22
22
  *
23
- * 之前的 Spinner 实现由内外 2 个环构成, 现在改为基于 @material-ui/core/CircularProgress 的实现
23
+ * 之前的 Spinner 实现由内外 2 个环构成, 现在改为基于 @mui/material/CircularProgress 的实现
24
24
  *
25
25
  * - 之前 size prop 是 array 类型, 需要与 CircularProgress#size 兼容
26
26
  * - color 默认使用 #4598fa, 如果调用方传入了 color prop 或 style#color, 则默认 color 被覆盖
@@ -11,19 +11,19 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
11
11
 
12
12
  var _styledComponents = _interopRequireDefault(require("styled-components"));
13
13
 
14
- var _ExpandMore = _interopRequireDefault(require("@material-ui/icons/ExpandMore"));
14
+ var _ExpandMore = _interopRequireDefault(require("@mui/icons-material/ExpandMore"));
15
15
 
16
- var _Popper = _interopRequireDefault(require("@material-ui/core/Popper"));
16
+ var _Popper = _interopRequireDefault(require("@mui/material/Popper"));
17
17
 
18
- var _Paper = _interopRequireDefault(require("@material-ui/core/Paper"));
18
+ var _Paper = _interopRequireDefault(require("@mui/material/Paper"));
19
19
 
20
- var _ClickAwayListener = _interopRequireDefault(require("@material-ui/core/ClickAwayListener"));
20
+ var _ClickAwayListener = _interopRequireDefault(require("@mui/material/ClickAwayListener"));
21
21
 
22
- var _MenuList = _interopRequireDefault(require("@material-ui/core/MenuList"));
22
+ var _MenuList = _interopRequireDefault(require("@mui/material/MenuList"));
23
23
 
24
- var _MenuItem = _interopRequireDefault(require("@material-ui/core/MenuItem"));
24
+ var _MenuItem = _interopRequireDefault(require("@mui/material/MenuItem"));
25
25
 
26
- var _ButtonGroup = _interopRequireDefault(require("@material-ui/core/ButtonGroup"));
26
+ var _ButtonGroup = _interopRequireDefault(require("@mui/material/ButtonGroup"));
27
27
 
28
28
  var _Button = _interopRequireDefault(require("../Button"));
29
29
 
@@ -98,7 +98,7 @@ function SplitButton(_ref) {
98
98
 
99
99
  SplitButton.propTypes = {
100
100
  size: _propTypes.default.oneOf(['small', 'medium', 'large']),
101
- color: _propTypes.default.oneOf(['default', 'primary', 'secondary', 'inherit']),
101
+ color: _propTypes.default.oneOf(['primary', 'secondary', 'inherit']),
102
102
  menu: _propTypes.default.oneOfType([_propTypes.default.node, _propTypes.default.array]),
103
103
  // 也可以是用于渲染主按钮的 function
104
104
  children: _propTypes.default.any,
@@ -9,11 +9,11 @@ var _react = _interopRequireDefault(require("react"));
9
9
 
10
10
  var _propTypes = _interopRequireDefault(require("prop-types"));
11
11
 
12
- var _styles = require("@material-ui/core/styles");
12
+ var _styles = require("@mui/styles");
13
13
 
14
- var _FormControlLabel = _interopRequireDefault(require("@material-ui/core/FormControlLabel"));
14
+ var _FormControlLabel = _interopRequireDefault(require("@mui/material/FormControlLabel"));
15
15
 
16
- var _Switch = _interopRequireDefault(require("@material-ui/core/Switch"));
16
+ var _Switch = _interopRequireDefault(require("@mui/material/Switch"));
17
17
 
18
18
  const _excluded = ["classes"],
19
19
  _excluded2 = ["labelProps"];
package/lib/Tabs/index.js CHANGED
@@ -7,13 +7,13 @@ exports.default = Tabs;
7
7
 
8
8
  var _react = _interopRequireDefault(require("react"));
9
9
 
10
- var _propTypes = _interopRequireDefault(require("prop-types"));
10
+ var _styles = require("@mui/material/styles");
11
11
 
12
- var _core = require("@material-ui/core");
12
+ var _propTypes = _interopRequireDefault(require("prop-types"));
13
13
 
14
- var _Tabs = _interopRequireDefault(require("@material-ui/core/Tabs"));
14
+ var _Tabs = _interopRequireDefault(require("@mui/material/Tabs"));
15
15
 
16
- var _Tab = _interopRequireDefault(require("@material-ui/core/Tab"));
16
+ var _Tab = _interopRequireDefault(require("@mui/material/Tab"));
17
17
 
18
18
  const _excluded = ["tabs", "current", "onChange"];
19
19
 
@@ -23,26 +23,35 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
23
23
 
24
24
  function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
25
25
 
26
- const useStyles = (0, _core.makeStyles)(theme => ({
27
- tabs: {},
28
- tab: {
29
- fontSize: '0.875rem',
30
- [theme.breakpoints.up('md')]: {
31
- fontSize: '1rem'
26
+ const PREFIX = 'index';
27
+ const classes = {
28
+ tabs: "".concat(PREFIX, "-tabs"),
29
+ tab: "".concat(PREFIX, "-tab")
30
+ };
31
+ const StyledMuiTabs = (0, _styles.styled)(_Tabs.default)(_ref => {
32
+ let {
33
+ theme
34
+ } = _ref;
35
+ return {
36
+ ["& .".concat(classes.tabs)]: {},
37
+ ["& .".concat(classes.tab)]: {
38
+ fontSize: '0.875rem',
39
+ [theme.breakpoints.up('md')]: {
40
+ fontSize: '1rem'
41
+ }
32
42
  }
33
- }
34
- }));
43
+ };
44
+ });
35
45
 
36
- function Tabs(_ref) {
46
+ function Tabs(_ref2) {
37
47
  let {
38
48
  tabs,
39
49
  current,
40
50
  onChange: _onChange
41
- } = _ref,
42
- rest = _objectWithoutProperties(_ref, _excluded);
51
+ } = _ref2,
52
+ rest = _objectWithoutProperties(_ref2, _excluded);
43
53
 
44
- const classes = useStyles();
45
- return /*#__PURE__*/_react.default.createElement(_Tabs.default, Object.assign({
54
+ return /*#__PURE__*/_react.default.createElement(StyledMuiTabs, Object.assign({
46
55
  scrollButtons: "on",
47
56
  variant: "scrollable",
48
57
  value: current,
package/lib/Tag/index.js CHANGED
@@ -11,9 +11,9 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
11
11
 
12
12
  var _styledComponents = _interopRequireDefault(require("styled-components"));
13
13
 
14
- var _Typography = _interopRequireDefault(require("@material-ui/core/Typography"));
14
+ var _Typography = _interopRequireDefault(require("@mui/material/Typography"));
15
15
 
16
- var _useTheme = _interopRequireDefault(require("@material-ui/core/styles/useTheme"));
16
+ var _useTheme = _interopRequireDefault(require("@mui/styles/useTheme"));
17
17
 
18
18
  var _Util = require("../Util");
19
19
 
@@ -9,7 +9,7 @@ var _react = _interopRequireDefault(require("react"));
9
9
 
10
10
  var _propTypes = _interopRequireDefault(require("prop-types"));
11
11
 
12
- var _Typography = _interopRequireDefault(require("@material-ui/core/Typography"));
12
+ var _Typography = _interopRequireDefault(require("@mui/material/Typography"));
13
13
 
14
14
  var _styledComponents = _interopRequireDefault(require("styled-components"));
15
15
 
@@ -5,14 +5,12 @@ Object.defineProperty(exports, "__esModule", {
5
5
  });
6
6
  exports.create = void 0;
7
7
 
8
- var _styles = require("@material-ui/core/styles");
8
+ var _styles = require("@mui/material/styles");
9
9
 
10
10
  require("@fontsource/lato/400.css");
11
11
 
12
12
  require("@fontsource/lato/700.css");
13
13
 
14
- var _responsiveFontSizes = _interopRequireDefault(require("./responsiveFontSizes"));
15
-
16
14
  var _Colors = _interopRequireDefault(require("../Colors"));
17
15
 
18
16
  const _excluded = ["mode", "pageWidth", "palette", "typography", "overrides"];
@@ -29,8 +27,13 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
29
27
 
30
28
  function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
31
29
 
32
- // https://material-ui.com/customization/default-theme/
30
+ const muiDarkTheme = (0, _styles.createTheme)({
31
+ palette: {
32
+ mode: 'dark'
33
+ }
34
+ }); // https://material-ui.com/customization/default-theme/
33
35
  // eslint-disable-next-line import/prefer-default-export
36
+
34
37
  const create = function create() {
35
38
  let _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
36
39
  {
@@ -42,15 +45,26 @@ const create = function create() {
42
45
  } = _ref,
43
46
  rest = _objectWithoutProperties(_ref, _excluded);
44
47
 
48
+ // palette 考虑 light & dark mode, dark mode 需要持续完善
49
+ // - 能配合 ColorModeContext 使用
50
+ // - 为 dark mode 系统的设计整个 palette, 不要单个 color 设置
51
+ const _palette = mode === 'light' ? Object.assign(_objectSpread(_objectSpread({}, _Colors.default), {}, {
52
+ background: {
53
+ paper: _Colors.default.common.white,
54
+ default: _Colors.default.background.default
55
+ },
56
+ mode
57
+ }), palette || {}) : Object.assign(_objectSpread(_objectSpread({}, muiDarkTheme.palette), {}, {
58
+ background: {
59
+ paper: _Colors.default.grey[900],
60
+ default: _Colors.default.grey[900]
61
+ },
62
+ mode
63
+ }), palette || {});
64
+
45
65
  const theme = (0, _styles.createTheme)(_objectSpread({
46
66
  themeName: 'ArcBlock',
47
- palette: Object.assign(_objectSpread(_objectSpread({}, _Colors.default), {}, {
48
- background: {
49
- paper: mode === 'light' ? _Colors.default.common.white : _Colors.default.grey[900],
50
- default: mode === 'light' ? _Colors.default.background.default : _Colors.default.grey[900]
51
- },
52
- type: mode
53
- }), palette || {}),
67
+ palette: _palette,
54
68
  typography: Object.assign({
55
69
  useNextVariants: true,
56
70
  color: {
@@ -72,70 +86,40 @@ const create = function create() {
72
86
  fontWeight: 700
73
87
  }
74
88
  }, typography || {}),
75
- overrides: Object.assign({
89
+ components: _objectSpread({
76
90
  MuiButton: {
77
- root: {
78
- boxShadow: 'none'
91
+ styleOverrides: {
92
+ root: {
93
+ boxShadow: 'none'
94
+ }
79
95
  }
80
96
  },
81
97
  MuiButtonGroup: {
82
- contained: {
83
- boxShadow: 'none'
84
- }
85
- },
86
- MuiAppBar: {
87
- root: {
88
- height: 80
89
- }
90
- },
91
- MuiToolbar: {
92
- root: {
93
- background: mode === 'light' ? _Colors.default.background.default : _Colors.default.grey[900]
98
+ styleOverrides: {
99
+ root: {
100
+ boxShadow: 'none'
101
+ }
94
102
  }
95
103
  },
96
104
  MuiTableCell: {
97
- root: {
98
- borderBottomWidth: '0',
99
- paddingTop: '14px',
100
- paddingBottom: '14px',
101
- paddingLeft: 0,
102
- paddingRight: '30px'
103
- },
104
- head: {
105
- textTransform: 'uppercase',
106
- color: mode === 'light' ? _Colors.default.grey[900] : _Colors.default.grey[300]
107
- },
108
- body: {
109
- color: mode === 'light' ? _Colors.default.grey[900] : _Colors.default.grey[300]
110
- }
111
- },
112
- MuiChip: {
113
- root: {
114
- padding: '3px',
115
- height: '24px',
116
- fontSize: '12px',
117
- marginRight: '10px'
118
- },
119
- label: {
120
- paddingLeft: '5px',
121
- paddingRight: '5px',
122
- marginRight: '5px'
123
- }
124
- },
125
- MuiTooltip: {
126
- tooltip: {
127
- fontSize: '14px'
128
- }
129
- },
130
- MuiTypography: {
131
- body1: {
132
- color: mode === 'light' ? _Colors.default.grey[900] : _Colors.default.grey[300]
133
- },
134
- body2: {
135
- color: mode === 'light' ? _Colors.default.grey[900] : _Colors.default.grey[300]
105
+ styleOverrides: {
106
+ root: {
107
+ borderBottomWidth: '0',
108
+ paddingTop: '14px',
109
+ paddingBottom: '14px',
110
+ paddingLeft: 0,
111
+ paddingRight: '30px'
112
+ },
113
+ head: {
114
+ textTransform: 'uppercase',
115
+ color: mode === 'light' ? _Colors.default.grey[900] : _Colors.default.grey[300]
116
+ },
117
+ body: {
118
+ color: mode === 'light' ? _Colors.default.grey[900] : _Colors.default.grey[300]
119
+ }
136
120
  }
137
121
  }
138
- }, overrides || {}),
122
+ }, overrides),
139
123
  pageWidth,
140
124
  // TODO: 过时的 colors, 需要各项目负责人检查项目中是否使用 "theme.colors", 如果有需要清除,
141
125
  // 可以从 Colors 模块/theme.palette/mui colors 中取值
@@ -161,7 +145,7 @@ const create = function create() {
161
145
  },
162
146
  mode
163
147
  }, rest));
164
- const enhanced = (0, _responsiveFontSizes.default)(theme, {
148
+ const enhanced = (0, _styles.responsiveFontSizes)(theme, {
165
149
  breakpoints: ['xs', 'sm', 'md', 'lg'],
166
150
  disableAlign: false,
167
151
  factor: 3,