ag-common 0.0.685 → 0.0.688

package/dist/common/helpers/i18n.js

@@ -25,6 +25,7 @@ const useTranslation = (texts, lang) => {
         if (v1 || v1 === null) {
             return v1 !== null && v1 !== void 0 ? v1 : '';
         }
+        // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
         return (_a = texts[lineText].en) !== null && _a !== void 0 ? _a : '???';
     };
     return ret;

package/dist/common/helpers/stream.js

@@ -17,7 +17,7 @@ function getStringFromStream(stream) {
         const reader = stream.getReader();
         let result = '';
         try {
-            // eslint-disable-next-line no-constant-condition
+            // eslint-disable-next-line no-constant-condition, @typescript-eslint/no-unnecessary-condition
             while (true) {
                 const { done, value } = yield reader.read();
                 if (done)

package/dist/ui/components/InfiniteScroll/index.js

@@ -50,7 +50,7 @@ const InfiniteScroll = (p) => {
     const { incrementNumber = 10, scrollDisabled = false } = p;
     const ref = (0, react_1.createRef)();
     const [startIndex] = (0, react_1.useState)((_a = p.startIndex) !== null && _a !== void 0 ? _a : 0);
-    const [endIndex, setEndIndex] = (0, react_1.useState)((startIndex !== null && startIndex !== void 0 ? startIndex : 0) + incrementNumber);
+    const [endIndex, setEndIndex] = (0, react_1.useState)(startIndex + incrementNumber);
     const [startScrollTop, setStartScrollTop] = (0, react_1.useState)(0);
     const handleScrollTop = (e) => {
         const { scrollTop, clientHeight, scrollHeight } = e.currentTarget;

package/dist/ui/components/LineChart/LegendX.js

@@ -90,7 +90,7 @@ const LegendX = ({ data, lt, tt, colours, style, }) => {
         }
     }
     itemsRaw.push({ v: maxX, group: 0 });
-    const items = itemsRaw.map((d) => { var _a; return ({ v: (_a = lt(d.v)) !== null && _a !== void 0 ? _a : d.v, group: d.group }); });
+    const items = itemsRaw.map((d) => ({ v: lt(d.v), group: d.group }));
     const ch = maxY.toString().length + 1;
     return (react_1.default.createElement(Base, { style: Object.assign(Object.assign({}, style), { marginLeft: 'auto', width: `calc(100% - ${ch}ch)` }) },
         react_1.default.createElement(Bar, null,

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

@@ -32,8 +32,8 @@ const Total = styled_1.default.span `
   }
 `;
 const TooltipContent = (p) => {
-    var _a, _b, _c;
-    const name = (_c = p.tt((_b = (_a = p.selectedXs) === null || _a === void 0 ? void 0 : _a[0].x) !== null && _b !== void 0 ? _b : 0)) !== null && _c !== void 0 ? _c : '';
+    var _a, _b;
+    const name = p.tt((_b = (_a = p.selectedXs) === null || _a === void 0 ? void 0 : _a[0].x) !== null && _b !== void 0 ? _b : 0);
     return (react_1.default.createElement(Base, { style: Object.assign(Object.assign({}, p.style), { border: `solid 1px ${p.style.borderColor}` }) },
         react_1.default.createElement(Title, null, name),
         react_1.default.createElement(Row, null,

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

@@ -90,7 +90,7 @@ const Modal = ({ open, setOpen, children, position = 'left', topPosition = 'top'
     if (portalId === undefined) {
         portalId = globalId;
     }
-    const [elem, setElem] = (0, react_1.useState)();
+    const [portalElem, setPortalElem] = (0, react_1.useState)();
     (0, react_1.useEffect)(() => {
         if (portalId === null ||
             document.querySelectorAll(`#${portalId}`).length > 0) {
@@ -128,6 +128,17 @@ const Modal = ({ open, setOpen, children, position = 'left', topPosition = 'top'
         ref,
         moveMouseOutside: closeOnMoveMouseOutside,
     }, () => {
+        var _a;
+        //there might be multiple models open, only close the last one on the stack
+        if (portalElem) {
+            const myid = Array.prototype.indexOf.call(portalElem.children, 
+            //parent because fixed background is first
+            (_a = ref.current) === null || _a === void 0 ? void 0 : _a.parentElement);
+            const childcount = portalElem.children.length;
+            if (myid + 1 !== childcount) {
+                return;
+            }
+        }
         if (closeOnClickOutside && open) {
             setOpen(false);
             setBounced(false);
@@ -139,10 +150,10 @@ const Modal = ({ open, setOpen, children, position = 'left', topPosition = 'top'
         }
     }, [open, bounced]);
     (0, react_1.useEffect)(() => {
-        if (elem === undefined && portalId) {
-            setElem(document.getElementById(portalId));
+        if (portalElem === undefined && portalId) {
+            setPortalElem(document.getElementById(portalId));
         }
-    }, [elem, portalId]);
+    }, [portalElem, portalId]);
     if (!open) {
         return react_1.default.createElement(react_1.default.Fragment, null);
     }
@@ -150,11 +161,11 @@ const Modal = ({ open, setOpen, children, position = 'left', topPosition = 'top'
         react_1.default.createElement(ModalBase, { "data-bounced": bounced, "data-position": position, "data-topposition": topPosition, ref: ref, className: className, style: style },
             showCloseButton && (react_1.default.createElement(CloseStyled, { "data-type": "modal-close", onClick: () => setOpen(false) })),
             children)));
-    if (portalId && elem === undefined) {
+    if (portalId && portalElem === undefined) {
         return null;
     }
-    if (portalId && elem) {
-        return (0, react_dom_1.createPortal)(Content, elem);
+    if (portalId && portalElem) {
+        return (0, react_dom_1.createPortal)(Content, portalElem);
     }
     return Content;
 };

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

@@ -3,13 +3,18 @@ import React from 'react';
 interface IPos<T> {
     cursor: MouseEvent;
     data: T;
+    portalId: string;
     usePortal: boolean;
     parentWidth: number;
     parentHeight: number;
     x: number;
     y: number;
 }
-export declare const useTooltip: <T>() => {
+type IUT = {
+    /** default 'ag-tooltip-portal' */
+    portalId: string;
+};
+export declare const useTooltip: <T>(p?: IUT) => {
     Comp: <T_1>({ pos, children, }: {
         pos: IPos<T_1> | undefined;
         children: (data: T_1) => JSX.Element;

package/dist/ui/helpers/useTooltip.js

@@ -34,7 +34,6 @@ const Base = styled_1.default.div `
   position: absolute;
   z-index: 2;
 `;
-const globalId = 'ag-tooltip-portal';
 const Comp = ({ pos, children, }) => {
     const ref = (0, react_1.createRef)();
     const [size, setSize] = (0, react_1.useState)();
@@ -92,30 +91,32 @@ const Comp = ({ pos, children, }) => {
             right,
             top,
             bottom, zIndex: 10 }, (pos.usePortal && { position: 'fixed' })), (!(size === null || size === void 0 ? void 0 : size.p) && { zIndex: -1 })) }, children(pos.data)));
-    const e = document.querySelector(`#${globalId}`);
+    const e = document.querySelector(`#${pos.portalId}`);
     if (pos.usePortal && e) {
         return (0, react_dom_1.createPortal)(Content, e);
     }
     return Content;
 };
-const useTooltip = () => {
+const useTooltip = (p) => {
+    const portalId = (p === null || p === void 0 ? void 0 : p.portalId) || 'ag-tooltip-portal';
     const [pos, setPosRaw] = (0, react_1.useState)();
     (0, react_1.useEffect)(() => {
-        if (document.querySelectorAll(`#${globalId}`).length > 0) {
+        if (document.querySelectorAll(`#${portalId}`).length > 0) {
             return;
         }
         const d = document.createElement('div');
-        d.id = globalId;
+        d.id = portalId;
         document.body.appendChild(d);
         return () => {
             var _a;
             try {
-                (_a = document.querySelector(`#${globalId}`)) === null || _a === void 0 ? void 0 : _a.remove();
+                (_a = document.querySelector(`#${portalId}`)) === null || _a === void 0 ? void 0 : _a.remove();
             }
             catch (e) {
                 //
             }
         };
+        // eslint-disable-next-line react-hooks/exhaustive-deps
     }, []);
     const setPos = (p) => {
         if (!p) {
@@ -144,6 +145,7 @@ const useTooltip = () => {
             x,
             y,
             usePortal: !p.parent,
+            portalId,
         };
         setPosRaw(p2);
     };

package/package.json

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