shineout 1.12.6-beta.6 → 1.12.6-beta.8

package/css/Sticky/index.js

@@ -7,6 +7,8 @@ exports.default = void 0;
 
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread"));
 
+var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+
 var _inheritsLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/inheritsLoose"));
 
 var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized"));
@@ -31,6 +33,7 @@ var _context = require("./context");
 
 var events = ['scroll', 'pageshow', 'load'];
 var supportSticky = (0, _element.cssSupport)('position', 'sticky');
+var defaultZIndex = 900;
 
 var Sticky =
 /*#__PURE__*/
@@ -58,7 +61,10 @@ function (_PureComponent) {
     var target = this.props.target;
     this.targetElement = (0, _element.getParent)(this.element, target);
     this.handlePosition();
-    this.bindScroll();
+
+    if (!this.shouldUseCss) {
+      this.bindScroll();
+    }
   };
 
   _proto.componentDidUpdate = function componentDidUpdate(prevProps) {
@@ -78,7 +84,7 @@ function (_PureComponent) {
     var _style;
 
     var _this$props$style$zIn = this.props.style.zIndex,
-        zIndex = _this$props$style$zIn === void 0 ? 900 : _this$props$style$zIn;
+        zIndex = _this$props$style$zIn === void 0 ? defaultZIndex : _this$props$style$zIn;
     var css = this.props.css;
     var style = (_style = {
       position: 'fixed',
@@ -314,13 +320,21 @@ function (_PureComponent) {
         children = _this$props2.children,
         className = _this$props2.className,
         target = _this$props2.target,
-        css = _this$props2.css;
+        css = _this$props2.css,
+        top = _this$props2.top,
+        bottom = _this$props2.bottom;
     var placeholder = this.state.placeholder;
     var outerStyle = this.props.style;
     var innerStyle = this.state.style;
 
     if (target && supportSticky && css) {
-      outerStyle = Object.assign({}, outerStyle, innerStyle);
+      outerStyle = Object.assign({
+        zIndex: defaultZIndex
+      }, outerStyle, {
+        position: 'sticky',
+        top: top,
+        bottom: bottom
+      });
       innerStyle = {};
     }
 
@@ -340,6 +354,18 @@ function (_PureComponent) {
     }));
   };
 
+  (0, _createClass2.default)(Sticky, [{
+    key: "shouldUseCss",
+    get: function get() {
+      var css = this.props.css;
+
+      if (css && supportSticky && this.targetElement) {
+        return true;
+      }
+
+      return false;
+    }
+  }]);
   return Sticky;
 }(_component.PureComponent);
 

package/css/Table/Table.js

@@ -160,7 +160,6 @@ function (_Component) {
     var newStyle = Object.assign({}, style);
     if (height) newStyle.height = height;
     if (useSeparate && !newStyle.height) newStyle.height = '100%';
-    if (loading) newStyle.overflow = 'hidden';
     return _react.default.createElement("div", (0, _extends2.default)({
       className: className,
       ref: this.bindTable,

package/css/index.d.ts

@@ -3,7 +3,7 @@ import * as utils from './utils'
 
 declare const __default: {
   utils: typeof utils,
-  version: '1.12.6-beta.6'
+  version: '1.12.6-beta.8'
 }
 
 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.6-beta.6'
+  version: '1.12.6-beta.8'
 };
 exports.default = _default;