@j2inn/fin5-ui-utils 1.0.8-react-router.6 → 1.0.9

package/dist_es/react/components/navigation/HeaderSiderLayout.js

@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2024, J2 Innovations. All Rights Reserved
+ */
+import { Container, Layout, Menu } from '@j2inn/ui';
+import classNames from 'classnames';
+import React, { useMemo, useState } from 'react';
+import { createUseStyles } from 'react-jss';
+import { DEFAULT_HEADER_HEIGHT, getMenuPages, } from './BasicLayout';
+import MenuTrigger from './MenuTrigger';
+const useStyles = createUseStyles({
+    header: ({ headerHeight }) => ({
+        position: 'fixed',
+        width: '100%',
+        zIndex: 1000,
+        padding: 0,
+        height: headerHeight,
+        lineHeight: `${headerHeight}px`,
+    }),
+    headerContent: {
+        height: '100%',
+    },
+    sider: ({ headerHeight }) => ({
+        overflow: 'auto',
+        height: '100vh',
+        position: 'fixed',
+        left: 0,
+        top: 0,
+        bottom: 0,
+        zIndex: 999,
+        paddingTop: headerHeight,
+    }),
+    content: ({ isMobile, compactSider, siderWidth = 200, headerHeight, }) => ({
+        paddingLeft: isMobile ? 0 : compactSider ? 45 : siderWidth,
+        paddingTop: headerHeight,
+    }),
+});
+// Workaround j2inn/ui exporting problem
+const Header = Layout.Header;
+const Sider = Layout.Sider;
+const Content = Layout.Content;
+/**
+ * Layout with header and sider. Sider is collapsed on mobile.
+ * Routing management can be plugged in, for examples @see ReactRouterLayout @see RouterLayout
+ */
+export function HeaderSiderLayout({ pages = [], defaultPage, selectedPages = [], onSelect, compactSider, layoutProps, header, headerProps, siderProps, contentProps, menuProps, menuBefore, menuAfter, menuTriggerClassName, headerHeight = DEFAULT_HEADER_HEIGHT, children, }) {
+    const [isMobile, setIsMobile] = useState(false);
+    const [hiddenSider, setHiddenSider] = useState(false);
+    const siderWidth = siderProps?.width;
+    const classes = useStyles({
+        isMobile,
+        compactSider: compactSider?.isCompact,
+        siderWidth,
+        headerHeight,
+    });
+    const menuPages = useMemo(() => getMenuPages(pages), [pages]);
+    return (React.createElement(Layout, { hasSider: true, ...layoutProps },
+        React.createElement(Header, { ...headerProps, className: classNames(classes.header, headerProps?.className) },
+            React.createElement(Container, { horizontal: true, middle: true, className: classes.headerContent },
+                isMobile && (React.createElement(MenuTrigger, { hiddenSider: hiddenSider, headerHeight: headerHeight, className: menuTriggerClassName, onClick: () => {
+                        setHiddenSider(!hiddenSider);
+                    } })),
+                header)),
+        React.createElement(Sider, { ...siderProps, className: classNames(classes.sider, siderProps?.className), breakpoint: 'md', onBreakpoint: (broken) => {
+                setIsMobile(broken);
+                setHiddenSider(true);
+            }, collapsed: (isMobile && hiddenSider) || compactSider?.isCompact, collapsedWidth: isMobile && hiddenSider
+                ? 0
+                : compactSider
+                    ? headerHeight
+                    : 0, trigger: null },
+            menuBefore,
+            React.createElement(Menu, { ...menuProps, defaultSelectedKeys: defaultPage ? [defaultPage] : undefined, items: menuPages, selectedKeys: selectedPages, onSelect: ({ key }) => {
+                    if (!hiddenSider) {
+                        setHiddenSider(true);
+                    }
+                    onSelect?.(key);
+                } }),
+            menuAfter),
+        React.createElement(Content, { ...contentProps, className: classNames(classes.content, contentProps?.className) }, children)));
+}
+//# sourceMappingURL=HeaderSiderLayout.js.map

package/dist_es/react/components/navigation/HeaderSiderLayout.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"HeaderSiderLayout.js","sourceRoot":"","sources":["../../../../src/react/components/navigation/HeaderSiderLayout.tsx"],"names":[],"mappings":"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"}

package/dist_es/react/components/navigation/MenuTrigger.d.ts

@@ -0,0 +1,9 @@
+import React from 'react';
+interface MenuTriggerProps {
+    hiddenSider: boolean;
+    headerHeight?: number;
+    className?: string;
+    onClick: () => void;
+}
+declare const MenuTrigger: React.FC<MenuTriggerProps>;
+export default MenuTrigger;

package/dist_es/react/components/navigation/MenuTrigger.js

