@arcblock/ux 2.10.44 → 2.10.46

package/lib/DID/index.js

@@ -1,25 +1,26 @@
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 import { getDIDMotifInfo } from '@arcblock/did-motif';
-import IconQrCode from '@iconify-icons/material-symbols/qr-code-rounded';
+import { types } from '@ocap/mcrypto';
+import QRCode from 'qrcode.react';
 import { Icon } from '@iconify/react';
-import { Box, Dialog, DialogContent, DialogTitle, Typography } from '@mui/material';
+import IconQrCode from '@iconify-icons/material-symbols/qr-code-rounded';
+import { Box, Dialog, DialogContent, Typography } from '@mui/material';
 import { useCreation, useMemoizedFn } from 'ahooks';
-import QRCode from 'qrcode.react';
 import React, { forwardRef, useImperativeHandle, useRef, useState } from 'react';
 import Address from '../Address';
 import Avatar from '../Avatar';
 import { temp as colors } from '../Colors';
 import { DID_PREFIX } from '../Util/constant';
 import { translate } from '../Locale/util';
-import { getDIDColor, getFontSize, isEthereumDid } from '../Util';
+import { getDIDColor, isEthereumDid } from '../Util';
 const translations = {
   en: {
-    scanQrcode: 'Scan with DID Wallet to transfer token to here',
+    scanQrcode: 'Scan with DID Wallet to view this {role}',
     download: 'Download',
     downloadTips: "Don't have DID Wallet ?"
   },
   zh: {
-    scanQrcode: '扫描此二维码，用 DID Wallet 转账',
+    scanQrcode: '使用 DID Wallet 扫码查看该 {role}',
     download: '下载',
     downloadTips: '没有 DID Wallet ？'
   }
@@ -45,6 +46,16 @@ const isSquareMotif = roleType => {
   };
   return !roles[roleType];
 };
