@daoyi/nmtl-ui 2.0.1-beta.66 → 2.0.1-beta.68

package/lib/components/Filter.js

@@ -754,7 +754,9 @@ var Filter = function Filter(_ref) {
       }, {
         'filter__item--active': key === urlSearch[filterKey]
       }),
-      onClick: handleClick
+      onClick: function onClick() {
+        return handleClick(key);
+      }
     }, "".concat(title, "(").concat(count, ")"));
   }));
 };

package/lib/components/{NmtlPagination.js → Pagination.js}

@@ -1,3 +1,4 @@
+import { c as _objectWithoutProperties$1 } from './_rollupPluginBabelHelpers-ed61ffc0.js';
 import * as React$2 from 'react';
 import React__default, { Children, isValidElement, cloneElement } from 'react';
 import PropTypes from 'prop-types';
@@ -2544,7 +2545,7 @@ function defaultGetAriaLabel(type, page, selected) {
   return "Go to ".concat(type, " page");
 }
 
-var Pagination = /*#__PURE__*/React$2.forwardRef(function Pagination(props, ref) {
+var Pagination$1 = /*#__PURE__*/React$2.forwardRef(function Pagination(props, ref) {
   props.boundaryCount;
       var classes = props.classes,
       className = props.className,
@@ -2597,9 +2598,9 @@ var Pagination = /*#__PURE__*/React$2.forwardRef(function Pagination(props, ref)
     })));
   })));
 }); // @default tags synced with default values from usePagination
-var Pagination$1 = withStyles(styles$4, {
+var MUIPagination = withStyles(styles$4, {
   name: 'MuiPagination'
-})(Pagination);
+})(Pagination$1);
 
 /**
  * @ignore - internal component.
@@ -3605,28 +3606,33 @@ var _default = (0, _createSvgIcon.default)( /*#__PURE__*/React.createElement("pa
 
 default_1 = ArrowRight.default = _default;
 
-var css_248z = ".ntmlPagination__center {\n  display: flex;\n  justify-content: center; }\n  .ntmlPagination__center .MuiSvgIcon-colorSecondary {\n    color: #509891; }\n\n.ntmlPagination__rightSide {\n  position: relative;\n  float: right;\n  top: -36px; }\n  .ntmlPagination__rightSide-showTotal {\n    display: flex;\n    align-items: center; }\n    .ntmlPagination__rightSide-showTotal .MuiInput-root {\n      width: 90px;\n      height: 34px;\n      margin: 0 8px;\n      padding: 2px 8px 3px 20px;\n      border-radius: 17px;\n      background-color: rgba(222, 219, 202, 0.4);\n      border: 0px; }\n    .ntmlPagination__rightSide-showTotal .MuiNativeSelect-icon {\n      color: #509891; }\n    .ntmlPagination__rightSide-showTotal .MuiNativeSelect-select:not([multiple]) option,\n    .ntmlPagination__rightSide-showTotal .MuiNativeSelect-select:not([multiple]) optgroup {\n      background-color: rgba(222, 219, 202, 0.4); }\n\n@media only screen and (max-width: 767px) {\n  .ntmlPagination__center-page {\n    width: 48px;\n    height: 48px;\n    display: flex;\n    background-color: rgba(222, 219, 202, 0.4);\n    border-radius: 50%;\n    align-items: center;\n    justify-content: center; }\n  .ntmlPagination__rightSide {\n    position: relative;\n    float: initial;\n    top: 0;\n    display: flex;\n    justify-content: center;\n    margin-top: 28px; } }\n";
+var css_248z = ".ntml-pagination__center {\n  display: flex;\n  justify-content: center; }\n  .ntml-pagination__center .MuiSvgIcon-colorSecondary {\n    color: #509891; }\n\n.ntml-pagination__rightSide {\n  position: relative;\n  float: right;\n  top: -36px; }\n  .ntml-pagination__rightSide-showTotal {\n    display: flex;\n    align-items: center; }\n    .ntml-pagination__rightSide-showTotal .MuiInput-root {\n      width: 90px;\n      height: 34px;\n      margin: 0 8px;\n      padding: 2px 8px 3px 20px;\n      border-radius: 17px;\n      background-color: rgba(222, 219, 202, 0.4);\n      border: 0px; }\n    .ntml-pagination__rightSide-showTotal .MuiNativeSelect-icon {\n      color: #509891; }\n    .ntml-pagination__rightSide-showTotal .MuiNativeSelect-select:not([multiple]) option,\n    .ntml-pagination__rightSide-showTotal .MuiNativeSelect-select:not([multiple]) optgroup {\n      background-color: rgba(222, 219, 202, 0.4); }\n\n@media only screen and (max-width: 767px) {\n  .ntml-pagination__center-page {\n    width: 48px;\n    height: 48px;\n    display: flex;\n    background-color: rgba(222, 219, 202, 0.4);\n    border-radius: 50%;\n    align-items: center;\n    justify-content: center; }\n  .ntml-pagination__rightSide {\n    position: relative;\n    float: initial;\n    top: 0;\n    display: flex;\n    justify-content: center;\n    margin-top: 28px; } }\n";
 styleInject(css_248z);
 
-var NmtlPagination = function NmtlPagination(_ref) {
+var _excluded = ["className", "pageSize", "total", "onChange"];
+var Pagination = function Pagination(_ref) {
   var className = _ref.className,
-    current = _ref.current,
-    defaultCurrent = _ref.defaultCurrent,
     pageSize = _ref.pageSize,
     total = _ref.total,
-    _onChange = _ref.onChange;
+    _onChange = _ref.onChange,
+    props = _objectWithoutProperties$1(_ref, _excluded);
   var count = Math.ceil(total / pageSize);
   var pages = Array.from(Array(count).keys(), function (x) {
     return x + 1;
   });
+
+  // eslint-disable-next-line react/destructuring-assignment
+  var current = Number.parseInt(props.current, 10) || 1;
+  // eslint-disable-next-line react/destructuring-assignment
+  var defaultCurrent = Number.parseInt(props.defaultCurrent, 10) || 1;
   var handlePageSelected = function handlePageSelected(event) {
     var page = Number.parseInt(event.target.value, 10);
     _onChange(page);
   };
   return /*#__PURE__*/React__default.createElement("div", {
-    className: classNames('ntmlPagination', className)
+    className: classNames('ntml-pagination', className)
   }, /*#__PURE__*/React__default.createElement("div", {
-    className: "ntmlPagination__center"
+    className: "ntml-pagination__center"
   }, /*#__PURE__*/React__default.createElement("div", {
     style: {
       display: 'flex',
@@ -3639,7 +3645,7 @@ var NmtlPagination = function NmtlPagination(_ref) {
     }
   }, /*#__PURE__*/React__default.createElement(default_1$1, {
     color: "secondary"
-  })), /*#__PURE__*/React__default.createElement(Pagination$1, {
+  })), /*#__PURE__*/React__default.createElement(MUIPagination, {
     color: "secondary",
     count: count,
     boundaryCount: 1,
@@ -3672,7 +3678,7 @@ var NmtlPagination = function NmtlPagination(_ref) {
     }, page);
   })), /*#__PURE__*/React__default.createElement("span", null, "\u9801\uFF0C\u5171"), count, /*#__PURE__*/React__default.createElement("span", null, "\u9801"))));
 };
