shineout 1.9.6 → 1.9.7

package/dist/shineout.js

@@ -9951,21 +9951,7 @@ function (_PureComponent) {
   }, {
     key: "componentDidUpdate",
     value: function componentDidUpdate(preProps) {
-      var _this$props = this.props,
-          compressed = _this$props.compressed,
-          _this$props$value = _this$props.value,
-          value = _this$props$value === void 0 ? [] : _this$props$value,
-          onFilter = _this$props.onFilter;
-
-      if (compressed) {
-        if ((preProps.value || []).join('') !== (value || []).join('')) {
-          this.resetMore();
-        } else if (value.length && this.shouldResetMore) {
-          this.shouldResetMore = false;
-          this.state.more = Object(_Select_More__WEBPACK_IMPORTED_MODULE_15__["getResetMore"])(onFilter, this.resultEl, this.resultEl.querySelectorAll(".".concat(Object(_styles__WEBPACK_IMPORTED_MODULE_12__["cascaderClass"])('item'))));
-          this.forceUpdate();
-        }
-      }
+      this.updateMore(preProps);
     }
   }, {
     key: "componentWillUnmount",
@@ -9984,6 +9970,28 @@ function (_PureComponent) {
     value: function bindResult(el) {
       this.resultEl = el;
     }
+  }, {
+    key: "updateMore",
+    value: function updateMore(preProps) {
+      var _this$props = this.props,
+          compressed = _this$props.compressed,
+          _this$props$value = _this$props.value,
+          value = _this$props$value === void 0 ? [] : _this$props$value,
+          onFilter = _this$props.onFilter,
+          data = _this$props.data;
+
+      if (compressed) {
+        if ((preProps.value || []).join('') !== (value || []).join('')) {
+          this.resetMore();
+        } else if ((preProps.data || []).length !== (data || []).length) {
+          this.resetMore();
+        } else if (value.length && this.shouldResetMore) {
+          this.shouldResetMore = false;
+          this.state.more = Object(_Select_More__WEBPACK_IMPORTED_MODULE_15__["getResetMore"])(onFilter, this.resultEl, this.resultEl.querySelectorAll(".".concat(Object(_styles__WEBPACK_IMPORTED_MODULE_12__["cascaderClass"])('item'))));
+          this.forceUpdate();
+        }
+      }
+    }
   }, {
     key: "resetMore",
     value: function resetMore() {
@@ -10066,7 +10074,7 @@ function (_PureComponent) {
             __self: this,
             __source: {
               fileName: _jsxFileName,
-              lineNumber: 145,
+              lineNumber: 151,
               columnNumber: 9
             }
           })
@@ -10106,7 +10114,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 164,
+            lineNumber: 170,
             columnNumber: 7
           }
         }), res)
@@ -10134,7 +10142,7 @@ function (_PureComponent) {
         __self: this,
         __source: {
           fileName: _jsxFileName,
-          lineNumber: 184,
+          lineNumber: 190,
           columnNumber: 7
         }
       })];
@@ -10162,7 +10170,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 200,
+            lineNumber: 206,
             columnNumber: 7
           }
         })
@@ -10187,7 +10195,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 218,
+            lineNumber: 224,
             columnNumber: 7
           }
         }, this.props.placeholder, "\xA0")
@@ -10212,7 +10220,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 231,
+            lineNumber: 237,
             columnNumber: 7
           }
         }, showCaret &&
@@ -10221,7 +10229,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 232,
+            lineNumber: 238,
             columnNumber: 23
           }
         }))
@@ -10284,7 +10292,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 266,
+            lineNumber: 272,
             columnNumber: 7
           }
         }, result, this.renderIndicator(), clearEl)