@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2024, J2 Innovations. All Rights Reserved
+ */
+import { MenuFoldOutlined, MenuUnfoldOutlined } from '@ant-design/icons';
+import classNames from 'classnames';
+import React from 'react';
+import { createUseStyles } from 'react-jss';
+const useStyles = createUseStyles((theme) => ({
+    menuTrigger: ({ headerHeight }) => ({
+        width: headerHeight,
+        height: '100%',
+        textAlign: 'center',
+        fontSize: 18,
+        cursor: 'pointer',
+        transition: 'color 0.3s ease-in-out',
+        backgroundColor: 'transparent',
+        color: theme.linkColor,
+        padding: '0 0.5rem',
+        '&:hover': {
+            color: theme.linkActiveColor,
+        },
+    }),
+}));
+const MenuTrigger = ({ hiddenSider, headerHeight = 45, onClick, className, }) => {
+    const classes = useStyles({ headerHeight });
+    return hiddenSider ? (React.createElement(MenuUnfoldOutlined, { className: classNames(classes.menuTrigger, className), onClick: onClick })) : (React.createElement(MenuFoldOutlined, { className: classNames(classes.menuTrigger, className), onClick: onClick }));
+};
+export default MenuTrigger;
+//# sourceMappingURL=MenuTrigger.js.map

package/dist_es/react/components/navigation/MenuTrigger.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"MenuTrigger.js","sourceRoot":"","sources":["../../../../src/react/components/navigation/MenuTrigger.tsx"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAA;AAExE,OAAO,UAAU,MAAM,YAAY,CAAA;AACnC,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAA;AAM3C,MAAM,SAAS,GAAG,eAAe,CAAC,CAAC,KAAe,EAAE,EAAE,CAAC,CAAC;IACvD,WAAW,EAAE,CAAC,EAAE,YAAY,EAAkB,EAAE,EAAE,CAAC,CAAC;QACnD,KAAK,EAAE,YAAY;QACnB,MAAM,EAAE,MAAM;QACd,SAAS,EAAE,QAAQ;QACnB,QAAQ,EAAE,EAAE;QACZ,MAAM,EAAE,SAAS;QACjB,UAAU,EAAE,wBAAwB;QACpC,eAAe,EAAE,aAAa;QAC9B,KAAK,EAAE,KAAK,CAAC,SAAS;QACtB,OAAO,EAAE,UAAU;QACnB,SAAS,EAAE;YACV,KAAK,EAAE,KAAK,CAAC,eAAe;SAC5B;KACD,CAAC;CACF,CAAC,CAAC,CAAA;AASH,MAAM,WAAW,GAA+B,CAAC,EAChD,WAAW,EACX,YAAY,GAAG,EAAE,EACjB,OAAO,EACP,SAAS,GACT,EAAE,EAAE;IACJ,MAAM,OAAO,GAAG,SAAS,CAAC,EAAE,YAAY,EAAE,CAAC,CAAA;IAE3C,OAAO,WAAW,CAAC,CAAC,CAAC,CACpB,oBAAC,kBAAkB,IAClB,SAAS,EAAE,UAAU,CAAC,OAAO,CAAC,WAAW,EAAE,SAAS,CAAC,EACrD,OAAO,EAAE,OAAO,GACf,CACF,CAAC,CAAC,CAAC,CACH,oBAAC,gBAAgB,IAChB,SAAS,EAAE,UAAU,CAAC,OAAO,CAAC,WAAW,EAAE,SAAS,CAAC,EACrD,OAAO,EAAE,OAAO,GACf,CACF,CAAA;AACF,CAAC,CAAA;AAED,eAAe,WAAW,CAAA"}

package/dist_es/react/components/navigation/ReactRouterHeaderSiderLayout.d.ts

@@ -0,0 +1,11 @@
+import type { Location } from '@remix-run/router';
+import React from 'react';
+import { HeaderSiderLayoutProps } from './HeaderSiderLayout';
+import { ReactRouterMenuPage } from './ReactRouterLayout';
+export interface ReactRouterHeaderSiderLayoutProps extends HeaderSiderLayoutProps<ReactRouterMenuPage> {
+    isSelectedRoute?: (page: ReactRouterMenuPage, location: Location) => boolean;
+}
+/**
+ * Header/Sider layout that uses React Router.
+ */
+export declare const ReactRouterHeaderSiderLayout: React.FC<ReactRouterHeaderSiderLayoutProps>;

package/dist_es/react/components/navigation/ReactRouterHeaderSiderLayout.js

@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2024, J2 Innovations. All Rights Reserved
+ */
+import React from 'react';
+import { Outlet, useNavigate } from 'react-router';
+import { HeaderSiderLayout } from './HeaderSiderLayout';
+import { useDefaultOnSelect, useGetPageKeyRouteMap, useSelectedRoutes, } from './ReactRouterLayout';
+/**
+ * Header/Sider layout that uses React Router.
+ */
+export const ReactRouterHeaderSiderLayout = ({ isSelectedRoute, pages = [], onSelect, ...otherProps }) => {
+    const navigate = useNavigate();
+    const selectedRoutes = useSelectedRoutes(pages, isSelectedRoute);
+    const pageKeyRouteMap = useGetPageKeyRouteMap(pages);
+    const defaultOnSelect = useDefaultOnSelect(navigate, pageKeyRouteMap, pages);
+    return (React.createElement(HeaderSiderLayout, { ...otherProps, pages: pages, onSelect: onSelect ?? defaultOnSelect, selectedPages: selectedRoutes },
+        React.createElement(Outlet, null)));
+};
+//# sourceMappingURL=ReactRouterHeaderSiderLayout.js.map

package/dist_es/react/components/navigation/ReactRouterHeaderSiderLayout.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ReactRouterHeaderSiderLayout.js","sourceRoot":"","sources":["../../../../src/react/components/navigation/ReactRouterHeaderSiderLayout.tsx"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,cAAc,CAAA;AAClD,OAAO,EAAE,iBAAiB,EAA0B,MAAM,qBAAqB,CAAA;AAC/E,OAAO,EAEN,kBAAkB,EAClB,qBAAqB,EACrB,iBAAiB,GACjB,MAAM,qBAAqB,CAAA;AAO5B;;GAEG;AACH,MAAM,CAAC,MAAM,4BAA4B,GAErC,CAAC,EAAE,eAAe,EAAE,KAAK,GAAG,EAAE,EAAE,QAAQ,EAAE,GAAG,UAAU,EAAE,EAAE,EAAE;IAChE,MAAM,QAAQ,GAAG,WAAW,EAAE,CAAA;IAC9B,MAAM,cAAc,GAAG,iBAAiB,CAAC,KAAK,EAAE,eAAe,CAAC,CAAA;IAChE,MAAM,eAAe,GAAG,qBAAqB,CAAC,KAAK,CAAC,CAAA;IACpD,MAAM,eAAe,GAAG,kBAAkB,CAAC,QAAQ,EAAE,eAAe,EAAE,KAAK,CAAC,CAAA;IAE5E,OAAO,CACN,oBAAC,iBAAiB,OACb,UAAU,EACd,KAAK,EAAE,KAAK,EACZ,QAAQ,EAAE,QAAQ,IAAI,eAAe,EACrC,aAAa,EAAE,cAAc;QAC7B,oBAAC,MAAM,OAAG,CACS,CACpB,CAAA;AACF,CAAC,CAAA"}

