shineout 1.12.13-beta.2 → 1.12.13-beta.3

package/css/Select/Select.js

@@ -243,8 +243,10 @@ function (_PureComponent) {
         onCollapse = _this$props3.onCollapse;
     var position = this.props.position;
     var windowHeight = _document.docSize.height;
-    var bottom = height + this.element.getBoundingClientRect().bottom;
-    if (bottom > windowHeight && !position) position = 'drop-up';
+    var rect = this.element.getBoundingClientRect();
+    var bottom = height + rect.bottom;
+    var canDropUp = rect.top > windowHeight - rect.bottom;
+    if (bottom > windowHeight && canDropUp) position = 'drop-up';
     if (onCollapse) onCollapse(focus);
     this.setState({
       focus: focus,

package/css/Table/Sorter.js

@@ -45,10 +45,10 @@ function (_PureComponent) {
     var _this$props = this.props,
         defaultOrder = _this$props.defaultOrder,
         current = _this$props.current,
-        index = _this$props.index;
+        keyStr = _this$props.keyStr;
     if (current.length !== 1) return;
     var item = current[0];
-    var changed = index === item.index && defaultOrder === item.order;
+    var changed = keyStr === item.key && defaultOrder === item.order;
     if (defaultOrder && !changed && !item.manual) this.handleChange(defaultOrder, false);
   };
 
@@ -59,15 +59,15 @@ function (_PureComponent) {
 
     var _this$props2 = this.props,
         sorter = _this$props2.sorter,
-        index = _this$props2.index,
+        keyStr = _this$props2.keyStr,
         onChange = _this$props2.onChange,
         current = _this$props2.current;
     var item = current.find(function (v) {
-      return v.index === index;
+      return v.key === keyStr;
     });
     var isCancel = !!item && order === item.order;
     var finalOrder = isCancel ? undefined : order;
-    onChange(finalOrder, sorter, index, order, manual);
+    onChange(finalOrder, sorter, keyStr, order, manual);
   };
 
   _proto.handleAsc = function handleAsc() {
@@ -81,10 +81,10 @@ function (_PureComponent) {
   _proto.render = function render() {
     var _this$props3 = this.props,
         current = _this$props3.current,
-        index = _this$props3.index,
+        keyStr = _this$props3.keyStr,
         renderSorter = _this$props3.renderSorter;
     var item = current.find(function (v) {
-      return v.index === index;
+      return v.key === keyStr;
     });
     var active = !!item;
     var isCustomRender = renderSorter && typeof renderSorter === 'function';
@@ -110,11 +110,11 @@ function (_PureComponent) {
 
 Sorter.propTypes = {
   current: _propTypes.default.array,
-  index: _propTypes.default.number.isRequired,
   onChange: _propTypes.default.func.isRequired,
   sorter: _propTypes.default.oneOfType([_propTypes.default.func, _propTypes.default.string, _propTypes.default.object]).isRequired,
   defaultOrder: _propTypes.default.oneOf(['desc', 'asc']),
-  renderSorter: _propTypes.default.func
+  renderSorter: _propTypes.default.func,
+  keyStr: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.number]).isRequired
 };
 var _default = Sorter;
 exports.default = _default;

package/css/Table/Thead.js

@@ -193,6 +193,7 @@ function (_PureComponent) {
         className: (0, _styles.tableClass)(col.sorter && 'has-sorter')
       }, _react.default.createElement("span", null, typeof col.title === 'function' ? col.title(data) : col.title), col.sorter && _react.default.createElement(_Sorter.default, (0, _extends2.default)({}, col, {
         current: sorter,
+        keyStr: col.key,
         onChange: onSortChange,
         renderSorter: this.props.renderSorter
       })), resize)));

package/css/Table/index.js

@@ -163,7 +163,7 @@ function (_React$Component) {
     return undefined;
   };
 
-  _proto.handleSortChange = function handleSortChange(order, sorter, index, cancelOrder, manual) {
+  _proto.handleSortChange = function handleSortChange(order, sorter, key, cancelOrder, manual) {
     var _this2 = this;
 
     var onSortCancel = this.props.onSortCancel; // cancel sorter
@@ -171,7 +171,7 @@ function (_React$Component) {
     if (!order) {
       this.setState((0, _immer.default)(function (state) {
         var item = state.sorter.find(function (v) {
-          return v.index === index;
+          return v.key === key;
         });
 
         if (item) {
@@ -185,7 +185,7 @@ function (_React$Component) {
         }).map(function (v) {
           return {
             order: v.order,
-            index: v.index,
+            key: v.key,
             weight: v.weight,
             manual: v.manual
           };
@@ -195,7 +195,7 @@ function (_React$Component) {
           sorter.rule(rpm);
         }
 
-        if (onSortCancel) onSortCancel(cancelOrder, index, rpm, sorter);
+        if (onSortCancel) onSortCancel(cancelOrder, key, rpm, sorter);
       });
       return;
     }
@@ -205,13 +205,13 @@ function (_React$Component) {
         var rpm = state.sorter.map(function (v) {
           return {
             order: v.order,
-            index: v.index,
+            key: v.key,
             weight: v.weight,
             manual: v.manual
           };
         });
         var item = state.sorter.find(function (v) {
-          return v.index === index;
+          return v.key === key;
         });
 
         if (state.sorter.length === 1 && !state.sorter[0].multiple) {
@@ -224,7 +224,7 @@ function (_React$Component) {
           item.manual = manual;
           item.deleted = false;
           var rpmItem = rpm.find(function (v) {
-            return v.index === index;
+            return v.key === key;
           });
           rpmItem.order = order;
           rpmItem.manual = manual;
@@ -238,7 +238,7 @@ function (_React$Component) {
             _this2.cacheDefaultSorterList = [];
             rpm.push({
               order: order,
-              index: index,
+              key: key,
               weight: sorter.weight,
               manual: manual
             });
@@ -250,7 +250,7 @@ function (_React$Component) {
           if (!manual) {
             _this2.cacheDefaultSorterList.push({
               order: order,
-              index: index,
+              key: key,
               weight: sorter.weight,
               manual: manual
             });
@@ -262,7 +262,7 @@ function (_React$Component) {
 
           state.sorter.push({
             order: order,
-            index: index,
+            key: key,
             sort: _sort,
             manual: manual,
             multiple: true,
@@ -286,13 +286,13 @@ function (_React$Component) {
     } else {
       var sort = typeof sorter === 'string' ? this.getTableSorter()(sorter, order, [{
         order: order,
-        index: index
+        key: key
       }]) : sorter(order);
       this.setState((0, _immer.default)(function (state) {
         state.sorter = [];
         state.sorter.push({
           order: order,
-          index: index,
+          key: key,
           sort: sort,
           manual: manual,
           multiple: false,

package/css/index.d.ts

@@ -3,7 +3,7 @@ import * as utils from './utils'
 
 declare const __default: {
   utils: typeof utils,
-  version: '1.12.13-beta.2'
+  version: '1.12.13-beta.3'
 }
 
 export default __default

package/css/index.js

@@ -224,6 +224,6 @@ exports.Upload = _Upload.default;
 // Created by scripts/src-index.js.
 var _default = {
   utils: utils,
-  version: '1.12.13-beta.2'
+  version: '1.12.13-beta.3'
 };
 exports.default = _default;