+const getRoleName = roleType => {
+  const [roleName] = Object.entries(types.RoleType).find(item => item[1] === roleType) || [];
+  if (roleName) {
+    // UpperCase first word, example:
+    // ROLE_ACCOUNT -> Account
+    // ROLE_APPLICATION -> Application
+    return roleName.toLowerCase().replace(/role_(\S)/g, (_, $1) => $1.toUpperCase());
+  }
+  return 'Address';
+};
 const getAvatarSize = (didMotifInfo, isEthDid, size) => {
   if (isEthDid) {
     return size * 0.75;
@@ -104,24 +115,19 @@ const DID = /*#__PURE__*/forwardRef((props, ref) => {
   const [open, setOpen] = useState(false);
   const isEthDid = isEthereumDid(did);
   const didMotifInfo = isEthDid ? undefined : getDIDMotifInfo(did);
-  const fontSize = getFontSize(rest.size);
-  const prepend = [/*#__PURE__*/_jsx("span", {
+  const getPrepend = avatarSize => [/*#__PURE__*/_jsx("span", {
     style: {
       flex: '0 0 auto',
-      fontSize,
       color: getFontColor(did, didMotifInfo, isEthDid)
     },
     children: "DID:"
   }, "prefix-did"), /*#__PURE__*/_jsx("span", {
     className: "did-address-text",
-    style: {
-      fontSize
-    },
     children: "ABT:"
   }, "prefix-abt"), showAvatar && /*#__PURE__*/_jsx(Avatar, {
     src: "",
     did: did,
-    size: getAvatarSize(didMotifInfo, isEthDid, rest.size || 18),
+    size: getAvatarSize(didMotifInfo, isEthDid, avatarSize || 18),
     style: {
       display: 'inline-flex',
       alignItems: 'center',
@@ -179,7 +185,7 @@ const DID = /*#__PURE__*/forwardRef((props, ref) => {
       content: `${DID_PREFIX}${did}`,
       ...rest,
       ref: addressRef,
-      prepend: prepend,
+      prepend: getPrepend(rest.size),
       append: /*#__PURE__*/_jsxs(_Fragment, {
         children: [showQrcode ? /*#__PURE__*/_jsx(Box, {
           id: "did-qrcode-button",
@@ -195,20 +201,31 @@ const DID = /*#__PURE__*/forwardRef((props, ref) => {
         }) : null, rest.append]
       }),
       children: did
-    }), /*#__PURE__*/_jsxs(Dialog, {
+    }), /*#__PURE__*/_jsx(Dialog, {
       open: open,
       onClose: closeQrCode,
       maxWidth: "sm",
-      children: [/*#__PURE__*/_jsx(DialogTitle, {
+      PaperProps: {
+        sx: {
+          boxShadow: 'none',
+          borderRadius: '12px'
+        }
+      },
+      children: /*#__PURE__*/_jsxs(DialogContent, {
         align: "center",
-        children: /*#__PURE__*/_jsx(Typography, {
-          variant: "h6",
-          component: "h3",
-          children: t('scanQrcode')
-        })
-      }), /*#__PURE__*/_jsxs(DialogContent, {
-        align: 'center',
-        children: [/*#__PURE__*/_jsx(QRCode
+        sx: {
+          p: 3
+        },
+        children: [/*#__PURE__*/_jsx(Typography, {
+          sx: {
+            mb: 2,
+            fontWeight: 500,
+            fontSize: 18
+          },
+          children: t('scanQrcode', {
+            role: getRoleName(didMotifInfo?.roleType)
+          })
+        }), /*#__PURE__*/_jsx(QRCode
         // eslint-disable-next-line max-len
         , {
           value: `abt://abtwallet.io/i?did=${DID_PREFIX}${did}&action=didRecognize&chainID=${chainId || DEFAULT_CHAIN_ID}`,
@@ -217,14 +234,15 @@ const DID = /*#__PURE__*/forwardRef((props, ref) => {
           level: "M"
         }), /*#__PURE__*/_jsx(Box, {
           sx: {
-            marginTop: 1,
+            mt: 1.5,
             textAlign: 'center'
           },
           children: /*#__PURE__*/_jsx(Address, {
             locale: locale,
             content: `${DID_PREFIX}${did}`,
-            prepend: prepend,
+            prepend: getPrepend(16),
             ...rest,
+            size: 16,
             copyable: true,
             children: did
           })
@@ -237,7 +255,7 @@ const DID = /*#__PURE__*/forwardRef((props, ref) => {
           },
           children: downloadTips
         })]
-      })]
+      })
     })]
   });
 });

package/lib/withTracker/README.md

@@ -1,13 +1,13 @@
 # withTracker
 
-Add arcblock analytics, google analytics and sentry error reporting to your application.
+Add google analytics reporting to your application.
 
 ## Usage
 
 ### Installation
 
 ```bash
-yarn add react-ga @arcblock/analytics-js @sentry/browser @arcblock/ux
+yarn add @arcblock/ux
 ```
 
 ### Configuration & Usage
@@ -16,19 +16,22 @@ In your application entry file
 
 ```javascript
 import React from 'react';
-import ReactDOM from 'react-dom';
 import withTracker from '@arcblock/ux/lib/withTracker';
+import { BrowserRouter as Router } from 'react-router-dom';
 
-function App() {
-  return <p>My awesome application</p>;
-}
+const App = () => <p>My awesome application</p>;
+const TrackedApp = withTracker(App);
 
-const Wrapped = withTracker(App, {
-  appName: 'my-awesome-app',
-  appVersion: '0.1.0',
-  gaAccount: '',
-  sentryDSN: '',
-});
+export default function WrappedApp() {
+  // While the blocklet is deploy to a sub path, this will be work properly.
+  const basename = window?.blocklet?.prefix || '/';
 
-ReactDOM.render(<Wrapped />, document.getElementById('root'));
+  return (
+    <Router basename={basename}>
+      <TrackedApp />
+    </Router>
+  );
+}
 ```
+
+Then you can use `window.trackPage(path, title)` and `window.trackEvent(category, action, label, value)` to track page views and events.

package/lib/withTracker/index.d.ts

@@ -1,2 +1,2 @@
-declare function _default(WrappedComponent: any, options?: {}): (props: any) => import("react/jsx-runtime").JSX.Element;
+declare function _default(WrappedComponent: any): (props: any) => import("react/jsx-runtime").JSX.Element;
 export default _default;

package/lib/withTracker/index.js

@@ -1,38 +1,37 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-/* eslint-disable import/no-unresolved */
-import ReactGA from 'react-ga';
-import * as Sentry from '@sentry/browser';
-import { useMount, useDeepCompareEffect } from 'ahooks';
 import { useLocation } from 'react-router-dom';
-import ErrorBoundary from './error_boundary';
-export default (WrappedComponent, options = {}) => {
-  const {
-    appVersion,
-    gaAccount,
-    sentryDSN
-  } = options;
-  if (gaAccount) {
-    ReactGA.initialize(gaAccount);
-  }
-  if (sentryDSN) {
-    Sentry.init({
-      dsn: sentryDSN,
-      release: appVersion || 'unknown',
-      environment: process.env.NODE_ENV || 'development'
-    });
-  }
-  const trackPage = page => {
+import { useMount, useDeepCompareEffect } from 'ahooks';
+import ReactGA from 'react-ga4';
+export default WrappedComponent => {
+  const trackingId = window.blocklet?.GA_MEASUREMENT_ID || '';
+  const trackPage = (page, title = document.title) => {
     if (!process.env.NODE_ENV || process.env.NODE_ENV === 'development') {
       return;
     }
-    if (gaAccount) {
-      ReactGA.set({
+    if (trackingId) {
+      ReactGA.send({
+        hitType: 'pageview',
         page,
-        ...options
+        title
       });
-      ReactGA.pageview(page);
     }
   };
+  const trackEvent = (category, action, label, value) => {
+    if (trackingId) {
+      ReactGA.event({
+        category,
+        action,
+        label,
+        value,
+        transport: 'beacon'
+      });
+    }
+  };
+  if (trackingId) {
+    ReactGA.initialize(trackingId);
+  }
+  window.trackPage = trackPage;
+  window.trackEvent = trackEvent;
   return function TrackedComponent(props) {
     const location = useLocation();
     useMount(() => {
@@ -41,13 +40,6 @@ export default (WrappedComponent, options = {}) => {
     useDeepCompareEffect(() => {
       trackPage(location.pathname);
     }, [location.pathname]);
-    if (process.env.NODE_ENV === 'production') {
-      return /*#__PURE__*/_jsx(ErrorBoundary, {
-        children: /*#__PURE__*/_jsx(WrappedComponent, {
-          ...props
-        })
-      });
-    }
     return /*#__PURE__*/_jsx(WrappedComponent, {
       ...props
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arcblock/ux",
-  "version": "2.10.44",
+  "version": "2.10.46",
   "description": "Common used react components for arcblock products",
   "keywords": [
     "react",
@@ -64,12 +64,12 @@
     "react": ">=18.2.0",
     "react-router-dom": ">=6.22.3"
   },
-  "gitHead": "35fb53cce48d64d7affbc3023f7d027f0ec93171",
+  "gitHead": "ae503a7f61a29ddfe9fdc5a1b0e040fa5890dc75",
   "dependencies": {
     "@arcblock/did-motif": "^1.1.13",
-    "@arcblock/icons": "^2.10.44",
-    "@arcblock/nft-display": "^2.10.44",
-    "@arcblock/react-hooks": "^2.10.44",
+    "@arcblock/icons": "^2.10.46",
+    "@arcblock/nft-display": "^2.10.46",
+    "@arcblock/react-hooks": "^2.10.46",
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
     "@fontsource/inter": "^5.0.16",
     "@fontsource/ubuntu-mono": "^5.0.18",
@@ -101,6 +101,7 @@
     "qrcode.react": "^3.1.0",
     "react-cookie-consent": "^6.4.1",
     "react-error-boundary": "^3.1.4",
+    "react-ga4": "^2.1.0",
     "react-helmet": "^6.1.0",
     "react-intersection-observer": "^8.34.0",
     "react-lottie-player": "^1.4.3",

package/src/DID/index.tsx

@@ -1,9 +1,10 @@
 import { getDIDMotifInfo } from '@arcblock/did-motif';
-import IconQrCode from '@iconify-icons/material-symbols/qr-code-rounded';
+import { types } from '@ocap/mcrypto';
+import QRCode from 'qrcode.react';
 import { Icon } from '@iconify/react';
-import { Box, Dialog, DialogContent, DialogTitle, Typography } from '@mui/material';
+import IconQrCode from '@iconify-icons/material-symbols/qr-code-rounded';
+import { Box, Dialog, DialogContent, Typography } from '@mui/material';
 import { useCreation, useMemoizedFn } from 'ahooks';
-import QRCode from 'qrcode.react';
 import React, { forwardRef, useImperativeHandle, useRef, useState } from 'react';
 
 import Address, { IDidAddressWrapper } from '../Address';
@@ -13,16 +14,16 @@ import { DID_PREFIX } from '../Util/constant';
 
 import { HTMLDidAddressElement } from '../Address/did-address';
 import { translate } from '../Locale/util';
-import { getDIDColor, getFontSize, isEthereumDid } from '../Util';
+import { getDIDColor, isEthereumDid } from '../Util';
 
 const translations = {
   en: {
-    scanQrcode: 'Scan with DID Wallet to transfer token to here',
+    scanQrcode: 'Scan with DID Wallet to view this {role}',
     download: 'Download',
     downloadTips: "Don't have DID Wallet ?",
   },
   zh: {
-    scanQrcode: '扫描此二维码，用 DID Wallet 转账',
+    scanQrcode: '使用 DID Wallet 扫码查看该 {role}',
     download: '下载',
     downloadTips: '没有 DID Wallet ？',
   },
@@ -70,6 +71,19 @@ const isSquareMotif = (roleType: number) => {
   return !roles[roleType];
 };
 
+const getRoleName = (roleType: number) => {
+  const [roleName] = Object.entries(types.RoleType).find((item) => item[1] === roleType) || [];
+
+  if (roleName) {
+    // UpperCase first word, example:
+    // ROLE_ACCOUNT -> Account
+    // ROLE_APPLICATION -> Application
+    return roleName.toLowerCase().replace(/role_(\S)/g, (_, $1) => $1.toUpperCase());
+  }
+
+  return 'Address';
+};
+
 const getAvatarSize = (didMotifInfo: any, isEthDid: boolean, size: number) => {
   if (isEthDid) {
     return size * 0.75;
@@ -139,12 +153,12 @@ const DID = forwardRef<HTMLDIDElement, IDIDPropTypes>((props, ref) => {
   const [open, setOpen] = useState(false);
   const isEthDid = isEthereumDid(did);
   const didMotifInfo = isEthDid ? undefined : getDIDMotifInfo(did);
-  const fontSize = getFontSize(rest.size);
-  const prepend = [
-    <span key="prefix-did" style={{ flex: '0 0 auto', fontSize, color: getFontColor(did, didMotifInfo, isEthDid) }}>
+
+  const getPrepend = (avatarSize: number) => [
+    <span key="prefix-did" style={{ flex: '0 0 auto', color: getFontColor(did, didMotifInfo, isEthDid) }}>
       DID:
     </span>,
-    <span key="prefix-abt" className="did-address-text" style={{ fontSize }}>
+    <span key="prefix-abt" className="did-address-text">
       ABT:
     </span>,
     showAvatar && (
@@ -152,7 +166,7 @@ const DID = forwardRef<HTMLDIDElement, IDIDPropTypes>((props, ref) => {
         key="avatar"
         src=""
         did={did}
-        size={getAvatarSize(didMotifInfo, isEthDid, rest.size || 18)}
+        size={getAvatarSize(didMotifInfo, isEthDid, avatarSize || 18)}
         style={{ display: 'inline-flex', alignItems: 'center', marginLeft: 2, marginRight: 4 }}
         blockiesPadding={false}
         className="did-address-avatar"
@@ -218,7 +232,7 @@ const DID = forwardRef<HTMLDIDElement, IDIDPropTypes>((props, ref) => {
         content={`${DID_PREFIX}${did}`}
         {...rest}
         ref={addressRef}
-        prepend={prepend}
+        prepend={getPrepend(rest.size)}
         append={
           <>
             {showQrcode ? (
@@ -241,14 +255,21 @@ const DID = forwardRef<HTMLDIDElement, IDIDPropTypes>((props, ref) => {
         {did}
       </Address>
 
-      <Dialog open={open} onClose={closeQrCode} maxWidth="sm">
-        <DialogTitle align="center">
-          <Typography variant="h6" component="h3">
-            {t('scanQrcode')}
-          </Typography>
-        </DialogTitle>
+      <Dialog
+        open={open}
+        onClose={closeQrCode}
+        maxWidth="sm"
+        PaperProps={{
+          sx: {
+            boxShadow: 'none',
+            borderRadius: '12px',
+          },
+        }}>
         {/* @ts-ignore */}
-        <DialogContent align={'center' as any}>
+        <DialogContent align="center" sx={{ p: 3 }}>
+          <Typography sx={{ mb: 2, fontWeight: 500, fontSize: 18 }}>
+            {t('scanQrcode', { role: getRoleName(didMotifInfo?.roleType) })}
+          </Typography>
           <QRCode
             // eslint-disable-next-line max-len
             value={`abt://abtwallet.io/i?did=${DID_PREFIX}${did}&action=didRecognize&chainID=${
@@ -258,8 +279,14 @@ const DID = forwardRef<HTMLDIDElement, IDIDPropTypes>((props, ref) => {
             renderAs="svg"
             level="M"
           />
-          <Box sx={{ marginTop: 1, textAlign: 'center' }}>
-            <Address locale={locale} content={`${DID_PREFIX}${did}`} prepend={prepend} {...rest} copyable>
+          <Box sx={{ mt: 1.5, textAlign: 'center' }}>
+            <Address
+              locale={locale}
+              content={`${DID_PREFIX}${did}`}
+              prepend={getPrepend(16)}
+              {...rest}
+              size={16}
+              copyable>
               {did}
             </Address>
           </Box>

package/src/withTracker/README.md

@@ -1,13 +1,13 @@
 # withTracker
 
-Add arcblock analytics, google analytics and sentry error reporting to your application.
+Add google analytics reporting to your application.
 
 ## Usage
 
 ### Installation
 
 ```bash
-yarn add react-ga @arcblock/analytics-js @sentry/browser @arcblock/ux
+yarn add @arcblock/ux
 ```
 
 ### Configuration & Usage
@@ -16,19 +16,22 @@ In your application entry file
 
 ```javascript
 import React from 'react';
-import ReactDOM from 'react-dom';
 import withTracker from '@arcblock/ux/lib/withTracker';
+import { BrowserRouter as Router } from 'react-router-dom';
 
-function App() {
-  return <p>My awesome application</p>;
-}
+const App = () => <p>My awesome application</p>;
+const TrackedApp = withTracker(App);
 
-const Wrapped = withTracker(App, {
-  appName: 'my-awesome-app',
-  appVersion: '0.1.0',
-  gaAccount: '',
-  sentryDSN: '',
-});
+export default function WrappedApp() {
+  // While the blocklet is deploy to a sub path, this will be work properly.
+  const basename = window?.blocklet?.prefix || '/';
 
-ReactDOM.render(<Wrapped />, document.getElementById('root'));
+  return (
+    <Router basename={basename}>
+      <TrackedApp />
+    </Router>
+  );
+}
 ```
+
+Then you can use `window.trackPage(path, title)` and `window.trackEvent(category, action, label, value)` to track page views and events.

package/src/withTracker/index.js

@@ -1,37 +1,32 @@
-/* eslint-disable import/no-unresolved */
-import ReactGA from 'react-ga';
-import * as Sentry from '@sentry/browser';
-
-import { useMount, useDeepCompareEffect } from 'ahooks';
 import { useLocation } from 'react-router-dom';
+import { useMount, useDeepCompareEffect } from 'ahooks';
+import ReactGA from 'react-ga4';
 
-import ErrorBoundary from './error_boundary';
-
-export default (WrappedComponent, options = {}) => {
-  const { appVersion, gaAccount, sentryDSN } = options;
-
-  if (gaAccount) {
-    ReactGA.initialize(gaAccount);
-  }
-  if (sentryDSN) {
-    Sentry.init({
-      dsn: sentryDSN,
-      release: appVersion || 'unknown',
-      environment: process.env.NODE_ENV || 'development',
-    });
-  }
-
-  const trackPage = (page) => {
+export default (WrappedComponent) => {
+  const trackingId = window.blocklet?.GA_MEASUREMENT_ID || '';
+  const trackPage = (page, title = document.title) => {
     if (!process.env.NODE_ENV || process.env.NODE_ENV === 'development') {
       return;
     }
 
-    if (gaAccount) {
-      ReactGA.set({ page, ...options });
-      ReactGA.pageview(page);
+    if (trackingId) {
+      ReactGA.send({ hitType: 'pageview', page, title });
     }
   };
 
+  const trackEvent = (category, action, label, value) => {
+    if (trackingId) {
+      ReactGA.event({ category, action, label, value, transport: 'beacon' });
+    }
+  };
+
+  if (trackingId) {
+    ReactGA.initialize(trackingId);
+  }
+
+  window.trackPage = trackPage;
+  window.trackEvent = trackEvent;
+
   return function TrackedComponent(props) {
     const location = useLocation();
 
@@ -43,14 +38,6 @@ export default (WrappedComponent, options = {}) => {
       trackPage(location.pathname);
     }, [location.pathname]);
 
-    if (process.env.NODE_ENV === 'production') {
-      return (
-        <ErrorBoundary>
-          <WrappedComponent {...props} />
-        </ErrorBoundary>
-      );
-    }
-
     return <WrappedComponent {...props} />;
   };
 };