shineout 1.10.12 → 1.10.13-beta.1

package/css/Cascader/Cascader.js

@@ -209,6 +209,7 @@ function (_PureComponent) {
     } else {
       var v = value[value.length - 1];
       var data = this.datum.getDataById(v);
+      if (data === null) return;
 
       try {
         var id = this.datum.getKey(data);
@@ -371,7 +372,6 @@ function (_PureComponent) {
         onItemClick = _this$props7.onItemClick,
         expandTrigger = _this$props7.expandTrigger,
         childrenKey = _this$props7.childrenKey,
-        absolute = _this$props7.absolute,
         height = _this$props7.height;
     var path = this.state.path;
     var props = {

package/css/Cascader/Result.js

@@ -339,7 +339,7 @@ function (_PureComponent) {
 
     var items = this.handleNode(nodes, render);
 
-    if (compressed) {
+    if (compressed && items.length) {
       items = this.renderMore(items);
     }
 

package/css/Scroll/Scroll.js

@@ -87,6 +87,7 @@ function (_PureComponent) {
       passive: false
     });
     this.inner.addEventListener('scroll', this.handleInnerScroll);
+    this.wheelElement.addEventListener('scroll', this.handleInnerScroll);
   };
 
   _proto.componentDidUpdate = function componentDidUpdate(prevProps) {
@@ -104,6 +105,7 @@ function (_PureComponent) {
     this.wheelElement.removeEventListener('touchstart', this.handleTouchStart);
     this.wheelElement.removeEventListener('touchmove', this.handleTouchMove);
     this.inner.removeEventListener('scroll', this.handleInnerScroll);
+    this.wheelElement.removeEventListener('scroll', this.handleInnerScroll);
   };
 
   _proto.getWheelRect = function getWheelRect() {
@@ -283,20 +285,31 @@ function (_PureComponent) {
 
     this.setStartPoint(position);
     this.boundleScroll();
-  } // inner scroll
+  } // handle inner scroll cased by input focus
   ;
 
   _proto.handleInnerScroll = function handleInnerScroll(e) {
     var target = e.target;
     var _this$props6 = this.props,
         left = _this$props6.left,
-        scrollWidth = _this$props6.scrollWidth;
+        scrollWidth = _this$props6.scrollWidth,
+        top = _this$props6.top,
+        scrollHeight = _this$props6.scrollHeight;
 
     var _this$getWheelRect2 = this.getWheelRect(),
-        width = _this$getWheelRect2.width;
-
-    if (target.scrollLeft) {
-      this.handleScroll(left + target.scrollLeft / (scrollWidth - width), this.props.top, undefined, 0);
+        width = _this$getWheelRect2.width,
+        height = _this$getWheelRect2.height;
+
+    if (target.scrollLeft || target.scrollTop) {
+      var sLeft = target.scrollLeft ? left + target.scrollLeft / (scrollWidth - width) : left;
+      var sTop = target.scrollTop ? top + target.scrollTop / (scrollHeight - height) : top;
+      sTop = Math.min(1, sTop);
+      sTop = Math.max(0, sTop);
+      sLeft = Math.min(1, sLeft);
+      sLeft = Math.max(0, sLeft);
+      this.handleScroll(sLeft, sTop, undefined, undefined, {
+        drag: true
+      });
       target.scrollLeft = 0;
       target.scrollTop = 0;
     }

package/css/index.d.ts

@@ -1,7 +1,7 @@
 // Created by scripts/src-index.js.
 import * as utils from './utils'
 
-export default { utils, version: '1.10.12' }
+export default { utils, version: '1.10.13-beta.1' }
 export { utils }
 export { setLocale } from './locale'
 export { color, style } from './utils/expose'

package/css/index.js

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

package/dist/shineout.js

@@ -8320,6 +8320,7 @@ function (_PureComponent) {
       } else {
         var v = value[value.length - 1];
         var data = this.datum.getDataById(v);
+        if (data === null) return;
 
         try {
           var id = this.datum.getKey(data);
@@ -8491,7 +8492,6 @@ function (_PureComponent) {
           onItemClick = _this$props7.onItemClick,
           expandTrigger = _this$props7.expandTrigger,
           childrenKey = _this$props7.childrenKey,
-          absolute = _this$props7.absolute,
           height = _this$props7.height;
       var path = this.state.path;
       var props = {
@@ -10288,7 +10288,7 @@ function (_PureComponent) {
 
       var items = this.handleNode(nodes, render);
 
-      if (compressed) {
+      if (compressed && items.length) {
         items = this.renderMore(items);
       }
 
@@ -34169,6 +34169,7 @@ function (_PureComponent) {
         passive: false
       });
       this.inner.addEventListener('scroll', this.handleInnerScroll);
+      this.wheelElement.addEventListener('scroll', this.handleInnerScroll);
     }
   }, {
     key: "componentDidUpdate",
@@ -34188,6 +34189,7 @@ function (_PureComponent) {
       this.wheelElement.removeEventListener('touchstart', this.handleTouchStart);
       this.wheelElement.removeEventListener('touchmove', this.handleTouchMove);
       this.inner.removeEventListener('scroll', this.handleInnerScroll);
+      this.wheelElement.removeEventListener('scroll', this.handleInnerScroll);
     }
   }, {
     key: "getWheelRect",
@@ -34381,7 +34383,7 @@ function (_PureComponent) {
 
       this.setStartPoint(position);
       this.boundleScroll();
-    } // inner scroll
+    } // handle inner scroll cased by input focus
 
   }, {
     key: "handleInnerScroll",
@@ -34389,13 +34391,24 @@ function (_PureComponent) {
       var target = e.target;
       var _this$props6 = this.props,
           left = _this$props6.left,
-          scrollWidth = _this$props6.scrollWidth;
+          scrollWidth = _this$props6.scrollWidth,
+          top = _this$props6.top,
+          scrollHeight = _this$props6.scrollHeight;
 
       var _this$getWheelRect2 = this.getWheelRect(),
-          width = _this$getWheelRect2.width;
-
-      if (target.scrollLeft) {
-        this.handleScroll(left + target.scrollLeft / (scrollWidth - width), this.props.top, undefined, 0);
+          width = _this$getWheelRect2.width,
+          height = _this$getWheelRect2.height;
+
+      if (target.scrollLeft || target.scrollTop) {
+        var sLeft = target.scrollLeft ? left + target.scrollLeft / (scrollWidth - width) : left;
+        var sTop = target.scrollTop ? top + target.scrollTop / (scrollHeight - height) : top;
+        sTop = Math.min(1, sTop);
+        sTop = Math.max(0, sTop);
+        sLeft = Math.min(1, sLeft);
+        sLeft = Math.max(0, sLeft);
+        this.handleScroll(sLeft, sTop, undefined, undefined, {
+          drag: true
+        });
         target.scrollLeft = 0;
         target.scrollTop = 0;
       }
@@ -34431,7 +34444,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 249,
+            lineNumber: 257,
             columnNumber: 7
           }
         },
@@ -34444,7 +34457,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 250,
+            lineNumber: 258,
             columnNumber: 9
           }
         }),
@@ -34454,7 +34467,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 251,
+            lineNumber: 259,
             columnNumber: 9
           }
         }),
@@ -34465,7 +34478,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 252,
+            lineNumber: 260,
             columnNumber: 9
           }
         },
@@ -34479,7 +34492,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 253,
+            lineNumber: 261,
             columnNumber: 11
           }
         }, children)), scrollY &&
@@ -34494,7 +34507,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 256,
+            lineNumber: 264,
             columnNumber: 11
           }
         }), scrollX &&
@@ -34508,7 +34521,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 266,
+            lineNumber: 274,
             columnNumber: 11
           }
         }))
@@ -61448,7 +61461,7 @@ __webpack_require__.r(__webpack_exports__);
 
 /* harmony default export */ __webpack_exports__["default"] = ({
   utils: _utils__WEBPACK_IMPORTED_MODULE_0__,
-  version: '1.10.12'
+  version: '1.10.13-beta.1'
 });