@hi-ui/hiui 2.15.9 → 2.15.11

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # 更新日志
 
+# 2.15.11
+
+- 修复 `Preview` 组件，图片打开失败时，页面一直处在加载状态 [#1816](https://github.com/XiaoMi/hiui/issues/1816)
+## 2.15.10
+
+- 修复 `<Cascader />` 组件 id 为 Number 类型时导致节点重复添加问题[#1648](https://github.com/XiaoMi/hiui/issues/1648)
+- 修复 `<Upload />` 组件 预览中放大和缩小按钮操作反馈异常[#1770](https://github.com/XiaoMi/hiui/issues/1770)
+
 ## 2.15.9
 
 - 修复 `<Dropdown />` 配置href 无效的问题[#1641](https://github.com/XiaoMi/hiui/issues/1641)

package/es/_util/warning.js

@@ -1,7 +1,5 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -9,6 +7,8 @@ exports.warningOnce = warningOnce;
 
 var _warning = _interopRequireDefault(require("warning"));
 
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+
 var warned = {};
 
 function warningOnce(condition, format, args) {

package/es/alert/__test__/index.test.js

@@ -0,0 +1,67 @@
+"use strict";
+
+var _react = _interopRequireDefault(require("react"));
+
+var _enzyme = require("enzyme");
+
+var _reactTestRenderer = _interopRequireDefault(require("react-test-renderer"));
+
+var _ = _interopRequireDefault(require("../"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+
+describe('Alert', function () {
+  beforeAll(function () {
+    jest.useFakeTimers();
+  });
+  afterAll(function () {
+    jest.useRealTimers();
+  }); // it('basic use', () => {
+  //   const wrapper = renderer.create(
+  //     <div>
+  //       <Alert type='info' message='新提示' />
+  //       <Alert type='success' message='成功' />
+  //       <Alert type='error' message='错误' />
+  //       <Alert type='warning' message='警告' />
+  //     </div>
+  //   )
+  //   expect(wrapper).toMatchSnapshot()
+  // })
+
+  it('could be closed', function () {
+    var onClose = jest.fn();
+    var wrapper = (0, _enzyme.mount)( /*#__PURE__*/_react["default"].createElement(_["default"], {
+      type: "info",
+      message: "\u4FE1\u606F\u63D0\u793A\u7684\u6587\u6848",
+      onClose: onClose
+    }));
+    wrapper.find('.close-btn').simulate('click');
+    expect(onClose).toBeCalled();
+    expect(wrapper.find('.hi-alert')).toHaveLength(0);
+  }); // it('props update', () => {
+  //   const onClose = jest.fn()
+  //   const wrapper = mount(
+  //     <Alert type='info' message='信息提示的文案' onClose={onClose} />
+  //   )
+  //   expect(wrapper.props().message).toEqual('信息提示的文案')
+  //   wrapper.setProps({message: '新方案'})
+  //   expect(wrapper.props().message).toEqual('新方案')
+  // })
+
+  it('auto close', function () {
+    var onClose = jest.fn();
+    var wrapper = (0, _enzyme.mount)( /*#__PURE__*/_react["default"].createElement(_["default"], {
+      type: "info",
+      message: "\u4FE1\u606F\u63D0\u793A\u7684\u6587\u6848",
+      autoClose: true,
+      closeable: false,
+      onClose: onClose
+    }));
+    expect(wrapper.find('.hi-alert')).toHaveLength(1);
+    expect(onClose).not.toBeCalled();
+    jest.runAllTimers();
+    expect(onClose).toBeCalled(); // expect(onClose).toHaveBeenCalledTimes(1)
+    // expect(wrapper.find('.hi-alert')).toHaveLength(0)
+    // expect(wrapper.find('.hi-alert').exists()).toBeTruthy()
+  });
+});

package/es/alert/index.js

@@ -1,20 +1,161 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
 
-var _Alert = _interopRequireDefault(require("./Alert"));
+var _react = _interopRequireWildcard(require("react"));
+
+var _propTypes = _interopRequireDefault(require("prop-types"));
+
+var _classnames = _interopRequireDefault(require("classnames"));
 
 require("./style/index");
 
-var _util = require("../_util");
+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); }
+
+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 _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); }
+
+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 _context = _interopRequireDefault(require("../context"));
+var Alert = /*#__PURE__*/function (_Component) {
+  _inherits(Alert, _Component);
 
-var _default = (0, _util.depreactedPropsCompat)([['content', 'message'], ['duration', 'autoCloseTime']])((0, _context["default"])(_Alert["default"]));
+  var _super = _createSuper(Alert);
+
+  _createClass(Alert, [{
+    key: "componentDidMount",
+    value: function componentDidMount() {
+      var _this2 = this;
+
+      if (!this.props.closeable && this.props.autoClose) {
+        window.setTimeout(function () {
+          _this2.handleClose();
+        }, this.props.autoCloseTime);
+      }
+    }
+  }]);
+
+  function Alert(props) {
+    var _this;
+
+    _classCallCheck(this, Alert);
+
+    _this = _super.call(this, props);
+    _this.state = {
+      show: true
+    };
+    return _this;
+  }
+
+  _createClass(Alert, [{
+    key: "handleClose",
+    value: function handleClose() {
+      this.setState({
+        show: false
+      });
+      this.props.onClose && this.props.onClose();
+      this.props.onCancel && this.props.onCancel();
+    }
+  }, {
+    key: "render",
+    value: function render() {
+      var classnames = (0, _classnames["default"])(this.props.prefixCls, this.state.show, this.props.type, this.props.size, {
+        noTitle: !this.props.title
+      });
+      var type = this.props.type;
+
+      switch (type) {
+        case 'warning':
+          type = 'info-circle-o';
+          break;
+
+        case 'error':
+          type = 'close-circle-o';
+          break;
+
+        case 'success':
+          type = 'check-circle-o';
+          break;
+
+        default:
+          type = 'info-circle-o';
+      }
+
+      return this.state.show ? /*#__PURE__*/_react["default"].createElement("div", {
+        className: classnames
+      }, /*#__PURE__*/_react["default"].createElement("div", {
+        className: "icon-contain"
+      }, /*#__PURE__*/_react["default"].createElement("i", {
+        className: "hi-icon icon-".concat(type)
+      })), /*#__PURE__*/_react["default"].createElement("div", {
+        className: "text-contain"
+      }, this.props.title && /*#__PURE__*/_react["default"].createElement("div", {
+        className: "text-title"
+      }, this.props.title), /*#__PURE__*/_react["default"].createElement("div", {
+        className: "text-message"
+      }, this.props.message || this.props.content, _react["default"].Children.map(this.props.children, function (item) {
+        return item;
+      }))), this.props.closeable ? /*#__PURE__*/_react["default"].createElement("div", {
+        className: "close-btn icon-img-delete",
+        onClick: this.handleClose.bind(this)
+      }, /*#__PURE__*/_react["default"].createElement("i", {
+        className: "hi-icon icon-close"
+      })) : null) : null;
+    }
+  }]);
+
+  return Alert;
+}(_react.Component);
+
+_defineProperty(Alert, "propTypes", {
+  type: _propTypes["default"].oneOf(['info', 'error', 'success', 'warning']),
+  onCancel: _propTypes["default"].func,
+  // 废气，用 onClose 代替
+  onClose: _propTypes["default"].func,
+  size: _propTypes["default"].oneOf(['small', 'middle', 'large']),
+  content: _propTypes["default"].string,
+  // 废弃，用 message 代替
+  message: _propTypes["default"].string,
+  title: _propTypes["default"].string,
+  closeable: _propTypes["default"].bool,
+  autoClose: _propTypes["default"].bool,
+  autoCloseTime: _propTypes["default"].number
+});
+
+_defineProperty(Alert, "defaultProps", {
+  prefixCls: 'hi-alert',
+  type: 'info',
+  size: 'middle',
+  closeable: true,
+  autoClose: false,
+  autoCloseTime: 3000
+});
 
+var _default = Alert;
 exports["default"] = _default;

package/es/alert/style/index.css

@@ -1 +1 @@
-.hi-alert{position:relative;padding:9px 11px;background:#ebf2fd;border:1px solid #b3cdfb;border-radius:2px;color:#4284f5;font-size:14px;min-width:280px;display:block;-webkit-box-align:start;-ms-flex-align:start;align-items:flex-start}.hi-alert .hi-icon__title{display:-webkit-box;display:-ms-flexbox;display:flex;font-size:14px;-webkit-box-align:center;-ms-flex-align:center;align-items:center;line-height:22px}.hi-alert .hi-icon__title .hi-icon{font-size:16px;margin-right:8px}.hi-alert .text-message{margin:2px 24px 0 24px;font-weight:400;font-size:12px;line-height:20px;color:#666}.hi-alert .close-btn{position:absolute;top:12px;right:12px;cursor:pointer;height:16px;line-height:16px}.hi-alert .close-btn .hi-icon{font-size:16px;color:#999}.hi-alert.error{background:#fceded;border:1px solid #f7b9b9;color:#eb5252}.hi-alert.error .icon-contain{color:#eb5252}.hi-alert.success{background:#e8f6ee;border:1px solid #a4dbba;color:#1da653}.hi-alert.success .icon-contain{color:#1da653}.hi-alert.warning{background:#fbf5e6;border:1px solid #f3d79d;color:#e19d0c}.hi-alert.warning .icon-contain{color:#e19d0c}.hi-alert.noTitle .text-contain .text-message{font-size:14px}.hi-alert.theme__hiui-blue.info{color:#4285f4;background-color:rgba(66,133,244,0.1);border:1px solid #8eb6f8}.hi-alert.theme__orange.info{color:#f63;background-color:rgba(255,102,51,0.1);border:1px solid #ffa385}.hi-alert.theme__cyan.info{color:#46bc99;background-color:rgba(70,188,153,0.1);border:1px solid #90d7c2}.hi-alert.theme__magenta.info{color:#ff5975;background-color:rgba(255,89,117,0.1);border:1px solid #ff9bac}.hi-alert.theme__lavender.info{color:#b450de;background-color:rgba(180,80,222,0.1);border:1px solid #d296eb}.hi-alert.theme__blue.info{color:#3da8f5;background-color:rgba(61,168,245,0.1);border:1px solid #8bcbf9}.hi-alert.theme__purple.info{color:#8a8acb;background-color:rgba(138,138,203,0.1);border:1px solid #b9b9e0}
+.hi-alert{position:relative;padding:12px;background:#ebf2fd;border:1px solid #b3cdfb;border-radius:2px;color:#4284f5;font-size:14px;overflow:hidden;min-width:280px;display:block}.hi-alert .icon-contain{position:absolute;top:50%;left:16px;-webkit-transform:translateY(-50%);transform:translateY(-50%);font-size:0;color:#4284f5}.hi-alert .icon-contain .hi-icon{font-size:20px}.hi-alert .text-contain{margin:0 32px;font-weight:400}.hi-alert .text-contain .text-title{font-size:14px;margin-bottom:4px}.hi-alert .text-contain .text-message{font-size:12px}.hi-alert .close-btn{position:absolute;top:50%;right:16px;-webkit-transform:translateY(-50%);transform:translateY(-50%);font-size:0;cursor:pointer}.hi-alert .close-btn .hi-icon{font-size:14px;color:#999}.hi-alert.error{background:#fceded;border:1px solid #f7b9b9;color:#eb5252}.hi-alert.error .icon-contain{color:#eb5252}.hi-alert.success{background:#e8f6ee;border:1px solid #a4dbba;color:#1da653}.hi-alert.success .icon-contain{color:#1da653}.hi-alert.warning{background:#fbf5e6;border:1px solid #f3d79d;color:#e19d0c}.hi-alert.warning .icon-contain{color:#e19d0c}.hi-alert.noTitle .text-contain .text-message{font-size:14px}

package/es/badge/index.js

@@ -1,22 +1,100 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
 
-var _Badge = _interopRequireDefault(require("./Badge"));
+var _react = _interopRequireWildcard(require("react"));
+
+var _propTypes = _interopRequireDefault(require("prop-types"));
+
+var _classnames = _interopRequireDefault(require("classnames"));
 
 require("./style/index");
 
-var _util = require("../_util");
+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); }
+
+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 _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); }
 
-var _default = (0, _util.depreactedPropsCompat)([['content', 'value'], ['type', 'dot', function (data) {
-  return data ? 'dot' : 'bubble';
-}], ['visible', 'hidden', function (data) {
-  return !data;
-}]])(_Badge["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 Badge = /*#__PURE__*/function (_Component) {
+  _inherits(Badge, _Component);
+
+  var _super = _createSuper(Badge);
+
+  function Badge() {
+    _classCallCheck(this, Badge);
+
+    return _super.apply(this, arguments);
+  }
+
+  _createClass(Badge, [{
+    key: "render",
+    value: function render() {
+      var _this$props = this.props,
+          value = _this$props.value,
+          prefixCls = _this$props.prefixCls,
+          max = _this$props.max,
+          dot = _this$props.dot,
+          hidden = _this$props.hidden,
+          style = _this$props.style;
+      var eleClass = (0, _classnames["default"])("".concat(prefixCls, "-base"));
+      return /*#__PURE__*/_react["default"].createElement("div", {
+        className: eleClass,
+        style: style
+      }, this.props.children, dot ? /*#__PURE__*/_react["default"].createElement("span", {
+        className: "".concat(prefixCls, "-dot").concat(hidden ? ' hi-hide' : '')
+      }) : /*#__PURE__*/_react["default"].createElement("span", {
+        className: "".concat(prefixCls, "-value").concat(hidden ? ' hi-hide' : '')
+      }, typeof +value === 'number' ? +value > max ? max + '+' : value : value));
+    }
+  }]);
+
+  return Badge;
+}(_react.Component);
+
+_defineProperty(Badge, "propTypes", {
+  value: _propTypes["default"].oneOfType([_propTypes["default"].string, _propTypes["default"].number]),
+  dot: _propTypes["default"].bool,
+  max: _propTypes["default"].number,
+  hidden: _propTypes["default"].bool,
+  style: _propTypes["default"].object
+});
+
+_defineProperty(Badge, "defaultProps", {
+  prefixCls: 'hi-badge',
+  style: {},
+  value: '',
+  dot: false,
+  max: 99,
+  hidden: false
+});
 
+var _default = Badge;
 exports["default"] = _default;

package/es/badge/style/index.css

@@ -1 +1 @@
-.hi-badge-base{display:inline-block;position:relative}.hi-badge-value{position:absolute;top:-10px;right:0;-webkit-transform:translateX(50%);transform:translateX(50%);height:16px;padding:0 4px;min-width:8px;border:2px solid #fff;border-radius:10px;line-height:16px;background:#f44141;font-size:12px;color:#fff;letter-spacing:0;text-align:center}.hi-badge-value.hi-hide{display:none}.hi-badge-dot{position:absolute;width:8px;height:8px;top:-5px;right:-5px;background:#f44141;border:1px solid #fff;border-radius:50%;font-size:0}.hi-badge-dot.hi-hide{display:none}
+.hi-badge-base{display:inline-block;position:relative}.hi-badge-value{position:absolute;top:-12px;right:0;-webkit-transform:translateX(50%);transform:translateX(50%);height:16px;padding:0 5px;border:2px solid #fff;border-radius:10px;line-height:16px;background:#eb5252;font-size:12px;color:#fff;letter-spacing:0;text-align:center}.hi-badge-value.hi-hide{display:none}.hi-badge-dot{position:absolute;width:8px;height:8px;top:-7px;right:-5px;background:#eb5252;border:1px solid #fff;border-radius:50%;font-size:0}.hi-badge-dot.hi-hide{display:none}

package/es/button/Button.js

@@ -1,73 +1,85 @@
 "use strict";
 
-var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.Button = exports["default"] = void 0;
+exports["default"] = void 0;
 
-var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+var _react = _interopRequireWildcard(require("react"));
 
-var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+var _propTypes = _interopRequireDefault(require("prop-types"));
 
-var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
+var _classnames = _interopRequireDefault(require("classnames"));
 
-var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+var _context = _interopRequireDefault(require("../context"));
 
-var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized"));
+var _icon = _interopRequireDefault(require("../icon"));
 
-var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
+var _IconLoading = _interopRequireDefault(require("./IconLoading"));
 
-var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
+var _deprecatedPropsCheck = _interopRequireDefault(require("../_util/deprecatedPropsCheck"));
 
-var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function _getRequireWildcardCache() { return cache; }; return cache; }
 
-var _react = _interopRequireWildcard(require("react"));
+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 _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 
-var _classnames = _interopRequireDefault(require("classnames"));
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 
-var _context = _interopRequireDefault(require("../context"));
+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 _icon = _interopRequireDefault(require("../icon"));
+function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 
-var _IconLoading = _interopRequireDefault(require("./IconLoading"));
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
-var _deprecatedPropsCheck = _interopRequireDefault(require("../_util/deprecatedPropsCheck"));
+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); }
+
+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 _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 { 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 Button = /*#__PURE__*/function (_Component) {
-  (0, _inherits2["default"])(Button, _Component);
+  _inherits(Button, _Component);
 
   var _super = _createSuper(Button);
 
   function Button() {
     var _this;
 
-    (0, _classCallCheck2["default"])(this, Button);
+    _classCallCheck(this, Button);
 
     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), "deprecatedProps", {
+
+    _defineProperty(_assertThisInitialized(_this), "deprecatedProps", {
       type: ['info'],
       appearance: ['line']
     });
+
     return _this;
   }
 
-  (0, _createClass2["default"])(Button, [{
+  _createClass(Button, [{
     key: "render",
     value: function render() {
       var _this$props = this.props,
@@ -80,56 +92,38 @@ var Button = /*#__PURE__*/function (_Component) {
           icon = _this$props.icon,
           loading = _this$props.loading,
           onClick = _this$props.onClick,
-          onContextMenu = _this$props.onContextMenu,
-          onMouseOver = _this$props.onMouseOver,
-          onMouseOut = _this$props.onMouseOut,
-          onMouseEnter = _this$props.onMouseEnter,
-          onMouseLeave = _this$props.onMouseLeave,
           href = _this$props.href,
           style = _this$props.style,
           children = _this$props.children,
           target = _this$props.target;
       var isDisabled = disabled || loading;
-      var classes = (0, _classnames["default"])('theme__' + theme, "hi-btn", className, appearance && "hi-btn--appearance--".concat(appearance), size && "hi-btn--size--".concat(size), isDisabled && "hi-btn--disabled", loading && "hi-btn--loading", {
-        'hi-btn--icon': function () {
-          // Detect if children is empty
-          if (!children || typeof children === 'string' && !children.trim()) return true; // Detect if children is an Icon
-
-          if ( /*#__PURE__*/_react["default"].isValidElement(children) && children.type.name === 'Icon') return true;
-        }()
-      }, // For version < 1.1.0
+      var classes = (0, _classnames["default"])('theme__' + theme, "hi-btn", className, appearance && "hi-btn--appearance--".concat(appearance), size && "hi-btn--size--".concat(size), isDisabled && "hi-btn--disabled", icon && "hi-btn--icon", loading && "hi-btn--loading", // For version < 1.1.0
       type === 'primary' && appearance === 'line' ? "hi-btn--type--line" : "hi-btn--type--".concat(type));
       var restProps = {
         href: href,
         style: style,
         onClick: onClick,
         disabled: isDisabled,
-        onContextMenu: onContextMenu,
-        onMouseOver: onMouseOver,
-        onMouseEnter: onMouseEnter,
-        onMouseLeave: onMouseLeave,
-        onMouseOut: onMouseOut,
         target: target
       };
       (0, _deprecatedPropsCheck["default"])(this.deprecatedProps, this.props, 'Button');
-      return /*#__PURE__*/_react["default"].createElement(ButtonWrapper, (0, _extends2["default"])({
+      return /*#__PURE__*/_react["default"].createElement(ButtonWrapper, _extends({
         className: classes
       }, restProps), loading && /*#__PURE__*/_react["default"].createElement(_IconLoading["default"], null), icon && !loading && /*#__PURE__*/_react["default"].createElement(_icon["default"], {
         name: icon
+      }), (icon || loading) && children && /*#__PURE__*/_react["default"].createElement("span", {
+        className: "hi-btn--icon__spacer"
       }), children);
     }
   }]);
+
   return Button;
 }(_react.Component);
 
-exports.Button = Button;
-(0, _defineProperty2["default"])(Button, "propTypes", {
-  type: _propTypes["default"].oneOf(['primary', 'line', 'success', 'danger', 'default', 'warning', // deprecated
-  'info' // deprecated
-  ]),
-  size: _propTypes["default"].oneOf(['large', 'small', 'normal', 'default']),
-  appearance: _propTypes["default"].oneOf(['button', 'link', 'line' // deprecated
-  ]),
+_defineProperty(Button, "propTypes", {
+  type: _propTypes["default"].oneOf(['primary', 'line', 'success', 'danger', 'default', 'warning', 'info']),
+  size: _propTypes["default"].oneOf(['large', 'small', 'normal']),
+  appearance: _propTypes["default"].oneOf(['link', 'button', 'line']),
   className: _propTypes["default"].string,
   style: _propTypes["default"].object,
   disabled: _propTypes["default"].bool,
@@ -138,7 +132,8 @@ exports.Button = Button;
   loading: _propTypes["default"].bool,
   target: _propTypes["default"].oneOf(['_self', '_blank', '_parent', '_top'])
 });
-(0, _defineProperty2["default"])(Button, "defaultProps", {
+
+_defineProperty(Button, "defaultProps", {
   type: 'default',
   disabled: false,
   appearance: 'button',
@@ -147,8 +142,9 @@ exports.Button = Button;
 
 function ButtonWrapper(_ref) {
   var children = _ref.children,
-      restProps = (0, _objectWithoutProperties2["default"])(_ref, ["children"]);
-  return restProps.href ? /*#__PURE__*/_react["default"].createElement("a", restProps, children) : /*#__PURE__*/_react["default"].createElement("button", (0, _extends2["default"])({}, restProps, {
+      restProps = _objectWithoutProperties(_ref, ["children"]);
+
+  return restProps.href ? /*#__PURE__*/_react["default"].createElement("a", restProps, children) : /*#__PURE__*/_react["default"].createElement("button", _extends({}, restProps, {
     type: "button"
   }), children);
 }