@hi-ui/hiui 2.15.10 → 2.15.11

package/es/popper/index.js

@@ -1,75 +1,78 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
-var _typeof = require("@babel/runtime/helpers/typeof");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
 
-var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
+var _react = _interopRequireWildcard(require("react"));
 
-var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+var _reactDom = require("react-dom");
 
-var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized"));
+var _propTypes = _interopRequireDefault(require("prop-types"));
 
-var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
+var _classnames = _interopRequireDefault(require("classnames"));
 
-var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
+require("./style/index");
 
-var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
+var _context = _interopRequireDefault(require("../context"));
 
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
-var _react = _interopRequireWildcard(require("react"));
+function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function _getRequireWildcardCache() { return cache; }; return cache; }
 
-var _reactDom = require("react-dom");
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
-var _propTypes = _interopRequireDefault(require("prop-types"));
+function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
 
-var _classnames = _interopRequireDefault(require("classnames"));
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
-var _lodash = _interopRequireDefault(require("lodash"));
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
 
-require("./style/index");
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
+
+function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
 
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
 
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); }
 
-function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2["default"])(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2["default"])(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2["default"])(this, result); }; }
+function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
 
-function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Date.prototype.toString.call(Reflect.construct(Date, [], function () {})); return true; } catch (e) { return false; } }
+
+function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
 var Popper = /*#__PURE__*/function (_Component) {
-  (0, _inherits2["default"])(Popper, _Component);
+  _inherits(Popper, _Component);
 
   var _super = _createSuper(Popper);
 
   function Popper() {
     var _this;
 
-    (0, _classCallCheck2["default"])(this, Popper);
+    _classCallCheck(this, Popper);
 
     for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
       args[_key] = arguments[_key];
     }
 
     _this = _super.call.apply(_super, [this].concat(args));
-    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "container", undefined);
-    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "popperHeight", undefined);
+
+    _defineProperty(_assertThisInitialized(_this), "container", undefined);
+
+    _defineProperty(_assertThisInitialized(_this), "popperHeight", undefined);
+
     return _this;
   }
 
