indicator-ui 0.0.263 → 0.0.265

package/dist/index.js

@@ -29136,12 +29136,13 @@ function Dropdown(_ref) {
   };
   var getItem = function getItem(curItem, idx) {
     var value = getValue(curItem);
+    var active = isActive === null || isActive === void 0 ? void 0 : isActive(value);
     if (_typeof(curItem) === 'object' && 'customComponent' in curItem) {
       return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1___default().cloneElement(curItem.customComponent, {
         onClick: function onClick() {
           return handleClick(curItem);
         },
-        active: isActive(value),
+        active: active,
         key: idx
       });
     }
@@ -29151,7 +29152,7 @@ function Dropdown(_ref) {
       onClick: function onClick() {
         return handleClick(curItem);
       },
-      selected: isActive(value)
+      selected: active
     }, curItem), {}, {
       key: idx
     }));
@@ -35598,7 +35599,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__);
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! react */ "react");
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_1__);
-var _excluded = ["onScroll", "onScrollTop", "onScrollBottom", "accuracy", "wrapper"];
+var _excluded = ["onScroll", "onScrollTop", "onScrollBottom", "accuracy", "wrapper", "onWheelTopUp", "onWheelBottomDown"];
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
@@ -35620,8 +35621,13 @@ var ScrollProvider = /*#__PURE__*/(0,react__WEBPACK_IMPORTED_MODULE_1__.forwardR
     accuracy = _props$accuracy === void 0 ? 10 : _props$accuracy,
     _props$wrapper = props.wrapper,
     wrapper = _props$wrapper === void 0 ? (0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__.jsx)("div", {}) : _props$wrapper,
+    onWheelTopUp = props.onWheelTopUp,
+    onWheelBottomDown = props.onWheelBottomDown,
     componentProps = _objectWithoutProperties(props, _excluded);
+  var lastScrollHeightRef = (0,react__WEBPACK_IMPORTED_MODULE_1__.useRef)(undefined);
   var elementRef = (0,react__WEBPACK_IMPORTED_MODULE_1__.useRef)(null);
+  var isTopTriggeredRef = (0,react__WEBPACK_IMPORTED_MODULE_1__.useRef)(false);
+  var isBottomTriggeredRef = (0,react__WEBPACK_IMPORTED_MODULE_1__.useRef)(false);
   (0,react__WEBPACK_IMPORTED_MODULE_1__.useEffect)(function () {
     if (elementRef.current) {
       var handleScroll = function handleScroll(_event) {
@@ -35630,12 +35636,9 @@ var ScrollProvider = /*#__PURE__*/(0,react__WEBPACK_IMPORTED_MODULE_1__.forwardR
         var scrollTop = Math.abs(el.scrollTop);
         var clientHeight = el.clientHeight;
         var scrollHeight = el.scrollHeight;
-        if (onScrollTop && scrollTop <= accuracy) {
-          onScrollTop();
-        }
-        if (onScrollBottom && scrollTop + clientHeight + accuracy >= scrollHeight) {
-          onScrollBottom();
-        }
+        var prevScrollHeight = lastScrollHeightRef.current;
+        lastScrollHeightRef.current = scrollHeight;
+        // Обработка обычного скролла
         if (onScroll) {
           if (typeof onScroll === "function") {
             onScroll(scrollTop);
@@ -35653,15 +35656,37 @@ var ScrollProvider = /*#__PURE__*/(0,react__WEBPACK_IMPORTED_MODULE_1__.forwardR
             }
           }
         }
+        // Сброс флагов при выходе за границы accuracy
+        if (scrollTop > accuracy) {
+          isTopTriggeredRef.current = false;
+        }
+        if (scrollTop + clientHeight < scrollHeight - accuracy) {
+          isBottomTriggeredRef.current = false;
+        }
+        // Обработка верхней границы
+        if (onScrollTop && scrollTop <= accuracy) {
+          var shouldSkipDueToHeightChange = prevScrollHeight !== undefined && scrollHeight > prevScrollHeight;
+          if (!shouldSkipDueToHeightChange && !isTopTriggeredRef.current) {
+            onScrollTop();
+            isTopTriggeredRef.current = true;
+          }
+        }
+        // Обработка нижней границы
+        if (onScrollBottom && scrollTop + clientHeight + accuracy >= scrollHeight) {
+          var _shouldSkipDueToHeightChange = prevScrollHeight !== undefined && scrollHeight < prevScrollHeight;
+          if (!_shouldSkipDueToHeightChange && !isBottomTriggeredRef.current) {
+            onScrollBottom();
+            isBottomTriggeredRef.current = true;
+          }
+        }
       };
-      // Добавляем слушатель события scroll
       elementRef.current.addEventListener("scroll", handleScroll);
       return function () {
         var _elementRef$current;
         (_elementRef$current = elementRef.current) === null || _elementRef$current === void 0 || _elementRef$current.removeEventListener("scroll", handleScroll);
       };
     }
-  }, [onScroll, onScrollTop, onScrollBottom]);
+  }, [onScroll, onScrollTop, onScrollBottom, accuracy]);
   return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1___default().cloneElement(wrapper, _objectSpread({
     ref: function ref(node) {
       elementRef.current = node;