shineout 1.8.2 → 1.8.3

package/css/AnimationList/AbsoluteList.js

@@ -115,8 +115,8 @@ function _default(List) {
     _proto.componentDidUpdate = function componentDidUpdate(prevProps) {
       var _this2 = this;
 
-      if ((0, _shallowEqual.default)(prevProps.value, this.props.value)) return;
       if (!this.props.focus) this.ajustdoc = false;
+      if ((0, _shallowEqual.default)(prevProps.value, this.props.value)) return;
       setTimeout(function () {
         _this2.forceUpdate();
       });

package/css/Scroll/Scroll.js

@@ -67,6 +67,7 @@ function (_PureComponent) {
     _this.handleTouchStart = _this.handleTouchStart.bind((0, _assertThisInitialized2.default)((0, _assertThisInitialized2.default)(_this)));
     _this.handleTouchMove = _this.handleTouchMove.bind((0, _assertThisInitialized2.default)((0, _assertThisInitialized2.default)(_this)));
     _this.setStartPoint = _this.setStartPoint.bind((0, _assertThisInitialized2.default)((0, _assertThisInitialized2.default)(_this)));
+    _this.handleInnerScroll = _this.handleInnerScroll.bind((0, _assertThisInitialized2.default)((0, _assertThisInitialized2.default)(_this)));
     return _this;
   }
 
@@ -85,6 +86,7 @@ function (_PureComponent) {
     this.wheelElement.addEventListener('touchmove', this.handleTouchMove, {
       passive: false
     });
+    this.inner.addEventListener('scroll', this.handleInnerScroll);
   };
 
   _proto.componentDidUpdate = function componentDidUpdate(prevProps) {
@@ -101,6 +103,7 @@ function (_PureComponent) {
     this.wheelElement.removeEventListener('wheel', this.handleWheel);
     this.wheelElement.removeEventListener('touchstart', this.handleTouchStart);
     this.wheelElement.removeEventListener('touchmove', this.handleTouchMove);
+    this.inner.removeEventListener('scroll', this.handleInnerScroll);
   };
 
   _proto.getWheelRect = function getWheelRect() {
@@ -280,22 +283,39 @@ function (_PureComponent) {
 
     this.setStartPoint(position);
     this.boundleScroll();
-  };
+  } // inner scroll
+  ;
 
-  _proto.render = function render() {
+  _proto.handleInnerScroll = function handleInnerScroll(e) {
+    var target = e.target;
     var _this$props6 = this.props,
-        children = _this$props6.children,
-        scrollWidth = _this$props6.scrollWidth,
-        scrollHeight = _this$props6.scrollHeight,
         left = _this$props6.left,
-        top = _this$props6.top,
-        scrollX = _this$props6.scrollX,
-        scrollY = _this$props6.scrollY,
-        style = _this$props6.style;
+        scrollWidth = _this$props6.scrollWidth;
 
     var _this$getWheelRect2 = this.getWheelRect(),
-        width = _this$getWheelRect2.width,
-        height = _this$getWheelRect2.height;
+        width = _this$getWheelRect2.width;
+
+    if (target.scrollLeft) {
+      this.handleScroll(left + target.scrollLeft / (scrollWidth - width), this.props.top, undefined, 0);
+      target.scrollLeft = 0;
+      target.scrollTop = 0;
+    }
+  };
+
+  _proto.render = function render() {
+    var _this$props7 = this.props,
+        children = _this$props7.children,
+        scrollWidth = _this$props7.scrollWidth,
+        scrollHeight = _this$props7.scrollHeight,
+        left = _this$props7.left,
+        top = _this$props7.top,
+        scrollX = _this$props7.scrollX,
+        scrollY = _this$props7.scrollY,
+        style = _this$props7.style;
+
+    var _this$getWheelRect3 = this.getWheelRect(),
+        width = _this$getWheelRect3.width,
+        height = _this$getWheelRect3.height;
 
     var rtl = (0, _config.isRTL)();
     var className = (0, _classnames.default)((0, _styles.scrollClass)('_', scrollX && 'show-x', scrollY && 'show-y', rtl && 'rtl'), this.props.className);

package/css/Table/resizable.js

@@ -79,7 +79,7 @@ var _default = function _default(Table) {
       var onColumnResize = this.props.onColumnResize;
       var changed = (0, _immer.default)(this.state, function (draft) {
         var column = draft.columns[index];
-        draft.delta += parseFloat(width - (column.width || 0));
+        draft.delta += parseFloat(width - (column.width || colgroup[index] || 0));
         colgroup[index] = width;
         draft.columns.forEach(function (col, i) {
           var w = colgroup[i];

package/css/index.d.ts

@@ -2,7 +2,7 @@
 import './styles/normalize.less'
 import * as utils from './utils'
 
-export default { utils, version: '1.8.2' }
+export default { utils, version: '1.8.3' }
 export { utils }
 export { setLocale } from './locale'
 export { color, style } from './utils/expose'

package/css/index.js

@@ -222,6 +222,6 @@ exports.Upload = _Upload.default;
 // Created by scripts/src-index.js.
 var _default = {
   utils: utils,
-  version: '1.8.2'
+  version: '1.8.3'
 };
 exports.default = _default;

package/dist/shineout.js

@@ -4538,8 +4538,8 @@ var dropdownPosition = ['bottom-left', 'bottom-right', 'top-left', 'top-right'];
       value: function componentDidUpdate(prevProps) {
         var _this2 = this;
 
-        if (Object(_utils_shallowEqual__WEBPACK_IMPORTED_MODULE_12__["default"])(prevProps.value, this.props.value)) return;
         if (!this.props.focus) this.ajustdoc = false;
+        if (Object(_utils_shallowEqual__WEBPACK_IMPORTED_MODULE_12__["default"])(prevProps.value, this.props.value)) return;
         setTimeout(function () {
           _this2.forceUpdate();
         });
@@ -33413,6 +33413,7 @@ function (_PureComponent) {
     _this.handleTouchStart = _this.handleTouchStart.bind(Object(_Users_10008649_Desktop_workspace_fe_shein_shineout_node_modules_babel_preset_react_app_node_modules_babel_runtime_helpers_esm_assertThisInitialized__WEBPACK_IMPORTED_MODULE_3__["default"])(_this));
     _this.handleTouchMove = _this.handleTouchMove.bind(Object(_Users_10008649_Desktop_workspace_fe_shein_shineout_node_modules_babel_preset_react_app_node_modules_babel_runtime_helpers_esm_assertThisInitialized__WEBPACK_IMPORTED_MODULE_3__["default"])(_this));
     _this.setStartPoint = _this.setStartPoint.bind(Object(_Users_10008649_Desktop_workspace_fe_shein_shineout_node_modules_babel_preset_react_app_node_modules_babel_runtime_helpers_esm_assertThisInitialized__WEBPACK_IMPORTED_MODULE_3__["default"])(_this));
+    _this.handleInnerScroll = _this.handleInnerScroll.bind(Object(_Users_10008649_Desktop_workspace_fe_shein_shineout_node_modules_babel_preset_react_app_node_modules_babel_runtime_helpers_esm_assertThisInitialized__WEBPACK_IMPORTED_MODULE_3__["default"])(_this));
     return _this;
   }
 
@@ -33431,6 +33432,7 @@ function (_PureComponent) {
       this.wheelElement.addEventListener('touchmove', this.handleTouchMove, {
         passive: false
       });
+      this.inner.addEventListener('scroll', this.handleInnerScroll);
     }
   }, {
     key: "componentDidUpdate",
@@ -33449,6 +33451,7 @@ function (_PureComponent) {
       this.wheelElement.removeEventListener('wheel', this.handleWheel);
       this.wheelElement.removeEventListener('touchstart', this.handleTouchStart);
       this.wheelElement.removeEventListener('touchmove', this.handleTouchMove);
+      this.inner.removeEventListener('scroll', this.handleInnerScroll);
     }
   }, {
     key: "getWheelRect",
@@ -33642,23 +33645,41 @@ function (_PureComponent) {
 
       this.setStartPoint(position);
       this.boundleScroll();
-    }
+    } // inner scroll
+
   }, {
-    key: "render",
-    value: function render() {
+    key: "handleInnerScroll",
+    value: function handleInnerScroll(e) {
+      var target = e.target;
       var _this$props6 = this.props,
-          children = _this$props6.children,
-          scrollWidth = _this$props6.scrollWidth,
-          scrollHeight = _this$props6.scrollHeight,
           left = _this$props6.left,
-          top = _this$props6.top,
-          scrollX = _this$props6.scrollX,
-          scrollY = _this$props6.scrollY,
-          style = _this$props6.style;
+          scrollWidth = _this$props6.scrollWidth;
 
       var _this$getWheelRect2 = this.getWheelRect(),
-          width = _this$getWheelRect2.width,
-          height = _this$getWheelRect2.height;
+          width = _this$getWheelRect2.width;
+
+      if (target.scrollLeft) {
+        this.handleScroll(left + target.scrollLeft / (scrollWidth - width), this.props.top, undefined, 0);
+        target.scrollLeft = 0;
+        target.scrollTop = 0;
+      }
+    }
+  }, {
+    key: "render",
+    value: function render() {
+      var _this$props7 = this.props,
+          children = _this$props7.children,
+          scrollWidth = _this$props7.scrollWidth,
+          scrollHeight = _this$props7.scrollHeight,
+          left = _this$props7.left,
+          top = _this$props7.top,
+          scrollX = _this$props7.scrollX,
+          scrollY = _this$props7.scrollY,
+          style = _this$props7.style;
+
+      var _this$getWheelRect3 = this.getWheelRect(),
+          width = _this$getWheelRect3.width,
+          height = _this$getWheelRect3.height;
 
       var rtl = Object(_config__WEBPACK_IMPORTED_MODULE_17__["isRTL"])();
       var className = classnames__WEBPACK_IMPORTED_MODULE_10___default()(Object(_styles__WEBPACK_IMPORTED_MODULE_15__["scrollClass"])('_', scrollX && 'show-x', scrollY && 'show-y', rtl && 'rtl'), this.props.className);
@@ -33674,7 +33695,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 234,
+            lineNumber: 249,
             columnNumber: 7
           }
         },
@@ -33687,7 +33708,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 235,
+            lineNumber: 250,
             columnNumber: 9
           }
         }),
@@ -33697,7 +33718,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 236,
+            lineNumber: 251,
             columnNumber: 9
           }
         }),
@@ -33708,7 +33729,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 237,
+            lineNumber: 252,
             columnNumber: 9
           }
         },
@@ -33722,7 +33743,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 238,
+            lineNumber: 253,
             columnNumber: 11
           }
         }, children)), scrollY &&
@@ -33737,7 +33758,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 241,
+            lineNumber: 256,
             columnNumber: 11
           }
         }), scrollX &&
@@ -33751,7 +33772,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 251,
+            lineNumber: 266,
             columnNumber: 11
           }
         }))
@@ -45842,7 +45863,7 @@ function _createSuper2(Derived) {
         var onColumnResize = this.props.onColumnResize;
         var changed = Object(immer__WEBPACK_IMPORTED_MODULE_8__["default"])(this.state, function (draft) {
           var column = draft.columns[index];
-          draft.delta += parseFloat(width - (column.width || 0));
+          draft.delta += parseFloat(width - (column.width || colgroup[index] || 0));
           colgroup[index] = width;
           draft.columns.forEach(function (col, i) {
             var w = colgroup[i];
@@ -60258,7 +60279,7 @@ __webpack_require__.r(__webpack_exports__);
 
 /* harmony default export */ __webpack_exports__["default"] = ({
   utils: _utils__WEBPACK_IMPORTED_MODULE_0__,
-  version: '1.8.2'
+  version: '1.8.3'
 });