@dhis2-ui/pagination 8.15.0-alpha.2 → 8.15.0

package/build/cjs/locales/index.js

@@ -61,15 +61,17 @@ var _translations26 = _interopRequireDefault(require("./uk/translations.json"));
 
 var _translations27 = _interopRequireDefault(require("./ur/translations.json"));
 
-var _translations28 = _interopRequireDefault(require("./uz/translations.json"));
+var _translations28 = _interopRequireDefault(require("./uz_Latn/translations.json"));
 
-var _translations29 = _interopRequireDefault(require("./uz_Latn/translations.json"));
+var _translations29 = _interopRequireDefault(require("./uz_UZ_Cyrl/translations.json"));
 
-var _translations30 = _interopRequireDefault(require("./vi/translations.json"));
+var _translations30 = _interopRequireDefault(require("./uz_UZ_Latn/translations.json"));
 
-var _translations31 = _interopRequireDefault(require("./zh/translations.json"));
+var _translations31 = _interopRequireDefault(require("./vi/translations.json"));
 
-var _translations32 = _interopRequireDefault(require("./zh_CN/translations.json"));
+var _translations32 = _interopRequireDefault(require("./zh/translations.json"));
+
+var _translations33 = _interopRequireDefault(require("./zh_CN/translations.json"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -137,15 +139,17 @@ _d2I18n.default.addResources('uk', namespace, _translations26.default);
 
 _d2I18n.default.addResources('ur', namespace, _translations27.default);
 
-_d2I18n.default.addResources('uz', namespace, _translations28.default);
+_d2I18n.default.addResources('uz_Latn', namespace, _translations28.default);
+
+_d2I18n.default.addResources('uz_UZ_Cyrl', namespace, _translations29.default);
 
-_d2I18n.default.addResources('uz_Latn', namespace, _translations29.default);
+_d2I18n.default.addResources('uz_UZ_Latn', namespace, _translations30.default);
 
-_d2I18n.default.addResources('vi', namespace, _translations30.default);
+_d2I18n.default.addResources('vi', namespace, _translations31.default);
 
-_d2I18n.default.addResources('zh', namespace, _translations31.default);
+_d2I18n.default.addResources('zh', namespace, _translations32.default);
 
-_d2I18n.default.addResources('zh_CN', namespace, _translations32.default);
+_d2I18n.default.addResources('zh_CN', namespace, _translations33.default);
 
 var _default = _d2I18n.default;
 exports.default = _default;

package/build/cjs/locales/nb/translations.json

@@ -1,10 +1,10 @@
 {
     "Page {{page}} of {{pageCount}}, items {{firstItem}}-{{lastItem}} of {{total}}": "Side {{page}} av {{pageCount}}, elementer {{firstItem}}-{{lastItem}} av {{total}}",
-    "Page {{page}}, items {{firstItem}}-{{lastItem}}": "",
-    "Page {{page}}": "",
+    "Page {{page}}, items {{firstItem}}-{{lastItem}}": "Side {{page}}, elementer {{firstItem}}-{{lastItem}}",
+    "Page {{page}}": "Side {{page}}",
     "Next": "Neste",
     "Page": "Side",
     "Items per page": "Elementer per side",
     "Previous": "Forrige",
-    "You are at page {{page}} showing items {{firstItem}}-{{lastItem}}, but there are {{pageCount}} pages and {{total}} items": ""
+    "You are at page {{page}} showing items {{firstItem}}-{{lastItem}}, but there are {{pageCount}} pages and {{total}} items": "Du er på side {{page}} som viser elementer {{firstItem}}-{{lastItem}}, men det er {{pageCount}} sider og {{total}} elementer."
 }

package/build/cjs/locales/uz_UZ_Latn/translations.json

@@ -0,0 +1,10 @@
+{
+    "Page {{page}} of {{pageCount}}, items {{firstItem}}-{{lastItem}} of {{total}}": "",
+    "Page {{page}}, items {{firstItem}}-{{lastItem}}": "",
+    "Page {{page}}": "",
+    "Next": "Кейинги",
+    "Page": "Sahifa",
+    "Items per page": "",
+    "Previous": "Oldingi",
+    "You are at page {{page}} showing items {{firstItem}}-{{lastItem}}, but there are {{pageCount}} pages and {{total}} items": ""
+}

package/build/cjs/pagination.js

@@ -9,6 +9,8 @@ var _style = _interopRequireDefault(require("styled-jsx/style"));
 
 var _propTypes = require("@dhis2/prop-types");
 
+var _uiConstants = require("@dhis2/ui-constants");
+
 var _classnames = _interopRequireDefault(require("classnames"));
 
 var _propTypes2 = _interopRequireDefault(require("prop-types"));
@@ -69,9 +71,9 @@ const Pagination = _ref => {
   const showPageSelect = !hidePageSelect && typeof pageCount === 'number' && pageCount > 1 && pageCount <= MAX_PAGE_COUNT;
   return /*#__PURE__*/_react.default.createElement("div", {
     "data-test": dataTest,
-    className: "jsx-3647884394" + " " + ((0, _classnames.default)('container', className) || "")
+    className: _style.default.dynamic([["3796520840", [_uiConstants.spacers.dp4]]]) + " " + ((0, _classnames.default)('container', className) || "")
   }, hidePageSizeSelect ? /*#__PURE__*/_react.default.createElement("div", {
-    className: "jsx-3647884394" + " " + "spacer"
+    className: _style.default.dynamic([["3796520840", [_uiConstants.spacers.dp4]]]) + " " + "spacer"
   }) : /*#__PURE__*/_react.default.createElement(_pageSizeSelect.PageSizeSelect, {
     dataTest: dataTest,
     disabled: disabled,
@@ -89,7 +91,7 @@ const Pagination = _ref => {
     pageSummaryText: pageSummaryText,
     total: total
   }), /*#__PURE__*/_react.default.createElement("div", {
-    className: "jsx-3647884394" + " " + "page-navigation"
+    className: _style.default.dynamic([["3796520840", [_uiConstants.spacers.dp4]]]) + " " + "page-navigation"
   }, showPageSelect && /*#__PURE__*/_react.default.createElement(_pageSelect.PageSelect, {
     dataTest: dataTest,
     disabled: disabled,
@@ -106,8 +108,9 @@ const Pagination = _ref => {
     isNextDisabled: disabled || isLastPage || page === pageCount,
     isPreviousDisabled: disabled || page === 1
   })), /*#__PURE__*/_react.default.createElement(_style.default, {
-    id: "3647884394"
-  }, [".container.jsx-3647884394{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-wrap:wrap;-ms-flex-wrap:wrap;flex-wrap:wrap;}", ".spacer.jsx-3647884394{-webkit-box-flex:1;-webkit-flex-grow:1;-ms-flex-positive:1;flex-grow:1;}", ".page-navigation.jsx-3647884394{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;}"]));
+    id: "3796520840",
+    dynamic: [_uiConstants.spacers.dp4]
+  }, [".container.__jsx-style-dynamic-selector{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-wrap:wrap;-ms-flex-wrap:wrap;flex-wrap:wrap;row-gap:".concat(_uiConstants.spacers.dp4, ";}"), ".spacer.__jsx-style-dynamic-selector{-webkit-box-flex:1;-webkit-flex-grow:1;-ms-flex-positive:1;flex-grow:1;}", ".page-navigation.__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;}"]));
 };
 
 exports.Pagination = Pagination;

package/build/cjs/pagination.stories.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = exports.WithoutPageSummary = exports.WithoutPageSizeSelect = exports.WithoutGoToPageSelect = exports.WithoutAnySelect = exports.WithCustomPageSummary = exports.PagerAtLastPage = exports.PagerAtFirstPage = exports.NoTotalAtLastPageWithoutPageLength = exports.NoTotalAtLastPage = exports.NoTotal = exports.Disabled = exports.Default = void 0;
+exports.default = exports.WithoutPageSummary = exports.WithoutPageSizeSelect = exports.WithoutGoToPageSelect = exports.WithoutAnySelect = exports.WithCustomPageSummary = exports.PagerAtLastPage = exports.PagerAtFirstPage = exports.NoTotalAtLastPageWithoutPageLength = exports.NoTotalAtLastPage = exports.NoTotal = exports.NarrowWidth = exports.MediumWidth = exports.Disabled = exports.Default = void 0;
 
 var _d2I18n = _interopRequireDefault(require("@dhis2/d2-i18n"));
 
@@ -106,4 +106,27 @@ exports.WithoutAnySelect = WithoutAnySelect;
 WithoutAnySelect.args = { ...pagers.atTenthPage,
   ...WithoutGoToPageSelect.args,
   ...WithoutPageSizeSelect.args
+};
+
+const InBox = _ref => {
+  let {
+    boxWidth,
+    ...args
+  } = _ref;
+  return /*#__PURE__*/_react.default.createElement("div", {
+    style: {
+      width: boxWidth
+    }
+  }, /*#__PURE__*/_react.default.createElement(_pagination.Pagination, args));
+};
+
+const MediumWidth = InBox.bind({});
+exports.MediumWidth = MediumWidth;
+MediumWidth.args = { ...pagers.atTenthPage,
+  boxWidth: 500
+};
+const NarrowWidth = InBox.bind({});
+exports.NarrowWidth = NarrowWidth;
+NarrowWidth.args = { ...pagers.atTenthPage,
+  boxWidth: 100
 };

package/build/es/locales/index.js

@@ -34,8 +34,9 @@ import tetTranslations from './tet/translations.json';
 import tgTranslations from './tg/translations.json';
 import ukTranslations from './uk/translations.json';
 import urTranslations from './ur/translations.json';
-import uzTranslations from './uz/translations.json';
 import uz_LatnTranslations from './uz_Latn/translations.json';
+import uz_UZ_CyrlTranslations from './uz_UZ_Cyrl/translations.json';
+import uz_UZ_LatnTranslations from './uz_UZ_Latn/translations.json';
 import viTranslations from './vi/translations.json';
 import zhTranslations from './zh/translations.json';
 import zh_CNTranslations from './zh_CN/translations.json';
@@ -67,8 +68,9 @@ i18n.addResources('tet', namespace, tetTranslations);
 i18n.addResources('tg', namespace, tgTranslations);
 i18n.addResources('uk', namespace, ukTranslations);
 i18n.addResources('ur', namespace, urTranslations);
-i18n.addResources('uz', namespace, uzTranslations);
 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);

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

