@arcblock/ux 2.9.52 → 2.9.54

package/es/Dialog/confirm.js

@@ -45,7 +45,8 @@ export default function Confirm({
     if (['backdropClick', 'escapeKeyDown'].includes(reason)) {
       return;
     }
-    onCancel();
+    e.stopPropagation();
+    onCancel(e, reason);
   });
   return /*#__PURE__*/_jsx(Dialog, {
     title: title,
@@ -69,12 +70,18 @@ export default function Confirm({
     },
     actions: /*#__PURE__*/_jsxs(_Fragment, {
       children: [showCancelButton && /*#__PURE__*/_jsx(Button, {
-        onClick: e => onCancel(e, 'closeButton'),
+        onClick: e => {
+          e.stopPropagation();
+          onCancel(e, 'closeButton');
+        },
         color: "primary",
         ...cancelButton.props,
         children: cancelButton.text
       }), /*#__PURE__*/_jsx(Button, {
-        onClick: () => onConfirm(),
+        onClick: e => {
+          e.stopPropagation();
+          onConfirm(e);
+        },
         color: "primary",
         autoFocus: true,
         ...confirmButton.props,

package/es/Dialog/use-confirm.js

@@ -44,14 +44,14 @@ const ConfirmHolder = /*#__PURE__*/forwardRef((props, ref) => {
       reset();
     }, 300);
   });
-  const onCancel = useMemoizedFn(() => {
+  const onCancel = useMemoizedFn((e, reason) => {
     close();
-    state?.onCancel();
+    state?.onCancel(e, reason);
   }, []);
-  const onConfirm = useMemoizedFn(async () => {
+  const onConfirm = useMemoizedFn(async e => {
     state.loading = true;
     try {
-      await state?.onConfirm(close);
+      await state?.onConfirm(close, e);
     } finally {
       state.loading = false;
     }

package/es/Layout/dashboard/sidebar.js

@@ -7,7 +7,7 @@ import { styled } from '../../Theme';
 import { NavLink } from './external-link';
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
-function renderGroup(item) {
+function renderGroup(item, index) {
   return /*#__PURE__*/_jsxs("li", {
     className: "layout-sidebar-group",
     children: [/*#__PURE__*/_jsx("span", {
@@ -16,11 +16,11 @@ function renderGroup(item) {
     }), /*#__PURE__*/_jsx("ul", {
       children: item.children.map(renderItem)
     })]
-  }, `group-${item.title}`);
+  }, `group-${item.title}-${index}`);
 }
-function renderItem(item) {
+function renderItem(item, index) {
   if (item.children?.length) {
-    return renderGroup(item);
+    return renderGroup(item, index);
   }
   const {
     url,
@@ -50,7 +50,7 @@ function renderItem(item) {
         children: title
       })]
     })
-  }, url);
+  }, `${url}-${index}`);
 }
 function Sidebar({
   links,

package/es/SessionBlocklet/index.js

@@ -132,7 +132,7 @@ export default function SessionBlocklet({
                       textAlign: 'center',
                       lineHeight: 'normal'
                     },
-                    children: item.title?.zh || item.title
+                    children: item.title?.[locale] || item.title
                   })]
                 })
               }, item.id))

package/lib/Dialog/confirm.js

@@ -57,7 +57,8 @@ function Confirm(_ref) {
     if (['backdropClick', 'escapeKeyDown'].includes(reason)) {
       return;
     }
-    onCancel();
+    e.stopPropagation();
+    onCancel(e, reason);
   });
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_dialog.default, _objectSpread(_objectSpread({
     title: title,
@@ -81,12 +82,18 @@ function Confirm(_ref) {
     },
     actions: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
       children: [showCancelButton && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Button.default, _objectSpread(_objectSpread({
-        onClick: e => onCancel(e, 'closeButton'),
+        onClick: e => {
+          e.stopPropagation();
+          onCancel(e, 'closeButton');
+        },
         color: "primary"
       }, cancelButton.props), {}, {
         children: cancelButton.text
       })), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Button.default, _objectSpread(_objectSpread({
-        onClick: () => onConfirm(),
+        onClick: e => {
+          e.stopPropagation();
+          onConfirm(e);
+        },
         color: "primary",
         autoFocus: true
       }, confirmButton.props), {}, {

package/lib/Dialog/use-confirm.js

@@ -58,14 +58,14 @@ const ConfirmHolder = /*#__PURE__*/(0, _react.forwardRef)((props, ref) => {
       reset();
     }, 300);
   });
-  const onCancel = (0, _ahooks.useMemoizedFn)(() => {
+  const onCancel = (0, _ahooks.useMemoizedFn)((e, reason) => {
     close();
-    state === null || state === void 0 ? void 0 : state.onCancel();
+    state === null || state === void 0 ? void 0 : state.onCancel(e, reason);
   }, []);
-  const onConfirm = (0, _ahooks.useMemoizedFn)(async () => {
+  const onConfirm = (0, _ahooks.useMemoizedFn)(async e => {
     state.loading = true;
     try {
-      await (state === null || state === void 0 ? void 0 : state.onConfirm(close));
+      await (state === null || state === void 0 ? void 0 : state.onConfirm(close, e));
     } finally {
       state.loading = false;
     }

package/lib/Layout/dashboard/sidebar.js

@@ -23,7 +23,7 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 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; }
-function renderGroup(item) {
+function renderGroup(item, index) {
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)("li", {
     className: "layout-sidebar-group",
     children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
@@ -32,12 +32,12 @@ function renderGroup(item) {
     }), /*#__PURE__*/(0, _jsxRuntime.jsx)("ul", {
       children: item.children.map(renderItem)
     })]
-  }, "group-".concat(item.title));
+  }, "group-".concat(item.title, "-").concat(index));
 }
-function renderItem(item) {
+function renderItem(item, index) {
   var _item$children;
   if ((_item$children = item.children) !== null && _item$children !== void 0 && _item$children.length) {
-    return renderGroup(item);
+    return renderGroup(item, index);
   }
   const {
     url,
@@ -70,7 +70,7 @@ function renderItem(item) {
         children: title
       })]
     })
-  }, url);
+  }, "".concat(url, "-").concat(index));
 }
 function Sidebar(_ref2) {
   let {

package/lib/SessionBlocklet/index.js

@@ -148,7 +148,7 @@ function SessionBlocklet(_ref) {
                           textAlign: 'center',
                           lineHeight: 'normal'
                         },
-                        children: ((_item$title = item.title) === null || _item$title === void 0 ? void 0 : _item$title.zh) || item.title
+                        children: ((_item$title = item.title) === null || _item$title === void 0 ? void 0 : _item$title[locale]) || item.title
                       })]
                     })
                   }, item.id);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arcblock/ux",
