ag-common 0.0.661 → 0.0.663

package/dist/common/helpers/object.d.ts

@@ -48,7 +48,9 @@ joinKeys: string): string;
  */
 export declare const castObject: <TIn, TOut>(orig: Record<string, TIn>, castF: (t: TIn) => TOut) => Record<string, TOut>;
 /** remove key values from an object where the value is null or undefined or other specific passed in values  */
-export declare const removeUndefValuesFromObject: <T>(orig: Record<string, T>, ...additionalRemoves: T[]) => Record<string, T>;
+export declare const removeUndefValuesFromObject: <TA>(orig: Record<string, TA>) => Record<string, TA extends null | undefined ? never : TA>;
+/** remove key values from an object where the value is null or undefined or other specific passed in values  */
+export declare const removeUndefValuesFromObjectAdditional: <T>(orig: Record<string, T>, ...additionalRemoves: T[]) => Record<string, T>;
 /**
  * cast Record<string,string[]|string> to Record<string,string>. can be used for querystring params
  * @param orig

package/dist/common/helpers/object.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isObject = exports.castStringlyObject = exports.removeUndefValuesFromObject = exports.castObject = exports.objectToString = exports.paramsToObject = exports.objectAlphaSort = exports.objectToArray = exports.getObjectKeysAsNumber = exports.objectKeysToLowerCase = exports.isJson = exports.tryJsonParse = void 0;
+exports.isObject = exports.castStringlyObject = exports.removeUndefValuesFromObjectAdditional = exports.removeUndefValuesFromObject = exports.castObject = exports.objectToString = exports.paramsToObject = exports.objectAlphaSort = exports.objectToArray = exports.getObjectKeysAsNumber = exports.objectKeysToLowerCase = exports.isJson = exports.tryJsonParse = void 0;
 const tryJsonParse = (str, defaultValue) => {
     if (!str) {
         return null;
@@ -131,7 +131,19 @@ const castObject = (orig, castF) => {
 };
 exports.castObject = castObject;
 /** remove key values from an object where the value is null or undefined or other specific passed in values  */
-const removeUndefValuesFromObject = (orig, 
+const removeUndefValuesFromObject = (orig) => {
+    const ret = {};
+    Object.entries(orig).forEach(([k, v]) => {
+        if (v !== null && v !== undefined) {
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            ret[k] = v;
+        }
+    });
+    return ret;
+};
+exports.removeUndefValuesFromObject = removeUndefValuesFromObject;
+/** remove key values from an object where the value is null or undefined or other specific passed in values  */
+const removeUndefValuesFromObjectAdditional = (orig, 
 /** other than null or undefined */
 ...additionalRemoves) => {
     const ret = {};
@@ -142,7 +154,7 @@ const removeUndefValuesFromObject = (orig,
     });
     return ret;
 };
-exports.removeUndefValuesFromObject = removeUndefValuesFromObject;
+exports.removeUndefValuesFromObjectAdditional = removeUndefValuesFromObjectAdditional;
 /**
  * cast Record<string,string[]|string> to Record<string,string>. can be used for querystring params
  * @param orig

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/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/package.json

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