@servicetitan/navigation 11.0.0-canary.237.fef17f5.0 → 11.0.0

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

@@ -123,6 +123,11 @@
 
     .dropdown-section {
         padding: @spacing-1 @spacing-2;
+        position: relative;
+
+        &.dropdown-section-with-counter {
+            padding-right: @spacing-3;
+        }
     }
 
     .dropdown-link {
@@ -136,13 +141,22 @@
         }
     }
 
-    .counter {
-        color: @color-white;
-        font-size: @typescale-0;
-        font-weight: @font-weight-semibold;
+    .counter-wrapper {
         position: absolute;
-        top: @spacing-half;
-        margin-left: @spacing-half;
+        top: 0;
+        bottom: 0;
+        right: @spacing-1;
+
+        display: flex;
+        align-items: center;
+
+        .counter {
+            color: @color-white;
+            font-size: @typescale-0;
+            font-weight: @font-weight-semibold;
+            min-width: 12px !important;
+            min-height: 12px !important;
+        }
     }
 }
 

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

@@ -4,12 +4,14 @@ export const badge: string;
 export const badgeNoContent: string;
 export const badgeWithContent: string;
 export const counter: string;
+export const counterWrapper: string;
 export const dropdown: string;
 export const dropdownContent: string;
 export const dropdownContentBottomLeft: string;
 export const dropdownContentWrapper: string;
 export const dropdownLink: string;
 export const dropdownSection: string;
+export const dropdownSectionWithCounter: string;
 export const expandIcon: string;
 export const hint: string;
 export const hintContent: string;

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

