@arcblock/ux 2.9.52 → 2.9.53
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/es/Dialog/confirm.js +10 -3
- package/es/Dialog/use-confirm.js +4 -4
- package/es/SessionBlocklet/index.js +1 -1
- package/lib/Dialog/confirm.js +10 -3
- package/lib/Dialog/use-confirm.js +4 -4
- package/lib/SessionBlocklet/index.js +1 -1
- package/package.json +5 -5
- package/src/Dialog/confirm.jsx +17 -3
- package/src/Dialog/use-confirm.jsx +4 -4
- package/src/SessionBlocklet/index.jsx +1 -1
package/es/Dialog/confirm.js
CHANGED
|
@@ -45,7 +45,8 @@ export default function Confirm({
|
|
|
45
45
|
if (['backdropClick', 'escapeKeyDown'].includes(reason)) {
|
|
46
46
|
return;
|
|
47
47
|
}
|
|
48
|
-
|
|
48
|
+
e.stopPropagation();
|
|
49
|
+
onCancel(e, reason);
|
|
49
50
|
});
|
|
50
51
|
return /*#__PURE__*/_jsx(Dialog, {
|
|
51
52
|
title: title,
|
|
@@ -69,12 +70,18 @@ export default function Confirm({
|
|
|
69
70
|
},
|
|
70
71
|
actions: /*#__PURE__*/_jsxs(_Fragment, {
|
|
71
72
|
children: [showCancelButton && /*#__PURE__*/_jsx(Button, {
|
|
72
|
-
onClick: e =>
|
|
73
|
+
onClick: e => {
|
|
74
|
+
e.stopPropagation();
|
|
75
|
+
onCancel(e, 'closeButton');
|
|
76
|
+
},
|
|
73
77
|
color: "primary",
|
|
74
78
|
...cancelButton.props,
|
|
75
79
|
children: cancelButton.text
|
|
76
80
|
}), /*#__PURE__*/_jsx(Button, {
|
|
77
|
-
onClick:
|
|
81
|
+
onClick: e => {
|
|
82
|
+
e.stopPropagation();
|
|
83
|
+
onConfirm(e);
|
|
84
|
+
},
|
|
78
85
|
color: "primary",
|
|
79
86
|
autoFocus: true,
|
|
80
87
|
...confirmButton.props,
|
package/es/Dialog/use-confirm.js
CHANGED
|
@@ -44,14 +44,14 @@ const ConfirmHolder = /*#__PURE__*/forwardRef((props, ref) => {
|
|
|
44
44
|
reset();
|
|
45
45
|
}, 300);
|
|
46
46
|
});
|
|
47
|
-
const onCancel = useMemoizedFn(() => {
|
|
47
|
+
const onCancel = useMemoizedFn((e, reason) => {
|
|
48
48
|
close();
|
|
49
|
-
state?.onCancel();
|
|
49
|
+
state?.onCancel(e, reason);
|
|
50
50
|
}, []);
|
|
51
|
-
const onConfirm = useMemoizedFn(async
|
|
51
|
+
const onConfirm = useMemoizedFn(async e => {
|
|
52
52
|
state.loading = true;
|
|
53
53
|
try {
|
|
54
|
-
await state?.onConfirm(close);
|
|
54
|
+
await state?.onConfirm(close, e);
|
|
55
55
|
} finally {
|
|
56
56
|
state.loading = false;
|
|
57
57
|
}
|
package/lib/Dialog/confirm.js
CHANGED
|
@@ -57,7 +57,8 @@ function Confirm(_ref) {
|
|
|
57
57
|
if (['backdropClick', 'escapeKeyDown'].includes(reason)) {
|
|
58
58
|
return;
|
|
59
59
|
}
|
|
60
|
-
|
|
60
|
+
e.stopPropagation();
|
|
61
|
+
onCancel(e, reason);
|
|
61
62
|
});
|
|
62
63
|
return /*#__PURE__*/(0, _jsxRuntime.jsx)(_dialog.default, _objectSpread(_objectSpread({
|
|
63
64
|
title: title,
|
|
@@ -81,12 +82,18 @@ function Confirm(_ref) {
|
|
|
81
82
|
},
|
|
82
83
|
actions: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
|
|
83
84
|
children: [showCancelButton && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Button.default, _objectSpread(_objectSpread({
|
|
84
|
-
onClick: e =>
|
|
85
|
+
onClick: e => {
|
|
86
|
+
e.stopPropagation();
|
|
87
|
+
onCancel(e, 'closeButton');
|
|
88
|
+
},
|
|
85
89
|
color: "primary"
|
|
86
90
|
}, cancelButton.props), {}, {
|
|
87
91
|
children: cancelButton.text
|
|
88
92
|
})), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Button.default, _objectSpread(_objectSpread({
|
|
89
|
-
onClick:
|
|
93
|
+
onClick: e => {
|
|
94
|
+
e.stopPropagation();
|
|
95
|
+
onConfirm(e);
|
|
96
|
+
},
|
|
90
97
|
color: "primary",
|
|
91
98
|
autoFocus: true
|
|
92
99
|
}, confirmButton.props), {}, {
|
|
@@ -58,14 +58,14 @@ const ConfirmHolder = /*#__PURE__*/(0, _react.forwardRef)((props, ref) => {
|
|
|
58
58
|
reset();
|
|
59
59
|
}, 300);
|
|
60
60
|
});
|
|
61
|
-
const onCancel = (0, _ahooks.useMemoizedFn)(() => {
|
|
61
|
+
const onCancel = (0, _ahooks.useMemoizedFn)((e, reason) => {
|
|
62
62
|
close();
|
|
63
|
-
state === null || state === void 0 ? void 0 : state.onCancel();
|
|
63
|
+
state === null || state === void 0 ? void 0 : state.onCancel(e, reason);
|
|
64
64
|
}, []);
|
|
65
|
-
const onConfirm = (0, _ahooks.useMemoizedFn)(async
|
|
65
|
+
const onConfirm = (0, _ahooks.useMemoizedFn)(async e => {
|
|
66
66
|
state.loading = true;
|
|
67
67
|
try {
|
|
68
|
-
await (state === null || state === void 0 ? void 0 : state.onConfirm(close));
|
|
68
|
+
await (state === null || state === void 0 ? void 0 : state.onConfirm(close, e));
|
|
69
69
|
} finally {
|
|
70
70
|
state.loading = false;
|
|
71
71
|
}
|
|
@@ -148,7 +148,7 @@ function SessionBlocklet(_ref) {
|
|
|
148
148
|
textAlign: 'center',
|
|
149
149
|
lineHeight: 'normal'
|
|
150
150
|
},
|
|
151
|
-
children: ((_item$title = item.title) === null || _item$title === void 0 ? void 0 : _item$title
|
|
151
|
+
children: ((_item$title = item.title) === null || _item$title === void 0 ? void 0 : _item$title[locale]) || item.title
|
|
152
152
|
})]
|
|
153
153
|
})
|
|
154
154
|
}, item.id);
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@arcblock/ux",
|
|
3
|
-
"version": "2.9.
|
|
3
|
+
"version": "2.9.53",
|
|
4
4
|
"description": "Common used react components for arcblock products",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"react",
|
|
@@ -358,12 +358,12 @@
|
|
|
358
358
|
"@mui/material": "^5.15.0",
|
|
359
359
|
"react": ">=18.2.0"
|
|
360
360
|
},
|
|
361
|
-
"gitHead": "
|
|
361
|
+
"gitHead": "bf54e5b6fe510e2340ae87d1561d38d04dc25363",
|
|
362
362
|
"dependencies": {
|
|
363
363
|
"@arcblock/did-motif": "^1.1.13",
|
|
364
|
-
"@arcblock/icons": "^2.9.
|
|
365
|
-
"@arcblock/nft-display": "^2.9.
|
|
366
|
-
"@arcblock/react-hooks": "^2.9.
|
|
364
|
+
"@arcblock/icons": "^2.9.53",
|
|
365
|
+
"@arcblock/nft-display": "^2.9.53",
|
|
366
|
+
"@arcblock/react-hooks": "^2.9.53",
|
|
367
367
|
"@babel/plugin-syntax-dynamic-import": "^7.8.3",
|
|
368
368
|
"@emotion/react": "^11.10.4",
|
|
369
369
|
"@emotion/styled": "^11.10.4",
|
package/src/Dialog/confirm.jsx
CHANGED
|
@@ -47,7 +47,8 @@ export default function Confirm({
|
|
|
47
47
|
if (['backdropClick', 'escapeKeyDown'].includes(reason)) {
|
|
48
48
|
return;
|
|
49
49
|
}
|
|
50
|
-
|
|
50
|
+
e.stopPropagation();
|
|
51
|
+
onCancel(e, reason);
|
|
51
52
|
});
|
|
52
53
|
|
|
53
54
|
return (
|
|
@@ -72,11 +73,24 @@ export default function Confirm({
|
|
|
72
73
|
actions={
|
|
73
74
|
<>
|
|
74
75
|
{showCancelButton && (
|
|
75
|
-
<Button
|
|
76
|
+
<Button
|
|
77
|
+
onClick={(e) => {
|
|
78
|
+
e.stopPropagation();
|
|
79
|
+
onCancel(e, 'closeButton');
|
|
80
|
+
}}
|
|
81
|
+
color="primary"
|
|
82
|
+
{...cancelButton.props}>
|
|
76
83
|
{cancelButton.text}
|
|
77
84
|
</Button>
|
|
78
85
|
)}
|
|
79
|
-
<Button
|
|
86
|
+
<Button
|
|
87
|
+
onClick={(e) => {
|
|
88
|
+
e.stopPropagation();
|
|
89
|
+
onConfirm(e);
|
|
90
|
+
}}
|
|
91
|
+
color="primary"
|
|
92
|
+
autoFocus
|
|
93
|
+
{...confirmButton.props}>
|
|
80
94
|
{confirmButton.text}
|
|
81
95
|
</Button>
|
|
82
96
|
</>
|
|
@@ -46,14 +46,14 @@ const ConfirmHolder = forwardRef((props, ref) => {
|
|
|
46
46
|
reset();
|
|
47
47
|
}, 300);
|
|
48
48
|
});
|
|
49
|
-
const onCancel = useMemoizedFn(() => {
|
|
49
|
+
const onCancel = useMemoizedFn((e, reason) => {
|
|
50
50
|
close();
|
|
51
|
-
state?.onCancel();
|
|
51
|
+
state?.onCancel(e, reason);
|
|
52
52
|
}, []);
|
|
53
|
-
const onConfirm = useMemoizedFn(async () => {
|
|
53
|
+
const onConfirm = useMemoizedFn(async (e) => {
|
|
54
54
|
state.loading = true;
|
|
55
55
|
try {
|
|
56
|
-
await state?.onConfirm(close);
|
|
56
|
+
await state?.onConfirm(close, e);
|
|
57
57
|
} finally {
|
|
58
58
|
state.loading = false;
|
|
59
59
|
}
|
|
@@ -136,7 +136,7 @@ export default function SessionBlocklet({ session, locale, size }) {
|
|
|
136
136
|
textAlign: 'center',
|
|
137
137
|
lineHeight: 'normal',
|
|
138
138
|
}}>
|
|
139
|
-
{item.title?.
|
|
139
|
+
{item.title?.[locale] || item.title}
|
|
140
140
|
</Typography>
|
|
141
141
|
</ListItemButton>
|
|
142
142
|
</ListItem>
|