@servicetitan/navigation 10.6.1 → 11.0.0-canary.237.0505ce7.0

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/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

@@ -105,6 +105,10 @@
         position: relative;
     }
 
+    .dropdown-content-wrapper > span {
+        display: block !important;
+    }
+
     .dropdown-content-bottom-left {
         .dropdown-content-wrapper::before {
             content: '';
@@ -119,6 +123,11 @@
 
     .dropdown-section {
         padding: @spacing-1 @spacing-2;
+        position: relative;
+
+        &.dropdown-section-with-counter {
+            padding-right: @spacing-3;
+        }
     }
 
     .dropdown-link {
@@ -132,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.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

@@ -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,
@@ -25,6 +26,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';
 
@@ -146,21 +148,43 @@ 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;
 }
 
-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
 }) => {
@@ -172,16 +196,26 @@ export const ProfileDropdownSection: FC<ProfileDropdownSectionProps> = ({
         }
     };
 
-    return (
+    const tagElement = useTag(counter, tag);
+
+    return withTooltip(
         <div
-            className={classNames(Styles.dropdownSection, className)}
+            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}
-        </div>
+            {tagElement}
+        </div>,
+        tooltip,
+        'left'
     );
 };
 
@@ -193,15 +227,15 @@ 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 {
-    [key: string]: any;
-}
+export type ProfileDropdownLinkProps = Omit<ComponentPropsWithoutRef<'a'>, 'children'> &
+    ProfileDropdownLinkPropsStrict &
+    ProfileItemContent;
 
 export const ProfileDropdownLink: FC<ProfileDropdownLinkProps> = ({
     children,
@@ -211,59 +245,56 @@ export const ProfileDropdownLink: FC<ProfileDropdownLinkProps> = ({
     counter,
     tag,
     target,
+    text,
     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(
-        () => <CounterTag data={getCounterTag(counter, tag)} className={Styles.counter} />,
-        [counter, tag]
-    );
+    const tagElement = useTag(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,
+                    tagElement && Styles.dropdownSectionWithCounter,
+                    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,
+                    { [Styles.dropdownSectionWithCounter]: !!tagElement },
+                    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 +322,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, width: 0 },
+    isTitanLayout: false,
+    sidebar: { styles: { popoverContent: {} } },
+});
+
+export const useTitanLayoutContext = () => useContext(LayoutContext);
+
+export const LayoutPlacementContext = createContext<TitanLayoutPlacement | undefined>(undefined);
+export const useTitanLayoutPlacementContext = () => useContext(LayoutPlacementContext);

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

@@ -0,0 +1,144 @@
+import { Icon, IconProps } from '@servicetitan/anvil2';
+import classNames from 'classnames';
+import { FC, Fragment } from 'react';
+import {
+    HeaderNavigationLinkProps,
+    HeaderNavigationTriggerProps,
+} from '../../utils/navigation-legacy';
+import { getCounterTag } from '../../utils/side-nav';
+import { CounterTag, CounterTagProps } from '../counter-tag';
+// use v1 tooltips due to bug with v2 in monolith
+import { withTooltip } from '../header-navigation/with-tooltip';
+import { useTitanLayoutContext } from './layout-context';
+import * as Styles from './layout-header.module.less';
+
+/** Content for navigation items */
+const HeaderNavigationItemContent: FC<{
+    tag?: CounterTagProps;
+    counterClassName?: string;
+    icon: IconProps['svg'] | undefined;
+    iconActive?: IconProps['svg'];
+    label?: string;
+    labelClassName?: string;
+}> = ({ counterClassName, icon, iconActive, label, labelClassName, tag }) => {
+    return (
+        <Fragment>
+            {!!icon && <Icon svg={icon} className={Styles.navigationIcon} />}
+            {!!iconActive && (
+                <Icon
+                    svg={iconActive}
+                    className={classNames(Styles.navigationIcon, Styles.navigationIconActive)}
+                />
+            )}
+
+            {!!label && (
+                <span className={classNames(Styles.navigationItemLabel, labelClassName)}>
+                    {label}
+                </span>
+            )}
+
+            {!!tag && (
+                <CounterTag
+                    data={tag}
+                    className={classNames(Styles.navigationItemCounter, counterClassName)}
+                    longClassName={Styles.navigationItemCounterLong}
+                />
+            )}
+        </Fragment>
+    );
+};
+
+/** Navigation extra item with link */
+export const LayoutHeaderNavigationLink: FC<HeaderNavigationLinkProps> = ({
+    id,
+    to,
+    hint,
+    tooltip,
+    className,
+    counter,
+    icon,
+    iconActive,
+    iconClassName,
+    iconComponent,
+    iconName,
+    isActive,
+    label,
+    labelClassName,
+    tag,
+    target,
+    ...rest
+}) => {
+    const { NavigationComponent } = useTitanLayoutContext();
+
+    return withTooltip(
+        <NavigationComponent
+            data-cy={`navigation-link-${id}`}
+            data-pendo={`navigation-link-${id}`}
+            {...rest}
+            key={id}
+            to={to}
+            title={hint}
+            className={classNames(Styles.navigationLink, className, {
+                [Styles.navigationItemActive]: isActive === true,
+                [Styles.navigationItemIconState]: !!icon && !!iconActive,
+            })}
+            isActive={typeof isActive === 'function' ? isActive : undefined}
+            activeClassName={Styles.navigationItemActive}
+            target={target}
+        >
+            <HeaderNavigationItemContent
+                tag={getCounterTag(counter, tag)}
+                icon={icon}
+                iconActive={iconActive}
+                label={label}
+                labelClassName={labelClassName}
+            />
+        </NavigationComponent>,
+        tooltip
+    );
+};
+
+/** Navigation extra item with icon button */
+export const LayoutHeaderNavigationTrigger: FC<HeaderNavigationTriggerProps> = ({
+    id,
+    className,
+    counter,
+    icon,
+    iconActive,
+    iconName,
+    isActive,
+    hint,
+    label,
+    labelClassName,
+    tag,
+    tooltip,
+    title,
+    titleClassName,
+    ...rest
+}) => {
+    return withTooltip(
+        <div
+            data-cy={`navigation-trigger-${id}`}
+            data-pendo={`navigation-trigger-${id}`}
+            {...rest}
+            title={hint}
+            className={classNames(
+                Styles.navigationLink,
+                {
+                    [Styles.navigationItemActive]: isActive === true,
+                    [Styles.navigationItemIconState]: !!icon && !!iconActive,
+                },
+                'cursor-pointer',
+                className
+            )}
+        >
+            <HeaderNavigationItemContent
+                tag={getCounterTag(counter, tag)}
+                icon={isActive && iconActive ? iconActive : icon}
+                label={label}
+                labelClassName={labelClassName}
+            />
+        </div>,
+        tooltip
+    );
+};