-  (0, _createClass2["default"])(Popper, [{
+  _createClass(Popper, [{
     key: "componentDidUpdate",
     value: function componentDidUpdate(prevProps) {
-      if (!_lodash["default"].isEqual(prevProps.children.props, this.props.children.props)) {
-        this.forceUpdate();
-      }
-
       if (prevProps.show !== this.props.show || this.props.show) {
         (0, _reactDom.render)(this.renderChildren(), this.container);
       }
@@ -114,11 +117,6 @@ var Popper = /*#__PURE__*/function (_Component) {
           left = left + leftGap;
           break;
 
-        case 'bottom-end':
-          top = top + topGap + rect.height;
-          left = left + leftGap - width + rect.width;
-          break;
-
         case 'top':
           top = top - topGap;
           left = left + leftGap + rect.width / 2;
@@ -129,18 +127,13 @@ var Popper = /*#__PURE__*/function (_Component) {
           left = left + leftGap;
           break;
 
-        case 'top-end':
-          top = top - topGap;
-          left = left + leftGap - width + rect.width;
-          break;
-
         case 'left':
-          top = top + rect.height / 2;
-          left = left - leftGap;
+          top = top + topGap + rect.height / 2;
+          left = left + leftGap;
           break;
 
         case 'right':
-          top = top + rect.height / 2;
+          top = top + topGap + rect.height / 2;
           left = left + rect.width + leftGap;
           break;
 
@@ -215,11 +208,7 @@ var Popper = /*#__PURE__*/function (_Component) {
           className = _this$props3.className,
           show = _this$props3.show,
           height = _this$props3.height,
-          zIndex = _this$props3.zIndex,
-          onMouseOver = _this$props3.onMouseOver,
-          onMouseOut = _this$props3.onMouseOut,
-          onMouseEnter = _this$props3.onMouseEnter,
-          onMouseLeave = _this$props3.onMouseLeave;
+          zIndex = _this$props3.zIndex;
       if (!attachEle) return;
       var offset = this.getOffset();
       var width = offset.width;
@@ -244,11 +233,7 @@ var Popper = /*#__PURE__*/function (_Component) {
         style: {
           width: width,
           height: height
-        },
-        onMouseOut: onMouseOut,
-        onMouseOver: onMouseOver,
-        onMouseLeave: onMouseLeave,
-        onMouseEnter: onMouseEnter
+        }
       }, children));
     }
   }, {
@@ -258,7 +243,8 @@ var Popper = /*#__PURE__*/function (_Component) {
       container.style.position = 'absolute';
       container.style.top = '0';
       container.style.left = '0';
-      container.style.width = '100%';
+      container.style.width = '100%'; // const child = React.Children.only(this.props.children)
+
       document.body.appendChild(container);
       this.container = container;
     }
@@ -268,11 +254,14 @@ var Popper = /*#__PURE__*/function (_Component) {
       return null;
     }
   }]);
+
   return Popper;
 }(_react.Component);
 
-exports["default"] = Popper;
-(0, _defineProperty2["default"])(Popper, "propTypes", {
+_defineProperty(Popper, "propTypes", {
+  // attachEle: PropTypes.oneOfType([
+  //   PropTypes.node
+  // ]).isRequired,
   width: _propTypes["default"].oneOfType([_propTypes["default"].string, _propTypes["default"].bool, _propTypes["default"].number]),
   // 为false时不设置
   height: _propTypes["default"].number,
@@ -281,16 +270,17 @@ exports["default"] = Popper;
   topGap: _propTypes["default"].number,
   leftGap: _propTypes["default"].number,
   zIndex: _propTypes["default"].number,
-  placement: _propTypes["default"].oneOf(['bottom', 'bottom-start', 'top', 'top-start', 'top-end', 'left', 'right', 'right-start', 'top-bottom-start', 'top-bottom', 'bottom-end']),
-  onMouseOver: _propTypes["default"].func,
-  onMouseOut: _propTypes["default"].func,
-  onMouseEnter: _propTypes["default"].func,
-  onMouseLeave: _propTypes["default"].func
+  placement: _propTypes["default"].oneOf(['bottom', 'bottom-start', 'top', 'top-start', 'left', 'right', 'right-start', 'top-bottom-start', 'top-bottom'])
 });
-(0, _defineProperty2["default"])(Popper, "defaultProps", {
+
+_defineProperty(Popper, "defaultProps", {
   show: false,
   topGap: 2,
-  leftGap: 2,
+  leftGap: 0,
   zIndex: 1060,
   placement: 'bottom-start'
-});
+});
+
+var _default = (0, _context["default"])(Popper);
+
+exports["default"] = _default;

package/es/popper/style/index.css

@@ -1 +1 @@
-.hi-popper__container{position:absolute}.hi-popper__container--hide{display:none !important}.hi-popper__container .hi-popper__content{position:absolute}.hi-popper__container .hi-popper__content--hide{visibility:hidden;opacity:0}.hi-popper__container .hi-popper__content--top{bottom:0;-webkit-transform:translateX(-50%);transform:translateX(-50%)}.hi-popper__container .hi-popper__content--top-start{bottom:0}.hi-popper__container .hi-popper__content--top-end{bottom:0}.hi-popper__container .hi-popper__content--right{-webkit-transform:translateY(-50%);transform:translateY(-50%)}.hi-popper__container .hi-popper__content--bottom{-webkit-transform:translateX(-50%);transform:translateX(-50%)}.hi-popper__container .hi-popper__content--left{right:0;-webkit-transform:translateY(-50%);transform:translateY(-50%)}
+.hi-popper__container{position:absolute}.hi-popper__container--hide{display:none !important}.hi-popper__container .hi-popper__content{position:absolute}.hi-popper__container .hi-popper__content--hide{visibility:hidden;opacity:0}.hi-popper__container .hi-popper__content--top{bottom:0;-webkit-transform:translateX(-50%);transform:translateX(-50%)}.hi-popper__container .hi-popper__content--top-start{bottom:0}.hi-popper__container .hi-popper__content--right{-webkit-transform:translateY(-50%);transform:translateY(-50%)}.hi-popper__container .hi-popper__content--bottom{-webkit-transform:translateX(-50%);transform:translateX(-50%)}.hi-popper__container .hi-popper__content--left{right:0;-webkit-transform:translateY(-50%);transform:translateY(-50%)}

package/es/progress/BarProgress.js

@@ -1,127 +1,61 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = void 0;
-
-var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
-
-var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
-
-var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized"));
-
-var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
-
-var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
-
-var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
-
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+exports.BarProgress = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
-var _classnames = _interopRequireDefault(require("classnames"));
-
-function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2["default"])(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2["default"])(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2["default"])(this, result); }; }
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
-function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
-
-var BarProgress = /*#__PURE__*/function (_React$Component) {
-  (0, _inherits2["default"])(BarProgress, _React$Component);
-
-  var _super = _createSuper(BarProgress);
-
-  function BarProgress() {
-    var _this;
-
-    (0, _classCallCheck2["default"])(this, BarProgress);
-
-    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-      args[_key] = arguments[_key];
+var BarProgress = function BarProgress(props) {
+  function getWidth() {
+    if (!props.width || props.width <= 0) {
+      return props.size === 'big' || props.size === 'large' ? 480 : 160;
     }
 
-    _this = _super.call.apply(_super, [this].concat(args));
-    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "textRef", /*#__PURE__*/_react["default"].createRef());
-    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "state", {
-      insidePlacement: 'right'
-    });
-    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "getWidth", function () {
-      var _this$props = _this.props,
-          width = _this$props.width,
-          size = _this$props.size;
-
-      if (!width || width <= 0) {
-        return size === 'large' ? 480 : 160;
-      }
+    return props.width;
+  }
 
-      return width;
-    });
-    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "getHeight", function () {
-      var _this$props2 = _this.props,
-          size = _this$props2.size,
-          height = _this$props2.height;
+  function getHeight() {
+    var size = props.size,
+        height = props.height;
 
-      if (!height || height <= 0) {
-        return size === 'large' ? 8 : size === 'default' ? 6 : 2;
-      }
+    if (!height || height <= 0) {
+      return size === 'big' || size === 'large' ? 8 : size === 'middle' ? 6 : 2;
+    }
 
-      return height;
-    });
-    return _this;
+    return height;
   }
 
