@servicetitan/navigation 10.6.1 → 11.0.0-canary.237.0ce6038.0

package/src/components/left-navigation/side-navigation-links-internal.tsx

@@ -3,7 +3,7 @@ import SvgGroupCollapse from '@servicetitan/anvil2/assets/icons/material/round/e
 import SvgGroupExpand from '@servicetitan/anvil2/assets/icons/material/round/expand_more.svg';
 
 import classNames from 'classnames';
-import { FC, Fragment } from 'react';
+import { FC, Fragment, MouseEvent } from 'react';
 import { NavigationItemData } from '../../utils/navigation';
 import { BadgeTag, BadgeTagProps } from '../badge-tag';
 import { SideNavigationTriggerProps } from './interface';
@@ -14,6 +14,7 @@ export interface InternalSideNavigationItemContentProps
     extends Omit<NavigationItemData, 'iconName' | 'to' | 'counter' | 'tag'> {
     submenuExpanded: boolean | undefined;
     tag: BadgeTagProps | undefined;
+    onExpandToggle?: (e: MouseEvent<never>) => void;
 }
 
 export const InternalSideNavigationItemContent: FC<InternalSideNavigationItemContentProps> = ({
@@ -24,6 +25,7 @@ export const InternalSideNavigationItemContent: FC<InternalSideNavigationItemCon
     tag,
     title,
     submenuExpanded,
+    onExpandToggle,
 }) => (
     <Fragment>
         <div className={Styles.navigationItemIconWrapper}>
@@ -65,10 +67,17 @@ export const InternalSideNavigationItemContent: FC<InternalSideNavigationItemCon
                 />
             )}
             {typeof submenuExpanded === 'boolean' && (
-                <Icon
-                    svg={submenuExpanded ? SvgGroupCollapse : SvgGroupExpand}
-                    className={Styles.navigationItemGroupToggle}
-                />
+                <div className={Styles.navigationItemGroupToggleWrapper}>
+                    <Icon
+                        svg={submenuExpanded ? SvgGroupCollapse : SvgGroupExpand}
+                        className={Styles.navigationItemGroupToggle}
+                        onClick={onExpandToggle}
+                    />
+                    <div
+                        className={Styles.navigationItemGroupToggleClick}
+                        onClick={onExpandToggle}
+                    />
+                </div>
             )}
         </div>
 
@@ -89,6 +98,7 @@ export interface InternalSideNavigationLinkProps
     submenuExpanded: boolean | undefined;
     dataPrefix?: string;
     tag: BadgeTagProps | undefined;
