From d812b3c0b94af6ac227c9798a563fabbf482b2f7 Mon Sep 17 00:00:00 2001
From: Earlopain <14981592+Earlopain@users.noreply.github.com>
Date: Sat, 7 Feb 2026 19:41:27 +0100
Subject: [PATCH] Add sections to the TOC

They are currently in the left sidebar but they don't make much sense there I believe.
Now they are in the TOC with the other headers.

If a heading is part of a section, its indentation is incremented by one level.
---
 .../generator/template/aliki/_icons.rhtml     | 53 -------------------
 .../template/aliki/_sidebar_sections.rhtml    | 21 --------
 lib/rdoc/generator/template/aliki/class.rhtml |  3 +-
 .../generator/template/aliki/css/rdoc.css     | 12 ++++-
 lib/rdoc/generator/template/aliki/js/aliki.js | 17 ++++--
 5 files changed, 24 insertions(+), 82 deletions(-)
 delete mode 100644 lib/rdoc/generator/template/aliki/_sidebar_sections.rhtml

diff --git a/lib/rdoc/generator/template/aliki/_icons.rhtml b/lib/rdoc/generator/template/aliki/_icons.rhtml
index 9c11a4a120..1ca4f7e73b 100644
--- a/lib/rdoc/generator/template/aliki/_icons.rhtml
+++ b/lib/rdoc/generator/template/aliki/_icons.rhtml
@@ -152,57 +152,4 @@
     <circle cx="8.5" cy="7" r="4"></circle>
     <polyline points="17 11 19 13 23 9"></polyline>
   </symbol>
-
-  <!-- List - Sections section -->
-  <symbol
-    id="icon-list"
-    viewBox="0 0 24 24"
-    fill="none"
-    stroke="currentColor"
-    stroke-width="2"
-    stroke-linecap="round"
-    stroke-linejoin="round"
-  >
-    <line
-      x1="8"
-      y1="6"
-      x2="21"
-      y2="6"
-    ></line>
-
-    <line
-      x1="8"
-      y1="12"
-      x2="21"
-      y2="12"
-    ></line>
-
-    <line
-      x1="8"
-      y1="18"
-      x2="21"
-      y2="18"
-    ></line>
-
-    <line
-      x1="3"
-      y1="6"
-      x2="3.01"
-      y2="6"
-    ></line>
-
-    <line
-      x1="3"
-      y1="12"
-      x2="3.01"
-      y2="12"
-    ></line>
-
-    <line
-      x1="3"
-      y1="18"
-      x2="3.01"
-      y2="18"
-    ></line>
-  </symbol>
 </svg>
diff --git a/lib/rdoc/generator/template/aliki/_sidebar_sections.rhtml b/lib/rdoc/generator/template/aliki/_sidebar_sections.rhtml
deleted file mode 100644
index 9ff56e6f60..0000000000
--- a/lib/rdoc/generator/template/aliki/_sidebar_sections.rhtml
+++ /dev/null
@@ -1,21 +0,0 @@
-<%- unless klass.sections.length == 1 then %>
-<div id="sections-section" class="nav-section">
-  <details class="nav-section-collapsible" open>
-    <summary class="nav-section-header">
-      <span class="nav-section-icon">
-        <svg><use href="#icon-list"></use></svg>
-      </span>
-      <span class="nav-section-title">Sections</span>
-      <span class="nav-section-chevron">
-        <svg><use href="#icon-chevron"></use></svg>
-      </span>
-    </summary>
-
-    <ul class="nav-list" role="directory">
-      <%- klass.sort_sections.each do |section| %>
-        <li><a href="#<%= section.aref %>"><%= h section.title %></a></li>
-      <%- end %>
-    </ul>
-  </details>
-</div>
-<%- end %>
diff --git a/lib/rdoc/generator/template/aliki/class.rhtml b/lib/rdoc/generator/template/aliki/class.rhtml
index 7c571bc88b..c7e4a84802 100644
--- a/lib/rdoc/generator/template/aliki/class.rhtml
+++ b/lib/rdoc/generator/template/aliki/class.rhtml
@@ -5,7 +5,6 @@
 
 <nav id="navigation" role="navigation" hidden>
   <%= render '_sidebar_pages.rhtml' %>