@@ -1,10 +1,10 @@
 {
     "Page {{page}} of {{pageCount}}, items {{firstItem}}-{{lastItem}} of {{total}}": "Side {{page}} av {{pageCount}}, elementer {{firstItem}}-{{lastItem}} av {{total}}",
-    "Page {{page}}, items {{firstItem}}-{{lastItem}}": "",
-    "Page {{page}}": "",
+    "Page {{page}}, items {{firstItem}}-{{lastItem}}": "Side {{page}}, elementer {{firstItem}}-{{lastItem}}",
+    "Page {{page}}": "Side {{page}}",
     "Next": "Neste",
     "Page": "Side",
     "Items per page": "Elementer per side",
     "Previous": "Forrige",
-    "You are at page {{page}} showing items {{firstItem}}-{{lastItem}}, but there are {{pageCount}} pages and {{total}} items": ""
+    "You are at page {{page}} showing items {{firstItem}}-{{lastItem}}, but there are {{pageCount}} pages and {{total}} items": "Du er på side {{page}} som viser elementer {{firstItem}}-{{lastItem}}, men det er {{pageCount}} sider og {{total}} elementer."
 }

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

@@ -0,0 +1,10 @@
+{
+    "Page {{page}} of {{pageCount}}, items {{firstItem}}-{{lastItem}} of {{total}}": "",
+    "Page {{page}}, items {{firstItem}}-{{lastItem}}": "",
+    "Page {{page}}": "",
+    "Next": "Кейинги",
+    "Page": "Sahifa",
+    "Items per page": "",
+    "Previous": "Oldingi",
+    "You are at page {{page}} showing items {{firstItem}}-{{lastItem}}, but there are {{pageCount}} pages and {{total}} items": ""
+}

