@danderson00/react-forms 0.0.29 → 0.0.30

package/dist/Form.js

@@ -100,7 +100,7 @@ var Form = function Form(ContextProvider) {
       setValid(form.current.checkValidity());
     };
 
-    var onSubmit = function onSubmit(e, additionalValues) {
+    var onSubmit = function onSubmit(e, additionalValues, additionalArg) {
       fieldValidators.forEach(function (setFieldValidated) {
         return setFieldValidated();
       });
@@ -132,7 +132,8 @@ var Form = function Form(ContextProvider) {
             return result;
           };
 
-          var result = props.onSubmit(mapFieldValues(_objectSpread(_objectSpread({}, fieldValues), additionalValues)));
+          var args = [mapFieldValues(_objectSpread(_objectSpread({}, fieldValues), additionalValues))].concat(_toConsumableArray(additionalArg ? [additionalArg] : []));
+          var result = props.onSubmit.apply(props, _toConsumableArray(args));
 
           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"];
+var _excluded = ["onSubmit", "registerFieldValidator", "setFieldValue", "getFieldValue", "getFieldValues", "valid", "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); }
 
@@ -21,10 +21,6 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
-function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-
-function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -37,9 +33,24 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+
 var _default = function _default(render) {
   return function Submit(props) {
-    if (!props.onSubmit) throw new Error('Button components must be contained within a Form component'); // TODO: set executing when form is triggered by enter key
+    if (!props.onSubmit) throw new Error('Button components must be contained within a Form component');
+
+    var onSubmit = props.onSubmit,
+        registerFieldValidator = props.registerFieldValidator,
+        setFieldValue = props.setFieldValue,
+        getFieldValue = props.getFieldValue,
+        getFieldValues = props.getFieldValues,
+        valid = props.valid,
+        disableInvalid = props.disableInvalid,
+        values = props.values,
+        propsToPass = _objectWithoutProperties(props, _excluded); // TODO: set executing when form is triggered by enter key
+
 
     var _useState = (0, _react.useState)(false),
         _useState2 = _slicedToArray(_useState, 2),
@@ -47,7 +58,7 @@ var _default = function _default(render) {
         setExecuting = _useState2[1];
 
     var onClick = function onClick(e) {
-      var result = props.onSubmit(e);
+      var result = onSubmit(e, values);
 
       if (result && result["finally"] && typeof result["finally"] === 'function') {
         setExecuting(true);
@@ -57,18 +68,9 @@ var _default = function _default(render) {
       }
     };
 
-    var onSubmit = props.onSubmit,
-        registerFieldValidator = props.registerFieldValidator,
-        setFieldValue = props.setFieldValue,
-        getFieldValue = props.getFieldValue,
-        getFieldValues = props.getFieldValues,
-        valid = props.valid,
-        disableInvalid = props.disableInvalid,
-        propsToPass = _objectWithoutProperties(props, _excluded);
-
     var finalProps = _objectSpread(_objectSpread({}, propsToPass), {}, {
       onClick: onClick,
-      disabled: props.disabled || executing || props.disableInvalid && !props.valid
+      disabled: props.disabled || executing || disableInvalid && !valid
     });
 
     return render(finalProps);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@danderson00/react-forms",
-  "version": "0.0.29",
+  "version": "0.0.30",
   "description": "Ultra simple, stateless, validated forms for use in React function components",
   "main": "dist/index.js",
   "module": "src/index.js",
@@ -21,9 +21,9 @@
     "@babel/preset-env": "^7.4.4",
     "@babel/preset-react": "^7.0.0",
     "@wojtekmaj/enzyme-adapter-react-17": "^0.6.1",
-    "babel-jest": "26.6.0",
+    "babel-jest": "26.6.3",
     "enzyme": "^3.9.0",
-    "jest": "26.6.0",
+    "jest": "26.6.3",
     "react": "^17.0.2",
     "react-dom": "^17.0.2"
   },

package/src/Form.js

@@ -27,7 +27,7 @@ const Form = (ContextProvider, additionalContext = {}, ErrorMessage) => (
       setValid(form.current.checkValidity())
     }
 
-    const onSubmit = (e, additionalValues) => {
+    const onSubmit = (e, additionalValues, additionalArg) => {
       fieldValidators.forEach(setFieldValidated => setFieldValidated())
 
       if(form.current.checkValidity() && props.onSubmit) {
@@ -52,7 +52,11 @@ const Form = (ContextProvider, additionalContext = {}, ErrorMessage) => (
             return result
           }
 
-          const result = props.onSubmit(mapFieldValues({ ...fieldValues, ...additionalValues }))
+          const args = [
+            mapFieldValues({ ...fieldValues, ...additionalValues }),
+            ...(additionalArg ? [additionalArg] : [])
+          ]
+          const result = props.onSubmit(...args)
             if(result && typeof result.then === 'function') {
               setFormDisabled(true)
               result

package/src/submit.js

@@ -3,26 +3,26 @@ import React, { useState } from 'react'
 export default render => function Submit(props) {
   if(!props.onSubmit) throw new Error('Button components must be contained within a Form component')
 
+  const {
+    onSubmit, registerFieldValidator, setFieldValue, getFieldValue, getFieldValues,
+    valid, disableInvalid, values, ...propsToPass
+  } = props
+
   // TODO: set executing when form is triggered by enter key
   const [executing, setExecuting] = useState(false)
 
   const onClick = e => {
-    const result = props.onSubmit(e)
+    const result = onSubmit(e, values)
     if(result && result.finally && typeof result.finally === 'function') {
       setExecuting(true)
       result.finally(() => setExecuting(false))
     }
   }
 
-  const {
-    onSubmit, registerFieldValidator, setFieldValue, getFieldValue, getFieldValues,
-    valid, disableInvalid, ...propsToPass
-  } = props
-
   const finalProps = {
     ...propsToPass,
     onClick,
-    disabled: props.disabled || executing || (props.disableInvalid && !props.valid)
+    disabled: props.disabled || executing || (disableInvalid && !valid)
   }
 
   return render(finalProps)