feat(QIcon): True SVG icon support #6027

quasarframework · Jan 8, 2020 · 3edefde · 3edefde
1 parent 8db463f
commit 3edefde
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 2 deletions.
diff --git a/ui/src/components/icon/QIcon.js b/ui/src/components/icon/QIcon.js
@@ -49,6 +49,16 @@ export default Vue.extend({
         }
       }
 
+      if (icon.startsWith('M') === true) {
+        const [ path, viewBox ] = icon.split('|')
+        return {
+          svg: true,
+          cls: commonCls + ' q-svg-icon',
+          path,
+          viewBox
+        }
+      }
+
       if (icon.startsWith('img:') === true) {
         return {
           img: true,
@@ -119,11 +129,26 @@ export default Vue.extend({
       })
     }
 
-    return h('i', {
+    const data = {
       staticClass: this.type.cls,
       style: this.sizeStyle,
       on: this.$listeners,
       attrs: { 'aria-hidden': true }
-    }, mergeSlot([ this.type.content ], this, 'default'))
+    }
+
+    if (this.type.svg === true) {
+      data.attrs.focusable = 'false' /* needed for IE11 */
+      data.attrs.viewBox = this.type.viewBox
+
+      return h('svg', data, mergeSlot([
+        h('path', {
+          attrs: { d: this.type.path }
+        })
+      ], this, 'default'))
+    }
+
+    return h('i', data, mergeSlot([
+      this.type.content
+    ], this, 'default'))
   }
 })
diff --git a/ui/src/css/critical.sass b/ui/src/css/critical.sass
@@ -32,3 +32,8 @@
   align-items: center
   justify-content: center
   vertical-align: middle
+
+.q-svg-icon
+  vertical-align: text-bottom
+  path
+    fill: currentColor
diff --git a/ui/src/css/critical.styl b/ui/src/css/critical.styl
@@ -32,3 +32,8 @@
   align-items: center
   justify-content: center
   vertical-align: middle
+
+.q-svg-icon
+  vertical-align: text-bottom
+  path
+    fill: currentColor