@dataloop-ai/components 0.16.11 → 0.16.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dataloop-ai/components",
-  "version": "0.16.11",
+  "version": "0.16.13",
   "exports": {
     ".": "./index.ts",
     "./models": "./models.ts",

package/src/components/essential/DlIcon/DlIcon.vue

@@ -32,7 +32,6 @@
 import { v4 } from 'uuid'
 import { defineComponent } from 'vue-demi'
 import { getColor, loggerFactory } from '../../../utils'
-import { dynamicSvgImport } from '../../../utils/dynamicSvgImport'
 
 export default defineComponent({
     name: 'DlIcon',
@@ -105,12 +104,7 @@ export default defineComponent({
     },
     methods: {
         loadSvg() {
-            return new Promise<void>(async (resolve, reject) => {
-                let dynamicalImagePath = null
-                await dynamicSvgImport(this.icon).then((path: any) => {
-                    dynamicalImagePath = path
-                })
-
+            return new Promise<void>((resolve, reject) => {
                 const svgElement = new Image()
                 svgElement.setAttribute('height', this.size)
                 svgElement.setAttribute('width', this.size)
@@ -134,7 +128,7 @@ export default defineComponent({
                 try {
                     svgElement.src = this.svgSource
                         ? `${this.svgSource}/${this.icon}.svg`
-                        : dynamicalImagePath
+                        : require(`@dataloop-ai/icons/assets/${this.icon}.svg`)
                 } catch (e) {
                     reject(e)
                 }

package/src/components/essential/DlTypography/DlTypography.vue

@@ -50,18 +50,28 @@ export default defineComponent({
                 fontWeight: this.bold ? 'bold' : 400
             }
 
-            if (!this.size) {
-                if (sizes.includes(this.variant)) {
-                    styles.fontSize = this.variant as string
-                }
-            } else {
+            if (this.size && !sizes.includes(this.size)) {
                 styles.fontSize = this.size as string
             }
 
             return styles
         },
         classes(): string[] {
-            return [`dl-typography dl-typography--${this.size}`]
+            const classes = [`dl-typography`]
+
+            if (this.size) {
+                if (sizes.includes(this.size)) {
+                    classes.push(`dl-typography--${this.size}`)
+                }
+            } else {
+                if (sizes.includes(this.variant)) {
+                    classes.push(`dl-typography--${this.size}`)
+                } else {
+                    classes.push(`dl-typography--body`)
+                }
+            }
+
+            return classes
         }
     }
 })

package/src/utils/dynamicSvgImport.ts

@@ -1,5 +0,0 @@
-export function dynamicSvgImport(iconName: string) {
-    return import(
-        `../../node_modules/@dataloop-ai/icons/assets/${iconName}.svg`
-    ).then((d) => d.default)
-}