@danderson00/react-forms 0.0.37 → 0.0.38

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/dist/input.js +2 -1
  2. package/dist/input.js.map +1 -1
  3. package/package.json +1 -1
  4. package/src/input.js +1 -1
package/dist/input.js CHANGED
@@ -15,7 +15,7 @@ var _inputTypes = _interopRequireDefault(require("./inputTypes"));
15
15
 
16
16
  var _throttle2 = _interopRequireDefault(require("./throttle"));
17
17
 
18
- var _excluded = ["type", "value", "checked", "defaultValue", "numeric", "onSubmit", "registerFieldValidator", "setFieldValue", "getFieldValue", "getFieldValues", "submitOnChange", "submitOnBlur", "selectOnFocus", "throttle", "valid"];
18
+ var _excluded = ["type", "value", "checked", "defaultValue", "numeric", "onSubmit", "registerFieldValidator", "setFieldValue", "getFieldValue", "getFieldValues", "submitOnChange", "submitOnBlur", "selectOnFocus", "throttle", "valid", "onValidated"];
19
19
 
20
20
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
21
21
 
@@ -251,6 +251,7 @@ var _default = function _default(render) {
251
251
  selectOnFocus = props.selectOnFocus,
252
252
  _throttle = props.throttle,
253
253
  valid = props.valid,
254
+ onValidated = props.onValidated,
254
255
  passThroughProps = _objectWithoutProperties(props, _excluded);
255
256
 
256
257
  var valueProps = getValueProps({
package/dist/input.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"sources":["../src/input.js"],"names":["nextElementId","id","render","options","Input","props","name","Error","setFieldValue","fieldValidated","setFieldValidated","error","setError","previousValueProp","value","groups","throttle","onSubmit","map","group","submitHandler","isNaN","getFieldValue","registerFieldValidator","setInitialValue","applyValueTransforms","undefined","set","element","document","querySelector","updateValidationState","onChange","args","event","submitOnChange","valueFromEvent","getOutputValue","elementValue","apply","target","checkValidity","additionalValues","onBlur","submitOnBlur","onFocus","selectOnFocus","selectText","selectionStart","selectionEnd","length","setTimeout","onKeyDown","numeric","exec","key","includes","keyCode","preventDefault","invalid","Boolean","onValidated","passErrorProp","getValueProps","type","checked","defaultValue","getFieldValues","valid","passThroughProps","valueProps","currentValue","numericProps","typeProps","errorProps","className","finalProps"],"mappings":"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","sourcesContent":["import { useState, useEffect } from 'react'\nimport usePrevious from './usePrevious'\nimport useUpdate from './useUpdate'\nimport types from './inputTypes'\nimport createThrottled from './throttle'\n\nconst nextElementId = (id => () => `react-forms-${++id}`)(0)\n\nexport default (render, options = {}) => function Input(props) {\n if (!props.name) throw new Error(\"You must provide a name prop to form components\")\n if (!props.setFieldValue) throw new Error(\"Input components must be contained within a Form component\")\n\n const [fieldValidated, setFieldValidated] = useState(false)\n const [error, setError] = useState(false)\n const [id] = useState(props.id || nextElementId())\n const previousValueProp = usePrevious(props.value)\n\n // this is currently broken :-\\\n const { groups = [], throttle, onSubmit } = props\n const name = groups.map(group => group + '.') + props.name\n const submitHandler = (throttle && onSubmit) ? createThrottled(onSubmit, isNaN(throttle) ? 200 : throttle) : onSubmit\n\n useEffect(() => {\n const { getFieldValue, setFieldValue, registerFieldValidator } = props\n const { setInitialValue, applyValueTransforms } = types(props, options)\n\n // don't override values that were set from passing a values prop to the form\n if(getFieldValue(name) === undefined) {\n // TODO: change setter to a getter and return a private `UNSET` symbol to indicate not to call the field setter\n // this allows us to set the default value with useState above and not have an initial render cycle without the default value\n // BUT... to get the default value of a select list, we need to render it first? dilemma....\n\n setInitialValue({\n // pass a setter function - radio buttons do not always want to set a value!\n set: value => setFieldValue(name, applyValueTransforms(value)),\n element: document.querySelector(`#${id}`)\n })\n }\n registerFieldValidator(updateValidationState)\n\n // TODO: need to unregister in case of dynamic form elements\n }, [])\n\n // ensure form values are updated to reflect passed `value` prop\n // this probably introduces some redundancy with the onChange handler below\n useUpdate(() => {\n const { value, setFieldValue } = props\n const { applyValueTransforms } = types(props, options)\n\n if(value !== previousValueProp) {\n setFieldValue(name, applyValueTransforms(value))\n }\n }, [props])\n\n // TODO: refactor bubbling to prop pattern\n const onChange = (...args) => {\n const [event] = args\n const { setFieldValue, onChange, submitOnChange } = props\n const { valueFromEvent } = options\n const { getOutputValue, applyValueTransforms } = types(props, options)\n\n const elementValue = valueFromEvent\n ? valueFromEvent.apply(null, args)\n : getOutputValue({ event })\n\n setFieldValue(name, applyValueTransforms(elementValue))\n\n if(event && event.target && event.target.checkValidity) {\n event.target.checkValidity()\n updateValidationState()\n }\n\n if(onChange) {\n onChange.apply(event.target, args)\n }\n\n if(submitOnChange && submitHandler) {\n // the setFieldValue above sets state on the Form component, used in the onSubmit handler\n // setting state requires an additional render cycle - we need to pass in the new value so it's set correctly\n submitHandler(undefined, { additionalValues: { [name]: applyValueTransforms(elementValue) } })\n }\n }\n\n const onBlur = (...args) => {\n const { submitOnBlur, onSubmit, onBlur } = props\n const [event] = args\n\n if(submitOnBlur) {\n onSubmit()\n }\n if(onBlur) {\n onBlur.apply(event.target, args)\n }\n }\n\n const onFocus = (...args) => {\n const { selectOnFocus, onFocus } = props\n const [event] = args\n const element = event.target\n\n const selectText = () => {\n element.selectionStart = 0\n element.selectionEnd = element.value.length\n }\n\n if(selectOnFocus) {\n selectText()\n setTimeout(selectText)\n }\n if(onFocus) {\n onFocus.apply(element, args)\n }\n }\n\n const onKeyDown = (...args) => {\n const { onKeyDown } = props\n const [event] = args\n const element = event.target\n \n if(props.numeric && !/[0-9-]/.exec(event.key) && ![null, 0, 8, 9, 13, 27, 35, 36, 37, 39, 46].includes(event.keyCode)) {\n event.preventDefault()\n }\n\n if(onKeyDown) {\n onKeyDown.apply(element, args)\n }\n }\n\n const updateValidationState = () => {\n setFieldValidated(true)\n // this is a little hacky, but the simplest way I could think of to determine the\n // validity of the actual input element. :invalid is also not supported by enzyme\n const invalid = Boolean(document.querySelector(`#${id}:invalid`))\n setError(invalid)\n props.onValidated && props.onValidated(!invalid)\n }\n\n /* render */ {\n const { passErrorProp } = options\n const { getValueProps } = types(props, options)\n\n const {\n type, value, checked, defaultValue, numeric,\n onSubmit, registerFieldValidator, setFieldValue, getFieldValue, getFieldValues,\n submitOnChange, submitOnBlur, selectOnFocus, throttle, valid,\n ...passThroughProps\n } = props\n const valueProps = getValueProps({ currentValue: getFieldValue(name) })\n const numericProps = (numeric && { type: 'number' })\n const typeProps = (type && { type })\n const errorProps = (passErrorProp && { error })\n const className = ((fieldValidated ? 'validated ' : '') + (props.className || '') || undefined)\n\n const finalProps = {\n id, name, className,\n ...passThroughProps, ...valueProps, ...numericProps, ...typeProps, ...errorProps,\n onChange, onFocus, onBlur, onKeyDown\n }\n\n return render(finalProps)\n }\n}"],"file":"input.js"}
1
+ {"version":3,"sources":["../src/input.js"],"names":["nextElementId","id","render","options","Input","props","name","Error","setFieldValue","fieldValidated","setFieldValidated","error","setError","previousValueProp","value","groups","throttle","onSubmit","map","group","submitHandler","isNaN","getFieldValue","registerFieldValidator","setInitialValue","applyValueTransforms","undefined","set","element","document","querySelector","updateValidationState","onChange","args","event","submitOnChange","valueFromEvent","getOutputValue","elementValue","apply","target","checkValidity","additionalValues","onBlur","submitOnBlur","onFocus","selectOnFocus","selectText","selectionStart","selectionEnd","length","setTimeout","onKeyDown","numeric","exec","key","includes","keyCode","preventDefault","invalid","Boolean","onValidated","passErrorProp","getValueProps","type","checked","defaultValue","getFieldValues","valid","passThroughProps","valueProps","currentValue","numericProps","typeProps","errorProps","className","finalProps"],"mappings":";;;;;;;AAAA;;AACA;;AACA;;AACA;;AACA;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,IAAMA,aAAa,GAAI,UAAAC,EAAE;AAAA,SAAI;AAAA,iCAAqB,EAAEA,EAAvB;AAAA,GAAJ;AAAA,CAAH,CAAoC,CAApC,CAAtB;;eAEe,kBAACC,MAAD;AAAA,MAASC,OAAT,uEAAmB,EAAnB;AAAA,SAA0B,SAASC,KAAT,CAAeC,KAAf,EAAsB;AAC7D,QAAI,CAACA,KAAK,CAACC,IAAX,EAAiB,MAAM,IAAIC,KAAJ,CAAU,iDAAV,CAAN;AACjB,QAAI,CAACF,KAAK,CAACG,aAAX,EAA0B,MAAM,IAAID,KAAJ,CAAU,4DAAV,CAAN;;AAE1B,oBAA4C,qBAAS,KAAT,CAA5C;AAAA;AAAA,QAAOE,cAAP;AAAA,QAAuBC,iBAAvB;;AACA,qBAA0B,qBAAS,KAAT,CAA1B;AAAA;AAAA,QAAOC,KAAP;AAAA,QAAcC,QAAd;;AACA,qBAAa,qBAASP,KAAK,CAACJ,EAAN,IAAYD,aAAa,EAAlC,CAAb;AAAA;AAAA,QAAOC,EAAP;;AACA,QAAMY,iBAAiB,GAAG,6BAAYR,KAAK,CAACS,KAAlB,CAA1B,CAP6D,CAS7D;;AACA,wBAA4CT,KAA5C,CAAQU,MAAR;AAAA,QAAQA,MAAR,8BAAiB,EAAjB;AAAA,QAAqBC,QAArB,GAA4CX,KAA5C,CAAqBW,QAArB;AAAA,QAA+BC,QAA/B,GAA4CZ,KAA5C,CAA+BY,QAA/B;AACA,QAAMX,IAAI,GAAGS,MAAM,CAACG,GAAP,CAAW,UAAAC,KAAK;AAAA,aAAIA,KAAK,GAAG,GAAZ;AAAA,KAAhB,IAAmCd,KAAK,CAACC,IAAtD;AACA,QAAMc,aAAa,GAAIJ,QAAQ,IAAIC,QAAb,GAAyB,2BAAgBA,QAAhB,EAA0BI,KAAK,CAACL,QAAD,CAAL,GAAkB,GAAlB,GAAwBA,QAAlD,CAAzB,GAAuFC,QAA7G;AAEA,0BAAU,YAAM;AACd,UAAQK,aAAR,GAAiEjB,KAAjE,CAAQiB,aAAR;AAAA,UAAuBd,aAAvB,GAAiEH,KAAjE,CAAuBG,aAAvB;AAAA,UAAsCe,sBAAtC,GAAiElB,KAAjE,CAAsCkB,sBAAtC;;AACA,mBAAkD,4BAAMlB,KAAN,EAAaF,OAAb,CAAlD;AAAA,UAAQqB,eAAR,UAAQA,eAAR;AAAA,UAAyBC,oBAAzB,UAAyBA,oBAAzB,CAFc,CAId;;;AACA,UAAGH,aAAa,CAAChB,IAAD,CAAb,KAAwBoB,SAA3B,EAAsC;AACpC;AACA;AACA;AAEAF,QAAAA,eAAe,CAAC;AACd;AACAG,UAAAA,GAAG,EAAE,aAAAb,KAAK;AAAA,mBAAIN,aAAa,CAACF,IAAD,EAAOmB,oBAAoB,CAACX,KAAD,CAA3B,CAAjB;AAAA,WAFI;AAGdc,UAAAA,OAAO,EAAEC,QAAQ,CAACC,aAAT,YAA2B7B,EAA3B;AAHK,SAAD,CAAf;AAKD;;AACDsB,MAAAA,sBAAsB,CAACQ,qBAAD,CAAtB,CAhBc,CAkBd;AACD,KAnBD,EAmBG,EAnBH,EAd6D,CAmC7D;AACA;;AACA,+BAAU,YAAM;AACd,UAAQjB,KAAR,GAAiCT,KAAjC,CAAQS,KAAR;AAAA,UAAeN,aAAf,GAAiCH,KAAjC,CAAeG,aAAf;;AACA,oBAAiC,4BAAMH,KAAN,EAAaF,OAAb,CAAjC;AAAA,UAAQsB,oBAAR,WAAQA,oBAAR;;AAEA,UAAGX,KAAK,KAAKD,iBAAb,EAAgC;AAC9BL,QAAAA,aAAa,CAACF,IAAD,EAAOmB,oBAAoB,CAACX,KAAD,CAA3B,CAAb;AACD;AACF,KAPD,EAOG,CAACT,KAAD,CAPH,EArC6D,CA8C7D;;AACA,QAAM2B,QAAQ,GAAG,oBAAa;AAAA,wCAATC,IAAS;AAATA,QAAAA,IAAS;AAAA;;AAC5B,UAAOC,KAAP,GAAgBD,IAAhB;AACA,UAAQzB,aAAR,GAAoDH,KAApD,CAAQG,aAAR;AAAA,UAAuBwB,QAAvB,GAAoD3B,KAApD,CAAuB2B,QAAvB;AAAA,UAAiCG,cAAjC,GAAoD9B,KAApD,CAAiC8B,cAAjC;AACA,UAAQC,cAAR,GAA2BjC,OAA3B,CAAQiC,cAAR;;AACA,oBAAiD,4BAAM/B,KAAN,EAAaF,OAAb,CAAjD;AAAA,UAAQkC,cAAR,WAAQA,cAAR;AAAA,UAAwBZ,oBAAxB,WAAwBA,oBAAxB;;AAEA,UAAMa,YAAY,GAAGF,cAAc,GAC/BA,cAAc,CAACG,KAAf,CAAqB,IAArB,EAA2BN,IAA3B,CAD+B,GAE/BI,cAAc,CAAC;AAAEH,QAAAA,KAAK,EAALA;AAAF,OAAD,CAFlB;AAIA1B,MAAAA,aAAa,CAACF,IAAD,EAAOmB,oBAAoB,CAACa,YAAD,CAA3B,CAAb;;AAEA,UAAGJ,KAAK,IAAIA,KAAK,CAACM,MAAf,IAAyBN,KAAK,CAACM,MAAN,CAAaC,aAAzC,EAAwD;AACtDP,QAAAA,KAAK,CAACM,MAAN,CAAaC,aAAb;AACAV,QAAAA,qBAAqB;AACtB;;AAED,UAAGC,QAAH,EAAa;AACXA,QAAAA,QAAQ,CAACO,KAAT,CAAeL,KAAK,CAACM,MAArB,EAA6BP,IAA7B;AACD;;AAED,UAAGE,cAAc,IAAIf,aAArB,EAAoC;AAClC;AACA;AACAA,QAAAA,aAAa,CAACM,SAAD,EAAY;AAAEgB,UAAAA,gBAAgB,sBAAKpC,IAAL,EAAYmB,oBAAoB,CAACa,YAAD,CAAhC;AAAlB,SAAZ,CAAb;AACD;AACF,KA1BD;;AA4BA,QAAMK,MAAM,GAAG,kBAAa;AAC1B,UAAQC,YAAR,GAA2CvC,KAA3C,CAAQuC,YAAR;AAAA,UAAsB3B,QAAtB,GAA2CZ,KAA3C,CAAsBY,QAAtB;AAAA,UAAgC0B,MAAhC,GAA2CtC,KAA3C,CAAgCsC,MAAhC;;AAD0B,yCAATV,IAAS;AAATA,QAAAA,IAAS;AAAA;;AAE1B,UAAOC,KAAP,GAAgBD,IAAhB;;AAEA,UAAGW,YAAH,EAAiB;AACf3B,QAAAA,QAAQ;AACT;;AACD,UAAG0B,MAAH,EAAW;AACTA,QAAAA,MAAM,CAACJ,KAAP,CAAaL,KAAK,CAACM,MAAnB,EAA2BP,IAA3B;AACD;AACF,KAVD;;AAYA,QAAMY,OAAO,GAAG,mBAAa;AAC3B,UAAQC,aAAR,GAAmCzC,KAAnC,CAAQyC,aAAR;AAAA,UAAuBD,OAAvB,GAAmCxC,KAAnC,CAAuBwC,OAAvB;;AAD2B,yCAATZ,IAAS;AAATA,QAAAA,IAAS;AAAA;;AAE3B,UAAOC,KAAP,GAAgBD,IAAhB;AACA,UAAML,OAAO,GAAGM,KAAK,CAACM,MAAtB;;AAEA,UAAMO,UAAU,GAAG,SAAbA,UAAa,GAAM;AACvBnB,QAAAA,OAAO,CAACoB,cAAR,GAAyB,CAAzB;AACApB,QAAAA,OAAO,CAACqB,YAAR,GAAuBrB,OAAO,CAACd,KAAR,CAAcoC,MAArC;AACD,OAHD;;AAKA,UAAGJ,aAAH,EAAkB;AAChBC,QAAAA,UAAU;AACVI,QAAAA,UAAU,CAACJ,UAAD,CAAV;AACD;;AACD,UAAGF,OAAH,EAAY;AACVA,QAAAA,OAAO,CAACN,KAAR,CAAcX,OAAd,EAAuBK,IAAvB;AACD;AACF,KAjBD;;AAmBA,QAAMmB,SAAS,GAAG,qBAAa;AAC7B,UAAQA,SAAR,GAAsB/C,KAAtB,CAAQ+C,SAAR;;AAD6B,yCAATnB,IAAS;AAATA,QAAAA,IAAS;AAAA;;AAE7B,UAAOC,KAAP,GAAgBD,IAAhB;AACA,UAAML,OAAO,GAAGM,KAAK,CAACM,MAAtB;;AAEA,UAAGnC,KAAK,CAACgD,OAAN,IAAiB,CAAC,SAASC,IAAT,CAAcpB,KAAK,CAACqB,GAApB,CAAlB,IAA8C,CAAC,CAAC,IAAD,EAAO,CAAP,EAAU,CAAV,EAAa,CAAb,EAAgB,EAAhB,EAAoB,EAApB,EAAwB,EAAxB,EAA4B,EAA5B,EAAgC,EAAhC,EAAoC,EAApC,EAAwC,EAAxC,EAA4CC,QAA5C,CAAqDtB,KAAK,CAACuB,OAA3D,CAAlD,EAAuH;AACrHvB,QAAAA,KAAK,CAACwB,cAAN;AACD;;AAED,UAAGN,SAAH,EAAc;AACZA,QAAAA,SAAS,CAACb,KAAV,CAAgBX,OAAhB,EAAyBK,IAAzB;AACD;AACF,KAZD;;AAcA,QAAMF,qBAAqB,GAAG,SAAxBA,qBAAwB,GAAM;AAClCrB,MAAAA,iBAAiB,CAAC,IAAD,CAAjB,CADkC,CAElC;AACA;;AACA,UAAMiD,OAAO,GAAGC,OAAO,CAAC/B,QAAQ,CAACC,aAAT,YAA2B7B,EAA3B,cAAD,CAAvB;AACAW,MAAAA,QAAQ,CAAC+C,OAAD,CAAR;AACAtD,MAAAA,KAAK,CAACwD,WAAN,IAAqBxD,KAAK,CAACwD,WAAN,CAAkB,CAACF,OAAnB,CAArB;AACD,KAPD;AASA;;;AAAa;AACX,UAAQG,aAAR,GAA0B3D,OAA1B,CAAQ2D,aAAR;;AACA,oBAA0B,4BAAMzD,KAAN,EAAaF,OAAb,CAA1B;AAAA,UAAQ4D,aAAR,WAAQA,aAAR;;AAEA,UACEC,IADF,GAKI3D,KALJ,CACE2D,IADF;AAAA,UACQlD,KADR,GAKIT,KALJ,CACQS,KADR;AAAA,UACemD,OADf,GAKI5D,KALJ,CACe4D,OADf;AAAA,UACwBC,YADxB,GAKI7D,KALJ,CACwB6D,YADxB;AAAA,UACsCb,OADtC,GAKIhD,KALJ,CACsCgD,OADtC;AAAA,UAEEpC,SAFF,GAKIZ,KALJ,CAEEY,QAFF;AAAA,UAEYM,sBAFZ,GAKIlB,KALJ,CAEYkB,sBAFZ;AAAA,UAEoCf,aAFpC,GAKIH,KALJ,CAEoCG,aAFpC;AAAA,UAEmDc,aAFnD,GAKIjB,KALJ,CAEmDiB,aAFnD;AAAA,UAEkE6C,cAFlE,GAKI9D,KALJ,CAEkE8D,cAFlE;AAAA,UAGEhC,cAHF,GAKI9B,KALJ,CAGE8B,cAHF;AAAA,UAGkBS,YAHlB,GAKIvC,KALJ,CAGkBuC,YAHlB;AAAA,UAGgCE,aAHhC,GAKIzC,KALJ,CAGgCyC,aAHhC;AAAA,UAG+C9B,SAH/C,GAKIX,KALJ,CAG+CW,QAH/C;AAAA,UAGyDoD,KAHzD,GAKI/D,KALJ,CAGyD+D,KAHzD;AAAA,UAGgEP,WAHhE,GAKIxD,KALJ,CAGgEwD,WAHhE;AAAA,UAIKQ,gBAJL,4BAKIhE,KALJ;;AAMA,UAAMiE,UAAU,GAAGP,aAAa,CAAC;AAAEQ,QAAAA,YAAY,EAAEjD,aAAa,CAAChB,IAAD;AAA7B,OAAD,CAAhC;AACA,UAAMkE,YAAY,GAAInB,OAAO,IAAI;AAAEW,QAAAA,IAAI,EAAE;AAAR,OAAjC;AACA,UAAMS,SAAS,GAAIT,IAAI,IAAI;AAAEA,QAAAA,IAAI,EAAJA;AAAF,OAA3B;AACA,UAAMU,UAAU,GAAIZ,aAAa,IAAI;AAAEnD,QAAAA,KAAK,EAALA;AAAF,OAArC;AACA,UAAMgE,SAAS,GAAI,CAAClE,cAAc,GAAG,YAAH,GAAkB,EAAjC,KAAwCJ,KAAK,CAACsE,SAAN,IAAmB,EAA3D,KAAkEjD,SAArF;;AAEA,UAAMkD,UAAU;AACd3E,QAAAA,EAAE,EAAFA,EADc;AACVK,QAAAA,IAAI,EAAJA,IADU;AACJqE,QAAAA,SAAS,EAATA;AADI,SAEXN,gBAFW,GAEUC,UAFV,GAEyBE,YAFzB,GAE0CC,SAF1C,GAEwDC,UAFxD;AAGd1C,QAAAA,QAAQ,EAARA,QAHc;AAGJa,QAAAA,OAAO,EAAPA,OAHI;AAGKF,QAAAA,MAAM,EAANA,MAHL;AAGaS,QAAAA,SAAS,EAATA;AAHb,QAAhB;;AAMA,aAAOlD,MAAM,CAAC0E,UAAD,CAAb;AACD;AACF,GAzJc;AAAA,C","sourcesContent":["import { useState, useEffect } from 'react'\nimport usePrevious from './usePrevious'\nimport useUpdate from './useUpdate'\nimport types from './inputTypes'\nimport createThrottled from './throttle'\n\nconst nextElementId = (id => () => `react-forms-${++id}`)(0)\n\nexport default (render, options = {}) => function Input(props) {\n if (!props.name) throw new Error(\"You must provide a name prop to form components\")\n if (!props.setFieldValue) throw new Error(\"Input components must be contained within a Form component\")\n\n const [fieldValidated, setFieldValidated] = useState(false)\n const [error, setError] = useState(false)\n const [id] = useState(props.id || nextElementId())\n const previousValueProp = usePrevious(props.value)\n\n // this is currently broken :-\\\n const { groups = [], throttle, onSubmit } = props\n const name = groups.map(group => group + '.') + props.name\n const submitHandler = (throttle && onSubmit) ? createThrottled(onSubmit, isNaN(throttle) ? 200 : throttle) : onSubmit\n\n useEffect(() => {\n const { getFieldValue, setFieldValue, registerFieldValidator } = props\n const { setInitialValue, applyValueTransforms } = types(props, options)\n\n // don't override values that were set from passing a values prop to the form\n if(getFieldValue(name) === undefined) {\n // TODO: change setter to a getter and return a private `UNSET` symbol to indicate not to call the field setter\n // this allows us to set the default value with useState above and not have an initial render cycle without the default value\n // BUT... to get the default value of a select list, we need to render it first? dilemma....\n\n setInitialValue({\n // pass a setter function - radio buttons do not always want to set a value!\n set: value => setFieldValue(name, applyValueTransforms(value)),\n element: document.querySelector(`#${id}`)\n })\n }\n registerFieldValidator(updateValidationState)\n\n // TODO: need to unregister in case of dynamic form elements\n }, [])\n\n // ensure form values are updated to reflect passed `value` prop\n // this probably introduces some redundancy with the onChange handler below\n useUpdate(() => {\n const { value, setFieldValue } = props\n const { applyValueTransforms } = types(props, options)\n\n if(value !== previousValueProp) {\n setFieldValue(name, applyValueTransforms(value))\n }\n }, [props])\n\n // TODO: refactor bubbling to prop pattern\n const onChange = (...args) => {\n const [event] = args\n const { setFieldValue, onChange, submitOnChange } = props\n const { valueFromEvent } = options\n const { getOutputValue, applyValueTransforms } = types(props, options)\n\n const elementValue = valueFromEvent\n ? valueFromEvent.apply(null, args)\n : getOutputValue({ event })\n\n setFieldValue(name, applyValueTransforms(elementValue))\n\n if(event && event.target && event.target.checkValidity) {\n event.target.checkValidity()\n updateValidationState()\n }\n\n if(onChange) {\n onChange.apply(event.target, args)\n }\n\n if(submitOnChange && submitHandler) {\n // the setFieldValue above sets state on the Form component, used in the onSubmit handler\n // setting state requires an additional render cycle - we need to pass in the new value so it's set correctly\n submitHandler(undefined, { additionalValues: { [name]: applyValueTransforms(elementValue) } })\n }\n }\n\n const onBlur = (...args) => {\n const { submitOnBlur, onSubmit, onBlur } = props\n const [event] = args\n\n if(submitOnBlur) {\n onSubmit()\n }\n if(onBlur) {\n onBlur.apply(event.target, args)\n }\n }\n\n const onFocus = (...args) => {\n const { selectOnFocus, onFocus } = props\n const [event] = args\n const element = event.target\n\n const selectText = () => {\n element.selectionStart = 0\n element.selectionEnd = element.value.length\n }\n\n if(selectOnFocus) {\n selectText()\n setTimeout(selectText)\n }\n if(onFocus) {\n onFocus.apply(element, args)\n }\n }\n\n const onKeyDown = (...args) => {\n const { onKeyDown } = props\n const [event] = args\n const element = event.target\n \n if(props.numeric && !/[0-9-]/.exec(event.key) && ![null, 0, 8, 9, 13, 27, 35, 36, 37, 39, 46].includes(event.keyCode)) {\n event.preventDefault()\n }\n\n if(onKeyDown) {\n onKeyDown.apply(element, args)\n }\n }\n\n const updateValidationState = () => {\n setFieldValidated(true)\n // this is a little hacky, but the simplest way I could think of to determine the\n // validity of the actual input element. :invalid is also not supported by enzyme\n const invalid = Boolean(document.querySelector(`#${id}:invalid`))\n setError(invalid)\n props.onValidated && props.onValidated(!invalid)\n }\n\n /* render */ {\n const { passErrorProp } = options\n const { getValueProps } = types(props, options)\n\n const {\n type, value, checked, defaultValue, numeric,\n onSubmit, registerFieldValidator, setFieldValue, getFieldValue, getFieldValues,\n submitOnChange, submitOnBlur, selectOnFocus, throttle, valid, onValidated,\n ...passThroughProps\n } = props\n const valueProps = getValueProps({ currentValue: getFieldValue(name) })\n const numericProps = (numeric && { type: 'number' })\n const typeProps = (type && { type })\n const errorProps = (passErrorProp && { error })\n const className = ((fieldValidated ? 'validated ' : '') + (props.className || '') || undefined)\n\n const finalProps = {\n id, name, className,\n ...passThroughProps, ...valueProps, ...numericProps, ...typeProps, ...errorProps,\n onChange, onFocus, onBlur, onKeyDown\n }\n\n return render(finalProps)\n }\n}"],"file":"input.js"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@danderson00/react-forms",
3
- "version": "0.0.37",
3
+ "version": "0.0.38",
4
4
  "description": "Ultra simple, stateless, validated forms for use in React function components",
5
5
  "main": "dist/index.js",
6
6
  "module": "src/index.js",
package/src/input.js CHANGED
@@ -142,7 +142,7 @@ export default (render, options = {}) => function Input(props) {
142
142
  const {
143
143
  type, value, checked, defaultValue, numeric,
144
144
  onSubmit, registerFieldValidator, setFieldValue, getFieldValue, getFieldValues,
145
- submitOnChange, submitOnBlur, selectOnFocus, throttle, valid,
145
+ submitOnChange, submitOnBlur, selectOnFocus, throttle, valid, onValidated,
146
146
  ...passThroughProps
147
147
  } = props
148
148
  const valueProps = getValueProps({ currentValue: getFieldValue(name) })