@dhis2-ui/selector-bar 10.16.3 → 10.16.5

package/build/cjs/locales/index.js

@@ -14,15 +14,15 @@ var _translations6 = _interopRequireDefault(require("./fr/translations.json"));
 var _translations7 = _interopRequireDefault(require("./hi_IN/translations.json"));
 var _translations8 = _interopRequireDefault(require("./id/translations.json"));
 var _translations9 = _interopRequireDefault(require("./lo/translations.json"));
-var _translations10 = _interopRequireDefault(require("./nb/translations.json"));
-var _translations11 = _interopRequireDefault(require("./pt/translations.json"));
-var _translations12 = _interopRequireDefault(require("./ru/translations.json"));
-var _translations13 = _interopRequireDefault(require("./uk/translations.json"));
-var _translations14 = _interopRequireDefault(require("./uz_UZ_Cyrl/translations.json"));
-var _translations15 = _interopRequireDefault(require("./uz_UZ_Latn/translations.json"));
-var _translations16 = _interopRequireDefault(require("./vi/translations.json"));
-var _translations17 = _interopRequireDefault(require("./zh/translations.json"));
-var _translations18 = _interopRequireDefault(require("./zh_CN/translations.json"));
+var _translations0 = _interopRequireDefault(require("./nb/translations.json"));
+var _translations1 = _interopRequireDefault(require("./pt/translations.json"));
+var _translations10 = _interopRequireDefault(require("./ru/translations.json"));
+var _translations11 = _interopRequireDefault(require("./uk/translations.json"));
+var _translations12 = _interopRequireDefault(require("./uz_UZ_Cyrl/translations.json"));
+var _translations13 = _interopRequireDefault(require("./uz_UZ_Latn/translations.json"));
+var _translations14 = _interopRequireDefault(require("./vi/translations.json"));
+var _translations15 = _interopRequireDefault(require("./zh/translations.json"));
+var _translations16 = _interopRequireDefault(require("./zh_CN/translations.json"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 //------------------------------------------------------------------------------
 // <auto-generated>
@@ -34,22 +34,44 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e
 //------------------------------------------------------------------------------
 
 const namespace = 'default';
-_d2I18n.default.addResources('ar', namespace, _translations.default);
-_d2I18n.default.addResources('cs', namespace, _translations2.default);
-_d2I18n.default.addResources('en', namespace, _translations3.default);
-_d2I18n.default.addResources('es', namespace, _translations4.default);
-_d2I18n.default.addResources('es_419', namespace, _translations5.default);
-_d2I18n.default.addResources('fr', namespace, _translations6.default);
-_d2I18n.default.addResources('hi_IN', namespace, _translations7.default);
-_d2I18n.default.addResources('id', namespace, _translations8.default);
-_d2I18n.default.addResources('lo', namespace, _translations9.default);
-_d2I18n.default.addResources('nb', namespace, _translations10.default);
-_d2I18n.default.addResources('pt', namespace, _translations11.default);
-_d2I18n.default.addResources('ru', namespace, _translations12.default);
-_d2I18n.default.addResources('uk', namespace, _translations13.default);
-_d2I18n.default.addResources('uz_UZ_Cyrl', namespace, _translations14.default);
-_d2I18n.default.addResources('uz_UZ_Latn', namespace, _translations15.default);
-_d2I18n.default.addResources('vi', namespace, _translations16.default);
-_d2I18n.default.addResources('zh', namespace, _translations17.default);
-_d2I18n.default.addResources('zh_CN', namespace, _translations18.default);
+
+// Use 'deep' = true and 'overwrite' = false to add to, but not overwrite,
+// custom translations from the datastore (added by the app adapter)
+
+_d2I18n.default.addResourceBundle('ar', namespace, _translations.default, true, false);
+_d2I18n.default.addResourceBundle('ar', namespace, _translations.default, true, false);
+_d2I18n.default.addResourceBundle('cs', namespace, _translations2.default, true, false);
+_d2I18n.default.addResourceBundle('cs', namespace, _translations2.default, true, false);
+_d2I18n.default.addResourceBundle('en', namespace, _translations3.default, true, false);
+_d2I18n.default.addResourceBundle('en', namespace, _translations3.default, true, false);
+_d2I18n.default.addResourceBundle('es', namespace, _translations4.default, true, false);
+_d2I18n.default.addResourceBundle('es', namespace, _translations4.default, true, false);
+_d2I18n.default.addResourceBundle('es_419', namespace, _translations5.default, true, false);
+_d2I18n.default.addResourceBundle('es-419', namespace, _translations5.default, true, false);
+_d2I18n.default.addResourceBundle('fr', namespace, _translations6.default, true, false);
+_d2I18n.default.addResourceBundle('fr', namespace, _translations6.default, true, false);
+_d2I18n.default.addResourceBundle('hi_IN', namespace, _translations7.default, true, false);
+_d2I18n.default.addResourceBundle('hi-IN', namespace, _translations7.default, true, false);
+_d2I18n.default.addResourceBundle('id', namespace, _translations8.default, true, false);
+_d2I18n.default.addResourceBundle('id', namespace, _translations8.default, true, false);
+_d2I18n.default.addResourceBundle('lo', namespace, _translations9.default, true, false);
+_d2I18n.default.addResourceBundle('lo', namespace, _translations9.default, true, false);
+_d2I18n.default.addResourceBundle('nb', namespace, _translations0.default, true, false);
+_d2I18n.default.addResourceBundle('nb', namespace, _translations0.default, true, false);
+_d2I18n.default.addResourceBundle('pt', namespace, _translations1.default, true, false);
+_d2I18n.default.addResourceBundle('pt', namespace, _translations1.default, true, false);
+_d2I18n.default.addResourceBundle('ru', namespace, _translations10.default, true, false);
+_d2I18n.default.addResourceBundle('ru', namespace, _translations10.default, true, false);
+_d2I18n.default.addResourceBundle('uk', namespace, _translations11.default, true, false);
+_d2I18n.default.addResourceBundle('uk', namespace, _translations11.default, true, false);
+_d2I18n.default.addResourceBundle('uz_UZ_Cyrl', namespace, _translations12.default, true, false);
+_d2I18n.default.addResourceBundle('uz-Cyrl-UZ', namespace, _translations12.default, true, false);
+_d2I18n.default.addResourceBundle('uz_UZ_Latn', namespace, _translations13.default, true, false);
+_d2I18n.default.addResourceBundle('uz-Latn-UZ', namespace, _translations13.default, true, false);
+_d2I18n.default.addResourceBundle('vi', namespace, _translations14.default, true, false);
+_d2I18n.default.addResourceBundle('vi', namespace, _translations14.default, true, false);
+_d2I18n.default.addResourceBundle('zh', namespace, _translations15.default, true, false);
+_d2I18n.default.addResourceBundle('zh', namespace, _translations15.default, true, false);
+_d2I18n.default.addResourceBundle('zh_CN', namespace, _translations16.default, true, false);
+_d2I18n.default.addResourceBundle('zh-CN', namespace, _translations16.default, true, false);
 var _default = exports.default = _d2I18n.default;

package/build/cjs/selector-bar/__stories__/common.js

@@ -10,8 +10,7 @@ var _uiConstants = require("@dhis2/ui-constants");
 var _menu = require("@dhis2-ui/menu");
 var _organisationUnitTree = require("@dhis2-ui/organisation-unit-tree");
 var _react = _interopRequireWildcard(require("react"));
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const decoratorCommonStyles = fn => /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, fn(), /*#__PURE__*/_react.default.createElement(_style.default, {
   id: "3746816729",
@@ -114,10 +113,9 @@ const getOrganisationUnitData = id => {
 };
 exports.getOrganisationUnitData = getOrganisationUnitData;
 const dataProviderData = exports.dataProviderData = {
-  organisationUnits: (_, _ref) => {
-    let {
-      id
-    } = _ref;
+  organisationUnits: (_, {
+    id
+  }) => {
     const data = getOrganisationUnitData(id);
     if (!data) {
       return Promise.reject(new Error('404 - Org unit not found'));
@@ -177,37 +175,32 @@ const dataSets = exports.dataSets = [{
   value: 'data-set-3',
   label: 'Data set 3'
 }];
-const MenuSelect = _ref2 => {
-  let {
-    values,
-    selected,
-    onChange
-  } = _ref2;
+const MenuSelect = ({
+  values,
+  selected,
+  onChange
+}) => {
   return /*#__PURE__*/_react.default.createElement("div", {
     style: {
       width: 400
     }
-  }, /*#__PURE__*/_react.default.createElement(_menu.Menu, null, values.map(_ref3 => {
-    let {
-      value,
-      label
-    } = _ref3;
-    return /*#__PURE__*/_react.default.createElement(_menu.MenuItem, {
-      key: value,
-      label: label,
-      active: selected === value,
-      onClick: () => onChange({
-        selected: value
-      })
-    });
-  })));
+  }, /*#__PURE__*/_react.default.createElement(_menu.Menu, null, values.map(({
+    value,
+    label
+  }) => /*#__PURE__*/_react.default.createElement(_menu.MenuItem, {
+    key: value,
+    label: label,
+    active: selected === value,
+    onClick: () => onChange({
+      selected: value
+    })
+  }))));
 };
 exports.MenuSelect = MenuSelect;
-const OrgUnitSelect = _ref4 => {
-  let {
-    onChange,
-    selected
-  } = _ref4;
+const OrgUnitSelect = ({
+  onChange,
+  selected
+}) => {
   return /*#__PURE__*/_react.default.createElement("div", {
     style: {
       width: 400,

package/build/cjs/selector-bar/__stories__/keep-org-unit-expanded.js

@@ -8,28 +8,20 @@ var _organisationUnitTree = require("@dhis2-ui/organisation-unit-tree");
 var _react = _interopRequireWildcard(require("react"));
 var _index = require("../../index.js");
 var _common = require("./common.js");
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
-const KeepOrgUnitExpanded = (_, _ref) => {
-  let {
-    orgUnit,
-    setOrgUnit,
-    orgUnitOpen,
-    setOrgUnitOpen
-  } = _ref;
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
+const KeepOrgUnitExpanded = (_, {
+  orgUnit,
+  setOrgUnit,
+  orgUnitOpen,
+  setOrgUnitOpen
+}) => {
   const [expanded, setExpanded] = (0, _react.useState)([]);
-  const handleExpand = _ref2 => {
-    let {
-      path
-    } = _ref2;
-    return setExpanded([...expanded, path]);
-  };
-  const handleCollapse = _ref3 => {
-    let {
-      path
-    } = _ref3;
-    return setExpanded(expanded.filter(p => p !== path));
-  };
+  const handleExpand = ({
+    path
+  }) => setExpanded([...expanded, path]);
+  const handleCollapse = ({
+    path
+  }) => setExpanded(expanded.filter(p => p !== path));
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_index.SelectorBar, {
     disableClearSelections: !orgUnit,
     onClearSelectionClick: () => setOrgUnit(null)

package/build/cjs/selector-bar/__stories__/rtl.js

@@ -17,17 +17,16 @@ const RHSContent = () => /*#__PURE__*/_react.default.createElement("div", {
 }, "Options"), /*#__PURE__*/_react.default.createElement(_style.default, {
   id: "876392447"
 }, [".rhs-content.jsx-876392447{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;height:40px;padding:0 16px;-webkit-align-items:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;}"]));
-const RTL = (_, _ref) => {
-  let {
-    workflow,
-    setWorkflow,
-    workflowOpen,
-    setWorkflowOpen,
-    orgUnit,
-    setOrgUnit,
-    orgUnitOpen,
-    setOrgUnitOpen
-  } = _ref;
+const RTL = (_, {
+  workflow,
+  setWorkflow,
+  workflowOpen,
+  setWorkflowOpen,
+  orgUnit,
+  setOrgUnit,
+  orgUnitOpen,
+  setOrgUnitOpen
+}) => {
   return /*#__PURE__*/_react.default.createElement("div", {
     dir: "rtl"
   }, /*#__PURE__*/_react.default.createElement(_index.SelectorBar, {
@@ -50,10 +49,9 @@ const RTL = (_, _ref) => {
   }, /*#__PURE__*/_react.default.createElement(_common.MenuSelect, {
     values: _common.workflows,
     selected: workflow === null || workflow === void 0 ? void 0 : workflow.value,
-    onChange: _ref2 => {
-      let {
-        selected
-      } = _ref2;
+    onChange: ({
+      selected
+    }) => {
       setWorkflow(_common.workflows.find(currentWorkflow => selected === currentWorkflow.value));
       setWorkflowOpen(false);
     }

package/build/cjs/selector-bar/__stories__/with-multiple-rows.js

@@ -10,21 +10,20 @@ var _react = _interopRequireDefault(require("react"));
 var _index = require("../../index.js");
 var _common = require("./common.js");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-const WithMultipleRows = (_, _ref) => {
-  let {
-    workflow,
-    setWorkflow,
-    workflowOpen,
-    setWorkflowOpen,
-    dataSet,
-    setDataSet,
-    dataSetOpen,
-    setDataSetOpen,
-    orgUnit,
-    setOrgUnit,
-    orgUnitOpen,
-    setOrgUnitOpen
-  } = _ref;
+const WithMultipleRows = (_, {
+  workflow,
+  setWorkflow,
+  workflowOpen,
+  setWorkflowOpen,
+  dataSet,
+  setDataSet,
+  dataSetOpen,
+  setDataSetOpen,
+  orgUnit,
+  setOrgUnit,
+  orgUnitOpen,
+  setOrgUnitOpen
+}) => {
   return /*#__PURE__*/_react.default.createElement("div", {
     className: "jsx-3203152640" + " " + "narrow-container"
   }, /*#__PURE__*/_react.default.createElement(_index.SelectorBar, {
@@ -40,10 +39,9 @@ const WithMultipleRows = (_, _ref) => {
   }, /*#__PURE__*/_react.default.createElement(_common.MenuSelect, {
     values: _common.workflows,
     selected: workflow === null || workflow === void 0 ? void 0 : workflow.value,
-    onChange: _ref2 => {
-      let {
-        selected
-      } = _ref2;
+    onChange: ({
+      selected
+    }) => {
       setWorkflow(_common.workflows.find(currentWorkflow => selected === currentWorkflow.value));
       setWorkflowOpen(false);
     }
@@ -57,10 +55,9 @@ const WithMultipleRows = (_, _ref) => {
   }, /*#__PURE__*/_react.default.createElement(_common.MenuSelect, {
     values: _common.dataSets,
     selected: dataSet === null || dataSet === void 0 ? void 0 : dataSet.value,
-    onChange: _ref3 => {
-      let {
-        selected
-      } = _ref3;
+    onChange: ({
+      selected
+    }) => {
       setDataSet(_common.dataSets.find(currentWorkflow => selected === currentWorkflow.value));
       setDataSetOpen(false);
     }

package/build/cjs/selector-bar/__stories__/with-right-hand-side-content.js

@@ -17,17 +17,16 @@ const RHSContent = () => /*#__PURE__*/_react.default.createElement("div", {
 }, "Options"), /*#__PURE__*/_react.default.createElement(_style.default, {
   id: "876392447"
 }, [".rhs-content.jsx-876392447{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;height:40px;padding:0 16px;-webkit-align-items:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;}"]));
-const WithAdditionalContent = (_, _ref) => {
-  let {
-    workflow,
-    setWorkflow,
-    workflowOpen,
-    setWorkflowOpen,
-    orgUnit,
-    setOrgUnit,
-    orgUnitOpen,
-    setOrgUnitOpen
-  } = _ref;
+const WithAdditionalContent = (_, {
+  workflow,
+  setWorkflow,
+  workflowOpen,
+  setWorkflowOpen,
+  orgUnit,
+  setOrgUnit,
+  orgUnitOpen,
+  setOrgUnitOpen
+}) => {
   return /*#__PURE__*/_react.default.createElement(_index.SelectorBar, {
     disableClearSelections: !workflow || !orgUnit,
     onClearSelectionClick: () => {
@@ -48,10 +47,9 @@ const WithAdditionalContent = (_, _ref) => {
   }, /*#__PURE__*/_react.default.createElement(_common.MenuSelect, {
     values: _common.workflows,
     selected: workflow === null || workflow === void 0 ? void 0 : workflow.value,
-    onChange: _ref2 => {
-      let {
-        selected
-      } = _ref2;
+    onChange: ({
+      selected
+    }) => {
       setWorkflow(_common.workflows.find(currentWorkflow => selected === currentWorkflow.value));
       setWorkflowOpen(false);
     }

package/build/cjs/selector-bar/__stories__/with-some-inputs.js

@@ -8,17 +8,16 @@ var _react = _interopRequireDefault(require("react"));
 var _index = require("../../index.js");
 var _common = require("./common.js");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-const WithSomeInputs = (_, _ref) => {
-  let {
-    workflow,
-    setWorkflow,
-    workflowOpen,
-    setWorkflowOpen,
-    orgUnit,
-    setOrgUnit,
-    orgUnitOpen,
-    setOrgUnitOpen
-  } = _ref;
+const WithSomeInputs = (_, {
+  workflow,
+  setWorkflow,
+  workflowOpen,
+  setWorkflowOpen,
+  orgUnit,
+  setOrgUnit,
+  orgUnitOpen,
+  setOrgUnitOpen
+}) => {
   return /*#__PURE__*/_react.default.createElement(_index.SelectorBar, {
     disableClearSelections: !workflow && !orgUnit,
     onClearSelectionClick: () => {
@@ -38,10 +37,9 @@ const WithSomeInputs = (_, _ref) => {
   }, /*#__PURE__*/_react.default.createElement(_common.MenuSelect, {
     values: _common.workflows,
     selected: workflow === null || workflow === void 0 ? void 0 : workflow.value,
-    onChange: _ref2 => {
-      let {
-        selected
-      } = _ref2;
+    onChange: ({
+      selected
+    }) => {
       setWorkflow(_common.workflows.find(currentWorkflow => selected === currentWorkflow.value));
       setWorkflowOpen(false);
     }

package/build/cjs/selector-bar/selector-bar.js

@@ -11,14 +11,12 @@ var _classnames = _interopRequireDefault(require("classnames"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _react = _interopRequireWildcard(require("react"));
 var _index = _interopRequireDefault(require("../locales/index.js"));
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-const ClearSelection = _ref => {
-  let {
-    disabled,
-    onClick
-  } = _ref;
+const ClearSelection = ({
+  disabled,
+  onClick
+}) => {
   return /*#__PURE__*/_react.default.createElement("div", {
     className: _style.default.dynamic([["3676026375", [_uiConstants.spacers.dp8]]]) + " " + "clear-selections"
   }, /*#__PURE__*/_react.default.createElement(_button.Button, {
@@ -35,16 +33,15 @@ ClearSelection.propTypes = {
   disabled: _propTypes.default.bool,
   onClick: _propTypes.default.func
 };
-const SelectorBar = _ref2 => {
-  let {
-    className,
-    children,
-    onClearSelectionClick,
-    dataTest = 'dhis2-ui-selectorbar',
-    disableClearSelections,
-    additionalContent,
-    ariaLabel
-  } = _ref2;
+const SelectorBar = ({
+  className,
+  children,
+  onClearSelectionClick,
+  dataTest = 'dhis2-ui-selectorbar',
+  disableClearSelections,
+  additionalContent,
+  ariaLabel
+}) => {
   const container = (0, _react.useRef)(null);
   const [childrenToFocus, setChildrenToFocus] = (0, _react.useState)([]);
   (0, _react.useEffect)(() => {

package/build/cjs/selector-bar-item/selector-bar-item.e2e.stories.js

@@ -7,8 +7,7 @@ exports.default = exports.OpenWithValue = exports.OpenNoValue = exports.ClosedWi
 var _select = require("@dhis2-ui/select");
 var _react = _interopRequireWildcard(require("react"));
 var _selectorBarItem = require("./selector-bar-item.js");
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 const options = [{
   value: 'value 1',
   label: 'label 1'
@@ -31,45 +30,37 @@ const createStateDecorator = args => {
     });
   };
 };
-const createStory = () => (_, _ref) => {
+const createStory = () => (_, {
+  open,
+  setOpen,
+  selected,
+  setSelected
+}) => {
   var _options$find;
-  let {
-    open,
-    setOpen,
-    selected,
-    setSelected
-  } = _ref;
   return /*#__PURE__*/_react.default.createElement(_selectorBarItem.SelectorBarItem, {
     label: "Selection bar item",
     noValueMessage: "No value message",
     open: open,
     setOpen: setOpen,
-    value: ((_options$find = options.find(_ref2 => {
-      let {
-        value
-      } = _ref2;
-      return value === selected;
-    })) === null || _options$find === void 0 ? void 0 : _options$find.label) || ''
+    value: ((_options$find = options.find(({
+      value
+    }) => value === selected)) === null || _options$find === void 0 ? void 0 : _options$find.label) || ''
   }, /*#__PURE__*/_react.default.createElement(_select.SingleSelectField, {
     selected: selected,
-    onChange: _ref3 => {
-      let {
-        selected: nextSelected
-      } = _ref3;
+    onChange: ({
+      selected: nextSelected
+    }) => {
       setSelected(nextSelected);
       setOpen(false);
     }
-  }, options.map(_ref4 => {
-    let {
-      value,
-      label
-    } = _ref4;
-    return /*#__PURE__*/_react.default.createElement(_select.SingleSelectOption, {
-      key: value,
-      value: value,
-      label: label
-    });
-  })));
+  }, options.map(({
+    value,
+    label
+  }) => /*#__PURE__*/_react.default.createElement(_select.SingleSelectOption, {
+    key: value,
+    value: value,
+    label: label
+  }))));
 };
 var _default = exports.default = {
   title: 'SelectorBarItem'

package/build/cjs/selector-bar-item/selector-bar-item.js

@@ -13,8 +13,7 @@ var _popper = require("@dhis2-ui/popper");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _react = _interopRequireWildcard(require("react"));
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const offsetModifier = {
   name: 'offset',
@@ -33,27 +32,26 @@ const offsetModifier = {
  * "multiple" selections, this would be more or less impossible to predict
  * inside this component
  */
-const SelectorBarItem = _ref => {
-  let {
-    children,
-    className,
-    dataTest = 'dhis2-ui-selectorbaritem',
-    disabled,
-    displayOnly,
-    label,
-    noValueMessage,
-    open,
-    setOpen,
-    value,
-    onClearSelectionClick
-  } = _ref;
+const SelectorBarItem = ({
+  children,
+  className,
+  dataTest = 'dhis2-ui-selectorbaritem',
+  disabled,
+  displayOnly,
+  label,
+  noValueMessage,
+  open,
+  setOpen,
+  value,
+  onClearSelectionClick
+}) => {
   const buttonRef = (0, _react.useRef)();
   const Icon = open ? _uiIcons.IconChevronUp24 : _uiIcons.IconChevronDown24;
   const handleKeyDown = evt => {
     if (open && setOpen && evt.key === 'Tab') {
       var _buttonRef$current;
       // Move focus to trigger and defer close so Tab advances before the popup unmounts.
-      (_buttonRef$current = buttonRef.current) === null || _buttonRef$current === void 0 ? void 0 : _buttonRef$current.focus();
+      (_buttonRef$current = buttonRef.current) === null || _buttonRef$current === void 0 || _buttonRef$current.focus();
       requestAnimationFrame(() => setOpen(false));
     }
   };

package/build/es/locales/index.js

@@ -26,22 +26,44 @@ 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('cs', namespace, csTranslations);
-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('lo', namespace, loTranslations);
-i18n.addResources('nb', namespace, nbTranslations);
-i18n.addResources('pt', namespace, ptTranslations);
-i18n.addResources('ru', namespace, ruTranslations);
-i18n.addResources('uk', namespace, ukTranslations);
-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('cs', namespace, csTranslations, true, false);
+i18n.addResourceBundle('cs', namespace, csTranslations, 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('lo', namespace, loTranslations, true, false);
+i18n.addResourceBundle('lo', namespace, loTranslations, true, false);
+i18n.addResourceBundle('nb', namespace, nbTranslations, true, false);
+i18n.addResourceBundle('nb', namespace, nbTranslations, true, false);
+i18n.addResourceBundle('pt', namespace, ptTranslations, true, false);
+i18n.addResourceBundle('pt', namespace, ptTranslations, true, false);
+i18n.addResourceBundle('ru', namespace, ruTranslations, true, false);
+i18n.addResourceBundle('ru', namespace, ruTranslations, true, false);
+i18n.addResourceBundle('uk', namespace, ukTranslations, true, false);
+i18n.addResourceBundle('uk', namespace, ukTranslations, 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/selector-bar/__stories__/common.js

@@ -103,10 +103,9 @@ export const getOrganisationUnitData = id => {
   return data;
 };
 export const dataProviderData = {
-  organisationUnits: (_, _ref) => {
-    let {
-      id
-    } = _ref;
+  organisationUnits: (_, {
+    id
+  }) => {
     const data = getOrganisationUnitData(id);
     if (!data) {
       return Promise.reject(new Error('404 - Org unit not found'));
@@ -164,36 +163,31 @@ export const dataSets = [{
   value: 'data-set-3',
   label: 'Data set 3'
 }];
-export const MenuSelect = _ref2 => {
-  let {
-    values,
-    selected,
-    onChange
-  } = _ref2;
+export const MenuSelect = ({
+  values,
+  selected,
+  onChange
+}) => {
   return /*#__PURE__*/React.createElement("div", {
     style: {
       width: 400
     }
-  }, /*#__PURE__*/React.createElement(Menu, null, values.map(_ref3 => {
-    let {
-      value,
-      label
-    } = _ref3;
-    return /*#__PURE__*/React.createElement(MenuItem, {
-      key: value,
-      label: label,
-      active: selected === value,
-      onClick: () => onChange({
-        selected: value
-      })
-    });
-  })));
+  }, /*#__PURE__*/React.createElement(Menu, null, values.map(({
+    value,
+    label
+  }) => /*#__PURE__*/React.createElement(MenuItem, {
+    key: value,
+    label: label,
+    active: selected === value,
+    onClick: () => onChange({
+      selected: value
+    })
+  }))));
 };
-export const OrgUnitSelect = _ref4 => {
-  let {
-    onChange,
-    selected
-  } = _ref4;
+export const OrgUnitSelect = ({
+  onChange,
+  selected
+}) => {
   return /*#__PURE__*/React.createElement("div", {
     style: {
       width: 400,

package/build/es/selector-bar/__stories__/keep-org-unit-expanded.js

@@ -2,26 +2,19 @@ import { OrganisationUnitTree } from '@dhis2-ui/organisation-unit-tree';
 import React, { useState } from 'react';
 import { SelectorBar, SelectorBarItem } from '../../index.js';
 import { createStatefulDecorator, decoratorCommonStyles, createDecoratorCustomDataProvider } from './common.js';
-export const KeepOrgUnitExpanded = (_, _ref) => {
-  let {
-    orgUnit,
-    setOrgUnit,
-    orgUnitOpen,
-    setOrgUnitOpen
-  } = _ref;
+export const KeepOrgUnitExpanded = (_, {
+  orgUnit,
+  setOrgUnit,
+  orgUnitOpen,
+  setOrgUnitOpen
+}) => {
   const [expanded, setExpanded] = useState([]);
-  const handleExpand = _ref2 => {
-    let {
-      path
-    } = _ref2;
-    return setExpanded([...expanded, path]);
-  };
-  const handleCollapse = _ref3 => {
-    let {
-      path
-    } = _ref3;
-    return setExpanded(expanded.filter(p => p !== path));
-  };
+  const handleExpand = ({
+    path
+  }) => setExpanded([...expanded, path]);
+  const handleCollapse = ({
+    path
+  }) => setExpanded(expanded.filter(p => p !== path));
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(SelectorBar, {
     disableClearSelections: !orgUnit,
     onClearSelectionClick: () => setOrgUnit(null)

package/build/es/selector-bar/__stories__/rtl.js

@@ -10,17 +10,16 @@ const RHSContent = () => /*#__PURE__*/React.createElement("div", {
 }, "Options"), /*#__PURE__*/React.createElement(_JSXStyle, {
   id: "876392447"
 }, [".rhs-content.jsx-876392447{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;height:40px;padding:0 16px;-webkit-align-items:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;}"]));
-export const RTL = (_, _ref) => {
-  let {
-    workflow,
-    setWorkflow,
-    workflowOpen,
-    setWorkflowOpen,
-    orgUnit,
-    setOrgUnit,
-    orgUnitOpen,
-    setOrgUnitOpen
-  } = _ref;
+export const RTL = (_, {
+  workflow,
+  setWorkflow,
+  workflowOpen,
+  setWorkflowOpen,
+  orgUnit,
+  setOrgUnit,
+  orgUnitOpen,
+  setOrgUnitOpen
+}) => {
   return /*#__PURE__*/React.createElement("div", {
     dir: "rtl"
   }, /*#__PURE__*/React.createElement(SelectorBar, {
@@ -43,10 +42,9 @@ export const RTL = (_, _ref) => {
   }, /*#__PURE__*/React.createElement(MenuSelect, {
     values: workflows,
     selected: workflow === null || workflow === void 0 ? void 0 : workflow.value,
-    onChange: _ref2 => {
-      let {
-        selected
-      } = _ref2;
+    onChange: ({
+      selected
+    }) => {
       setWorkflow(workflows.find(currentWorkflow => selected === currentWorkflow.value));
       setWorkflowOpen(false);
     }

package/build/es/selector-bar/__stories__/with-multiple-rows.js

@@ -3,21 +3,20 @@ import { OrganisationUnitTree } from '@dhis2-ui/organisation-unit-tree';
 import React from 'react';
 import { SelectorBar, SelectorBarItem } from '../../index.js';
 import { MenuSelect, createDecoratorCustomDataProvider, createStatefulDecorator, dataSets, decoratorCommonStyles, workflows } from './common.js';
-export const WithMultipleRows = (_, _ref) => {
-  let {
-    workflow,
-    setWorkflow,
-    workflowOpen,
-    setWorkflowOpen,
-    dataSet,
-    setDataSet,
-    dataSetOpen,
-    setDataSetOpen,
-    orgUnit,
-    setOrgUnit,
-    orgUnitOpen,
-    setOrgUnitOpen
-  } = _ref;
+export const WithMultipleRows = (_, {
+  workflow,
+  setWorkflow,
+  workflowOpen,
+  setWorkflowOpen,
+  dataSet,
+  setDataSet,
+  dataSetOpen,
+  setDataSetOpen,
+  orgUnit,
+  setOrgUnit,
+  orgUnitOpen,
+  setOrgUnitOpen
+}) => {
   return /*#__PURE__*/React.createElement("div", {
     className: "jsx-3203152640" + " " + "narrow-container"
   }, /*#__PURE__*/React.createElement(SelectorBar, {
@@ -33,10 +32,9 @@ export const WithMultipleRows = (_, _ref) => {
   }, /*#__PURE__*/React.createElement(MenuSelect, {
     values: workflows,
     selected: workflow === null || workflow === void 0 ? void 0 : workflow.value,
-    onChange: _ref2 => {
-      let {
-        selected
-      } = _ref2;
+    onChange: ({
+      selected
+    }) => {
       setWorkflow(workflows.find(currentWorkflow => selected === currentWorkflow.value));
       setWorkflowOpen(false);
     }
@@ -50,10 +48,9 @@ export const WithMultipleRows = (_, _ref) => {
   }, /*#__PURE__*/React.createElement(MenuSelect, {
     values: dataSets,
     selected: dataSet === null || dataSet === void 0 ? void 0 : dataSet.value,
-    onChange: _ref3 => {
-      let {
-        selected
-      } = _ref3;
+    onChange: ({
+      selected
+    }) => {
       setDataSet(dataSets.find(currentWorkflow => selected === currentWorkflow.value));
       setDataSetOpen(false);
     }

package/build/es/selector-bar/__stories__/with-right-hand-side-content.js

@@ -10,17 +10,16 @@ const RHSContent = () => /*#__PURE__*/React.createElement("div", {
 }, "Options"), /*#__PURE__*/React.createElement(_JSXStyle, {
   id: "876392447"
 }, [".rhs-content.jsx-876392447{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;height:40px;padding:0 16px;-webkit-align-items:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;}"]));
-export const WithAdditionalContent = (_, _ref) => {
-  let {
-    workflow,
-    setWorkflow,
-    workflowOpen,
-    setWorkflowOpen,
-    orgUnit,
-    setOrgUnit,
-    orgUnitOpen,
-    setOrgUnitOpen
-  } = _ref;
+export const WithAdditionalContent = (_, {
+  workflow,
+  setWorkflow,
+  workflowOpen,
+  setWorkflowOpen,
+  orgUnit,
+  setOrgUnit,
+  orgUnitOpen,
+  setOrgUnitOpen
+}) => {
   return /*#__PURE__*/React.createElement(SelectorBar, {
     disableClearSelections: !workflow || !orgUnit,
     onClearSelectionClick: () => {
@@ -41,10 +40,9 @@ export const WithAdditionalContent = (_, _ref) => {
   }, /*#__PURE__*/React.createElement(MenuSelect, {
     values: workflows,
     selected: workflow === null || workflow === void 0 ? void 0 : workflow.value,
-    onChange: _ref2 => {
-      let {
-        selected
-      } = _ref2;
+    onChange: ({
+      selected
+    }) => {
       setWorkflow(workflows.find(currentWorkflow => selected === currentWorkflow.value));
       setWorkflowOpen(false);
     }

package/build/es/selector-bar/__stories__/with-some-inputs.js

@@ -1,17 +1,16 @@
 import React from 'react';
 import { SelectorBar, SelectorBarItem } from '../../index.js';
 import { OrgUnitSelect, MenuSelect, createDecoratorCustomDataProvider, createStatefulDecorator, decoratorCommonStyles, workflows } from './common.js';
-export const WithSomeInputs = (_, _ref) => {
-  let {
-    workflow,
-    setWorkflow,
-    workflowOpen,
-    setWorkflowOpen,
-    orgUnit,
-    setOrgUnit,
-    orgUnitOpen,
-    setOrgUnitOpen
-  } = _ref;
+export const WithSomeInputs = (_, {
+  workflow,
+  setWorkflow,
+  workflowOpen,
+  setWorkflowOpen,
+  orgUnit,
+  setOrgUnit,
+  orgUnitOpen,
+  setOrgUnitOpen
+}) => {
   return /*#__PURE__*/React.createElement(SelectorBar, {
     disableClearSelections: !workflow && !orgUnit,
     onClearSelectionClick: () => {
@@ -31,10 +30,9 @@ export const WithSomeInputs = (_, _ref) => {
   }, /*#__PURE__*/React.createElement(MenuSelect, {
     values: workflows,
     selected: workflow === null || workflow === void 0 ? void 0 : workflow.value,
-    onChange: _ref2 => {
-      let {
-        selected
-      } = _ref2;
+    onChange: ({
+      selected
+    }) => {
       setWorkflow(workflows.find(currentWorkflow => selected === currentWorkflow.value));
       setWorkflowOpen(false);
     }

package/build/es/selector-bar/selector-bar.js

@@ -5,11 +5,10 @@ import cx from 'classnames';
 import PropTypes from 'prop-types';
 import React, { useRef, useState, useEffect } from 'react';
 import i18n from '../locales/index.js';
-const ClearSelection = _ref => {
-  let {
-    disabled,
-    onClick
-  } = _ref;
+const ClearSelection = ({
+  disabled,
+  onClick
+}) => {
   return /*#__PURE__*/React.createElement("div", {
     className: _JSXStyle.dynamic([["3676026375", [spacers.dp8]]]) + " " + "clear-selections"
   }, /*#__PURE__*/React.createElement(Button, {
@@ -26,16 +25,15 @@ ClearSelection.propTypes = {
   disabled: PropTypes.bool,
   onClick: PropTypes.func
 };
-export const SelectorBar = _ref2 => {
-  let {
-    className,
-    children,
-    onClearSelectionClick,
-    dataTest = 'dhis2-ui-selectorbar',
-    disableClearSelections,
-    additionalContent,
-    ariaLabel
-  } = _ref2;
+export const SelectorBar = ({
+  className,
+  children,
+  onClearSelectionClick,
+  dataTest = 'dhis2-ui-selectorbar',
+  disableClearSelections,
+  additionalContent,
+  ariaLabel
+}) => {
   const container = useRef(null);
   const [childrenToFocus, setChildrenToFocus] = useState([]);
   useEffect(() => {

package/build/es/selector-bar-item/selector-bar-item.e2e.stories.js

@@ -23,45 +23,37 @@ const createStateDecorator = args => {
     });
   };
 };
-const createStory = () => (_, _ref) => {
+const createStory = () => (_, {
+  open,
+  setOpen,
+  selected,
+  setSelected
+}) => {
   var _options$find;
-  let {
-    open,
-    setOpen,
-    selected,
-    setSelected
-  } = _ref;
   return /*#__PURE__*/React.createElement(SelectorBarItem, {
     label: "Selection bar item",
     noValueMessage: "No value message",
     open: open,
     setOpen: setOpen,
-    value: ((_options$find = options.find(_ref2 => {
-      let {
-        value
-      } = _ref2;
-      return value === selected;
-    })) === null || _options$find === void 0 ? void 0 : _options$find.label) || ''
+    value: ((_options$find = options.find(({
+      value
+    }) => value === selected)) === null || _options$find === void 0 ? void 0 : _options$find.label) || ''
   }, /*#__PURE__*/React.createElement(SingleSelectField, {
     selected: selected,
-    onChange: _ref3 => {
-      let {
-        selected: nextSelected
-      } = _ref3;
+    onChange: ({
+      selected: nextSelected
+    }) => {
       setSelected(nextSelected);
       setOpen(false);
     }
-  }, options.map(_ref4 => {
-    let {
-      value,
-      label
-    } = _ref4;
-    return /*#__PURE__*/React.createElement(SingleSelectOption, {
-      key: value,
-      value: value,
-      label: label
-    });
-  })));
+  }, options.map(({
+    value,
+    label
+  }) => /*#__PURE__*/React.createElement(SingleSelectOption, {
+    key: value,
+    value: value,
+    label: label
+  }))));
 };
 export default {
   title: 'SelectorBarItem'

package/build/es/selector-bar-item/selector-bar-item.js

@@ -24,27 +24,26 @@ const offsetModifier = {
  * "multiple" selections, this would be more or less impossible to predict
  * inside this component
  */
-export const SelectorBarItem = _ref => {
-  let {
-    children,
-    className,
-    dataTest = 'dhis2-ui-selectorbaritem',
-    disabled,
-    displayOnly,
-    label,
-    noValueMessage,
-    open,
-    setOpen,
-    value,
-    onClearSelectionClick
-  } = _ref;
+export const SelectorBarItem = ({
+  children,
+  className,
+  dataTest = 'dhis2-ui-selectorbaritem',
+  disabled,
+  displayOnly,
+  label,
+  noValueMessage,
+  open,
+  setOpen,
+  value,
+  onClearSelectionClick
+}) => {
   const buttonRef = useRef();
   const Icon = open ? IconChevronUp24 : IconChevronDown24;
   const handleKeyDown = evt => {
     if (open && setOpen && evt.key === 'Tab') {
       var _buttonRef$current;
       // Move focus to trigger and defer close so Tab advances before the popup unmounts.
-      (_buttonRef$current = buttonRef.current) === null || _buttonRef$current === void 0 ? void 0 : _buttonRef$current.focus();
+      (_buttonRef$current = buttonRef.current) === null || _buttonRef$current === void 0 || _buttonRef$current.focus();
       requestAnimationFrame(() => setOpen(false));
     }
   };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@dhis2-ui/selector-bar",
-    "version": "10.16.3",
+    "version": "10.16.5",
     "description": "UI Select",
     "repository": {
         "type": "git",
@@ -33,20 +33,20 @@
         "styled-jsx": "^4"
     },
     "dependencies": {
-        "@dhis2-ui/button": "10.16.3",
-        "@dhis2-ui/card": "10.16.3",
-        "@dhis2-ui/popper": "10.16.3",
-        "@dhis2-ui/layer": "10.16.3",
-        "@dhis2/ui-constants": "10.16.3",
-        "@dhis2/ui-icons": "10.16.3",
+        "@dhis2-ui/button": "10.16.5",
+        "@dhis2-ui/card": "10.16.5",
+        "@dhis2-ui/popper": "10.16.5",
+        "@dhis2-ui/layer": "10.16.5",
+        "@dhis2/ui-constants": "10.16.5",
+        "@dhis2/ui-icons": "10.16.5",
         "classnames": "^2.3.1",
         "prop-types": "^15.7.2"
     },
     "devDependencies": {
-        "@dhis2-ui/css": "10.16.3",
-        "@dhis2-ui/menu": "10.16.3",
-        "@dhis2-ui/organisation-unit-tree": "10.16.3",
-        "@dhis2-ui/select": "10.16.3",
+        "@dhis2-ui/css": "10.16.5",
+        "@dhis2-ui/menu": "10.16.5",
+        "@dhis2-ui/organisation-unit-tree": "10.16.5",
+        "@dhis2-ui/select": "10.16.5",
         "@dhis2/d2-i18n": "^1.1.0",
         "react": "^18.3.1",
         "react-dom": "^18.3.1",

package/src/locales/index.js

@@ -28,23 +28,62 @@ import zhTranslations from './zh/translations.json'
 import zh_CNTranslations from './zh_CN/translations.json'
 
 const namespace = 'default'
-i18n.addResources('ar', namespace, arTranslations)
-i18n.addResources('cs', namespace, csTranslations)
-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('lo', namespace, loTranslations)
-i18n.addResources('nb', namespace, nbTranslations)
-i18n.addResources('pt', namespace, ptTranslations)
-i18n.addResources('ru', namespace, ruTranslations)
-i18n.addResources('uk', namespace, ukTranslations)
-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('cs', namespace, csTranslations, true, false)
+i18n.addResourceBundle('cs', namespace, csTranslations, 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('lo', namespace, loTranslations, true, false)
+i18n.addResourceBundle('lo', namespace, loTranslations, true, false)
+
+i18n.addResourceBundle('nb', namespace, nbTranslations, true, false)
+i18n.addResourceBundle('nb', namespace, nbTranslations, true, false)
+
+i18n.addResourceBundle('pt', namespace, ptTranslations, true, false)
+i18n.addResourceBundle('pt', namespace, ptTranslations, true, false)
+
+i18n.addResourceBundle('ru', namespace, ruTranslations, true, false)
+i18n.addResourceBundle('ru', namespace, ruTranslations, true, false)
+
+i18n.addResourceBundle('uk', namespace, ukTranslations, true, false)
+i18n.addResourceBundle('uk', namespace, ukTranslations, 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