From 68d2df90847ed746a9b64262c57f5c67f6919697 Mon Sep 17 00:00:00 2001
From: Charles de Dreuille <charles.dedreuille@gmail.com>
Date: Tue, 22 Jul 2025 08:09:12 +0100
Subject: [PATCH] Fix links on the header toolbar

Signed-off-by: Charles de Dreuille <charles.dedreuille@gmail.com>
---
 packages/ui/report.api.md                     |   2 +
 .../src/components/Header/Header.stories.tsx  |   1 +
 packages/ui/src/components/Header/Header.tsx  |  14 +-
 .../src/components/Header/HeaderToolbar.tsx   | 164 ++++++++++--------
 packages/ui/src/components/Header/types.ts    |   2 +
 5 files changed, 109 insertions(+), 74 deletions(-)

diff --git a/packages/ui/report.api.md b/packages/ui/report.api.md
index 6f6fc41fdb..5f08a8ce84 100644
--- a/packages/ui/report.api.md
+++ b/packages/ui/report.api.md
@@ -1045,6 +1045,8 @@ export interface HeaderProps {
   tabs?: HeaderTab[];
   // (undocumented)
   title?: string;
+  // (undocumented)
+  titleLink?: string;
 }
 
 // @public
diff --git a/packages/ui/src/components/Header/Header.stories.tsx b/packages/ui/src/components/Header/Header.stories.tsx
index 5a632d741e..f7aa47e64b 100644
--- a/packages/ui/src/components/Header/Header.stories.tsx
+++ b/packages/ui/src/components/Header/Header.stories.tsx
@@ -230,6 +230,7 @@ export const WithEverything: Story = {
     menuItems,
     breadcrumbs,
     tabs,
+    titleLink: '/',
   },
   decorators: layoutDecorator,
   render: args => (
diff --git a/packages/ui/src/components/Header/Header.tsx b/packages/ui/src/components/Header/Header.tsx
index 4f85d9096d..7fd93c4154 100644
--- a/packages/ui/src/components/Header/Header.tsx
+++ b/packages/ui/src/components/Header/Header.tsx
@@ -32,7 +32,16 @@ declare module 'react-aria-components' {
  * @public
  */
 export const Header = (props: HeaderProps) => {
-  const { tabs, icon, title, menuItems, breadcrumbs, customActions } = props;
+  const {
+    tabs,
+    icon,
+    title,
+    titleLink,
+    menuItems,
+    breadcrumbs,
+    customActions,
+    onTabSelectionChange,
+  } = props;
 
   const { classNames } = useStyles('Header');
 
@@ -43,6 +52,7 @@ export const Header = (props: HeaderProps) => {
       <HeaderToolbar
         icon={icon}
         title={title}
+        titleLink={titleLink}
         menuItems={menuItems}
         breadcrumbs={breadcrumbs}
         customActions={customActions}
@@ -50,7 +60,7 @@ export const Header = (props: HeaderProps) => {
       />
       {tabs && (
         <div className={classNames.tabsWrapper}>
-          <Tabs onSelectionChange={props.onTabSelectionChange}>
+          <Tabs onSelectionChange={onTabSelectionChange}>
             <TabList>
               {tabs?.map(tab => (
                 <Tab key={tab.id} id={tab.id} href={tab.href}>
diff --git a/packages/ui/src/components/Header/HeaderToolbar.tsx b/packages/ui/src/components/Header/HeaderToolbar.tsx
index e03b70055d..9236ad3fe7 100644
--- a/packages/ui/src/components/Header/HeaderToolbar.tsx
+++ b/packages/ui/src/components/Header/HeaderToolbar.tsx
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { Link } from 'react-aria-components';
+import { Link, RouterProvider } from 'react-aria-components';
 import { useStyles } from '../../hooks/useStyles';
 import { useRef, useState, useEffect } from 'react';
 import { RiArrowRightSLine, RiMore2Line, RiShapesLine } from '@remixicon/react';
@@ -23,6 +23,7 @@ import { ButtonIcon } from '../ButtonIcon';
 import { Menu } from '../Menu';
 import { Text } from '../Text';
 import { motion, useScroll, useTransform } from 'motion/react';
+import { useNavigate, useHref } from 'react-router-dom';
 
 /**
  * A component that renders a toolbar.
@@ -30,9 +31,17 @@ import { motion, useScroll, useTransform } from 'motion/react';
  * @internal
  */
 export const HeaderToolbar = (props: HeaderToolbarProps) => {
-  const { icon, title, menuItems, breadcrumbs, customActions, hasTabs } = props;
+  const {
+    icon,
+    title,
+    titleLink,
+    menuItems,
+    breadcrumbs,
+    customActions,
+    hasTabs,
+  } = props;
   const { classNames } = useStyles('Header');
-
+  let navigate = useNavigate();
   const { scrollY } = useScroll();
   const breadcrumbOpacity = useTransform(scrollY, [80, 120], [0, 1]);
 
@@ -87,80 +96,91 @@ export const HeaderToolbar = (props: HeaderToolbarProps) => {
     };
   }, []);
 
+  const titleContent = (
+    <>
+      <div className={classNames.toolbarIcon}>{icon || <RiShapesLine />}</div>
+      <Text variant="body">{title || 'Your plugin'}</Text>
+    </>
+  );
+
   return (
-    <div className={classNames.toolbar} data-has-tabs={hasTabs}>
-      <div className={classNames.toolbarWrapper} ref={toolbarWrapperRef}>
-        <div className={classNames.toolbarContent} ref={toolbarContentRef}>
-          <div className={classNames.toolbarName}>
-            <div className={classNames.toolbarIcon}>
-              {icon || <RiShapesLine />}
-            </div>
-            <Text variant="body">{title || 'Your plugin'}</Text>
+    <RouterProvider navigate={navigate} useHref={useHref}>
+      {' '}
+      <div className={classNames.toolbar} data-has-tabs={hasTabs}>
+        <div className={classNames.toolbarWrapper} ref={toolbarWrapperRef}>
+          <div className={classNames.toolbarContent} ref={toolbarContentRef}>
+            {titleLink ? (
+              <Link className={classNames.toolbarName} href={titleLink}>
+                {titleContent}
+              </Link>
+            ) : (
+              <div className={classNames.toolbarName}>{titleContent}</div>
+            )}
+            {breadcrumbs && (
+              <motion.div
+                className={classNames.breadcrumbs}
+                style={{
+                  opacity: breadcrumbOpacity,
+                  visibility: showBreadcrumbs ? 'visible' : 'hidden',
+                }}
+              >
+                <RiArrowRightSLine
+                  size={16}
+                  className={classNames.breadcrumbSeparator}
+                />
+                {breadcrumbs.map((breadcrumb, index) => (
+                  <div key={breadcrumb.label} className={classNames.breadcrumb}>
+                    <Link
+                      href={breadcrumb.href}
+                      className={classNames.breadcrumbLink}
+                      data-active={index === breadcrumbs.length - 1}
+                    >
+                      {breadcrumb.label}
+                    </Link>
+                    {index < breadcrumbs.length - 1 && (
+                      <RiArrowRightSLine
+                        size={16}
+                        className={classNames.breadcrumbSeparator}
+                      />
+                    )}
+                  </div>
+                ))}
+              </motion.div>
+            )}
           </div>
-          {breadcrumbs && (
-            <motion.div
-              className={classNames.breadcrumbs}
-              style={{
-                opacity: breadcrumbOpacity,
-                visibility: showBreadcrumbs ? 'visible' : 'hidden',
-              }}
-            >
-              <RiArrowRightSLine
-                size={16}
-                className={classNames.breadcrumbSeparator}
-              />
-              {breadcrumbs.map((breadcrumb, index) => (
-                <div key={breadcrumb.label} className={classNames.breadcrumb}>
-                  <Link
-                    href={breadcrumb.href}
-                    className={classNames.breadcrumbLink}
-                    data-active={index === breadcrumbs.length - 1}
-                  >
-                    {breadcrumb.label}
-                  </Link>
-                  {index < breadcrumbs.length - 1 && (
-                    <RiArrowRightSLine
-                      size={16}
-                      className={classNames.breadcrumbSeparator}
+          <div className={classNames.toolbarControls} ref={toolbarControlsRef}>
+            {customActions}
+            {menuItems && (
+              <Menu.Root>
+                <Menu.Trigger
+                  render={props => (
+                    <ButtonIcon
+                      size="small"
+                      icon={<RiMore2Line />}
+                      variant="tertiary"
+                      {...props}
                     />
                   )}
-                </div>
-              ))}
-            </motion.div>
-          )}
-        </div>
-        <div className={classNames.toolbarControls} ref={toolbarControlsRef}>
-          {customActions}
-          {menuItems && (
-            <Menu.Root>
-              <Menu.Trigger
-                render={props => (
-                  <ButtonIcon
-                    size="small"
-                    icon={<RiMore2Line />}
-                    variant="tertiary"
-                    {...props}
-                  />
-                )}
-              />
-              <Menu.Portal>
-                <Menu.Positioner sideOffset={4} align="end">
-                  <Menu.Popup>
-                    {menuItems.map(option => (
-                      <Menu.Item
-                        key={option.value}
-                        onClick={() => option.onClick?.()}
-                      >
-                        {option.label}
-                      </Menu.Item>
-                    ))}
-                  </Menu.Popup>
-                </Menu.Positioner>
-              </Menu.Portal>
-            </Menu.Root>
-          )}
+                />
+                <Menu.Portal>
+                  <Menu.Positioner sideOffset={4} align="end">
+                    <Menu.Popup>
+                      {menuItems.map(option => (
+                        <Menu.Item
+                          key={option.value}
+                          onClick={() => option.onClick?.()}
+                        >
+                          {option.label}
+                        </Menu.Item>
+                      ))}
+                    </Menu.Popup>
+                  </Menu.Positioner>
+                </Menu.Portal>
+              </Menu.Root>
+            )}
+          </div>
         </div>
       </div>
-    </div>
+    </RouterProvider>
   );
 };
diff --git a/packages/ui/src/components/Header/types.ts b/packages/ui/src/components/Header/types.ts
index cf76929389..5f3eceec5b 100644
--- a/packages/ui/src/components/Header/types.ts
+++ b/packages/ui/src/components/Header/types.ts
@@ -24,6 +24,7 @@ import { TabsProps } from 'react-aria-components';
 export interface HeaderProps {
   icon?: React.ReactNode;
   title?: string;
+  titleLink?: string;
   breadcrumbs?: HeaderBreadcrumb[];
   customActions?: React.ReactNode;
   menuItems?: HeaderMenuItem[];
@@ -71,6 +72,7 @@ export interface HeaderBreadcrumb {
 export interface HeaderToolbarProps {
   icon?: HeaderProps['icon'];
   title?: HeaderProps['title'];
+  titleLink?: HeaderProps['titleLink'];
   breadcrumbs?: HeaderProps['breadcrumbs'];
   customActions?: HeaderProps['customActions'];
   menuItems?: HeaderProps['menuItems'];