Merge pull request #1685 from creative-commoners/pulls/2/bypass-entwine

FIX Enable bypassing entwine onsubmit handler

client/src/components/FormBuilder/README.md

@@ -107,3 +107,7 @@ the submission process works as follows:
 
 See [handleSubmit](http://redux-form.com/6.0.5/docs/api/Props.md#-handlesubmit-eventorsubmit-function-) 
 in the redux-form docs for more details.
+
+Note that submissions from a `<FormBuilder>` component that rendered inside part of a regular edit form may
+have their submission event intercepted by entwine by `onsubmit` in `LeftAndMain.EditForm.js`. You
+can add a `bypass-entwine` class to your react component to prevent this behaviour.

client/src/components/Toasts/Toast.js

@@ -47,11 +47,12 @@ const Toast = ({ type, text, onDismiss, dismissed, actions }) => {
 
 Toast.propTypes = {
   ...toastShape,
-  onDismiss: PropTypes.func.isRequired
+  onDismiss: PropTypes.func
 };
 
 Toast.defaultProps = {
-  actions: []
+  actions: [],
+  onDismiss: () => {},
 };
 
 export default Toast;

client/src/legacy/LeftAndMain.EditForm.js

@@ -260,6 +260,11 @@ $.entwine('ss', function($){
      * Suppress submission unless it is handled through ajaxSubmit().
      */
     onsubmit: function(e, button) {
+      // If the submit button a child of on an element with a .bypass-entwine-submission class on it then
+      // skip handling. Usually the element in question will be used by react e.g. FormBuilder
+      if ($(e.target.activeElement).closest('.bypass-entwine-submission').length) {
+        return true;
+      }
       // Only submit if a button is present.
       // This supressed submits from ENTER keys in input fields,
       // which means the browser auto-selects the first available form button.