Merge pull request #921 from open-sausages/pulls/1.4/allow-modal-to-r…

…ender-html-titlewq FIX FormSchema field title can include html, this will sometimes be used to render form modals
silverstripe · Aug 7, 2019 · 76cc4e7 · 76cc4e7
2 parents f0aa1ae + 181dba8
commit 76cc4e7
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
diff --git a/client/dist/js/bundle.js b/client/dist/js/bundle.js
diff --git a/client/dist/js/vendor.js b/client/dist/js/vendor.js
diff --git a/client/src/components/FormBuilderModal/FormBuilderModal.js b/client/src/components/FormBuilderModal/FormBuilderModal.js
@@ -144,9 +144,16 @@ class FormBuilderModal extends Component {
   }
 
   renderHeader() {
-    if (this.props.title !== false) {
+    let { title } = this.props;
+
+    if (title !== false) {
+      if (typeof title === 'object') {
+        // FormSchema title occasionaly contains html, only render text for modal title
+        const doc = new DOMParser().parseFromString(title.html, 'text/html');
+        title = doc.body.textContent || '';
+      }
       return (
-        <ModalHeader toggle={this.handleHide}>{this.props.title}</ModalHeader>
+        <ModalHeader toggle={this.handleHide}>{title}</ModalHeader>
       );
     }
 
@@ -188,7 +195,11 @@ class FormBuilderModal extends Component {
 FormBuilderModal.propTypes = {
   autoFocus: PropTypes.bool,
   isOpen: PropTypes.bool,
-  title: PropTypes.oneOfType([PropTypes.string, PropTypes.bool]),
+  title: PropTypes.oneOfType([
+    PropTypes.string,
+    PropTypes.bool,
+    PropTypes.shape({ html: PropTypes.string })
+  ]),
   className: PropTypes.string,
   bodyClassName: PropTypes.string,
   modalClassName: PropTypes.string,