-  (0, _createClass2["default"])(BarProgress, [{
-    key: "componentDidMount",
-    value: function componentDidMount() {
-      if (this.props.placement === 'inside') {
-        if (this.textRef.current && this.textRef.current.clientWidth >= this.getWidth() - (this.getWidth() * this.props.percent / 100 + 5)) {
-          this.setState({
-            insidePlacement: 'left'
-          });
-        } else {
-          this.setState({
-            insidePlacement: 'right'
-          });
-        }
-      }
+  var prefix = 'hi-progress';
+  var percentNum = props.percent,
+      text = props.text,
+      status = props.status,
+      _props$withOutText = props.withOutText,
+      withOutText = _props$withOutText === void 0 ? false : _props$withOutText,
+      _props$inside = props.inside,
+      inside = _props$inside === void 0 ? false : _props$inside,
+      _props$tooltip = props.tooltip,
+      tooltip = _props$tooltip === void 0 ? null : _props$tooltip;
+  var percent = percentNum > 0 ? percentNum : 0;
+  return /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement("div", {
+    className: "".concat(prefix, "__inner"),
+    style: {
+      width: getWidth() + 'px',
+      height: getHeight() + 'px'
     }
-  }, {
-    key: "render",
-    value: function render() {
-      var prefix = 'hi-progress';
-      var _this$props3 = this.props,
-          percentNum = _this$props3.percent,
-          content = _this$props3.content,
-          type = _this$props3.type,
-          showInfo = _this$props3.showInfo,
-          placement = _this$props3.placement,
-          _this$props3$tooltip = _this$props3.tooltip,
-          tooltip = _this$props3$tooltip === void 0 ? null : _this$props3$tooltip,
-          active = _this$props3.active;
-      var percent = percentNum > 0 ? percentNum : 0;
-      return /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement("div", {
-        className: "".concat(prefix, "__inner"),
-        style: {
-          width: this.getWidth() + 'px',
-          height: this.getHeight() + 'px'
-        }
-      }, /*#__PURE__*/_react["default"].createElement("div", {
-        className: (0, _classnames["default"])("".concat(prefix, "__bar ").concat(prefix, "__bar--").concat(type), (0, _defineProperty2["default"])({}, "".concat(prefix, "__bar--active"), active)),
-        style: {
-          width: "".concat(percent, "%")
-        }
-      }, showInfo && placement === 'inside' && this.getHeight() >= 14 && /*#__PURE__*/_react["default"].createElement("div", {
-        ref: this.textRef,
-        className: "".concat(prefix, "__text--inside inside--").concat(this.state.insidePlacement)
-      }, content || "".concat(percent, "%")), tooltip)), showInfo && placement === 'outside' && /*#__PURE__*/_react["default"].createElement("div", {
-        className: "".concat(prefix, "__text ").concat(prefix, "__text--").concat(type)
-      }, content || "".concat(percent, "%")));
+  }, /*#__PURE__*/_react["default"].createElement("div", {
+    className: "".concat(prefix, "__bar ").concat(prefix, "__bar--").concat(status),
+    style: {
+      width: "".concat(percent, "%")
     }
-  }]);
-  return BarProgress;
-}(_react["default"].Component);
-
-exports["default"] = BarProgress;
+  }, !withOutText && inside && getHeight() >= 14 && /*#__PURE__*/_react["default"].createElement("div", {
+    className: "".concat(prefix, "__text--inside")
+  }, text || "".concat(percent, "%")), tooltip)), !withOutText && !inside && /*#__PURE__*/_react["default"].createElement("div", {
+    className: "".concat(prefix, "__text ").concat(prefix, "__text--").concat(status)
+  }, text || "".concat(percent, "%")));
+};
+
+exports.BarProgress = BarProgress;

