@dhis2/ui-forms 10.16.3 → 10.16.4

package/build/es/SimpleSingleSelectFieldFF/SimpleSingleSelectFieldFF.js

@@ -5,20 +5,19 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import { createFocusHandler, createBlurHandler, hasError, isLoading, isValid, getValidationText } from '../shared/helpers.js';
 import { inputPropType, metaPropType } from '../shared/propTypes.js';
-export const SimpleSingleSelectFieldFF = _ref => {
-  let {
-    error,
-    input,
-    loading,
-    meta,
-    showLoadingStatus,
-    showValidStatus,
-    valid,
-    validationText,
-    onBlur,
-    onFocus,
-    ...rest
-  } = _ref;
+export const SimpleSingleSelectFieldFF = ({
+  error,
+  input,
+  loading,
+  meta,
+  showLoadingStatus,
+  showValidStatus,
+  valid,
+  validationText,
+  onBlur,
+  onFocus,
+  ...rest
+}) => {
   return /*#__PURE__*/React.createElement(SimpleSingleSelectField, _extends({}, rest, {
     name: input.name,
     error: hasError(meta, error),
@@ -103,12 +102,9 @@ SimpleSingleSelectFieldFF.propTypes = {
    * be used to supply the text to be shown.
    **/
   valueLabel: requiredIf(props => {
-    if (props.options.find(_ref2 => {
-      let {
-        value
-      } = _ref2;
-      return props.value === value;
-    })) {
+    if (props.options.find(({
+      value
+    }) => props.value === value)) {
       return false;
     }
     return props.value;

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

@@ -16,16 +16,13 @@ export default {
     }
   }
 };
-export const Required = (_, _ref) => {
-  let {
-    cypressProps
-  } = _ref;
-  return /*#__PURE__*/React.createElement(Field, {
-    required: true,
-    name: "singleSelect",
-    label: "Single select",
-    component: SingleSelectFieldFF,
-    validate: hasValue,
-    options: cypressProps.options || defaultOptions
-  });
-};
+export const Required = (_, {
+  cypressProps
+}) => /*#__PURE__*/React.createElement(Field, {
+  required: true,
+  name: "singleSelect",
+  label: "Single select",
+  component: SingleSelectFieldFF,
+  validate: hasValue,
+  options: cypressProps.options || defaultOptions
+});

package/build/es/SingleSelectFieldFF/SingleSelectFieldFF.js

@@ -4,21 +4,20 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import { createSelectChangeHandler, createFocusHandler, createBlurHandler, hasError, isLoading, isValid, getValidationText } from '../shared/helpers.js';
 import { inputPropType, metaPropType } from '../shared/propTypes.js';
-export const SingleSelectFieldFF = _ref => {
-  let {
-    error,
-    input,
-    loading,
-    meta,
-    onBlur,
-    onFocus,
-    options,
-    showLoadingStatus,
-    showValidStatus,
-    valid,
-    validationText,
-    ...rest
-  } = _ref;
+export const SingleSelectFieldFF = ({
+  error,
+  input,
+  loading,
+  meta,
+  onBlur,
+  onFocus,
+  options,
+  showLoadingStatus,
+  showValidStatus,
+  valid,
+  validationText,
+  ...rest
+}) => {
   return /*#__PURE__*/React.createElement(SingleSelectField, _extends({}, rest, {
     name: input.name,
     error: hasError(meta, error),

package/build/es/SwitchFieldFF/SwitchFieldFF.js

@@ -4,30 +4,27 @@ 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 = _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)
-  }));
-};
+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)
+}));
 SwitchFieldFF.propTypes = {
   /** `input` props received from Final Form `Field` */
   input: inputPropType.isRequired,

package/build/es/TextAreaFieldFF/TextAreaFieldFF.js

@@ -4,32 +4,29 @@ 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 = _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
-  }));
-};
+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
+}));
 TextAreaFieldFF.propTypes = {
   /** `input` props received from Final Form `Field` */
   input: inputPropType.isRequired,

package/build/es/__tests__/__snapshots__/index.test.js.snap

@@ -2,6 +2,7 @@
 
 exports[`final-form named export should re-export the expected exports 1`] = `
 Array [
+  "default",
   "ARRAY_ERROR",
   "FORM_ERROR",
   "configOptions",
@@ -11,7 +12,6 @@ Array [
   "getIn",
   "setIn",
   "version",
-  "default",
 ]
 `;
 

package/build/es/formDecorator.js

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

package/build/es/locales/index.js

@@ -43,39 +43,78 @@ import viTranslations from './vi/translations.json';
 import zhTranslations from './zh/translations.json';
 import zh_CNTranslations from './zh_CN/translations.json';
 const namespace = 'default';
-i18n.addResources('ar', namespace, arTranslations);
-i18n.addResources('ar_IQ', namespace, ar_IQTranslations);
-i18n.addResources('ckb', namespace, ckbTranslations);
-i18n.addResources('cs', namespace, csTranslations);
-i18n.addResources('da', namespace, daTranslations);
-i18n.addResources('en', namespace, enTranslations);
-i18n.addResources('es', namespace, esTranslations);
-i18n.addResources('es_419', namespace, es_419Translations);
-i18n.addResources('fr', namespace, frTranslations);
-i18n.addResources('hi_IN', namespace, hi_INTranslations);
-i18n.addResources('id', namespace, idTranslations);
-i18n.addResources('km', namespace, kmTranslations);
-i18n.addResources('ko_KR', namespace, ko_KRTranslations);
-i18n.addResources('lo', namespace, loTranslations);
-i18n.addResources('my', namespace, myTranslations);
-i18n.addResources('nb', namespace, nbTranslations);
-i18n.addResources('nl', namespace, nlTranslations);
-i18n.addResources('prs', namespace, prsTranslations);
-i18n.addResources('ps', namespace, psTranslations);
-i18n.addResources('pt', namespace, ptTranslations);
-i18n.addResources('pt_BR', namespace, pt_BRTranslations);
-i18n.addResources('ro', namespace, roTranslations);
-i18n.addResources('ru', namespace, ruTranslations);
-i18n.addResources('si', namespace, siTranslations);
-i18n.addResources('sv', namespace, svTranslations);
-i18n.addResources('tet', namespace, tetTranslations);
-i18n.addResources('tg', namespace, tgTranslations);
-i18n.addResources('uk', namespace, ukTranslations);
-i18n.addResources('ur', namespace, urTranslations);
-i18n.addResources('uz_Latn', namespace, uz_LatnTranslations);
-i18n.addResources('uz_UZ_Cyrl', namespace, uz_UZ_CyrlTranslations);
-i18n.addResources('uz_UZ_Latn', namespace, uz_UZ_LatnTranslations);
-i18n.addResources('vi', namespace, viTranslations);
-i18n.addResources('zh', namespace, zhTranslations);
-i18n.addResources('zh_CN', namespace, zh_CNTranslations);
+
+// Use 'deep' = true and 'overwrite' = false to add to, but not overwrite,
+// custom translations from the datastore (added by the app adapter)
+
+i18n.addResourceBundle('ar', namespace, arTranslations, true, false);
+i18n.addResourceBundle('ar', namespace, arTranslations, true, false);
+i18n.addResourceBundle('ar_IQ', namespace, ar_IQTranslations, true, false);
+i18n.addResourceBundle('ar-IQ', namespace, ar_IQTranslations, true, false);
+i18n.addResourceBundle('ckb', namespace, ckbTranslations, true, false);
+i18n.addResourceBundle('ckb', namespace, ckbTranslations, true, false);
+i18n.addResourceBundle('cs', namespace, csTranslations, true, false);
+i18n.addResourceBundle('cs', namespace, csTranslations, true, false);
+i18n.addResourceBundle('da', namespace, daTranslations, true, false);
+i18n.addResourceBundle('da', namespace, daTranslations, true, false);
+i18n.addResourceBundle('en', namespace, enTranslations, true, false);
+i18n.addResourceBundle('en', namespace, enTranslations, true, false);
+i18n.addResourceBundle('es', namespace, esTranslations, true, false);
+i18n.addResourceBundle('es', namespace, esTranslations, true, false);
+i18n.addResourceBundle('es_419', namespace, es_419Translations, true, false);
+i18n.addResourceBundle('es-419', namespace, es_419Translations, true, false);
+i18n.addResourceBundle('fr', namespace, frTranslations, true, false);
+i18n.addResourceBundle('fr', namespace, frTranslations, true, false);
+i18n.addResourceBundle('hi_IN', namespace, hi_INTranslations, true, false);
+i18n.addResourceBundle('hi-IN', namespace, hi_INTranslations, true, false);
+i18n.addResourceBundle('id', namespace, idTranslations, true, false);
+i18n.addResourceBundle('id', namespace, idTranslations, true, false);
+i18n.addResourceBundle('km', namespace, kmTranslations, true, false);
+i18n.addResourceBundle('km', namespace, kmTranslations, true, false);
+i18n.addResourceBundle('ko_KR', namespace, ko_KRTranslations, true, false);
+i18n.addResourceBundle('ko-KR', namespace, ko_KRTranslations, true, false);
+i18n.addResourceBundle('lo', namespace, loTranslations, true, false);
+i18n.addResourceBundle('lo', namespace, loTranslations, true, false);
+i18n.addResourceBundle('my', namespace, myTranslations, true, false);
+i18n.addResourceBundle('my', namespace, myTranslations, true, false);
+i18n.addResourceBundle('nb', namespace, nbTranslations, true, false);
+i18n.addResourceBundle('nb', namespace, nbTranslations, true, false);
+i18n.addResourceBundle('nl', namespace, nlTranslations, true, false);
+i18n.addResourceBundle('nl', namespace, nlTranslations, true, false);
+i18n.addResourceBundle('prs', namespace, prsTranslations, true, false);
+i18n.addResourceBundle('prs', namespace, prsTranslations, true, false);
+i18n.addResourceBundle('ps', namespace, psTranslations, true, false);
+i18n.addResourceBundle('ps', namespace, psTranslations, true, false);
+i18n.addResourceBundle('pt', namespace, ptTranslations, true, false);
+i18n.addResourceBundle('pt', namespace, ptTranslations, true, false);
+i18n.addResourceBundle('pt_BR', namespace, pt_BRTranslations, true, false);
+i18n.addResourceBundle('pt-BR', namespace, pt_BRTranslations, true, false);
+i18n.addResourceBundle('ro', namespace, roTranslations, true, false);
+i18n.addResourceBundle('ro', namespace, roTranslations, true, false);
+i18n.addResourceBundle('ru', namespace, ruTranslations, true, false);
+i18n.addResourceBundle('ru', namespace, ruTranslations, true, false);
+i18n.addResourceBundle('si', namespace, siTranslations, true, false);
+i18n.addResourceBundle('si', namespace, siTranslations, true, false);
+i18n.addResourceBundle('sv', namespace, svTranslations, true, false);
+i18n.addResourceBundle('sv', namespace, svTranslations, true, false);
+i18n.addResourceBundle('tet', namespace, tetTranslations, true, false);
+i18n.addResourceBundle('tet', namespace, tetTranslations, true, false);
+i18n.addResourceBundle('tg', namespace, tgTranslations, true, false);
+i18n.addResourceBundle('tg', namespace, tgTranslations, true, false);
+i18n.addResourceBundle('uk', namespace, ukTranslations, true, false);
+i18n.addResourceBundle('uk', namespace, ukTranslations, true, false);
+i18n.addResourceBundle('ur', namespace, urTranslations, true, false);
+i18n.addResourceBundle('ur', namespace, urTranslations, true, false);
+i18n.addResourceBundle('uz_Latn', namespace, uz_LatnTranslations, true, false);
+i18n.addResourceBundle('uz-Latn', namespace, uz_LatnTranslations, true, false);
+i18n.addResourceBundle('uz_UZ_Cyrl', namespace, uz_UZ_CyrlTranslations, true, false);
+i18n.addResourceBundle('uz-Cyrl-UZ', namespace, uz_UZ_CyrlTranslations, true, false);
+i18n.addResourceBundle('uz_UZ_Latn', namespace, uz_UZ_LatnTranslations, true, false);
+i18n.addResourceBundle('uz-Latn-UZ', namespace, uz_UZ_LatnTranslations, true, false);
+i18n.addResourceBundle('vi', namespace, viTranslations, true, false);
+i18n.addResourceBundle('vi', namespace, viTranslations, true, false);
+i18n.addResourceBundle('zh', namespace, zhTranslations, true, false);
+i18n.addResourceBundle('zh', namespace, zhTranslations, true, false);
+i18n.addResourceBundle('zh_CN', namespace, zh_CNTranslations, true, false);
+i18n.addResourceBundle('zh-CN', namespace, zh_CNTranslations, true, false);
 export default i18n;

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

@@ -1,22 +1,19 @@
 const PRIMITIVE_TYPES = new Set(['string', 'number', 'boolean']);
-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');
-    }
-  };
+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');
+  }
 };
 export { createChangeHandler };

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

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

package/build/es/transformers/arrayWithIdObjects.js

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

package/build/es/validators/composeValidators.js

@@ -1,11 +1,5 @@
-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];
-    }
+export const composeValidators = (...validators) => {
+  return (...args) => {
     return validators.reduce((error, validator) => error || validator(...args), undefined);
   };
 };

package/package.json

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

package/src/__tests__/__snapshots__/index.test.js.snap

@@ -2,6 +2,7 @@
 
 exports[`final-form named export should re-export the expected exports 1`] = `
 Array [
+  "default",
   "ARRAY_ERROR",
   "FORM_ERROR",
   "configOptions",
@@ -11,7 +12,6 @@ Array [
   "getIn",
   "setIn",
   "version",
-  "default",
 ]
 `;