@dhis2-ui/pagination 10.16.3-alpha.1 → 10.16.4

package/build/es/get-default-page-summary-text.js

@@ -1,13 +1,12 @@
 import i18n from './locales/index.js';
 const isValidNumber = input => typeof input === 'number' && !isNaN(input);
-export const getDefaultPageSummaryText = _ref => {
-  let {
-    firstItem,
-    lastItem,
-    page,
-    pageCount,
-    total
-  } = _ref;
+export const getDefaultPageSummaryText = ({
+  firstItem,
+  lastItem,
+  page,
+  pageCount,
+  total
+}) => {
   if (isValidNumber(total) && isValidNumber(lastItem)) {
     return i18n.t('Page {{page}} of {{pageCount}}, items {{firstItem}}-{{lastItem}} of {{total}}', {
       page,

package/build/es/get-item-range.js

@@ -1,11 +1,10 @@
-export const getItemRange = _ref => {
-  let {
-    isLastPage,
-    page,
-    pageLength,
-    pageSize,
-    total
-  } = _ref;
+export const getItemRange = ({
+  isLastPage,
+  page,
+  pageLength,
+  pageSize,
+  total
+}) => {
   // page is 1-based
   let firstItem = (page - 1) * pageSize + 1;
   let lastItem = firstItem + pageSize - 1;

package/build/es/locales/index.js

@@ -42,38 +42,76 @@ 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('bn', namespace, bnTranslations);
-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('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('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('bn', namespace, bnTranslations, true, false);
+i18n.addResourceBundle('bn', namespace, bnTranslations, 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('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('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/page-controls.js

@@ -10,42 +10,39 @@ const translate = (prop, interpolationObject) => {
   }
   return prop;
 };
-const PageControls = _ref => {
-  let {
-    dataTest,
-    isNextDisabled,
-    isPreviousDisabled,
-    nextPageText,
-    page,
-    previousPageText,
-    onClick
-  } = _ref;
-  return /*#__PURE__*/React.createElement("div", {
-    "data-test": `${dataTest}-pagecontrols`,
-    className: _JSXStyle.dynamic([["3252926163", [spacers.dp4]]])
-  }, /*#__PURE__*/React.createElement(Button, {
-    secondary: true,
-    className: "button-previous",
-    small: true,
-    disabled: isPreviousDisabled,
-    onClick: () => onClick(page - 1),
-    dataTest: `${dataTest}-page-previous`
-  }, /*#__PURE__*/React.createElement("div", {
-    className: _JSXStyle.dynamic([["3252926163", [spacers.dp4]]]) + " " + "navigator-icon"
-  }, /*#__PURE__*/React.createElement(IconChevronLeft16, null)), translate(previousPageText)), /*#__PURE__*/React.createElement(Button, {
-    secondary: true,
-    className: "button-next",
-    small: true,
-    disabled: isNextDisabled,
-    onClick: () => onClick(page + 1),
-    dataTest: `${dataTest}-page-next`
-  }, translate(nextPageText), /*#__PURE__*/React.createElement("div", {
-    className: _JSXStyle.dynamic([["3252926163", [spacers.dp4]]]) + " " + "navigator-icon"
-  }, /*#__PURE__*/React.createElement(IconChevronRight16, null))), /*#__PURE__*/React.createElement(_JSXStyle, {
-    id: "3252926163",
-    dynamic: [spacers.dp4]
-  }, ["div.__jsx-style-dynamic-selector{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;}", "div.__jsx-style-dynamic-selector .button-previous{height:32px;padding-inline-start:0;}", `div.__jsx-style-dynamic-selector .button-next{height:32px;padding-inline-end:0;margin-inline-start:${spacers.dp4};}`, "div.__jsx-style-dynamic-selector .navigator-icon.__jsx-style-dynamic-selector:dir(rtl){-webkit-transform:rotate(180deg);-ms-transform:rotate(180deg);transform:rotate(180deg);}"]));
-};
+const PageControls = ({
+  dataTest,
+  isNextDisabled,
+  isPreviousDisabled,
+  nextPageText,
+  page,
+  previousPageText,
+  onClick
+}) => /*#__PURE__*/React.createElement("div", {
+  "data-test": `${dataTest}-pagecontrols`,
+  className: _JSXStyle.dynamic([["3252926163", [spacers.dp4]]])
+}, /*#__PURE__*/React.createElement(Button, {
+  secondary: true,
+  className: "button-previous",
+  small: true,
+  disabled: isPreviousDisabled,
+  onClick: () => onClick(page - 1),
+  dataTest: `${dataTest}-page-previous`
+}, /*#__PURE__*/React.createElement("div", {
+  className: _JSXStyle.dynamic([["3252926163", [spacers.dp4]]]) + " " + "navigator-icon"
+}, /*#__PURE__*/React.createElement(IconChevronLeft16, null)), translate(previousPageText)), /*#__PURE__*/React.createElement(Button, {
+  secondary: true,
+  className: "button-next",
+  small: true,
+  disabled: isNextDisabled,
+  onClick: () => onClick(page + 1),
+  dataTest: `${dataTest}-page-next`
+}, translate(nextPageText), /*#__PURE__*/React.createElement("div", {
+  className: _JSXStyle.dynamic([["3252926163", [spacers.dp4]]]) + " " + "navigator-icon"
+}, /*#__PURE__*/React.createElement(IconChevronRight16, null))), /*#__PURE__*/React.createElement(_JSXStyle, {
+  id: "3252926163",
+  dynamic: [spacers.dp4]
+}, ["div.__jsx-style-dynamic-selector{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;}", "div.__jsx-style-dynamic-selector .button-previous{height:32px;padding-inline-start:0;}", `div.__jsx-style-dynamic-selector .button-next{height:32px;padding-inline-end:0;margin-inline-start:${spacers.dp4};}`, "div.__jsx-style-dynamic-selector .navigator-icon.__jsx-style-dynamic-selector:dir(rtl){-webkit-transform:rotate(180deg);-ms-transform:rotate(180deg);transform:rotate(180deg);}"]));
 PageControls.propTypes = {
   dataTest: PropTypes.string.isRequired,
   nextPageText: PropTypes.oneOfType([PropTypes.string, PropTypes.func]).isRequired,

package/build/es/page-select.js

@@ -14,40 +14,34 @@ const translate = (prop, interpolationObject) => {
 const createAvailablePages = length => Array.from({
   length
 }, (_x, i) => (i + 1).toString());
-const PageSelect = _ref => {
-  let {
-    dataTest,
-    disabled,
-    pageSelectText,
-    onChange,
-    page,
-    pageCount
-  } = _ref;
-  return /*#__PURE__*/React.createElement("div", {
-    "data-test": `${dataTest}-gotopage`,
-    className: _JSXStyle.dynamic([["599400768", [spacers.dp12]]])
-  }, /*#__PURE__*/React.createElement(SingleSelect, {
-    dense: true,
-    disabled: disabled,
-    selected: page.toString(),
-    onChange: _ref2 => {
-      let {
-        selected
-      } = _ref2;
-      return onChange(parseInt(selected, 10));
-    },
-    className: "select",
-    dataTest: `${dataTest}-page-select`,
-    prefix: translate(pageSelectText)
-  }, createAvailablePages(pageCount).map(availablePage => /*#__PURE__*/React.createElement(SingleSelectOption, {
-    key: availablePage,
-    value: availablePage,
-    label: availablePage
-  }))), /*#__PURE__*/React.createElement(_JSXStyle, {
-    id: "599400768",
-    dynamic: [spacers.dp12]
-  }, [`div.__jsx-style-dynamic-selector{margin-inline-end:${spacers.dp12};}`]));
-};
+const PageSelect = ({
+  dataTest,
+  disabled,
+  pageSelectText,
+  onChange,
+  page,
+  pageCount
+}) => /*#__PURE__*/React.createElement("div", {
+  "data-test": `${dataTest}-gotopage`,
+  className: _JSXStyle.dynamic([["599400768", [spacers.dp12]]])
+}, /*#__PURE__*/React.createElement(SingleSelect, {
+  dense: true,
+  disabled: disabled,
+  selected: page.toString(),
+  onChange: ({
+    selected
+  }) => onChange(parseInt(selected, 10)),
+  className: "select",
+  dataTest: `${dataTest}-page-select`,
+  prefix: translate(pageSelectText)
+}, createAvailablePages(pageCount).map(availablePage => /*#__PURE__*/React.createElement(SingleSelectOption, {
+  key: availablePage,
+  value: availablePage,
+  label: availablePage
+}))), /*#__PURE__*/React.createElement(_JSXStyle, {
+  id: "599400768",
+  dynamic: [spacers.dp12]
+}, [`div.__jsx-style-dynamic-selector{margin-inline-end:${spacers.dp12};}`]));
 PageSelect.propTypes = {
   dataTest: PropTypes.string.isRequired,
   page: PropTypes.number.isRequired,

package/build/es/page-size-select.js

@@ -11,40 +11,34 @@ const translate = (prop, interpolationObject) => {
   }
   return prop;
 };
-const PageSizeSelect = _ref => {
-  let {
-    dataTest,
-    disabled,
-    pageSizeSelectText,
-    pageSize,
-    pageSizes,
-    onChange
-  } = _ref;
-  return /*#__PURE__*/React.createElement("div", {
-    "data-test": `${dataTest}-pagesize`,
-    className: _JSXStyle.dynamic([["3539890457", [spacers.dp12]]])
-  }, /*#__PURE__*/React.createElement(SingleSelect, {
-    dense: true,
-    disabled: disabled,
-    selected: pageSize.toString(),
-    onChange: _ref2 => {
-      let {
-        selected
-      } = _ref2;
-      return onChange(parseInt(selected, 10));
-    },
-    className: "select",
-    dataTest: `${dataTest}-pagesize-select`,
-    prefix: translate(pageSizeSelectText)
-  }, pageSizes.map(length => /*#__PURE__*/React.createElement(SingleSelectOption, {
-    key: length,
-    value: length,
-    label: length
-  }))), /*#__PURE__*/React.createElement(_JSXStyle, {
-    id: "3539890457",
-    dynamic: [spacers.dp12]
-  }, [`div.__jsx-style-dynamic-selector{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-align-items:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-flex-shrink:0;-ms-flex-negative:0;flex-shrink:0;min-height:32px;margin-inline-end:${spacers.dp12};-webkit-box-flex:1;-webkit-flex-grow:1;-ms-flex-positive:1;flex-grow:1;}`]));
-};
+const PageSizeSelect = ({
+  dataTest,
+  disabled,
+  pageSizeSelectText,
+  pageSize,
+  pageSizes,
+  onChange
+}) => /*#__PURE__*/React.createElement("div", {
+  "data-test": `${dataTest}-pagesize`,
+  className: _JSXStyle.dynamic([["3539890457", [spacers.dp12]]])
+}, /*#__PURE__*/React.createElement(SingleSelect, {
+  dense: true,
+  disabled: disabled,
+  selected: pageSize.toString(),
+  onChange: ({
+    selected
+  }) => onChange(parseInt(selected, 10)),
+  className: "select",
+  dataTest: `${dataTest}-pagesize-select`,
+  prefix: translate(pageSizeSelectText)
+}, pageSizes.map(length => /*#__PURE__*/React.createElement(SingleSelectOption, {
+  key: length,
+  value: length,
+  label: length
+}))), /*#__PURE__*/React.createElement(_JSXStyle, {
+  id: "3539890457",
+  dynamic: [spacers.dp12]
+}, [`div.__jsx-style-dynamic-selector{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-align-items:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-flex-shrink:0;-ms-flex-negative:0;flex-shrink:0;min-height:32px;margin-inline-end:${spacers.dp12};-webkit-box-flex:1;-webkit-flex-grow:1;-ms-flex-positive:1;flex-grow:1;}`]));
 PageSizeSelect.propTypes = {
   dataTest: PropTypes.string.isRequired,
   pageSize: PropTypes.number.isRequired,

package/build/es/page-summary.js

@@ -9,17 +9,16 @@ const translate = (prop, interpolationObject) => {
   }
   return prop;
 };
-const PageSummary = _ref => {
-  let {
-    dataTest,
-    firstItem,
-    inactive,
-    lastItem,
-    page,
-    pageCount,
-    pageSummaryText,
-    total
-  } = _ref;
+const PageSummary = ({
+  dataTest,
+  firstItem,
+  inactive,
+  lastItem,
+  page,
+  pageCount,
+  pageSummaryText,
+  total
+}) => {
   const summary = translate(pageSummaryText, {
     firstItem,
     lastItem,

package/build/es/pagination.js

@@ -21,29 +21,28 @@ const defaultProps = {
   pageSummaryText: getDefaultPageSummaryText,
   previousPageText: () => i18n.t('Previous')
 };
-const Pagination = _ref => {
-  let {
-    className,
-    dataTest = defaultProps.dataTest,
-    disabled,
-    hidePageSelect,
-    hidePageSizeSelect,
-    hidePageSummary,
-    isLastPage,
-    nextPageText = defaultProps.nextPageText,
-    onPageChange,
-    onPageSizeChange,
-    page,
-    pageCount,
-    pageLength,
-    pageSelectText = defaultProps.pageSelectText,
-    pageSize,
-    pageSizes = defaultProps.pageSizes,
-    pageSizeSelectText = defaultProps.pageSizeSelectText,
-    pageSummaryText = defaultProps.pageSummaryText,
-    previousPageText = defaultProps.previousPageText,
-    total
-  } = _ref;
+const Pagination = ({
+  className,
+  dataTest = defaultProps.dataTest,
+  disabled,
+  hidePageSelect,
+  hidePageSizeSelect,
+  hidePageSummary,
+  isLastPage,
+  nextPageText = defaultProps.nextPageText,
+  onPageChange,
+  onPageSizeChange,
+  page,
+  pageCount,
+  pageLength,
+  pageSelectText = defaultProps.pageSelectText,
+  pageSize,
+  pageSizes = defaultProps.pageSizes,
+  pageSizeSelectText = defaultProps.pageSizeSelectText,
+  pageSummaryText = defaultProps.pageSummaryText,
+  previousPageText = defaultProps.previousPageText,
+  total
+}) => {
   const {
     firstItem,
     lastItem

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

@@ -96,17 +96,14 @@ WithoutAnySelect.args = {
   ...WithoutGoToPageSelect.args,
   ...WithoutPageSizeSelect.args
 };
-const InBox = _ref => {
-  let {
-    boxWidth,
-    ...args
-  } = _ref;
-  return /*#__PURE__*/React.createElement("div", {
-    style: {
-      width: boxWidth
-    }
-  }, /*#__PURE__*/React.createElement(Pagination, args));
-};
+const InBox = ({
+  boxWidth,
+  ...args
+}) => /*#__PURE__*/React.createElement("div", {
+  style: {
+    width: boxWidth
+  }
+}, /*#__PURE__*/React.createElement(Pagination, args));
 export const MediumWidth = InBox.bind({});
 MediumWidth.args = {
   ...pagers.atTenthPage,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@dhis2-ui/pagination",
-    "version": "10.16.3-alpha.1",
+    "version": "10.16.4",
     "description": "UI Pagination",
     "repository": {
         "type": "git",
@@ -34,10 +34,10 @@
     },
     "dependencies": {
         "@dhis2/prop-types": "^3.1.2",
-        "@dhis2-ui/button": "10.16.3-alpha.1",
-        "@dhis2-ui/select": "10.16.3-alpha.1",
-        "@dhis2/ui-constants": "10.16.3-alpha.1",
-        "@dhis2/ui-icons": "10.16.3-alpha.1",
+        "@dhis2-ui/button": "10.16.4",
+        "@dhis2-ui/select": "10.16.4",
+        "@dhis2/ui-constants": "10.16.4",
+        "@dhis2/ui-icons": "10.16.4",
         "classnames": "^2.3.1",
         "prop-types": "^15.7.2"
     },