shineout 1.9.4 → 1.9.7

package/lib/Tag/styles/index.js

@@ -5,6 +5,8 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 exports.__esModule = true;
 exports.tagClass = void 0;
 
+require("../../styles/normalize.less");
+
 var _tag = _interopRequireDefault(require("./tag.less"));
 
 var _classname = _interopRequireDefault(require("../../utils/classname"));

package/lib/Tooltip/styles/index.js

@@ -5,6 +5,8 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 exports.__esModule = true;
 exports.tooltipClass = void 0;
 
+require("../../styles/normalize.less");
+
 var _tooltip = _interopRequireDefault(require("./tooltip.less"));
 
 var _classname = _interopRequireDefault(require("../../utils/classname"));

package/lib/Transfer/styles/index.js

@@ -5,6 +5,8 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 exports.__esModule = true;
 exports.transferClass = void 0;
 
+require("../../styles/normalize.less");
+
 var _transfer = _interopRequireDefault(require("./transfer.less"));
 
 var _classname = _interopRequireDefault(require("../../utils/classname"));

package/lib/Tree/Checkbox.js

@@ -92,6 +92,6 @@ exports.default = _default;
 (0, _defineProperty2.default)(_default, "propTypes", {
   datum: _propTypes.default.object.isRequired,
   disabled: _propTypes.default.bool,
-  id: _propTypes.default.string.isRequired,
+  id: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.number]),
   onChange: _propTypes.default.func.isRequired
 });

package/lib/Tree/Content.js

@@ -163,7 +163,7 @@ Content.propTypes = {
   draggable: _propTypes.default.bool,
   expanded: _propTypes.default.bool,
   loader: _propTypes.default.func,
-  id: _propTypes.default.any,
+  id: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.number]),
   onChange: _propTypes.default.func,
   onToggle: _propTypes.default.func,
   onDragOver: _propTypes.default.func,

package/lib/Tree/List.js

@@ -107,7 +107,7 @@ List.propTypes = {
   className: _propTypes.default.string,
   data: _propTypes.default.array,
   expanded: _propTypes.default.bool,
-  id: _propTypes.default.any,
+  id: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.number]),
   isRoot: _propTypes.default.bool,
   keygen: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.func]).isRequired,
   line: _propTypes.default.bool,

package/lib/Tree/styles/index.js

@@ -5,6 +5,8 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 exports.__esModule = true;
 exports.treeClass = void 0;
 
+require("../../styles/normalize.less");
+
 var _tree = _interopRequireDefault(require("./tree.less"));
 
 var _classname = _interopRequireDefault(require("../../utils/classname"));

package/lib/TreeSelect/Result.js

@@ -100,13 +100,47 @@ function (_PureComponent) {
   };
 
   _proto.componentDidUpdate = function componentDidUpdate(preProps) {
+    this.updateMore(preProps);
+  };
+
+  _proto.componentWillUnmount = function componentWillUnmount() {
+    if (this.cancelResizeObserver) this.cancelResizeObserver();
+  };
+
+  _proto.bindResult = function bindResult(el) {
+    this.resultEl = el;
+  };
+
+  _proto.updateMore = function updateMore(preProps) {
     var _this$props = this.props,
         result = _this$props.result,
         compressed = _this$props.compressed,
-        onFilter = _this$props.onFilter;
+        onFilter = _this$props.onFilter,
+        renderResult = _this$props.renderResult,
+        renderUnmatched = _this$props.renderUnmatched;
 
     if (compressed) {
-      if ((preProps.result || []).join('') !== (result || []).join('')) {
+      var shouldRest = false;
+
+      if (preProps.result.length !== result.length) {
+        shouldRest = true;
+      } else {
+        var i = preProps.result.length - 1;
+
+        while (i >= 0) {
+          var before = getResultContent(preProps.result[i], preProps.renderResult, preProps.renderUnmatched);
+          var now = getResultContent(result[i], renderResult, renderUnmatched);
+
+          if (before !== now) {
+            shouldRest = true;
+            break;
+          }
+
+          i -= 1;
+        }
+      }
+
+      if (shouldRest) {
         this.resetMore();
       } else if (result.length && this.shouldResetMore) {
         this.shouldResetMore = false;
@@ -116,14 +150,6 @@ function (_PureComponent) {
     }
   };
 
-  _proto.componentWillUnmount = function componentWillUnmount() {
-    if (this.cancelResizeObserver) this.cancelResizeObserver();
-  };
-
-  _proto.bindResult = function bindResult(el) {
-    this.resultEl = el;
-  };
-
   _proto.resetMore = function resetMore() {
     if (!this.props.compressed) return;
     this.shouldResetMore = true;

package/lib/TreeSelect/styles/index.js

@@ -5,6 +5,8 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 exports.__esModule = true;
 exports.treeSelectClass = void 0;
 
+require("../../styles/normalize.less");
+
 var _treeSelect = _interopRequireDefault(require("./treeSelect.less"));
 
 var _classname = _interopRequireDefault(require("../../utils/classname"));

package/lib/TreeSelect/styles/treeSelect.less

@@ -520,7 +520,7 @@
       padding-right: (@padding-base-horizontal / 2);
       padding-left: @padding-base-horizontal + 22;
     }
-    a.@{treeSelect-prefix}-close-wrapper {
+    .@{treeSelect-prefix}-close-warpper {
       right: 17px;
       .@{input-prefix}-rtl & ,@{treeSelect-prefix}-rtl & {
         left: 17px;
@@ -536,7 +536,7 @@
       padding-right: (@padding-base-horizontal / 2);
       padding-left: @padding-base-horizontal + 12;
     }
-    a.@{treeSelect-prefix}-close-wrapper {
+    .@{treeSelect-prefix}-close-warpper {
       right: 7px;
       .@{input-prefix}-rtl & ,@{treeSelect-prefix}-rtl & {
         left: 7px;

package/lib/Upload/styles/index.js

@@ -5,6 +5,8 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 exports.__esModule = true;
 exports.uploadClass = void 0;
 
+require("../../styles/normalize.less");
+
 var _upload = _interopRequireDefault(require("./upload.less"));
 
 var _classname = _interopRequireDefault(require("../../utils/classname"));

package/lib/hoc/styles/index.js

@@ -5,6 +5,8 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 exports.__esModule = true;
 exports.resizableClass = exports.moveableClass = exports.hidableClass = void 0;
 
+require("../../styles/normalize.less");
+
 var _resizable = _interopRequireDefault(require("./resizable.less"));
 
 var _moveable = _interopRequireDefault(require("./moveable.less"));

package/lib/index.d.ts

@@ -1,9 +1,7 @@
 // Created by scripts/src-index.js.
 import * as utils from './utils'
 
-require('./styles/normalize.less')
-
-export default { utils, version: '1.9.4' }
+export default { utils, version: '1.9.7' }
 export { utils }
 export { setLocale } from './locale'
 export { color, style } from './utils/expose'

package/lib/index.js

@@ -221,12 +221,9 @@ exports.TreeSelect = _TreeSelect.default;
 var _Upload = _interopRequireDefault(require("./Upload"));
 
 exports.Upload = _Upload.default;
-
 // Created by scripts/src-index.js.
-require('./styles/normalize.less');
-
 var _default = {
   utils: utils,
-  version: '1.9.4'
+  version: '1.9.7'
 };
 exports.default = _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shineout",
-  "version": "1.9.4",
+  "version": "1.9.7",
   "description": "Shein 前端组件库",
   "main": "./lib/index.js",
   "module": "./es/index.js",