@arcblock/ux 2.9.58 → 2.9.59

package/es/SessionBlocklet/index.js

@@ -9,6 +9,7 @@ import Button from '../Button';
 import { temp as colors } from '../Colors';
 import { AUTH_SERVICE_PREFIX, NAVIGATION_URL } from '../Util/constant';
 import SessionPermission from '../SessionPermission';
+import { getTranslation } from '../Util';
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
@@ -132,7 +133,7 @@ export default function SessionBlocklet({
                       textAlign: 'center',
                       lineHeight: 'normal'
                     },
-                    children: item.title?.[locale] || item.title
+                    children: getTranslation(item.title, locale)
                   })]
                 })
               }, item.id))

package/es/Util/index.js

@@ -329,4 +329,34 @@ export const getDIDColor = did => {
   } catch {
     return null;
   }
+};
+
+/**
+ * Retrieves the appropriate translation based on the locale, with fallback options.
+ *
+ * @param {Object|string} translations - The translations object or string to retrieve translation from.
+ * @param {string} locale - The locale to use for retrieving the translation.
+ * @param {Object} options - Additional options for fallbackLocale and defaultValue.
+ * @param {string} [options.fallbackLocale='en'] - The fallback locale to use if the translation for the specified locale is not found.
+ * @param {string} [options.defaultValue='unknown'] - The default value to return if no translation is found.
+ * @return {string} The translated string based on the locale, with fallback options if necessary.
+ */
+export const getTranslation = (translations, locale, {
+  fallbackLocale = 'en',
+  defaultValue = 'unknown'
+} = {}) => {
+  if (typeof translations === 'string') {
+    return translations;
+  }
+  let translation;
+  if (locale) {
+    translation = translations[locale];
+  }
+  if (!translation || typeof translation !== 'string') {
+    translation = translations[fallbackLocale];
+  }
+  if (!translation || typeof translation !== 'string') {
+    translation = defaultValue;
+  }
+  return translation;
 };

package/lib/SessionBlocklet/index.js

@@ -15,6 +15,7 @@ var _Button = _interopRequireDefault(require("../Button"));
 var _Colors = require("../Colors");
 var _constant = require("../Util/constant");
 var _SessionPermission = _interopRequireDefault(require("../SessionPermission"));
+var _Util = require("../Util");
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
@@ -110,7 +111,7 @@ function SessionBlocklet(_ref) {
                   p: 0
                 },
                 children: sessionMenuList.map(item => {
-                  var _item$component, _item$title;
+                  var _item$component;
                   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.ListItem, {
                     disablePadding: true,
                     children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.ListItemButton, {
@@ -148,7 +149,7 @@ function SessionBlocklet(_ref) {
                           textAlign: 'center',
                           lineHeight: 'normal'
                         },
-                        children: ((_item$title = item.title) === null || _item$title === void 0 ? void 0 : _item$title[locale]) || item.title
+                        children: (0, _Util.getTranslation)(item.title, locale)
                       })]
                     })
                   }, item.id);

package/lib/Util/index.js

@@ -12,7 +12,7 @@ exports.getCookieOptions = getCookieOptions;
 exports.getCopyright = getCopyright;
 exports.getDIDColor = void 0;
 exports.getDateTool = getDateTool;
-exports.isUrl = exports.isEthereumDid = exports.getVisitorId = exports.getUserAvatar = exports.getTimezone = exports.getFontSize = void 0;
+exports.isUrl = exports.isEthereumDid = exports.getVisitorId = exports.getUserAvatar = exports.getTranslation = exports.getTimezone = exports.getFontSize = void 0;
 exports.mergeProps = mergeProps;
 exports.openWebWallet = openWebWallet;
 exports.parseQuery = parseQuery;
@@ -378,4 +378,35 @@ const getDIDColor = did => {
     return null;
   }
 };
-exports.getDIDColor = getDIDColor;
+
+/**
+ * Retrieves the appropriate translation based on the locale, with fallback options.
+ *
+ * @param {Object|string} translations - The translations object or string to retrieve translation from.
+ * @param {string} locale - The locale to use for retrieving the translation.
+ * @param {Object} options - Additional options for fallbackLocale and defaultValue.
+ * @param {string} [options.fallbackLocale='en'] - The fallback locale to use if the translation for the specified locale is not found.
+ * @param {string} [options.defaultValue='unknown'] - The default value to return if no translation is found.
+ * @return {string} The translated string based on the locale, with fallback options if necessary.
+ */
+exports.getDIDColor = getDIDColor;
+const getTranslation = exports.getTranslation = function getTranslation(translations, locale) {
+  let {
+    fallbackLocale = 'en',
+    defaultValue = 'unknown'
+  } = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+  if (typeof translations === 'string') {
+    return translations;
+  }
+  let translation;
+  if (locale) {
+    translation = translations[locale];
+  }
+  if (!translation || typeof translation !== 'string') {
+    translation = translations[fallbackLocale];
+  }
+  if (!translation || typeof translation !== 'string') {
+    translation = defaultValue;
+  }
+  return translation;
+};

package/package.json

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

package/src/SessionBlocklet/index.jsx

@@ -21,6 +21,7 @@ import Button from '../Button';
 import { temp as colors } from '../Colors';
 import { AUTH_SERVICE_PREFIX, NAVIGATION_URL } from '../Util/constant';
 import SessionPermission from '../SessionPermission';
+import { getTranslation } from '../Util';
 
 export default function SessionBlocklet({ session, locale, size }) {
   const blocklet = window?.blocklet || {};
@@ -136,7 +137,7 @@ export default function SessionBlocklet({ session, locale, size }) {
                             textAlign: 'center',
                             lineHeight: 'normal',
                           }}>
-                          {item.title?.[locale] || item.title}
+                          {getTranslation(item.title, locale)}
                         </Typography>
                       </ListItemButton>
                     </ListItem>

package/src/Util/index.js

@@ -372,3 +372,31 @@ export const getDIDColor = (did) => {
     return null;
   }
 };
+
+/**
+ * Retrieves the appropriate translation based on the locale, with fallback options.
+ *
+ * @param {Object|string} translations - The translations object or string to retrieve translation from.
+ * @param {string} locale - The locale to use for retrieving the translation.
+ * @param {Object} options - Additional options for fallbackLocale and defaultValue.
+ * @param {string} [options.fallbackLocale='en'] - The fallback locale to use if the translation for the specified locale is not found.
+ * @param {string} [options.defaultValue='unknown'] - The default value to return if no translation is found.
+ * @return {string} The translated string based on the locale, with fallback options if necessary.
+ */
+export const getTranslation = (translations, locale, { fallbackLocale = 'en', defaultValue = 'unknown' } = {}) => {
+  if (typeof translations === 'string') {
+    return translations;
+  }
+  let translation;
+  if (locale) {
+    translation = translations[locale];
+  }
+  if (!translation || typeof translation !== 'string') {
+    translation = translations[fallbackLocale];
+  }
+  if (!translation || typeof translation !== 'string') {
+    translation = defaultValue;
+  }
+
+  return translation;
+};