@veritree/ui 0.23.0-0 → 0.24.0-0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@veritree/ui",
-  "version": "0.23.0-0",
+  "version": "0.24.0-0",
   "description": "veritree ui library",
   "type": "module",
   "main": "index.js",

package/src/components/Image/VTImage.vue

@@ -60,12 +60,14 @@ export default {
           return this.placeholder;
         }
 
-        if (this.cdnSrc) {
-          return this.handleImageResizing(this.cdnSrc, this.$attrs.width);
+        if (this.src) {
+          return this.src.includes('cloudfront.net/')
+            ? handleImageResizing(this.src, this.$attrs.width)
+            : this.src;
         }
 
-        if (this.src) {
-          return this.src;
+        if (this.cdnSrc) {
+          return handleImageResizing(this.cdnSrc, this.$attrs.width);
         }
       }
 

package/src/utils/images.js

@@ -3,42 +3,35 @@ export const handleImageResizing = (url, width) => {
   if (!url) {
     return '';
   }
-  
+
   let cdn;
-  
+
   try {
-    if (typeof url === 'object') {
-      cdn = url.cdn_url;
-    }
+    // new code
+    if (typeof url === 'string' && url.includes('cloudfront.net/')) {
+      cdn = url;
+    } else {
+      // old code
+      if (typeof url === 'object') {
+        cdn = url.cdn_url;
+      }
 
-    if (typeof url === 'string') {
-      cdn = JSON.parse(url).cdn_url;
+      if (typeof url === 'string') {
+        cdn = JSON.parse(url).cdn_url;
+      }
     }
 
     const base64String = cdn.split('net/');
     const firstPart = base64String[0];
+    const decodedString = JSON.parse(atob(base64String[1]));
 
-    // if atob is crossed and your editor says is not supported,
-    // don't worry, it seems to be about NodeJS and not about
-    // browsers.
-    //
-    // Details: https://developer.mozilla.org/en-US/docs/Web/API/atob
-      const decodedString = JSON.parse(atob(base64String[1]));
-
-    width
-      ? (decodedString.edits.resize.width = width)
-      : (decodedString.edits.resize.width = 450);
+    decodedString.edits.resize.width = width ?? 450;
 
-    // if btoa is crossed and your editor says is not supported,
-    // don't worry, it seems to be about NodeJS and not about
-    // browsers.
-    //
-    // Details: https://developer.mozilla.org/en-US/docs/Web/API/atob
     const encodedString = btoa(JSON.stringify(decodedString));
     const encodedUrl = `${firstPart}net/${encodedString}`;
 
-    return encodedUrl
-  } catch(error) {
+    return encodedUrl;
+  } catch (error) {
     console.error(`${error} in ${cdn}`);
   }
-};
+};