-  "version": "2.9.52",
+  "version": "2.9.54",
   "description": "Common used react components for arcblock products",
   "keywords": [
     "react",
@@ -358,12 +358,12 @@
     "@mui/material": "^5.15.0",
     "react": ">=18.2.0"
   },
-  "gitHead": "362391bd55f3b943e59f16dfaaded615c64ecb93",
+  "gitHead": "497c6bb83ad04937b3ba6a182e79383889a4562e",
   "dependencies": {
     "@arcblock/did-motif": "^1.1.13",
-    "@arcblock/icons": "^2.9.52",
-    "@arcblock/nft-display": "^2.9.52",
-    "@arcblock/react-hooks": "^2.9.52",
+    "@arcblock/icons": "^2.9.54",
+    "@arcblock/nft-display": "^2.9.54",
+    "@arcblock/react-hooks": "^2.9.54",
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
     "@emotion/react": "^11.10.4",
     "@emotion/styled": "^11.10.4",

package/src/Dialog/confirm.jsx

@@ -47,7 +47,8 @@ export default function Confirm({
     if (['backdropClick', 'escapeKeyDown'].includes(reason)) {
       return;
     }
-    onCancel();
+    e.stopPropagation();
+    onCancel(e, reason);
   });
 
   return (
@@ -72,11 +73,24 @@ export default function Confirm({
       actions={
         <>
           {showCancelButton && (
-            <Button onClick={(e) => onCancel(e, 'closeButton')} color="primary" {...cancelButton.props}>
+            <Button
+              onClick={(e) => {
+                e.stopPropagation();
+                onCancel(e, 'closeButton');
+              }}
+              color="primary"
+              {...cancelButton.props}>
               {cancelButton.text}
             </Button>
           )}
-          <Button onClick={() => onConfirm()} color="primary" autoFocus {...confirmButton.props}>
+          <Button
+            onClick={(e) => {
+              e.stopPropagation();
+              onConfirm(e);
+            }}
+            color="primary"
+            autoFocus
+            {...confirmButton.props}>
             {confirmButton.text}
           </Button>
         </>

package/src/Dialog/use-confirm.jsx

@@ -46,14 +46,14 @@ const ConfirmHolder = forwardRef((props, ref) => {
       reset();
     }, 300);
   });
-  const onCancel = useMemoizedFn(() => {
+  const onCancel = useMemoizedFn((e, reason) => {
     close();
-    state?.onCancel();
+    state?.onCancel(e, reason);
   }, []);
-  const onConfirm = useMemoizedFn(async () => {
+  const onConfirm = useMemoizedFn(async (e) => {
     state.loading = true;
     try {
-      await state?.onConfirm(close);
+      await state?.onConfirm(close, e);
     } finally {
       state.loading = false;
     }

package/src/Layout/dashboard/sidebar.js

@@ -6,23 +6,23 @@ import clsx from 'clsx';
 import { styled } from '../../Theme';
 import { NavLink } from './external-link';
 
-function renderGroup(item) {
+function renderGroup(item, index) {
   return (
-    <li key={`group-${item.title}`} className="layout-sidebar-group">
+    <li key={`group-${item.title}-${index}`} className="layout-sidebar-group">
       <span className="layout-sidebar-group-title">{item.title}</span>
       <ul>{item.children.map(renderItem)}</ul>
     </li>
   );
 }
 
-function renderItem(item) {
+function renderItem(item, index) {
   if (item.children?.length) {
-    return renderGroup(item);
+    return renderGroup(item, index);
   }
   const { url, icon, title, showBadge, external, active } = item;
   // external = true 时 link active 状态由传入 links 的调用方决定 (适用于 blocklet ui dashboard 的情况)
   return (
-    <li key={url} className="layout-sidebar-item">
+    <li key={`${url}-${index}`} className="layout-sidebar-item">
       <NavLink
         external={external}
         to={url}

package/src/SessionBlocklet/index.jsx

@@ -136,7 +136,7 @@ export default function SessionBlocklet({ session, locale, size }) {
                             textAlign: 'center',
                             lineHeight: 'normal',
                           }}>
-                          {item.title?.zh || item.title}
+                          {item.title?.[locale] || item.title}
                         </Typography>
                       </ListItemButton>
                     </ListItem>