Merge branch 'feature/update-icon' into feature/update

SnowdogApps · Jul 16, 2021 · 0e15bd6 · 0e15bd6
2 parents 848a58e + 58bbc95
commit 0e15bd6
Show file tree

Hide file tree

Showing 6 changed files with 119 additions and 110 deletions.
diff --git a/src/atoms/icon/Icon.css b/src/atoms/icon/Icon.css
diff --git a/src/atoms/icon/Icon.html b/src/atoms/icon/Icon.html
@@ -2,11 +2,11 @@
   xmlns="http://www.w3.org/2000/svg"
   :width="`${width}px`"
   :height="`${height}px`"
-  class="a-icon"
   :viewBox="viewBox ? viewBox : `0 0 ${width} ${height}`"
   :aria-labelledby="ariaId"
   :role="title ? 'img' : 'presentation'"
   :focusable="title ? null : 'false'"
+  :class="getClass('icon')"
 >
   <title
     v-if="title"

diff --git a/src/atoms/icon/Icon.js b/src/atoms/icon/Icon.js
@@ -1,5 +1,7 @@
-// @vue/component
+import getClass from '../../../utils/helpers/get-class.js'
+
 export default {
+  mixins: [getClass],
   props: {
     /**
      * Icon id for aria-labelledby
@@ -37,6 +39,19 @@ export default {
       default: false
     }
   },
+  data () {
+    return {
+      config: {
+        base: {
+          icon: [
+            'block',
+            'pointer-events-none',
+            'transition-all', 'duration-200', 'ease-in-out'
+          ]
+        }
+      }
+    }
+  },
   computed: {
     ariaId () {
       return this.id || (this.title && this.title.toLowerCase().replace(/ /g, '-'))

diff --git a/src/atoms/icon/Icon.spec.js b/src/atoms/icon/Icon.spec.js
@@ -6,8 +6,6 @@ describe('Icon', () => {
     const wrapper = mount(AIcon)
 
     expect(wrapper.element.tagName).toBe('svg')
-    expect(wrapper.classes()).toContain('a-icon')
-    expect(wrapper.classes().length).toBe(1)
     expect(wrapper.attributes().xmlns).toBeDefined()
     expect(wrapper.attributes().xmlns).toEqual('http://www.w3.org/2000/svg')
     expect(wrapper.attributes().role).toBeDefined()
@@ -29,7 +27,7 @@ describe('Icon', () => {
       }
     })
 
-    const title = wrapper.find('.a-icon > title')
+    const title = wrapper.find('svg > title')
 
     expect(wrapper.attributes().role).toBeDefined()
     expect(wrapper.attributes().role).toEqual('img')