package/es/progress/CircleProgress.js

@@ -1,7 +1,5 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -9,13 +7,16 @@ exports.CircleProgress = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+
 var CircleProgress = function CircleProgress(props) {
   var prefix = 'hi-progress';
   var percentNum = props.percent,
-      content = props.content,
-      type = props.type,
+      text = props.text,
+      status = props.status,
       radiusThis = props.radius,
-      showInfo = props.showInfo;
+      _props$withOutText = props.withOutText,
+      withOutText = _props$withOutText === void 0 ? false : _props$withOutText;
   var percent = percentNum > 0 ? percentNum : 0;
   var radius = radiusThis > 0 ? radiusThis : 40;
   var totalRadiusWidth = radius + 10;
@@ -37,13 +38,13 @@ var CircleProgress = function CircleProgress(props) {
     cx: totalRadiusWidth,
     cy: totalRadiusWidth,
     r: radius,
-    className: "".concat(prefix, "__circle ").concat(prefix, "__circle--").concat(type),
+    className: "".concat(prefix, "__circle ").concat(prefix, "__circle--").concat(status),
     strokeDasharray: "".concat(strokeDash, " ").concat(strokeDash),
     strokeDashoffset: "".concat(strokeDash * ((100 - percent) / 100)),
     strokeLinecap: "round"
-  })), showInfo && /*#__PURE__*/_react["default"].createElement("div", {
-    className: "".concat(prefix, "__text ").concat(prefix, "__text--").concat(type)
-  }, content || "".concat(percent, "%")));
+  })), !withOutText && /*#__PURE__*/_react["default"].createElement("div", {
+    className: "".concat(prefix, "__text ").concat(prefix, "__text--").concat(status)
+  }, text || "".concat(percent, "%")));
 };
 
 exports.CircleProgress = CircleProgress;

