feat: Add text prop to CButton component to allow self closing syntax

woothu · woothu · commit 62c82ef22d64 · 2019-02-27T16:02:44.000+01:00
diff --git a/src/components/Button/CButton.js b/src/components/Button/CButton.js
@@ -23,7 +23,8 @@ const btnProps = {
   pressed: {
     type: Boolean,
     default: null
-  }
+  },
+  text: String
 }
 export const props = assign(linkPropsFactory(), btnProps)
 
@@ -83,11 +84,13 @@ export default {
         }
       }
     }
+    const domProps = children ? '' : { innerHTML: props.text }
     const componentData = {
       staticClass: 'btn',
       class: computeClasses(props),
       props: computePassedProps(props),
       attrs: computeAttrs(props, data, isButton, toggle),
+      domProps,
       on
     }
     return h(isButton ? 'button' : CLink , mergeData(data, componentData), children)

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,8 @@ const btnProps = {`
`23`	`23`	`pressed: {`
`24`	`24`	`type: Boolean,`
`25`	`25`	`default: null`
`26`		`- }`
	`26`	`+ },`
	`27`	`+ text: String`
`27`	`28`	`}`
`28`	`29`	`export const props = assign(linkPropsFactory(), btnProps)`
`29`	`30`
`@@ -83,11 +84,13 @@ export default {`
`83`	`84`	`}`
`84`	`85`	`}`
`85`	`86`	`}`
	`87`	`+ const domProps = children ? '' : { innerHTML: props.text }`
`86`	`88`	`const componentData = {`
`87`	`89`	`staticClass: 'btn',`
`88`	`90`	`class: computeClasses(props),`
`89`	`91`	`props: computePassedProps(props),`
`90`	`92`	`attrs: computeAttrs(props, data, isButton, toggle),`
	`93`	`+ domProps,`
`91`	`94`	`on`
`92`	`95`	`}`
`93`	`96`	`return h(isButton ? 'button' : CLink , mergeData(data, componentData), children)`