-NmtlPagination.defaultProps = {
+Pagination.defaultProps = {
   className: undefined,
   current: undefined,
   defaultCurrent: 1,
@@ -3682,13 +3688,13 @@ NmtlPagination.defaultProps = {
 };
 
 /* Write props detail information and 'npm run updateStory' will help you generate stories's argTypes */
-NmtlPagination.propTypes = {
+Pagination.propTypes = {
   /** Css Name */
   className: PropTypes.string,
   /** 当前页数 */
-  current: PropTypes.number,
+  current: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
   /** 默认的当前页数 */
-  defaultCurrent: PropTypes.number,
+  defaultCurrent: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
   /** 每页条数 */
   pageSize: PropTypes.number,
   /** 数据总数 */
@@ -3697,4 +3703,4 @@ NmtlPagination.propTypes = {
   onChange: PropTypes.func
 };
 
-export { NmtlPagination as default };
+export { Pagination as default };

package/lib/index.d.ts

@@ -22,7 +22,7 @@ export { default as ExportButton } from './components/ExportButton';
 export { default as SNA } from './components/SNA';
 export { default as BarChart } from './components/BarChart';
 export { default as ForwardLink } from './components/ForwardLink';
-export { default as NmtlPagination } from './components/NmtlPagination';
+export { default as Pagination } from './components/Pagination';
 
 export { default as ContactModal } from './components/ContactModal';
 export { default as KeywordSearch } from './components/KeywordSearch';

package/lib/index.js

@@ -22,7 +22,7 @@ export { default as ExportButton } from './components/ExportButton';
 export { default as SNA } from './components/SNA';
 export { default as BarChart } from './components/BarChart';
 export { default as ForwardLink } from './components/ForwardLink';
-export { default as NmtlPagination } from './components/NmtlPagination';
+export { default as Pagination } from './components/Pagination';
 
 export { default as ContactModal } from './components/ContactModal';
 export { default as KeywordSearch } from './components/KeywordSearch';

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@daoyi/nmtl-ui",
-	"version": "2.0.1-beta.66",
+	"version": "2.0.1-beta.68",
 	"description": "This project is to be used as a starter kit for building React component using Storybook and Rollup",
 	"author": "daoyi",
 	"main": "lib/index.js",