@servicetitan/navigation 11.0.0-canary.237.0c461af.0 → 11.0.0-canary.237.1127df0.0

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

@@ -33,9 +33,11 @@ export interface LayoutSidebarProps {
     mainItems?: NavigationItemData[];
     barExpanded: boolean;
     submenuExpanded: string | undefined;
+    drawerOpened: boolean;
     mobile: boolean;
     navigationComponent: FC<NavLinkComponentProps>;
     onBarExpandChange(expanded: boolean): void;
+    onDrawerOpenChange(expanded: boolean): void;
     onSubmenuExpandChange(id: string, expanded: boolean): void;
 }
 
@@ -44,29 +46,36 @@ export const LayoutSidebar: FC<LayoutSidebarProps> = ({
     mobile,
     barExpanded,
     submenuExpanded,
+    drawerOpened,
     onBarExpandChange,
     onSubmenuExpandChange,
+    onDrawerOpenChange,
     mainItems,
     top,
     bottom,
     navigationComponent,
 }) => {
-    const handleClick = (e: MouseEvent<never>) => {
-        e.stopPropagation();
+    const closeDrawer = () => {
+        if (mobile) {
+            onDrawerOpenChange?.(false);
+        }
     };
 
     return (
         <LayoutPlacementContext.Provider value="side">
+            {mobile && drawerOpened && (
+                <div className={Styles.navDrawerBackdrop} onClick={closeDrawer} />
+            )}
             <div
                 className={classNames(
                     Styles.nav,
                     mobile && Styles.navDrawer,
-                    mobile && barExpanded && Styles.navDrawerOpened,
+                    mobile && drawerOpened && Styles.navDrawerOpened,
                     !mobile && (barExpanded ? Styles.navWide : Styles.navSlim),
                     className
                 )}
                 data-cy="side-navigation"
-                onClick={handleClick}
+                onClick={closeDrawer}
             >
                 <ThemeProvider mode="dark" className={Styles.navMain}>
                     {mobile && (
@@ -86,7 +95,7 @@ export const LayoutSidebar: FC<LayoutSidebarProps> = ({
                             item.submenu ? (
                                 <SideNavigationGroupItem
                                     key={item.id}
-                                    barExpanded={barExpanded}
+                                    barExpanded={mobile ? drawerOpened : barExpanded}
                                     submenuExpanded={!!item.id && submenuExpanded === item.id}
                                     onSubmenuExpand={onSubmenuExpandChange}
                                     navigationComponent={navigationComponent}

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

@@ -0,0 +1,44 @@
+import {
+    FC,
+    PropsWithChildren,
+    createContext,
+    useCallback,
+    useContext,
+    useRef,
+    useState,
+} from 'react';
+
+interface NotificationsContextType {
+    onNotificationsUpdate: (id: string, hasNotifications: boolean) => void;
+}
+
+const NotificationsContext = createContext<NotificationsContextType>({
+    onNotificationsUpdate: () => {},
+});
+
+export const useNotificationsContext = () => useContext(NotificationsContext);
+
+export const useNotificationsState = () => {
+    const [hasNotifications, setHasNotifications] = useState(false);
+    const items = useRef(new Set<string>());
+    const onNotificationsUpdate = useCallback((id: string, hasNotifications: boolean) => {
+        if (hasNotifications && !items.current.has(id)) {
+            items.current.add(id);
+            setHasNotifications(!!items.current.size);
+        } else if (!hasNotifications && items.current.has(id)) {
+            items.current.delete(id);
+            setHasNotifications(!!items.current.size);
+        }
+    }, []);
+
+    const NotificationsContextProvider: FC<PropsWithChildren> = useCallback(
+        ({ children }) => (
+            <NotificationsContext.Provider value={{ onNotificationsUpdate }}>
+                {children}
+            </NotificationsContext.Provider>
+        ),
+        [onNotificationsUpdate]
+    );
+
+    return { NotificationsContextProvider, hasNotifications };
+};

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

@@ -53,18 +53,21 @@
 
 .layout-legacy,
 .layout-anvil2 {
-    overflow-x: auto;
     .top-placeholder {
         height: var(--nav-offset-top);
     }
 }
 
 .layout {
-    --nav-offset-top: 49px;
+    --nav-offset-top: 0px;
+    --nav-offset-left: 0px;
 
-    &.layout-mobile {
-        --nav-offset-top: 61px;
-        --nav-offset-left: 0;
+    &.layout-desktop.layout-top {
+        --nav-offset-top: 48px;
+    }
+
+    &.layout-mobile.layout-top {
+        --nav-offset-top: 72px;
     }
 
     &.layout-desktop.layout-nav-slim {
@@ -77,9 +80,9 @@
 
     .top {
         position: fixed;
+        width: 100vw;
         top: 0;
         left: 0;
-        right: 0;
         z-index: 991;
     }
 

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

@@ -9,6 +9,7 @@ export const layoutLegacy: string;
 export const layoutMobile: string;
 export const layoutNavSlim: string;
 export const layoutNavWide: string;
+export const layoutTop: string;
 export const side: string;
 export const top: string;
 export const topPlaceholder: string;

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

@@ -27,6 +27,8 @@ interface LayoutContentArgs {
     search: boolean;
     longContent: boolean;
     wideContent: boolean;
+    minWidth: boolean;
+    emptyNav: boolean;
 }
 
 export default {
@@ -41,6 +43,8 @@ export default {
         search: true,
         longContent: true,
         wideContent: false,
+        minWidth: false,
+        emptyNav: false,
     } as LayoutContentArgs,
 };
 
@@ -68,6 +72,7 @@ const profile = (
             to="https://google.com"
             tooltip="Google it"
             target="_blank"
+            tag={{ value: true }}
         >
             first link
         </ProfileDropdown.Link>
@@ -180,7 +185,9 @@ const ContentHeader = () => {
         </Fragment>
     );
 };
-const SearchBar = () => <TextField size="small" placeholder="Search" className="w-100-i" />;
+const SearchBar = () => (
+    <TextField size="small" placeholder="Search" className="w-100-i m-x-half-i" />
+);
 
 const useLayoutProps = (args: LayoutContentArgs): TitanLayoutProps => {
     const [state, setState] = useState<TitanLayoutState | undefined>(undefined);
@@ -190,7 +197,7 @@ const useLayoutProps = (args: LayoutContentArgs): TitanLayoutProps => {
         onStateChange: setState,
 
         navigationComponent: NavLinkMock,
-        navigationMainItems: mainNavItems,
+        navigationMainItems: args.emptyNav ? [] : mainNavItems,
 
         profile,
         top: args.search ? <SearchBar /> : undefined,
@@ -200,14 +207,16 @@ const useLayoutProps = (args: LayoutContentArgs): TitanLayoutProps => {
         extraLinksTop,
         extraText: args.extraText ? 'EST (-8 hrs)' : undefined,
 
-        sideTop: args.sideTop ? sidebarTop() : undefined,
+        sideTop: args.sideTop && !args.emptyNav ? sidebarTop() : undefined,
+
+        minContentWidth: args.minWidth ? 900 : undefined,
     };
 };
 
 const Content = (args: LayoutContentArgs) => {
     return (
         <Fragment>
-            <LocationInfo />
+            <LocationInfo className="m-b-3" />
             {args.wideContent && (
                 <div style={{ width: '1200px' }}>
                     Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor

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

@@ -29,24 +29,27 @@ import { TitanLayoutLogo, TitanLayoutLogoProps } from './layout-logo';
 import { LayoutSidebar } from './layout-sidebar';
 import { TitanLayoutSidebarLink, TitanLayoutSidebarTrigger } from './layout-sidebar-links';
 import { InternalSideNavigationTrigger } from './layout-sidebar-links-internal';
+import { useNotificationsState } from './notifications-context';
 import * as Styles from './titan-layout.module.less';
 
 type TitanLayoutChild = ReactElement<TitanLayoutContentProps> | ReactElement<TitanLayoutLogoProps>;
 
 export type TitanLayoutProps = Omit<ComponentPropsWithoutRef<'div'>, 'children' | 'style'> & {
-    empty?: boolean;
-
+    /** layout appearance */
     appearance?: 'legacy' | 'anvil1' | 'anvil2';
 
+    /** layout's content */
+    children?: TitanLayoutChild | TitanLayoutChild[];
+
+    /** show only content without side and top bars */
+    contentOnly?: boolean;
+
     /** component used for navigation */
     navigationComponent?: FC<NavLinkComponentProps>;
 
     /** data for main navigation links */
     navigationMainItems?: NavigationItemData[];
 
-    /** layout's content */
-    children?: TitanLayoutChild | TitanLayoutChild[];
-
     state?: TitanLayoutState;
     onStateChange?: (state: TitanLayoutState) => void;
 
@@ -116,6 +119,7 @@ const TitanLayoutComponent: FC<TitanLayoutProps> = ({
     appearance = 'anvil2',
     id,
     children,
+    contentOnly,
     navigationComponent,
     header,
     top,
@@ -130,7 +134,6 @@ const TitanLayoutComponent: FC<TitanLayoutProps> = ({
     sideTop,
 }) => {
     const breakpoint = useTitanBreakpoint();
-    const isMobile = breakpoint.isMobile;
     const context: TitanLayoutContextType = useMemo(
         () => ({
             NavigationComponent: navigationComponent ?? DefaultNavLinkComponent,
@@ -143,26 +146,21 @@ const TitanLayoutComponent: FC<TitanLayoutProps> = ({
     const variant = useVariant(appearance);
     const [mobileDrawerOpened, setMobileDrawerOpened] = useState(false);
     const { content, logo } = useLayoutChildren(children);
+    const { hasNotifications, NotificationsContextProvider } = useNotificationsState();
+    const [anvil2Styles, setAnvil2Styles] = useState<object>({});
+    const updateIndicatorsHeight = useCallback((offset: number) => {
+        setAnvil2Styles({ '--offset': `calc(var(--nav-offset-top) + ${offset}px)` });
+    }, []);
 
-    useEffect(() => {
-        if (!isMobile) {
-            setMobileDrawerOpened(false);
-            return;
-        }
-
-        const listener = () => {
-            setMobileDrawerOpened(false);
-        };
-
-        document.addEventListener('click', listener);
-
-        return () => document.removeEventListener('click', listener);
-    }, [isMobile]);
+    const isMobile = breakpoint.isMobile;
+    const hasSideBar = !contentOnly && (!!navigationMainItems?.length || !!sideTop?.length);
+    const hasTopBar = !contentOnly;
 
     useEffect(() => {
         if (variant.isAnvil1) {
-            document.body.classList.add('of-hidden-i');
-            return () => document.body.classList.remove('of-hidden');
+            const bodyClassName = 'of-hidden-i';
+            document.body.classList.add(bodyClassName);
+            return () => document.body.classList.remove(bodyClassName);
         }
     }, [variant.isAnvil1]);
 
@@ -190,6 +188,48 @@ const TitanLayoutComponent: FC<TitanLayoutProps> = ({
         },
         [state, onStateChange]
     );
+    const hasMenuNotifications = useMemo(() => {
+        try {
+            return (
+                navigationMainItems?.some(item => {
+                    if (item.counter || item.tag?.value) {
+                        return true;
+                    } else if (item.submenu) {
+                        return item.submenu.groups.some(group =>
+                            group.links.some(link => !!link.counter || !!link.tag?.value)
+                        );
+                    }
+                    return false;
+                }) ?? false
+            );
+        } catch {
+            return false;
+        }
+    }, [navigationMainItems]);
+
+    const limitContentWidth = useMemo(() => {
+        if (variant.isAnvil2 || !minContentWidth) {
+            return undefined;
+        }
+
+        if (breakpoint.width < minContentWidth) {
+            return minContentWidth;
+        }
+    }, [variant, minContentWidth, breakpoint.width]);
+
+    const contentStyles = useMemo(() => {
+        if (variant.isAnvil2) {
+            return anvil2Styles;
+        }
+
+        if (variant.isLegacy && limitContentWidth) {
+            return {
+                display: 'flex',
+                flexDirection: 'column',
+                minHeight: '100vh',
+            };
+        }
+    }, [variant, anvil2Styles, limitContentWidth]);
 
     const layoutClass = variant.isLegacy
         ? Styles.layoutLegacy
@@ -205,67 +245,88 @@ const TitanLayoutComponent: FC<TitanLayoutProps> = ({
                     className={classNames(
                         Styles.layout,
                         isMobile ? Styles.layoutMobile : Styles.layoutDesktop,
-                        !isMobile && state?.navCollapsed
-                            ? Styles.layoutNavSlim
-                            : Styles.layoutNavWide,
+                        {
+                            [Styles.layoutTop]: hasTopBar,
+                            [Styles.layoutNavSlim]: !isMobile && hasSideBar && state?.navCollapsed,
+                            [Styles.layoutNavWide]: !isMobile && hasSideBar && !state?.navCollapsed,
+                        },
                         layoutClass
                     )}
+                    style={contentStyles}
                 >
                     {variant.isSequent && <div className={Styles.topPlaceholder} />}
-                    <LayoutHeader
-                        className={Styles.top}
-                        logo={logo}
-                        profile={isMobile ? undefined : profile}
-                        center={top}
-                        rightText={isMobile ? undefined : extraText}
-                        right={
-                            <Fragment>
-                                {extraLinksTop}
-                                {!isMobile && extraLinks}
-                            </Fragment>
-                        }
-                        onBurgerClick={onBurgerClick}
-                    />
-
-                    <LayoutSidebar
-                        className={Styles.side}
-                        mobile={breakpoint.isMobile}
-                        barExpanded={isMobile ? mobileDrawerOpened : !state?.navCollapsed}
-                        submenuExpanded={state?.submenuExpanded}
-                        onBarExpandChange={onBarExpandChange}
-                        onSubmenuExpandChange={onSubmenuExpandChange}
-                        top={sideTop}
-                        mainItems={navigationMainItems}
-                        navigationComponent={context.NavigationComponent}
-                        bottom={
-                            isMobile ? (
+                    {hasTopBar && (
+                        <LayoutHeader
+                            className={Styles.top}
+                            logo={logo}
+                            profile={isMobile ? undefined : profile}
+                            center={top}
+                            rightText={isMobile ? undefined : extraText}
+                            right={
                                 <Fragment>
-                                    {profile}
-                                    {extraLinks}
-                                    {!!extraText && (
-                                        <InternalSideNavigationTrigger
-                                            id="__extra_text"
-                                            title={extraText}
-                                            submenuExpanded={undefined}
-                                            dataPrefix="navigation-extra-text"
-                                            tag={undefined}
-                                            icon={undefined}
-                                            iconActive={undefined}
-                                        />
-                                    )}
+                                    {extraLinksTop}
+                                    {!isMobile && extraLinks}
                                 </Fragment>
-                            ) : undefined
-                        }
-                    />
-
-                    <LayoutContent
-                        header={header}
-                        anvil2={variant.isAnvil2}
-                        anvil1={variant.isAnvil1}
-                        minWidth={minContentWidth}
-                    >
-                        {content}
-                    </LayoutContent>
+                            }
+                            isMobile={isMobile}
+                            hasNotifications={hasNotifications || hasMenuNotifications}
+                            onBurgerClick={onBurgerClick}
+                        />
+                    )}
+
+                    {hasSideBar && (
+                        <NotificationsContextProvider>
+                            <LayoutSidebar
+                                className={Styles.side}
+                                mobile={breakpoint.isMobile}
+                                barExpanded={!state?.navCollapsed}
+                                onBarExpandChange={onBarExpandChange}
+                                submenuExpanded={state?.submenuExpanded}
+                                onSubmenuExpandChange={onSubmenuExpandChange}
+                                drawerOpened={mobileDrawerOpened}
+                                onDrawerOpenChange={setMobileDrawerOpened}
+                                top={sideTop}
+                                mainItems={navigationMainItems}
+                                navigationComponent={context.NavigationComponent}
+                                bottom={
+                                    isMobile ? (
+                                        <Fragment>
+                                            {profile}
+                                            {extraLinks}
+                                            {!!extraText && (
+                                                <InternalSideNavigationTrigger
+                                                    id="__extra_text"
+                                                    title={extraText}
+                                                    submenuExpanded={undefined}
+                                                    dataPrefix="navigation-extra-text"
+                                                    tag={undefined}
+                                                    icon={undefined}
+                                                    iconActive={undefined}
+                                                />
+                                            )}
+                                        </Fragment>
+                                    ) : undefined
+                                }
+                            />
+                        </NotificationsContextProvider>
+                    )}
+
+                    {variant.isAnvil1 ? (
+                        <LayoutContentAnvil1 header={header} minWidth={limitContentWidth}>
+                            {content}
+                        </LayoutContentAnvil1>
+                    ) : variant.isLegacy ? (
+                        <LayoutContentLegacy header={header} minWidth={limitContentWidth}>
+                            {content}
+                        </LayoutContentLegacy>
+                    ) : (
+                        <LayoutContentAnvil2
+                            header={header}
+                            onHeaderHeightChange={updateIndicatorsHeight}
+                        >
+                            {content}
+                        </LayoutContentAnvil2>
+                    )}
                 </div>
             </LayoutPlacementContext.Provider>
         </LayoutContext.Provider>
@@ -306,57 +367,92 @@ const TitanLayoutHeaderObserved: FC<{
         </div>
     );
 };
+const TitanLayoutHeader: FC<{ children: ReactNode }> = ({ children }) => {
+    return (
+        <div className={Styles.contentHeader} data-cy="layout-content-header">
+            {children}
+        </div>
+    );
+};
 
 export interface TitanLayoutContentProps {
     children: ReactNode;
 }
 const TitanLayoutContent: FC<TitanLayoutContentProps> = ({ children }) => children;
 
-const LayoutContent: FC<{
+const LayoutContentAnvil2: FC<{
     children: ReactNode;
     header?: ReactNode;
-    anvil1: boolean;
-    anvil2: boolean;
-    minWidth: number | undefined;
-}> = ({ anvil1, anvil2, children, header, minWidth }) => {
-    const [anvil2Styles, setAnvil2Styles] = useState<object>({});
-    const updateIndicatorsHeight = useCallback((offset: number) => {
-        setAnvil2Styles({ '--offset': `calc(var(--nav-offset-top) + ${offset}px)` });
-    }, []);
+    onHeaderHeightChange?: (height: number) => void;
+}> = ({ children, header, onHeaderHeightChange }) => {
+    return (
+        <Fragment>
+            <TitanLayoutHeaderObserved heightChange={onHeaderHeightChange}>
+                {header}
+            </TitanLayoutHeaderObserved>
+            {children}
+        </Fragment>
+    );
+};
 
-    const contentStyles = useMemo(
+const LayoutContentAnvil1: FC<{
+    children: ReactNode;
+    header?: ReactNode;
+    minWidth?: number;
+}> = ({ children, header, minWidth }) => {
+    const innerContentStyles: CSSProperties = useMemo(
         () => ({
             ...(minWidth ? { minWidth: `${minWidth}px` } : {}),
-            ...(anvil2 ? anvil2Styles : {}),
         }),
-        [anvil2, minWidth, anvil2Styles]
+        [minWidth]
     );
 
     return (
         <Fragment>
-            {!!header &&
-                (anvil2 ? (
-                    <TitanLayoutHeaderObserved heightChange={updateIndicatorsHeight}>
-                        {header}
-                    </TitanLayoutHeaderObserved>
-                ) : (
-                    <div className={Styles.contentHeader} data-cy="layout-content-header">
-                        {header}
-                    </div>
-                ))}
-            <div className={Styles.content} style={contentStyles} data-cy="layout-content">
-                {anvil1 ? (
-                    <div className="position-relative d-f flex-grow-1 flex-basis-0 of-hidden">
-                        {children}
-                    </div>
-                ) : (
-                    children
-                )}
+            <TitanLayoutHeader>{header}</TitanLayoutHeader>
+            <div
+                className={classNames(Styles.content, { 'of-x-auto': !!minWidth })}
+                data-cy="layout-content"
+            >
+                <div
+                    className="position-relative d-f flex-grow-1 flex-basis-0 of-hidden"
+                    style={innerContentStyles}
+                >
+                    {children}
+                </div>
             </div>
         </Fragment>
     );
 };
 
+const LayoutContentLegacy: FC<{
+    children: ReactNode;
+    header?: ReactNode;
+    minWidth: number | undefined;
+}> = ({ children, header, minWidth }) => {
+    const innerContentStyles: CSSProperties = useMemo(
+        () => ({
+            position: 'relative',
+            minWidth: `${minWidth}px`,
+        }),
+        [minWidth]
+    );
+
+    return (
+        <Fragment>
+            <TitanLayoutHeader>{header}</TitanLayoutHeader>
+
+            {minWidth ? (
+                <div className="of-x-auto flex-basis-0 flex-grow-1">
+                    <div style={innerContentStyles}>{children}</div>
+                </div>
+            ) : (
+                children
+            )}
+        </Fragment>
+    );
+};
+
 export const TitanLayout = Object.assign(TitanLayoutComponent, {
     Content: TitanLayoutContent,
     Logo: TitanLayoutLogo,

package/src/test/data.tsx

@@ -66,7 +66,6 @@ export const NavLinkMock = forwardRef<any, NavLinkComponentProps>(
                 {...rest}
                 onClick={e => {
                     e.preventDefault();
-                    e.stopPropagation();
 
                     if (!to.startsWith('http')) {
                         history.replace(to);
@@ -82,10 +81,10 @@ export const NavLinkMock = forwardRef<any, NavLinkComponentProps>(
     }
 );
 
-export const LocationInfo = () => {
+export const LocationInfo: FC<{ className?: string }> = ({ className }) => {
     const location = useLocation();
 
-    return <BodyText>current location - {location.pathname}</BodyText>;
+    return <BodyText className={className}>current location - {location.pathname}</BodyText>;
 };
 
 const LocationProvider: FC<{ children: any }> = ({ children }) => {

package/src/utils/use-breakpoint.ts

@@ -4,6 +4,7 @@ import { useMemo } from 'react';
 export interface TitanBreakpoint {
     name: BreakpointReturnProps['name'];
     isMobile: boolean;
+    width: number;
 }
 
 export const useTitanBreakpoint = (): TitanBreakpoint => {
@@ -12,7 +13,8 @@ export const useTitanBreakpoint = (): TitanBreakpoint => {
     return useMemo(
         () => ({
             name: breakpoint?.name ?? 'xl',
-            isMobile: breakpoint ? breakpoint.innerWidth <= 768 : false,
+            isMobile: breakpoint ? breakpoint.innerWidth < 768 : false,
+            width: breakpoint?.innerWidth ?? 0,
         }),
         [breakpoint]
     );