ag-common 0.0.660 → 0.0.662

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

@@ -66,10 +66,7 @@ const ChevronStyled = (0, styled_1.default)(Chevron_1.Chevron) `
 const MinSidebar = ({ chevronColour, children, className, style, }) => {
     const ref = (0, react_1.useRef)(null);
     const [open, setOpen] = (0, react_1.useState)(false);
-    (0, helpers_1.useOnClickOutside)({ ref }, () => {
-        if (!open || window.innerWidth > media_1.smallScreenPx) {
-            return;
-        }
+    (0, helpers_1.useOnClickOutside)({ ref, disabled: () => !open || window.innerWidth > media_1.smallScreenPx }, () => {
         setOpen(false);
     });
     return (react_1.default.createElement(Base, { style: style, "data-type": "sidebar", className: className, "data-open": open, onClick: () => !open && setOpen(true), ref: ref },

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

@@ -84,6 +84,15 @@ const CloseStyled = (0, styled_1.default)(Close_1.Close) `
   z-index: 1;
 `;
 const Modal = ({ open, setOpen, children, position = 'left', topPosition = 'top', showCloseButton = true, closeOnMoveMouseOutside = false, className, closeOnClickOutside = true, }) => {
+    (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/Sidebar/index.js

@@ -168,10 +168,7 @@ const ChevronStyled = (0, styled_1.default)(Chevron_1.Chevron) `
 const Sidebar = ({ children, className, mode = 'defaultClosed', }) => {
     const ref = (0, react_2.useRef)(null);
     const [open, setOpen] = (0, react_2.useState)(mode === 'defaultClosed' ? false : null);
-    (0, helpers_1.useOnClickOutside)({ ref }, () => {
-        if (!open || window.innerWidth > media_1.smallScreenPx) {
-            return;
-        }
+    (0, helpers_1.useOnClickOutside)({ ref, disabled: () => !open || window.innerWidth > media_1.smallScreenPx }, () => {
         setOpen(false);
     });
     return (react_2.default.createElement(Base, { "data-type": "sidebar", className: className, "data-open": open, onClick: () => !open && setOpen(true), "data-hover": true, ref: ref },

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

@@ -38,28 +38,18 @@ export interface IStateCommon<TRequest extends IRequestCommon> extends IInitialS
     cookieDocument: string | undefined;
 }
 export declare const getRenderLanguage: (host?: string | null) => TLang;
+export declare const getClientReqHref: () => IRequestCommon;
 /**
  * get parsed url. use on client/SSR. defaults to window location if possible
  * @param param0
  * @returns
  */
-export declare const getClientOrServerReqHref: ({ url, query, forceServer, userAgent, }: {
+export declare const getClientOrServerReqHref: ({ url, query, userAgent, }: {
     url?: URLLite | undefined;
     query?: Record<string, string> | undefined;
-    /**
-     * if true, wont use window location. default false
-     */
-    forceServer?: boolean | undefined;
     /** will use navigator if possible */
     userAgent?: string | undefined;
-}) => {
-    url: URLLite;
-    query: {
-        [x: string]: string;
-    };
-    userAgent: string;
-    lang: TLang;
-};
+}) => IRequestCommon;
 /**
  * get server side parsed url
  * @param param0 * @returns
@@ -81,11 +71,4 @@ export declare const getServerReq: ({ pathname, query, headers, }: {
      * eg ctx.query
      */
     query: Record<string, string | string[] | undefined>;
-}) => {
-    url: URLLite;
-    query: {
-        [x: string]: string;
-    };
-    userAgent: string;
-    lang: TLang;
-};
+}) => IRequestCommon;

package/dist/ui/helpers/routes.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getServerReq = exports.getClientOrServerReqHref = exports.getRenderLanguage = void 0;
+exports.getServerReq = exports.getClientOrServerReqHref = exports.getClientReqHref = exports.getRenderLanguage = void 0;
+const common_1 = require("../../common");
 const i18n_1 = require("../../common/helpers/i18n");
 const object_1 = require("../../common/helpers/object");
 const object_2 = require("../../common/helpers/string/object");
