@arcblock/ux 2.9.4 → 2.9.6

package/es/DID/index.js

@@ -1,9 +1,9 @@
 import React, { forwardRef } from 'react';
 import PropTypes from 'prop-types';
-import { getDIDMotifInfo, colors } from '@arcblock/did-motif';
+import { getDIDMotifInfo } from '@arcblock/did-motif';
 import Address from '../Address';
 import Avatar from '../Avatar';
-import { isEthereumDid, getFontSize } from '../Util';
+import { isEthereumDid, getFontSize, getDIDColor } from '../Util';
 import { jsx as _jsx } from "react/jsx-runtime";
 const DIDPropTypes = {
   did: PropTypes.string.isRequired,
@@ -21,8 +21,7 @@ const DIDPropTypes = {
 };
 const getFontColor = (did, didMotifInfo, isEthDid) => {
   if (isEthDid) {
-    const index = Uint8Array.from(did.slice(2).match(/.{1,2}/g).map(pair => parseInt(pair, 16))).slice(0, 8).reduce((acc, val) => acc + val, 0) % colors.length;
-    return colors[index];
+    return getDIDColor(did);
   }
   return didMotifInfo.color;
 };

package/es/Util/index.js

@@ -1,5 +1,6 @@
 /* eslint-disable no-bitwise */
 import padStart from 'lodash/padStart';
+import { getDIDMotifInfo, colors } from '@arcblock/did-motif';
 let dateTool = null;
 export function parseQuery(str) {
   return str.replace(/^\?/, '').split('&').map(x => x.split('=')).filter(([key]) => !!key).reduce((memo, x) => {
@@ -316,4 +317,16 @@ export const setVisitorId = value => {
   } else {
     localStorage.setItem(visitorIdKey, value);
   }
+};
+export const getDIDColor = did => {
+  if (isEthereumDid(did)) {
+    const index = Uint8Array.from(did.slice(2).match(/.{1,2}/g).map(pair => parseInt(pair, 16))).slice(0, 8).reduce((acc, val) => acc + val, 0) % colors.length;
+    return colors[index];
+  }
+  try {
+    const didMotifInfo = getDIDMotifInfo(did);
+    return didMotifInfo?.color;
+  } catch {
+    return null;
+  }
 };

package/lib/DID/index.js

@@ -38,8 +38,7 @@ const DIDPropTypes = {
 };
 const getFontColor = (did, didMotifInfo, isEthDid) => {
   if (isEthDid) {
-    const index = Uint8Array.from(did.slice(2).match(/.{1,2}/g).map(pair => parseInt(pair, 16))).slice(0, 8).reduce((acc, val) => acc + val, 0) % _didMotif.colors.length;
-    return _didMotif.colors[index];
+    return (0, _Util.getDIDColor)(did);
   }
   return didMotifInfo.color;
 };

package/lib/Util/index.js

@@ -10,6 +10,7 @@ exports.formatToDatetime = formatToDatetime;
 exports.getColor = exports.getBackground = exports.formatUptime = void 0;
 exports.getCookieOptions = getCookieOptions;
 exports.getCopyright = getCopyright;
+exports.getDIDColor = void 0;
 exports.getDateTool = getDateTool;
 exports.isUrl = exports.isEthereumDid = exports.getVisitorId = exports.getUserAvatar = exports.getTimezone = exports.getFontSize = void 0;
 exports.mergeProps = mergeProps;
@@ -19,6 +20,7 @@ exports.setDateTool = setDateTool;
 exports.str2color = exports.sleep = exports.setVisitorId = void 0;
 exports.stringifyQuery = stringifyQuery;
 var _padStart = _interopRequireDefault(require("lodash/padStart"));
+var _didMotif = require("@arcblock/did-motif");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 /* eslint-disable no-bitwise */
 
@@ -365,4 +367,17 @@ const setVisitorId = value => {
     localStorage.setItem(visitorIdKey, value);
   }
 };
-exports.setVisitorId = setVisitorId;
+exports.setVisitorId = setVisitorId;
+const getDIDColor = did => {
+  if (isEthereumDid(did)) {
+    const index = Uint8Array.from(did.slice(2).match(/.{1,2}/g).map(pair => parseInt(pair, 16))).slice(0, 8).reduce((acc, val) => acc + val, 0) % _didMotif.colors.length;
+    return _didMotif.colors[index];
+  }
+  try {
+    const didMotifInfo = (0, _didMotif.getDIDMotifInfo)(did);
+    return didMotifInfo === null || didMotifInfo === void 0 ? void 0 : didMotifInfo.color;
+  } catch (_unused2) {
+    return null;
+  }
+};
+exports.getDIDColor = getDIDColor;

package/package.json

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

package/src/DID/index.jsx

@@ -1,11 +1,11 @@
 import React, { forwardRef } from 'react';
 import PropTypes from 'prop-types';
-import { getDIDMotifInfo, colors } from '@arcblock/did-motif';
+import { getDIDMotifInfo } from '@arcblock/did-motif';
 
 import Address from '../Address';
 import Avatar from '../Avatar';
 
-import { isEthereumDid, getFontSize } from '../Util';
+import { isEthereumDid, getFontSize, getDIDColor } from '../Util';
 
 const DIDPropTypes = {
   did: PropTypes.string.isRequired,
@@ -24,17 +24,7 @@ const DIDPropTypes = {
 
 const getFontColor = (did, didMotifInfo, isEthDid) => {
   if (isEthDid) {
-    const index =
-      Uint8Array.from(
-        did
-          .slice(2)
-          .match(/.{1,2}/g)
-          .map((pair) => parseInt(pair, 16))
-      )
-        .slice(0, 8)
-        .reduce((acc, val) => acc + val, 0) % colors.length;
-
-    return colors[index];
+    return getDIDColor(did);
   }
 
   return didMotifInfo.color;

package/src/Util/index.js

@@ -1,5 +1,6 @@
 /* eslint-disable no-bitwise */
 import padStart from 'lodash/padStart';
+import { getDIDMotifInfo, colors } from '@arcblock/did-motif';
 
 let dateTool = null;
 
@@ -349,3 +350,25 @@ export const setVisitorId = (value) => {
     localStorage.setItem(visitorIdKey, value);
   }
 };
+
+export const getDIDColor = (did) => {
+  if (isEthereumDid(did)) {
+    const index =
+      Uint8Array.from(
+        did
+          .slice(2)
+          .match(/.{1,2}/g)
+          .map((pair) => parseInt(pair, 16))
+      )
+        .slice(0, 8)
+        .reduce((acc, val) => acc + val, 0) % colors.length;
+
+    return colors[index];
+  }
+  try {
+    const didMotifInfo = getDIDMotifInfo(did);
+    return didMotifInfo?.color;
+  } catch {
+    return null;
+  }
+};