@arcblock/ux 2.12.23 → 2.12.25
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.
|
@@ -19,6 +19,7 @@ import SessionPermission from '../../SessionPermission';
|
|
|
19
19
|
import { translations } from '../libs/translation';
|
|
20
20
|
import { translate } from '../../Locale/util';
|
|
21
21
|
import DidSpace from './did-space';
|
|
22
|
+
import { mergeSx } from '../../Util/style';
|
|
22
23
|
const getInviteLink = inviter => {
|
|
23
24
|
const url = new URL(window.location.href);
|
|
24
25
|
url.searchParams.set('inviter', inviter);
|
|
@@ -107,20 +108,21 @@ export default function LoggedIn({
|
|
|
107
108
|
Toast.success(t('inviteCopied'));
|
|
108
109
|
});
|
|
109
110
|
return /*#__PURE__*/_jsxs(Box, {
|
|
110
|
-
sx: {
|
|
111
|
+
sx: mergeSx({
|
|
111
112
|
display: 'inline-flex',
|
|
112
113
|
alignItems: 'center',
|
|
113
|
-
justifyContent: 'center'
|
|
114
|
-
...sx
|
|
114
|
+
justifyContent: 'center'
|
|
115
115
|
},
|
|
116
|
+
// @ts-ignore
|
|
117
|
+
sx),
|
|
116
118
|
...rest,
|
|
117
|
-
...handleEventProps,
|
|
118
119
|
children: [/*#__PURE__*/_jsx(IconButton, {
|
|
119
120
|
ref: popperAnchorRef,
|
|
120
121
|
size: "medium",
|
|
121
122
|
"data-cy": "sessionManager-logout-popup",
|
|
122
123
|
className: "arc-session-user-logged-in",
|
|
123
124
|
"aria-label": "User info button",
|
|
125
|
+
...handleEventProps,
|
|
124
126
|
children: /*#__PURE__*/_jsx(DidAvatar, {
|
|
125
127
|
variant: "circle",
|
|
126
128
|
did: session.user.did,
|
|
@@ -145,7 +147,7 @@ export default function LoggedIn({
|
|
|
145
147
|
onClickAway: e => {
|
|
146
148
|
e.preventDefault();
|
|
147
149
|
e.stopPropagation();
|
|
148
|
-
|
|
150
|
+
onTogglePopper(false);
|
|
149
151
|
},
|
|
150
152
|
children: /*#__PURE__*/_jsx(Fade, {
|
|
151
153
|
...TransitionProps,
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@arcblock/ux",
|
|
3
|
-
"version": "2.12.
|
|
3
|
+
"version": "2.12.25",
|
|
4
4
|
"description": "Common used react components for arcblock products",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"react",
|
|
@@ -68,12 +68,12 @@
|
|
|
68
68
|
"react": ">=18.2.0",
|
|
69
69
|
"react-router-dom": ">=6.22.3"
|
|
70
70
|
},
|
|
71
|
-
"gitHead": "
|
|
71
|
+
"gitHead": "6a239ca2c9add4e3f8844eafd3a42ad2ab4edc04",
|
|
72
72
|
"dependencies": {
|
|
73
73
|
"@arcblock/did-motif": "^1.1.13",
|
|
74
|
-
"@arcblock/icons": "^2.12.
|
|
75
|
-
"@arcblock/nft-display": "^2.12.
|
|
76
|
-
"@arcblock/react-hooks": "^2.12.
|
|
74
|
+
"@arcblock/icons": "^2.12.25",
|
|
75
|
+
"@arcblock/nft-display": "^2.12.25",
|
|
76
|
+
"@arcblock/react-hooks": "^2.12.25",
|
|
77
77
|
"@babel/plugin-syntax-dynamic-import": "^7.8.3",
|
|
78
78
|
"@fontsource/inter": "^5.0.16",
|
|
79
79
|
"@fontsource/ubuntu-mono": "^5.0.18",
|
|
@@ -31,6 +31,7 @@ import { translations } from '../libs/translation';
|
|
|
31
31
|
import { translate } from '../../Locale/util';
|
|
32
32
|
import type { Locale, Session } from '../../type';
|
|
33
33
|
import DidSpace from './did-space';
|
|
34
|
+
import { mergeSx } from '../../Util/style';
|
|
34
35
|
|
|
35
36
|
const getInviteLink = (inviter: string) => {
|
|
36
37
|
const url = new URL(window.location.href);
|
|
@@ -136,15 +137,23 @@ export default function LoggedIn({
|
|
|
136
137
|
|
|
137
138
|
return (
|
|
138
139
|
<Box
|
|
139
|
-
sx={
|
|
140
|
-
|
|
141
|
-
|
|
140
|
+
sx={mergeSx(
|
|
141
|
+
{
|
|
142
|
+
display: 'inline-flex',
|
|
143
|
+
alignItems: 'center',
|
|
144
|
+
justifyContent: 'center',
|
|
145
|
+
},
|
|
146
|
+
// @ts-ignore
|
|
147
|
+
sx
|
|
148
|
+
)}
|
|
149
|
+
{...rest}>
|
|
142
150
|
<IconButton
|
|
143
151
|
ref={popperAnchorRef}
|
|
144
152
|
size="medium"
|
|
145
153
|
data-cy="sessionManager-logout-popup"
|
|
146
154
|
className="arc-session-user-logged-in"
|
|
147
|
-
aria-label="User info button"
|
|
155
|
+
aria-label="User info button"
|
|
156
|
+
{...handleEventProps}>
|
|
148
157
|
<DidAvatar variant="circle" did={session.user.did} src={avatar} size={size} shape="circle" />
|
|
149
158
|
</IconButton>
|
|
150
159
|
|
|
@@ -161,7 +170,7 @@ export default function LoggedIn({
|
|
|
161
170
|
onClickAway={(e) => {
|
|
162
171
|
e.preventDefault();
|
|
163
172
|
e.stopPropagation();
|
|
164
|
-
|
|
173
|
+
onTogglePopper(false);
|
|
165
174
|
}}>
|
|
166
175
|
<Fade {...TransitionProps} timeout={350}>
|
|
167
176
|
<Paper
|