@servicetitan/navigation 11.0.0-canary.237.c90556e.0 → 11.0.0-canary.237.f92c882.0

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

@@ -11,6 +11,7 @@ import {
     useCallback,
     useEffect,
     useMemo,
+    useRef,
     useState,
 } from 'react';
 import { NavigationItemData } from '../../utils/navigation';
@@ -28,6 +29,7 @@ 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>;
@@ -50,11 +52,13 @@ export type TitanLayoutProps = Omit<ComponentPropsWithoutRef<'div'>, 'children'
     onStateChange?: (state: TitanLayoutState) => void;
 
     header?: ReactElement;
+    top?: ReactElement;
+    sideTop?: ReactElement[];
     profile?: ReactElement;
     extraLinks?: ReactElement;
     extraLinksTop?: ReactElement;
     extraText?: string;
-    sidebarTop?: ReactElement[];
+    minContentWidth?: number;
 };
 
 const defaultSidebarContext: TitanLayoutSidebarContextType = {
@@ -76,7 +80,7 @@ const useVariant = (appearance: TitanLayoutProps['appearance']) =>
             isLegacy,
             isAnvil1,
             isAnvil2,
-            isSequent: isLegacy || isAnvil1,
+            isSequent: isLegacy || isAnvil2,
         };
     }, [appearance]);
 
@@ -115,6 +119,7 @@ const TitanLayoutComponent: FC<TitanLayoutProps> = ({
     children,
     navigationComponent,
     header,
+    top,
     profile,
     state,
     onStateChange,
@@ -122,7 +127,8 @@ const TitanLayoutComponent: FC<TitanLayoutProps> = ({
     extraLinks,
     extraLinksTop,
     extraText,
-    sidebarTop,
+    minContentWidth,
+    sideTop,
 }) => {
     const breakpoint = useTitanBreakpoint();
     const isMobile = breakpoint.isMobile;
@@ -138,21 +144,15 @@ const TitanLayoutComponent: FC<TitanLayoutProps> = ({
     const variant = useVariant(appearance);
     const [mobileDrawerOpened, setMobileDrawerOpened] = useState(false);
     const { content, logo } = useLayoutChildren(children);
+    const { hasNotifications, NotificationsContextProvider } = useNotificationsState();
 
     useEffect(() => {
-        if (!isMobile) {
-            setMobileDrawerOpened(false);
-            return;
+        if (variant.isAnvil1) {
+            const bodyClassName = 'of-hidden-i';
+            document.body.classList.add(bodyClassName);
+            return () => document.body.classList.remove(bodyClassName);
         }
-
-        const listener = () => {
-            setMobileDrawerOpened(false);
-        };
-
-        document.addEventListener('click', listener);
-
-        return () => document.removeEventListener('click', listener);
-    }, [isMobile]);
+    }, [variant.isAnvil1]);
 
     const onBurgerClick = useCallback((e: MouseEvent) => {
         setMobileDrawerOpened(true);
@@ -179,8 +179,6 @@ const TitanLayoutComponent: FC<TitanLayoutProps> = ({
         [state, onStateChange]
     );
 
-    const [layoutStyles] = useState<object>({});
-
     const layoutClass = variant.isLegacy
         ? Styles.layoutLegacy
         : variant.isAnvil1
@@ -194,21 +192,19 @@ const TitanLayoutComponent: FC<TitanLayoutProps> = ({
                     id={id}
                     className={classNames(
                         Styles.layout,
-                        isMobile
-                            ? Styles.layoutMobile
-                            : state?.navCollapsed
-                              ? Styles.layoutNavSlim
-                              : Styles.layoutNavWide,
+                        isMobile ? Styles.layoutMobile : Styles.layoutDesktop,
+                        !isMobile && state?.navCollapsed
+                            ? Styles.layoutNavSlim
+                            : Styles.layoutNavWide,
                         layoutClass
                     )}
-                    style={layoutStyles}
                 >
                     {variant.isSequent && <div className={Styles.topPlaceholder} />}
                     <LayoutHeader
                         className={Styles.top}
                         logo={logo}
                         profile={isMobile ? undefined : profile}
-                        center={header}
+                        center={top}
                         rightText={isMobile ? undefined : extraText}
                         right={
                             <Fragment>
@@ -216,55 +212,147 @@ const TitanLayoutComponent: FC<TitanLayoutProps> = ({
                                 {!isMobile && extraLinks}
                             </Fragment>
                         }
+                        isMobile={isMobile}
+                        hasNotifications={hasNotifications}
                         onBurgerClick={onBurgerClick}
                     />
 
-                    <LayoutSidebar
-                        flex={!variant.isSequent}
-                        mobile={breakpoint.isMobile}
-                        barExpanded={isMobile ? mobileDrawerOpened : !state?.navCollapsed}
-                        submenuExpanded={state?.submenuExpanded}
-                        onBarExpandChange={onBarExpandChange}
-                        onSubmenuExpandChange={onSubmenuExpandChange}
-                        top={sidebarTop}
-                        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
-                        }
-                    />
-
-                    {content}
+                    <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>
+                    <LayoutContent
+                        header={header}
+                        anvil2={variant.isAnvil2}
+                        anvil1={variant.isAnvil1}
+                        minWidth={minContentWidth}
+                    >
+                        {content}
+                    </LayoutContent>
                 </div>
             </LayoutPlacementContext.Provider>
         </LayoutContext.Provider>
     );
 };
 
+const TitanLayoutHeaderObserved: FC<{
+    children: ReactNode;
+    heightChange?(value: number): void;
+}> = ({ children, heightChange }) => {
+    const ref = useRef<HTMLDivElement>(null);
+
+    useEffect(() => {
+        if (ref.current) {
+            const updatePosition = () => {
+                if (ref.current && heightChange) {
+                    const pos = ref.current.getBoundingClientRect();
+                    heightChange(pos.height);
+                }
+            };
+
+            const observer = new ResizeObserver(updatePosition);
+            observer.observe(ref.current);
+
+            updatePosition();
+            return () => observer.disconnect();
+        }
+    }, [heightChange]);
+
+    useEffect(() => {
+        return () => {
+            heightChange?.(0);
+        };
+    }, [heightChange]);
+    return (
+        <div ref={ref} className={Styles.contentHeader} data-cy="layout-content-header">
+            {children}
+        </div>
+    );
+};
+
 export interface TitanLayoutContentProps {
     children: ReactNode;
 }
 const TitanLayoutContent: FC<TitanLayoutContentProps> = ({ children }) => children;
 
+const LayoutContent: 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)` });
+    }, []);
+
+    const contentStyles = useMemo(
+        () => ({
+            ...(minWidth ? { minWidth: `${minWidth}px` } : {}),
+            ...(anvil2 ? anvil2Styles : {}),
+        }),
+        [anvil2, minWidth, anvil2Styles]
+    );
+
+    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
+                )}
+            </div>
+        </Fragment>
+    );
+};
+
 export const TitanLayout = Object.assign(TitanLayoutComponent, {
     Content: TitanLayoutContent,
     Logo: TitanLayoutLogo,
-    SidebarLink: TitanLayoutSidebarLink,
-    SidebarTrigger: TitanLayoutSidebarTrigger,
+    Link: TitanLayoutSidebarLink,
+    Trigger: TitanLayoutSidebarTrigger,
 });

package/src/test/data-stories.module.less.d.ts

@@ -0,0 +1,3 @@
+export const __esModule: true;
+export const fixIcons: string;
+

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 }) => {