-  <%= render '_sidebar_sections.rhtml' %>
   <%= render '_sidebar_ancestors.rhtml' %>
   <%= render '_sidebar_includes.rhtml' %>
   <%= render '_sidebar_extends.rhtml' %>
@@ -40,7 +39,7 @@
 
   <%- klass.each_section do |section, constants, attributes| %>
   <span id="<%= section.legacy_aref %>" class="legacy-anchor"></span>
-  <section id="<%= section.aref %>" class="documentation-section anchor-link">
+  <section id="<%= section.aref %>" class="documentation-section <%= "documentation-section-toplevel " unless section.title %>anchor-link">
     <%- if section.title then %>
     <header class="documentation-section-title">
       <h2>
diff --git a/lib/rdoc/generator/template/aliki/css/rdoc.css b/lib/rdoc/generator/template/aliki/css/rdoc.css
index 25a3f43076..16330bf592 100644
--- a/lib/rdoc/generator/template/aliki/css/rdoc.css
+++ b/lib/rdoc/generator/template/aliki/css/rdoc.css
@@ -1622,14 +1622,22 @@ aside.table-of-contents .toc-sticky nav {
   height: auto;
 }
 
-aside.table-of-contents .toc-list > .toc-h2 {
+aside.table-of-contents .toc-list > .toc-depth-0 {
+  margin-left: 0;
+}
+
+aside.table-of-contents .toc-list > .toc-depth-1 {
   margin-left: var(--space-4);
 }
 
-aside.table-of-contents .toc-list > .toc-h3 {
+aside.table-of-contents .toc-list > .toc-depth-2 {
   margin-left: var(--space-8);
 }
 
+aside.table-of-contents .toc-list > .toc-depth-3 {
+  margin-left: var(--space-12);
+}
+
 /* Hide TOC on mobile/tablet */
 @media (width <= 1279px) {
   aside.table-of-contents {
diff --git a/lib/rdoc/generator/template/aliki/js/aliki.js b/lib/rdoc/generator/template/aliki/js/aliki.js
index 7883132b00..695a669e57 100644
--- a/lib/rdoc/generator/template/aliki/js/aliki.js
+++ b/lib/rdoc/generator/template/aliki/js/aliki.js
@@ -196,6 +196,8 @@ function hookSidebar() {
 
 /* ===== Right Sidebar Table of Contents ===== */
 
+const headerToDepth = { "h1": 0, "h2": 1, "h3": 2, "section": 1 };
+
 function generateToc() {
   const tocNav = document.querySelector('#toc-nav');
   if (!tocNav) return; // Exit if TOC nav doesn't exist
@@ -204,7 +206,7 @@ function generateToc() {
   if (!main) return;
 
   // Find all h2 and h3 headings in the main content
-  const headings = main.querySelectorAll('h1, h2, h3');
+  const headings = main.querySelectorAll('h1, h2, h3, .documentation-section:not(.documentation-section-toplevel)');
   if (headings.length === 0) return;
 
   const tocList = document.createElement('ul');
@@ -214,15 +216,22 @@ function generateToc() {
     // Skip if heading doesn't have an id
     if (!heading.id) return;
 
+    let level = headerToDepth[heading.tagName.toLowerCase()];
+    if (heading.closest(".documentation-section:not(.documentation-section-toplevel)")) {
+      level += 1;
+    }
     const li = document.createElement('li');
-    const level = heading.tagName.toLowerCase();
-    li.className = `toc-item toc-${level}`;
+    li.className = `toc-item toc-depth-${level}`;
 
     const link = document.createElement('a');
     link.href = `#${heading.id}`;
     link.className = 'toc-link';
-    link.textContent = heading.textContent.trim();
     link.setAttribute('data-target', heading.id);
+    if (heading.tagName.toLowerCase() === "section") {
+      link.textContent = heading.querySelector(".documentation-section-title").textContent;
+    } else {
+      link.textContent = heading.textContent.trim();
+    }
 
     li.appendChild(link);
     setHeadingScrollHandler(heading, link);