@hi-ui/hiui 2.15.9 → 2.15.11

package/es/checkbox/{checkbox-legacy/CheckBox.js → CheckBox.js}

@@ -1,51 +1,62 @@
 "use strict";
 
-var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
 
-var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
+var _react = _interopRequireWildcard(require("react"));
 
-var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
+var _propTypes = _interopRequireDefault(require("prop-types"));
 
-var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+var _Base = _interopRequireDefault(require("./Base"));
 
-var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
+var _common = _interopRequireDefault(require("./common"));
 
-var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
+var _isEqual = _interopRequireDefault(require("lodash/isEqual"));
 
-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 _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 _Base = _interopRequireDefault(require("./Base"));
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
-var _common = _interopRequireDefault(require("./common"));
+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 = (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 _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 CheckBox = /*#__PURE__*/function (_Component) {
-  (0, _inherits2["default"])(CheckBox, _Component);
+  _inherits(CheckBox, _Component);
 
   var _super = _createSuper(CheckBox);
 
   function CheckBox() {
-    (0, _classCallCheck2["default"])(this, CheckBox);
+    _classCallCheck(this, CheckBox);
+
     return _super.apply(this, arguments);
   }
 
-  (0, _createClass2["default"])(CheckBox, [{
+  _createClass(CheckBox, [{
     key: "componentWillReceiveProps",
     value: function componentWillReceiveProps(nextProps) {
       var groups = _common["default"].getAll(nextProps.name);
@@ -68,13 +79,22 @@ var CheckBox = /*#__PURE__*/function (_Component) {
     value: function componentWillUnmount() {
       _common["default"].remove(this.props.name || this.props.all);
     }
+  }, {
+    key: "shouldComponentUpdate",
+    value: function shouldComponentUpdate(nextProps, nextState) {
+      if (this.props.list && (0, _isEqual["default"])(this.props.list, nextProps.list)) {
+        return false;
+      }
+
+      return true;
+    }
   }, {
     key: "renderCheckBoxGroup",
     value: function renderCheckBoxGroup(list) {
       var _this = this;
 
       return /*#__PURE__*/_react["default"].createElement("div", null, list && list.map(function (item, index) {
-        if ((0, _typeof2["default"])(item) === 'object') {
+        if (_typeof(item) === 'object') {
           var value = item.value,
               text = item.text,
               checked = item.checked,
@@ -142,20 +162,24 @@ var CheckBox = /*#__PURE__*/function (_Component) {
       });
     }
   }]);
+
   return CheckBox;
 }(_react.Component);
 
-(0, _defineProperty2["default"])(CheckBox, "_type", 'CheckBox');
-(0, _defineProperty2["default"])(CheckBox, "propTypes", {
+_defineProperty(CheckBox, "_type", 'CheckBox');
+
+_defineProperty(CheckBox, "propTypes", {
   onChange: _propTypes["default"].func,
   checked: _propTypes["default"].bool,
   disabled: _propTypes["default"].bool,
   value: _propTypes["default"].oneOfType([_propTypes["default"].string, _propTypes["default"].number, _propTypes["default"].bool]),
   list: _propTypes["default"].array
 });
-(0, _defineProperty2["default"])(CheckBox, "defaultProps", {
+
+_defineProperty(CheckBox, "defaultProps", {
   checked: false,
   value: ''
 });
+
 var _default = CheckBox;
 exports["default"] = _default;

package/es/checkbox/index.js

@@ -1,24 +1,15 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
 
-var _Checkbox = _interopRequireDefault(require("./Checkbox"));
-
-var _index = _interopRequireDefault(require("./checkbox-legacy/index"));
-
-var _Group = _interopRequireDefault(require("./Group"));
-
-var _SwitchVersion = _interopRequireDefault(require("../_util/SwitchVersion"));
+var _CheckBox = _interopRequireDefault(require("./CheckBox"));
 
 require("./style/index");
 
-var VGroup = (0, _SwitchVersion["default"])(_Group["default"], undefined);
-var VCheckbox = (0, _SwitchVersion["default"])(_Checkbox["default"], _index["default"]);
-VCheckbox.Group = VGroup;
-var _default = VCheckbox;
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+
+var _default = _CheckBox["default"];
 exports["default"] = _default;

package/es/checkbox/style/index.css

@@ -1 +1 @@
-.hi-checkbox{cursor:pointer;display:-webkit-inline-box;display:-ms-inline-flexbox;display:inline-flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;height:32px;vertical-align:middle}.hi-checkbox input{position:absolute;width:16px;height:16px;opacity:0}.hi-checkbox__input{position:relative;-webkit-box-sizing:border-box;box-sizing:border-box;display:inline-block;vertical-align:middle;width:16px;height:16px;border:1px solid #d8d8d8;border-radius:2px;-webkit-transition:0.3s ease-out;transition:0.3s ease-out;line-height:1}.hi-checkbox__input--indeterminate::after{-webkit-transform:rotate(90deg) scaleY(1);transform:rotate(90deg) scaleY(1);pointer-events:none;-webkit-box-sizing:content-box;box-sizing:content-box;content:'';border:none;border-bottom:2px solid #fff;height:8px;left:6px;position:absolute;top:2px;width:2px;-webkit-transform-origin:center;transform-origin:center}.hi-checkbox__input--checked::after{-webkit-transform:rotate(45deg) scaleY(1);transform:rotate(45deg) scaleY(1);pointer-events:none;-webkit-box-sizing:content-box;box-sizing:content-box;content:'';border:2px solid #fff;border-left:0;border-top:0;height:7px;left:4px;position:absolute;top:1px;width:4px;-webkit-transform-origin:center;transform-origin:center}.hi-checkbox__text{padding:0 32px 0 8px;line-height:32px}.hi-checkbox--disabled{cursor:not-allowed}.hi-checkbox--disabled .hi-checkbox__input{border-color:#d8d8d8;background:#f2f2f2}.hi-checkbox--disabled .hi-checkbox__input::after{border-color:#d8d8d8}.hi-checkbox--disabled .hi-checkbox__text{color:rgba(0,0,0,0.65)}.hi-checkbox-group{display:inline-block}.hi-checkbox-group--vertical{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}.hi-checkbox:not(.hi-checkbox--disabled):hover .hi-checkbox__input{border-color:#4285f4}.hi-checkbox input:focus+.hi-checkbox__input{border-color:#4285f4}.hi-checkbox__input--indeterminate{background:#4285f4;border-color:#4285f4}.hi-checkbox__input--indeterminate::after{background:#fff}.hi-checkbox__input--checked{background:#4285f4;border-color:#4285f4}.theme__orange .hi-checkbox:not(.hi-checkbox--disabled):hover .hi-checkbox__input{border-color:#f63}.theme__orange .hi-checkbox input:focus+.hi-checkbox__input{border-color:#f63}.theme__orange .hi-checkbox__input--indeterminate{background:#f63;border-color:#f63}.theme__orange .hi-checkbox__input--indeterminate::after{background:#fff}.theme__orange .hi-checkbox__input--checked{background:#f63;border-color:#f63}.theme__orange.hi-checkbox:not(.hi-checkbox--disabled):hover .hi-checkbox__input{border-color:#f63}.theme__orange.hi-checkbox input:focus+.hi-checkbox__input{border-color:#f63}.theme__cyan .hi-checkbox:not(.hi-checkbox--disabled):hover .hi-checkbox__input{border-color:#46bc99}.theme__cyan .hi-checkbox input:focus+.hi-checkbox__input{border-color:#46bc99}.theme__cyan .hi-checkbox__input--indeterminate{background:#46bc99;border-color:#46bc99}.theme__cyan .hi-checkbox__input--indeterminate::after{background:#fff}.theme__cyan .hi-checkbox__input--checked{background:#46bc99;border-color:#46bc99}.theme__cyan.hi-checkbox:not(.hi-checkbox--disabled):hover .hi-checkbox__input{border-color:#46bc99}.theme__cyan.hi-checkbox input:focus+.hi-checkbox__input{border-color:#46bc99}.theme__magenta .hi-checkbox:not(.hi-checkbox--disabled):hover .hi-checkbox__input{border-color:#ff5975}.theme__magenta .hi-checkbox input:focus+.hi-checkbox__input{border-color:#ff5975}.theme__magenta .hi-checkbox__input--indeterminate{background:#ff5975;border-color:#ff5975}.theme__magenta .hi-checkbox__input--indeterminate::after{background:#fff}.theme__magenta .hi-checkbox__input--checked{background:#ff5975;border-color:#ff5975}.theme__magenta.hi-checkbox:not(.hi-checkbox--disabled):hover .hi-checkbox__input{border-color:#ff5975}.theme__magenta.hi-checkbox input:focus+.hi-checkbox__input{border-color:#ff5975}.theme__lavender .hi-checkbox:not(.hi-checkbox--disabled):hover .hi-checkbox__input{border-color:#b450de}.theme__lavender .hi-checkbox input:focus+.hi-checkbox__input{border-color:#b450de}.theme__lavender .hi-checkbox__input--indeterminate{background:#b450de;border-color:#b450de}.theme__lavender .hi-checkbox__input--indeterminate::after{background:#fff}.theme__lavender .hi-checkbox__input--checked{background:#b450de;border-color:#b450de}.theme__lavender.hi-checkbox:not(.hi-checkbox--disabled):hover .hi-checkbox__input{border-color:#b450de}.theme__lavender.hi-checkbox input:focus+.hi-checkbox__input{border-color:#b450de}.theme__blue .hi-checkbox:not(.hi-checkbox--disabled):hover .hi-checkbox__input{border-color:#3da8f5}.theme__blue .hi-checkbox input:focus+.hi-checkbox__input{border-color:#3da8f5}.theme__blue .hi-checkbox__input--indeterminate{background:#3da8f5;border-color:#3da8f5}.theme__blue .hi-checkbox__input--indeterminate::after{background:#fff}.theme__blue .hi-checkbox__input--checked{background:#3da8f5;border-color:#3da8f5}.theme__blue.hi-checkbox:not(.hi-checkbox--disabled):hover .hi-checkbox__input{border-color:#3da8f5}.theme__blue.hi-checkbox input:focus+.hi-checkbox__input{border-color:#3da8f5}.theme__purple .hi-checkbox:not(.hi-checkbox--disabled):hover .hi-checkbox__input{border-color:#8a8acb}.theme__purple .hi-checkbox input:focus+.hi-checkbox__input{border-color:#8a8acb}.theme__purple .hi-checkbox__input--indeterminate{background:#8a8acb;border-color:#8a8acb}.theme__purple .hi-checkbox__input--indeterminate::after{background:#fff}.theme__purple .hi-checkbox__input--checked{background:#8a8acb;border-color:#8a8acb}.theme__purple.hi-checkbox:not(.hi-checkbox--disabled):hover .hi-checkbox__input{border-color:#8a8acb}.theme__purple.hi-checkbox input:focus+.hi-checkbox__input{border-color:#8a8acb}
+.hi-checkbox{display:inline-block;cursor:pointer;font:normal 14px/1.5 -apple-system,BlinkMacSystemFont,"Helvetica Neue",Helvetica,Arial,sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol";text-align:left;text-indent:0;text-shadow:none;text-transform:none;letter-spacing:0;word-spacing:normal;white-space:normal;color:#333}.hi-checkbox a{padding-left:0;padding-right:0}.hi-checkbox p,.hi-checkbox blockquote,.hi-checkbox ul,.hi-checkbox ol,.hi-checkbox dl,.hi-checkbox table,.hi-checkbox pre,.hi-checkbox h1,.hi-checkbox h2,.hi-checkbox h3,.hi-checkbox h4,.hi-checkbox h5,.hi-checkbox h6{margin-top:0;margin-bottom:0}.hi-checkbox ul,.hi-checkbox ol{margin:0;padding:0;list-style-type:none}.hi-checkbox ul ul,.hi-checkbox ul ol,.hi-checkbox ol ul,.hi-checkbox ol ol{margin-top:0;margin-bottom:0}.hi-checkbox li+li{margin-top:0}.hi-checkbox dl{margin-top:0;margin-bottom:0}.hi-checkbox:not(.hi-checkbox--disabled):hover .hi-checkbox__input{border:1px solid #4284f5}.hi-checkbox--disabled{cursor:not-allowed}.hi-checkbox--disabled .hi-checkbox__input{background:#f2f2f2 !important;border:1px solid #d8d8d8}.hi-checkbox--disabled .hi-checkbox__input::after{border-color:#d8d8d8}.hi-checkbox--disabled .hi-checkbox__label{color:#ccc}.hi-checkbox--checked .hi-checkbox__input{background:#4284f5}.hi-checkbox--checked .hi-checkbox__input::after{-webkit-transform:rotate(45deg) scaleY(1);transform:rotate(45deg) scaleY(1);pointer-events:none;-webkit-box-sizing:content-box;box-sizing:content-box;content:'';border:2px solid #fff;border-left:0;border-top:0;height:7px;left:4px;position:absolute;top:1px;width:4px;-webkit-transform-origin:center;transform-origin:center}.hi-checkbox--part .hi-checkbox__input{background:#4284f5}.hi-checkbox--part .hi-checkbox__input::after{content:'';position:absolute;display:block;border:1px solid #fff;margin-top:-1px;left:3px;right:3px;top:50%;pointer-events:none}.hi-checkbox__input{display:inline-block;width:16px;height:16px;border:1px solid #d8d8d8;border-radius:2px;vertical-align:middle;position:relative;-webkit-box-sizing:border-box;box-sizing:border-box}.hi-checkbox__label{padding:0 16px 0 8px;vertical-align:middle;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.hi-checkbox__label.highlight{color:#4284f5}

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

@@ -0,0 +1,58 @@
+"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 }; }
+
+var changeCallback = jest.fn(function (key) {
+  return key;
+});
+describe('Collapse', function () {
+  it('手风琴模式&不可点击状态测试成功', function () {
+    var wrapper = (0, _enzyme.mount)( /*#__PURE__*/_react["default"].createElement(_["default"], {
+      onChange: changeCallback,
+      accordion: true,
+      arrow: "right"
+    }, /*#__PURE__*/_react["default"].createElement(_["default"].Panel, {
+      disabled: true,
+      header: "panel title 1"
+    }, /*#__PURE__*/_react["default"].createElement("p", null, "Collapse Panel Content 1"), /*#__PURE__*/_react["default"].createElement("p", null, "Collapse Panel Content 1"), /*#__PURE__*/_react["default"].createElement("p", null, "Collapse Panel Content 1")), /*#__PURE__*/_react["default"].createElement(_["default"].Panel, {
+      header: "panel title 2"
+    }, /*#__PURE__*/_react["default"].createElement("p", null, "Collapse Panel Content 2"), /*#__PURE__*/_react["default"].createElement("p", null, "Collapse Panel Content 2"), /*#__PURE__*/_react["default"].createElement("p", null, "Collapse Panel Content 2")), /*#__PURE__*/_react["default"].createElement(_["default"].Panel, {
+      header: "panel title 3"
+    }, /*#__PURE__*/_react["default"].createElement("p", null, "Collapse Panel Content 3"), /*#__PURE__*/_react["default"].createElement("p", null, "Collapse Panel Content 3"), /*#__PURE__*/_react["default"].createElement("p", null, "Collapse Panel Content 3"))));
+    expect(wrapper.find('.collapse-item--show')).toHaveLength(0);
+    wrapper.find('.collapse-item__head').at(0).simulate('click'); // test disabled
+
+    expect(wrapper.find('.collapse-item--show')).toHaveLength(0);
+    wrapper.find('.collapse-item__head').at(1).simulate('click');
+    expect(wrapper.find('.collapse-item--show')).toHaveLength(1);
+    wrapper.find('.collapse-item__head').at(2).simulate('click');
+    expect(wrapper.find('.collapse-item--show')).toHaveLength(1);
+    expect(changeCallback.mock.results[1].value).toBe('2');
+  });
+  it('非手风琴模式&默认激活测试成功', function () {
+    var wrapper = (0, _enzyme.mount)( /*#__PURE__*/_react["default"].createElement(_["default"], {
+      onChange: changeCallback,
+      activeKey: "2",
+      arrow: "left"
+    }, /*#__PURE__*/_react["default"].createElement(_["default"].Panel, {
+      header: "panel title 1"
+    }, /*#__PURE__*/_react["default"].createElement("p", null, "Collapse Panel Content 1"), /*#__PURE__*/_react["default"].createElement("p", null, "Collapse Panel Content 1"), /*#__PURE__*/_react["default"].createElement("p", null, "Collapse Panel Content 1")), /*#__PURE__*/_react["default"].createElement(_["default"].Panel, {
+      header: "panel title 2"
+    }, /*#__PURE__*/_react["default"].createElement("p", null, "Collapse Panel Content 2"), /*#__PURE__*/_react["default"].createElement("p", null, "Collapse Panel Content 2"), /*#__PURE__*/_react["default"].createElement("p", null, "Collapse Panel Content 2")), /*#__PURE__*/_react["default"].createElement(_["default"].Panel, {
+      header: "panel title 3"
+    }, /*#__PURE__*/_react["default"].createElement("p", null, "Collapse Panel Content 3"), /*#__PURE__*/_react["default"].createElement("p", null, "Collapse Panel Content 3"), /*#__PURE__*/_react["default"].createElement("p", null, "Collapse Panel Content 3"))));
+    expect(wrapper.find('.collapse-item--show')).toHaveLength(1); // 测试默认激活
+
+    wrapper.find('.collapse-item__head').at(0).simulate('click');
+    expect(wrapper.find('.collapse-item--show')).toHaveLength(2);
+    expect(changeCallback.mock.results[2].value).toEqual(['2', '0']);
+  });
+});

package/es/collapse/index.js

@@ -1,73 +1,88 @@
 "use strict";
 
-var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
 
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+var _react = _interopRequireWildcard(require("react"));
 
-var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
+var _propTypes = _interopRequireDefault(require("prop-types"));
 
-var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+var _classnames = _interopRequireDefault(require("classnames"));
 
-var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
+require("./style/index");
 
-var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
-var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
+function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function _getRequireWildcardCache() { return cache; }; return cache; }
 
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+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 _react = _interopRequireWildcard(require("react"));
+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 _propTypes = _interopRequireDefault(require("prop-types"));
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 
-var _classnames = _interopRequireDefault(require("classnames"));
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 
-require("./style/index");
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && Symbol.iterator in Object(iter)) return Array.from(iter); }
 
-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 _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
+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 noop = function noop() {};
 
 var Collapse = /*#__PURE__*/function (_Component) {
-  (0, _inherits2["default"])(Collapse, _Component);
+  _inherits(Collapse, _Component);
 
   var _super = _createSuper(Collapse);
 
   function Collapse(props) {
     var _this;
 
-    (0, _classCallCheck2["default"])(this, Collapse);
-    _this = _super.call(this, props);
-    var _this$props = _this.props,
-        activeId = _this$props.activeId,
-        activeKey = _this$props.activeKey;
-
-    var _activeId = activeId || activeKey;
+    _classCallCheck(this, Collapse);
 
+    _this = _super.call(this, props);
     _this.state = {
-      activeId: Array.isArray(_activeId) ? _activeId : [_activeId]
+      activeKey: Array.isArray(_this.props.activeKey) ? _this.props.activeKey : [_this.props.activeKey]
     };
     return _this;
   }
 
-  (0, _createClass2["default"])(Collapse, [{
+  _createClass(Collapse, [{
     key: "onClickPanel",
     value: function onClickPanel(key) {
-      var activeKey = this.state.activeId;
+      var activeKey = this.state.activeKey;
 
       if (this.props.accordion) {
         activeKey = activeKey[0] === key ? [] : [key];
       } else {
-        activeKey = (0, _toConsumableArray2["default"])(activeKey);
+        activeKey = _toConsumableArray(activeKey);
         var index = activeKey.indexOf(key);
         var isActive = index > -1;
 
@@ -83,9 +98,11 @@ var Collapse = /*#__PURE__*/function (_Component) {
   }, {
     key: "setActiveKey",
     value: function setActiveKey(activeKey) {
+      // if (!('activeKey' in this.props)) {
       this.setState({
-        activeId: activeKey
-      });
+        activeKey: activeKey
+      }); // }
+
       this.props.onChange(this.props.accordion ? activeKey[0] : activeKey);
     }
   }, {
@@ -93,30 +110,33 @@ var Collapse = /*#__PURE__*/function (_Component) {
     value: function renderPanels() {
       var _this2 = this;
 
-      var activeKey = this.state.activeId;
-      var _this$props2 = this.props,
-          children = _this$props2.children,
-          accordion = _this$props2.accordion,
-          arrow = _this$props2.arrow,
-          arrowPlacement = _this$props2.arrowPlacement,
-          showArrow = _this$props2.showArrow;
+      var activeKey = this.state.activeKey;
+      var _this$props = this.props,
+          children = _this$props.children,
+          accordion = _this$props.accordion,
+          arrow = _this$props.arrow;
       var newChildren = [];
 
       _react.Children.forEach(children, function (child, index) {
         if (!child) return;
-        var key = child.props.id || child.key || String(index);
+        var key = child.key || String(index);
         var _child$props = child.props,
             header = _child$props.header,
-            disabled = _child$props.disabled,
-            title = _child$props.title;
-        var isActive = accordion ? activeKey[0] === key : activeKey.includes(key);
+            disabled = _child$props.disabled;
+        var isActive = false;
+
+        if (accordion) {
+          isActive = activeKey[0] === key;
+        } else {
+          isActive = activeKey.indexOf(key) > -1;
+        }
+
         var props = {
           key: key,
-          header: title || header,
+          header: header,
           disabled: disabled,
           isActive: isActive,
-          arrow: arrowPlacement !== 'left' ? arrowPlacement : arrow,
-          showArrow: showArrow,
+          arrow: arrow,
           children: child.props.children,
           onClickPanel: disabled ? noop : function () {
             return _this2.onClickPanel(key);
@@ -130,68 +150,64 @@ var Collapse = /*#__PURE__*/function (_Component) {
   }, {
     key: "render",
     value: function render() {
-      var _this$props3 = this.props,
-          prefixCls = _this$props3.prefixCls,
-          type = _this$props3.type;
+      var _this$props2 = this.props,
+          prefixCls = _this$props2.prefixCls,
+          type = _this$props2.type;
       var classnames = (0, _classnames["default"])(prefixCls, type && "".concat(prefixCls, "__").concat(type));
       return /*#__PURE__*/_react["default"].createElement("div", {
         className: classnames
       }, this.renderPanels());
     }
   }]);
+
   return Collapse;
 }(_react.Component);
 
-(0, _defineProperty2["default"])(Collapse, "propTypes", {
+_defineProperty(Collapse, "propTypes", {
   accordion: _propTypes["default"].bool,
   // 手风琴模式
   activeKey: _propTypes["default"].oneOfType([_propTypes["default"].string, _propTypes["default"].array]),
-  activeId: _propTypes["default"].oneOfType([_propTypes["default"].string, _propTypes["default"].array]),
   onChange: _propTypes["default"].func,
   icon: _propTypes["default"].string,
   type: _propTypes["default"].string,
-  // TODO:废弃
-  arrow: _propTypes["default"].oneOf(['left', 'right']),
-  // TODO:废弃，使用 arrowPlacement
-  arrowPlacement: _propTypes["default"].oneOf(['left', 'right']),
-  showArrow: _propTypes["default"].bool
+  //
+  arrow: _propTypes["default"].string
 });
-(0, _defineProperty2["default"])(Collapse, "defaultProps", {
+
+_defineProperty(Collapse, "defaultProps", {
   prefixCls: 'hi-collapse',
   accordion: false,
   arrow: 'left',
-  arrowPlacement: 'left',
-  type: 'default',
-  showArrow: true
+  type: 'default'
 });
 
 var CollapsePanel = /*#__PURE__*/function (_Component2) {
-  (0, _inherits2["default"])(CollapsePanel, _Component2);
+  _inherits(CollapsePanel, _Component2);
 
   var _super2 = _createSuper(CollapsePanel);
 
   function CollapsePanel() {
-    (0, _classCallCheck2["default"])(this, CollapsePanel);
+    _classCallCheck(this, CollapsePanel);
+
     return _super2.apply(this, arguments);
   }
 
-  (0, _createClass2["default"])(CollapsePanel, [{
+  _createClass(CollapsePanel, [{
     key: "render",
     value: function render() {
-      var _this$props4 = this.props,
-          key = _this$props4.key,
-          arrow = _this$props4.arrow,
-          header = _this$props4.header,
-          disabled = _this$props4.disabled,
-          isActive = _this$props4.isActive,
-          children = _this$props4.children,
-          onClickPanel = _this$props4.onClickPanel,
-          showArrow = _this$props4.showArrow;
+      var _this$props3 = this.props,
+          key = _this$props3.key,
+          arrow = _this$props3.arrow,
+          header = _this$props3.header,
+          disabled = _this$props3.disabled,
+          isActive = _this$props3.isActive,
+          children = _this$props3.children,
+          onClickPanel = _this$props3.onClickPanel;
       var classnames = (0, _classnames["default"])('collapse-item', {
         'collapse-item--show': isActive,
         'collapse-item--disabled': disabled
       });
-      var collapseIcon = (0, _classnames["default"])('collapse-item__icon', 'hi-icon', 'icon-down');
+      var collapseIcon = (0, _classnames["default"])('collapse-item__icon', 'hi-icon', 'icon-right');
       return /*#__PURE__*/_react["default"].createElement("div", {
         className: classnames
       }, /*#__PURE__*/_react["default"].createElement("div", {
@@ -199,31 +215,33 @@ var CollapsePanel = /*#__PURE__*/function (_Component2) {
         onClick: function onClick() {
           return onClickPanel(key);
         }
-      }, showArrow && arrow === 'left' && /*#__PURE__*/_react["default"].createElement("i", {
+      }, arrow === 'left' && /*#__PURE__*/_react["default"].createElement("i", {
         className: collapseIcon
       }), /*#__PURE__*/_react["default"].createElement("div", {
         className: "collapse-item__title"
-      }, header), showArrow && arrow === 'right' && /*#__PURE__*/_react["default"].createElement("i", {
+      }, header), arrow === 'right' && /*#__PURE__*/_react["default"].createElement("i", {
         className: collapseIcon
       })), /*#__PURE__*/_react["default"].createElement("div", {
         className: "collapse-item__content"
       }, children));
     }
   }]);
+
   return CollapsePanel;
 }(_react.Component);
 
-(0, _defineProperty2["default"])(CollapsePanel, "propTypes", {
+_defineProperty(CollapsePanel, "propTypes", {
   header: _propTypes["default"].oneOfType([_propTypes["default"].string, _propTypes["default"].node]),
   disabled: _propTypes["default"].bool,
   isActive: _propTypes["default"].bool,
   arrow: _propTypes["default"].string,
-  showArrow: _propTypes["default"].bool,
   onClickPanel: _propTypes["default"].func
 });
-(0, _defineProperty2["default"])(CollapsePanel, "defaultProps", {
+
+_defineProperty(CollapsePanel, "defaultProps", {
   disabled: false
 });
+
 Collapse.Panel = CollapsePanel;
 var _default = Collapse;
 exports["default"] = _default;

package/es/collapse/style/index.css

@@ -1 +1 @@
-.hi-collapse{text-align:left;border-bottom:0;border-radius:3px;font-size:14px}.hi-collapse .collapse-item{border-bottom:1px solid #d8d8d8}.hi-collapse .collapse-item__head{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;background-color:#fff;padding:12px 0 12px 16px;color:rgba(0,0,0,0.85);cursor:pointer}.hi-collapse .collapse-item__head .collapse-item__title{-webkit-box-flex:1;-ms-flex:auto;flex:auto;line-height:1}.hi-collapse .collapse-item__head>.collapse-item__icon{-webkit-box-flex:0;-ms-flex:none;flex:none;margin-right:10px;-webkit-transition:all 0.2s ease-out;transition:all 0.2s ease-out}.hi-collapse .collapse-item__content{display:block;width:100%;-webkit-transition:all 0.2s ease-out;transition:all 0.2s ease-out;height:0;-webkit-transform-origin:top;transform-origin:top;padding:0 16px;color:rgba(0,0,0,0.65);overflow:hidden;-webkit-box-sizing:border-box;box-sizing:border-box;background-color:#fbfbfb}.hi-collapse .collapse-item--show{border:none}.hi-collapse .collapse-item--show>.collapse-item__head>.collapse-item__icon{-webkit-transform:rotate(-180deg);transform:rotate(-180deg)}.hi-collapse .collapse-item--show>.collapse-item__content{padding:16px;height:auto;width:100%}.hi-collapse .collapse-item--disabled .collapse-item__head{cursor:not-allowed;color:#ccc}.hi-collapse__simple .collapse-item .head{background-color:#fff}
+.hi-collapse{text-align:left;border:1px solid #d9d9d9;border-bottom:0;border-radius:3px;font-size:14px}.hi-collapse .collapse-item{border-bottom:1px solid #d9d9d9}.hi-collapse .collapse-item__head{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;background-color:#f7f7f7;padding:12px 0 12px 16px;color:rgba(0,0,0,0.85);cursor:pointer}.hi-collapse .collapse-item__head .collapse-item__title{-webkit-box-flex:1;-ms-flex:auto;flex:auto;line-height:1}.hi-collapse .collapse-item__head>.collapse-item__icon{-webkit-box-flex:0;-ms-flex:none;flex:none;margin-right:10px;-webkit-transition:all 0.2s ease-out;transition:all 0.2s ease-out}.hi-collapse .collapse-item__content{display:block;width:100%;-webkit-transition:all 0.2s ease-out;transition:all 0.2s ease-out;height:0;-webkit-transform-origin:top;transform-origin:top;padding:0 16px;color:rgba(0,0,0,0.65);overflow:hidden;-webkit-box-sizing:border-box;box-sizing:border-box}.hi-collapse .collapse-item--show>.collapse-item__head>.collapse-item__icon{-webkit-transform:rotate(90deg);transform:rotate(90deg)}.hi-collapse .collapse-item--show>.collapse-item__content{padding:16px;height:auto;width:100%;border-top:1px solid #d9d9d9}.hi-collapse .collapse-item--disabled .collapse-item__head{cursor:not-allowed}.hi-collapse__simple .collapse-item .head{background-color:#fff}