@abtnode/ux 1.16.21-beta-e828f413 → 1.16.21-beta-bd0e2503

package/es/blocklet/configuration.js

@@ -364,8 +364,14 @@ function BlockletEnvironment({
         initialValue: customLanguages ? customLanguages.value.split(',') : ['en', 'zh'],
         onSubmit: value => onSubmitConfig('BLOCKLET_APP_LANGUAGES', value),
         helperText: t('blocklet.config.selectLanguagesTip'),
-        placeholder: t('common.search'),
-        filterKeys: languagesFilterKeys
+        placeholder: t('blocklet.config.languagesSearch'),
+        filterKeys: languagesFilterKeys,
+        renderLabel: (code, item) => {
+          if (item.name === item.enName) {
+            return `${item.name} (${code.toUpperCase()})`;
+          }
+          return `${item.name},  ${item.enName} (${code.toUpperCase()})`;
+        }
       })]
     }), /*#__PURE__*/_jsx(Box, {
       className: "config-form",

package/es/blocklet/router/action/add-domain-alias.js

@@ -50,7 +50,7 @@ function AddDomainAliasComponent({
     });
     try {
       const domain = parseDomainFromURL(params.domain);
-      const validateResult = await domainContext.validateDomain(domain);
+      const validateResult = await domainContext.validateDomain(domain, params.type);
       if (!validateResult) {
         // eslint-disable-next-line consistent-return
         return false;
@@ -89,11 +89,13 @@ function AddDomainAliasComponent({
         }),
         onInputDomain: ({
           domain,
+          type,
           error
         }) => {
           setParams({
             ...params,
             domain,
+            type,
             __disableConfirm: !!error
           });
           setError(error);

package/es/blocklet/router/add-domain.js

@@ -1,6 +1,7 @@
 import Connect from '@arcblock/did-connect/lib/Connect';
 import Button from '@arcblock/ux/lib/Button';
 import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
+import Toast from '@arcblock/ux/lib/Toast';
 import IconInfo from '@mui/icons-material/InfoOutlined';
 import OpenInNewIcon from '@mui/icons-material/OpenInNew';
 import Box from '@mui/material/Box';
@@ -77,7 +78,8 @@ export default function AddDomain({
       await sleep(2000);
       setState({
         confirmSetting: null,
-        showNFTDomainAuth: false
+        showNFTDomainAuth: false,
+        type: 'nftDomain'
       });
       onSuccess({
         domain: tmpDomain,
@@ -85,13 +87,15 @@ export default function AddDomain({
         nftDid,
         chainHost
       });
+    } catch (error) {
+      Toast.error(error.message);
     } finally {
       setState({
-        openAuthNFTDomain: false
+        showNFTDomainAuth: false
       });
     }
   };
-  const error = state.error || domainContext.error; // TODO: state error 可能不需要了
+  const error = domainContext.error || state.error; // TODO: state error 可能不需要了
 
   const domainTypes = {
     inputDomain: {
@@ -99,7 +103,7 @@ export default function AddDomain({
       component: /*#__PURE__*/_jsxs(_Fragment, {
         children: [/*#__PURE__*/_jsx(TextField, {
           label: t('router.domainAlias.add.domainDescription'),
-          helperText: error || t('router.domainAlias.add.helperText'),
+          helperText: state.type === 'inputDomain' && error || t('router.domainAlias.add.helperText'),
           inputProps: {
             'data-cy': 'domain-name-input'
           },
@@ -108,18 +112,20 @@ export default function AddDomain({
           value: state.domain,
           size: "small",
           variant: "outlined",
-          error: !!error,
+          error: !!error && state.type === 'inputDomain',
           onChange: e => {
             const value = trim(e.target?.value);
             domainContext.setDomain(value);
             const errMessage = validateDomain(value, locale);
             setState({
               domain: value,
-              error: errMessage
+              error: errMessage,
+              type: 'inputDomain'
             });
             onInputDomain({
               domain: value,
-              error: errMessage
+              error: errMessage,
+              type: 'inputDomain'
             });
           },
           autoFocus: autoFocus,

package/es/contexts/domain.js

@@ -42,8 +42,8 @@ function DomainProvider({
         error: errMessage
       });
     },
-    validateDomain: async domain => {
-      if (!state.error) {
+    validateDomain: async (domain, type) => {
+      if (!state.error && type && type !== 'nftDomain') {
         const result = await api.isDidDomain({
           input: {
             domain

package/es/form/form-autocomplete-input.js

@@ -32,6 +32,7 @@ export default function FormAutocompleteInput({
   helperText,
   placeholder,
   renderImage,
+  renderLabel,
   filterKeys,
   noEmpty,
   ...rest
@@ -148,7 +149,7 @@ export default function FormAutocompleteInput({
           flex: 1,
           fontWeight: selected ? '700' : 'normal'
         },
-        children: optionsMap[code]?.name
+        children: renderLabel(code, optionsMap[code]) || optionsMap[code]?.name
       }), /*#__PURE__*/_jsx(Box, {
         component: CloseIcon,
         sx: {
@@ -237,7 +238,8 @@ FormAutocompleteInput.propTypes = {
   placeholder: PropTypes.string,
   renderImage: PropTypes.func,
   filterKeys: PropTypes.arrayOf(PropTypes.string),
-  noEmpty: PropTypes.bool
+  noEmpty: PropTypes.bool,
+  renderLabel: PropTypes.func
 };
 FormAutocompleteInput.defaultProps = {
   style: {},
@@ -254,6 +256,8 @@ FormAutocompleteInput.defaultProps = {
   placeholder: '',
   filterKeys: ['name'],
   renderImage: () => null,
+  // eslint-disable-next-line no-unused-vars
+  renderLabel: (code, item) => '',
   noEmpty: false
 };
 const Row = styled.div`

package/es/locales/en.js

@@ -420,6 +420,7 @@ export default {
       },
       languages: 'Supported Languages',
       selectLanguagesTip: 'Adjust the order by removing and re-adding',
+      languagesSearch: "Search by Country's Local Name, English Name, or ISO Code...",
       passportColor: 'Passport Color',
       appUrl: 'App URL',
       access: {

package/es/locales/zh.js

@@ -424,6 +424,7 @@ export default {
       },
       languages: '支持的语言',
       selectLanguagesTip: '通过删除再添加来调整顺序',
+      languagesSearch: '搜索国家的本地名称、英文名称或ISO代码..',
       passportColor: '通行证颜色',
       appUrl: '应用访问地址',
       access: {

package/lib/blocklet/configuration.js

@@ -383,8 +383,14 @@ function BlockletEnvironment(_ref) {
         initialValue: customLanguages ? customLanguages.value.split(',') : ['en', 'zh'],
         onSubmit: value => onSubmitConfig('BLOCKLET_APP_LANGUAGES', value),
         helperText: t('blocklet.config.selectLanguagesTip'),
-        placeholder: t('common.search'),
-        filterKeys: languagesFilterKeys
+        placeholder: t('blocklet.config.languagesSearch'),
+        filterKeys: languagesFilterKeys,
+        renderLabel: (code, item) => {
+          if (item.name === item.enName) {
+            return "".concat(item.name, " (").concat(code.toUpperCase(), ")");
+          }
+          return "".concat(item.name, ",  ").concat(item.enName, " (").concat(code.toUpperCase(), ")");
+        }
       })]
     }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
       className: "config-form",

package/lib/blocklet/router/action/add-domain-alias.js

@@ -61,7 +61,7 @@ function AddDomainAliasComponent(_ref) {
     });
     try {
       const domain = (0, _util2.parseDomainFromURL)(params.domain);
-      const validateResult = await domainContext.validateDomain(domain);
+      const validateResult = await domainContext.validateDomain(domain, params.type);
       if (!validateResult) {
         // eslint-disable-next-line consistent-return
         return false;
@@ -101,10 +101,12 @@ function AddDomainAliasComponent(_ref) {
         onInputDomain: _ref2 => {
           let {
             domain,
+            type,
             error
           } = _ref2;
           setParams(_objectSpread(_objectSpread({}, params), {}, {
             domain,
+            type,
             __disableConfirm: !!error
           }));
           setError(error);

package/lib/blocklet/router/add-domain.js

@@ -7,6 +7,7 @@ exports.default = AddDomain;
 var _Connect = _interopRequireDefault(require("@arcblock/did-connect/lib/Connect"));
 var _Button = _interopRequireDefault(require("@arcblock/ux/lib/Button"));
 var _context = require("@arcblock/ux/lib/Locale/context");
+var _Toast = _interopRequireDefault(require("@arcblock/ux/lib/Toast"));
 var _InfoOutlined = _interopRequireDefault(require("@mui/icons-material/InfoOutlined"));
 var _OpenInNew = _interopRequireDefault(require("@mui/icons-material/OpenInNew"));
 var _Box = _interopRequireDefault(require("@mui/material/Box"));
@@ -92,7 +93,8 @@ function AddDomain(_ref) {
       await (0, _util.sleep)(2000);
       setState({
         confirmSetting: null,
-        showNFTDomainAuth: false
+        showNFTDomainAuth: false,
+        type: 'nftDomain'
       });
       onSuccess({
         domain: tmpDomain,
@@ -100,13 +102,15 @@ function AddDomain(_ref) {
         nftDid,
         chainHost
       });
+    } catch (error) {
+      _Toast.default.error(error.message);
     } finally {
       setState({
-        openAuthNFTDomain: false
+        showNFTDomainAuth: false
       });
     }
   };
-  const error = state.error || domainContext.error; // TODO: state error 可能不需要了
+  const error = domainContext.error || state.error; // TODO: state error 可能不需要了
 
   const domainTypes = {
     inputDomain: {
@@ -114,7 +118,7 @@ function AddDomain(_ref) {
       component: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
         children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_TextField.default, {
           label: t('router.domainAlias.add.domainDescription'),
-          helperText: error || t('router.domainAlias.add.helperText'),
+          helperText: state.type === 'inputDomain' && error || t('router.domainAlias.add.helperText'),
           inputProps: {
             'data-cy': 'domain-name-input'
           },
@@ -123,7 +127,7 @@ function AddDomain(_ref) {
           value: state.domain,
           size: "small",
           variant: "outlined",
-          error: !!error,
+          error: !!error && state.type === 'inputDomain',
           onChange: e => {
             var _e$target;
             const value = (0, _trim.default)((_e$target = e.target) === null || _e$target === void 0 ? void 0 : _e$target.value);
@@ -131,11 +135,13 @@ function AddDomain(_ref) {
             const errMessage = (0, _util.validateDomain)(value, locale);
             setState({
               domain: value,
-              error: errMessage
+              error: errMessage,
+              type: 'inputDomain'
             });
             onInputDomain({
               domain: value,
-              error: errMessage
+              error: errMessage,
+              type: 'inputDomain'
             });
           },
           autoFocus: autoFocus,

package/lib/contexts/domain.js

@@ -53,8 +53,8 @@ function DomainProvider(_ref) {
         error: errMessage
       });
     },
-    validateDomain: async domain => {
-      if (!state.error) {
+    validateDomain: async (domain, type) => {
+      if (!state.error && type && type !== 'nftDomain') {
         const result = await api.isDidDomain({
           input: {
             domain

package/lib/form/form-autocomplete-input.js

@@ -22,7 +22,7 @@ var _formWrapper = _interopRequireDefault(require("./form-wrapper"));
 var _inputTriggers = _interopRequireDefault(require("./input-triggers"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _templateObject;
-const _excluded = ["label", "disabled", "required", "initialValue", "onChange", "style", "onSubmit", "triggers", "options", "formatterBeforeSubmit", "helperText", "placeholder", "renderImage", "filterKeys", "noEmpty"];
+const _excluded = ["label", "disabled", "required", "initialValue", "onChange", "style", "onSubmit", "triggers", "options", "formatterBeforeSubmit", "helperText", "placeholder", "renderImage", "renderLabel", "filterKeys", "noEmpty"];
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
@@ -49,6 +49,7 @@ function FormAutocompleteInput(_ref) {
       helperText,
       placeholder,
       renderImage,
+      renderLabel,
       filterKeys,
       noEmpty
     } = _ref,
@@ -169,7 +170,7 @@ function FormAutocompleteInput(_ref) {
           flex: 1,
           fontWeight: selected ? '700' : 'normal'
         },
-        children: (_optionsMap$code = optionsMap[code]) === null || _optionsMap$code === void 0 ? void 0 : _optionsMap$code.name
+        children: renderLabel(code, optionsMap[code]) || ((_optionsMap$code = optionsMap[code]) === null || _optionsMap$code === void 0 ? void 0 : _optionsMap$code.name)
       }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
         component: _Close.default,
         sx: {
@@ -257,7 +258,8 @@ FormAutocompleteInput.propTypes = {
   placeholder: _propTypes.default.string,
   renderImage: _propTypes.default.func,
   filterKeys: _propTypes.default.arrayOf(_propTypes.default.string),
-  noEmpty: _propTypes.default.bool
+  noEmpty: _propTypes.default.bool,
+  renderLabel: _propTypes.default.func
 };
 FormAutocompleteInput.defaultProps = {
   style: {},
@@ -274,6 +276,8 @@ FormAutocompleteInput.defaultProps = {
   placeholder: '',
   filterKeys: ['name'],
   renderImage: () => null,
+  // eslint-disable-next-line no-unused-vars
+  renderLabel: (code, item) => '',
   noEmpty: false
 };
 const Row = _styled.default.div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  display: flex;\n  justify-content: space-between;\n  align-items: center;\n  height: 48px;\n  border-bottom: 1px solid rgba(0, 0, 0, 0.08);\n  font-size: 1.1em;\n"])));

package/lib/locales/en.js

@@ -426,6 +426,7 @@ var _default = exports.default = {
       },
       languages: 'Supported Languages',
       selectLanguagesTip: 'Adjust the order by removing and re-adding',
+      languagesSearch: "Search by Country's Local Name, English Name, or ISO Code...",
       passportColor: 'Passport Color',
       appUrl: 'App URL',
       access: {

package/lib/locales/zh.js

@@ -430,6 +430,7 @@ var _default = exports.default = {
       },
       languages: '支持的语言',
       selectLanguagesTip: '通过删除再添加来调整顺序',
+      languagesSearch: '搜索国家的本地名称、英文名称或ISO代码..',
       passportColor: '通行证颜色',
       appUrl: '应用访问地址',
       access: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abtnode/ux",
-  "version": "1.16.21-beta-e828f413",
+  "version": "1.16.21-beta-bd0e2503",
   "description": "UX components shared across abtnode packages",
   "publishConfig": {
     "access": "public"
@@ -27,9 +27,9 @@
   "author": "linchen <linchen1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/auth": "1.16.21-beta-e828f413",
-    "@abtnode/constant": "1.16.21-beta-e828f413",
-    "@abtnode/util": "1.16.21-beta-e828f413",
+    "@abtnode/auth": "1.16.21-beta-bd0e2503",
+    "@abtnode/constant": "1.16.21-beta-bd0e2503",
+    "@abtnode/util": "1.16.21-beta-bd0e2503",
     "@ahooksjs/use-url-state": "^3.5.1",
     "@arcblock/did": "^1.18.107",
     "@arcblock/did-connect": "^2.8.23",
@@ -39,12 +39,12 @@
     "@arcblock/react-hooks": "^2.8.23",
     "@arcblock/terminal": "^2.8.23",
     "@arcblock/ux": "^2.8.23",
-    "@blocklet/constant": "1.16.21-beta-e828f413",
+    "@blocklet/constant": "1.16.21-beta-bd0e2503",
     "@blocklet/launcher-layout": "2.2.48",
     "@blocklet/list": "^0.12.60",
-    "@blocklet/meta": "1.16.21-beta-e828f413",
+    "@blocklet/meta": "1.16.21-beta-bd0e2503",
     "@blocklet/ui-react": "^2.8.23",
-    "@blocklet/uploader": "^0.0.55",
+    "@blocklet/uploader": "^0.0.56",
     "@emotion/react": "^11.10.4",
     "@emotion/styled": "^11.10.4",
     "@iconify/react": "^4.0.0",
@@ -102,7 +102,7 @@
     "babel-plugin-inline-react-svg": "^1.1.2",
     "glob": "^10.3.3"
   },
-  "gitHead": "936af9cb0549f341d3683ea63085b460bf6ddbf0",
+  "gitHead": "f4550e061b661cb67d7f1413ada51f3f6491f0b8",
   "exports": {
     ".": {
       "import": "./es/index.js",