@abtnode/ux 1.16.0-beta-1f8bf936 → 1.16.0-beta-ad6df3ae

package/lib/blocklet/component/navigation/locale-tabs.js

@@ -27,7 +27,8 @@ const defaultLocale = 'en';
 function LocaleTabs(_ref) {
   let {
     sx,
-    onChange,
+    onAdd,
+    onChange: _onChange,
     locales,
     onRemoveLocale
   } = _ref;
@@ -45,15 +46,18 @@ function LocaleTabs(_ref) {
   const openChooseLocale = (0, _react.useMemo)(() => {
     return !!addLocaleButtonEl;
   }, [addLocaleButtonEl]);
+  const showLocale = (0, _react.useMemo)(() => {
+    if (locales.includes(state.currentLocale)) {
+      return state.currentLocale;
+    }
+    return defaultLocale;
+  }, [locales, state.currentLocale]);
   const localeOptions = (0, _react.useMemo)(() => {
     return Object.keys((0, _lodash.omit)(_locales.default, [...state.localeList, defaultLocale])).map(locale => ({
       title: _locales.default[locale],
       value: locale
     }));
   }, [state.localeList]);
-  (0, _react.useEffect)(() => {
-    onChange(state.currentLocale);
-  }, [onChange, state.currentLocale]);
   (0, _react.useEffect)(() => {
     state.localeList = [...locales];
   }, [locales, state]);
@@ -97,6 +101,7 @@ function LocaleTabs(_ref) {
       close();
       state.localeList.push(value);
       state.currentLocale = value;
+      onAdd(value);
     }
   }
   function close() {
@@ -123,9 +128,10 @@ function LocaleTabs(_ref) {
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
     children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)(_Tabs.default, {
       sx: sx,
-      value: state.currentLocale,
+      value: showLocale,
       onChange: (e, value) => {
         state.currentLocale = value;
+        _onChange(value);
       },
       children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Tab.default, {
         label: "Default (".concat(_locales.default[defaultLocale], ")"),
@@ -210,12 +216,14 @@ function LocaleTabs(_ref) {
 }
 LocaleTabs.propTypes = {
   sx: _propTypes.default.any,
+  onAdd: _propTypes.default.func,
   onChange: _propTypes.default.func,
   onRemoveLocale: _propTypes.default.func,
   locales: _propTypes.default.array
 };
 LocaleTabs.defaultProps = {
   sx: null,
+  onAdd: () => {},
   onChange: () => {},
   onRemoveLocale: () => {},
   locales: []

package/lib/blocklet/component/navigation/navigation-dialog.js

@@ -214,6 +214,8 @@ const NavigationDialog = /*#__PURE__*/(0, _react.forwardRef)(function Navigation
     return '--';
   }, [state.type, t]);
   const reset = (0, _react.useCallback)(() => {
+    state.isRoot = true;
+    state.locale = defaultLocale;
     state.type = defaultType;
     state.linkDisabled = false;
     saveFn.current = () => {};
@@ -402,6 +404,15 @@ const NavigationDialog = /*#__PURE__*/(0, _react.forwardRef)(function Navigation
     state.formState.title = (0, _omit.default)(state.formState.title, currentLocale);
     state.formState.link = (0, _omit.default)(state.formState.link, currentLocale);
   }, [state.formState]);
+  const handleAddLocale = (0, _react.useCallback)(newLocale => {
+    var _state$formState$titl, _state$formState$link;
+    state.locale = newLocale;
+    state.formState.title[newLocale] = (_state$formState$titl = state.formState.title) === null || _state$formState$titl === void 0 ? void 0 : _state$formState$titl[defaultLocale];
+    state.formState.link[newLocale] = (_state$formState$link = state.formState.link) === null || _state$formState$link === void 0 ? void 0 : _state$formState$link[defaultLocale];
+    setTimeout(() => {
+      clearErrors();
+    });
+  }, [clearErrors, state]);
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Dialog.default, {
     open: show,
     title: name,
@@ -417,6 +428,7 @@ const NavigationDialog = /*#__PURE__*/(0, _react.forwardRef)(function Navigation
       sx: {
         mb: 1
       },
+      onAdd: handleAddLocale,
       onChange: handleChangeLocale,
       onRemoveLocale: handleRemoveLocale,
       locales: state.localeList
@@ -464,6 +476,7 @@ const NavigationDialog = /*#__PURE__*/(0, _react.forwardRef)(function Navigation
             placeholder: t('navigation.form.iconPlaceholder'),
             label: t('navigation.form.icon'),
             error: !!(errors !== null && errors !== void 0 && (_errors$icon = errors.icon) !== null && _errors$icon !== void 0 && _errors$icon.message),
+            disabled: state.locale !== defaultLocale,
             helperText: (errors === null || errors === void 0 ? void 0 : (_errors$icon2 = errors.icon) === null || _errors$icon2 === void 0 ? void 0 : _errors$icon2.message) || /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
               display: "flex",
               children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
@@ -490,7 +503,7 @@ const NavigationDialog = /*#__PURE__*/(0, _react.forwardRef)(function Navigation
                   },
                   disableFocusRipple: true,
                   disableRipple: true,
-                  children: /*#__PURE__*/(0, _jsxRuntime.jsx)(IconSuffix, {
+                  children: watchIcon && /*#__PURE__*/(0, _jsxRuntime.jsx)(IconSuffix, {
                     icon: watchIcon
                   })
                 })
@@ -509,7 +522,7 @@ const NavigationDialog = /*#__PURE__*/(0, _react.forwardRef)(function Navigation
           return /*#__PURE__*/(0, _jsxRuntime.jsx)(_simpleSelect.default, _objectSpread({
             fullWidth: true,
             margin: "dense",
-            disabled: state.type === 'edit',
+            disabled: state.type === 'edit' || state.locale !== defaultLocale,
             label: t('navigation.form.component'),
             placeholer: t('navigation.form.componentPlaceholder'),
             options: components.map(item => ({
@@ -519,7 +532,7 @@ const NavigationDialog = /*#__PURE__*/(0, _react.forwardRef)(function Navigation
             })),
             error: !!(errors !== null && errors !== void 0 && (_errors$component = errors.component) !== null && _errors$component !== void 0 && _errors$component.message),
             helperText: (errors === null || errors === void 0 ? void 0 : (_errors$component2 = errors.component) === null || _errors$component2 === void 0 ? void 0 : _errors$component2.message) || ' '
-          }, field));
+          }, (0, _omit.default)(field, 'ref')));
         }
       }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactHookForm.Controller, {
         name: "link",
@@ -528,7 +541,6 @@ const NavigationDialog = /*#__PURE__*/(0, _react.forwardRef)(function Navigation
           validate: validLink
         },
         render: _ref6 => {
-          var _errors$link3, _errors$link4;
           let {
             field
           } = _ref6;
@@ -575,8 +587,6 @@ const NavigationDialog = /*#__PURE__*/(0, _react.forwardRef)(function Navigation
                   children: option.title
                 })]
               })),
-              error: !!(errors !== null && errors !== void 0 && (_errors$link3 = errors.link) !== null && _errors$link3 !== void 0 && _errors$link3.message),
-              helperText: (errors === null || errors === void 0 ? void 0 : (_errors$link4 = errors.link) === null || _errors$link4 === void 0 ? void 0 : _errors$link4.message) || ' ',
               margin: "dense"
             }, field), {}, {
               onChange: () => {},
@@ -606,7 +616,7 @@ const NavigationDialog = /*#__PURE__*/(0, _react.forwardRef)(function Navigation
             })),
             error: !!(errors !== null && errors !== void 0 && (_errors$role = errors.role) !== null && _errors$role !== void 0 && _errors$role.message),
             helperText: (errors === null || errors === void 0 ? void 0 : (_errors$role2 = errors.role) === null || _errors$role2 === void 0 ? void 0 : _errors$role2.message) || ' '