@@ -10319,7 +10327,8 @@ Result.propTypes = {
   selectId: prop_types__WEBPACK_IMPORTED_MODULE_8___default.a.string,
   showList: prop_types__WEBPACK_IMPORTED_MODULE_8___default.a.func,
   size: prop_types__WEBPACK_IMPORTED_MODULE_8___default.a.string,
-  showArrow: prop_types__WEBPACK_IMPORTED_MODULE_8___default.a.bool
+  showArrow: prop_types__WEBPACK_IMPORTED_MODULE_8___default.a.bool,
+  data: prop_types__WEBPACK_IMPORTED_MODULE_8___default.a.array
 };
 Result.defaultProps = {
   value: []
@@ -35724,6 +35733,7 @@ function _createSuper2(Derived) {
 
 
 
+ // if num = -1 display all else display num
 
 function getResetMore(onFilter, container, doms) {
   if (!container || !doms || !doms.length) return -1;
@@ -35754,10 +35764,18 @@ function getResetMore(onFilter, container, doms) {
     for (var i = 0; i < itemWidthArr.length; i++) {
       var itemLen = itemWidthArr[i]; // number length
 
-      var reset = "+".concat(items.length - 1 - i);
-      hideEl.childNodes[0].innerText = reset; // (+num) width
+      var resetNum = items.length - 1 - i;
+      var moreWidth = void 0;
+
+      if (resetNum <= 0) {
+        moreWidth = 0;
+      } else {
+        var reset = "+".concat(resetNum);
+        hideEl.childNodes[0].innerText = reset; // (+num) width
+
+        moreWidth = hideEl.offsetWidth + hideMargin;
+      }
 
-      var moreWidth = hideEl.offsetWidth + hideMargin;
       len += itemLen;
 
       if (len > contentWidth - moreWidth) {
@@ -35822,13 +35840,13 @@ function (_Component) {
           cls = _this$props.cls,
           showNum = _this$props.showNum;
       var status = this.state.status;
-      if (showNum < 0 || showNum > data.length) return (
+      if (showNum < 0 || showNum >= data.length) return (
         /*#__PURE__*/
         react__WEBPACK_IMPORTED_MODULE_6___default.a.createElement(react__WEBPACK_IMPORTED_MODULE_6___default.a.Fragment, {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 86,
+            lineNumber: 94,
             columnNumber: 9
           }
         }, data,
@@ -35846,7 +35864,7 @@ function (_Component) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 89,
+            lineNumber: 97,
             columnNumber: 11
           }
         },
@@ -35855,7 +35873,7 @@ function (_Component) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 100,
+            lineNumber: 108,
             columnNumber: 13
           }
         }, "+")))
@@ -35873,7 +35891,7 @@ function (_Component) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 110,
+            lineNumber: 118,
             columnNumber: 7
           }
         }, before,
@@ -35885,7 +35903,7 @@ function (_Component) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 112,
+            lineNumber: 120,
             columnNumber: 9
           }
         },
@@ -35894,7 +35912,7 @@ function (_Component) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 113,
+            lineNumber: 121,
             columnNumber: 11
           }
         }, "+".concat(itemsLength)),
@@ -35908,7 +35926,7 @@ function (_Component) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 114,
+            lineNumber: 122,
             columnNumber: 11
           }
         },
@@ -35919,7 +35937,7 @@ function (_Component) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 121,
+            lineNumber: 129,
             columnNumber: 13
           }
         }, compressed === 'no-repeat' ? null : before, after))))
@@ -37043,13 +37061,50 @@ function (_PureComponent) {
   }, {
     key: "componentDidUpdate",
     value: function componentDidUpdate(preProps) {
+      this.updateMore(preProps);
+    }
+  }, {
+    key: "componentWillUnmount",
+    value: function componentWillUnmount() {
+      if (this.cancelResizeObserver) this.cancelResizeObserver();
+    }
+  }, {
+    key: "bindResult",
+    value: function bindResult(el) {
+      this.resultEl = el;
+    }
+  }, {
+    key: "updateMore",
+    value: 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;
@@ -37058,16 +37113,6 @@ function (_PureComponent) {
         }
       }
     }
-  }, {
-    key: "componentWillUnmount",
-    value: function componentWillUnmount() {
-      if (this.cancelResizeObserver) this.cancelResizeObserver();
-    }
-  }, {
-    key: "bindResult",
-    value: function bindResult(el) {
-      this.resultEl = el;
-    }
   }, {
     key: "resetMore",
     value: function resetMore() {
@@ -37139,7 +37184,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 143,
+            lineNumber: 163,
             columnNumber: 7
           }
         })
@@ -37168,7 +37213,7 @@ function (_PureComponent) {
         __self: this,
         __source: {
           fileName: _jsxFileName,
-          lineNumber: 162,
+          lineNumber: 182,
           columnNumber: 7
         }
       })];
@@ -37192,7 +37237,7 @@ function (_PureComponent) {
             __self: this,
             __source: {
               fileName: _jsxFileName,
-              lineNumber: 182,
+              lineNumber: 202,
               columnNumber: 9
             }
           },