@@ -6,6 +6,7 @@ import SvgAccountInactive from '@servicetitan/anvil2/assets/icons/st/gnav_accoun
 import { BodyText, Popover, PopoverPropsStrict } from '@servicetitan/design-system';
 import classNames from 'classnames';
 import {
+    ComponentPropsWithoutRef,
     FC,
     HTMLAttributeAnchorTarget,
     MouseEvent,
@@ -147,22 +148,42 @@ const ProfileDropdownTrigger: FC<ProfileDropdownTriggerProps> = ({
     );
 };
 
+const useTag = (counter?: CounterTagValue, tag?: CounterTagData) =>
+    useMemo(() => {
+        const data = getCounterTag(counter, tag);
+
+        return data ? (
+            <div className={Styles.counterWrapper}>
+                <CounterTag className={Styles.counter} data={data} />
+            </div>
+        ) : undefined;
+    }, [counter, tag]);
+
+export type ProfileItemContent =
+    | { children: string; text?: string }
+    | { children: ReactNode; text: string };
+
 export interface ProfileDropdownSectionPropsStrict {
     children: ReactNode;
     id: string;
     tooltip?: string;
     className?: string;
+    tag?: CounterTagData;
+    counter?: CounterTagValue;
     onClick?(e: MouseEvent): void;
 }
 
-export interface ProfileDropdownSectionProps extends ProfileDropdownSectionPropsStrict {
-    [key: string]: any;
-}
+export type ProfileDropdownSectionProps = Omit<ComponentPropsWithoutRef<'div'>, 'children'> &
+    ProfileDropdownSectionPropsStrict &
+    ProfileItemContent;
 
 export const ProfileDropdownSection: FC<ProfileDropdownSectionProps> = ({
     children,
     className,
+    counter,
     id,
+    tag,
+    text,
     tooltip,
     onClick,
     ...rest
@@ -175,17 +196,23 @@ export const ProfileDropdownSection: FC<ProfileDropdownSectionProps> = ({
         }
     };
 
+    const tagElement = useTag(counter, tag);
+
     return withTooltip(
         <div
-            className={classNames(Styles.dropdownSection, className, {
-                'cursor-pointer': !!onClick,
-            })}
+            className={classNames(
+                Styles.dropdownSection,
+                tagElement && Styles.dropdownSectionWithCounter,
+                !!onClick && Styles.dropdownLink,
+                className
+            )}
             onClick={clickHandler}
             data-cy={`profile-dropdown-section-${id}`}
             data-pendo={`profile-dropdown-section-${id}`}
             {...rest}
         >
             {children}
+            {tagElement}
         </div>,
         tooltip,
         'left'
@@ -206,9 +233,9 @@ export interface ProfileDropdownLinkPropsStrict {
     counter?: CounterTagValue;
 }
 
-export interface ProfileDropdownLinkProps extends ProfileDropdownLinkPropsStrict {
-    [key: string]: any;
-}
+export type ProfileDropdownLinkProps = Omit<ComponentPropsWithoutRef<'a'>, 'children'> &
+    ProfileDropdownLinkPropsStrict &
+    ProfileItemContent;
 
 export const ProfileDropdownLink: FC<ProfileDropdownLinkProps> = ({
     children,
@@ -218,6 +245,7 @@ export const ProfileDropdownLink: FC<ProfileDropdownLinkProps> = ({
     counter,
     tag,
     target,
+    text,
     to,
     tooltip,
     onClick,
@@ -227,15 +255,17 @@ export const ProfileDropdownLink: FC<ProfileDropdownLinkProps> = ({
 
     const isExternalLink = external ?? to?.startsWith('http');
 
-    const tagElement = useMemo(
-        () => <CounterTag data={getCounterTag(counter, tag)} className={Styles.counter} />,
-        [counter, tag]
-    );
+    const tagElement = useTag(counter, tag);
 
     return withTooltip(
         isExternalLink ? (
             <a
-                className={classNames(Styles.dropdownSection, Styles.dropdownLink, className)}
+                className={classNames(
+                    Styles.dropdownSection,
+                    tagElement && Styles.dropdownSectionWithCounter,
+                    Styles.dropdownLink,
+                    className
+                )}
                 href={to}
                 target={target}
                 data-cy={`profile-dropdown-link-${id}`}
@@ -247,7 +277,12 @@ export const ProfileDropdownLink: FC<ProfileDropdownLinkProps> = ({
             </a>
         ) : (
             <NavigationComponent
-                className={classNames(Styles.dropdownSection, Styles.dropdownLink, className)}
+                className={classNames(
+                    Styles.dropdownSection,
+                    Styles.dropdownLink,
+                    { [Styles.dropdownSectionWithCounter]: !!tagElement },
+                    className
+                )}
                 target={target}
                 to={to}
                 data-cy={`profile-dropdown-link-${id}`}

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

@@ -19,7 +19,7 @@ export interface TitanLayoutContextType {
 
 export const LayoutContext = createContext<TitanLayoutContextType>({
     NavigationComponent: DefaultNavLinkComponent,
-    breakpoint: { name: 'lg', isMobile: false },
+    breakpoint: { name: 'lg', isMobile: false, width: 0 },
     isTitanLayout: false,
     sidebar: { styles: { popoverContent: {} } },
 });

package/src/components/titan-layout/layout-header-links.tsx

@@ -134,7 +134,8 @@ export const LayoutHeaderNavigationTrigger: FC<HeaderNavigationTriggerProps> = (
         >
             <HeaderNavigationItemContent
                 tag={getCounterTag(counter, tag)}
-                icon={isActive && iconActive ? iconActive : icon}
+                icon={icon}
+                iconActive={iconActive}
                 label={label}
                 labelClassName={labelClassName}
             />

package/src/components/titan-layout/layout-header.module.less

@@ -4,12 +4,14 @@
 @size-links-tiny: 24px;
 
 .header {
+    --nav-top-content-height: 32px;
     display: flex;
     justify-content: space-between;
 
     background-color: @color-white;
     color: @color-black;
-    border-bottom: 1px solid @color-neutral-60;
+    box-sizing: border-box;
+    outline: 1px solid @color-neutral-60;
 
     & > * {
         overflow-y: hidden;
@@ -20,6 +22,10 @@
         align-items: center;
     }
 
+    .he-top-center {
+        overflow: hidden;
+    }
+
     .he-top-right {
         & > * {
             color: @color-black;
@@ -57,7 +63,7 @@
         }
 
         &.navigation-item-icon-state.navigation-item-active {
-            .navigation-icon:not(.navigation-icon-active) {
+            .navigation-icon[data-anv][data-anv]:not(.navigation-icon-active) {
                 display: none;
             }
 
@@ -84,28 +90,59 @@
     }
 }
 
+.header-mobile {
+    padding: @spacing-2 @spacing-0;
+    height: var(--nav-offset-top);
+
+    --nav-top-content-height: 40px;
+
+    .navigation-link {
+        padding: 10px;
+    }
+
+    .he-top-center {
+        max-width: unset;
+        flex: 1;
+        margin-left: @spacing-3;
+        margin-right: @spacing-3;
+    }
+
+    .he-top-left {
+        margin-left: @spacing-half;
+    }
+
+    .he-top-right {
+        margin-right: @spacing-half;
+    }
+}
+
 // desktop
-@media only screen and (min-width: 768px) {
-    .header {
-        .navigation-link {
-            margin: 6px 2px;
-            padding: 6px 6px;
-        }
+.header-desktop {
+    height: var(--nav-offset-top);
+    .navigation-link {
+        margin: 6px 2px;
+        padding: 6px 6px;
 
-        .he-top-left {
-            padding-left: @spacing-1;
-        }
-        .he-top-center {
-            flex: 1;
-            margin-left: @spacing-2;
-            margin-right: @spacing-2;
-            max-width: 400px;
+        .navigation-item-counter {
+            min-width: 12px !important;
+            height: 12px !important;
         }
     }
+
+    .he-top-left {
+        padding-left: @spacing-1;
+    }
+    .he-top-center {
+        flex: 1;
+        margin-left: @spacing-2;
+        margin-right: @spacing-2;
+        max-width: 400px;
+    }
 }
+
 // desktop wide
 @media only screen and (min-width: 1200px) {
-    .header {
+    .header-desktop {
         display: grid;
         grid-template-columns: repeat(3, 1fr);
         grid-template-rows: 48px;
@@ -122,21 +159,6 @@
     }
 }
 
-// mobile
-@media only screen and (max-width: 768px) {
-    .header {
-        display: grid;
-        grid-template-columns: repeat(3, 1fr);
-        grid-template-rows: 44px;
-
-        padding: @spacing-1 @spacing-half;
-
-        .navigation-link {
-            padding: 10px;
-        }
-    }
-}
-
 .navigation-link {
     // styles specific to extra nav links
     color: @color-black;
@@ -150,7 +172,8 @@
         color: @color-white;
         font-weight: @font-weight-semibold;
         font-size: 8px !important;
-        min-width: 12px;
+        min-width: 16px !important;
+        height: 16px !important;
         position: absolute;
         top: 4px;
         right: -2px;

package/src/components/titan-layout/layout-header.module.less.d.ts

@@ -4,6 +4,8 @@ export const heTopLeft: string;
 export const heTopRight: string;
 export const heTopRightText: string;
 export const header: string;
+export const headerDesktop: string;
+export const headerMobile: string;
 export const navigationIcon: string;
 export const navigationIconActive: string;
 export const navigationItemActive: string;

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

@@ -1,7 +1,7 @@
 import SvgBurgerMenu from '@servicetitan/anvil2/assets/icons/material/round/menu.svg';
 import classNames from 'classnames';
 import { ComponentPropsWithoutRef, FC, ReactElement, ReactNode } from 'react';
-import { LayoutPlacementContext, useTitanLayoutContext } from './layout-context';
+import { LayoutPlacementContext } from './layout-context';
 import { LayoutHeaderNavigationTrigger } from './layout-header-links';
 import * as Styles from './layout-header.module.less';
 import { TitanLayoutLogoProps } from './layout-logo';
@@ -25,6 +25,8 @@ export type LayoutHeaderProps = Omit<ComponentPropsWithoutRef<'div'>, 'children'
     logo: ReactElement<TitanLayoutLogoProps>;
     profile?: ReactElement;
 
+    isMobile: boolean;
+    hasNotifications: boolean;
     onBurgerClick?: (e: MouseEvent) => void;
 };
 
@@ -35,22 +37,26 @@ export const LayoutHeader: FC<LayoutHeaderProps> = ({
     rightClassName,
     center,
     centerClassName,
+    isMobile,
+    hasNotifications,
     logo,
     profile,
     onBurgerClick,
     ...rest
 }) => {
-    const { breakpoint } = useTitanLayoutContext();
-
     return (
         <LayoutPlacementContext.Provider value="top">
             <div
-                className={classNames(Styles.header, className)}
+                className={classNames(
+                    Styles.header,
+                    isMobile ? Styles.headerMobile : Styles.headerDesktop,
+                    className
+                )}
                 {...rest}
                 data-cy="header-navigation"
             >
                 <div className={classNames(Styles.heTopLeft)} data-cy="navigation-left">
-                    {breakpoint.isMobile && (
+                    {isMobile && (
                         <LayoutHeaderNavigationTrigger
                             id="burger"
                             title=""
@@ -58,6 +64,7 @@ export const LayoutHeader: FC<LayoutHeaderProps> = ({
                             iconActive={SvgBurgerMenu}
                             className="m-r-1"
                             onClick={onBurgerClick}
+                            tag={{ value: hasNotifications }}
                         />
                     )}
                     {logo}

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

@@ -33,20 +33,27 @@ export const TitanLayoutLogo: FC<TitanLayoutLogoProps> = ({
     const Wrapper = logoWrapper;
     const logoSize = isMobile ? 44 : 56;
     const logoCompanySize = 48;
+    const showCompanyTitle = title === true && !isMobile;
 
     return (
-        <div className={classNames('d-f align-items-center', className)}>
-            {typeof title === 'string' ? (
+        <div
+            className={classNames(
+                'd-f align-items-center',
+                { 'p-t-half': showCompanyTitle },
+                className
+            )}
+        >
+            {showCompanyTitle ? (
+                <Wrapper>
+                    <LogoCompanyTitle height={logoCompanySize} />
+                </Wrapper>
+            ) : typeof title === 'string' ? (
                 <Fragment>
                     <LogoTitan size={logoSize} mantleFill={mantleFill} logoWrapper={Wrapper} />
                     {!isMobile && (
                         <LogoTitanTitle className="c-inherit m-l-1">{title}</LogoTitanTitle>
                     )}
                 </Fragment>
-            ) : title === true && !isMobile ? (
-                <Wrapper className="">
-                    <LogoCompanyTitle height={logoCompanySize} />
-                </Wrapper>
             ) : (
                 <LogoTitan size={logoSize} mantleFill={mantleFill} logoWrapper={Wrapper} />
             )}

package/src/components/titan-layout/layout-profile.stories.tsx

@@ -18,7 +18,7 @@ export default {
 
 export const ProfileDefault = withTitanLayout(
     <ProfileDropdown>
-        <ProfileDropdown.Link id="first" to="https://google.com">
+        <ProfileDropdown.Link id="first" to="https://google.com" external>
             first link
         </ProfileDropdown.Link>
         <ProfileDropdown.Section id="second" onClick={() => alert('second click')}>
@@ -33,5 +33,14 @@ export const ProfileDefault = withTitanLayout(
             third link
         </ProfileDropdown.Link>
         <ProfileDropdown.Divider />
+        <ProfileDropdown.Section
+            id="forth"
+            onClick={() => alert('forth click')}
+            text="Sign Out user"
+        >
+            Sign Out
+            <span className="c-neutral-60 m-l-1">user</span>
+        </ProfileDropdown.Section>
+        <ProfileDropdown.Divider />
     </ProfileDropdown>
 );

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

@@ -1,8 +1,8 @@
 import SvgAccountActive from '@servicetitan/anvil2/assets/icons/st/gnav_account_active.svg';
 import SvgAccountInactive from '@servicetitan/anvil2/assets/icons/st/gnav_account_inactive.svg';
 
-import { FC, useState } from 'react';
-import { NavigationComponentContext } from '../../utils/navigation-context';
+import { FC, MouseEvent, useEffect, useState } from 'react';
+import { NavLinkComponentProps, NavigationComponentContext } from '../../utils/navigation-context';
 import {
     ProfileDropdown as DesktopProfileDropdown,
     ProfileDropdownLinkProps,
@@ -17,6 +17,7 @@ import {
     InternalSideNavigationGroupLink,
     InternalSideNavigationGroupTrigger,
 } from './layout-sidebar-links-internal';
+import { useNotificationsContext, useNotificationsState } from './notifications-context';
 
 export type {
     ProfileDropdownProps,
@@ -24,14 +25,28 @@ export type {
     ProfileDropdownLinkProps,
 } from '../profile-dropdown/profile-dropdown';
 
+const ExternalNavComponent: FC<NavLinkComponentProps> = ({
+    children,
+    isActive,
+    to,
+    activeClassName,
+    ...props
+}) => (
+    <a {...props} href={to}>
+        {children}
+    </a>
+);
+
 const ProfileDropdownContent: FC<ProfileDropdownProps> = props => {
-    const { breakpoint, NavigationComponent } = useTitanLayoutContext();
+    const { isTitanLayout, breakpoint, NavigationComponent } = useTitanLayoutContext();
     return breakpoint.isMobile ? (
         <MobileProfileDropdown {...props} navigationComponent={NavigationComponent} />
-    ) : (
+    ) : isTitanLayout ? (
         <NavigationComponentContext.Provider value={NavigationComponent}>
             <DesktopProfileDropdown {...props} />
         </NavigationComponentContext.Provider>
+    ) : (
+        <DesktopProfileDropdown {...props} />
     );
 };
 ProfileDropdownContent.displayName = 'ProfileDropdown';
@@ -40,24 +55,37 @@ const MobileProfileDropdown: FC<ProfileDropdownProps & NavigationComponentProps>
     children,
     ...props
 }) => {
+    const id = '__profile';
     const [expanded, setExpanded] = useState(false);
-    const onExpandToggle = () => setExpanded(!expanded);
+    const { hasNotifications, NotificationsContextProvider } = useNotificationsState();
+    const { onNotificationsUpdate } = useNotificationsContext();
+    const onExpandToggle = (e: MouseEvent<never>) => {
+        e.stopPropagation();
+        setExpanded(!expanded);
+    };
+
+    useEffect(() => {
+        onNotificationsUpdate(id, hasNotifications);
+    }, [hasNotifications, onNotificationsUpdate]);
+
     return (
-        <InternalSideNavigationGroup
-            id="__profile"
-            to={undefined}
-            title="Profile"
-            icon={SvgAccountInactive}
-            iconActive={SvgAccountActive}
-            isActive={expanded}
-            {...props}
-            submenuExpanded={expanded}
-            onExpandToggle={onExpandToggle}
-            onClick={onExpandToggle}
-            tag={undefined}
-        >
-            {children}
-        </InternalSideNavigationGroup>
+        <NotificationsContextProvider>
+            <InternalSideNavigationGroup
+                id={id}
+                to={undefined}
+                title="Profile"
+                icon={SvgAccountInactive}
+                iconActive={SvgAccountActive}
+                isActive={expanded}
+                {...props}
+                submenuExpanded={expanded}
+                onExpandToggle={onExpandToggle}
+                onClick={onExpandToggle}
+                tag={{ value: hasNotifications }}
+            >
+                {children}
+            </InternalSideNavigationGroup>
+        </NotificationsContextProvider>
     );
 };
 
@@ -70,6 +98,25 @@ const ProfileDropdownDivider: FC = () => {
     );
 };
 
+const getText = (children: any, text: any): string | undefined => {
+    if (typeof children === 'string') {
+        return children;
+    }
+
+    if (typeof text === 'string') {
+        return text;
+    }
+
+    return undefined;
+};
+
+const getTag = (
+    tag: ProfileDropdownLinkProps['tag'],
+    counter: ProfileDropdownLinkProps['counter']
+): boolean => {
+    return !!tag?.value || !!counter;
+};
+
 const ProfileDropdownSection: FC<ProfileDropdownSectionProps> = props => {
     const { breakpoint } = useTitanLayoutContext();
     return breakpoint.isMobile ? (
@@ -78,10 +125,19 @@ const ProfileDropdownSection: FC<ProfileDropdownSectionProps> = props => {
         <DesktopProfileDropdown.Section {...props} />
     );
 };
-const MobileProfileDropdownSection: FC<ProfileDropdownSectionProps> = props => {
-    const title = typeof props.children === 'string' ? props.children : undefined;
-    return title ? (
-        <InternalSideNavigationGroupTrigger id={props.id} title={title} onClick={props.onClick} />
+const MobileProfileDropdownSection: FC<ProfileDropdownSectionProps> = ({
+    children,
+    text,
+    tooltip,
+    title,
+    ...props
+}) => {
+    const sectionText = getText(children, text);
+    const { onNotificationsUpdate } = useNotificationsContext();
+    onNotificationsUpdate(props.id, getTag(props.tag, props.counter));
+
+    return sectionText ? (
+        <InternalSideNavigationGroupTrigger {...props} title={sectionText} />
     ) : null;
 };
 
@@ -94,17 +150,25 @@ const ProfileDropdownLink: FC<ProfileDropdownLinkProps> = props => {
     );
 };
 const MobileProfileDropdownLink: FC<ProfileDropdownLinkProps & NavigationComponentProps> = ({
+    external,
     to,
+    tooltip,
+    text,
+    children,
     navigationComponent,
     ...props
 }) => {
-    const title = typeof props.children === 'string' ? props.children : undefined;
-    return title ? (
+    const { onNotificationsUpdate } = useNotificationsContext();
+    const linkText = getText(children, text);
+    const isExternalLink = external ?? to?.startsWith('http');
+    onNotificationsUpdate(props.id, getTag(props.tag, props.counter));
+
+    return linkText ? (
         <InternalSideNavigationGroupLink
             {...props}
             to={to}
-            title={title}
-            navigationComponent={navigationComponent}
+            title={linkText}
+            navigationComponent={isExternalLink ? ExternalNavComponent : navigationComponent}
         />
     ) : null;
 };