@servicetitan/navigation 11.0.0-canary.237.f2d512b.0 → 11.0.0-canary.237.f834dab.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@servicetitan/navigation",
-    "version": "11.0.0-canary.237.f2d512b.0",
+    "version": "11.0.0-canary.237.f834dab.0",
     "description": "Navigation components",
     "repository": {
         "type": "git",
@@ -42,5 +42,5 @@
         "less": true,
         "webpack": false
     },
-    "gitHead": "f2d512b061480a072b2b840832515edd05b6844d"
+    "gitHead": "f834dab984458f0c3c0d7df80f64443bfee2f7f6"
 }

package/src/components/badge-tag.tsx

@@ -5,7 +5,7 @@ import { CounterTagData } from '../utils/counter-tag';
 
 export interface BadgeTagProps extends CounterTagData {
     [key: string]: any;
-    className: string;
+    className?: string;
 }
 
 export const BadgeTag: FC<{

package/src/components/header-navigation/header-navigation-stacked.stories.tsx

@@ -130,7 +130,7 @@ export const WithAllMonolithData = () => (
                         Task Management
                     </ProfileDropdown.Link>
                     <ProfileDropdown.Divider />
-                    <ProfileDropdown.Link id="sign-out" to="https://googgle.com">
+                    <ProfileDropdown.Link id="sign-out" to="https://googgle.com" text="Sign Out">
                         Sign Out{' '}
                         <span className="c-neutral-100 m-l-half t-truncate">James Bond</span>
                     </ProfileDropdown.Link>

package/src/components/header-navigation/header-navigation.stories.tsx

@@ -154,7 +154,7 @@ export const WithAllMonolithData = () => (
                 Task Management
             </ProfileDropdown.Link>
             <ProfileDropdown.Divider />
-            <ProfileDropdown.Link id="sign-out" to="https://googgle.com">
+            <ProfileDropdown.Link id="sign-out" to="https://googgle.com" text="Sign Out">
                 Sign Out <span className="c-neutral-100 m-l-half t-truncate">James Bond</span>
             </ProfileDropdown.Link>
             <ProfileDropdown.Section id="userid" className="c-neutral-100 fs-1">

package/src/components/left-navigation/header-navigation-tiny.stories.tsx

@@ -93,7 +93,7 @@ export const WithAllMonolithData = () => (
                         Task Management
                     </ProfileDropdown.Link>
                     <ProfileDropdown.Divider />
-                    <ProfileDropdown.Link id="sign-out" to="https://googgle.com">
+                    <ProfileDropdown.Link id="sign-out" to="https://googgle.com" text="Sign Out">
                         Sign Out{' '}
                         <span className="c-neutral-100 m-l-half t-truncate">James Bond</span>
                     </ProfileDropdown.Link>
@@ -162,7 +162,7 @@ export const WithAllMonolithDataCommercial = () => (
                         Task Management
                     </ProfileDropdown.Link>
                     <ProfileDropdown.Divider />
-                    <ProfileDropdown.Link id="sign-out" to="https://googgle.com">
+                    <ProfileDropdown.Link id="sign-out" to="https://googgle.com" text="Sign Out">
                         Sign Out{' '}
                         <span className="c-neutral-100 m-l-half t-truncate">James Bond</span>
                     </ProfileDropdown.Link>

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

@@ -3,7 +3,7 @@ import { CSSProperties, FC, ReactNode } from 'react';
 import { LogoTitanSvg } from './logo-titan';
 import * as Styles from './logo-titan-text.module.less';
 
-export type WrapperProps = FC<{ className: string; children: ReactNode; style?: CSSProperties }>;
+export type WrapperProps = FC<{ className?: string; children: ReactNode; style?: CSSProperties }>;
 
 export interface LogoTitanProps {
     mantleFill?: string;

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

@@ -123,6 +123,7 @@
 
     .dropdown-section {
         padding: @spacing-1 @spacing-2;
+        position: relative;
     }
 
     .dropdown-link {
@@ -143,6 +144,8 @@
         position: absolute;
         top: @spacing-half;
         margin-left: @spacing-half;
+        min-width: 12px !important;
+        min-height: 12px !important;
     }
 }
 

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,31 @@ const ProfileDropdownTrigger: FC<ProfileDropdownTriggerProps> = ({
     );
 };
 
+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,6 +185,11 @@ export const ProfileDropdownSection: FC<ProfileDropdownSectionProps> = ({
         }
     };
 
+    const tagElement = useMemo(
+        () => <CounterTag data={getCounterTag(counter, tag)} className={Styles.counter} />,
+        [counter, tag]
+    );
+
     return withTooltip(
         <div
             className={classNames(Styles.dropdownSection, className, {
@@ -186,6 +201,7 @@ export const ProfileDropdownSection: FC<ProfileDropdownSectionProps> = ({
             {...rest}
         >
             {children}
+            {tagElement}
         </div>,
         tooltip,
         'left'
@@ -206,9 +222,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 +234,7 @@ export const ProfileDropdownLink: FC<ProfileDropdownLinkProps> = ({
     counter,
     tag,
     target,
+    text,
     to,
     tooltip,
     onClick,

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.module.less

@@ -4,29 +4,29 @@
 @size-links-tiny: 24px;
 
 .header {
-    display: grid;
+    --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;
     }
 
     .he-top-left {
-        grid-column: span 1;
         display: flex;
         align-items: center;
     }
 
     .he-top-center {
-        grid-column: span 1;
+        overflow: hidden;
     }
 
     .he-top-right {
-        grid-column: span 1;
-
         & > * {
             color: @color-black;
         }
@@ -90,33 +90,71 @@
     }
 }
 
+.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 {
-        grid-template-columns: repeat(3, 1fr);
-        grid-template-rows: 48px;
+.header-desktop {
+    height: var(--nav-offset-top);
+    .navigation-link {
+        margin: 6px 2px;
+        padding: 6px 6px;
 
-        .navigation-link {
-            margin: 6px 2px;
-            padding: 6px 6px;
+        .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;
+    }
 }
 
-// mobile
-@media only screen and (max-width: 768px) {
-    .header {
+// desktop wide
+@media only screen and (min-width: 1200px) {
+    .header-desktop {
+        display: grid;
         grid-template-columns: repeat(3, 1fr);
-        grid-template-rows: 44px;
+        grid-template-rows: 48px;
 
-        padding: @spacing-1 @spacing-half;
+        .he-top-left,
+        .he-top-center,
+        .he-top-right {
+            grid-column: span 1;
+        }
 
-        .navigation-link {
-            padding: 10px;
+        .he-top-center {
+            max-width: unset;
         }
     }
 }
@@ -134,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,6 +25,18 @@ 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();
     return breakpoint.isMobile ? (
@@ -40,24 +53,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 +96,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 +123,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 +148,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;
 };

package/src/components/titan-layout/layout-sidebar-links-internal.tsx

@@ -156,7 +156,9 @@ export const InternalSideNavigationLink: FC<InternalSideNavigationLinkProps> = (
 
 /** Side Navigation menu trigger (for internal usage) */
 export const InternalSideNavigationTrigger: FC<
-    Omit<InternalSideNavigationLinkProps, 'to' | 'navigationComponent'> & { onClick?: () => void }
+    Omit<InternalSideNavigationLinkProps, 'to' | 'navigationComponent'> & {
+        onClick?: (e: MouseEvent<never>) => void;
+    }
 > = ({ className, dataPrefix, isActive, submenuExpanded, onExpandToggle, onClick, ...props }) => {
     return (
         <div
@@ -180,12 +182,22 @@ export const InternalSideNavigationTrigger: FC<
 
 export const InternalSideNavigationGroupLink: FC<
     NavigationSubmenuItemData & NavigationComponentProps
-> = ({ id, counter, tag, title, to, isActive, navigationComponent: NavigationComponent }) => {
+> = ({
+    id,
+    counter,
+    tag,
+    title,
+    to,
+    isActive,
+    navigationComponent: NavigationComponent,
+    ...rest
+}) => {
     return (
         <NavigationComponent
+            key={id}
             data-cy={`navigation-item-${id}`}
             data-pendo={`navigation-item-${id}`}
-            key={id}
+            {...rest}
             to={to}
             className={classNames(Styles.submenuItem, Styles.submenuLink, {
                 [Styles.submenuLinkActive]: isActive === true,
@@ -201,12 +213,13 @@ export const InternalSideNavigationGroupLink: FC<
 
 export const InternalSideNavigationGroupTrigger: FC<
     Omit<NavigationSubmenuItemData, 'to'> & { onClick?: (e: MouseEvent<any>) => void }
-> = ({ id, counter, onClick, tag, title, isActive }) => {
+> = ({ id, counter, onClick, tag, title, isActive, ...rest }) => {
     return (
         <div
             data-cy={`navigation-item-${id}`}
             data-pendo={`navigation-item-${id}`}
             key={id}
+            {...rest}
             className={classNames(Styles.submenuItem, {
                 [Styles.submenuLink]: !!onClick,
                 [Styles.submenuLinkActive]: isActive === true,
@@ -231,7 +244,7 @@ export const InternalSideNavigationGroup: FC<
             onExpandToggle?: (e: MouseEvent<never>) => void;
             tag: BadgeTagProps | undefined;
             to: NavigationItemData['to'] | undefined;
-            onClick?: () => void;
+            onClick?: (e: MouseEvent<never>) => void;
         }
 > = ({ children, submenuExpanded, to, onExpandToggle, onClick, ...props }) => {
     return (