@arcblock/ux 2.6.6 → 2.6.8
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/Img/index.js +3 -3
- package/lib/SessionManager/federated-login-detecter.js +17 -14
- package/lib/SessionManager/index.js +8 -8
- package/lib/SessionManager/user-popper.js +6 -4
- package/package.json +4 -4
- package/src/Img/index.js +1 -1
- package/src/SessionManager/federated-login-detecter.jsx +4 -1
- package/src/SessionManager/index.jsx +1 -2
- package/src/SessionManager/user-popper.jsx +3 -1
package/lib/Img/index.js
CHANGED
@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
6
6
|
exports.default = void 0;
|
7
7
|
var _react = require("react");
|
8
8
|
var _propTypes = _interopRequireDefault(require("prop-types"));
|
9
|
-
var
|
9
|
+
var _SvgIcon = _interopRequireDefault(require("@mui/material/SvgIcon"));
|
10
10
|
var _reactIntersectionObserver = require("react-intersection-observer");
|
11
11
|
var _Alert = _interopRequireDefault(require("mdi-material-ui/Alert"));
|
12
12
|
var _Image = _interopRequireDefault(require("mdi-material-ui/Image"));
|
@@ -173,14 +173,14 @@ function Img(_ref) {
|
|
173
173
|
children: [!fallback && imgState === 'error' && /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
|
174
174
|
className: "image--state",
|
175
175
|
title: "loading image",
|
176
|
-
children: /*#__PURE__*/(0, _jsxRuntime.jsx)(
|
176
|
+
children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_SvgIcon.default, {
|
177
177
|
component: _Alert.default,
|
178
178
|
className: "image--icon"
|
179
179
|
})
|
180
180
|
}), !placeholder && imgState === 'loading' && /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
|
181
181
|
className: "image--state",
|
182
182
|
title: "Image load error",
|
183
|
-
children: /*#__PURE__*/(0, _jsxRuntime.jsx)(
|
183
|
+
children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_SvgIcon.default, {
|
184
184
|
component: _Image.default,
|
185
185
|
className: "image--icon"
|
186
186
|
})
|
@@ -6,7 +6,10 @@ Object.defineProperty(exports, "__esModule", {
|
|
6
6
|
exports.default = FederatedLoginDetecter;
|
7
7
|
var _propTypes = _interopRequireDefault(require("prop-types"));
|
8
8
|
var _react = require("react");
|
9
|
-
var
|
9
|
+
var _Box = _interopRequireDefault(require("@mui/material/Box"));
|
10
|
+
var _Chip = _interopRequireDefault(require("@mui/material/Chip"));
|
11
|
+
var _Divider = _interopRequireDefault(require("@mui/material/Divider"));
|
12
|
+
var _SvgIcon = _interopRequireDefault(require("@mui/material/SvgIcon"));
|
10
13
|
var _ShieldCheck = _interopRequireDefault(require("mdi-material-ui/ShieldCheck"));
|
11
14
|
var _userPopper = _interopRequireDefault(require("./user-popper"));
|
12
15
|
var _Avatar = _interopRequireDefault(require("../Avatar"));
|
@@ -73,21 +76,21 @@ function FederatedLoginDetecter(_ref3) {
|
|
73
76
|
anchorEl: anchorEl,
|
74
77
|
dark: dark,
|
75
78
|
onClose: () => setFederatedLoginOpen(false),
|
76
|
-
children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(
|
79
|
+
children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
|
77
80
|
p: 2,
|
78
|
-
children: [siteInfo && /*#__PURE__*/(0, _jsxRuntime.jsxs)(
|
81
|
+
children: [siteInfo && /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
|
79
82
|
display: "flex",
|
80
83
|
alignItems: "center",
|
81
|
-
children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(
|
84
|
+
children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
|
82
85
|
component: "img",
|
83
86
|
mr: 2,
|
84
87
|
src: "".concat(siteInfo.appUrl).concat(siteInfo.appLogo),
|
85
88
|
alt: siteInfo.appName,
|
86
89
|
width: "30px",
|
87
90
|
height: "30px"
|
88
|
-
}), /*#__PURE__*/(0, _jsxRuntime.jsx)(
|
91
|
+
}), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
|
89
92
|
children: translations[locale].useToConnect({
|
90
|
-
master: /*#__PURE__*/(0, _jsxRuntime.jsx)(
|
93
|
+
master: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
|
91
94
|
component: "a",
|
92
95
|
href: siteInfo.appUrl,
|
93
96
|
target: "_blank",
|
@@ -102,11 +105,11 @@ function FederatedLoginDetecter(_ref3) {
|
|
102
105
|
member: window.blocklet.appName
|
103
106
|
})
|
104
107
|
})]
|
105
|
-
}), siteInfo && userInfo && /*#__PURE__*/(0, _jsxRuntime.jsx)(
|
108
|
+
}), siteInfo && userInfo && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Divider.default, {
|
106
109
|
style: {
|
107
110
|
margin: '15px 0 10px 0'
|
108
111
|
}
|
109
|
-
}), userInfo && /*#__PURE__*/(0, _jsxRuntime.jsxs)(
|
112
|
+
}), userInfo && /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
|
110
113
|
display: "flex",
|
111
114
|
alignItems: "center",
|
112
115
|
children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Avatar.default, {
|
@@ -115,16 +118,16 @@ function FederatedLoginDetecter(_ref3) {
|
|
115
118
|
src: (0, _Util.getUserAvatar)(userInfo.avatar),
|
116
119
|
size: 28,
|
117
120
|
shape: "circle"
|
118
|
-
}), /*#__PURE__*/(0, _jsxRuntime.jsxs)(
|
121
|
+
}), /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
|
119
122
|
ml: 2,
|
120
|
-
children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)(
|
123
|
+
children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
|
121
124
|
display: "flex",
|
122
125
|
justifyContent: "space-between",
|
123
126
|
alignItems: "center",
|
124
|
-
children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(
|
127
|
+
children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
|
125
128
|
fontSize: 18,
|
126
129
|
children: userInfo.fullName
|
127
|
-
}), ((_userInfo$role = userInfo.role) === null || _userInfo$role === void 0 ? void 0 : _userInfo$role.toUpperCase()) && /*#__PURE__*/(0, _jsxRuntime.jsx)(
|
130
|
+
}), ((_userInfo$role = userInfo.role) === null || _userInfo$role === void 0 ? void 0 : _userInfo$role.toUpperCase()) && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Chip.default, {
|
128
131
|
label: (_userInfo$role2 = userInfo.role) === null || _userInfo$role2 === void 0 ? void 0 : _userInfo$role2.toUpperCase(),
|
129
132
|
size: "small",
|
130
133
|
variant: "outlined",
|
@@ -133,7 +136,7 @@ function FederatedLoginDetecter(_ref3) {
|
|
133
136
|
marginRight: 0,
|
134
137
|
fontSize: 12
|
135
138
|
},
|
136
|
-
icon: /*#__PURE__*/(0, _jsxRuntime.jsx)(
|
139
|
+
icon: /*#__PURE__*/(0, _jsxRuntime.jsx)(_SvgIcon.default, {
|
137
140
|
component: _ShieldCheck.default,
|
138
141
|
style: {
|
139
142
|
fontSize: '14px'
|
@@ -145,7 +148,7 @@ function FederatedLoginDetecter(_ref3) {
|
|
145
148
|
children: userInfo.did
|
146
149
|
})]
|
147
150
|
})]
|
148
|
-
}), siteInfo && /*#__PURE__*/(0, _jsxRuntime.jsx)(
|
151
|
+
}), siteInfo && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
|
149
152
|
display: "flex",
|
150
153
|
justifyContent: "center",
|
151
154
|
mt: 2,
|
@@ -25,6 +25,7 @@ var _Disconnect = _interopRequireDefault(require("@arcblock/icons/lib/Disconnect
|
|
25
25
|
var _Switch = _interopRequireDefault(require("@arcblock/icons/lib/Switch"));
|
26
26
|
var _useBrowser = _interopRequireDefault(require("@arcblock/react-hooks/lib/useBrowser"));
|
27
27
|
var _isEmpty = _interopRequireDefault(require("lodash/isEmpty"));
|
28
|
+
var _noop = _interopRequireDefault(require("lodash/noop"));
|
28
29
|
var _Avatar = _interopRequireDefault(require("../Avatar"));
|
29
30
|
var _Address = _interopRequireDefault(require("../Address"));
|
30
31
|
var _Util = require("../Util");
|
@@ -474,7 +475,6 @@ SessionManager.propTypes = {
|
|
474
475
|
dark: _propTypes.default.bool,
|
475
476
|
size: _propTypes.default.number
|
476
477
|
};
|
477
|
-
const noop = () => {};
|
478
478
|
SessionManager.defaultProps = {
|
479
479
|
locale: 'en',
|
480
480
|
showText: false,
|
@@ -484,13 +484,13 @@ SessionManager.defaultProps = {
|
|
484
484
|
switchPassport: true,
|
485
485
|
disableLogout: false,
|
486
486
|
menu: [],
|
487
|
-
menuRender:
|
488
|
-
onLogin:
|
489
|
-
onLogout:
|
490
|
-
onSwitchDid:
|
491
|
-
onSwitchProfile:
|
492
|
-
onSwitchPassport:
|
493
|
-
onBindWallet:
|
487
|
+
menuRender: _noop.default,
|
488
|
+
onLogin: _noop.default,
|
489
|
+
onLogout: _noop.default,
|
490
|
+
onSwitchDid: _noop.default,
|
491
|
+
onSwitchProfile: _noop.default,
|
492
|
+
onSwitchPassport: _noop.default,
|
493
|
+
onBindWallet: _noop.default,
|
494
494
|
dark: false,
|
495
495
|
size: 24
|
496
496
|
};
|
@@ -5,7 +5,9 @@ Object.defineProperty(exports, "__esModule", {
|
|
5
5
|
});
|
6
6
|
exports.default = UserPopper;
|
7
7
|
var _propTypes = _interopRequireDefault(require("prop-types"));
|
8
|
-
var
|
8
|
+
var _ClickAwayListener = _interopRequireDefault(require("@mui/material/ClickAwayListener"));
|
9
|
+
var _Paper = _interopRequireDefault(require("@mui/material/Paper"));
|
10
|
+
var _Popper = _interopRequireDefault(require("@mui/material/Popper"));
|
9
11
|
var _Theme = require("../Theme");
|
10
12
|
var _jsxRuntime = require("react/jsx-runtime");
|
11
13
|
var _templateObject;
|
@@ -25,7 +27,7 @@ function UserPopper(_ref) {
|
|
25
27
|
anchorEl: anchorEl,
|
26
28
|
placement: "bottom-end",
|
27
29
|
$dark: dark,
|
28
|
-
children: /*#__PURE__*/(0, _jsxRuntime.jsx)(
|
30
|
+
children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Paper.default, {
|
29
31
|
sx: [theme => ({
|
30
32
|
borderColor: '#F0F0F0',
|
31
33
|
boxShadow: '0px 8px 12px rgba(92, 92, 92, 0.04)',
|
@@ -50,7 +52,7 @@ function UserPopper(_ref) {
|
|
50
52
|
}
|
51
53
|
}],
|
52
54
|
variant: "outlined",
|
53
|
-
children: /*#__PURE__*/(0, _jsxRuntime.jsx)(
|
55
|
+
children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_ClickAwayListener.default, {
|
54
56
|
onClickAway: onClose,
|
55
57
|
children: children
|
56
58
|
})
|
@@ -70,7 +72,7 @@ UserPopper.defaultProps = {
|
|
70
72
|
open: false,
|
71
73
|
onClose: () => {}
|
72
74
|
};
|
73
|
-
const StyledPopper = (0, _Theme.styled)(
|
75
|
+
const StyledPopper = (0, _Theme.styled)(_Popper.default)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n z-index: ", ";\n .MuiList-root {\n /* HACK: \u9700\u8981288px \u624D\u80FD\u5C06 did \u5C55\u793A\u5B8C\u6574 */\n width: 290px;\n }\n .session-manager-user {\n font-size: 12px;\n flex-direction: column;\n align-items: flex-start;\n padding: 24px 24px 10px;\n }\n .session-manager-user-name {\n font-size: 20px;\n color: ", ";\n font-weight: bold;\n margin-bottom: 10px;\n display: flex;\n align-items: center;\n justify-content: space-between;\n }\n .session-manager-id-item {\n position: relative;\n padding-left: 8px;\n /* HACK: \u5F53\u524D\u5143\u7D20\u65E2\u662F\u7B2C\u4E00\u4E2A\uFF0C\u4E5F\u662F\u6700\u540E\u4E00\u4E2A\uFF0C\u5373\u53EA\u6709\u4E00\u4E2A\u540C\u7EA7\u5143\u7D20 */\n &:first-of-type:last-of-type {\n padding-left: 0;\n &:before,\n &:after {\n content: unset;\n }\n }\n &:before {\n position: absolute;\n content: '';\n left: 0px;\n top: 50%;\n width: 6px;\n height: 1px;\n background-color: #aeaeae;\n }\n &:not(:last-of-type):after {\n position: absolute;\n content: '';\n left: 0px;\n top: 50%;\n height: 100%;\n width: 1px;\n background-color: #aeaeae;\n }\n }\n .session-manager-menu-item {\n padding: 18.5px 24px;\n color: #777;\n font-size: 16px;\n &:hover {\n background-color: #fbfbfb;\n }\n }\n .session-manager-menu-icon {\n color: #999;\n margin-right: 16px;\n }\n"])), _ref2 => {
|
74
76
|
let {
|
75
77
|
theme
|
76
78
|
} = _ref2;
|
package/package.json
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"name": "@arcblock/ux",
|
3
|
-
"version": "2.6.
|
3
|
+
"version": "2.6.8",
|
4
4
|
"description": "Common used react components for arcblock products",
|
5
5
|
"keywords": [
|
6
6
|
"react",
|
@@ -47,11 +47,11 @@
|
|
47
47
|
"peerDependencies": {
|
48
48
|
"react": ">=18.1.0"
|
49
49
|
},
|
50
|
-
"gitHead": "
|
50
|
+
"gitHead": "3fa83a839824d393aba4550d3e90660c0c150425",
|
51
51
|
"dependencies": {
|
52
52
|
"@arcblock/did-motif": "^1.1.13",
|
53
|
-
"@arcblock/icons": "^2.6.
|
54
|
-
"@arcblock/react-hooks": "^2.6.
|
53
|
+
"@arcblock/icons": "^2.6.8",
|
54
|
+
"@arcblock/react-hooks": "^2.6.8",
|
55
55
|
"@babel/plugin-syntax-dynamic-import": "^7.8.3",
|
56
56
|
"@emotion/react": "^11.10.4",
|
57
57
|
"@emotion/styled": "^11.10.4",
|
package/src/Img/index.js
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
import { useEffect, useMemo, useState } from 'react';
|
2
2
|
import PropTypes from 'prop-types';
|
3
|
-
import
|
3
|
+
import SvgIcon from '@mui/material/SvgIcon';
|
4
4
|
import { useInView } from 'react-intersection-observer';
|
5
5
|
import Alert from 'mdi-material-ui/Alert';
|
6
6
|
import ImageIcon from 'mdi-material-ui/Image';
|
@@ -1,6 +1,9 @@
|
|
1
1
|
import PropTypes from 'prop-types';
|
2
2
|
import { useCallback, useState } from 'react';
|
3
|
-
import
|
3
|
+
import Box from '@mui/material/Box';
|
4
|
+
import Chip from '@mui/material/Chip';
|
5
|
+
import Divider from '@mui/material/Divider';
|
6
|
+
import SvgIcon from '@mui/material/SvgIcon';
|
4
7
|
import ShieldCheck from 'mdi-material-ui/ShieldCheck';
|
5
8
|
|
6
9
|
import UserPopper from './user-popper';
|
@@ -21,6 +21,7 @@ import DisconnectIcon from '@arcblock/icons/lib/Disconnect';
|
|
21
21
|
import SwitchDidIcon from '@arcblock/icons/lib/Switch';
|
22
22
|
import useBrowser from '@arcblock/react-hooks/lib/useBrowser';
|
23
23
|
import isEmpty from 'lodash/isEmpty';
|
24
|
+
import noop from 'lodash/noop';
|
24
25
|
|
25
26
|
import DidAvatar from '../Avatar';
|
26
27
|
import DidAddress from '../Address';
|
@@ -419,8 +420,6 @@ SessionManager.propTypes = {
|
|
419
420
|
size: PropTypes.number,
|
420
421
|
};
|
421
422
|
|
422
|
-
const noop = () => {};
|
423
|
-
|
424
423
|
SessionManager.defaultProps = {
|
425
424
|
locale: 'en',
|
426
425
|
showText: false,
|
@@ -1,5 +1,7 @@
|
|
1
1
|
import PropTypes from 'prop-types';
|
2
|
-
import
|
2
|
+
import ClickAwayListener from '@mui/material/ClickAwayListener';
|
3
|
+
import Paper from '@mui/material/Paper';
|
4
|
+
import Popper from '@mui/material/Popper';
|
3
5
|
import { styled } from '../Theme';
|
4
6
|
|
5
7
|
export default function UserPopper({ anchorEl, dark, children, open, onClose }) {
|