@danderson00/react-forms 0.0.30 → 0.0.31

package/dist/Form.js

@@ -100,12 +100,14 @@ var Form = function Form(ContextProvider) {
       setValid(form.current.checkValidity());
     };
 
-    var onSubmit = function onSubmit(e, additionalValues, additionalArg) {
+    var onSubmit = function onSubmit(e, additionalValues) {
+      var submitOptions = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+      var validate = submitOptions.validate;
       fieldValidators.forEach(function (setFieldValidated) {
         return setFieldValidated();
       });
 
-      if (form.current.checkValidity() && props.onSubmit) {
+      if ((validate === false || form.current.checkValidity()) && props.onSubmit) {
         setError(undefined);
         var interactiveElements = form.current.querySelectorAll('input,button,textarea,select');
 
@@ -132,8 +134,7 @@ var Form = function Form(ContextProvider) {
             return result;
           };
 
-          var args = [mapFieldValues(_objectSpread(_objectSpread({}, fieldValues), additionalValues))].concat(_toConsumableArray(additionalArg ? [additionalArg] : []));
-          var result = props.onSubmit.apply(props, _toConsumableArray(args));
+          var result = props.onSubmit(mapFieldValues(_objectSpread(_objectSpread({}, fieldValues), additionalValues)));
 
           if (result && typeof result.then === 'function') {
             setFormDisabled(true);

package/dist/submit.js

@@ -9,7 +9,7 @@ exports["default"] = void 0;
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _excluded = ["onSubmit", "registerFieldValidator", "setFieldValue", "getFieldValue", "getFieldValues", "valid", "disableInvalid", "values"];
+var _excluded = ["onSubmit", "registerFieldValidator", "setFieldValue", "getFieldValue", "getFieldValues", "valid", "validate", "disableInvalid", "values"];
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
@@ -47,6 +47,7 @@ var _default = function _default(render) {
         getFieldValue = props.getFieldValue,
         getFieldValues = props.getFieldValues,
         valid = props.valid,
+        validate = props.validate,
         disableInvalid = props.disableInvalid,
         values = props.values,
         propsToPass = _objectWithoutProperties(props, _excluded); // TODO: set executing when form is triggered by enter key
@@ -58,7 +59,9 @@ var _default = function _default(render) {
         setExecuting = _useState2[1];
 
     var onClick = function onClick(e) {
-      var result = onSubmit(e, values);
+      var result = onSubmit(e, values, {
+        validate: validate
+      });
 
       if (result && result["finally"] && typeof result["finally"] === 'function') {
         setExecuting(true);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@danderson00/react-forms",
-  "version": "0.0.30",
+  "version": "0.0.31",
   "description": "Ultra simple, stateless, validated forms for use in React function components",
   "main": "dist/index.js",
   "module": "src/index.js",

package/src/Form.js

@@ -27,10 +27,12 @@ const Form = (ContextProvider, additionalContext = {}, ErrorMessage) => (
       setValid(form.current.checkValidity())
     }
 
-    const onSubmit = (e, additionalValues, additionalArg) => {
+    const onSubmit = (e, additionalValues, submitOptions = {}) => {
+      const { validate } = submitOptions
+
       fieldValidators.forEach(setFieldValidated => setFieldValidated())
 
-      if(form.current.checkValidity() && props.onSubmit) {
+      if((validate === false || form.current.checkValidity()) && props.onSubmit) {
         setError(undefined)
 
         const interactiveElements = form.current.querySelectorAll('input,button,textarea,select')
@@ -52,11 +54,7 @@ const Form = (ContextProvider, additionalContext = {}, ErrorMessage) => (
             return result
           }
 
-          const args = [
-            mapFieldValues({ ...fieldValues, ...additionalValues }),
-            ...(additionalArg ? [additionalArg] : [])
-          ]
-          const result = props.onSubmit(...args)
+          const result = props.onSubmit(mapFieldValues({ ...fieldValues, ...additionalValues }))
             if(result && typeof result.then === 'function') {
               setFormDisabled(true)
               result

package/src/submit.js

@@ -5,14 +5,14 @@ export default render => function Submit(props) {
 
   const {
     onSubmit, registerFieldValidator, setFieldValue, getFieldValue, getFieldValues,
-    valid, disableInvalid, values, ...propsToPass
+    valid, validate, disableInvalid, values, ...propsToPass
   } = props
 
   // TODO: set executing when form is triggered by enter key
   const [executing, setExecuting] = useState(false)
 
   const onClick = e => {
-    const result = onSubmit(e, values)
+    const result = onSubmit(e, values, { validate })
     if(result && result.finally && typeof result.finally === 'function') {
       setExecuting(true)
       result.finally(() => setExecuting(false))