fix(modal): properly render *-html props if provided (closes #3491) (…

…#3492)
bootstrap-vue · Jun 11, 2019 · c1ada9f · c1ada9f
1 parent 42570e0
commit c1ada9f
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 9 deletions.
diff --git a/src/components/modal/helpers/bv-modal.js b/src/components/modal/helpers/bv-modal.js
@@ -112,7 +112,7 @@ const plugin = Vue => {
         hideHeaderClose: true,
         hideHeader: !(props.title || props.titleHtml),
         // Add in (filtered) user supplied props
-        ...omit(props, ['msgBoxContent']),
+        ...omit(props, keys(propsToSlots)),
         // Props that can't be overridden
         lazy: false,
         busy: false,

diff --git a/src/components/modal/modal.js b/src/components/modal/modal.js
@@ -715,11 +715,13 @@ export const BModal = /*#__PURE__*/ Vue.extend({
               [this.normalizeSlot('modal-header-close', {})]
             )
           }
+          const domProps =
+            !this.hasNormalizedSlot('modal-title') && this.titleHtml
+              ? { innerHTML: this.titleHtml }
+              : {}
           modalHeader = [
-            h(this.titleTag, { class: ['modal-title'] }, [
-              this.normalizeSlot('modal-title', this.slotScope) ||
-                this.titleHtml ||
-                stripTags(this.title)
+            h(this.titleTag, { class: ['modal-title'], domProps }, [
+              this.normalizeSlot('modal-title', this.slotScope) || stripTags(this.title)
             ]),
             closeButton
           ]
@@ -755,6 +757,7 @@ export const BModal = /*#__PURE__*/ Vue.extend({
         if (!modalFooter) {
           let cancelButton = h(false)
           if (!this.okOnly) {
+            const cancelHtml = this.cancelTitleHtml ? { innerHTML: this.cancelTitleHtml } : null
             cancelButton = h(
               BButton,
               {
@@ -767,11 +770,11 @@ export const BModal = /*#__PURE__*/ Vue.extend({
               },
               [
                 this.normalizeSlot('modal-cancel', {}) ||
-                  this.cancelTitleHtml ||
-                  stripTags(this.cancelTitle)
+                  (cancelHtml ? h('span', { domProps: cancelHtml }) : stripTags(this.cancelTitle))
               ]
             )
           }
+          const okHtml = this.okTitleHtml ? { innerHTML: this.okTitleHtml } : null
           const okButton = h(
             BButton,
             {
@@ -782,7 +785,10 @@ export const BModal = /*#__PURE__*/ Vue.extend({
               },
               on: { click: this.onOk }
             },
-            [this.normalizeSlot('modal-ok', {}) || this.okTitleHtml || stripTags(this.okTitle)]
+            [
+              this.normalizeSlot('modal-ok', {}) ||
+                (okHtml ? h('span', { domProps: okHtml }) : stripTags(this.okTitle))
+            ]
           )
           modalFooter = [cancelButton, okButton]
         }

diff --git a/src/components/toast/helpers/bv-toast.js b/src/components/toast/helpers/bv-toast.js
@@ -106,7 +106,7 @@ const plugin = Vue => {
       propsData: {
         ...filterOptions(getComponentConfig('BToast') || {}),
         // Add in (filtered) user supplied props
-        ...omit(props, ['toastContent']),
+        ...omit(props, keys(propsToSlots)),
         // Props that can't be overridden
         static: false,
         visible: true