shineout 1.10.16-beta.2 → 1.10.16

package/css/Datum/Tree.js

@@ -86,13 +86,20 @@ function () {
   _proto.setUnmatedValue = function setUnmatedValue() {
     var _this = this;
 
+    this.unmatchedValueMap = new Map();
     if (!this.value || !this.data) return;
     this.value.forEach(function (v) {
       var data = _this.getDataById(v);
 
-      var unmatched = data && data[IS_NOT_MATCHED_VALUE];
+      var unmatched = _this.isUnMatch(data);
+
       if (unmatched) _this.unmatchedValueMap.set(v, true);else _this.unmatchedValueMap.delete(v);
     });
+  } // eslint-disable-next-line class-methods-use-this
+  ;
+
+  _proto.isUnMatch = function isUnMatch(data) {
+    return data && data[IS_NOT_MATCHED_VALUE];
   };
 
   _proto.setValue = function setValue(value) {
@@ -161,12 +168,6 @@ function () {
 
     // self
     if (!this.isDisabled(id)) this.setValueMap(id, checked);
-
-    if (CheckedMode.Freedom === this.mode) {
-      // Free mode will return zero
-      return 0;
-    }
-
     var data = this.getDataById(id);
 
     if (data && data[IS_NOT_MATCHED_VALUE]) {
@@ -174,6 +175,11 @@ function () {
       return null;
     }
 
+    if (CheckedMode.Freedom === this.mode) {
+      // Free mode will return zero
+      return 0;
+    }
+
     var _this$pathMap$get = this.pathMap.get(id),
         path = _this$pathMap$get.path,
         children = _this$pathMap$get.children;

package/css/InputTitle/styles/inputTitle.css

@@ -128,7 +128,7 @@
   padding: 2px 8px;
   font-size: var(--font-size-small, 12px);
 }
-.so-input-small .so-input-title-box-content .so-input-title-box-item {
+.so-input-small *.so-input-title-box-item {
   padding: 2px 8px;
 }
 .so-input-large .so-input-title-box {
@@ -138,7 +138,7 @@
   padding: 4px 8px;
   font-size: var(--font-size-large, 18px);
 }
-.so-input-large .so-input-title-box-content > .so-input-title-box-item {
+.so-input-large *.so-input-title-box-item {
   padding: 4px 8px;
 }
 .so-datepicker-inner-title .so-input-title-box-title {

package/css/Tabs/Header.js

@@ -19,6 +19,8 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _immer = _interopRequireDefault(require("immer"));
 
+var _element = require("shineout/utils/dom/element");
+
 var _component = require("../component");
 
 var _Button = _interopRequireDefault(require("../Button"));
@@ -56,6 +58,7 @@ function (_PureComponent) {
     _this.handleNextClick = _this.handleMove.bind((0, _assertThisInitialized2.default)((0, _assertThisInitialized2.default)(_this)), false);
     _this.moveToCenter = _this.moveToCenter.bind((0, _assertThisInitialized2.default)((0, _assertThisInitialized2.default)(_this)));
     _this.handleCollapse = _this.handleCollapse.bind((0, _assertThisInitialized2.default)((0, _assertThisInitialized2.default)(_this)));
+    _this.handleResize = _this.handleResize.bind((0, _assertThisInitialized2.default)((0, _assertThisInitialized2.default)(_this)));
     return _this;
   }
 
@@ -66,6 +69,10 @@ function (_PureComponent) {
 
     var isVertical = this.props.isVertical;
     this.setPosition(isVertical);
+    this.removeObserver = (0, _element.addResizeObserver)(this.innerElement, this.handleResize, {
+      direction: true,
+      timer: 100
+    });
   };
 
   _proto.componentDidUpdate = function componentDidUpdate() {
@@ -73,6 +80,14 @@ function (_PureComponent) {
     this.setPosition(isVertical);
   };
 
+  _proto.componentWillUnmount = function componentWillUnmount() {
+    _PureComponent.prototype.componentWillUnmount.call(this);
+
+    if (this.removeObserver) {
+      this.removeObserver();
+    }
+  };
+
   _proto.setPosition = function setPosition(isVertical) {
     var attributeString = isVertical ? 'Height' : 'Width';
     if (!this.innerElement) return;
@@ -85,6 +100,14 @@ function (_PureComponent) {
     });
   };
 
+  _proto.handleResize = function handleResize(entry, _ref) {
+    var x = _ref.x,
+        y = _ref.y;
+    var isVertical = this.props.isVertical;
+    var isResize = isVertical ? y : x;
+    if (isResize) this.setPosition(isVertical);
+  };
+
   _proto.bindElement = function bindElement(name, el) {
     this[name] = el;
   };
@@ -98,6 +121,7 @@ function (_PureComponent) {
     var attribute = a + (lt ? -innerAttribute : innerAttribute);
     if (attribute < 0) attribute = 0;
     if (attribute + innerAttribute > scrollAttribute) attribute = scrollAttribute - innerAttribute;
+    if (scrollAttribute <= innerAttribute) attribute = 0;
     this.setState({
       attribute: attribute
     });
@@ -151,10 +175,10 @@ function (_PureComponent) {
     onCollapse(!collapsed);
   };
 
-  _proto.renderTab = function renderTab(_ref) {
-    var tab = _ref.tab,
-        id = _ref.id,
-        other = (0, _objectWithoutPropertiesLoose2.default)(_ref, ["tab", "id"]);
+  _proto.renderTab = function renderTab(_ref2) {
+    var tab = _ref2.tab,
+        id = _ref2.id,
+        other = (0, _objectWithoutPropertiesLoose2.default)(_ref2, ["tab", "id"]);
     return _react.default.createElement(_Tab.default, (0, _extends2.default)({}, other, {
       key: id,
       id: id,
@@ -187,7 +211,7 @@ function (_PureComponent) {
   };
 
   _proto.render = function render() {
-    var _ref2;
+    var _ref3;
 
     var _this$props3 = this.props,
         border = _this$props3.border,
@@ -221,7 +245,7 @@ function (_PureComponent) {
       className: (0, _styles.tabsClass)('inner')
     }, _react.default.createElement("div", {
       ref: this.bindScroll,
-      style: (_ref2 = {}, _ref2["margin" + position] = -attribute, _ref2),
+      style: (_ref3 = {}, _ref3["margin" + position] = -attribute, _ref3),
       className: (0, _styles.tabsClass)('scroll')
     }, shape === 'button' ? this.renderButtons() : this.renderTabs())), overflow && _react.default.createElement("div", {
       onClick: this.handleNextClick,

package/css/Tabs/styles/tabs.css

@@ -320,17 +320,17 @@
 .so-tabs-panel.so-tabs-show {
   display: block;
 }
-.so-tabs-dash .so-tabs-tab {
+.so-tabs-dash > .so-tabs-header .so-tabs-tab {
   border-color: transparent;
   background: transparent;
   color: inherit;
 }
-.so-tabs-dash .so-tabs-active {
+.so-tabs-dash > .so-tabs-header .so-tabs-active {
   color: var(--primary-color, #3399ff);
   border-color: transparent;
   background: transparent;
 }
-.so-tabs-dash .so-tabs-active:after {
+.so-tabs-dash > .so-tabs-header .so-tabs-active:after {
   bottom: 0;
   left: 50%;
   -webkit-transform: translateX(-50%);

package/css/TreeSelect/TreeSelect.js

@@ -253,7 +253,8 @@ function (_PureComponent) {
 
   _proto.handleRemove = function handleRemove(data) {
     var datum = this.props.datum;
-    datum.set(datum.getKey(data), 0);
+    var dataKey = data && datum.isUnMatch(data) ? data.value : datum.getKey(data);
+    datum.set(dataKey, 0);
     this.handleChange(data, datum.getKey(data));
   };
 

package/css/TreeSelect/filter.js

@@ -73,7 +73,7 @@ var _default = function _default(Origin) {
           var _res;
 
           res = datum.getDataById(v);
-          if (res && !noCache) _this2.resultCache.set(v, res);else if (!res) res = (_res = {}, _res[_Result.IS_NOT_MATCHED_VALUE] = true, _res.value = v, _res);
+          if (res && !noCache && !res[_Result.IS_NOT_MATCHED_VALUE]) _this2.resultCache.set(v, res);else if (!res) res = (_res = {}, _res[_Result.IS_NOT_MATCHED_VALUE] = true, _res.value = v, _res);
         }
 
         if (res) {

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.16-beta.2' }
+export default { utils, version: '1.10.16' }
 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.16-beta.2'
+  version: '1.10.16'
 };
 exports.default = _default;

package/css/utils/dom/element.js

@@ -13,6 +13,8 @@ exports.addResizeObserver = exports.parsePxToNumber = exports.preventPasteFile =
 
 var _react = _interopRequireDefault(require("react"));
 
+var _func = require("../func");
+
 if (Element && !Element.prototype.matches) {
   var proto = Element.prototype;
   proto.matches = proto.matchesSelector || proto.mozMatchesSelector || proto.msMatchesSelector || proto.oMatchesSelector || proto.webkitMatchesSelector;
@@ -208,8 +210,14 @@ var addResizeObserver = function addResizeObserver(el, handler, options) {
   }
 
   var _options = options,
-      direction = _options.direction;
-  var h = handler;
+      direction = _options.direction,
+      timer = _options.timer;
+
+  var _throttle = (0, _func.throttle)(handler, timer),
+      throttleHandler = _throttle[0],
+      cleanTimer = _throttle[1];
+
+  var h = throttleHandler;
   var lastWidth;
   var lastHeight;
 
@@ -225,14 +233,14 @@ var addResizeObserver = function addResizeObserver(el, handler, options) {
 
         if (width && direction === 'x') {
           if (lastWidth !== width) {
-            handler(entry);
+            throttleHandler(entry);
           }
         } else if (direction === 'y') {
           if (height && lastHeight !== height) {
-            handler(entry);
+            throttleHandler(entry);
           }
         } else if (width && height) {
-          handler(entry, {
+          throttleHandler(entry, {
             x: lastWidth !== width,
             y: lastHeight !== height
           });
@@ -247,13 +255,15 @@ var addResizeObserver = function addResizeObserver(el, handler, options) {
     observer.observe(el);
     return function () {
       observer.disconnect();
+      cleanTimer();
       observer = null;
     };
   }
 
-  window.addEventListener('resize', handler);
+  window.addEventListener('resize', throttleHandler);
   return function () {
-    return window.removeEventListener('resize', handler);
+    window.removeEventListener('resize', handler);
+    cleanTimer();
   };
 };
 

package/css/utils/func.js

@@ -6,6 +6,7 @@ exports.curry = curry;
 exports.empty = empty;
 exports.memoize = memoize;
 exports.createFunc = createFunc;
+exports.throttle = void 0;
 
 /**
  * from redux.compose https://github.com/reactjs/redux/blob/master/src/compose.js
@@ -77,4 +78,29 @@ function createFunc(func) {
   return function (data) {
     return func ? data[func] : data;
   };
-}
+}
+
+var throttle = function throttle(func, timer) {
+  var that = {};
+
+  var cleanTimer = function cleanTimer() {
+    if (that.timer) {
+      clearTimeout(that.timer);
+      that.timer = '';
+    }
+  };
+
+  if (!timer) return [func, cleanTimer];
+  return [function () {
+    for (var _len4 = arguments.length, args = new Array(_len4), _key4 = 0; _key4 < _len4; _key4++) {
+      args[_key4] = arguments[_key4];
+    }
+
+    cleanTimer();
+    that.timer = setTimeout(function () {
+      func.apply(void 0, args);
+    }, timer);
+  }, cleanTimer];
+};
+
+exports.throttle = throttle;