+    onExpandToggle?: (e: MouseEvent<never>) => void;
 }
 
 export const internalNavigationContentContainerProps = ({
@@ -116,6 +126,7 @@ export const InternalSideNavigationLink: FC<InternalSideNavigationLinkProps> = (
     isActive,
     navigationComponent: NavigationComponent,
     submenuExpanded,
+    onExpandToggle,
     ...props
 }) => {
     return (
@@ -130,7 +141,11 @@ export const InternalSideNavigationLink: FC<InternalSideNavigationLinkProps> = (
             isActive={typeof isActive === 'function' ? isActive : undefined}
             activeClassName={Styles.navigationItemActive}
         >
-            <InternalSideNavigationItemContent submenuExpanded={submenuExpanded} {...props} />
+            <InternalSideNavigationItemContent
+                submenuExpanded={submenuExpanded}
+                onExpandToggle={onExpandToggle}
+                {...props}
+            />
         </NavigationComponent>
     );
 };

package/src/components/left-navigation/side-navigation-links.tsx

@@ -11,7 +11,7 @@ import {
 } from './side-navigation-links-internal';
 
 const WrappedLink: FC<{
-    children: ReactElement;
+    children: ReactElement<any>;
     wrapper: NonNullable<SideNavigationLinkProps['wrapper']>;
 }> = ({ children, wrapper: WrapperComponent }) => {
     return (

package/src/components/left-navigation/side-navigation.module.less

@@ -246,9 +246,24 @@
         min-height: 12px !important;
     }
 
-    .navigation-item-group-toggle[data-anv][data-anv] {
-        color: inherit;
-        font-weight: @font-weight-semibold;
+    .navigation-item-group-toggle-wrapper {
+        position: relative;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+
+        .navigation-item-group-toggle[data-anv][data-anv] {
+            color: inherit;
+            font-weight: @font-weight-semibold;
+        }
+
+        .navigation-item-group-toggle-click {
+            position: absolute;
+            left: -@spacing-2;
+            right: -@spacing-half;
+            top: -@spacing-1;
+            bottom: -@spacing-1;
+        }
     }
 
     .navigation-icon[data-anv][data-anv] {
@@ -266,24 +281,11 @@
 .navigation-group-wrapper {
     .navigation-group-item {
         position: relative;
-
-        .navigation-group-item-collapse {
-            display: none;
-            position: absolute;
-            inset: 0;
-            cursor: pointer;
-        }
     }
 
-    &:has(.navigation-item-active) {
-        .navigation-group-item-collapse {
-            display: block;
-        }
-
-        .submenu-wrapper:not(.submenu-wrapper-collapsed) {
-            max-height: 2000px;
-            transition: max-height 0.7s ease-in-out;
-        }
+    .submenu-wrapper:not(.submenu-wrapper-collapsed) {
+        max-height: 2000px;
+        transition: max-height 0.7s ease-in-out;
     }
 }
 

package/src/components/left-navigation/side-navigation.module.less.d.ts

@@ -1,7 +1,6 @@
 export const __esModule: true;
 export const divider: string;
 export const navigationGroupItem: string;
-export const navigationGroupItemCollapse: string;
 export const navigationGroupWrapper: string;
 export const navigationIcon: string;
 export const navigationIconActive: string;
@@ -11,6 +10,8 @@ export const navigationItemActive: string;
 export const navigationItemCounter: string;
 export const navigationItemCounterLong: string;
 export const navigationItemGroupToggle: string;
+export const navigationItemGroupToggleClick: string;
+export const navigationItemGroupToggleWrapper: string;
 export const navigationItemIconSwitch: string;
 export const navigationItemIconWrapper: string;
 export const navigationItemTextCollapsed: string;

package/src/components/left-navigation/side-navigation.tsx

@@ -371,13 +371,20 @@ const SideNavigationGroupItem: FC<
             onExpandedChange: undefined | ((expanded: SideNavigationExpandedState) => void);
         }
 > = ({ onExpandedChange, isGroupActive, ...props }) => {
-    const isSubmenuExpanded = !!props.id && isGroupActive && props.expanded?.collapsed !== props.id;
-    const triggerClick = useCallback(() => {
-        onExpandedChange?.({
-            bar: !!props.expanded?.bar,
-            collapsed: props.expanded?.collapsed === props.id ? undefined : props.id,
-        });
-    }, [props.id, props.expanded, onExpandedChange]);
+    const isSubmenuExpanded = !!props.id && props.expanded?.expandedSubmenu === props.id;
+    const onExpandToggle = useCallback(
+        (e: MouseEvent<never>) => {
+            e.preventDefault();
+            e.stopPropagation();
+
+            onExpandedChange?.({
+                bar: true,
+                expandedSubmenu: isSubmenuExpanded ? undefined : props.id,
+            });
+        },
+        [props.id, isSubmenuExpanded, onExpandedChange]
+    );
+
     const tag = getSubmenuGroupTag(props.submenu, getCounterTag(props.counter, props.tag));
     const context = useContext(SideNavigationContext);
 
@@ -387,9 +394,9 @@ const SideNavigationGroupItem: FC<
                 <InternalSideNavigationLink
                     {...props}
                     submenuExpanded={isSubmenuExpanded}
+                    onExpandToggle={onExpandToggle}
                     tag={tag}
                 />
-                <div className={Styles.navigationGroupItemCollapse} onClick={triggerClick} />
             </div>
             <div
                 className={classNames(Styles.submenuWrapper, {

package/src/components/links.tsx

@@ -1,5 +1,4 @@
-import { FC, useContext } from 'react';
-import { NavigationLegacyContext } from '../utils/navigation-context';
+import { FC } from 'react';
 import {
     HeaderNavigationLinkProps,
     HeaderNavigationTriggerProps,
@@ -8,27 +7,48 @@ import {
     HeaderNavigationLink as HeaderNavigationLinkLegacy,
     HeaderNavigationTrigger as HeaderNavigationTriggerLegacy,
 } from './header-navigation/header-navigation-links';
+import { useTitanLayoutPlacementContext } from './titan-layout';
 import {
-    HeaderNavigationLink as HeaderNavigationLinkModern,
-    HeaderNavigationTrigger as HeaderNavigationTriggerModern,
-} from './left-navigation/header-navigation-tiny-links';
+    LayoutHeaderNavigationLink,
+    LayoutHeaderNavigationTrigger,
+} from './titan-layout/layout-header-links';
+import {
+    TitanLayoutSidebarLink,
+    TitanLayoutSidebarTrigger,
+} from './titan-layout/layout-sidebar-links';
 
 export const HeaderNavigationLink: FC<HeaderNavigationLinkProps> = props => {
-    const isLegacy = useContext(NavigationLegacyContext);
+    const placement = useTitanLayoutPlacementContext();
 
-    return isLegacy ? (
-        <HeaderNavigationLinkLegacy {...props} />
+    return placement === 'top' ? (
+        <LayoutHeaderNavigationLink {...props} />
+    ) : placement === 'side' ? (
+        <TitanLayoutSidebarLink
+            id={props.id}
+            icon={props.icon}
+            iconActive={props.iconActive}
+            to={props.to}
+            title={props.title}
+            counter={props.counter}
+        />
     ) : (
-        <HeaderNavigationLinkModern {...props} />
+        <HeaderNavigationLinkLegacy {...props} />
     );
 };
 
 export const HeaderNavigationTrigger: FC<HeaderNavigationTriggerProps> = props => {
-    const isLegacy = useContext(NavigationLegacyContext);
+    const placement = useTitanLayoutPlacementContext();
 
-    return isLegacy ? (
-        <HeaderNavigationTriggerLegacy {...props} />
+    return placement === 'top' ? (
+        <LayoutHeaderNavigationTrigger {...props} />
+    ) : placement === 'side' ? (
+        <TitanLayoutSidebarTrigger
+            id={props.id}
+            title={props.title}
+            icon={props.icon}
+            iconActive={props.iconActive}
+        />
     ) : (
-        <HeaderNavigationTriggerModern {...props} />
+        <HeaderNavigationTriggerLegacy {...props} />
     );
 };

package/src/components/logo/logo-company-title.tsx

@@ -1,15 +1,17 @@
 import { FC } from 'react';
 
 /* tslint:disable: max-line-length */
-export const LogoCompanyTitle: FC<{ className?: string; fill?: string; size?: string }> = ({
-    className,
-    fill = 'currentColor',
-    size = '162',
-}) => {
+export const LogoCompanyTitle: FC<{
+    className?: string;
+    fill?: string;
+    size?: string;
+    height?: string | number;
+}> = ({ className, fill = 'currentColor', size = '162', height }) => {
     return (
         <svg
             className={className}
-            width={size}
+            width={height ? undefined : size}
+            height={height}
             viewBox="0 0 322 80"
             xmlns="http://www.w3.org/2000/svg"
         >

package/src/components/profile-dropdown/profile-dropdown.module.less

@@ -105,6 +105,10 @@
         position: relative;
     }
 
+    .dropdown-content-wrapper > span {
+        display: block !important;
+    }
+
     .dropdown-content-bottom-left {
         .dropdown-content-wrapper::before {
             content: '';

package/src/components/profile-dropdown/profile-dropdown.stories.tsx

@@ -21,9 +21,9 @@ export const ProfileDropdownDefault = () => (
         <ProfileDropdown.Link id="first" to="https://google.com">
             first link
         </ProfileDropdown.Link>
-        <ProfileDropdown.Link id="second" onClick={() => alert('second click')}>
+        <ProfileDropdown.Section id="second" onClick={() => alert('second click')}>
             second link
-        </ProfileDropdown.Link>
+        </ProfileDropdown.Section>
         <ProfileDropdown.Divider />
         <ProfileDropdown.Section id="content">some content</ProfileDropdown.Section>
         <ProfileDropdown.Divider />
@@ -45,9 +45,9 @@ export const ProfileDropdownWithLogo = () => (
         <ProfileDropdown.Link id="first" to="https://google.com">
             first link
         </ProfileDropdown.Link>
-        <ProfileDropdown.Link id="second" onClick={() => alert('second click')}>
+        <ProfileDropdown.Section id="second" onClick={() => alert('second click')}>
             second link
-        </ProfileDropdown.Link>
+        </ProfileDropdown.Section>
     </ProfileDropdown>
 );
 

package/src/components/profile-dropdown/profile-dropdown.tsx

@@ -25,6 +25,7 @@ import {
 } from '../../utils/navigation-context';
 import { getCounterTag } from '../../utils/side-nav';
 import { CounterTag } from '../counter-tag';
+import { withTooltip } from '../titan-layout/with-tooltip';
 import * as Styles from './profile-dropdown.module.less';
 import { ProfileLogo } from './profile-icon';
 
@@ -149,11 +150,12 @@ const ProfileDropdownTrigger: FC<ProfileDropdownTriggerProps> = ({
 export interface ProfileDropdownSectionPropsStrict {
     children: ReactNode;
     id: string;
+    tooltip?: string;
     className?: string;
     onClick?(e: MouseEvent): void;
 }
 
-interface ProfileDropdownSectionProps extends ProfileDropdownSectionPropsStrict {
+export interface ProfileDropdownSectionProps extends ProfileDropdownSectionPropsStrict {
     [key: string]: any;
 }
 
@@ -161,6 +163,7 @@ export const ProfileDropdownSection: FC<ProfileDropdownSectionProps> = ({
     children,
     className,
     id,
+    tooltip,
     onClick,
     ...rest
 }) => {
@@ -172,16 +175,20 @@ export const ProfileDropdownSection: FC<ProfileDropdownSectionProps> = ({
         }
     };
 
-    return (
+    return withTooltip(
         <div
-            className={classNames(Styles.dropdownSection, className)}
+            className={classNames(Styles.dropdownSection, className, {
+                'cursor-pointer': !!onClick,
+            })}
             onClick={clickHandler}
             data-cy={`profile-dropdown-section-${id}`}
             data-pendo={`profile-dropdown-section-${id}`}
             {...rest}
         >
             {children}
-        </div>
+        </div>,
+        tooltip,
+        'left'
     );
 };
 
@@ -193,10 +200,10 @@ export interface ProfileDropdownLinkPropsStrict {
     className?: string;
     external?: boolean;
     target?: HTMLAttributeAnchorTarget;
-    to?: string;
+    tooltip?: string;
+    to: string;
     tag?: CounterTagData;
     counter?: CounterTagValue;
-    onClick?: () => void;
 }
 
 export interface ProfileDropdownLinkProps extends ProfileDropdownLinkPropsStrict {
@@ -212,16 +219,12 @@ export const ProfileDropdownLink: FC<ProfileDropdownLinkProps> = ({
     tag,
     target,
     to,
+    tooltip,
     onClick,
     ...rest
 }: ProfileDropdownLinkProps) => {
     const NavigationComponent = useContext(NavigationComponentContext);
 
-    const clickHandler = (e: MouseEvent<any>) => {
-        e.preventDefault();
-        onClick?.();
-    };
-
     const isExternalLink = external ?? to?.startsWith('http');
 
     const tagElement = useMemo(
@@ -229,41 +232,34 @@ export const ProfileDropdownLink: FC<ProfileDropdownLinkProps> = ({
         [counter, tag]
     );
 
-    return isExternalLink ? (
-        <a
-            className={classNames(Styles.dropdownSection, Styles.dropdownLink, className)}
-            href={to}
-            target={target}
-            data-cy={`profile-dropdown-link-${id}`}
-            data-pendo={`profile-dropdown-link-${id}`}
-            {...rest}
-        >
-            {children}
-            {tagElement}
-        </a>
-    ) : to ? (
-        <NavigationComponent
-            className={classNames(Styles.dropdownSection, Styles.dropdownLink, className)}
-            target={target}
-            to={to}
-            data-cy={`profile-dropdown-link-${id}`}
-            data-pendo={`profile-dropdown-link-${id}`}
-            {...rest}
-        >
-            {children}
-            {tagElement}
-        </NavigationComponent>
-    ) : (
-        <a
-            className={classNames(Styles.dropdownSection, Styles.dropdownLink, className)}
-            onClick={clickHandler}
-            data-cy={`profile-dropdown-link-${id}`}
-            data-pendo={`profile-dropdown-link-${id}`}
-            {...rest}
-        >
-            {children}
-            {tagElement}
-        </a>
+    return withTooltip(
+        isExternalLink ? (
+            <a
+                className={classNames(Styles.dropdownSection, Styles.dropdownLink, className)}
+                href={to}
+                target={target}
+                data-cy={`profile-dropdown-link-${id}`}
+                data-pendo={`profile-dropdown-link-${id}`}
+                {...rest}
+            >
+                {children}
+                {tagElement}
+            </a>
+        ) : (
+            <NavigationComponent
+                className={classNames(Styles.dropdownSection, Styles.dropdownLink, className)}
+                target={target}
+                to={to}
+                data-cy={`profile-dropdown-link-${id}`}
+                data-pendo={`profile-dropdown-link-${id}`}
+                {...rest}
+            >
+                {children}
+                {tagElement}
+            </NavigationComponent>
+        ),
+        tooltip,
+        'left'
     );
 };
 
@@ -291,6 +287,7 @@ export interface ProfileDropdownProps extends ProfileDropdownPropsStrict {
 export interface ProfileDropdownType extends FC<ProfileDropdownProps> {
     Divider: typeof ProfileDropdownDivider;
     Link: typeof ProfileDropdownLink;
+    Trigger: typeof ProfileDropdownTrigger;
     Section: typeof ProfileDropdownSection;
 }
 

package/src/components/titan-layout/index.ts

@@ -0,0 +1,5 @@
+export * from './titan-layout';
+export * from './layout-profile';
+export * from './layout-context';
+export * from './layout-logo';
+export * from './interface';

package/src/components/titan-layout/interface-internal.ts

@@ -0,0 +1,6 @@
+import { FC } from 'react';
+import { NavLinkComponentProps } from '../../utils/navigation-context';
+
+export interface NavigationComponentProps {
+    navigationComponent: FC<NavLinkComponentProps>;
+}

package/src/components/titan-layout/interface.ts

@@ -0,0 +1,26 @@
+import { FC, ReactElement } from 'react';
+import { NavigationItemData } from '../../utils/navigation';
+import { TitanLayoutSidebarContextType } from './layout-context';
+
+export interface TitanLayoutSidebarLinkWrapperProps {
+    children:
+        | ReactElement<TitanLayoutSidebarLinkProps>
+        | ReactElement<TitanLayoutSidebarTriggerProps>;
+    context: TitanLayoutSidebarContextType;
+}
+
+export interface TitanLayoutSidebarLinkProps extends Omit<NavigationItemData, 'submenu'> {
+    wrapper?: FC<TitanLayoutSidebarLinkWrapperProps>;
+}
+export interface TitanLayoutSidebarTriggerProps
+    extends Omit<TitanLayoutSidebarLinkProps, 'to' | 'isActive'> {
+    isActive?: boolean;
+    wrapper?: FC<TitanLayoutSidebarLinkWrapperProps>;
+    onClick?: () => void;
+    onMobileClick?: () => void;
+}
+
+export interface TitanLayoutState {
+    navCollapsed: boolean;
+    submenuExpanded?: string;
+}

package/src/components/titan-layout/layout-context.tsx

@@ -0,0 +1,30 @@
+import { CSSProperties, FC, createContext, useContext } from 'react';
+import { DefaultNavLinkComponent, NavLinkComponentProps } from '../../utils/navigation-context';
+import { TitanBreakpoint } from '../../utils/use-breakpoint';
+
+export interface TitanLayoutSidebarContextType {
+    styles: {
+        popoverContent: CSSProperties;
+    };
+}
+
+export type TitanLayoutPlacement = 'top' | 'side' | 'unset';
+
+export interface TitanLayoutContextType {
+    NavigationComponent: FC<NavLinkComponentProps>;
+    breakpoint: TitanBreakpoint;
+    isTitanLayout: boolean;
+    sidebar: TitanLayoutSidebarContextType;
+}
+
+export const LayoutContext = createContext<TitanLayoutContextType>({
+    NavigationComponent: DefaultNavLinkComponent,
+    breakpoint: { name: 'lg', isMobile: false },
+    isTitanLayout: false,
+    sidebar: { styles: { popoverContent: {} } },
+});
+
+export const useTitanLayoutContext = () => useContext(LayoutContext);
+
+export const LayoutPlacementContext = createContext<TitanLayoutPlacement | undefined>(undefined);
+export const useTitanLayoutPlacementContext = () => useContext(LayoutPlacementContext);