@@ -30,27 +31,29 @@ const getRenderLanguage = (host) => {
     return 'en';
 };
 exports.getRenderLanguage = getRenderLanguage;
+const getClientReqHref = () => {
+    const nu = new URL(window.location.href);
+    const url = (0, url_1.stripUrl)(nu);
+    const query = (0, object_2.stringToObject)((0, common_1.trimSide)(url.search, true, '?') || '', '=', '&');
+    const userAgent = navigator.userAgent;
+    return { url, query, userAgent, lang: (0, exports.getRenderLanguage)(url.host) };
+};
+exports.getClientReqHref = getClientReqHref;
 /**
  * get parsed url. use on client/SSR. defaults to window location if possible
  * @param param0
  * @returns
  */
-const getClientOrServerReqHref = ({ url, query, forceServer = false, userAgent, }) => {
+const getClientOrServerReqHref = ({ url, query, userAgent, }) => {
     if (typeof window !== 'undefined') {
-        if (!forceServer) {
-            const nu = new URL(window.location.href);
-            url = (0, url_1.stripUrl)(nu);
-        }
-    }
-    if (typeof navigator !== 'undefined') {
-        userAgent = navigator.userAgent;
+        return (0, exports.getClientReqHref)();
     }
     if (!url) {
         throw new Error('no href');
     }
     return {
         url,
-        query: Object.assign(Object.assign({}, query), (0, object_2.stringToObject)(url.search || '', '=', '&')),
+        query: Object.assign(Object.assign({}, query), (0, object_2.stringToObject)((0, common_1.trimSide)(url.search, true, '?') || '', '=', '&')),
         userAgent: userAgent !== null && userAgent !== void 0 ? userAgent : '?',
         lang: (0, exports.getRenderLanguage)(url.host),
     };
@@ -70,7 +73,6 @@ const getServerReq = ({ pathname, query, headers, }) => {
     const ret = (0, exports.getClientOrServerReqHref)({
         url: !href ? undefined : new URL(href),
         query: parsedQuery,
-        forceServer: true,
         userAgent: (_a = headers['user-agent']) === null || _a === void 0 ? void 0 : _a.toLowerCase(),
     });
     return ret;

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

@@ -2,10 +2,8 @@ import type { RefObject } from 'react';
 type Event = MouseEvent | TouchEvent;
 export declare function useOnClickOutside<T extends HTMLElement = HTMLElement>(p: {
     ref: RefObject<T>;
-    /**
-     * default false
-     */
-    disabled?: boolean;
+    /** can either be a boolean, or a callback */
+    disabled?: boolean | (() => boolean);
     /** if true, will also consider moving mouse outside div. default false */
     moveMouseOutside?: boolean;
 }, handler: (event: Event) => void): void;

package/dist/ui/helpers/useOnClickOutside.js

@@ -6,21 +6,34 @@ const react_1 = require("react");
 const dom_1 = require("./dom");
 function useOnClickOutside(p, handler) {
     (0, react_1.useEffect)(() => {
-        if (p.disabled || typeof window === 'undefined') {
-            return () => {
-                //
-            };
-        }
         const listener = (event) => {
-            var _a;
+            var _a, _b;
+            const disabled = !p.disabled || typeof p.disabled === 'boolean'
+                ? (_a = p.disabled) !== null && _a !== void 0 ? _a : false
+                : p.disabled();
+            if (disabled) {
+                return;
+            }
             //
             const isRightMB = (0, dom_1.isRightClick)(event);
             if (isRightMB) {
                 return;
             }
-            const el = (_a = p.ref) === null || _a === void 0 ? void 0 : _a.current;
-            // Do nothing if clicking ref's element or descendent elements
-            if (!el || el.contains((event === null || event === void 0 ? void 0 : event.target) || null)) {
+            const el = (_b = p.ref) === null || _b === void 0 ? void 0 : _b.current;
+            if (!el) {
+                return;
+            }
+            //walk dom tree to see if nodes match
+            let n = event.target;
+            let found = false;
+            while (n) {
+                if (n.isEqualNode(el)) {
+                    found = true;
+                    break;
+                }
+                n = n.parentNode;
+            }
+            if (found) {
                 return;
             }
             handler(event);

package/package.json

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