@blocklet/ui-react 2.12.30 → 2.12.32

package/lib/UserCenter/components/user-info/metadata.js

@@ -100,15 +100,18 @@ export default function UserMetadataComponent({
       }
     }
   );
-  const address = useCreation(() => {
-    return user?.address || {
+  const address = useReactive(
+    user?.address ? cloneDeep(user.address) : {
       country: "",
       province: "",
       city: "",
       detailedAddress: "",
       postalCode: ""
-    };
-  }, [user?.address]);
+    }
+  );
+  const isSupportAddress = useCreation(() => {
+    return !!user?.address;
+  }, [user?.address?.country]);
   const defaultCountry = useMemo(() => {
     if (user?.address?.country) {
       return user.address.country;
@@ -277,7 +280,7 @@ export default function UserMetadataComponent({
               children: t("profile.editProfile")
             }
           ) : null,
-          editing && isMyself ? /* @__PURE__ */ jsx(
+          editing && isMyself && isSupportAddress ? /* @__PURE__ */ jsx(
             AddressEditor,
             {
               address,
@@ -321,7 +324,8 @@ export default function UserMetadataComponent({
                 {
                   value: metadata.timezone || currentTimezone,
                   onChange: (value) => onChange(value, "timezone"),
-                  disabled: !editing
+                  disabled: !editing,
+                  mode
                 }
               )
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/ui-react",
-  "version": "2.12.30",
+  "version": "2.12.32",
   "description": "Some useful front-end web components that can be used in Blocklets.",
   "keywords": [
     "react",
@@ -33,8 +33,8 @@
   },
   "dependencies": {
     "@abtnode/constant": "^1.16.40",
-    "@arcblock/bridge": "^2.12.30",
-    "@arcblock/react-hooks": "^2.12.30",
+    "@arcblock/bridge": "^2.12.32",
+    "@arcblock/react-hooks": "^2.12.32",
     "@arcblock/ws": "^1.19.15",
     "@blocklet/did-space-react": "^1.0.35",
     "@iconify-icons/logos": "^1.2.36",
@@ -87,5 +87,5 @@
     "jest": "^29.7.0",
     "unbuild": "^2.0.0"
   },
-  "gitHead": "97305a61162566787fbc38decf9d26dcdb556637"
+  "gitHead": "d968d5785a045b629da9d13864687d9abcb0461b"
 }

package/src/UserCenter/components/user-info/metadata.tsx

@@ -122,17 +122,22 @@ export default function UserMetadataComponent({
         }
   );
 
-  const address = useCreation(() => {
-    return (
-      user?.address || {
-        country: '',
-        province: '',
-        city: '',
-        detailedAddress: '',
-        postalCode: '',
-      }
-    );
-  }, [user?.address]);
+  const address: UserAddress = useReactive(
+    user?.address
+      ? cloneDeep(user.address)
+      : {
+          country: '',
+          province: '',
+          city: '',
+          detailedAddress: '',
+          postalCode: '',
+        }
+  );
+
+  // 判断是否支持地址, 如果已经支持则返回 {}, 否则返回为 undefined
+  const isSupportAddress = useCreation(() => {
+    return !!user?.address;
+  }, [user?.address?.country]);
 
   /**
    * 获取默认的国家
@@ -327,7 +332,7 @@ export default function UserMetadataComponent({
           </Button>
         ) : null}
 
-        {editing && isMyself ? (
+        {editing && isMyself && isSupportAddress ? (
           <AddressEditor
             address={address}
             errors={addressValidateMsg}
@@ -377,6 +382,7 @@ export default function UserMetadataComponent({
             value={metadata.timezone || currentTimezone}
             onChange={(value) => onChange(value, 'timezone')}
             disabled={!editing}
+            mode={mode}
           />
         </EditableField>