package/es/progress/DashboardProgress.js

@@ -1,7 +1,5 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -9,13 +7,16 @@ exports.DashboardProgress = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+
 var DashboardProgress = function DashboardProgress(props) {
   var prefix = 'hi-progress';
   var percentNum = props.percent,
-      content = props.content,
+      text = props.text,
       status = props.status,
       radiusThis = props.radius,
-      showInfo = props.showInfo;
+      _props$withOutText = props.withOutText,
+      withOutText = _props$withOutText === void 0 ? false : _props$withOutText;
   var percent = percentNum > 0 ? percentNum : 0;
   var radius = radiusThis > 0 ? radiusThis : 40;
   var totalRadiusWidth = radius + 10;
@@ -50,11 +51,12 @@ var DashboardProgress = function DashboardProgress(props) {
   }), /*#__PURE__*/_react["default"].createElement("path", {
     className: "".concat(prefix, "__dashboard ").concat(prefix, "__dashboard--").concat(status),
     d: pathString,
-    strokeLinecap: "round",
+    strokeLinecap: "round" // ref={(path) => { this.path = path }}
+    ,
     style: strokePathStyle
-  })), showInfo && /*#__PURE__*/_react["default"].createElement("div", {
+  })), !withOutText && /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__text ").concat(prefix, "__text--").concat(status)
-  }, content || "".concat(percent, "%")));
+  }, text || "".concat(percent, "%")));
 };
 
 exports.DashboardProgress = DashboardProgress;

package/es/progress/index.js

@@ -1,20 +1,112 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
 
-var _Progress = _interopRequireDefault(require("./Progress"));
+var _react = _interopRequireWildcard(require("react"));
+
+var _propTypes = _interopRequireDefault(require("prop-types"));
+
+require("./style");
+
+var _BarProgress = require("./BarProgress.js");
+
+var _CircleProgress = require("./CircleProgress.js");
+
+var _DashboardProgress = require("./DashboardProgress");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+
+function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function _getRequireWildcardCache() { return cache; }; return cache; }
+
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
+function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
+
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
+
+function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
 
-var _util = require("../_util");
+function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
 
-require("./style/index");
+function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); }
 
-var _default = (0, _util.depreactedPropsCompat)([['apperance', 'type'], ['content', 'text'], ['showInfo', 'withOutText'], ['type', 'status'], ['placement', 'inside', function (data) {
-  return data ? 'inside' : 'outside';
-}]])(_Progress["default"]);
+function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
+
+function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Date.prototype.toString.call(Reflect.construct(Date, [], function () {})); return true; } catch (e) { return false; } }
+
+function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+var Progress = /*#__PURE__*/function (_Component) {
+  _inherits(Progress, _Component);
+
+  var _super = _createSuper(Progress);
+
+  function Progress() {
+    _classCallCheck(this, Progress);
+
+    return _super.apply(this, arguments);
+  }
+
+  _createClass(Progress, [{
+    key: "getRenderType",
+    value: function getRenderType(type) {
+      switch (type) {
+        case 'circle':
+          return /*#__PURE__*/_react["default"].createElement(_CircleProgress.CircleProgress, this.props);
+
+        case 'dashboard':
+          return /*#__PURE__*/_react["default"].createElement(_DashboardProgress.DashboardProgress, this.props);
+
+        default:
+          return /*#__PURE__*/_react["default"].createElement(_BarProgress.BarProgress, this.props);
+      }
+    }
+  }, {
+    key: "render",
+    value: function render() {
+      var prefix = 'hi-progress';
+      var _this$props = this.props,
+          _this$props$className = _this$props.className,
+          className = _this$props$className === void 0 ? '' : _this$props$className,
+          type = _this$props.type;
+      return /*#__PURE__*/_react["default"].createElement("div", {
+        className: "".concat(prefix, "__container ").concat(className)
+      }, this.getRenderType(type));
+    }
+  }]);
+
+  return Progress;
+}(_react.Component);
+
+_defineProperty(Progress, "propTypes", {
+  type: _propTypes["default"].string,
+  status: _propTypes["default"].oneOf(['success', 'warn', 'error', 'primary']),
+  percent: _propTypes["default"].number,
+  width: _propTypes["default"].number,
+  height: _propTypes["default"].number,
+  tooltip: _propTypes["default"].oneOfType([_propTypes["default"].string, _propTypes["default"].node]),
+  text: _propTypes["default"].oneOfType([_propTypes["default"].string, _propTypes["default"].node]),
+  size: _propTypes["default"].oneOf(['big', 'large', 'middle', 'small'])
+});
+
+_defineProperty(Progress, "defaultProps", {
+  type: 'bar',
+  size: 'large',
+  percent: 0,
+  radius: 40,
+  status: 'primary'
+});
 