@@ -37204,7 +37249,7 @@ function (_PureComponent) {
             __self: this,
             __source: {
               fileName: _jsxFileName,
-              lineNumber: 183,
+              lineNumber: 203,
               columnNumber: 11
             }
           }))
@@ -37250,7 +37295,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 211,
+            lineNumber: 231,
             columnNumber: 7
           }
         })
@@ -37278,7 +37323,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 238,
+            lineNumber: 258,
             columnNumber: 7
           }
         },
@@ -37287,7 +37332,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 246,
+            lineNumber: 266,
             columnNumber: 9
           }
         }, this.props.placeholder), "\xA0")
@@ -37342,7 +37387,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 287,
+            lineNumber: 307,
             columnNumber: 7
           }
         }, v)
@@ -37367,7 +37412,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 303,
+            lineNumber: 323,
             columnNumber: 7
           }
         }, showCaret &&
@@ -37376,7 +37421,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 304,
+            lineNumber: 324,
             columnNumber: 23
           }
         }))
@@ -37407,7 +37452,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 321,
+            lineNumber: 341,
             columnNumber: 7
           }
         },
@@ -37418,7 +37463,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 331,
+            lineNumber: 351,
             columnNumber: 9
           }
         }, rtl ? inner.reverse() : inner))
@@ -53160,13 +53205,50 @@ function (_PureComponent) {
   }, {
     key: "componentDidUpdate",
     value: function componentDidUpdate(preProps) {
+      this.updateMore(preProps);
+    }
+  }, {
+    key: "componentWillUnmount",
+    value: function componentWillUnmount() {
+      if (this.cancelResizeObserver) this.cancelResizeObserver();
+    }
+  }, {
+    key: "bindResult",
+    value: function bindResult(el) {
+      this.resultEl = el;
+    }
+  }, {
+    key: "updateMore",
+    value: 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;
@@ -53175,16 +53257,6 @@ function (_PureComponent) {
         }
       }
     }
-  }, {
-    key: "componentWillUnmount",
-    value: function componentWillUnmount() {
-      if (this.cancelResizeObserver) this.cancelResizeObserver();
-    }
-  }, {
-    key: "bindResult",
-    value: function bindResult(el) {
-      this.resultEl = el;
-    }
   }, {
     key: "resetMore",
     value: function resetMore() {
@@ -53225,7 +53297,7 @@ function (_PureComponent) {
             __self: this,
             __source: {
               fileName: _jsxFileName,
-              lineNumber: 105,
+              lineNumber: 125,
               columnNumber: 9
             }
           },
@@ -53237,7 +53309,7 @@ function (_PureComponent) {
             __self: this,
             __source: {
               fileName: _jsxFileName,
-              lineNumber: 106,
+              lineNumber: 126,
               columnNumber: 11
             }
           }))
@@ -53269,7 +53341,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 122,
+            lineNumber: 142,
             columnNumber: 7
           }
         })
@@ -53297,7 +53369,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 141,
+            lineNumber: 161,
             columnNumber: 7
           }
         })
@@ -53322,7 +53394,7 @@ function (_PureComponent) {
         __self: this,
         __source: {
           fileName: _jsxFileName,
-          lineNumber: 156,
+          lineNumber: 176,
           columnNumber: 7
         }
       })];
@@ -53346,7 +53418,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 177,
+            lineNumber: 197,
             columnNumber: 7
           }
         }, this.props.placeholder, "\xA0")
@@ -53396,7 +53468,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 212,
+            lineNumber: 232,
             columnNumber: 7
           }
         }, getResultContent(result[0], renderResult, renderUnmatched))
@@ -53423,7 +53495,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 222,
+            lineNumber: 242,
             columnNumber: 7
           }
         },
@@ -53434,7 +53506,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 232,
+            lineNumber: 252,
             columnNumber: 9
           }
         }, result, !this.props.multiple &&
@@ -53446,7 +53518,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 242,
+            lineNumber: 262,
             columnNumber: 13
           }
         },
@@ -53455,7 +53527,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 243,
+            lineNumber: 263,
             columnNumber: 16
           }
         })), this.renderClear()))
@@ -61013,7 +61085,7 @@ __webpack_require__.r(__webpack_exports__);
 
 /* harmony default export */ __webpack_exports__["default"] = ({
   utils: _utils__WEBPACK_IMPORTED_MODULE_0__,
-  version: '1.9.6'
+  version: '1.9.7'
 });