package/dist_es/react/components/navigation/ReactRouterLayout.d.ts

@@ -1,15 +1,45 @@
 import type { Location } from '@remix-run/router';
 import React from 'react';
+import { NavigateFunction } from 'react-router';
 import { BasicLayoutProps } from './BasicLayout';
 import { MenuPage } from './MenuPage';
-export interface ReactRouterLayoutProps extends BasicLayoutProps<MenuPage> {
-    isSelectedRoute?: (page: MenuPage, location: Location) => boolean;
+export declare type ReactRouterMenuPage = MenuPage & {
+    route: string;
+};
+export interface ReactRouterLayoutProps extends BasicLayoutProps<ReactRouterMenuPage> {
+    isSelectedRoute?: (page: ReactRouterMenuPage, location: Location) => boolean;
 }
 /**
  * This hook can be used with react-router/BasicLayout,
  * to ensure FIN5 URL is aligned with the internal frame URL.
+ * This does not skip the hash update and should be used only with
+ * FIN >= 5.1.7.92, otherwise FIN will reload the entire page.
  */
 export declare const useLocationUpdate: () => void;
+/**
+ * This hook can be used with react-router/BasicLayout,
+ * to ensure FIN5 URL is aligned with the internal frame URL.
+ * This skips the hash update and should be used only with
+ * FIN < 5.1.7.92.
+ * @deprecated use only with FIN < 5.1.7.92
+ * @see {@link useLocationUpdate} for FIN >= 5.1.7.92
+ */
+export declare const useLocationUpdateSkippingHash: () => void;
+export declare const useSelectedRoutes: (pages: ReactRouterMenuPage[], isSelectedRoute?: (page: ReactRouterMenuPage, location: Location) => boolean) => string[];
+/**
+ * If we are inside a frame (FIN5), the route is left as is.
+ * If we are outside FIN5 frame, the route needs to be prefixed with a segment containing the project name.
+ * @param route
+ * @returns the correct route for the environment
+ */
+export declare const getRoute: (route: string) => string;
+/**
+ * Create a map that holds the page key and its related route.
+ * @param pages
+ * @returns the map page key - route
+ */
+export declare const useGetPageKeyRouteMap: (pages: ReactRouterMenuPage[]) => Map<string, string>;
+export declare const useDefaultOnSelect: (navigate: NavigateFunction, pageKeyRouteMap: Map<string, string>, pages: ReactRouterMenuPage[]) => (key: string) => void;
 /**
  * Basic layout that uses React Router.
  */

package/dist_es/react/components/navigation/ReactRouterLayout.js

@@ -2,51 +2,99 @@
  * Copyright (c) 2023, J2 Innovations. All Rights Reserved
  */
 import React, { useCallback, useEffect, useMemo } from 'react';
-import { Outlet, useLocation, useNavigate } from 'react-router';
+import { Outlet, useLocation, useNavigate, } from 'react-router';
 import { IN_IFRAME, fin5SkipHashUpdate, getFin5HashFrameParameters, getTopLocation, } from '../../../fin5Top/useFin5AppURLHashParameter';
 import { BasicLayout } from './BasicLayout';
 import { pageTreeToPageList } from './MenuPage';
 /**
  * This hook can be used with react-router/BasicLayout,
  * to ensure FIN5 URL is aligned with the internal frame URL.
+ * This does not skip the hash update and should be used only with
+ * FIN >= 5.1.7.92, otherwise FIN will reload the entire page.
  */
 export const useLocationUpdate = () => {
     const location = useLocation();
     useEffect(() => {
-        console.debug('Location changed', location);
-        const hash = location.pathname;
-        const queryParams = location.search;
+        if (IN_IFRAME) {
+            setHash(location);
+        }
+    }, [location]);
+};
+/**
+ * This hook can be used with react-router/BasicLayout,
+ * to ensure FIN5 URL is aligned with the internal frame URL.
+ * This skips the hash update and should be used only with
+ * FIN < 5.1.7.92.
+ * @deprecated use only with FIN < 5.1.7.92
+ * @see {@link useLocationUpdate} for FIN >= 5.1.7.92
+ */
+export const useLocationUpdateSkippingHash = () => {
+    const location = useLocation();
+    useEffect(() => {
         if (IN_IFRAME) {
             fin5SkipHashUpdate()?.then(() => {
-                const frameParameters = getFin5HashFrameParameters();
-                frameParameters.set('url', frameParameters.get('url')?.split('#')[0] +
-                    '#' +
-                    hash +
-                    queryParams);
-                getTopLocation().hash = `#${getTopLocation().hash.slice(1).split('?')[0]}?${frameParameters.toString()}`;
+                setHash(location);
             });
         }
     }, [location]);
 };
-const useSelectedRoutes = (pages, isSelectedRoute = (page, location) => location.pathname.includes(`/${page.key}`)) => {
+const setHash = (location) => {
+    const hash = location.pathname;
+    const queryParams = location.search;
+    const frameParameters = getFin5HashFrameParameters();
+    frameParameters.set('url', frameParameters.get('url')?.split('#')[0] + '#' + hash + queryParams);
+    getTopLocation().hash = `#${getTopLocation().hash.slice(1).split('?')[0]}?${frameParameters.toString()}`;
+};
+export const useSelectedRoutes = (pages, isSelectedRoute = (page, location) => location.pathname.includes(page.route)) => {
     const location = useLocation();
+    const flatPages = useMemo(() => pageTreeToPageList(pages), [pages]);
     return useMemo(() => {
-        const flatPages = pageTreeToPageList(pages);
         return flatPages
             .filter((page) => isSelectedRoute(page, location))
             .map((page) => page.key);
-    }, [location, pages]);
+    }, [location, flatPages, isSelectedRoute]);
+};
+/**
+ * If we are inside a frame (FIN5), the route is left as is.
+ * If we are outside FIN5 frame, the route needs to be prefixed with a segment containing the project name.
+ * @param route
+ * @returns the correct route for the environment
+ */
+export const getRoute = (route) => {
+    const prefixedRoute = route.startsWith('/') ? route : `/${route}`;
+    return !IN_IFRAME ? `/proj/:projectName${prefixedRoute}` : prefixedRoute;
 };