+var _default = Progress;
 exports["default"] = _default;

package/es/progress/style/index.css

@@ -1 +1 @@
-.hi-progress__inner{background-color:#f2f2f2;border-radius:10px;position:relative;overflow:hidden;display:inline-block;vertical-align:middle}.hi-progress__bar--active.hi-progress__bar::before{position:absolute;top:0;right:0;bottom:0;left:0;background:#fff;opacity:0;content:'';-webkit-animation:hi-progress-active 2.4s cubic-bezier(0.23, 1, 0.32, 1) infinite;animation:hi-progress-active 2.4s cubic-bezier(0.23, 1, 0.32, 1) infinite}.hi-progress__bar{height:100%;display:block;position:relative;background-color:#3b76dc;-webkit-transition:width 0.4s cubic-bezier(0.3, 0, 0.7, 1);transition:width 0.4s cubic-bezier(0.3, 0, 0.7, 1)}.hi-progress__bar--success{background-color:#1da653}.hi-progress__bar--warn{background-color:#e19d0c}.hi-progress__bar--error{background-color:#eb5252}.hi-progress__text{padding-left:25px;font-size:14px;color:#666;display:inline-block;vertical-align:middle}.hi-progress__text--inside{font-size:14px;position:absolute;right:-5px;top:50%;-webkit-transform:translate(100%, -50%);transform:translate(100%, -50%);line-height:14px}.hi-progress__text--inside.inside--left{color:#fff;right:5px;-webkit-transform:translate(0, -50%);transform:translate(0, -50%)}.hi-progress__text--success{color:#1da653}.hi-progress__text--warn{color:#e19d0c}.hi-progress__text--error{color:#eb5252}.hi-progress__svg{position:relative}.hi-progress__svg .hi-progress__text{display:block;position:absolute;width:100%;text-align:center;line-height:1;top:50%;-webkit-transform:translateY(-50%);transform:translateY(-50%);left:0;margin:0;padding:0;overflow:hidden;text-overflow:ellipsis}.hi-progress__svgbackground{fill:none;stroke:#e9e9e7;stroke-width:6}.hi-progress__circle{fill:none;stroke:#3b76dc;stroke-width:6;-webkit-transform:rotate(-90deg);transform:rotate(-90deg);-webkit-transform-origin:50% 50%;transform-origin:50% 50%;-webkit-transition:stroke-dashoffset 0.4s cubic-bezier(0.3, 0, 0.7, 1);transition:stroke-dashoffset 0.4s cubic-bezier(0.3, 0, 0.7, 1)}.hi-progress__circle--success{stroke:#1da653}.hi-progress__circle--warn{stroke:#e19d0c}.hi-progress__circle--error{stroke:#eb5252}.hi-progress__dashboard{fill:none;stroke:#3b76dc;stroke-width:6;-webkit-transition:stroke-dasharray 0.4s cubic-bezier(0.3, 0, 0.7, 1);transition:stroke-dasharray 0.4s cubic-bezier(0.3, 0, 0.7, 1)}.hi-progress__dashboard--success{stroke:#1da653}.hi-progress__dashboard--warn{stroke:#e19d0c}.hi-progress__dashboard--error{stroke:#eb5252}.theme__orange .hi-progress__bar--primary{background-color:#f63}.theme__orange .hi-progress__text--primary{color:#f63}.theme__orange .hi-progress__circle{stroke:#f63}.theme__orange .hi-progress__circle--success{stroke:#1da653}.theme__orange .hi-progress__circle--warn{stroke:#e19d0c}.theme__orange .hi-progress__circle--error{stroke:#eb5252}.theme__orange .hi-progress__dashboard{stroke:#f63}.theme__orange .hi-progress__dashboard--success{stroke:#1da653}.theme__orange .hi-progress__dashboard--warn{stroke:#e19d0c}.theme__orange .hi-progress__dashboard--error{stroke:#eb5252}.theme__cyan .hi-progress__bar--primary{background-color:#46bc99}.theme__cyan .hi-progress__text--primary{color:#46bc99}.theme__cyan .hi-progress__circle{stroke:#46bc99}.theme__cyan .hi-progress__circle--success{stroke:#1da653}.theme__cyan .hi-progress__circle--warn{stroke:#e19d0c}.theme__cyan .hi-progress__circle--error{stroke:#eb5252}.theme__cyan .hi-progress__dashboard{stroke:#46bc99}.theme__cyan .hi-progress__dashboard--success{stroke:#1da653}.theme__cyan .hi-progress__dashboard--warn{stroke:#e19d0c}.theme__cyan .hi-progress__dashboard--error{stroke:#eb5252}.theme__magenta .hi-progress__bar--primary{background-color:#ff5975}.theme__magenta .hi-progress__text--primary{color:#ff5975}.theme__magenta .hi-progress__circle{stroke:#ff5975}.theme__magenta .hi-progress__circle--success{stroke:#1da653}.theme__magenta .hi-progress__circle--warn{stroke:#e19d0c}.theme__magenta .hi-progress__circle--error{stroke:#eb5252}.theme__magenta .hi-progress__dashboard{stroke:#ff5975}.theme__magenta .hi-progress__dashboard--success{stroke:#1da653}.theme__magenta .hi-progress__dashboard--warn{stroke:#e19d0c}.theme__magenta .hi-progress__dashboard--error{stroke:#eb5252}.theme__lavender .hi-progress__bar--primary{background-color:#b450de}.theme__lavender .hi-progress__text--primary{color:#b450de}.theme__lavender .hi-progress__circle{stroke:#b450de}.theme__lavender .hi-progress__circle--success{stroke:#1da653}.theme__lavender .hi-progress__circle--warn{stroke:#e19d0c}.theme__lavender .hi-progress__circle--error{stroke:#eb5252}.theme__lavender .hi-progress__dashboard{stroke:#b450de}.theme__lavender .hi-progress__dashboard--success{stroke:#1da653}.theme__lavender .hi-progress__dashboard--warn{stroke:#e19d0c}.theme__lavender .hi-progress__dashboard--error{stroke:#eb5252}.theme__blue .hi-progress__bar--primary{background-color:#3da8f5}.theme__blue .hi-progress__text--primary{color:#3da8f5}.theme__blue .hi-progress__circle{stroke:#3da8f5}.theme__blue .hi-progress__circle--success{stroke:#1da653}.theme__blue .hi-progress__circle--warn{stroke:#e19d0c}.theme__blue .hi-progress__circle--error{stroke:#eb5252}.theme__blue .hi-progress__dashboard{stroke:#3da8f5}.theme__blue .hi-progress__dashboard--success{stroke:#1da653}.theme__blue .hi-progress__dashboard--warn{stroke:#e19d0c}.theme__blue .hi-progress__dashboard--error{stroke:#eb5252}.theme__purple .hi-progress__bar--primary{background-color:#8a8acb}.theme__purple .hi-progress__text--primary{color:#8a8acb}.theme__purple .hi-progress__circle{stroke:#8a8acb}.theme__purple .hi-progress__circle--success{stroke:#1da653}.theme__purple .hi-progress__circle--warn{stroke:#e19d0c}.theme__purple .hi-progress__circle--error{stroke:#eb5252}.theme__purple .hi-progress__dashboard{stroke:#8a8acb}.theme__purple .hi-progress__dashboard--success{stroke:#1da653}.theme__purple .hi-progress__dashboard--warn{stroke:#e19d0c}.theme__purple .hi-progress__dashboard--error{stroke:#eb5252}@-webkit-keyframes hi-progress-active{0%{width:0;opacity:0.1}20%{width:0;opacity:0.5}100%{width:100%;opacity:0}}@keyframes hi-progress-active{0%{width:0;opacity:0.1}20%{width:0;opacity:0.5}100%{width:100%;opacity:0}}
+.hi-progress__inner{background-color:#f2f2f2;border-radius:9px;position:relative;overflow:hidden;display:inline-block;vertical-align:middle}.hi-progress__bar{height:100%;display:block;position:relative;background-color:#3b76dc;-webkit-transition:width 0.4s cubic-bezier(0.3, 0, 0.7, 1);transition:width 0.4s cubic-bezier(0.3, 0, 0.7, 1)}.hi-progress__bar-success{background-color:#1da653}.hi-progress__bar--warn{background-color:#eb5252}.hi-progress__bar--error{background-color:#e19d0c}.hi-progress__text{padding-left:25px;font-size:14px;color:#666;display:inline-block;vertical-align:middle}.hi-progress__text--inside{font-size:14px;color:#fff;position:absolute;right:5px;top:50%;-webkit-transform:translateY(-50%);transform:translateY(-50%);line-height:14px}.hi-progress__text--success{color:#1da653}.hi-progress__text--warn{color:#eb5252}.hi-progress__text--error{color:#e19d0c}.hi-progress__svg{position:relative}.hi-progress__svg .hi-progress__text{display:block;position:absolute;width:100%;text-align:center;line-height:1;top:50%;-webkit-transform:translateY(-50%);transform:translateY(-50%);left:0;margin:0;padding:0;overflow:hidden;text-overflow:ellipsis}.hi-progress__svgbackground{fill:none;stroke:#e9e9e7;stroke-width:6}.hi-progress__circle{fill:none;stroke:#3b76dc;stroke-width:6;-webkit-transform:rotate(-90deg);transform:rotate(-90deg);-webkit-transform-origin:50% 50%;transform-origin:50% 50%;-webkit-transition:stroke-dashoffset 0.4s cubic-bezier(0.3, 0, 0.7, 1);transition:stroke-dashoffset 0.4s cubic-bezier(0.3, 0, 0.7, 1)}.hi-progress__circle--success{stroke:#1da653}.hi-progress__circle--warn{stroke:#eb5252}.hi-progress__circle--error{stroke:#e19d0c}.hi-progress__dashboard{fill:none;stroke:#3b76dc;stroke-width:6;-webkit-transition:stroke-dasharray 0.4s cubic-bezier(0.3, 0, 0.7, 1);transition:stroke-dasharray 0.4s cubic-bezier(0.3, 0, 0.7, 1)}.hi-progress__dashboard--success{stroke:#1da653}.hi-progress__dashboard--warn{stroke:#eb5252}.hi-progress__dashboard--error{stroke:#e19d0c}