@gen3/frontend 0.10.83 → 0.10.84

package/dist/cjs/index.js

@@ -1012,13 +1012,13 @@ var LoginButtonVisibility = /*#__PURE__*/ function(LoginButtonVisibility) {
 };
 const mergeTailwindClassnameWithDefault = (userValues, defaultValues)=>userValues ? tailwindMerge.twMerge(defaultValues, userValues) : defaultValues;
 
-const handleSelected = async (isAuthenticated, router, referrer, endSession, externalLoginUrl)=>{
+const handleSelected$1 = async (isAuthenticated, router, referrer, endSession, externalLoginUrl)=>{
     if (!isAuthenticated) await router.push(externalLoginUrl || `Login?redirect=${referrer}`);
     else {
         if (endSession) endSession();
     }
 };
-const LoginButton = ({ icon = /*#__PURE__*/ jsxRuntime.jsx(md.MdLogin, {
+const LoginButton$1 = ({ icon = /*#__PURE__*/ jsxRuntime.jsx(md.MdLogin, {
     className: "pl-1",
     size: '1.55rem'
 }), hideText = false, className = undefined, tooltip, visibility, externalLoginUrl })=>{
@@ -1040,7 +1040,7 @@ const LoginButton = ({ icon = /*#__PURE__*/ jsxRuntime.jsx(md.MdLogin, {
         disabled: tooltip === undefined,
         classNames: TooltipStyle,
         children: /*#__PURE__*/ jsxRuntime.jsx(core$1.UnstyledButton, {
-            onClick: ()=>handleSelected(authenticated, router$1, pathname, endSession, externalLoginUrl),
+            onClick: ()=>handleSelected$1(authenticated, router$1, pathname, endSession, externalLoginUrl),
             children: /*#__PURE__*/ jsxRuntime.jsxs("div", {
                 className: mergedClassname,
                 children: [
@@ -3057,27 +3057,6 @@ const Gen3Link = ({ className, href, linkType, text, showExternalIcon = false })
     });
 };
 
-const LoginAccountButton = ({ className = undefined })=>{
-    const router$1 = router.useRouter();
-    const handleSelected = async ()=>{
-        await router$1.push('Profile');
-    };
-    const userStatus = core.useCoreSelector((state)=>core.selectUserAuthStatus(state));
-    const userInfo = core.useCoreSelector((state)=>core.selectUserDetails(state));
-    const mergedClassname = mergeTailwindClassnameWithDefault(className, 'flex flex-nowrap items-center align-middle border-b-2 hover:border-accent border-transparent');
-    if (userStatus && core.isAuthenticated(userStatus)) {
-        return /*#__PURE__*/ jsxRuntime.jsx(core$1.UnstyledButton, {
-            className: "mx-2",
-            onClick: ()=>handleSelected(),
-            children: /*#__PURE__*/ jsxRuntime.jsx("div", {
-                className: mergedClassname,
-                children: userInfo?.username
-            })
-        });
-    }
-    return null;
-};
-
 const IconSize = {
     xs: 14,
     sm: 16,
@@ -3087,7 +3066,7 @@ const IconSize = {
     'xl-2': 36
 };
 
-const TopIconButton = ({ name, leftIcon = undefined, rightIcon = undefined, iconSize = 'md', classNames = {}, drawBorder = true })=>{
+const IconButton = ({ name, leftIcon = undefined, rightIcon = undefined, iconSize = 'md', tooltip = undefined, classNames = {}, clickHandler = undefined, ariaLabel = undefined })=>{
     const classNamesDefaults = {
         root: `flex items-center align-middle px-2 my-2`,
         button: 'flex flex-nowrap items-center align-middle border-b-2 hover:border-accent border-transparent',
@@ -3100,53 +3079,111 @@ const TopIconButton = ({ name, leftIcon = undefined, rightIcon = undefined, icon
     const iconSz = IconSize[iconSize] ?? iconSize;
     return /*#__PURE__*/ jsxRuntime.jsx("div", {
         className: extractClassName('root', mergedClassnames),
-        "aria-label": name,
-        children: /*#__PURE__*/ jsxRuntime.jsxs("div", {
-            className: extractClassName('button', mergedClassnames),
-            role: "button",
-            children: [
-                leftIcon ? /*#__PURE__*/ jsxRuntime.jsx(react.Icon, {
-                    icon: leftIcon,
-                    width: iconSz,
-                    height: iconSz,
-                    className: extractClassName('leftIcon', mergedClassnames)
-                }) : null,
-                /*#__PURE__*/ jsxRuntime.jsxs("p", {
-                    className: extractClassName('label', mergedClassnames),
-                    children: [
-                        " ",
-                        name,
-                        " "
-                    ]
-                }),
-                rightIcon && rightIcon.length > 0 ? /*#__PURE__*/ jsxRuntime.jsx(react.Icon, {
-                    width: iconSz,
-                    height: iconSz,
-                    icon: rightIcon,
-                    className: extractClassName('rightIcon', mergedClassnames)
-                }) : null
-            ]
+        children: /*#__PURE__*/ jsxRuntime.jsx(core$1.Tooltip, {
+            label: tooltip,
+            position: "bottom",
+            withArrow: true,
+            multiline: true,
+            color: "base",
+            disabled: tooltip === undefined,
+            classNames: TooltipStyle,
+            children: /*#__PURE__*/ jsxRuntime.jsxs("div", {
+                className: extractClassName('button', mergedClassnames),
+                role: "button",
+                "aria-label": ariaLabel ?? name,
+                onClick: (event)=>clickHandler && clickHandler(),
+                children: [
+                    leftIcon ? /*#__PURE__*/ jsxRuntime.jsx(react.Icon, {
+                        icon: leftIcon,
+                        width: iconSz,
+                        height: iconSz,
+                        className: extractClassName('leftIcon', mergedClassnames)
+                    }) : null,
+                    /*#__PURE__*/ jsxRuntime.jsx("p", {
+                        className: extractClassName('label', mergedClassnames),
+                        children: name
+                    }),
+                    rightIcon && rightIcon.length > 0 ? /*#__PURE__*/ jsxRuntime.jsx(react.Icon, {
+                        width: iconSz,
+                        height: iconSz,
+                        icon: rightIcon,
+                        className: extractClassName('rightIcon', mergedClassnames)
+                    }) : null
+                ]
+            })
         })
     });
 };
-const processTopBarItems = (items, showLogin, classNames, dividerClassname)=>{
+
+const AccountButton = ({ leftIcon = undefined, rightIcon = undefined, iconSize = 'md', classNames = {}, tooltip = 'See account profile' })=>{
+    const classNamesDefaults = {
+        root: `flex items-center align-middle px-2 my-2`,
+        button: 'flex flex-nowrap items-center align-middle border-b-2 hover:border-accent border-transparent',
+        leftIcon: 'text-secondary-contrast-lighter pr-1',
+        label: 'font-content text-secondary-contrast-lighter block',
+        rightIcon: 'text-secondary-contrast-lighter pl-1'
+    };
+    const mergedClassnames = mergeDefaultTailwindClassnames(classNamesDefaults, classNames);
+    const router$1 = router.useRouter();
+    const handleSelected = async ()=>{
+        await router$1.push('Profile');
+    };
+    const userInfo = core.useCoreSelector((state)=>core.selectUserDetails(state));
+    const userStatus = core.useCoreSelector((state)=>core.selectUserAuthStatus(state));
+    const authenticated = core.isAuthenticated(userStatus);
+    if (!authenticated) return null;
+    return /*#__PURE__*/ jsxRuntime.jsx(IconButton, {
+        name: userInfo?.username ?? 'Profile',
+        leftIcon: leftIcon,
+        rightIcon: rightIcon,
+        iconSize: iconSize,
+        classNames: mergedClassnames,
+        clickHandler: handleSelected,
+        tooltip: tooltip
+    });
+};
+
+const handleSelected = async (isAuthenticated, router, referrer, endSession, externalLoginUrl)=>{
+    if (!isAuthenticated) await router.push(externalLoginUrl || `Login?redirect=${referrer}`);
+    else {
+        if (endSession) endSession();
+    }
+};
+const LoginButton = ({ name = 'login', leftIcon = undefined, rightIcon = undefined, tooltip = 'Login to your account', visibility, externalLoginUrl, iconSize = 'md', classNames = {} })=>{
+    const router$1 = router.useRouter();
+    const pathname = navigation.usePathname();
+    const { endSession } = React.useContext(SessionContext) ?? {
+        endSession: undefined
+    };
+    const userStatus = core.useCoreSelector((state)=>core.selectUserAuthStatus(state));
+    const authenticated = core.isAuthenticated(userStatus);
+    if (visibility === LoginButtonVisibility.LogoutOnly && !authenticated) return null;
+    return /*#__PURE__*/ jsxRuntime.jsx(IconButton, {
+        name: authenticated ? 'Logout' : 'Login',
+        leftIcon: leftIcon,
+        rightIcon: authenticated ? 'gen3:logout' : 'gen3:login',
+        iconSize: iconSize,
+        classNames: classNames,
+        clickHandler: ()=>handleSelected(authenticated, router$1, pathname, endSession, externalLoginUrl)
+    });
+};
+
+const processTopBarItems = (items, classNames, dividerClassname)=>{
     return items.reduce((acc, item, index)=>{
-        const needsBorder = !(index === items.length - 1 && !showLogin);
         const mergedClassnames = item?.classNames ? mergeDefaultTailwindClassnames(classNames, item.classNames) : classNames;
-        acc.push(/*#__PURE__*/ jsxRuntime.jsxs("a", {
-            className: "flex",
-            href: item.href,
+        acc.push(/*#__PURE__*/ jsxRuntime.jsxs(jsxRuntime.Fragment, {
             children: [
-                ' ',
-                /*#__PURE__*/ jsxRuntime.jsx(TopIconButton, {
-                    name: item.name,
-                    iconSize: item.iconSize,
-                    leftIcon: item.leftIcon,
-                    rightIcon: item.rightIcon,
-                    classNames: mergedClassnames,
-                    drawBorder: needsBorder
-                }),
-                ' ',
+                /*#__PURE__*/ jsxRuntime.jsx("a", {
+                    className: "flex",
+                    href: item.href,
+                    children: /*#__PURE__*/ jsxRuntime.jsx(IconButton, {
+                        name: item.name,
+                        iconSize: item.iconSize,
+                        leftIcon: item.leftIcon,
+                        rightIcon: item.rightIcon,
+                        classNames: mergedClassnames
+                    })
+                }, `${item.href}_${item.name}`),
                 /*#__PURE__*/ jsxRuntime.jsx(core$1.Divider, {
                     size: "md",
                     orientation: "vertical",
@@ -3155,7 +3192,7 @@ const processTopBarItems = (items, showLogin, classNames, dividerClassname)=>{
                     }
                 })
             ]
-        }, `${item.href}_${item.name}`));
+        }));
         return acc;
     }, []);
 };
@@ -3182,29 +3219,30 @@ const TopBar = ({ items, loginButtonVisibility = LoginButtonVisibility.Hidden, e
                 "aria-label": "top most navigation",
                 className: "flex items-center align-middle",
                 children: [
-                    processTopBarItems(items, loginButtonVisibility === LoginButtonVisibility.Visible, mergedItemClassnames, extractClassName('divider', mergedClassnames)),
-                    loginButtonVisibility != LoginButtonVisibility.Hidden ? /*#__PURE__*/ jsxRuntime.jsxs("div", {
-                        className: "flex items-center",
+                    processTopBarItems(items, mergedItemClassnames, extractClassName('divider', mergedClassnames)),
+                    loginButtonVisibility != LoginButtonVisibility.Hidden ? /*#__PURE__*/ jsxRuntime.jsxs(jsxRuntime.Fragment, {
                         children: [
-                            /*#__PURE__*/ jsxRuntime.jsx(LoginAccountButton, {
-                                className: extractClassName('login', mergedClassnames)
+                            /*#__PURE__*/ jsxRuntime.jsxs("span", {
+                                className: "flex items-center align-middle [&>*:only-child]:hidden",
+                                children: [
+                                    /*#__PURE__*/ jsxRuntime.jsx(AccountButton, {
+                                        classNames: mergedItemClassnames
+                                    }),
+                                    /*#__PURE__*/ jsxRuntime.jsx(core$1.Divider, {
+                                        size: "md",
+                                        classNames: {
+                                            root: extractClassName('divider', mergedClassnames)
+                                        },
+                                        orientation: "vertical"
+                                    })
+                                ]
                             }),
-                            /*#__PURE__*/ jsxRuntime.jsx(core$1.Divider, {
-                                size: "md",
-                                classNames: {
-                                    root: extractClassName('divider', mergedClassnames)
-                                },
-                                orientation: "vertical"
+                            /*#__PURE__*/ jsxRuntime.jsx(LoginButton, {
+                                visibility: loginButtonVisibility,
+                                externalLoginUrl: externalLoginUrl,
+                                classNames: mergedItemClassnames
                             })
                         ]
-                    }) : null,
-                    loginButtonVisibility != LoginButtonVisibility.Hidden ? /*#__PURE__*/ jsxRuntime.jsx("div", {
-                        className: "flex items-center",
-                        children: /*#__PURE__*/ jsxRuntime.jsx(LoginButton, {
-                            visibility: loginButtonVisibility,
-                            externalLoginUrl: externalLoginUrl,
-                            className: extractClassName('login', mergedClassnames)
-                        })
                     }) : null
                 ]
             })
@@ -3538,7 +3576,7 @@ const HorizontalNavigationBar = ({ actions, items, logo = undefined, loginIcon =
             /*#__PURE__*/ jsxRuntime.jsxs("div", {
                 className: "flex items-center align-middle mr-3",
                 children: [
-                    actions.loginButtonVisibility === LoginButtonVisibility.Visible ? /*#__PURE__*/ jsxRuntime.jsx(LoginButton, {
+                    actions.loginButtonVisibility === LoginButtonVisibility.Visible ? /*#__PURE__*/ jsxRuntime.jsx(LoginButton$1, {
                         icon: loginIcon,
                         hideText: true,
                         className: `${extractClassName('login', mergedClassnames)}`,
@@ -20864,7 +20902,7 @@ exports.Header = Header;
 exports.HoverLink = HoverLink;
 exports.LandingPage = LandingPage;
 exports.LandingPageGetStaticProps = LandingPageGetStaticProps;
-exports.LoginButton = LoginButton;
+exports.LoginButton = LoginButton$1;
 exports.LoginPage = LoginPage;
 exports.LoginPageGetServerSideProps = LoginPageGetServerSideProps;
 exports.LoginPanel = LoginPanel;