@blocklet/ui-react 2.12.45 → 2.12.47

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

@@ -11,7 +11,8 @@ import Button from "@arcblock/ux/lib/Button";
 import PhoneInput, {
   validatePhoneNumber,
   getDialCodeByCountry,
-  getCountryNameByCountry
+  getCountryNameByCountry,
+  detectCountryFromPhone
 } from "@arcblock/ux/lib/PhoneInput";
 import cloneDeep from "lodash/cloneDeep";
 import omit from "lodash/omit";
@@ -127,26 +128,27 @@ export default function UserMetadataComponent({
   }, [user?.address?.country, locale]);
   const phoneValue = useCreation(() => {
     const phone = metadata.phone ?? user?.phone ?? {
-      country: "cn",
+      country: defaultCountry,
       phone: ""
     };
-    if (typeof phone === "string") {
+    if (phone && typeof phone === "string") {
+      const detectedCountry = detectCountryFromPhone(phone);
       return {
-        country: "cn",
+        country: detectedCountry || defaultCountry,
         phone
       };
     }
-    if (typeof phone === "object") {
+    if (phone && typeof phone === "object") {
       return {
         country: phone.country,
         phone: phone.phoneNumber || ""
       };
     }
     return {
-      country: "cn",
+      country: defaultCountry,
       phone: ""
     };
-  }, [metadata.phone, user?.phone]);
+  }, [metadata.phone, user?.phone, defaultCountry]);
   const onChange = (v, field) => {
     metadata[field] = v;
   };
@@ -250,6 +252,9 @@ export default function UserMetadataComponent({
       return;
     }
     const newAddress = omit(address, "detailedAddress");
+    if (!newAddress.country) {
+      newAddress.country = defaultCountry;
+    }
     onSave({ metadata, address: newAddress });
     setEditable(false);
     setVisible(false);
@@ -314,7 +319,7 @@ export default function UserMetadataComponent({
               editable: editing,
               placeholder: "Location",
               label: t("profile.location"),
-              tooltip: isMyself ? /* @__PURE__ */ jsx(Fragment, { children: ["line1", "line2"].map((k) => {
+              tooltip: isMyself && (address.line1 || address.line2) ? /* @__PURE__ */ jsx(Fragment, { children: ["line1", "line2"].map((k) => {
                 const value = address[k];
                 if (!value) {
                   return null;
@@ -415,7 +420,7 @@ export default function UserMetadataComponent({
                   helperText: validateMsg.phone,
                   sx: mergeSx(inputFieldStyle, !validateMsg.phone ? commonInputStyle : {}),
                   onChange: (value) => {
-                    const isValid = validatePhoneNumber(value.phone);
+                    const isValid = validatePhoneNumber(value.phone, value.country);
                     if (!isValid) {
                       validateMsg.phone = t("profile.phoneInvalid");
                     } else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/ui-react",
-  "version": "2.12.45",
+  "version": "2.12.47",
   "description": "Some useful front-end web components that can be used in Blocklets.",
   "keywords": [
     "react",
@@ -33,10 +33,10 @@
   },
   "dependencies": {
     "@abtnode/constant": "^1.16.40",
-    "@arcblock/bridge": "^2.12.45",
-    "@arcblock/react-hooks": "^2.12.45",
+    "@arcblock/bridge": "^2.12.47",
+    "@arcblock/react-hooks": "^2.12.47",
     "@arcblock/ws": "^1.19.15",
-    "@blocklet/did-space-react": "^1.0.36",
+    "@blocklet/did-space-react": "^1.0.37",
     "@iconify-icons/logos": "^1.2.36",
     "@iconify-icons/material-symbols": "^1.2.58",
     "@iconify/react": "^5.2.0",
@@ -87,5 +87,5 @@
     "jest": "^29.7.0",
     "unbuild": "^2.0.0"
   },
-  "gitHead": "dba0f3cdf67f80855a492dc43a7485724a2d7940"
+  "gitHead": "f8b62d37754f4254c8f2961eb778ca2ce71264ee"
 }

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

@@ -14,6 +14,7 @@ import PhoneInput, {
   validatePhoneNumber,
   getDialCodeByCountry,
   getCountryNameByCountry,
+  detectCountryFromPhone,
 } from '@arcblock/ux/lib/PhoneInput';
 import cloneDeep from 'lodash/cloneDeep';
 import omit from 'lodash/omit';
@@ -163,17 +164,18 @@ export default function UserMetadataComponent({
   const phoneValue = useCreation((): PhoneValue => {
     const phone = metadata.phone ??
       user?.phone ?? {
-        country: 'cn',
+        country: defaultCountry,
         phone: '',
       };
 
-    if (typeof phone === 'string') {
+    if (phone && typeof phone === 'string') {
+      const detectedCountry = detectCountryFromPhone(phone);
       return {
-        country: 'cn',
+        country: detectedCountry || defaultCountry,
         phone,
       };
     }
-    if (typeof phone === 'object') {
+    if (phone && typeof phone === 'object') {
       return {
         country: phone.country,
         phone: (phone as UserPhoneProps).phoneNumber || '',
@@ -181,10 +183,10 @@ export default function UserMetadataComponent({
     }
 
     return {
-      country: 'cn',
+      country: defaultCountry,
       phone: '',
     };
-  }, [metadata.phone, user?.phone]);
+  }, [metadata.phone, user?.phone, defaultCountry]);
 
   const onChange = (v: any, field: keyof UserMetadata | 'email' | 'phone') => {
     metadata[field] = v;
@@ -311,6 +313,10 @@ export default function UserMetadataComponent({
 
     // 兼容代码。移除之前的 detailedAddress 字段
     const newAddress = omit(address, 'detailedAddress');
+    // 添加默认值
+    if (!newAddress.country) {
+      newAddress.country = defaultCountry;
+    }
 
     onSave({ metadata, address: newAddress });
     setEditable(false);
@@ -371,7 +377,7 @@ export default function UserMetadataComponent({
             placeholder="Location"
             label={t('profile.location')}
             tooltip={
-              isMyself ? (
+              isMyself && (address.line1 || address.line2) ? (
                 <>
                   {['line1', 'line2'].map((k) => {
                     const value = address[k as keyof UserAddress];
@@ -474,7 +480,7 @@ export default function UserMetadataComponent({
             helperText={validateMsg.phone}
             sx={mergeSx(inputFieldStyle, !validateMsg.phone ? commonInputStyle : {})}
             onChange={(value: any) => {
-              const isValid = validatePhoneNumber(value.phone);
+              const isValid = validatePhoneNumber(value.phone, value.country);
               if (!isValid) {
                 validateMsg.phone = t('profile.phoneInvalid');
               } else {