x-ui-design 0.9.14 → 0.9.16

package/dist/index.esm.js

@@ -2653,49 +2653,34 @@ const usePopupPosition = ({
       top: (relativePosition.top || 0) + (targetRef.current?.offsetTop || 0) - (scrollableParents?.offsetTop || 0) + OFFSET,
       left: relativePosition.left + (targetRef.current?.offsetLeft || 0) - (targetRef.current?.clientWidth || 0) / 2
     };
-    if (e?.target === scrollableParents && inBody) {
-      setOpen(false);
-      setPopupPosition({});
-      return;
-    }
-    if (popupRef.current) {
+    if (!inBody && popupRef.current) {
       const popupRect = popupRef.current.getBoundingClientRect();
       const availableSpace = {
         top: container.top - (popupRect.height + OFFSET),
-        bottom: (inBody ? window.innerHeight : scrollableParents?.clientHeight || 0) - (container.bottom + popupRect.height + OFFSET),
+        bottom: (scrollableParents?.clientHeight || 0) - (container.bottom + popupRect.height + OFFSET),
         left: container.left - (popupRect.width + OFFSET),
-        right: (inBody ? window.innerWidth : scrollableParents?.clientWidth || 0) - (container.right + popupRect.width + OFFSET)
+        right: (scrollableParents?.clientWidth || 0) - (container.right + popupRect.width + OFFSET)
       };
       let newPlacement = _placement;
       if (availableSpace.bottom < 0 && availableSpace.top > 0) {
-        console.info(0);
         newPlacement = newPlacement.replace('bottom', 'top');
       }
       if (availableSpace.top < 0 && availableSpace.bottom > 0) {
-        console.info(1);
         newPlacement = newPlacement.replace('top', 'bottom');
       }
-      if (availableSpace.left < 0 && (availableSpace.right > 0 || availableSpace.right < popupRect.width)) {
-        console.info(2);
+      if (availableSpace.left < 0 && availableSpace.right > 0) {
         newPlacement = newPlacement.replace('Right', 'Left');
       }
-      if (availableSpace.right < 0 && (availableSpace.left > 0 || availableSpace.left < popupRect.width)) {
-        console.info(3);
+      if (availableSpace.right < 0 && availableSpace.left > 0) {
         newPlacement = newPlacement.replace('Left', 'Right');
       }
-      if (availableSpace.right < 0 && availableSpace.left < 0) {
-        console.info(4);
-        if (newPlacement.includes('Right')) {
-          console.info(5);
-          positions.left = popupRef.current.clientWidth - positions.left + container.left;
-        }
-        if (newPlacement.includes('Left')) {
-          console.info(6);
-          positions.left = positions.left - popupRef.current.clientWidth + container.width;
-        }
-      }
       _setPlacement(newPlacement);
     }
+    if (e?.target === scrollableParents && inBody) {
+      setOpen(false);
+      setPopupPosition({});
+      return;
+    }
     const _calculation = () => {
       switch (_placement) {
         case "bottom":
@@ -2763,7 +2748,6 @@ const usePopupPosition = ({
     document.body.addEventListener("resize", calculatePosition, options);
     return () => {
       controller.abort();
-      setPopupPosition({});
       // setPositionRelative('unset');
     };
   }, [open, targetRef, popupContainer, inBody, calculatePosition]);