@arcblock/ux 2.6.3 → 2.6.4

package/lib/Util/index.js

@@ -3,6 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.appendParams = void 0;
 exports.detectWalletExtension = detectWalletExtension;
 exports.formatToDate = formatToDate;
 exports.formatToDatetime = formatToDatetime;
@@ -296,15 +297,45 @@ const isEthereumDid = did => {
   }
   return true;
 };
+
+/**
+ *
+ * @param {string} url 需要处理的 url
+ * @param {{imageFilter: 'crop'|'resize'; w?: number; h?: number; r?: 0|90|180|270}} params
+ * @returns
+ */
 exports.isEthereumDid = isEthereumDid;
+const appendParams = (url, params) => {
+  if (!params) {
+    return url;
+  }
+  try {
+    // HACK: 如果 url 中带有域名，则 urlInstance.origin 为 url 中的域名；否则，借用当前页面的 location.origin 作为域名来拼接一个 url
+    const urlInstance = new URL(url, window.location.origin);
+    Object.keys(params).forEach(key => {
+      urlInstance.searchParams.set(key, params[key]);
+    });
+    // HACK: 如果前后域名一致，代表前面已经借用了 location.origin，这个时候只需要返回 urlInstance.pathname + urlInstance.search 即可
+    if (urlInstance.origin === window.location.origin) {
+      return urlInstance.pathname + urlInstance.search;
+    }
+    return urlInstance.href;
+  } catch (_unused) {
+    return url;
+  }
+};
+exports.appendParams = appendParams;
 const getUserAvatar = function getUserAvatar(avatar) {
-  var _window$blocklet, _window$blocklet$capa;
   let size = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 48;
   if (!avatar) {
     return avatar;
   }
-  if (avatar.indexOf('/.well-known/service') >= 0 && (_window$blocklet = window.blocklet) !== null && _window$blocklet !== void 0 && (_window$blocklet$capa = _window$blocklet.capabilities) !== null && _window$blocklet$capa !== void 0 && _window$blocklet$capa.httpImageFilter) {
-    return "".concat(avatar, "/resize?w=").concat(size, "&h=").concat(size);
+  if (avatar.indexOf('/.well-known/service') >= 0) {
+    return appendParams(avatar, {
+      imageFilter: 'resize',
+      w: size,
+      h: size
+    });
   }
   return avatar;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arcblock/ux",
-  "version": "2.6.3",
+  "version": "2.6.4",
   "description": "Common used react components for arcblock products",
   "keywords": [
     "react",
@@ -47,11 +47,11 @@
   "peerDependencies": {
     "react": ">=18.1.0"
   },
-  "gitHead": "1b4d3ea0e13aa11bc06cad0be0e3dd630ffd7008",
+  "gitHead": "15205ba8243468982ed04553234ca9c54eaafe6a",
   "dependencies": {
     "@arcblock/did-motif": "^1.1.13",
-    "@arcblock/icons": "^2.6.3",
-    "@arcblock/react-hooks": "^2.6.3",
+    "@arcblock/icons": "^2.6.4",
+    "@arcblock/react-hooks": "^2.6.4",
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
     "@emotion/react": "^11.10.4",
     "@emotion/styled": "^11.10.4",

package/src/Util/index.js

@@ -283,13 +283,43 @@ export const isEthereumDid = (did) => {
   return true;
 };
 
+/**
+ *
+ * @param {string} url 需要处理的 url
+ * @param {{imageFilter: 'crop'|'resize'; w?: number; h?: number; r?: 0|90|180|270}} params
+ * @returns
+ */
+export const appendParams = (url, params) => {
+  if (!params) {
+    return url;
+  }
+  try {
+    // HACK: 如果 url 中带有域名，则 urlInstance.origin 为 url 中的域名；否则，借用当前页面的 location.origin 作为域名来拼接一个 url
+    const urlInstance = new URL(url, window.location.origin);
+    Object.keys(params).forEach((key) => {
+      urlInstance.searchParams.set(key, params[key]);
+    });
+    // HACK: 如果前后域名一致，代表前面已经借用了 location.origin，这个时候只需要返回 urlInstance.pathname + urlInstance.search 即可
+    if (urlInstance.origin === window.location.origin) {
+      return urlInstance.pathname + urlInstance.search;
+    }
+    return urlInstance.href;
+  } catch {
+    return url;
+  }
+};
+
 export const getUserAvatar = (avatar, size = 48) => {
   if (!avatar) {
     return avatar;
   }
 
-  if (avatar.indexOf('/.well-known/service') >= 0 && window.blocklet?.capabilities?.httpImageFilter) {
-    return `${avatar}/resize?w=${size}&h=${size}`;
+  if (avatar.indexOf('/.well-known/service') >= 0) {
+    return appendParams(avatar, {
+      imageFilter: 'resize',
+      w: size,
+      h: size,
+    });
   }
 
   return avatar;