+/**
+ * Create a map that holds the page key and its related route.
+ * @param pages
+ * @returns the map page key - route
+ */
+export const useGetPageKeyRouteMap = (pages) => useMemo(() => {
+    const flatPages = pageTreeToPageList(pages);
+    const result = new Map();
+    flatPages.forEach((page) => {
+        result.set(page.key, page.route);
+    });
+    return result;
+}, [pages]);
+export const useDefaultOnSelect = (navigate, pageKeyRouteMap, pages) => useCallback((key) => {
+    const route = pageKeyRouteMap.get(key);
+    if (route) {
+        navigate(route);
+    }
+    else {
+        console.warn('Could not find route for page key', key, 'pages', pages);
+    }
+}, [navigate, pageKeyRouteMap]);
 /**
  * Basic layout that uses React Router.
  */
-export const ReactRouterLayout = ({ isSelectedRoute, pages = [], ...otherProps }) => {
+export const ReactRouterLayout = ({ isSelectedRoute, pages = [], onSelect, ...otherProps }) => {
     const navigate = useNavigate();
     const selectedRoutes = useSelectedRoutes(pages, isSelectedRoute);
-    const onSelect = useCallback((key) => {
-        navigate(key);
-    }, [navigate]);
-    return (React.createElement(BasicLayout, { ...otherProps, pages: pages, onSelect: onSelect, selectedPages: selectedRoutes },
+    const pageKeyRouteMap = useGetPageKeyRouteMap(pages);
+    const defaultOnSelect = useDefaultOnSelect(navigate, pageKeyRouteMap, pages);
+    return (React.createElement(BasicLayout, { ...otherProps, pages: pages, onSelect: onSelect ?? defaultOnSelect, selectedPages: selectedRoutes },
         React.createElement(Outlet, null)));
 };
 //# sourceMappingURL=ReactRouterLayout.js.map

package/dist_es/react/components/navigation/ReactRouterLayout.js.map

@@ -1 +1 @@
-{"version":3,"file":"ReactRouterLayout.js","sourceRoot":"","sources":["../../../../src/react/components/navigation/ReactRouterLayout.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"ReactRouterLayout.js","sourceRoot":"","sources":["../../../../src/react/components/navigation/ReactRouterLayout.tsx"],"names":[],"mappings":"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"}

package/dist_es/react/hooks/useFin5BinUrl.d.ts

@@ -0,0 +1,6 @@
+import { HRef } from 'haystack-core';
+/**
+ * Retrieves the url of a Fin 5 bin based on the file record id, or undefined if the url couldn't be retrieved.
+ * Uses haystack-nclient to retrieve the projectName from context.
+ */
+export declare const useFin5BinUrl: (fileId?: HRef) => string | undefined;

package/dist_es/react/hooks/useFin5BinUrl.js

@@ -0,0 +1,12 @@
+import { useClient } from 'haystack-react';
+import { useMemo } from 'react';
+import { getFin5BinUrl } from '../../fin5Top/getFin5BinUrl';
+/**
+ * Retrieves the url of a Fin 5 bin based on the file record id, or undefined if the url couldn't be retrieved.
+ * Uses haystack-nclient to retrieve the projectName from context.
+ */
+export const useFin5BinUrl = (fileId) => {
+    const projectName = useClient().project;
+    return useMemo(() => (fileId ? getFin5BinUrl(fileId, projectName) : undefined), [fileId, projectName]);
+};
+//# sourceMappingURL=useFin5BinUrl.js.map

package/dist_es/react/hooks/useFin5BinUrl.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"useFin5BinUrl.js","sourceRoot":"","sources":["../../../src/react/hooks/useFin5BinUrl.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAC1C,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAA;AAC/B,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAA;AAE3D;;;GAGG;AACH,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,MAAa,EAAsB,EAAE;IAClE,MAAM,WAAW,GAAG,SAAS,EAAE,CAAC,OAAO,CAAA;IAEvC,OAAO,OAAO,CACb,GAAG,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,aAAa,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,EAC/D,CAAC,MAAM,EAAE,WAAW,CAAC,CACrB,CAAA;AACF,CAAC,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@j2inn/fin5-ui-utils",
-	"version": "1.0.8-react-router.6",
+	"version": "1.0.9",
 	"description": "A set of useful client-side utilities useful for creating UI applications on top of FIN 5",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",
@@ -41,9 +41,7 @@
 		"haystack-units": "^1.0.20",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0",
-		"react-jss": "^10.9.2",
-		"react-router": "^6.10.0",
-		"react-router-dom": "^6.10.0"
+		"react-jss": "^10.9.2"
 	},
 	"devDependencies": {
 		"@babel/cli": "^7.18.10",

package/dist/react/components/navigation/ReactRouterLayout.d.ts

@@ -1,16 +0,0 @@
-import type { Location } from '@remix-run/router';
-import React from 'react';
-import { BasicLayoutProps } from './BasicLayout';
-import { MenuPage } from './MenuPage';
-export interface ReactRouterLayoutProps extends BasicLayoutProps<MenuPage> {
-    isSelectedRoute?: (page: MenuPage, location: Location) => boolean;
-}
-/**
- * This hook can be used with react-router/BasicLayout,
- * to ensure FIN5 URL is aligned with the internal frame URL.
- */
-export declare const useLocationUpdate: () => void;
-/**
- * Basic layout that uses React Router.
- */
-export declare const ReactRouterLayout: React.FC<ReactRouterLayoutProps>;

package/dist/react/components/navigation/ReactRouterLayout.js

@@ -1,80 +0,0 @@
-"use strict";
-/*
- * Copyright (c) 2023, J2 Innovations. All Rights Reserved
- */
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ReactRouterLayout = exports.useLocationUpdate = void 0;
-const react_1 = __importStar(require("react"));
-const react_router_1 = require("react-router");
-const useFin5AppURLHashParameter_1 = require("../../../fin5Top/useFin5AppURLHashParameter");
-const BasicLayout_1 = require("./BasicLayout");
-const MenuPage_1 = require("./MenuPage");
-/**
- * This hook can be used with react-router/BasicLayout,
- * to ensure FIN5 URL is aligned with the internal frame URL.
- */
-const useLocationUpdate = () => {
-    const location = (0, react_router_1.useLocation)();
-    (0, react_1.useEffect)(() => {
-        console.debug('Location changed', location);
-        const hash = location.pathname;
-        const queryParams = location.search;
-        if (useFin5AppURLHashParameter_1.IN_IFRAME) {
-            (0, useFin5AppURLHashParameter_1.fin5SkipHashUpdate)()?.then(() => {
-                const frameParameters = (0, useFin5AppURLHashParameter_1.getFin5HashFrameParameters)();
-                frameParameters.set('url', frameParameters.get('url')?.split('#')[0] +
-                    '#' +
-                    hash +
-                    queryParams);
-                (0, useFin5AppURLHashParameter_1.getTopLocation)().hash = `#${(0, useFin5AppURLHashParameter_1.getTopLocation)().hash.slice(1).split('?')[0]}?${frameParameters.toString()}`;
-            });
-        }
-    }, [location]);
-};
-exports.useLocationUpdate = useLocationUpdate;
-const useSelectedRoutes = (pages, isSelectedRoute = (page, location) => location.pathname.includes(`/${page.key}`)) => {
-    const location = (0, react_router_1.useLocation)();
-    return (0, react_1.useMemo)(() => {
-        const flatPages = (0, MenuPage_1.pageTreeToPageList)(pages);
-        return flatPages
-            .filter((page) => isSelectedRoute(page, location))
-            .map((page) => page.key);
-    }, [location, pages]);
-};
-/**
- * Basic layout that uses React Router.
- */
-const ReactRouterLayout = ({ isSelectedRoute, pages = [], ...otherProps }) => {
-    const navigate = (0, react_router_1.useNavigate)();
-    const selectedRoutes = useSelectedRoutes(pages, isSelectedRoute);
-    const onSelect = (0, react_1.useCallback)((key) => {
-        navigate(key);
-    }, [navigate]);
-    return (react_1.default.createElement(BasicLayout_1.BasicLayout, { ...otherProps, pages: pages, onSelect: onSelect, selectedPages: selectedRoutes },
-        react_1.default.createElement(react_router_1.Outlet, null)));
-};
-exports.ReactRouterLayout = ReactRouterLayout;
-//# sourceMappingURL=ReactRouterLayout.js.map

package/dist/react/components/navigation/ReactRouterLayout.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"ReactRouterLayout.js","sourceRoot":"","sources":["../../../../src/react/components/navigation/ReactRouterLayout.tsx"],"names":[],"mappings":";AAAA;;GAEG;;;;;;;;;;;;;;;;;;;;;;;;;;AAGH,+CAA8D;AAC9D,+CAA+D;AAC/D,4FAKoD;AACpD,+CAA6D;AAC7D,yCAAyD;AAMzD;;;GAGG;AACI,MAAM,iBAAiB,GAAG,GAAG,EAAE;IACrC,MAAM,QAAQ,GAAG,IAAA,0BAAW,GAAE,CAAA;IAC9B,IAAA,iBAAS,EAAC,GAAG,EAAE;QACd,OAAO,CAAC,KAAK,CAAC,kBAAkB,EAAE,QAAQ,CAAC,CAAA;QAC3C,MAAM,IAAI,GAAG,QAAQ,CAAC,QAAQ,CAAA;QAC9B,MAAM,WAAW,GAAG,QAAQ,CAAC,MAAM,CAAA;QAEnC,IAAI,sCAAS,EAAE;YACd,IAAA,+CAAkB,GAAE,EAAE,IAAI,CAAC,GAAG,EAAE;gBAC/B,MAAM,eAAe,GAAG,IAAA,uDAA0B,GAAE,CAAA;gBAEpD,eAAe,CAAC,GAAG,CAClB,KAAK,EACL,eAAe,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;oBACxC,GAAG;oBACH,IAAI;oBACJ,WAAW,CACZ,CAAA;gBAED,IAAA,2CAAc,GAAE,CAAC,IAAI,GAAG,IACvB,IAAA,2CAAc,GAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAC5C,IAAI,eAAe,CAAC,QAAQ,EAAE,EAAE,CAAA;YACjC,CAAC,CAAC,CAAA;SACF;IACF,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAA;AACf,CAAC,CAAA;AAzBY,QAAA,iBAAiB,qBAyB7B;AAED,MAAM,iBAAiB,GAAG,CACzB,KAAiB,EACjB,kBAAkB,CAAC,IAAc,EAAE,QAAkB,EAAE,EAAE,CACxD,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC,EAC1C,EAAE;IACH,MAAM,QAAQ,GAAG,IAAA,0BAAW,GAAE,CAAA;IAE9B,OAAO,IAAA,eAAO,EAAC,GAAG,EAAE;QACnB,MAAM,SAAS,GAAG,IAAA,6BAAkB,EAAC,KAAK,CAAC,CAAA;QAC3C,OAAO,SAAS;aACd,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,eAAe,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;aACjD,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IAC1B,CAAC,EAAE,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAA;AACtB,CAAC,CAAA;AAED;;GAEG;AACI,MAAM,iBAAiB,GAAqC,CAAC,EACnE,eAAe,EACf,KAAK,GAAG,EAAE,EACV,GAAG,UAAU,EACb,EAAE,EAAE;IACJ,MAAM,QAAQ,GAAG,IAAA,0BAAW,GAAE,CAAA;IAC9B,MAAM,cAAc,GAAG,iBAAiB,CAAC,KAAK,EAAE,eAAe,CAAC,CAAA;IAChE,MAAM,QAAQ,GAAG,IAAA,mBAAW,EAC3B,CAAC,GAAW,EAAE,EAAE;QACf,QAAQ,CAAC,GAAG,CAAC,CAAA;IACd,CAAC,EACD,CAAC,QAAQ,CAAC,CACV,CAAA;IAED,OAAO,CACN,8BAAC,yBAAW,OACP,UAAU,EACd,KAAK,EAAE,KAAK,EACZ,QAAQ,EAAE,QAAQ,EAClB,aAAa,EAAE,cAAc;QAC7B,8BAAC,qBAAM,OAAG,CACG,CACd,CAAA;AACF,CAAC,CAAA;AAvBY,QAAA,iBAAiB,qBAuB7B"}

package/dist/react/components/navigation/customRouting/Router.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"Router.js","sourceRoot":"","sources":["../../../../../src/react/components/navigation/customRouting/Router.tsx"],"names":[],"mappings":";AAAA;;GAEG;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,+CAMc;AACd,yDAAqD;AACrD,0CAAsD;AAStD;;GAEG;AACH,SAAgB,MAAM,CAAqB,EAC1C,KAAK,GAAG,EAAE,EACV,WAAW,EACX,YAAY,EACZ,iBAAiB,GACkB;IACnC,MAAM,IAAI,GAAG,IAAA,eAAO,EACnB,GAAG,EAAE,CAAC,IAAA,yBAAc,EAAC,KAAK,EAAE,WAAW,CAAC,EACxC,CAAC,KAAK,EAAE,WAAW,CAAC,CACpB,CAAA;IAED,IAAA,iBAAS,EAAC,GAAG,EAAE;QACd,YAAY,EAAE,CAAC,IAAI,CAAC,CAAA;IACrB,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAA;IAEV,OAAO,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC,CACxB,8BAAC,gBAAQ,IAAC,QAAQ,EAAE,8BAAC,+BAAc,OAAG,IACpC,eAAK,CAAC,aAAa,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,KAAK,CAAC,CACvC,CACX,CAAC,CAAC,CAAC,CACH,iBAAiB,IAAI;QAAM,WAAW;0BAAsB,CAC5D,CAAA;AACF,CAAC;AAtBD,wBAsBC"}

package/dist/react/components/navigation/customRouting/RouterLayout.d.ts

@@ -1,11 +0,0 @@
-import React from 'react';
-import { BasicLayoutProps } from '../BasicLayout';
-import { MenuPage } from '../MenuPage';
-export interface RouterLayoutProps extends BasicLayoutProps<MenuPage> {
-    page?: string;
-    onPageChange?: (page: string) => void;
-}
-/**
- * Basic layout that uses a custom router.
- */
-export declare const RouterLayout: React.FC<RouterLayoutProps>;

package/dist/react/components/navigation/customRouting/RouterLayout.js

@@ -1,62 +0,0 @@
-"use strict";
-/*
- * Copyright (c) 2022, J2 Innovations. All Rights Reserved
- */
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.RouterLayout = void 0;
-const ui_1 = require("@j2inn/ui");
-const react_1 = __importStar(require("react"));
-const ErrorDisplayer_1 = require("../../ErrorDisplayer");
-const BasicLayout_1 = require("../BasicLayout");
-const MenuPage_1 = require("../MenuPage");
-const Router_1 = require("./Router");
-/**
- * Basic layout that uses a custom router.
- */
-const RouterLayout = ({ pages = [], defaultPage = pages?.[0].key ?? '', onPageChange, page, ...otherProps }) => {
-    const [currentPage, setCurrentPage] = (0, react_1.useState)(page ?? defaultPage);
-    (0, react_1.useEffect)(() => {
-        if (page) {
-            setCurrentPage(page);
-        }
-    }, [page]);
-    // Fire onChange
-    (0, react_1.useEffect)(() => {
-        onPageChange?.(currentPage);
-    }, [currentPage]);
-    const onSelect = (0, react_1.useCallback)((key) => {
-        const page = (0, MenuPage_1.findPageByName)(pages, key);
-        if (page?.component) {
-            setCurrentPage(key);
-        }
-    }, [pages]);
-    return (react_1.default.createElement(BasicLayout_1.BasicLayout, { ...otherProps, pages: pages, defaultPage: defaultPage, onSelect: onSelect, selectedPages: [currentPage] },
-        react_1.default.createElement(Router_1.Router, { pages: pages, currentPage: currentPage, fallbackComponent: react_1.default.createElement(ErrorDisplayer_1.ErrorDisplayer, { error: new Error('Page Not Found'), extra: [
-                    react_1.default.createElement(ui_1.Button, { type: 'primary', key: 'refresh', onClick: () => setCurrentPage(defaultPage) }, "Go Home"),
-                ] }) })));
-};
-exports.RouterLayout = RouterLayout;
-//# sourceMappingURL=RouterLayout.js.map

package/dist/react/components/navigation/customRouting/RouterLayout.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"RouterLayout.js","sourceRoot":"","sources":["../../../../../src/react/components/navigation/customRouting/RouterLayout.tsx"],"names":[],"mappings":";AAAA;;GAEG;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,kCAAkC;AAClC,+CAA+D;AAC/D,yDAAqD;AACrD,gDAA8D;AAC9D,0CAAsD;AACtD,qCAAiC;AAOjC;;GAEG;AACI,MAAM,YAAY,GAAgC,CAAC,EACzD,KAAK,GAAG,EAAE,EACV,WAAW,GAAG,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,EAAE,EAClC,YAAY,EACZ,IAAI,EACJ,GAAG,UAAU,EACb,EAAE,EAAE;IACJ,MAAM,CAAC,WAAW,EAAE,cAAc,CAAC,GAAG,IAAA,gBAAQ,EAAC,IAAI,IAAI,WAAW,CAAC,CAAA;IAEnE,IAAA,iBAAS,EAAC,GAAG,EAAE;QACd,IAAI,IAAI,EAAE;YACT,cAAc,CAAC,IAAI,CAAC,CAAA;SACpB;IACF,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAA;IAEV,gBAAgB;IAChB,IAAA,iBAAS,EAAC,GAAG,EAAE;QACd,YAAY,EAAE,CAAC,WAAW,CAAC,CAAA;IAC5B,CAAC,EAAE,CAAC,WAAW,CAAC,CAAC,CAAA;IAEjB,MAAM,QAAQ,GAAG,IAAA,mBAAW,EAC3B,CAAC,GAAW,EAAE,EAAE;QACf,MAAM,IAAI,GAAG,IAAA,yBAAc,EAAC,KAAK,EAAE,GAAG,CAAC,CAAA;QACvC,IAAI,IAAI,EAAE,SAAS,EAAE;YACpB,cAAc,CAAC,GAAG,CAAC,CAAA;SACnB;IACF,CAAC,EACD,CAAC,KAAK,CAAC,CACP,CAAA;IAED,OAAO,CACN,8BAAC,yBAAW,OACP,UAAU,EACd,KAAK,EAAE,KAAK,EACZ,WAAW,EAAE,WAAW,EACxB,QAAQ,EAAE,QAAQ,EAClB,aAAa,EAAE,CAAC,WAAW,CAAC;QAC5B,8BAAC,eAAM,IACN,KAAK,EAAE,KAAK,EACZ,WAAW,EAAE,WAAW,EACxB,iBAAiB,EAChB,8BAAC,+BAAc,IACd,KAAK,EAAE,IAAI,KAAK,CAAC,gBAAgB,CAAC,EAClC,KAAK,EAAE;oBACN,8BAAC,WAAM,IACN,IAAI,EAAC,SAAS,EACd,GAAG,EAAC,SAAS,EACb,OAAO,EAAE,GAAG,EAAE,CAAC,cAAc,CAAC,WAAW,CAAC,cAElC;iBACT,GACA,GAEF,CACW,CACd,CAAA;AACF,CAAC,CAAA;AAxDY,QAAA,YAAY,gBAwDxB"}