@arcblock/ux 2.1.44 → 2.1.47

package/lib/Locale/context.js

@@ -82,14 +82,21 @@ const create = () => {
         rest = _objectWithoutProperties(_ref, _excluded);
 
     const [currentLocale, setCurrentLocale] = (0, _react.useState)(getLocale(locale));
-    (0, _react.useEffect)(() => {
-      setLocale(currentLocale);
-    }, [currentLocale]);
 
     const changeLocale = newLocale => {
       setCurrentLocale(newLocale);
+      setLocale(newLocale);
     };
 
+    (0, _react.useEffect)(() => {
+      const tmpLocale = getLocale(locale);
+
+      if (tmpLocale !== currentLocale) {
+        changeLocale(locale);
+      } // eslint-disable-next-line react-hooks/exhaustive-deps
+
+    }, [locale]);
+
     const translate = (key, data) => {
       if (!translations[currentLocale] || !translations[currentLocale][key]) {
         console.warn("Warning: no ".concat(key, " translation of ").concat(currentLocale));

package/lib/NFTDisplay/index.js

@@ -114,9 +114,10 @@ function NFTDisplay(_ref) {
     children: children
   }));
 
-  try {
-    const parsed = (0, _react.useRef)(data); // 如果是 raw data 先解析
+  const parsed = (0, _react.useRef)(data);
 
+  try {
+    // 如果是 raw data 先解析
     if (typeof parsed.current === 'string') {
       parsed.current = JSON.parse(data); // console.log('[debug] parse data')
     }
@@ -208,7 +209,7 @@ function NFTDisplay(_ref) {
               const svg = _buffer.Buffer.from(buffer).toString('utf8');
 
               if (checkSvg && !(0, _isSvg.default)(svg)) {
-                throw new Error("Invalid SVG: ".concat(svg));
+                throw new Error('Invalid SVG of type svg_gzipped');
               }
 
               const Embedder = getSvgEmbedder(preferredSvgEmbedder);
@@ -220,7 +221,7 @@ function NFTDisplay(_ref) {
           case 'svg':
             {
               if (checkSvg && !(0, _isSvg.default)(content)) {
-                throw new Error("Invalid SVG: ".concat(content));
+                throw new Error('Invalid SVG of type svg');
               }
 
               const Embedder = getSvgEmbedder(preferredSvgEmbedder);
@@ -246,7 +247,12 @@ function NFTDisplay(_ref) {
       children: [(state.loading || !minimumLoadingReady) && (renderLoading ? renderLoading() : /*#__PURE__*/(0, _jsxRuntime.jsx)(_loading.default, {})), renderNFT()]
     }));
   } catch (e) {
-    console.error(e);
+    var _parsed$current;
+
+    console.error(e === null || e === void 0 ? void 0 : e.message, {
+      nftId: address,
+      vcId: parsed === null || parsed === void 0 ? void 0 : (_parsed$current = parsed.current) === null || _parsed$current === void 0 ? void 0 : _parsed$current.vcId
+    });
     return wrapRoot(renderError ? renderError() : /*#__PURE__*/(0, _jsxRuntime.jsx)(_broken.default, {}));
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arcblock/ux",
-  "version": "2.1.44",
+  "version": "2.1.47",
   "description": "Common used react components for arcblock products",
   "keywords": [
     "react",
@@ -52,10 +52,10 @@
     "react": ">=18.1.0",
     "react-ga": "^2.7.0"
   },
-  "gitHead": "20e72c7ddc7f6f67d2b14782044bfc8e9609ca36",
+  "gitHead": "ec39f2bad16b784ed65cbf3f74bf7f32d137f4c3",
   "dependencies": {
-    "@arcblock/icons": "^2.1.44",
-    "@arcblock/react-hooks": "^2.1.44",
+    "@arcblock/icons": "^2.1.47",
+    "@arcblock/react-hooks": "^2.1.47",
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
     "@emotion/react": "^11.9.0",
     "@emotion/styled": "^11.8.1",

package/src/Locale/context.js

@@ -38,14 +38,19 @@ const create = () => {
   function LocaleProvider({ children, locale, translations, ...rest }) {
     const [currentLocale, setCurrentLocale] = useState(getLocale(locale));
 
-    useEffect(() => {
-      setLocale(currentLocale);
-    }, [currentLocale]);
-
     const changeLocale = (newLocale) => {
       setCurrentLocale(newLocale);
+      setLocale(newLocale);
     };
 
+    useEffect(() => {
+      const tmpLocale = getLocale(locale);
+      if (tmpLocale !== currentLocale) {
+        changeLocale(locale);
+      }
+      // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [locale]);
+
     const translate = (key, data) => {
       if (!translations[currentLocale] || !translations[currentLocale][key]) {
         console.warn(`Warning: no ${key} translation of ${currentLocale}`);

package/src/NFTDisplay/index.js

@@ -69,13 +69,15 @@ function NFTDisplay({
     </Root>
   );
 
+  const parsed = useRef(data);
+
   try {
-    const parsed = useRef(data);
     // 如果是 raw data 先解析
     if (typeof parsed.current === 'string') {
       parsed.current = JSON.parse(data);
       // console.log('[debug] parse data')
     }
+
     const { vcId } = parsed.current;
     // 需要兼容新旧两种类型的数据结构, nft data 有 credentialSubject 属性, 说明是旧 nft data, 否则是新 nft data
     const display = parsed.current.credentialSubject
@@ -147,14 +149,14 @@ function NFTDisplay({
             const buffer = pako.ungzip(fromBase64(content), {});
             const svg = Buffer.from(buffer).toString('utf8');
             if (checkSvg && !isSvg(svg)) {
-              throw new Error(`Invalid SVG: ${svg}`);
+              throw new Error('Invalid SVG of type svg_gzipped');
             }
             const Embedder = getSvgEmbedder(preferredSvgEmbedder);
             return <Embedder svg={svg} />;
           }
           case 'svg': {
             if (checkSvg && !isSvg(content)) {
-              throw new Error(`Invalid SVG: ${content}`);
+              throw new Error('Invalid SVG of type svg');
             }
             const Embedder = getSvgEmbedder(preferredSvgEmbedder);
             return <Embedder svg={content} />;
@@ -176,7 +178,10 @@ function NFTDisplay({
       </>
     );
   } catch (e) {
-    console.error(e);
+    console.error(e?.message, {
+      nftId: address,
+      vcId: parsed?.current?.vcId,
+    });
     return wrapRoot(renderError ? renderError() : <DefaultBrokenImage />);
   }
 }