Update make-icon.js

tmorehouse · web-flow · commit f9a46cd53fde · 2019-12-19T17:41:50.000-04:00
diff --git a/src/icons/helpers/make-icon.js b/src/icons/helpers/make-icon.js
@@ -4,7 +4,7 @@ import identity from '../../utils/identity'
 import { kebabCase, pascalCase, trim } from '../../utils/string'
 import { toFloat } from '../../utils/number'
 
-// Common icon props
+// Common icon props (should be cloned/spread before using)
 export const commonIconProps = {
   variant: {
     type: String,
@@ -40,6 +40,7 @@ export const commonIconProps = {
   }
 }
 
+// Base attributes needed on all icons
 const baseAttrs = {
   width: '1em',
   height: '1em',
@@ -49,7 +50,7 @@ const baseAttrs = {
   alt: 'icon'
 }
 
-// Shared base component to reduce bundle size
+// Shared private base component to reduce bundle/runtime size
 // @vue/component
 const BVIconBase = {
   name: 'BVIconBase',
@@ -132,7 +133,7 @@ export const makeIcon = (name, content) => {
     render(h, { data, props }) {
       return h(
         BVIconBase,
-        mergeData({ staticClass: iconNameClass, props: { ...props, content: svgContent } }, data)
+        mergeData(data, { staticClass: iconNameClass, props: { ...props, content: svgContent } })
       )
     }
   })

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ import identity from '../../utils/identity'`
`4`	`4`	`import { kebabCase, pascalCase, trim } from '../../utils/string'`
`5`	`5`	`import { toFloat } from '../../utils/number'`
`6`	`6`
`7`		`-// Common icon props`
	`7`	`+// Common icon props (should be cloned/spread before using)`
`8`	`8`	`export const commonIconProps = {`
`9`	`9`	`variant: {`
`10`	`10`	`type: String,`
`@@ -40,6 +40,7 @@ export const commonIconProps = {`
`40`	`40`	`}`
`41`	`41`	`}`
`42`	`42`
	`43`	`+// Base attributes needed on all icons`
`43`	`44`	`const baseAttrs = {`
`44`	`45`	`width: '1em',`
`45`	`46`	`height: '1em',`
`@@ -49,7 +50,7 @@ const baseAttrs = {`
`49`	`50`	`alt: 'icon'`
`50`	`51`	`}`
`51`	`52`
`52`		`-// Shared base component to reduce bundle size`
	`53`	`+// Shared private base component to reduce bundle/runtime size`
`53`	`54`	`// @vue/component`
`54`	`55`	`const BVIconBase = {`
`55`	`56`	`name: 'BVIconBase',`
`@@ -132,7 +133,7 @@ export const makeIcon = (name, content) => {`
`132`	`133`	`render(h, { data, props }) {`
`133`	`134`	`return h(`
`134`	`135`	`BVIconBase,`
`135`		`- mergeData({ staticClass: iconNameClass, props: { ...props, content: svgContent } }, data)`
	`136`	`+ mergeData(data, { staticClass: iconNameClass, props: { ...props, content: svgContent } })`
`136`	`137`	`)`
`137`	`138`	`}`
`138`	`139`	`})`