@dhis2-ui/transfer 10.16.3 → 10.16.5

package/build/es/transfer.prod.stories.js

@@ -140,11 +140,10 @@ export default {
     options: options
   }
 };
-const StatefulTemplate = _ref => {
-  let {
-    initiallySelected = [],
-    ...args
-  } = _ref;
+const StatefulTemplate = ({
+  initiallySelected = [],
+  ...args
+}) => {
   const [selected, setSelected] = useState(initiallySelected);
   const onChange = payload => setSelected(payload.selected);
   return /*#__PURE__*/React.createElement(Transfer, _extends({}, args, {
@@ -188,12 +187,9 @@ export const FilteredPicked = StatefulTemplate.bind({});
 FilteredPicked.args = {
   filterablePicked: true,
   initialSearchTermPicked: 'ANC',
-  initiallySelected: options.map(_ref2 => {
-    let {
-      value
-    } = _ref2;
-    return value;
-  })
+  initiallySelected: options.map(({
+    value
+  }) => value)
 };
 export const FilteredPlaceholder = StatefulTemplate.bind({});
 FilteredPlaceholder.args = {
@@ -201,25 +197,22 @@ FilteredPlaceholder.args = {
   filterLabel: 'Filter with placeholder',
   filterPlaceholder: 'Search'
 };
-const renderOption = _ref3 => {
-  let {
+const renderOption = ({
+  label,
+  value,
+  onClick,
+  highlighted,
+  selected
+}) => /*#__PURE__*/React.createElement("p", {
+  onClick: event => onClick({
     label,
-    value,
-    onClick,
-    highlighted,
-    selected
-  } = _ref3;
-  return /*#__PURE__*/React.createElement("p", {
-    onClick: event => onClick({
-      label,
-      value
-    }, event),
-    style: {
-      background: highlighted ? 'green' : 'blue',
-      color: selected ? 'orange' : 'white'
-    }
-  }, "Custom: ", label, " (label), ", value, " (value)");
-};
+    value
+  }, event),
+  style: {
+    background: highlighted ? 'green' : 'blue',
+    color: selected ? 'orange' : 'white'
+  }
+}, "Custom: ", label, " (label), ", value, " (value)");
 const RenderOptionCode = () => /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("strong", null, "Custom option code:"), /*#__PURE__*/React.createElement("code", null, /*#__PURE__*/React.createElement("pre", null, `const renderOption = ({ label, value, onClick, highlighted, selected }) => (
                 <p
                     onClick={event => onClick({ label, value }, event)}
@@ -231,11 +224,10 @@ const RenderOptionCode = () => /*#__PURE__*/React.createElement(React.Fragment,
                     Custom: {label} (label), {value} (value)
                 </p>
             )`)));
-const StatefulTemplateCustomRenderOption = _ref4 => {
-  let {
-    initiallySelected = [],
-    ...args
-  } = _ref4;
+const StatefulTemplateCustomRenderOption = ({
+  initiallySelected = [],
+  ...args
+}) => {
   const [selected, setSelected] = useState(initiallySelected);
   const onChange = payload => setSelected(payload.selected);
   return /*#__PURE__*/React.createElement(Transfer, _extends({}, args, {
@@ -250,12 +242,9 @@ export const CustomListOptions = args => /*#__PURE__*/React.createElement(React.
 CustomListOptions.args = {
   renderOption,
   options: options.slice(0, 2),
-  initiallySelected: options.slice(0, 2).map(_ref5 => {
-    let {
-      value
-    } = _ref5;
-    return value;
-  })
+  initiallySelected: options.slice(0, 2).map(({
+    value
+  }) => value)
 };
 export const IndividualCustomOption = StatefulTemplateCustomRenderOption.bind({});
 IndividualCustomOption.args = {
@@ -303,12 +292,9 @@ export const Reordering = StatefulTemplate.bind({});
 Reordering.args = {
   enableOrderChange: true,
   options: options.slice(0, 20),
-  initiallySelected: options.slice(0, 8).map(_ref6 => {
-    let {
-      value
-    } = _ref6;
-    return value;
-  })
+  initiallySelected: options.slice(0, 8).map(({
+    value
+  }) => value)
 };
 export const ReorderingWithPickedFilter = StatefulTemplate.bind({});
 ReorderingWithPickedFilter.storyName = 'Reordering with picked filter';
@@ -317,18 +303,14 @@ ReorderingWithPickedFilter.args = {
   filterablePicked: true,
   filterPlaceholderPicked: 'Search picked options',
   options: options.slice(0, 20),
-  initiallySelected: options.slice(0, 8).map(_ref7 => {
-    let {
-      value
-    } = _ref7;
-    return value;
-  })
+  initiallySelected: options.slice(0, 8).map(({
+    value
+  }) => value)
 };
-const ReorderingWithRightFooterTemplate = _ref8 => {
-  let {
-    initiallySelected = [],
-    ...args
-  } = _ref8;
+const ReorderingWithRightFooterTemplate = ({
+  initiallySelected = [],
+  ...args
+}) => {
   const [selected, setSelected] = useState(initiallySelected);
   const onChange = payload => setSelected(payload.selected);
   return /*#__PURE__*/React.createElement(Transfer, _extends({}, args, {
@@ -349,24 +331,18 @@ ReorderingWithRightFooterContent.storyName = 'Reordering with right footer conte
 ReorderingWithRightFooterContent.args = {
   enableOrderChange: true,
   options: options.slice(0, 20),
-  initiallySelected: options.slice(0, 8).map(_ref9 => {
-    let {
-      value
-    } = _ref9;
-    return value;
-  })
+  initiallySelected: options.slice(0, 8).map(({
+    value
+  }) => value)
 };
 export const ReorderingWithCustomOptions = StatefulTemplateCustomRenderOption.bind({});
 ReorderingWithCustomOptions.storyName = 'Reordering with custom options';
 ReorderingWithCustomOptions.args = {
   enableOrderChange: true,
   options: options.slice(0, 20),
-  initiallySelected: options.slice(0, 8).map(_ref10 => {
-    let {
-      value
-    } = _ref10;
-    return value;
-  }),
+  initiallySelected: options.slice(0, 8).map(({
+    value
+  }) => value),
   renderOption: option => {
     if (option.value === options[0].value) {
       return renderOption(option);
@@ -403,40 +379,37 @@ const createCustomFilteringInHeader = hideFilterInput => {
     year: index < 5 ? '2020' : '2019'
   }));
   const allOptions = [...relativePeriods, ...fixedPeriods];
-  const Header = _ref11 => {
-    let {
-      onClick,
-      relativePeriod,
-      selectedYear,
-      onSelectedYearChange
-    } = _ref11;
-    return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(TabBar, null, /*#__PURE__*/React.createElement(Tab, {
-      selected: relativePeriod,
-      onClick: () => onClick({
-        relativePeriod: true
-      })
-    }, "Relative periods"), /*#__PURE__*/React.createElement(Tab, {
-      selected: !relativePeriod,
-      onClick: () => onClick({
-        relativePeriod: false
-      })
-    }, "Fixed periods")), /*#__PURE__*/React.createElement("p", {
-      style: {
-        margin: 0,
-        height: 10
-      }
-    }), /*#__PURE__*/React.createElement(SingleSelectField, {
-      label: "Year",
-      selected: selectedYear,
-      onChange: onSelectedYearChange
-    }, /*#__PURE__*/React.createElement(SingleSelectOption, {
-      value: "2020",
-      label: "2020"
-    }), /*#__PURE__*/React.createElement(SingleSelectOption, {
-      value: "2019",
-      label: "2019"
-    })));
-  };
+  const Header = ({
+    onClick,
+    relativePeriod,
+    selectedYear,
+    onSelectedYearChange
+  }) => /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(TabBar, null, /*#__PURE__*/React.createElement(Tab, {
+    selected: relativePeriod,
+    onClick: () => onClick({
+      relativePeriod: true
+    })
+  }, "Relative periods"), /*#__PURE__*/React.createElement(Tab, {
+    selected: !relativePeriod,
+    onClick: () => onClick({
+      relativePeriod: false
+    })
+  }, "Fixed periods")), /*#__PURE__*/React.createElement("p", {
+    style: {
+      margin: 0,
+      height: 10
+    }
+  }), /*#__PURE__*/React.createElement(SingleSelectField, {
+    label: "Year",
+    selected: selectedYear,
+    onChange: onSelectedYearChange
+  }, /*#__PURE__*/React.createElement(SingleSelectOption, {
+    value: "2020",
+    label: "2020"
+  }), /*#__PURE__*/React.createElement(SingleSelectOption, {
+    value: "2019",
+    label: "2019"
+  })));
   /* eslint-enable react/prop-types */
 
   const CustomTransfer = props => {
@@ -449,28 +422,19 @@ const createCustomFilteringInHeader = hideFilterInput => {
       if (filter === '') {
         return optionsWithPeriod;
       }
-      return optionsWithPeriod.filter(_ref12 => {
-        let {
-          label
-        } = _ref12;
-        return label.indexOf(filter) !== -1;
-      });
+      return optionsWithPeriod.filter(({
+        label
+      }) => label.indexOf(filter) !== -1);
     };
     const header = /*#__PURE__*/React.createElement(Header, {
       relativePeriod: relativePeriod,
       selectedYear: year,
-      onSelectedYearChange: _ref13 => {
-        let {
-          selected
-        } = _ref13;
-        return setYear(selected);
-      },
-      onClick: _ref14 => {
-        let {
-          relativePeriod: newRelativePeriod
-        } = _ref14;
-        return setRelativePeriod(newRelativePeriod);
-      }
+      onSelectedYearChange: ({
+        selected
+      }) => setYear(selected),
+      onClick: ({
+        relativePeriod: newRelativePeriod
+      }) => setRelativePeriod(newRelativePeriod)
     });
     return /*#__PURE__*/React.createElement(Transfer, _extends({}, props, {
       options: allOptions,
@@ -480,22 +444,18 @@ const createCustomFilteringInHeader = hideFilterInput => {
       filterCallback: filterCallback,
       leftHeader: header,
       rightHeader: /*#__PURE__*/React.createElement("p", null, /*#__PURE__*/React.createElement("b", null, "Selected Periods")),
-      onFilterChange: _ref15 => {
-        let {
-          value
-        } = _ref15;
-        return setFilter(value);
-      },
+      onFilterChange: ({
+        value
+      }) => setFilter(value),
       height: "400px",
       filterLabel: "Filter options",
       filterPlaceholder: "Search"
     }));
   };
-  return _ref16 => {
-    let {
-      initiallySelected,
-      ...args
-    } = _ref16;
+  return ({
+    initiallySelected,
+    ...args
+  }) => {
     const [selected, setSelected] = useState(initiallySelected);
     const onChange = payload => setSelected(payload.selected);
     return /*#__PURE__*/React.createElement(CustomTransfer, _extends({}, args, {
@@ -529,12 +489,9 @@ export const InfiniteLoading = args => {
   // selected options
   const [selected] = useState(
   // Last 4 options preselected
-  preSelectedOptions.map(_ref17 => {
-    let {
-      value
-    } = _ref17;
-    return value;
-  }));
+  preSelectedOptions.map(({
+    value
+  }) => value));
   const selectedOptionsLookup = useMemo(() => preSelectedOptions.reduce((lookup, option) => {
     lookup[option.value] = option;
     return lookup;
@@ -573,12 +530,9 @@ export const LoadingPicked = StatefulTemplate.bind({});
 LoadingPicked.args = {
   loadingPicked: true,
   options: options.slice(0, 3),
-  initiallySelected: options.slice(0, 2).map(_ref18 => {
-    let {
-      value
-    } = _ref18;
-    return value;
-  })
+  initiallySelected: options.slice(0, 2).map(({
+    value
+  }) => value)
 };
 export const RTL = args => /*#__PURE__*/React.createElement("div", {
   dir: "rtl"

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@dhis2-ui/transfer",
-    "version": "10.16.3",
+    "version": "10.16.5",
     "description": "UI Transfer",
     "repository": {
         "type": "git",
@@ -34,13 +34,13 @@
     },
     "dependencies": {
         "@dhis2/prop-types": "^3.1.2",
-        "@dhis2-ui/button": "10.16.3",
-        "@dhis2-ui/field": "10.16.3",
-        "@dhis2-ui/input": "10.16.3",
-        "@dhis2-ui/intersection-detector": "10.16.3",
-        "@dhis2-ui/loader": "10.16.3",
-        "@dhis2-ui/tooltip": "10.16.3",
-        "@dhis2/ui-constants": "10.16.3",
+        "@dhis2-ui/button": "10.16.5",
+        "@dhis2-ui/field": "10.16.5",
+        "@dhis2-ui/input": "10.16.5",
+        "@dhis2-ui/intersection-detector": "10.16.5",
+        "@dhis2-ui/loader": "10.16.5",
+        "@dhis2-ui/tooltip": "10.16.5",
+        "@dhis2/ui-constants": "10.16.5",
         "classnames": "^2.3.1",
         "prop-types": "^15.7.2"
     },

package/src/locales/index.js

@@ -11,6 +11,11 @@ import i18n from '@dhis2/d2-i18n'
 import enTranslations from './en/translations.json'
 
 const namespace = 'default'
-i18n.addResources('en', namespace, enTranslations)
+
+// Use 'deep' = true and 'overwrite' = false to add to, but not overwrite,
+// custom translations from the datastore (added by the app adapter)
+
+i18n.addResourceBundle('en', namespace, enTranslations, true, false)
+i18n.addResourceBundle('en', namespace, enTranslations, true, false)
 
 export default i18n