Revert "Merge pull request #9741 from quarto-dev/website/sidebar-global"

This reverts commit 7d24d71, reversing
changes made to 024b610.

Author: cderv

news/changelog-1.5.md

@@ -61,7 +61,6 @@ All changes included in 1.5:
 - ([#8977](https://github.com/quarto-dev/quarto-cli/issues/8977)): Don't decorate about links within external link icons.
 - ([#8986](https://github.com/quarto-dev/quarto-cli/issues/8986)): Search: only build subfuse index when it's safe to do so.
 - ([#9356](https://github.com/quarto-dev/quarto-cli/issues/9356)): Don't process column classes for figures inside the About divs.
-- ([#9741](https://github.com/quarto-dev/quarto-cli/issues/9741)): Sidebar is correctly shown globally when title is used in the `sidebar` configuration.
 - ([#9781](https://github.com/quarto-dev/quarto-cli/issues/9781)): Correctly hide elements from click event in collapsed margin sidebar.
 
 ## Book

src/project/types/website/website-navigation.ts

@@ -288,11 +288,6 @@ export async function websiteNavigationExtras(
   const href = target?.outputHref || inputFileHref(inputRelative);
   const sidebar = sidebarForHref(href, format);
 
-  // if the sidebar has a title and no id generate the id
-  if (sidebar && sidebar.title && !sidebar.id) {
-    sidebar.id = asHtmlId(sidebar.title);
-  }
-
   // Forward the draft mode, if present
   const draftMode = projectDraftMode(project);
 
@@ -1008,6 +1003,11 @@ async function sidebarsEjsData(project: ProjectContext, sidebars: Sidebar[]) {
 async function sidebarEjsData(project: ProjectContext, sidebar: Sidebar) {
   sidebar = ld.cloneDeep(sidebar);
 
+  // if the sidebar has a title and no id generate the id
+  if (sidebar.title && !sidebar.id) {
+    sidebar.id = asHtmlId(sidebar.title);
+  }
+
   // ensure title and search are present
   sidebar.title = sidebarTitle(sidebar, project) as string | undefined;
   sidebar.logo = resolveLogo(sidebar.logo);

src/project/types/website/website-shared.ts

@@ -342,21 +342,20 @@ export const navigation: Navigation = {
 };
 
 export function sidebarForHref(href: string, format: Format) {
-  const sidebars = ld.cloneDeep(navigation.sidebars) as Sidebar[];
   // if there is a single sidebar then it applies to all hrefs
   // (unless it has an id, in which restrict it)
   if (
-    sidebars.length === 1 && sidebars[0].id === undefined
+    navigation.sidebars.length === 1 && navigation.sidebars[0].id === undefined
   ) {
-    return sidebars[0];
+    return navigation.sidebars[0];
   } else {
-    const explicitSidebar = sidebars.find((sidebar) => {
+    const explicitSidebar = navigation.sidebars.find((sidebar) => {
       return sidebar.id === format.metadata[kSiteSidebar];
     });
     if (explicitSidebar) {
       return explicitSidebar;
     } else {
-      const containingSidebar = sidebars.find((sidebar) => {
+      const containingSidebar = navigation.sidebars.find((sidebar) => {
         return containsHref(href, sidebar.contents);
       });
       if (containingSidebar) {