package/build/es/pagination.js

@@ -1,5 +1,6 @@
 import _JSXStyle from "styled-jsx/style";
 import { requiredIf } from '@dhis2/prop-types';
+import { spacers } from '@dhis2/ui-constants';
 import cx from 'classnames';
 import PropTypes from 'prop-types';
 import React from 'react';
@@ -48,9 +49,9 @@ const Pagination = _ref => {
   const showPageSelect = !hidePageSelect && typeof pageCount === 'number' && pageCount > 1 && pageCount <= MAX_PAGE_COUNT;
   return /*#__PURE__*/React.createElement("div", {
     "data-test": dataTest,
-    className: "jsx-3647884394" + " " + (cx('container', className) || "")
+    className: _JSXStyle.dynamic([["3796520840", [spacers.dp4]]]) + " " + (cx('container', className) || "")
   }, hidePageSizeSelect ? /*#__PURE__*/React.createElement("div", {
-    className: "jsx-3647884394" + " " + "spacer"
+    className: _JSXStyle.dynamic([["3796520840", [spacers.dp4]]]) + " " + "spacer"
   }) : /*#__PURE__*/React.createElement(PageSizeSelect, {
     dataTest: dataTest,
     disabled: disabled,
@@ -68,7 +69,7 @@ const Pagination = _ref => {
     pageSummaryText: pageSummaryText,
     total: total
   }), /*#__PURE__*/React.createElement("div", {
-    className: "jsx-3647884394" + " " + "page-navigation"
+    className: _JSXStyle.dynamic([["3796520840", [spacers.dp4]]]) + " " + "page-navigation"
   }, showPageSelect && /*#__PURE__*/React.createElement(PageSelect, {
     dataTest: dataTest,
     disabled: disabled,
@@ -85,8 +86,9 @@ const Pagination = _ref => {
     isNextDisabled: disabled || isLastPage || page === pageCount,
     isPreviousDisabled: disabled || page === 1
   })), /*#__PURE__*/React.createElement(_JSXStyle, {
-    id: "3647884394"
-  }, [".container.jsx-3647884394{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-wrap:wrap;-ms-flex-wrap:wrap;flex-wrap:wrap;}", ".spacer.jsx-3647884394{-webkit-box-flex:1;-webkit-flex-grow:1;-ms-flex-positive:1;flex-grow:1;}", ".page-navigation.jsx-3647884394{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;}"]));
+    id: "3796520840",
+    dynamic: [spacers.dp4]
+  }, [".container.__jsx-style-dynamic-selector{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-wrap:wrap;-ms-flex-wrap:wrap;flex-wrap:wrap;row-gap:".concat(spacers.dp4, ";}"), ".spacer.__jsx-style-dynamic-selector{-webkit-box-flex:1;-webkit-flex-grow:1;-ms-flex-positive:1;flex-grow:1;}", ".page-navigation.__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;}"]));
 };
 
 Pagination.defaultProps = {

package/build/es/pagination.stories.js

@@ -76,4 +76,25 @@ export const WithoutAnySelect = Template.bind({});
 WithoutAnySelect.args = { ...pagers.atTenthPage,
   ...WithoutGoToPageSelect.args,
   ...WithoutPageSizeSelect.args
+};
+
+const InBox = _ref => {
+  let {
+    boxWidth,
+    ...args
+  } = _ref;
+  return /*#__PURE__*/React.createElement("div", {
+    style: {
+      width: boxWidth
+    }
+  }, /*#__PURE__*/React.createElement(Pagination, args));
+};
+
+export const MediumWidth = InBox.bind({});
+MediumWidth.args = { ...pagers.atTenthPage,
+  boxWidth: 500
+};
+export const NarrowWidth = InBox.bind({});
+NarrowWidth.args = { ...pagers.atTenthPage,
+  boxWidth: 100
 };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@dhis2-ui/pagination",
-    "version": "8.15.0-alpha.2",
+    "version": "8.15.0",
     "description": "UI Pagination",
     "repository": {
         "type": "git",
@@ -33,22 +33,20 @@
     },
     "dependencies": {
         "@dhis2/prop-types": "^3.1.2",
-        "@dhis2-ui/button": "8.15.0-alpha.2",
-        "@dhis2-ui/select": "8.15.0-alpha.2",
-        "@dhis2/ui-constants": "8.15.0-alpha.2",
-        "@dhis2/ui-icons": "8.15.0-alpha.2",
+        "@dhis2-ui/button": "8.15.0",
+        "@dhis2-ui/select": "8.15.0",
+        "@dhis2/ui-constants": "8.15.0",
+        "@dhis2/ui-icons": "8.15.0",
         "classnames": "^2.3.1",
         "prop-types": "^15.7.2"
     },
     "files": [
-        "build",
-        "types"
+        "build"
     ],
     "devDependencies": {
         "@dhis2/d2-i18n": "^1.1.0",
         "react": "16.13",
         "react-dom": "16.13",
         "styled-jsx": "^4.0.1"
-    },
-    "types": "types"
+    }
 }

package/types/index.d.ts

@@ -1,28 +0,0 @@
-import * as React from 'react'
-
-type TranslateableProp = string | ((argv0: any) => string)
-
-export interface PaginationProps {
-    page: number
-    pageSize: number
-    className?: string
-    dataTest?: string
-    disabled?: boolean
-    hidePageSelect?: boolean
-    hidePageSizeSelect?: boolean
-    hidePageSummary?: boolean
-    isLastPage?: boolean
-    nextPageText?: TranslateableProp
-    pageCount?: number
-    pageLength?: boolean
-    pageSelectText?: TranslateableProp
-    pageSizeSelectText?: TranslateableProp
-    pageSizes?: string[]
-    pageSummaryText?: TranslateableProp
-    previousPageText?: TranslateableProp
-    total?: number
-    onPageChange?: (page: number) => void
-    onPageSizeChange?: (pageSize: number) => void
-}
-
-export const Pagination: React.FC<PaginationProps>