ag-common 0.0.700 → 0.0.702

package/dist/ui/components/Modal/Modal.js

@@ -32,6 +32,7 @@ const styled_1 = __importDefault(require("@emotion/styled"));
 const react_1 = __importStar(require("react"));
 const react_dom_1 = require("react-dom");
 const dom_1 = require("../../helpers/dom");
+const useLockBodyScroll_1 = require("../../helpers/useLockBodyScroll");
 const useOnClickOutside_1 = require("../../helpers/useOnClickOutside");
 const styles_1 = require("../../styles");
 const Close_1 = require("../Close");
@@ -92,6 +93,7 @@ const Modal = (p) => {
     if (portalId === undefined) {
         portalId = globalId;
     }
+    (0, useLockBodyScroll_1.useLockBodyScroll)(p.open);
     const [portalElem, setPortalElem] = (0, react_1.useState)();
     (0, react_1.useEffect)(() => {
         if (portalId === null ||
@@ -114,15 +116,6 @@ const Modal = (p) => {
         };
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, []);
-    (0, react_1.useEffect)(() => {
-        const originalStyle = window.getComputedStyle(document.body).overflow || '';
-        if (open) {
-            document.body.style.overflow = 'hidden';
-        }
-        return () => {
-            document.body.style.overflow = originalStyle;
-        };
-    }, [open]);
     const [bounced, setBounced] = (0, react_1.useState)(false);
     const ref = (0, react_1.useRef)(null);
     (0, useOnClickOutside_1.useOnClickOutside)({

package/dist/ui/components/TreeChart/TooltipContent.js

@@ -10,6 +10,7 @@ const Base = styled_1.default.div `
   padding: 0.5rem;
   border: solid 1px black;
   background-color: white;
+  color: black;
 `;
 const Title = styled_1.default.div `
   font-weight: bold;

package/dist/ui/helpers/useTooltip.d.ts

@@ -3,7 +3,7 @@ interface IPos<T> {
     cursor: MouseEvent;
     data: T;
     portalId: string;
-    usePortal: boolean;
+    hasParent: boolean;
     parentWidth: number;
     parentHeight: number;
     x: number;

package/dist/ui/helpers/useTooltip.js

@@ -38,15 +38,12 @@ const Comp = ({ pos, children, }) => {
     const ref = (0, react_1.createRef)();
     const [size, setSize] = (0, react_1.useState)();
     (0, react_1.useEffect)(() => {
-        if (!ref.current) {
+        if (!ref.current || size) {
             return;
         }
         const tooltipWidth = Math.max(ref.current.clientWidth, ref.current.scrollWidth);
         const tooltipHeight = Math.max(ref.current.clientHeight, ref.current.scrollHeight);
-        if (tooltipHeight === (size === null || size === void 0 ? void 0 : size.tooltipHeight) ||
-            tooltipWidth === (size === null || size === void 0 ? void 0 : size.tooltipWidth) ||
-            tooltipHeight === 0 ||
-            tooltipWidth === 0) {
+        if (tooltipHeight === 0 || tooltipWidth === 0) {
             return;
         }
         setSize({
@@ -72,17 +69,19 @@ const Comp = ({ pos, children, }) => {
         //
         top = pos.y + gap;
         if (top + size.tooltipHeight > pos.parentHeight) {
-            top = undefined;
+            if (pos.hasParent) {
+                top = undefined;
+            }
             bottom = pos.parentHeight - pos.y;
         }
         if (right && right + size.tooltipWidth > pos.parentWidth) {
-            if (!pos.usePortal) {
+            if (pos.hasParent) {
                 right = undefined;
             }
             left = 0;
         }
         if (bottom && bottom + size.tooltipHeight > pos.parentHeight) {
-            if (!pos.usePortal) {
+            if (pos.hasParent) {
                 bottom = undefined;
             }
             top = 0;
@@ -91,9 +90,9 @@ const Comp = ({ pos, children, }) => {
     const Content = (react_1.default.createElement(Base, { "data-type": "tooltip-content", ref: ref, style: Object.assign(Object.assign({ left,
             right,
             top,
-            bottom, zIndex: 10, overflow: 'hidden' }, (pos.usePortal && { position: 'fixed' })), (!size && { zIndex: -1 })) }, children(pos, size)));
+            bottom, zIndex: 10, overflow: 'hidden' }, (!pos.hasParent && { position: 'fixed' })), (!size && { zIndex: -1 })) }, children(pos, size)));
     const e = document.querySelector(`#${pos.portalId}`);
-    if (pos.usePortal && e) {
+    if (!pos.hasParent && e) {
         return (0, react_dom_1.createPortal)(Content, e);
     }
     return Content;
@@ -153,7 +152,7 @@ const useTooltip = (p) => {
             parentHeight,
             x,
             y,
-            usePortal: !p.parent,
+            hasParent: !!p.parent,
             portalId,
         };
         setPosRaw(p2);

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.0.700",
+  "version": "0.0.702",
   "name": "ag-common",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",