@via-profit/ui-kit 0.2.3 → 0.2.4

package/Popper/usePopper.js

@@ -173,63 +173,30 @@ const usePopper = (props) => {
         return { left, top, width };
     }, [offset, positionStrategy]);
     const clampPopperToContainer = react_1.default.useCallback((style, popperRect) => {
-        // Если нет scrollableAncestor, используем document.documentElement как fallback
-        const container = scrollableAncestor instanceof HTMLElement ? scrollableAncestor : document.documentElement;
-        const containerRect = container.getBoundingClientRect();
-        // Базовые границы контейнера с учетом отступа
-        let minLeft = containerRect.left + viewportMargin;
-        let maxLeft = containerRect.right - popperRect.width - viewportMargin;
-        let minTop = containerRect.top + viewportMargin;
-        let maxTop = containerRect.bottom - popperRect.height - viewportMargin;
-        // Для fixed позиционирования добавляем ограничения viewport
-        if (positionStrategy === 'fixed') {
-            // Границы viewport с учетом отступа
-            const viewportMinLeft = viewportMargin;
-            const viewportMaxLeft = window.innerWidth - popperRect.width - viewportMargin;
-            const viewportMinTop = viewportMargin;
-            const viewportMaxTop = window.innerHeight - popperRect.height - viewportMargin;
-            // Берем пересечение границ контейнера и viewport
-            minLeft = Math.max(minLeft, viewportMinLeft);
-            maxLeft = Math.min(maxLeft, viewportMaxLeft);
-            minTop = Math.max(minTop, viewportMinTop);
-            maxTop = Math.min(maxTop, viewportMaxTop);
+        if (positionStrategy === 'absolute') {
+            return style;
         }
-        // Убеждаемся, что границы валидны (min не больше max)
-        const validMinLeft = Math.min(minLeft, maxLeft);
-        const validMaxLeft = Math.max(minLeft, maxLeft);
-        const validMinTop = Math.min(minTop, maxTop);
-        const validMaxTop = Math.max(minTop, maxTop);
-        // Ограничиваем позицию
-        const clampedLeft = Math.max(validMinLeft, Math.min(style.left, validMaxLeft));
-        const clampedTop = Math.max(validMinTop, Math.min(style.top, validMaxTop));
+        const viewportMinLeft = viewportMargin;
+        const viewportMaxLeft = window.innerWidth - popperRect.width - viewportMargin;
+        const viewportMinTop = viewportMargin;
+        const viewportMaxTop = window.innerHeight - popperRect.height - viewportMargin;
         return {
-            left: clampedLeft,
-            top: clampedTop,
+            left: Math.max(viewportMinLeft, Math.min(style.left, viewportMaxLeft)),
+            top: Math.max(viewportMinTop, Math.min(style.top, viewportMaxTop)),
             width: style.width,
         };
-    }, [positionStrategy, scrollableAncestor, viewportMargin]);
+    }, [positionStrategy, viewportMargin]);
     const checkIfViewportFits = react_1.default.useCallback((style, popperRect) => {
         const left = style.left;
         const top = style.top;
         const right = left + popperRect.width;
         const bottom = top + popperRect.height;
-        if (positionStrategy === 'absolute' && scrollableAncestor instanceof HTMLElement) {
-            const containerRect = scrollableAncestor.getBoundingClientRect();
-            const relativeLeft = left - containerRect.left;
-            const relativeTop = top - containerRect.top;
-            const relativeRight = relativeLeft + popperRect.width;
-            const relativeBottom = relativeTop + popperRect.height;
-            const isWithinHorizontal = relativeLeft >= viewportMargin && relativeRight <= containerRect.width - viewportMargin;
-            const isWithinVertical = relativeTop >= viewportMargin && relativeBottom <= containerRect.height - viewportMargin;
-            return isWithinHorizontal && isWithinVertical;
-        }
         const viewportWidth = window.innerWidth;
         const viewportHeight = window.innerHeight;
         const isWithinHorizontal = left >= viewportMargin && right <= viewportWidth - viewportMargin;
         const isWithinVertical = top >= viewportMargin && bottom <= viewportHeight - viewportMargin;
-        const hasValidPosition = left >= 0 && top >= 0;
-        return hasValidPosition && isWithinHorizontal && isWithinVertical;
-    }, [viewportMargin, scrollableAncestor, positionStrategy]);
+        return isWithinHorizontal && isWithinVertical;
+    }, [viewportMargin]);
     const placementsOrder = react_1.default.useMemo(() => {
         const basePlacements = {
             top: ['top', 'top-left', 'top-right', 'top-start', 'top-end'],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@via-profit/ui-kit",
-  "version": "0.2.3",
+  "version": "0.2.4",
   "description": "UI Kit",
   "repository": {
     "type": "git",