@ucloud-fe/react-components 1.5.3 → 1.5.4

package/lib/hooks/useOverflow.js

@@ -21,6 +21,8 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
+// https://github.com/que-etc/resize-observer-polyfill/issues/80
+// 由于 ts 官方增加了 contentRect 的类型定义，导致和 resize-observer-polyfill 内部的定义冲突，目前先以 "skipLibCheck" 解决
 var DEFAULT_DEP = [];
 /**
  * 计算容器内的元素最大展示数量
@@ -38,34 +40,47 @@ var useOverflow = function useOverflow(_ref) {
       minCount = _ref$minCount === void 0 ? 0 : _ref$minCount;
   var deps = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : DEFAULT_DEP;
 
+  // the count of trying to show
   var _useState = (0, _react.useState)(function () {
     (0, _newArrowCheck2.default)(this, _this);
     return Math.min(defaultCount, maxCount);
   }.bind(this)),
       _useState2 = (0, _slicedToArray2.default)(_useState, 2),
       count = _useState2[0],
-      setCount = _useState2[1];
+      setCount = _useState2[1]; // the count valid to show
+
 
   var _useState3 = (0, _react.useState)(count),
       _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
       measureCount = _useState4[0],
-      setMeasureCount = _useState4[1];
+      setMeasureCount = _useState4[1]; // latest valid count
+
 
   var _useState5 = (0, _react.useState)(null),
       _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
       latestValidCount = _useState6[0],
-      setLatestValidCount = _useState6[1];
+      setLatestValidCount = _useState6[1]; // the container element
+
 
   var _useState7 = (0, _react.useState)(true),
       _useState8 = (0, _slicedToArray2.default)(_useState7, 2),
       measuring = _useState8[0],
-      setMeasuring = _useState8[1];
+      setMeasuring = _useState8[1]; // save to ref for use in resize observer to avoid frequently create new observer
+
+
+  var measuringRef = (0, _react.useRef)(measuring);
+  (0, _react.useEffect)(function () {
+    (0, _newArrowCheck2.default)(this, _this);
+    measuringRef.current = measuring;
+  }.bind(this), [measuring]); // start to measure
 
   var startMeasuring = (0, _react.useCallback)(function () {
     (0, _newArrowCheck2.default)(this, _this);
+    if (measuringRef.current) return;
     setMeasuring(true);
     setLatestValidCount(null);
-  }.bind(this), []);
+  }.bind(this), []); // stop measuring
+
   var endMeasuring = (0, _react.useCallback)(function (measureCount) {
     (0, _newArrowCheck2.default)(this, _this);
     setMeasuring(false);
@@ -73,6 +88,7 @@ var useOverflow = function useOverflow(_ref) {
   }.bind(this), []);
   (0, _react.useEffect)(function () {
     (0, _newArrowCheck2.default)(this, _this);
+    // console.log('reset when deps changed');
     startMeasuring(); // eslint-disable-next-line react-hooks/exhaustive-deps
   }.bind(this), deps);
   (0, _react.useEffect)(function () {
@@ -80,12 +96,7 @@ var useOverflow = function useOverflow(_ref) {
     // reset when config changed
     startMeasuring();
   }.bind(this), [minCount, maxCount, startMeasuring]);
-  var measuringRef = (0, _react.useRef)(measuring);
   (0, _react.useEffect)(function () {
-    (0, _newArrowCheck2.default)(this, _this);
-    measuringRef.current = measuring;
-  }.bind(this), [measuring]);
-  (0, _react.useLayoutEffect)(function () {
     var _this2 = this;
 
     (0, _newArrowCheck2.default)(this, _this);
@@ -97,8 +108,11 @@ var useOverflow = function useOverflow(_ref) {
         (0, _newArrowCheck2.default)(this, _this2);
 
         if (!measuringRef.current) {
-          startMeasuring();
-        }
+          startMeasuring(); // console.log('reset when width changed');
+        } // else {
+        //     console.log('lock when width changed');
+        // }
+
       }.bind(this));
       resizeObserver.observe(containerDOM);
     }
@@ -110,11 +124,13 @@ var useOverflow = function useOverflow(_ref) {
         resizeObserver.disconnect();
       }
     }.bind(this);
-  }.bind(this), [containerRef, startMeasuring]);
+  }.bind(this), [containerRef, startMeasuring]); // console.log({ count, latestValidCount, maxCount, minCount, measuring });
+  // use layout effect to measure can avoid most shaking
+
   (0, _react.useLayoutEffect)(function () {
     (0, _newArrowCheck2.default)(this, _this);
     var containerDOM = containerRef === null || containerRef === void 0 ? void 0 : containerRef.current;
-    if (!containerDOM) return;
+    if (!containerDOM) return; // measure end
 
     if (count === latestValidCount) {
       endMeasuring(latestValidCount);
@@ -124,10 +140,13 @@ var useOverflow = function useOverflow(_ref) {
     var newCount = count;
 
     if (containerDOM.offsetWidth >= containerDOM.scrollWidth) {
-      setLatestValidCount(count);
+      setLatestValidCount(count); // try to show more
+
       newCount = Math.min(count + 1, maxCount);
     } else if (containerDOM.offsetWidth < containerDOM.scrollWidth) {
-      if (count === 0) setLatestValidCount(count);
+      // if container with not enough space event when count is 0, it will be set to 0
+      if (count === 0) setLatestValidCount(count); // try to show less
+
       newCount = Math.max(0, minCount, count - 1);
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ucloud-fe/react-components",
-  "version": "1.5.3",
+  "version": "1.5.4",
   "title": "UCloud react components",
   "description": "UCloud react components",
   "keywords": [