-          }, field));
+          }, (0, _omit.default)(field, 'ref')));
         }
       })]
     })]

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.0-beta-1f8bf936",
+  "version": "1.16.0-beta-ad6df3ae",
   "description": "UX components shared across abtnode packages",
   "main": "lib/index.js",
   "files": [
@@ -21,20 +21,20 @@
   "author": "linchen <linchen1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/auth": "1.16.0-beta-1f8bf936",
-    "@abtnode/constant": "1.16.0-beta-1f8bf936",
-    "@abtnode/util": "1.16.0-beta-1f8bf936",
-    "@arcblock/did-connect": "^2.5.15",
+    "@abtnode/auth": "1.16.0-beta-ad6df3ae",
+    "@abtnode/constant": "1.16.0-beta-ad6df3ae",
+    "@abtnode/util": "1.16.0-beta-ad6df3ae",
+    "@arcblock/did-connect": "^2.5.16",
     "@arcblock/did-motif": "^1.1.10",
-    "@arcblock/icons": "^2.5.15",
-    "@arcblock/react-hooks": "^2.5.15",
-    "@arcblock/terminal": "^2.5.15",
-    "@arcblock/ux": "^2.5.15",
-    "@blocklet/constant": "1.16.0-beta-1f8bf936",
+    "@arcblock/icons": "^2.5.16",
+    "@arcblock/react-hooks": "^2.5.16",
+    "@arcblock/terminal": "^2.5.16",
+    "@arcblock/ux": "^2.5.16",
+    "@blocklet/constant": "1.16.0-beta-ad6df3ae",
     "@blocklet/launcher-layout": "1.9.65",
     "@blocklet/list": "^0.11.10",
-    "@blocklet/meta": "1.16.0-beta-1f8bf936",
-    "@blocklet/ui-react": "^2.5.15",
+    "@blocklet/meta": "1.16.0-beta-ad6df3ae",
+    "@blocklet/ui-react": "^2.5.16",
     "@emotion/react": "^11.10.4",
     "@emotion/styled": "^11.10.4",
     "@iconify/react": "^4.0.0",
@@ -88,5 +88,5 @@
     "@babel/preset-react": "^7.18.6",
     "babel-plugin-inline-react-svg": "^1.1.2"
   },
-  "gitHead": "d832948cdc83e67ea42a2aefba3649fa73723b65"
+  "gitHead": "8fa60176a00400cd412b308df3c7d6dcd9af2db1"
 }