fix(b-card): handle header-html and footer-html props correctly (fixes #5038) (#5039)

tmorehouse · jacobmllr95 · web-flow · commit f378aeffdebd · 2020-03-29T19:42:57.000+02:00
Fixes #5038 Co-authored-by: Jacob Müller <jacob.mueller.elz@gmail.com>
diff --git a/src/components/card/card.js b/src/components/card/card.js
@@ -58,7 +58,7 @@ export const BCard = /*#__PURE__*/ Vue.extend({
       }
     }
 
-    if (props.header || hasNormalizedSlot('header', $scopedSlots, $slots)) {
+    if (props.header || props.headerHtml || hasNormalizedSlot('header', $scopedSlots, $slots)) {
       header = h(
         BCardHeader,
         { props: pluckProps(headerProps, props) },
@@ -72,7 +72,7 @@ export const BCard = /*#__PURE__*/ Vue.extend({
       content = [h(BCardBody, { props: pluckProps(bodyProps, props) }, [...content])]
     }
 
-    if (props.footer || hasNormalizedSlot('footer', $scopedSlots, $slots)) {
+    if (props.footer || props.footerHtml || hasNormalizedSlot('footer', $scopedSlots, $slots)) {
       footer = h(
         BCardFooter,
         {

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ export const BCard = /#__PURE__/ Vue.extend({`
`58`	`58`	`}`
`59`	`59`	`}`
`60`	`60`
`61`		`- if (props.header \|\| hasNormalizedSlot('header', $scopedSlots, $slots)) {`
	`61`	`+ if (props.header \|\| props.headerHtml \|\| hasNormalizedSlot('header', $scopedSlots, $slots)) {`
`62`	`62`	`header = h(`
`63`	`63`	`BCardHeader,`
`64`	`64`	`{ props: pluckProps(headerProps, props) },`
`@@ -72,7 +72,7 @@ export const BCard = /#__PURE__/ Vue.extend({`
`72`	`72`	`content = [h(BCardBody, { props: pluckProps(bodyProps, props) }, [...content])]`
`73`	`73`	`}`
`74`	`74`
`75`		`- if (props.footer \|\| hasNormalizedSlot('footer', $scopedSlots, $slots)) {`
	`75`	`+ if (props.footer \|\| props.footerHtml \|\| hasNormalizedSlot('footer', $scopedSlots, $slots)) {`
`76`	`76`	`footer = h(`
`77`	`77`	`BCardFooter,`
`78`	`78`	`{`