@dhis2/ui-forms 8.2.0 → 8.2.1

package/build/es/SingleSelectFieldFF/SingleSelectFieldFF.stories.js

@@ -3,33 +3,7 @@ import { Field } from 'react-final-form';
 import { formDecorator } from '../formDecorator.js';
 import { inputArgType, metaArgType } from '../shared/propTypes.js';
 import { SingleSelectFieldFF } from './SingleSelectFieldFF.js';
-const description = `
-The \`SingleSelectFieldFF\` is a wrapper around a \`SingleSelectField\` that enables it to work with Final Form, the preferred library for form validation and utilities in DHIS 2 apps.
-
-#### Final Form
-
-See how to use Final Form at [Final Form - Getting Started](https://final-form.org/docs/react-final-form/getting-started).
-
-Inside a Final Form \`<Form>\` component, these 'FF' UI components are intended to be used in the \`component\` prop of the [Final Form \`<Field>\` components](https://final-form.org/docs/react-final-form/api/Field) where they will receive some props from the Field, e.g. \`<Field component={SingleSelectFieldFF} />\`.  See the code samples below for examples.
-
-#### Props
-
-The props shown in the table below are generally provided to the \`SingleSelectFieldFF\` wrapper by the Final Form \`Field\`.
-
-Note that any props beyond the API of the \`Field\` component will be spread to the \`SingleSelectFieldFF\`, which passes any extra props to the underlying \`SingleSelectField\` using \`{...rest}\`.
-
-Therefore, to add any props to the \`SingleSelectFieldFF\` or \`SingleSelectField\`, add those props to the parent Final Form \`Field\` component.
-
-Also see \`SingleSelect\` and \`SingleSelectField\` for notes about props and implementation.
-
-\`\`\`js
-import { SingleSelectFieldFF } from '@dhis2/ui'
-\`\`\`
-
-Press **Submit** to see the form values logged to the console.
-
-_**Note:** Dropdowns may not appear correctly on this page. See the affected demos in the 'Canvas' tab for propper dropdown placement._
-`;
+const description = "\nThe `SingleSelectFieldFF` is a wrapper around a `SingleSelectField` that enables it to work with Final Form, the preferred library for form validation and utilities in DHIS 2 apps.\n\n#### Final Form\n\nSee how to use Final Form at [Final Form - Getting Started](https://final-form.org/docs/react-final-form/getting-started).\n\nInside a Final Form `<Form>` component, these 'FF' UI components are intended to be used in the `component` prop of the [Final Form `<Field>` components](https://final-form.org/docs/react-final-form/api/Field) where they will receive some props from the Field, e.g. `<Field component={SingleSelectFieldFF} />`.  See the code samples below for examples.\n\n#### Props\n\nThe props shown in the table below are generally provided to the `SingleSelectFieldFF` wrapper by the Final Form `Field`.\n\nNote that any props beyond the API of the `Field` component will be spread to the `SingleSelectFieldFF`, which passes any extra props to the underlying `SingleSelectField` using `{...rest}`.\n\nTherefore, to add any props to the `SingleSelectFieldFF` or `SingleSelectField`, add those props to the parent Final Form `Field` component.\n\nAlso see `SingleSelect` and `SingleSelectField` for notes about props and implementation.\n\n```js\nimport { SingleSelectFieldFF } from '@dhis2/ui'\n```\n\nPress **Submit** to see the form values logged to the console.\n\n_**Note:** Dropdowns may not appear correctly on this page. See the affected demos in the 'Canvas' tab for propper dropdown placement._\n";
 const options = [{
   value: '1',
   label: 'one'
@@ -62,7 +36,7 @@ const options = [{
   label: 'ten'
 }];
 export default {
-  title: 'Forms/Single Select/Single Select Field (Final Form)',
+  title: 'Single Select Field (Final Form)',
   component: SingleSelectFieldFF,
   decorators: [formDecorator],
   parameters: {

package/build/es/SwitchFieldFF/SwitchFieldFF.js

@@ -5,27 +5,30 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import { createToggleChangeHandler, createFocusHandler, createBlurHandler, hasError, isValid, getValidationText } from '../shared/helpers.js';
 import { metaPropType, inputPropType } from '../shared/propTypes.js';
-export const SwitchFieldFF = ({
-  error,
-  input,
-  meta,
-  showValidStatus,
-  valid,
-  validationText,
-  onBlur,
-  onFocus,
-  ...rest
-}) => /*#__PURE__*/React.createElement(SwitchField, _extends({}, rest, {
-  checked: input.checked,
-  name: input.name,
-  value: input.value,
-  error: hasError(meta, error),
-  valid: isValid(meta, valid, showValidStatus),
-  validationText: getValidationText(meta, validationText, error),
-  onFocus: createFocusHandler(input, onFocus),
-  onChange: createToggleChangeHandler(input),
-  onBlur: createBlurHandler(input, onBlur)
-}));
+export const SwitchFieldFF = _ref => {
+  let {
+    error,
+    input,
+    meta,
+    showValidStatus,
+    valid,
+    validationText,
+    onBlur,
+    onFocus,
+    ...rest
+  } = _ref;
+  return /*#__PURE__*/React.createElement(SwitchField, _extends({}, rest, {
+    checked: input.checked,
+    name: input.name,
+    value: input.value,
+    error: hasError(meta, error),
+    valid: isValid(meta, valid, showValidStatus),
+    validationText: getValidationText(meta, validationText, error),
+    onFocus: createFocusHandler(input, onFocus),
+    onChange: createToggleChangeHandler(input),
+    onBlur: createBlurHandler(input, onBlur)
+  }));
+};
 SwitchFieldFF.propTypes = {
   /** `input` props received from Final Form `Field` */
   input: inputPropType.isRequired,

package/build/es/SwitchFieldFF/SwitchFieldFF.stories.js

@@ -4,33 +4,9 @@ import { formDecorator } from '../formDecorator.js';
 import { inputArgType, metaArgType } from '../shared/propTypes.js';
 import { hasValue } from '../validators/index.js';
 import { SwitchFieldFF } from './SwitchFieldFF.js';
-const description = `
-The \`SwitchFieldFF\` is a wrapper around a \`SwitchField\` that enables it to work with Final Form, the preferred library for form validation and utilities in DHIS 2 apps.
-
-#### Final Form
-
-See how to use Final Form at [Final Form - Getting Started](https://final-form.org/docs/react-final-form/getting-started).
-
-Inside a Final Form \`<Form>\` component, these 'FF' UI components are intended to be used in the \`component\` prop of the [Final Form \`<Field>\` components](https://final-form.org/docs/react-final-form/api/Field) where they will receive some props from the Field, e.g. \`<Field component={SwitchFieldFF} />\`.  See the code samples below for examples.
-
-#### Props
-
-The props shown in the table below are generally provided to the \`SwitchFieldFF\` wrapper by the Final Form \`Field\`.
-
-Note that any props beyond the API of the \`Field\` component will be spread to the \`SwitchFieldFF\`, which passes any extra props to the underlying \`SwitchField\` using \`{...rest}\`.
-
-Therefore, to add any props to the \`SwitchFieldFF\` or \`SwitchField\`, add those props to the parent Final Form \`Field\` component.
-
-Also see \`Switch\` and \`SwitchField\` for notes about props and implementation.
-
-\`\`\`js
-import { SwitchFieldFF } from '@dhis2/ui'
-\`\`\`
-
-Press **Submit** to see the form values logged to the console.
-`;
+const description = "\nThe `SwitchFieldFF` is a wrapper around a `SwitchField` that enables it to work with Final Form, the preferred library for form validation and utilities in DHIS 2 apps.\n\n#### Final Form\n\nSee how to use Final Form at [Final Form - Getting Started](https://final-form.org/docs/react-final-form/getting-started).\n\nInside a Final Form `<Form>` component, these 'FF' UI components are intended to be used in the `component` prop of the [Final Form `<Field>` components](https://final-form.org/docs/react-final-form/api/Field) where they will receive some props from the Field, e.g. `<Field component={SwitchFieldFF} />`.  See the code samples below for examples.\n\n#### Props\n\nThe props shown in the table below are generally provided to the `SwitchFieldFF` wrapper by the Final Form `Field`.\n\nNote that any props beyond the API of the `Field` component will be spread to the `SwitchFieldFF`, which passes any extra props to the underlying `SwitchField` using `{...rest}`.\n\nTherefore, to add any props to the `SwitchFieldFF` or `SwitchField`, add those props to the parent Final Form `Field` component.\n\nAlso see `Switch` and `SwitchField` for notes about props and implementation.\n\n```js\nimport { SwitchFieldFF } from '@dhis2/ui'\n```\n\nPress **Submit** to see the form values logged to the console.\n";
 export default {
-  title: 'Forms/Switch/Switch Field (Final Form)',
+  title: 'Switch Field (Final Form)',
   component: SwitchFieldFF,
   decorators: [formDecorator],
   parameters: {

package/build/es/TextAreaFieldFF/TextAreaFieldFF.js

@@ -5,29 +5,32 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import { createChangeHandler, createFocusHandler, createBlurHandler, hasError, isLoading, isValid, getValidationText } from '../shared/helpers.js';
 import { metaPropType, inputPropType } from '../shared/propTypes.js';
-export const TextAreaFieldFF = ({
-  input,
-  meta,
-  error,
-  showValidStatus,
-  valid,
-  validationText,
-  onBlur,
-  onFocus,
-  loading,
-  showLoadingStatus,
-  ...rest
-}) => /*#__PURE__*/React.createElement(TextAreaField, _extends({}, rest, {
-  name: input.name,
-  error: hasError(meta, error),
-  valid: isValid(meta, valid, showValidStatus),
-  loading: isLoading(meta, loading, showLoadingStatus),
-  validationText: getValidationText(meta, validationText, error),
-  onFocus: createFocusHandler(input, onFocus),
-  onChange: createChangeHandler(input),
-  onBlur: createBlurHandler(input, onBlur),
-  value: input.value
-}));
+export const TextAreaFieldFF = _ref => {
+  let {
+    input,
+    meta,
+    error,
+    showValidStatus,
+    valid,
+    validationText,
+    onBlur,
+    onFocus,
+    loading,
+    showLoadingStatus,
+    ...rest
+  } = _ref;
+  return /*#__PURE__*/React.createElement(TextAreaField, _extends({}, rest, {
+    name: input.name,
+    error: hasError(meta, error),
+    valid: isValid(meta, valid, showValidStatus),
+    loading: isLoading(meta, loading, showLoadingStatus),
+    validationText: getValidationText(meta, validationText, error),
+    onFocus: createFocusHandler(input, onFocus),
+    onChange: createChangeHandler(input),
+    onBlur: createBlurHandler(input, onBlur),
+    value: input.value
+  }));
+};
 TextAreaFieldFF.propTypes = {
   /** `input` props received from Final Form `Field` */
   input: inputPropType.isRequired,

package/build/es/TextAreaFieldFF/TextAreaFieldFF.stories.js

@@ -4,33 +4,9 @@ import { formDecorator } from '../formDecorator.js';
 import { inputArgType, metaArgType } from '../shared/propTypes.js';
 import { hasValue } from '../validators/index.js';
 import { TextAreaFieldFF } from './TextAreaFieldFF.js';
-const description = `
-The \`TextAreaFieldFF\` is a wrapper around a \`TextAreaField\` that enables it to work with Final Form, the preferred library for form validation and utilities in DHIS 2 apps.
-
-#### Final Form
-
-See how to use Final Form at [Final Form - Getting Started](https://final-form.org/docs/react-final-form/getting-started).
-
-Inside a Final Form \`<Form>\` component, these 'FF' UI components are intended to be used in the \`component\` prop of the [Final Form \`<Field>\` components](https://final-form.org/docs/react-final-form/api/Field) where they will receive some props from the Field, e.g. \`<Field component={TextAreaFieldFF} />\`.  See the code samples below for examples.
-
-#### Props
-
-The props shown in the table below are generally provided to the \`TextAreaFieldFF\` wrapper by the Final Form \`Field\`.
-
-Note that any props beyond the API of the \`Field\` component will be spread to the \`TextAreaFieldFF\`, which passes any extra props to the underlying \`TextAreaField\` using \`{...rest}\`.
-
-Therefore, to add any props to the \`TextAreaFieldFF\` or \`TextAreaField\`, add those props to the parent Final Form \`Field\` component.
-
-Also see \`TextArea\` and \`TextAreaField\` for notes about props and implementation.
-
-\`\`\`js
-import { TextAreaFieldFF } from '@dhis2/ui'
-\`\`\`
-
-Press **Submit** to see the form values logged to the console.
-`;
+const description = "\nThe `TextAreaFieldFF` is a wrapper around a `TextAreaField` that enables it to work with Final Form, the preferred library for form validation and utilities in DHIS 2 apps.\n\n#### Final Form\n\nSee how to use Final Form at [Final Form - Getting Started](https://final-form.org/docs/react-final-form/getting-started).\n\nInside a Final Form `<Form>` component, these 'FF' UI components are intended to be used in the `component` prop of the [Final Form `<Field>` components](https://final-form.org/docs/react-final-form/api/Field) where they will receive some props from the Field, e.g. `<Field component={TextAreaFieldFF} />`.  See the code samples below for examples.\n\n#### Props\n\nThe props shown in the table below are generally provided to the `TextAreaFieldFF` wrapper by the Final Form `Field`.\n\nNote that any props beyond the API of the `Field` component will be spread to the `TextAreaFieldFF`, which passes any extra props to the underlying `TextAreaField` using `{...rest}`.\n\nTherefore, to add any props to the `TextAreaFieldFF` or `TextAreaField`, add those props to the parent Final Form `Field` component.\n\nAlso see `TextArea` and `TextAreaField` for notes about props and implementation.\n\n```js\nimport { TextAreaFieldFF } from '@dhis2/ui'\n```\n\nPress **Submit** to see the form values logged to the console.\n";
 export default {
-  title: 'Forms/Text Area/Text Area Field (Final Form)',
+  title: 'Text Area Field (Final Form)',
   component: TextAreaFieldFF,
   decorators: [formDecorator],
   parameters: {

package/build/es/formDecorator.js

@@ -12,8 +12,8 @@ const formProps = {
 };
 
 class FormWithSpyAndSubmit extends React.Component {
-  constructor(...args) {
-    super(...args);
+  constructor() {
+    super(...arguments);
 
     _defineProperty(this, "state", {
       cypressProps: {}
@@ -55,9 +55,10 @@ class FormWithSpyAndSubmit extends React.Component {
     }), /*#__PURE__*/React.createElement(Button, {
       primary: true,
       type: "submit"
-    }, "Submit"), /*#__PURE__*/React.createElement(FormSpy, null, ({
-      values
-    }) => {
+    }, "Submit"), /*#__PURE__*/React.createElement(FormSpy, null, _ref => {
+      let {
+        values
+      } = _ref;
       window.formValues = values;
       return /*#__PURE__*/React.createElement("span", {
         className: "form-spy-internal"

package/build/es/locales/en/translations.json

@@ -2,7 +2,6 @@
     "Upload file": "Upload file",
     "Upload files": "Upload files",
     "Remove": "Remove",
-    "No file(s) selected yet": "No file(s) selected yet",
     "Please provide an alpha-numeric value": "Please provide an alpha-numeric value",
     "Please provide a boolean value": "Please provide a boolean value",
     "Please enter between {{lowerBound}} and {{upperBound}} characters": "Please enter between {{lowerBound}} and {{upperBound}} characters",

package/build/es/shared/helpers/createChangeHandler.js

@@ -1,21 +1,24 @@
 const PRIMITIVE_TYPES = new Set(['string', 'number', 'boolean']);
 
-const createChangeHandler = ({
-  onChange
-}) => payload => {
-  if (payload && 'value' in payload) {
-    // ui event signature
-    onChange(payload.value);
-  } else if (payload && payload.target && 'value' in payload.target) {
-    // synthetic event
-    onChange(payload.target.value);
-  } else if (PRIMITIVE_TYPES.has(typeof payload)) {
-    // directly usable value
-    onChange(payload);
-  } else {
-    // ¯\_(ツ)_/¯
-    throw new Error('Could not process event payload');
-  }
+const createChangeHandler = _ref => {
+  let {
+    onChange
+  } = _ref;
+  return payload => {
+    if (payload && 'value' in payload) {
+      // ui event signature
+      onChange(payload.value);
+    } else if (payload && payload.target && 'value' in payload.target) {
+      // synthetic event
+      onChange(payload.target.value);
+    } else if (PRIMITIVE_TYPES.has(typeof payload)) {
+      // directly usable value
+      onChange(payload);
+    } else {
+      // ¯\_(ツ)_/¯
+      throw new Error('Could not process event payload');
+    }
+  };
 };
 
 export { createChangeHandler };

package/build/es/shared/helpers/createSelectChangeHandler.js

@@ -1,9 +1,13 @@
-const createSelectChangeHandler = ({
-  onChange
-}) => ({
-  selected
-}) => {
-  onChange(selected);
+const createSelectChangeHandler = _ref => {
+  let {
+    onChange
+  } = _ref;
+  return _ref2 => {
+    let {
+      selected
+    } = _ref2;
+    onChange(selected);
+  };
 };
 
 export { createSelectChangeHandler };

package/build/es/transformers/arrayWithIdObjects.js

@@ -1,6 +1,9 @@
-const format = value => !value ? [] : value.map(({
-  id
-}) => id);
+const format = value => !value ? [] : value.map(_ref => {
+  let {
+    id
+  } = _ref;
+  return id;
+});
 
 const parse = value => !value || Array.isArray(value) && value.length === 0 ? undefined : value.map(id => ({
   id

package/build/es/validators/__tests__/createPattern.test.js

@@ -20,7 +20,7 @@ describe('validator: createPattern', () => {
   });
   it('should return an error string when input does not match the pattern', () => {
     const escapedRegexString = '/^test$/';
-    const invalidMsg = `Please make sure the value of this input matches the pattern ${escapedRegexString}.`;
+    const invalidMsg = "Please make sure the value of this input matches the pattern ".concat(escapedRegexString, ".");
     expect(equalToTestPattern('bad input')).toEqual(invalidMsg);
   });
   it('should return an custon error string when one was provided and input does not match the pattern', () => {

package/build/es/validators/composeValidators.js

@@ -1,5 +1,13 @@
-export const composeValidators = (...validators) => {
-  return (...args) => {
+export const composeValidators = function () {
+  for (var _len = arguments.length, validators = new Array(_len), _key = 0; _key < _len; _key++) {
+    validators[_key] = arguments[_key];
+  }
+
+  return function () {
+    for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
+      args[_key2] = arguments[_key2];
+    }
+
     return validators.reduce((error, validator) => error || validator(...args), undefined);
   };
 };

package/build/es/validators/test-helpers/index.js

@@ -4,7 +4,7 @@ const testValidatorValues = (validator, returnValue, values) => {
   for (const value of values) {
     const type = typeof value;
     const valueStr = type === 'object' ? JSON.stringify(value) : value;
-    it(`should return ${returnValueStr} for value \`${valueStr}\` of type ${type}`, () => {
+    it("should return ".concat(returnValueStr, " for value `").concat(valueStr, "` of type ").concat(type), () => {
       expect(validator(value)).toBe(returnValue);
     });
   }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@dhis2/ui-forms",
-    "version": "8.2.0",
+    "version": "8.2.1",
     "main": "./build/cjs/index.js",
     "module": "./build/es/index.js",
     "sideEffects": [
@@ -34,15 +34,15 @@
     },
     "dependencies": {
         "@dhis2/prop-types": "^3.0.0-beta.1",
-        "@dhis2-ui/button": "8.2.0",
-        "@dhis2-ui/checkbox": "8.2.0",
-        "@dhis2-ui/field": "8.2.0",
-        "@dhis2-ui/file-input": "8.2.0",
-        "@dhis2-ui/input": "8.2.0",
-        "@dhis2-ui/radio": "8.2.0",
-        "@dhis2-ui/select": "8.2.0",
-        "@dhis2-ui/switch": "8.2.0",
-        "@dhis2-ui/text-area": "8.2.0",
+        "@dhis2-ui/button": "8.2.1",
+        "@dhis2-ui/checkbox": "8.2.1",
+        "@dhis2-ui/field": "8.2.1",
+        "@dhis2-ui/file-input": "8.2.1",
+        "@dhis2-ui/input": "8.2.1",
+        "@dhis2-ui/radio": "8.2.1",
+        "@dhis2-ui/select": "8.2.1",
+        "@dhis2-ui/switch": "8.2.1",
+        "@dhis2-ui/text-area": "8.2.1",
         "classnames": "^2.3.1",
         "final-form": "^4.20.2",
         "prop-types": "^15.7.2",