From e75c46b7ca0d10c2bc15d0329acf6cc5c9de9c3f Mon Sep 17 00:00:00 2001
From: Amp <amp@ampcode.com>
Date: Tue, 29 Sep 2026 09:23:51 +0000
Subject: [PATCH 01/11] Share Aliki class navigation across generated pages

Generate one navigation data file and lazily render namespace branches.
Keep a static class index for crawlability and offline fallback, and refresh
navigation data with live-preview changes.

Amp-Thread-ID: https://ampcode.com/threads/T-01a0ea31-9f66-7342-a269-34772e5428db
Co-authored-by: Stanislav Katkov <krooni@skatkov.com>
---
 lib/rdoc/generator/aliki.rb                   | 35 ++++++++
 .../generator/template/aliki/_footer.rhtml    |  1 +
 lib/rdoc/generator/template/aliki/_head.rhtml | 10 +++
 .../template/aliki/_sidebar_classes.rhtml     |  3 +-
 .../generator/template/aliki/js/navigation.js | 53 +++++++++++++
 .../template/aliki/table_of_contents.rhtml    | 30 +++++++
 lib/rdoc/server.rb                            |  6 +-
 test/rdoc/generator/aliki/navigation_test.rb  | 79 +++++++++++++++++++
 test/rdoc/generator/aliki_test.rb             | 55 +++++++++++++
 test/rdoc/rdoc_server_test.rb                 | 21 +++++
 10 files changed, 290 insertions(+), 3 deletions(-)
 create mode 100644 lib/rdoc/generator/template/aliki/js/navigation.js
 create mode 100644 lib/rdoc/generator/template/aliki/table_of_contents.rhtml
 create mode 100644 test/rdoc/generator/aliki/navigation_test.rb

diff --git a/lib/rdoc/generator/aliki.rb b/lib/rdoc/generator/aliki.rb
index 5157283b3a..09e21510fa 100644
--- a/lib/rdoc/generator/aliki.rb
+++ b/lib/rdoc/generator/aliki.rb
@@ -34,6 +34,7 @@ def generate
         generate_file_files
         generate_table_of_contents
         write_search_index
+        write_navigation_index
 
         copy_static
 
@@ -121,6 +122,40 @@ def write_search_index
         File.write search_index_path, "var search_data = #{JSON.generate(data)};"
       end
 
+      ##
+      # Builds the shared class tree in sidebar order. Hidden namespaces retain
+      # their visible descendants, but do not receive links of their own.
+
+      def build_navigation_index
+        setup
+        grouped = @classes.group_by { |klass| klass.full_name.rpartition('::').first }
+        build_nodes = ->(classes) {
+          classes.filter_map do |klass|
+            children = build_nodes.call(grouped[klass.full_name] || [])
+            next unless klass.display? || !children.empty?
+
+            {
+              name: klass.name,
+              full_name: klass.full_name,
+              path: klass.display? ? klass.path : nil,
+              children: children
+            }
+          end
+        }
+        build_nodes.call(grouped[''] || [])
+      end
+
+      ##
+      # Like search data, navigation uses a classic script so file:// works
+      # without fetch or a web server.
+
+      def write_navigation_index
+        return if @dry_run
+
+        FileUtils.mkdir_p 'js'
+        File.write 'js/navigation_data.js', "var navigation_data = #{JSON.generate(build_navigation_index, max_nesting: false)};"
+      end
+
       ##
       # Returns the type signature of +method_attr+ as HTML with linked type names.
       # Returns nil if no type signature is present.
diff --git a/lib/rdoc/generator/template/aliki/_footer.rhtml b/lib/rdoc/generator/template/aliki/_footer.rhtml
index ae2f831443..ef46dac4e6 100644
--- a/lib/rdoc/generator/template/aliki/_footer.rhtml
+++ b/lib/rdoc/generator/template/aliki/_footer.rhtml
@@ -15,6 +15,7 @@
   <% end %>
 
   <div class="footer-bottom">
+    <p><a href="<%= h rel_prefix %>/table_of_contents.html#classes">All classes and modules</a></p>
     <p>
       Generated by <a href="https://ruby.github.io/rdoc/">RDoc <%= VERSION %></a>
       using the Aliki theme by <a href="http://st0012.dev">Stan Lo</a>
diff --git a/lib/rdoc/generator/template/aliki/_head.rhtml b/lib/rdoc/generator/template/aliki/_head.rhtml
index 96ba1d65e5..f393b21d84 100644
--- a/lib/rdoc/generator/template/aliki/_head.rhtml
+++ b/lib/rdoc/generator/template/aliki/_head.rhtml
@@ -125,6 +125,16 @@
   defer
 ></script>
 
+<script
+  src="<%= h asset_rel_prefix %>/js/navigation_data.js?v=<%= h VERSION %>"
+  defer
+></script>
+
+<script
+  src="<%= h asset_rel_prefix %>/js/navigation.js?v=<%= h VERSION %>"
+  defer
+></script>
+
 <script
   src="<%= h asset_rel_prefix %>/js/search_ranker.js?v=<%= h VERSION %>"
   defer
diff --git a/lib/rdoc/generator/template/aliki/_sidebar_classes.rhtml b/lib/rdoc/generator/template/aliki/_sidebar_classes.rhtml
index 11ff53e1de..561506dc51 100644
--- a/lib/rdoc/generator/template/aliki/_sidebar_classes.rhtml
+++ b/lib/rdoc/generator/template/aliki/_sidebar_classes.rhtml
@@ -10,6 +10,7 @@
       </span>
     </summary>
 
-    <%= generate_class_index_content(@classes, rel_prefix) %>
+    <div id="class-navigation" data-current-class="<%= h(defined?(klass) ? klass.full_name : '') %>"></div>
+    <a href="<%= h rel_prefix %>/table_of_contents.html#classes">All classes and modules</a>
   </details>
 </div>
diff --git a/lib/rdoc/generator/template/aliki/js/navigation.js b/lib/rdoc/generator/template/aliki/js/navigation.js
new file mode 100644
index 0000000000..f211c5cbc1
--- /dev/null
+++ b/lib/rdoc/generator/template/aliki/js/navigation.js
@@ -0,0 +1,53 @@
+'use strict';
+
+// Share the class tree across pages without constructing the whole tree's DOM.
+function buildClassNavigation(container, nodes, prefix, current) {
+  function renderBranch(entries, expandSingleRoot = false) {
+    const list = document.createElement('ul');
+    list.className = 'link-list nav-list';
+
+    entries.forEach((node) => {
+      const item = document.createElement('li');
+      const code = document.createElement('code');
+      if (node.path) {
+        const link = document.createElement('a');
+        link.href = prefix + node.path;
+        link.textContent = node.name;
+        if (node.full_name === current) link.setAttribute('aria-current', 'page');
+        code.appendChild(link);
+      } else {
+        code.textContent = node.name;
+      }
+
+      if (node.children.length) {
+        const details = document.createElement('details');
+        const summary = document.createElement('summary');
+        summary.appendChild(code);
+        details.appendChild(summary);
+        let populated = false;
+        const populate = () => {
+          if (!details.open || populated) return;
+          details.appendChild(renderBranch(node.children));
+          populated = true;
+        };
+        details.addEventListener('toggle', populate);
+        details.open = expandSingleRoot || node.full_name === current ||
+          current.startsWith(node.full_name + '::');
+        populate();
+        item.appendChild(details);
+      } else {
+        item.appendChild(code);
+      }
+      list.appendChild(item);
+    });
+    return list;
+  }
+
+  container.replaceChildren(renderBranch(nodes, nodes.length === 1));
+}
+
+document.addEventListener('DOMContentLoaded', () => {
+  const container = document.getElementById('class-navigation');
+  if (!container || typeof navigation_data === 'undefined') return;
+  buildClassNavigation(container, navigation_data, index_rel_prefix, container.dataset.currentClass);
+});
diff --git a/lib/rdoc/generator/template/aliki/table_of_contents.rhtml b/lib/rdoc/generator/template/aliki/table_of_contents.rhtml
new file mode 100644
index 0000000000..bdce7a7168
--- /dev/null
+++ b/lib/rdoc/generator/template/aliki/table_of_contents.rhtml
@@ -0,0 +1,30 @@
+<body role="document" class="file has-toc">
+<%= render '_icons.rhtml' %>
+<%= render '_header.rhtml' %>
+<%= render '_sidebar_toggle.rhtml' %>
+
+<nav id="sidebar-navigation" role="navigation" hidden>
+  <%= render '_sidebar_pages.rhtml' %>
+  <%= render '_sidebar_classes.rhtml' %>
+</nav>
+
+<main role="main">
+  <h1>Table of Contents</h1>
+  <h2 id="pages">Pages</h2>
+  <ul>
+    <%- @files.select(&:text?).each do |file| %>
+    <li><a href="<%= h file.path %>"><%= h file.page_name %></a></li>
+    <%- end %>
+  </ul>
+
+  <h2 id="classes">Classes and Modules</h2>
+  <ul>
+    <%- @modsort.each do |klass| %>
+    <li><a href="<%= h klass.path %>"><%= h klass.full_name %></a></li>
+    <%- end %>
+  </ul>
+</main>
+
+<%= render '_aside_toc.rhtml' %>
+<%= render '_footer.rhtml' %>
+</body>
diff --git a/lib/rdoc/server.rb b/lib/rdoc/server.rb
index ee8021c7c9..6b6134a6bb 100644
--- a/lib/rdoc/server.rb
+++ b/lib/rdoc/server.rb
@@ -212,8 +212,8 @@ def route(path)
       when '/__status'
         t = @mutex.synchronize { @last_change_time }
         [200, 'application/json', JSON.generate(last_change: t)]
-      when '/js/search_data.js'
-        # Search data is dynamically generated, not a static asset
+      when '/js/search_data.js', '/js/navigation_data.js'
+        # Index data is dynamically generated, not a static asset
         serve_page(path)
       when %r{\A/(?:css|js)/}
         serve_asset(path)
@@ -307,6 +307,8 @@ def generate_page(name)
         @generator.generate_table_of_contents
       when 'js/search_data.js'
         "var search_data = #{JSON.generate(index: @generator.build_search_index)};"
+      when 'js/navigation_data.js'
+        "var navigation_data = #{JSON.generate(@generator.build_navigation_index, max_nesting: false)};"
       else
         text_name = name.chomp('.html')
         class_name = text_name.gsub('/', '::')
diff --git a/test/rdoc/generator/aliki/navigation_test.rb b/test/rdoc/generator/aliki/navigation_test.rb
new file mode 100644
index 0000000000..35a01dad4e
--- /dev/null
+++ b/test/rdoc/generator/aliki/navigation_test.rb
@@ -0,0 +1,79 @@
+# frozen_string_literal: true
+require_relative '../../helper'
+
+return if RUBY_DESCRIPTION =~ /truffleruby/ || RUBY_DESCRIPTION =~ /jruby/
+
+begin
+  require 'mini_racer'
+rescue LoadError
+  return
+end
+
+class RDocGeneratorAlikiNavigationTest < Test::Unit::TestCase
+  def setup
+    @context = MiniRacer::Context.new
+    @context.eval <<~JS
+      class Element {
+        constructor(tag) {
+          this.tag = tag;
+          this.children = [];
+          this.attributes = {};
+          this.listeners = {};
+        }
+        appendChild(child) { this.children.push(child); }
+        replaceChildren(child) { this.children = [child]; }
+        setAttribute(key, value) { this.attributes[key] = value; }
+        addEventListener(event, callback) { this.listeners[event] = callback; }
+        set innerHTML(value) { throw new Error('Navigation must use textContent'); }
+      }
+      const container = new Element('div');
+      const document = {
+        createElement: tag => new Element(tag),
+        addEventListener: () => {}
+      };
+      function elements(tag, root = container) {
+        return root.children.flatMap(child =>
+          (child.tag === tag ? [child] : []).concat(elements(tag, child)));
+      }
+      const nodes = [
+        {name: 'Foo', full_name: 'Foo', path: 'Foo.html', children: [
+          {name: '<Leaf>', full_name: 'Foo::Leaf', path: 'Foo/Leaf.html', children: []}
+        ]},
+        {name: 'FooBar', full_name: 'FooBar', path: null, children: [
+          {name: 'Child', full_name: 'FooBar::Child', path: 'FooBar/Child.html', children: []}
+        ]}
+      ];
+    JS
+    @context.eval File.read(File.expand_path('../../../../lib/rdoc/generator/template/aliki/js/navigation.js', __dir__))
+  end
+
+  def teardown
+    @context.dispose
+  end
+
+  def test_unopened_branches_are_lazy_and_only_populated_once
+    @context.eval "buildClassNavigation(container, nodes, '../', '')"
+    assert_equal ['Foo'], @context.eval('elements("a").map(link => link.textContent)')
+    @context.eval 'const branch = elements("details")[0]; branch.open = true; branch.listeners.toggle()'
+    assert_equal ['Foo', '<Leaf>'], @context.eval('elements("a").map(link => link.textContent)')
+    @context.eval 'branch.open = false; branch.listeners.toggle(); branch.open = true; branch.listeners.toggle()'
+    assert_equal 2, @context.eval('elements("a").length')
+  end
+
+  def test_current_namespace_opens_without_matching_similar_prefixes
+    @context.eval "buildClassNavigation(container, nodes, '../../', 'FooBar::Child')"
+    assert_equal [false, true], @context.eval('elements("details").map(branch => branch.open)')
+    assert_equal ['../../Foo.html', '../../FooBar/Child.html'], @context.eval('elements("a").map(link => link.href)')
+    assert_equal ['page'], @context.eval('elements("a").map(link => link.attributes["aria-current"]).filter(Boolean)')
+  end
+
+  def test_single_root_expands_but_grandchildren_remain_lazy
+    @context.eval <<~JS
+      buildClassNavigation(container, [
+        {name: 'Root', full_name: 'Root', path: 'Root.html', children: nodes}
+      ], './', '');
+    JS
+    assert_equal [true, false, false], @context.eval('elements("details").map(branch => branch.open)')
+    assert_equal ['Root', 'Foo'], @context.eval('elements("a").map(link => link.textContent)')
+  end
+end
diff --git a/test/rdoc/generator/aliki_test.rb b/test/rdoc/generator/aliki_test.rb
index f38f27d1dd..64cb95d965 100644
--- a/test/rdoc/generator/aliki_test.rb
+++ b/test/rdoc/generator/aliki_test.rb
@@ -84,6 +84,7 @@ def test_write_style_sheet_copies_css_and_js_only
     # Aliki should have these assets
     assert_file 'css/rdoc.css'
     assert_file 'js/aliki.js'
+    assert_file 'js/navigation.js'
     assert_file 'js/search_controller.js'
     assert_file 'js/search_navigation.js'
     assert_file 'js/search_ranker.js'
@@ -241,6 +242,58 @@ def test_generate
     assert_match %r{<main role="main">}, index
   end
 
+  def test_shared_class_navigation
+    @klass.add_class RDoc::NormalClass, 'Inner'
+    @g.generate
+
+    data = JSON.parse(File.read('js/navigation_data.js').delete_prefix('var navigation_data = ').delete_suffix(';'))
+    klass = data.find { |entry| entry['full_name'] == 'Klass' }
+    assert_equal 'Klass.html', klass['path']
+    assert_equal %w[Klass::A Klass::Inner], klass['children'].map { |entry| entry['full_name'] }
+    assert_equal 'Klass/Inner.html', klass['children'].last['path']
+
+    page = File.read('Klass/Inner.html')
+    assert_include page, 'data-current-class="Klass::Inner"'
+    assert_include page, '../js/navigation_data.js?v='
+    assert_include page, '../table_of_contents.html#classes'
+    sidebar = page[/<div id="classindex-section".*?<\/nav>/m]
+    assert_not_include sidebar, '<a href="../Klass.html">Klass</a>'
+
+    index = File.read('table_of_contents.html')
+    assert_include index, '<a href="Klass/Inner.html">Klass::Inner</a>'
+    assert_include index, '<a href="Klass.html">Klass</a>'
+  end
+
+  def test_navigation_preserves_hidden_namespace_and_omits_hidden_leaf
+    @klass = @top_level.add_class RDoc::NormalClass, 'HiddenRoot'
+    inner = @klass.add_class RDoc::NormalClass, 'Inner'
+    leaf = inner.add_class RDoc::NormalClass, 'Leaf'
+    hidden = @klass.add_class RDoc::NormalClass, 'Hidden'
+    hidden.document_self = false
+    inner.document_self = false
+    @klass.document_self = false
+
+    data = @g.build_navigation_index
+    klass = data.find { |entry| entry[:full_name] == 'HiddenRoot' }
+    assert_nil klass[:path]
+    assert_not_include klass[:children].map { |entry| entry[:full_name] }, hidden.full_name
+    branch = klass[:children].find { |entry| entry[:full_name] == inner.full_name }
+    assert_nil branch[:path]
+    assert_equal [leaf.path], branch[:children].map { |entry| entry[:path] }
+  end
+
+  def test_navigation_data_supports_deep_namespaces
+    leaf = @klass
+    55.times { |i| leaf = leaf.add_class RDoc::NormalClass, "Level#{i}" }
+
+    @g.write_navigation_index
+
+    data = JSON.parse(File.read('js/navigation_data.js').delete_prefix('var navigation_data = ').delete_suffix(';'), max_nesting: false)
+    branch = data.find { |entry| entry['full_name'] == 'Klass' }
+    55.times { |i| branch = branch['children'].find { |entry| entry['name'] == "Level#{i}" } }
+    assert_equal leaf.path, branch['path']
+  end
+
   def test_canonical_url
     @klass.add_class RDoc::NormalClass, 'Inner'
     @store.options.canonical_root = @options.canonical_root = "https://example.com/docs/"
@@ -262,6 +315,8 @@ def test_dry_run_creates_no_files
     @g.generate
 
     refute_file 'index.html'
+    refute_file 'table_of_contents.html'
+    refute_file 'js/navigation_data.js'
     refute_file 'css/rdoc.css'
     refute_file 'js/aliki.js'
   end
diff --git a/test/rdoc/rdoc_server_test.rb b/test/rdoc/rdoc_server_test.rb
index 1a8a0f9909..cd50291e8b 100644
--- a/test/rdoc/rdoc_server_test.rb
+++ b/test/rdoc/rdoc_server_test.rb
@@ -71,6 +71,27 @@ def test_route_serves_index
     assert_equal 'text/html', content_type
   end
 
+  def test_navigation_data_refreshes_after_file_changes
+    status, content_type, body = @server.send(:route, '/js/navigation_data.js')
+    assert_equal 200, status
+    assert_equal 'application/javascript', content_type
+    assert_include body, 'Example.html'
+
+    @server.instance_variable_set(:@file_mtimes, @rdoc.last_modified.keys.to_h { |file|
+      [file, File.mtime(file)]
+    })
+    File.write File.join(@dir, 'added.rb'), "# Added class\nclass Added; end\n"
+    capture_output { assert @server.send(:check_for_changes) }
+    _, _, updated = @server.send(:route, '/js/navigation_data.js')
+    assert_include updated, 'Added.html'
+
+    File.unlink File.join(@dir, 'added.rb')
+    capture_output { assert @server.send(:check_for_changes) }
+    _, _, removed = @server.send(:route, '/js/navigation_data.js')
+    assert_not_include removed, 'Added.html'
+    assert_include removed, 'Example.html'
+  end
+
   def test_route_returns_404_for_missing_page
     status, content_type, _body = @server.send(:route, '/nonexistent.html')
 

From 98207231e5db200df33e333cac819ab390f12ebd Mon Sep 17 00:00:00 2001
From: "Stanislav (Stas) Katkov" <git@skatkov.com>
Date: Tue, 29 Sep 2026 11:59:57 +0200
Subject: [PATCH 02/11] Use existing search_data.index

---
 lib/rdoc/generator/aliki.rb                   | 35 --------------
 .../generator/template/aliki/_footer.rhtml    |  1 -
 lib/rdoc/generator/template/aliki/_head.rhtml |  5 --
 .../generator/template/aliki/js/navigation.js | 31 +++++++++++-
 lib/rdoc/server.rb                            |  6 +--
 test/rdoc/generator/aliki/navigation_test.rb  | 48 ++++++++++++++++++-
 test/rdoc/generator/aliki_test.rb             | 34 ++++++-------
 test/rdoc/rdoc_server_test.rb                 |  9 ++--
 8 files changed, 98 insertions(+), 71 deletions(-)

diff --git a/lib/rdoc/generator/aliki.rb b/lib/rdoc/generator/aliki.rb
index 09e21510fa..5157283b3a 100644
--- a/lib/rdoc/generator/aliki.rb
+++ b/lib/rdoc/generator/aliki.rb
@@ -34,7 +34,6 @@ def generate
         generate_file_files
         generate_table_of_contents
         write_search_index
-        write_navigation_index
 
         copy_static
 
@@ -122,40 +121,6 @@ def write_search_index
         File.write search_index_path, "var search_data = #{JSON.generate(data)};"
       end
 
-      ##
-      # Builds the shared class tree in sidebar order. Hidden namespaces retain
-      # their visible descendants, but do not receive links of their own.
-
-      def build_navigation_index
-        setup
-        grouped = @classes.group_by { |klass| klass.full_name.rpartition('::').first }
-        build_nodes = ->(classes) {
-          classes.filter_map do |klass|
-            children = build_nodes.call(grouped[klass.full_name] || [])
-            next unless klass.display? || !children.empty?
-
-            {
-              name: klass.name,
-              full_name: klass.full_name,
-              path: klass.display? ? klass.path : nil,
-              children: children
-            }
-          end
-        }
-        build_nodes.call(grouped[''] || [])
-      end
-
-      ##
-      # Like search data, navigation uses a classic script so file:// works
-      # without fetch or a web server.
-
-      def write_navigation_index
-        return if @dry_run
-
-        FileUtils.mkdir_p 'js'
-        File.write 'js/navigation_data.js', "var navigation_data = #{JSON.generate(build_navigation_index, max_nesting: false)};"
-      end
-
       ##
       # Returns the type signature of +method_attr+ as HTML with linked type names.
       # Returns nil if no type signature is present.
diff --git a/lib/rdoc/generator/template/aliki/_footer.rhtml b/lib/rdoc/generator/template/aliki/_footer.rhtml
index ef46dac4e6..ae2f831443 100644
--- a/lib/rdoc/generator/template/aliki/_footer.rhtml
+++ b/lib/rdoc/generator/template/aliki/_footer.rhtml
@@ -15,7 +15,6 @@
   <% end %>
 
   <div class="footer-bottom">
-    <p><a href="<%= h rel_prefix %>/table_of_contents.html#classes">All classes and modules</a></p>
     <p>
       Generated by <a href="https://ruby.github.io/rdoc/">RDoc <%= VERSION %></a>
       using the Aliki theme by <a href="http://st0012.dev">Stan Lo</a>
diff --git a/lib/rdoc/generator/template/aliki/_head.rhtml b/lib/rdoc/generator/template/aliki/_head.rhtml
index f393b21d84..d1ca4b7ad0 100644
--- a/lib/rdoc/generator/template/aliki/_head.rhtml
+++ b/lib/rdoc/generator/template/aliki/_head.rhtml
@@ -125,11 +125,6 @@
   defer
 ></script>
 
-<script
-  src="<%= h asset_rel_prefix %>/js/navigation_data.js?v=<%= h VERSION %>"
-  defer
-></script>
-
 <script
   src="<%= h asset_rel_prefix %>/js/navigation.js?v=<%= h VERSION %>"
   defer
diff --git a/lib/rdoc/generator/template/aliki/js/navigation.js b/lib/rdoc/generator/template/aliki/js/navigation.js
index f211c5cbc1..20ad2659ba 100644
--- a/lib/rdoc/generator/template/aliki/js/navigation.js
+++ b/lib/rdoc/generator/template/aliki/js/navigation.js
@@ -1,5 +1,32 @@
 'use strict';
 
+// Reuse the search index's visible classes and modules, adding unlinked
+// ancestors where a namespace is hidden but has visible descendants.
+function buildClassTree(index) {
+  const roots = [];
+  const byName = new Map();
+
+  index.forEach((entry) => {
+    if (entry.type !== 'class' && entry.type !== 'module') return;
+
+    let children = roots;
+    let fullName = '';
+    entry.full_name.split('::').forEach((name) => {
+      fullName = fullName ? fullName + '::' + name : name;
+      let node = byName.get(fullName);
+      if (!node) {
+        node = {name, full_name: fullName, path: null, children: []};
+        byName.set(fullName, node);
+        children.push(node);
+      }
+      children = node.children;
+    });
+    byName.get(fullName).path = entry.path;
+  });
+
+  return roots;
+}
+
 // Share the class tree across pages without constructing the whole tree's DOM.
 function buildClassNavigation(container, nodes, prefix, current) {
   function renderBranch(entries, expandSingleRoot = false) {
@@ -48,6 +75,6 @@ function buildClassNavigation(container, nodes, prefix, current) {
 
 document.addEventListener('DOMContentLoaded', () => {
   const container = document.getElementById('class-navigation');
-  if (!container || typeof navigation_data === 'undefined') return;
-  buildClassNavigation(container, navigation_data, index_rel_prefix, container.dataset.currentClass);
+  if (!container || typeof search_data === 'undefined') return;
+  buildClassNavigation(container, buildClassTree(search_data.index), index_rel_prefix, container.dataset.currentClass);
 });
diff --git a/lib/rdoc/server.rb b/lib/rdoc/server.rb
index 6b6134a6bb..ee8021c7c9 100644
--- a/lib/rdoc/server.rb
+++ b/lib/rdoc/server.rb
@@ -212,8 +212,8 @@ def route(path)
       when '/__status'
         t = @mutex.synchronize { @last_change_time }
         [200, 'application/json', JSON.generate(last_change: t)]
-      when '/js/search_data.js', '/js/navigation_data.js'
-        # Index data is dynamically generated, not a static asset
+      when '/js/search_data.js'
+        # Search data is dynamically generated, not a static asset
         serve_page(path)
       when %r{\A/(?:css|js)/}
         serve_asset(path)
@@ -307,8 +307,6 @@ def generate_page(name)
         @generator.generate_table_of_contents
       when 'js/search_data.js'
         "var search_data = #{JSON.generate(index: @generator.build_search_index)};"
-      when 'js/navigation_data.js'
-        "var navigation_data = #{JSON.generate(@generator.build_navigation_index, max_nesting: false)};"
       else
         text_name = name.chomp('.html')
         class_name = text_name.gsub('/', '::')
diff --git a/test/rdoc/generator/aliki/navigation_test.rb b/test/rdoc/generator/aliki/navigation_test.rb
index 35a01dad4e..2377107ab8 100644
--- a/test/rdoc/generator/aliki/navigation_test.rb
+++ b/test/rdoc/generator/aliki/navigation_test.rb
@@ -29,7 +29,9 @@ class Element {
       const container = new Element('div');
       const document = {
         createElement: tag => new Element(tag),
-        addEventListener: () => {}
+        listeners: {},
+        addEventListener(event, callback) { this.listeners[event] = callback; },
+        getElementById: id => id === 'class-navigation' ? container : null
       };
       function elements(tag, root = container) {
         return root.children.flatMap(child =>
@@ -76,4 +78,48 @@ def test_single_root_expands_but_grandchildren_remain_lazy
     assert_equal [true, false, false], @context.eval('elements("details").map(branch => branch.open)')
     assert_equal ['Root', 'Foo'], @context.eval('elements("a").map(link => link.textContent)')
   end
+
+  def test_tree_from_search_index_synthesizes_unlinked_ancestors
+    @context.eval <<~JS
+      const index = [
+        {type: 'class', full_name: 'Hidden::Middle::Leaf', path: 'Hidden/Middle/Leaf.html'},
+        {type: 'instance_method', full_name: 'Hidden::Middle::Leaf#call', path: 'Hidden/Middle/Leaf.html#method-i-call'},
+        {type: 'constant', full_name: 'Hidden::Middle::Leaf::VALUE', path: 'Hidden/Middle/Leaf.html'},
+        {type: 'module', full_name: 'Visible', path: 'Visible.html'},
+        {type: 'class', full_name: 'Visible::Child', path: 'Visible/Child.html'}
+      ];
+      const tree = buildClassTree(index);
+      buildClassNavigation(container, tree, '../', 'Hidden::Middle::Leaf');
+    JS
+
+    assert_equal ['Hidden', 'Middle', 'Leaf', 'Visible', 'Child'], @context.eval('tree.flatMap(node => [node.name, ...node.children.flatMap(child => [child.name, ...child.children.map(leaf => leaf.name)])])')
+    assert_equal ['../Hidden/Middle/Leaf.html', '../Visible.html'], @context.eval('elements("a").map(link => link.href)')
+    assert_equal ['page'], @context.eval('elements("a").map(link => link.attributes["aria-current"]).filter(Boolean)')
+  end
+
+  def test_visible_parent_is_linked_even_when_child_appears_first
+    @context.eval <<~JS
+      const tree = buildClassTree([
+        {type: 'class', full_name: 'Parent::Child', path: 'Parent/Child.html'},
+        {type: 'module', full_name: 'Parent', path: 'Parent.html'}
+      ]);
+    JS
+
+    assert_equal 'Parent.html', @context.eval('tree[0].path')
+    assert_equal 'Parent/Child.html', @context.eval('tree[0].children[0].path')
+  end
+
+  def test_navigation_initializes_from_loaded_search_data
+    @context.eval <<~JS
+      var search_data = {index: [
+        {type: 'class', full_name: 'Root::Child', path: 'Root/Child.html'}
+      ]};
+      var index_rel_prefix = '../';
+      container.dataset = {currentClass: 'Root::Child'};
+      document.listeners.DOMContentLoaded();
+    JS
+
+    assert_equal ['../Root/Child.html'], @context.eval('elements("a").map(link => link.href)')
+    assert_equal ['Root'], @context.eval('elements("code").filter(code => code.textContent).map(code => code.textContent)')
+  end
 end
diff --git a/test/rdoc/generator/aliki_test.rb b/test/rdoc/generator/aliki_test.rb
index 64cb95d965..882a142b5d 100644
--- a/test/rdoc/generator/aliki_test.rb
+++ b/test/rdoc/generator/aliki_test.rb
@@ -246,15 +246,14 @@ def test_shared_class_navigation
     @klass.add_class RDoc::NormalClass, 'Inner'
     @g.generate
 
-    data = JSON.parse(File.read('js/navigation_data.js').delete_prefix('var navigation_data = ').delete_suffix(';'))
-    klass = data.find { |entry| entry['full_name'] == 'Klass' }
-    assert_equal 'Klass.html', klass['path']
-    assert_equal %w[Klass::A Klass::Inner], klass['children'].map { |entry| entry['full_name'] }
-    assert_equal 'Klass/Inner.html', klass['children'].last['path']
+    data = JSON.parse(File.read('js/search_data.js').delete_prefix('var search_data = ').delete_suffix(';'))['index']
+    assert_include data.map { |entry| entry['full_name'] }, 'Klass::Inner'
+    refute_file 'js/navigation_data.js'
 
     page = File.read('Klass/Inner.html')
     assert_include page, 'data-current-class="Klass::Inner"'
-    assert_include page, '../js/navigation_data.js?v='
+    assert_include page, '../js/search_data.js?v='
+    assert_not_include page, '../js/navigation_data.js?v='
     assert_include page, '../table_of_contents.html#classes'
     sidebar = page[/<div id="classindex-section".*?<\/nav>/m]
     assert_not_include sidebar, '<a href="../Klass.html">Klass</a>'
@@ -273,25 +272,22 @@ def test_navigation_preserves_hidden_namespace_and_omits_hidden_leaf
     inner.document_self = false
     @klass.document_self = false
 
-    data = @g.build_navigation_index
-    klass = data.find { |entry| entry[:full_name] == 'HiddenRoot' }
-    assert_nil klass[:path]
-    assert_not_include klass[:children].map { |entry| entry[:full_name] }, hidden.full_name
-    branch = klass[:children].find { |entry| entry[:full_name] == inner.full_name }
-    assert_nil branch[:path]
-    assert_equal [leaf.path], branch[:children].map { |entry| entry[:path] }
+    data = @g.build_search_index
+    names = data.map { |entry| entry[:full_name] }
+    assert_include names, leaf.full_name
+    assert_not_include names, @klass.full_name
+    assert_not_include names, inner.full_name
+    assert_not_include names, hidden.full_name
   end
 
-  def test_navigation_data_supports_deep_namespaces
+  def test_search_data_supports_deep_namespaces
     leaf = @klass
     55.times { |i| leaf = leaf.add_class RDoc::NormalClass, "Level#{i}" }
 
-    @g.write_navigation_index
+    @g.write_search_index
 
-    data = JSON.parse(File.read('js/navigation_data.js').delete_prefix('var navigation_data = ').delete_suffix(';'), max_nesting: false)
-    branch = data.find { |entry| entry['full_name'] == 'Klass' }
-    55.times { |i| branch = branch['children'].find { |entry| entry['name'] == "Level#{i}" } }
-    assert_equal leaf.path, branch['path']
+    data = JSON.parse(File.read('js/search_data.js').delete_prefix('var search_data = ').delete_suffix(';'))['index']
+    assert_equal leaf.path, data.find { |entry| entry['full_name'] == leaf.full_name }['path']
   end
 
   def test_canonical_url
diff --git a/test/rdoc/rdoc_server_test.rb b/test/rdoc/rdoc_server_test.rb
index cd50291e8b..0e2fe5adab 100644
--- a/test/rdoc/rdoc_server_test.rb
+++ b/test/rdoc/rdoc_server_test.rb
@@ -71,23 +71,24 @@ def test_route_serves_index
     assert_equal 'text/html', content_type
   end
 
-  def test_navigation_data_refreshes_after_file_changes
-    status, content_type, body = @server.send(:route, '/js/navigation_data.js')
+  def test_search_data_refreshes_after_file_changes
+    status, content_type, body = @server.send(:route, '/js/search_data.js')
     assert_equal 200, status
     assert_equal 'application/javascript', content_type
     assert_include body, 'Example.html'
+    assert_equal 404, @server.send(:route, '/js/navigation_data.js').first
 
     @server.instance_variable_set(:@file_mtimes, @rdoc.last_modified.keys.to_h { |file|
       [file, File.mtime(file)]
     })
     File.write File.join(@dir, 'added.rb'), "# Added class\nclass Added; end\n"
     capture_output { assert @server.send(:check_for_changes) }
-    _, _, updated = @server.send(:route, '/js/navigation_data.js')
+    _, _, updated = @server.send(:route, '/js/search_data.js')
     assert_include updated, 'Added.html'
 
     File.unlink File.join(@dir, 'added.rb')
     capture_output { assert @server.send(:check_for_changes) }
-    _, _, removed = @server.send(:route, '/js/navigation_data.js')
+    _, _, removed = @server.send(:route, '/js/search_data.js')
     assert_not_include removed, 'Added.html'
     assert_include removed, 'Example.html'
   end

From 7d98fa2e32293221c5fe496b6199e63c8a110a58 Mon Sep 17 00:00:00 2001
From: "Stanislav (Stas) Katkov" <git@skatkov.com>
Date: Tue, 29 Sep 2026 12:08:05 +0200
Subject: [PATCH 03/11] navigation should renders into root <ul>

---
 .../generator/template/aliki/_sidebar_classes.rhtml |  2 +-
 lib/rdoc/generator/template/aliki/css/rdoc.css      | 12 ++++++------
 lib/rdoc/generator/template/aliki/js/navigation.js  |  9 +++++----
 .../template/aliki/table_of_contents.rhtml          |  7 -------
 test/rdoc/generator/aliki/navigation_test.rb        |  8 ++++++--
 test/rdoc/generator/aliki_test.rb                   | 13 -------------
 test/rdoc/rdoc_server_test.rb                       |  1 -
 7 files changed, 18 insertions(+), 34 deletions(-)

diff --git a/lib/rdoc/generator/template/aliki/_sidebar_classes.rhtml b/lib/rdoc/generator/template/aliki/_sidebar_classes.rhtml
index 561506dc51..5d7805697f 100644
--- a/lib/rdoc/generator/template/aliki/_sidebar_classes.rhtml
+++ b/lib/rdoc/generator/template/aliki/_sidebar_classes.rhtml
@@ -10,7 +10,7 @@
       </span>
     </summary>
 
-    <div id="class-navigation" data-current-class="<%= h(defined?(klass) ? klass.full_name : '') %>"></div>
+    <ul id="class-navigation" class="link-list nav-list" data-current-class="<%= h(defined?(klass) ? klass.full_name : '') %>"></ul>
     <a href="<%= h rel_prefix %>/table_of_contents.html#classes">All classes and modules</a>
   </details>
 </div>
diff --git a/lib/rdoc/generator/template/aliki/css/rdoc.css b/lib/rdoc/generator/template/aliki/css/rdoc.css
index 36c3ead1e9..e9ce50f68e 100644
--- a/lib/rdoc/generator/template/aliki/css/rdoc.css
+++ b/lib/rdoc/generator/template/aliki/css/rdoc.css
@@ -920,17 +920,17 @@ header.top-navbar .navbar-search form {
 }
 
 /*
-  Improve chevron styling for details under link-list, using SVG chevron that matches nav-section-chevron
-  We need to avoid adding the element in class content generation so it doesn't break darkfish styles
+  Use the same chevron for existing nested lists and class branches whose
+  child lists are only added when opened.
 */
-#sidebar-navigation li details:has(.link-list) > summary {
+#sidebar-navigation li details:is(:has(.link-list), .class-navigation-branch) > summary {
   display: inline-flex;
   align-items: center;
   gap: var(--space-2);
   cursor: pointer;
 }
 
-#sidebar-navigation li details:has(.link-list) > summary::after {
+#sidebar-navigation li details:is(:has(.link-list), .class-navigation-branch) > summary::after {
   content: '';
   position: static;
   display: inline-block;
@@ -950,11 +950,11 @@ header.top-navbar .navbar-search form {
   transition: transform var(--transition-base), background-color var(--transition-fast);
 }
 
-#sidebar-navigation li details:has(.link-list) > summary:hover::after {
+#sidebar-navigation li details:is(:has(.link-list), .class-navigation-branch) > summary:hover::after {
   background-color: var(--color-accent-primary);
 }
 
-#sidebar-navigation li details:has(.link-list)[open] > summary::after {
+#sidebar-navigation li details:is(:has(.link-list), .class-navigation-branch)[open] > summary::after {
   transform: rotate(90deg);
   background-color: var(--color-accent-primary);
 }
diff --git a/lib/rdoc/generator/template/aliki/js/navigation.js b/lib/rdoc/generator/template/aliki/js/navigation.js
index 20ad2659ba..5e821296e1 100644
--- a/lib/rdoc/generator/template/aliki/js/navigation.js
+++ b/lib/rdoc/generator/template/aliki/js/navigation.js
@@ -29,8 +29,7 @@ function buildClassTree(index) {
 
 // Share the class tree across pages without constructing the whole tree's DOM.
 function buildClassNavigation(container, nodes, prefix, current) {
-  function renderBranch(entries, expandSingleRoot = false) {
-    const list = document.createElement('ul');
+  function renderBranch(entries, list, expandSingleRoot = false) {
     list.className = 'link-list nav-list';
 
     entries.forEach((node) => {
@@ -48,13 +47,14 @@ function buildClassNavigation(container, nodes, prefix, current) {
 
       if (node.children.length) {
         const details = document.createElement('details');
+        details.className = 'class-navigation-branch';
         const summary = document.createElement('summary');
         summary.appendChild(code);
         details.appendChild(summary);
         let populated = false;
         const populate = () => {
           if (!details.open || populated) return;
-          details.appendChild(renderBranch(node.children));
+          details.appendChild(renderBranch(node.children, document.createElement('ul')));
           populated = true;
         };
         details.addEventListener('toggle', populate);
@@ -70,7 +70,8 @@ function buildClassNavigation(container, nodes, prefix, current) {
     return list;
   }
 
-  container.replaceChildren(renderBranch(nodes, nodes.length === 1));
+  container.replaceChildren();
+  renderBranch(nodes, container, nodes.length === 1);
 }
 
 document.addEventListener('DOMContentLoaded', () => {
diff --git a/lib/rdoc/generator/template/aliki/table_of_contents.rhtml b/lib/rdoc/generator/template/aliki/table_of_contents.rhtml
index bdce7a7168..bb436f8178 100644
--- a/lib/rdoc/generator/template/aliki/table_of_contents.rhtml
+++ b/lib/rdoc/generator/template/aliki/table_of_contents.rhtml
@@ -10,13 +10,6 @@
 
 <main role="main">
   <h1>Table of Contents</h1>
-  <h2 id="pages">Pages</h2>
-  <ul>
-    <%- @files.select(&:text?).each do |file| %>
-    <li><a href="<%= h file.path %>"><%= h file.page_name %></a></li>
-    <%- end %>
-  </ul>
-
   <h2 id="classes">Classes and Modules</h2>
   <ul>
     <%- @modsort.each do |klass| %>
diff --git a/test/rdoc/generator/aliki/navigation_test.rb b/test/rdoc/generator/aliki/navigation_test.rb
index 2377107ab8..a0505b23d9 100644
--- a/test/rdoc/generator/aliki/navigation_test.rb
+++ b/test/rdoc/generator/aliki/navigation_test.rb
@@ -21,12 +21,13 @@ class Element {
           this.listeners = {};
         }
         appendChild(child) { this.children.push(child); }
-        replaceChildren(child) { this.children = [child]; }
+        replaceChildren(...children) { this.children = children; }
         setAttribute(key, value) { this.attributes[key] = value; }
         addEventListener(event, callback) { this.listeners[event] = callback; }
         set innerHTML(value) { throw new Error('Navigation must use textContent'); }
       }
-      const container = new Element('div');
+      const container = new Element('ul');
+      container.className = 'link-list nav-list';
       const document = {
         createElement: tag => new Element(tag),
         listeners: {},
@@ -55,6 +56,9 @@ def teardown
 
   def test_unopened_branches_are_lazy_and_only_populated_once
     @context.eval "buildClassNavigation(container, nodes, '../', '')"
+    assert_equal ['ul', 'link-list nav-list'], @context.eval('[container.tag, container.className]')
+    assert_equal ['li', 'li'], @context.eval('container.children.map(child => child.tag)')
+    assert_equal ['class-navigation-branch', 'class-navigation-branch'], @context.eval('elements("details").map(branch => branch.className)')
     assert_equal ['Foo'], @context.eval('elements("a").map(link => link.textContent)')
     @context.eval 'const branch = elements("details")[0]; branch.open = true; branch.listeners.toggle()'
     assert_equal ['Foo', '<Leaf>'], @context.eval('elements("a").map(link => link.textContent)')
diff --git a/test/rdoc/generator/aliki_test.rb b/test/rdoc/generator/aliki_test.rb
index 882a142b5d..4fd95b6131 100644
--- a/test/rdoc/generator/aliki_test.rb
+++ b/test/rdoc/generator/aliki_test.rb
@@ -248,12 +248,10 @@ def test_shared_class_navigation
 
     data = JSON.parse(File.read('js/search_data.js').delete_prefix('var search_data = ').delete_suffix(';'))['index']
     assert_include data.map { |entry| entry['full_name'] }, 'Klass::Inner'
-    refute_file 'js/navigation_data.js'
 
     page = File.read('Klass/Inner.html')
     assert_include page, 'data-current-class="Klass::Inner"'
     assert_include page, '../js/search_data.js?v='
-    assert_not_include page, '../js/navigation_data.js?v='
     assert_include page, '../table_of_contents.html#classes'
     sidebar = page[/<div id="classindex-section".*?<\/nav>/m]
     assert_not_include sidebar, '<a href="../Klass.html">Klass</a>'
@@ -280,16 +278,6 @@ def test_navigation_preserves_hidden_namespace_and_omits_hidden_leaf
     assert_not_include names, hidden.full_name
   end
 
-  def test_search_data_supports_deep_namespaces
-    leaf = @klass
-    55.times { |i| leaf = leaf.add_class RDoc::NormalClass, "Level#{i}" }
-
-    @g.write_search_index
-
-    data = JSON.parse(File.read('js/search_data.js').delete_prefix('var search_data = ').delete_suffix(';'))['index']
-    assert_equal leaf.path, data.find { |entry| entry['full_name'] == leaf.full_name }['path']
-  end
-
   def test_canonical_url
     @klass.add_class RDoc::NormalClass, 'Inner'
     @store.options.canonical_root = @options.canonical_root = "https://example.com/docs/"
@@ -312,7 +300,6 @@ def test_dry_run_creates_no_files
 
     refute_file 'index.html'
     refute_file 'table_of_contents.html'
-    refute_file 'js/navigation_data.js'
     refute_file 'css/rdoc.css'
     refute_file 'js/aliki.js'
   end
diff --git a/test/rdoc/rdoc_server_test.rb b/test/rdoc/rdoc_server_test.rb
index 0e2fe5adab..a0dadaf940 100644
--- a/test/rdoc/rdoc_server_test.rb
+++ b/test/rdoc/rdoc_server_test.rb
@@ -76,7 +76,6 @@ def test_search_data_refreshes_after_file_changes
     assert_equal 200, status
     assert_equal 'application/javascript', content_type
     assert_include body, 'Example.html'
-    assert_equal 404, @server.send(:route, '/js/navigation_data.js').first
 
     @server.instance_variable_set(:@file_mtimes, @rdoc.last_modified.keys.to_h { |file|
       [file, File.mtime(file)]

From 95967fe07eef2dcd3fd6b64017f20d82fcd99229 Mon Sep 17 00:00:00 2001
From: "Stanislav (Stas) Katkov" <git@skatkov.com>
Date: Tue, 29 Sep 2026 12:30:53 +0200
Subject: [PATCH 04/11] remove table_of_ocntents and extra link that we added.

---
 .../template/aliki/_sidebar_classes.rhtml     |  1 -
 .../template/aliki/table_of_contents.rhtml    | 23 -------------------
 test/rdoc/generator/aliki_test.rb             |  7 ++----
 3 files changed, 2 insertions(+), 29 deletions(-)
 delete mode 100644 lib/rdoc/generator/template/aliki/table_of_contents.rhtml

diff --git a/lib/rdoc/generator/template/aliki/_sidebar_classes.rhtml b/lib/rdoc/generator/template/aliki/_sidebar_classes.rhtml
index 5d7805697f..2bbd9f5575 100644
--- a/lib/rdoc/generator/template/aliki/_sidebar_classes.rhtml
+++ b/lib/rdoc/generator/template/aliki/_sidebar_classes.rhtml
@@ -11,6 +11,5 @@
     </summary>
 
     <ul id="class-navigation" class="link-list nav-list" data-current-class="<%= h(defined?(klass) ? klass.full_name : '') %>"></ul>
-    <a href="<%= h rel_prefix %>/table_of_contents.html#classes">All classes and modules</a>
   </details>
 </div>
diff --git a/lib/rdoc/generator/template/aliki/table_of_contents.rhtml b/lib/rdoc/generator/template/aliki/table_of_contents.rhtml
deleted file mode 100644
index bb436f8178..0000000000
--- a/lib/rdoc/generator/template/aliki/table_of_contents.rhtml
+++ /dev/null
@@ -1,23 +0,0 @@
-<body role="document" class="file has-toc">
-<%= render '_icons.rhtml' %>
-<%= render '_header.rhtml' %>
-<%= render '_sidebar_toggle.rhtml' %>
-
-<nav id="sidebar-navigation" role="navigation" hidden>
-  <%= render '_sidebar_pages.rhtml' %>
-  <%= render '_sidebar_classes.rhtml' %>
-</nav>
-
-<main role="main">
-  <h1>Table of Contents</h1>
-  <h2 id="classes">Classes and Modules</h2>
-  <ul>
-    <%- @modsort.each do |klass| %>
-    <li><a href="<%= h klass.path %>"><%= h klass.full_name %></a></li>
-    <%- end %>
-  </ul>
-</main>
-
-<%= render '_aside_toc.rhtml' %>
-<%= render '_footer.rhtml' %>
-</body>
diff --git a/test/rdoc/generator/aliki_test.rb b/test/rdoc/generator/aliki_test.rb
index 4fd95b6131..22064a0887 100644
--- a/test/rdoc/generator/aliki_test.rb
+++ b/test/rdoc/generator/aliki_test.rb
@@ -252,13 +252,11 @@ def test_shared_class_navigation
     page = File.read('Klass/Inner.html')
     assert_include page, 'data-current-class="Klass::Inner"'
     assert_include page, '../js/search_data.js?v='
-    assert_include page, '../table_of_contents.html#classes'
+    assert_not_include page, 'table_of_contents.html'
     sidebar = page[/<div id="classindex-section".*?<\/nav>/m]
     assert_not_include sidebar, '<a href="../Klass.html">Klass</a>'
 
-    index = File.read('table_of_contents.html')
-    assert_include index, '<a href="Klass/Inner.html">Klass::Inner</a>'
-    assert_include index, '<a href="Klass.html">Klass</a>'
+    refute_file 'table_of_contents.html'
   end
 
   def test_navigation_preserves_hidden_namespace_and_omits_hidden_leaf
@@ -299,7 +297,6 @@ def test_dry_run_creates_no_files
     @g.generate
 
     refute_file 'index.html'
-    refute_file 'table_of_contents.html'
     refute_file 'css/rdoc.css'
     refute_file 'js/aliki.js'
   end

From 1db8e8091ee3bb8f2be727bd2fcb9d3e0874541a Mon Sep 17 00:00:00 2001
From: "Stanislav (Stas) Katkov" <git@skatkov.com>
Date: Tue, 29 Sep 2026 12:31:17 +0200
Subject: [PATCH 05/11] remove refute_file assertions

---
 test/rdoc/generator/aliki_test.rb | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/test/rdoc/generator/aliki_test.rb b/test/rdoc/generator/aliki_test.rb
index 22064a0887..a62797568c 100644
--- a/test/rdoc/generator/aliki_test.rb
+++ b/test/rdoc/generator/aliki_test.rb
@@ -252,11 +252,8 @@ def test_shared_class_navigation
     page = File.read('Klass/Inner.html')
     assert_include page, 'data-current-class="Klass::Inner"'
     assert_include page, '../js/search_data.js?v='
-    assert_not_include page, 'table_of_contents.html'
     sidebar = page[/<div id="classindex-section".*?<\/nav>/m]
     assert_not_include sidebar, '<a href="../Klass.html">Klass</a>'
-
-    refute_file 'table_of_contents.html'
   end
 
   def test_navigation_preserves_hidden_namespace_and_omits_hidden_leaf

From bef02d1e4eea583a1d83ec372f499caa6117175e Mon Sep 17 00:00:00 2001
From: "Stanislav (Stas) Katkov" <git@skatkov.com>
Date: Tue, 29 Sep 2026 12:43:53 +0200
Subject: [PATCH 06/11] render all navigation links immediately, without
 listeners

---
 .../template/aliki/_sidebar_classes.rhtml     |  2 +-
 .../generator/template/aliki/css/rdoc.css     | 12 ++---
 .../generator/template/aliki/js/navigation.js | 22 +++------
 test/rdoc/generator/aliki/navigation_test.rb  | 47 +++++++------------
 test/rdoc/generator/aliki_test.rb             |  2 +-
 5 files changed, 32 insertions(+), 53 deletions(-)

diff --git a/lib/rdoc/generator/template/aliki/_sidebar_classes.rhtml b/lib/rdoc/generator/template/aliki/_sidebar_classes.rhtml
index 2bbd9f5575..32b3c39ee1 100644
--- a/lib/rdoc/generator/template/aliki/_sidebar_classes.rhtml
+++ b/lib/rdoc/generator/template/aliki/_sidebar_classes.rhtml
@@ -10,6 +10,6 @@
       </span>
     </summary>
 
-    <ul id="class-navigation" class="link-list nav-list" data-current-class="<%= h(defined?(klass) ? klass.full_name : '') %>"></ul>
+    <ul id="class-navigation" class="link-list nav-list"></ul>
   </details>
 </div>
diff --git a/lib/rdoc/generator/template/aliki/css/rdoc.css b/lib/rdoc/generator/template/aliki/css/rdoc.css
index e9ce50f68e..36c3ead1e9 100644
--- a/lib/rdoc/generator/template/aliki/css/rdoc.css
+++ b/lib/rdoc/generator/template/aliki/css/rdoc.css
@@ -920,17 +920,17 @@ header.top-navbar .navbar-search form {
 }
 
 /*
-  Use the same chevron for existing nested lists and class branches whose
-  child lists are only added when opened.
+  Improve chevron styling for details under link-list, using SVG chevron that matches nav-section-chevron
+  We need to avoid adding the element in class content generation so it doesn't break darkfish styles
 */
-#sidebar-navigation li details:is(:has(.link-list), .class-navigation-branch) > summary {
+#sidebar-navigation li details:has(.link-list) > summary {
   display: inline-flex;
   align-items: center;
   gap: var(--space-2);
   cursor: pointer;
 }
 
-#sidebar-navigation li details:is(:has(.link-list), .class-navigation-branch) > summary::after {
+#sidebar-navigation li details:has(.link-list) > summary::after {
   content: '';
   position: static;
   display: inline-block;
@@ -950,11 +950,11 @@ header.top-navbar .navbar-search form {
   transition: transform var(--transition-base), background-color var(--transition-fast);
 }
 
-#sidebar-navigation li details:is(:has(.link-list), .class-navigation-branch) > summary:hover::after {
+#sidebar-navigation li details:has(.link-list) > summary:hover::after {
   background-color: var(--color-accent-primary);
 }
 
-#sidebar-navigation li details:is(:has(.link-list), .class-navigation-branch)[open] > summary::after {
+#sidebar-navigation li details:has(.link-list)[open] > summary::after {
   transform: rotate(90deg);
   background-color: var(--color-accent-primary);
 }
diff --git a/lib/rdoc/generator/template/aliki/js/navigation.js b/lib/rdoc/generator/template/aliki/js/navigation.js
index 5e821296e1..c95b5b4c8a 100644
--- a/lib/rdoc/generator/template/aliki/js/navigation.js
+++ b/lib/rdoc/generator/template/aliki/js/navigation.js
@@ -15,7 +15,7 @@ function buildClassTree(index) {
       fullName = fullName ? fullName + '::' + name : name;
       let node = byName.get(fullName);
       if (!node) {
-        node = {name, full_name: fullName, path: null, children: []};
+        node = {name, path: null, children: []};
         byName.set(fullName, node);
         children.push(node);
       }
@@ -27,8 +27,8 @@ function buildClassTree(index) {
   return roots;
 }
 
-// Share the class tree across pages without constructing the whole tree's DOM.
-function buildClassNavigation(container, nodes, prefix, current) {
+// Share the class tree across pages without embedding it in every page's HTML.
+function buildClassNavigation(container, nodes, prefix) {
   function renderBranch(entries, list, expandSingleRoot = false) {
     list.className = 'link-list nav-list';
 
@@ -39,7 +39,6 @@ function buildClassNavigation(container, nodes, prefix, current) {
         const link = document.createElement('a');
         link.href = prefix + node.path;
         link.textContent = node.name;
-        if (node.full_name === current) link.setAttribute('aria-current', 'page');
         code.appendChild(link);
       } else {
         code.textContent = node.name;
@@ -47,20 +46,11 @@ function buildClassNavigation(container, nodes, prefix, current) {
 
       if (node.children.length) {
         const details = document.createElement('details');
-        details.className = 'class-navigation-branch';
         const summary = document.createElement('summary');
         summary.appendChild(code);
         details.appendChild(summary);
-        let populated = false;
-        const populate = () => {
-          if (!details.open || populated) return;
-          details.appendChild(renderBranch(node.children, document.createElement('ul')));
-          populated = true;
-        };
-        details.addEventListener('toggle', populate);
-        details.open = expandSingleRoot || node.full_name === current ||
-          current.startsWith(node.full_name + '::');
-        populate();
+        details.appendChild(renderBranch(node.children, document.createElement('ul')));
+        details.open = expandSingleRoot;
         item.appendChild(details);
       } else {
         item.appendChild(code);
@@ -77,5 +67,5 @@ function buildClassNavigation(container, nodes, prefix, current) {
 document.addEventListener('DOMContentLoaded', () => {
   const container = document.getElementById('class-navigation');
   if (!container || typeof search_data === 'undefined') return;
-  buildClassNavigation(container, buildClassTree(search_data.index), index_rel_prefix, container.dataset.currentClass);
+  buildClassNavigation(container, buildClassTree(search_data.index), index_rel_prefix);
 });
diff --git a/test/rdoc/generator/aliki/navigation_test.rb b/test/rdoc/generator/aliki/navigation_test.rb
index a0505b23d9..46471a99f6 100644
--- a/test/rdoc/generator/aliki/navigation_test.rb
+++ b/test/rdoc/generator/aliki/navigation_test.rb
@@ -17,13 +17,9 @@ class Element {
         constructor(tag) {
           this.tag = tag;
           this.children = [];
-          this.attributes = {};
-          this.listeners = {};
         }
         appendChild(child) { this.children.push(child); }
         replaceChildren(...children) { this.children = children; }
-        setAttribute(key, value) { this.attributes[key] = value; }
-        addEventListener(event, callback) { this.listeners[event] = callback; }
         set innerHTML(value) { throw new Error('Navigation must use textContent'); }
       }
       const container = new Element('ul');
@@ -39,11 +35,11 @@ class Element {
           (child.tag === tag ? [child] : []).concat(elements(tag, child)));
       }
       const nodes = [
-        {name: 'Foo', full_name: 'Foo', path: 'Foo.html', children: [
-          {name: '<Leaf>', full_name: 'Foo::Leaf', path: 'Foo/Leaf.html', children: []}
+        {name: 'Foo', path: 'Foo.html', children: [
+          {name: '<Leaf>', path: 'Foo/Leaf.html', children: []}
         ]},
-        {name: 'FooBar', full_name: 'FooBar', path: null, children: [
-          {name: 'Child', full_name: 'FooBar::Child', path: 'FooBar/Child.html', children: []}
+        {name: 'FooBar', path: null, children: [
+          {name: 'Child', path: 'FooBar/Child.html', children: []}
         ]}
       ];
     JS
@@ -54,33 +50,28 @@ def teardown
     @context.dispose
   end
 
-  def test_unopened_branches_are_lazy_and_only_populated_once
-    @context.eval "buildClassNavigation(container, nodes, '../', '')"
+  def test_all_branches_are_rendered_before_opening
+    @context.eval "buildClassNavigation(container, nodes, '../')"
     assert_equal ['ul', 'link-list nav-list'], @context.eval('[container.tag, container.className]')
     assert_equal ['li', 'li'], @context.eval('container.children.map(child => child.tag)')
-    assert_equal ['class-navigation-branch', 'class-navigation-branch'], @context.eval('elements("details").map(branch => branch.className)')
-    assert_equal ['Foo'], @context.eval('elements("a").map(link => link.textContent)')
-    @context.eval 'const branch = elements("details")[0]; branch.open = true; branch.listeners.toggle()'
-    assert_equal ['Foo', '<Leaf>'], @context.eval('elements("a").map(link => link.textContent)')
-    @context.eval 'branch.open = false; branch.listeners.toggle(); branch.open = true; branch.listeners.toggle()'
-    assert_equal 2, @context.eval('elements("a").length')
+    assert_equal [false, false], @context.eval('elements("details").map(branch => branch.open)')
+    assert_equal ['Foo', '<Leaf>', 'Child'], @context.eval('elements("a").map(link => link.textContent)')
   end
 
-  def test_current_namespace_opens_without_matching_similar_prefixes
-    @context.eval "buildClassNavigation(container, nodes, '../../', 'FooBar::Child')"
-    assert_equal [false, true], @context.eval('elements("details").map(branch => branch.open)')
-    assert_equal ['../../Foo.html', '../../FooBar/Child.html'], @context.eval('elements("a").map(link => link.href)')
-    assert_equal ['page'], @context.eval('elements("a").map(link => link.attributes["aria-current"]).filter(Boolean)')
+  def test_rendering_again_replaces_existing_links
+    @context.eval "buildClassNavigation(container, nodes, '../')"
+    @context.eval "buildClassNavigation(container, nodes, '../../')"
+    assert_equal ['../../Foo.html', '../../Foo/Leaf.html', '../../FooBar/Child.html'], @context.eval('elements("a").map(link => link.href)')
   end
 
-  def test_single_root_expands_but_grandchildren_remain_lazy
+  def test_single_root_expands_but_descendants_remain_closed
     @context.eval <<~JS
       buildClassNavigation(container, [
-        {name: 'Root', full_name: 'Root', path: 'Root.html', children: nodes}
-      ], './', '');
+        {name: 'Root', path: 'Root.html', children: nodes}
+      ], './');
     JS
     assert_equal [true, false, false], @context.eval('elements("details").map(branch => branch.open)')
-    assert_equal ['Root', 'Foo'], @context.eval('elements("a").map(link => link.textContent)')
+    assert_equal ['Root', 'Foo', '<Leaf>', 'Child'], @context.eval('elements("a").map(link => link.textContent)')
   end
 
   def test_tree_from_search_index_synthesizes_unlinked_ancestors
@@ -93,12 +84,11 @@ def test_tree_from_search_index_synthesizes_unlinked_ancestors
         {type: 'class', full_name: 'Visible::Child', path: 'Visible/Child.html'}
       ];
       const tree = buildClassTree(index);
-      buildClassNavigation(container, tree, '../', 'Hidden::Middle::Leaf');
+      buildClassNavigation(container, tree, '../');
     JS
 
     assert_equal ['Hidden', 'Middle', 'Leaf', 'Visible', 'Child'], @context.eval('tree.flatMap(node => [node.name, ...node.children.flatMap(child => [child.name, ...child.children.map(leaf => leaf.name)])])')
-    assert_equal ['../Hidden/Middle/Leaf.html', '../Visible.html'], @context.eval('elements("a").map(link => link.href)')
-    assert_equal ['page'], @context.eval('elements("a").map(link => link.attributes["aria-current"]).filter(Boolean)')
+    assert_equal ['../Hidden/Middle/Leaf.html', '../Visible.html', '../Visible/Child.html'], @context.eval('elements("a").map(link => link.href)')
   end
 
   def test_visible_parent_is_linked_even_when_child_appears_first
@@ -119,7 +109,6 @@ def test_navigation_initializes_from_loaded_search_data
         {type: 'class', full_name: 'Root::Child', path: 'Root/Child.html'}
       ]};
       var index_rel_prefix = '../';
-      container.dataset = {currentClass: 'Root::Child'};
       document.listeners.DOMContentLoaded();
     JS
 
diff --git a/test/rdoc/generator/aliki_test.rb b/test/rdoc/generator/aliki_test.rb
index a62797568c..9b33d8f970 100644
--- a/test/rdoc/generator/aliki_test.rb
+++ b/test/rdoc/generator/aliki_test.rb
@@ -250,7 +250,7 @@ def test_shared_class_navigation
     assert_include data.map { |entry| entry['full_name'] }, 'Klass::Inner'
 
     page = File.read('Klass/Inner.html')
-    assert_include page, 'data-current-class="Klass::Inner"'
+    assert_include page, '<ul id="class-navigation" class="link-list nav-list"></ul>'
     assert_include page, '../js/search_data.js?v='
     sidebar = page[/<div id="classindex-section".*?<\/nav>/m]
     assert_not_include sidebar, '<a href="../Klass.html">Klass</a>'

From d0ce24f0c4c927c73c0f2c9afa30e017360502dd Mon Sep 17 00:00:00 2001
From: "Stanislav (Stas) Katkov" <git@skatkov.com>
Date: Tue, 29 Sep 2026 12:48:28 +0200
Subject: [PATCH 07/11] simplify

---
 lib/rdoc/generator/template/aliki/js/navigation.js | 1 -
 test/rdoc/generator/aliki/navigation_test.rb       | 7 -------
 2 files changed, 8 deletions(-)

diff --git a/lib/rdoc/generator/template/aliki/js/navigation.js b/lib/rdoc/generator/template/aliki/js/navigation.js
index c95b5b4c8a..b6c017a4bb 100644
--- a/lib/rdoc/generator/template/aliki/js/navigation.js
+++ b/lib/rdoc/generator/template/aliki/js/navigation.js
@@ -60,7 +60,6 @@ function buildClassNavigation(container, nodes, prefix) {
     return list;
   }
 
-  container.replaceChildren();
   renderBranch(nodes, container, nodes.length === 1);
 }
 
diff --git a/test/rdoc/generator/aliki/navigation_test.rb b/test/rdoc/generator/aliki/navigation_test.rb
index 46471a99f6..546194e459 100644
--- a/test/rdoc/generator/aliki/navigation_test.rb
+++ b/test/rdoc/generator/aliki/navigation_test.rb
@@ -19,7 +19,6 @@ class Element {
           this.children = [];
         }
         appendChild(child) { this.children.push(child); }
-        replaceChildren(...children) { this.children = children; }
         set innerHTML(value) { throw new Error('Navigation must use textContent'); }
       }
       const container = new Element('ul');
@@ -58,12 +57,6 @@ def test_all_branches_are_rendered_before_opening
     assert_equal ['Foo', '<Leaf>', 'Child'], @context.eval('elements("a").map(link => link.textContent)')
   end
 
-  def test_rendering_again_replaces_existing_links
-    @context.eval "buildClassNavigation(container, nodes, '../')"
-    @context.eval "buildClassNavigation(container, nodes, '../../')"
-    assert_equal ['../../Foo.html', '../../Foo/Leaf.html', '../../FooBar/Child.html'], @context.eval('elements("a").map(link => link.href)')
-  end
-
   def test_single_root_expands_but_descendants_remain_closed
     @context.eval <<~JS
       buildClassNavigation(container, [

From 78f670151140e2a0c60271bc83ab797d73c6c071 Mon Sep 17 00:00:00 2001
From: "Stanislav (Stas) Katkov" <git@skatkov.com>
Date: Tue, 29 Sep 2026 12:54:13 +0200
Subject: [PATCH 08/11] remove redundant tests

---
 test/rdoc/generator/aliki/navigation_test.rb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/test/rdoc/generator/aliki/navigation_test.rb b/test/rdoc/generator/aliki/navigation_test.rb
index 546194e459..00ba0c6254 100644
--- a/test/rdoc/generator/aliki/navigation_test.rb
+++ b/test/rdoc/generator/aliki/navigation_test.rb
@@ -51,7 +51,6 @@ def teardown
 
   def test_all_branches_are_rendered_before_opening
     @context.eval "buildClassNavigation(container, nodes, '../')"
-    assert_equal ['ul', 'link-list nav-list'], @context.eval('[container.tag, container.className]')
     assert_equal ['li', 'li'], @context.eval('container.children.map(child => child.tag)')
     assert_equal [false, false], @context.eval('elements("details").map(branch => branch.open)')
     assert_equal ['Foo', '<Leaf>', 'Child'], @context.eval('elements("a").map(link => link.textContent)')
@@ -64,7 +63,6 @@ def test_single_root_expands_but_descendants_remain_closed
       ], './');
     JS
     assert_equal [true, false, false], @context.eval('elements("details").map(branch => branch.open)')
-    assert_equal ['Root', 'Foo', '<Leaf>', 'Child'], @context.eval('elements("a").map(link => link.textContent)')
   end
 
   def test_tree_from_search_index_synthesizes_unlinked_ancestors

From 7d54e9f3edff72284685ae4592caca2572fb45fe Mon Sep 17 00:00:00 2001
From: "Stanislav (Stas) Katkov" <git@skatkov.com>
Date: Tue, 29 Sep 2026 16:14:13 +0200
Subject: [PATCH 09/11] renamed id to 'namespace-navigation'

---
 lib/rdoc/generator/template/aliki/_sidebar_classes.rhtml | 2 +-
 lib/rdoc/generator/template/aliki/js/navigation.js       | 2 +-
 test/rdoc/generator/aliki/navigation_test.rb             | 2 +-
 test/rdoc/generator/aliki_test.rb                        | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/rdoc/generator/template/aliki/_sidebar_classes.rhtml b/lib/rdoc/generator/template/aliki/_sidebar_classes.rhtml
index 32b3c39ee1..c4efc3403b 100644
--- a/lib/rdoc/generator/template/aliki/_sidebar_classes.rhtml
+++ b/lib/rdoc/generator/template/aliki/_sidebar_classes.rhtml
@@ -10,6 +10,6 @@
       </span>
     </summary>
 
-    <ul id="class-navigation" class="link-list nav-list"></ul>
+    <ul id="namespace-navigation" class="link-list nav-list"></ul>
   </details>
 </div>
diff --git a/lib/rdoc/generator/template/aliki/js/navigation.js b/lib/rdoc/generator/template/aliki/js/navigation.js
index b6c017a4bb..8d030fe913 100644
--- a/lib/rdoc/generator/template/aliki/js/navigation.js
+++ b/lib/rdoc/generator/template/aliki/js/navigation.js
@@ -64,7 +64,7 @@ function buildClassNavigation(container, nodes, prefix) {
 }
 
 document.addEventListener('DOMContentLoaded', () => {
-  const container = document.getElementById('class-navigation');
+  const container = document.getElementById('namespace-navigation');
   if (!container || typeof search_data === 'undefined') return;
   buildClassNavigation(container, buildClassTree(search_data.index), index_rel_prefix);
 });
diff --git a/test/rdoc/generator/aliki/navigation_test.rb b/test/rdoc/generator/aliki/navigation_test.rb
index 00ba0c6254..316f5d4714 100644
--- a/test/rdoc/generator/aliki/navigation_test.rb
+++ b/test/rdoc/generator/aliki/navigation_test.rb
@@ -27,7 +27,7 @@ class Element {
         createElement: tag => new Element(tag),
         listeners: {},
         addEventListener(event, callback) { this.listeners[event] = callback; },
-        getElementById: id => id === 'class-navigation' ? container : null
+        getElementById: id => id === 'namespace-navigation' ? container : null
       };
       function elements(tag, root = container) {
         return root.children.flatMap(child =>
diff --git a/test/rdoc/generator/aliki_test.rb b/test/rdoc/generator/aliki_test.rb
index 9b33d8f970..068fb92ebf 100644
--- a/test/rdoc/generator/aliki_test.rb
+++ b/test/rdoc/generator/aliki_test.rb
@@ -250,7 +250,7 @@ def test_shared_class_navigation
     assert_include data.map { |entry| entry['full_name'] }, 'Klass::Inner'
 
     page = File.read('Klass/Inner.html')
-    assert_include page, '<ul id="class-navigation" class="link-list nav-list"></ul>'
+    assert_include page, '<ul id="namespace-navigation" class="link-list nav-list"></ul>'
     assert_include page, '../js/search_data.js?v='
     sidebar = page[/<div id="classindex-section".*?<\/nav>/m]
     assert_not_include sidebar, '<a href="../Klass.html">Klass</a>'

From cf3ff01692627038a90a69b202550546c7b4e291 Mon Sep 17 00:00:00 2001
From: "Stanislav (Stas) Katkov" <git@skatkov.com>
Date: Wed, 30 Sep 2026 11:50:37 +0200
Subject: [PATCH 10/11] better specs

---
 test/rdoc/rdoc_server_test.rb | 130 ++++++++++++++++++++--------------
 1 file changed, 77 insertions(+), 53 deletions(-)

diff --git a/test/rdoc/rdoc_server_test.rb b/test/rdoc/rdoc_server_test.rb
index a0dadaf940..35644d940b 100644
--- a/test/rdoc/rdoc_server_test.rb
+++ b/test/rdoc/rdoc_server_test.rb
@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 require_relative 'support/test_case'
+require 'net/http'
 
 class RDocServerTest < RDoc::TestCase
 
@@ -72,24 +73,23 @@ def test_route_serves_index
   end
 
   def test_search_data_refreshes_after_file_changes
-    status, content_type, body = @server.send(:route, '/js/search_data.js')
-    assert_equal 200, status
-    assert_equal 'application/javascript', content_type
-    assert_include body, 'Example.html'
-
-    @server.instance_variable_set(:@file_mtimes, @rdoc.last_modified.keys.to_h { |file|
-      [file, File.mtime(file)]
-    })
-    File.write File.join(@dir, 'added.rb'), "# Added class\nclass Added; end\n"
-    capture_output { assert @server.send(:check_for_changes) }
-    _, _, updated = @server.send(:route, '/js/search_data.js')
-    assert_include updated, 'Added.html'
-
-    File.unlink File.join(@dir, 'added.rb')
-    capture_output { assert @server.send(:check_for_changes) }
-    _, _, removed = @server.send(:route, '/js/search_data.js')
-    assert_not_include removed, 'Added.html'
-    assert_include removed, 'Example.html'
+    with_running_server do |port|
+      response = get(port, '/js/search_data.js')
+      assert_equal '200', response.code
+      assert_equal 'application/javascript', response.content_type
+      assert_include response.body, 'Example.html'
+
+      File.write File.join(@dir, 'added.rb'), "# Added class\nclass Added; end\n"
+      wait_for('search index to include the added class') do
+        get(port, '/js/search_data.js').body.include?('Added.html')
+      end
+
+      File.unlink File.join(@dir, 'added.rb')
+      wait_for('search index to remove the deleted class') do
+        !get(port, '/js/search_data.js').body.include?('Added.html')
+      end
+      assert_include get(port, '/js/search_data.js').body, 'Example.html'
+    end
   end
 
   def test_route_returns_404_for_missing_page
@@ -100,52 +100,44 @@ def test_route_returns_404_for_missing_page
   end
 
   def test_check_for_changes_parses_and_reloads_rbs_signatures
-    @server.instance_variable_set(:@file_mtimes, @rdoc.last_modified.keys.to_h { |file|
-      [file, File.mtime(file)]
-    })
+    with_running_server do |port|
+      sig_dir = File.join @dir, 'sig'
+      FileUtils.mkdir_p sig_dir
+      File.write File.join(sig_dir, 'example.rbs'), <<~RBS
+        class Example
+          # RBS method docs.
+          def greet: () -> String
+        end
+      RBS
 
-    sig_dir = File.join @dir, 'sig'
-    FileUtils.mkdir_p sig_dir
-    File.write File.join(sig_dir, 'example.rbs'), <<~RBS
-      class Example
-        # RBS method docs.
-        def greet: () -> String
+      wait_for('class page to include the RBS method documentation') do
+        get(port, '/Example.html').body.include?('RBS method docs.')
       end
-    RBS
 
-    _out, err = capture_output do
-      assert @server.send(:check_for_changes)
+      example = @rdoc.store.find_class_or_module 'Example'
+      greet = example.find_method 'greet', false
+      assert_equal "RBS method docs.", greet.comment.to_s.strip
+      assert_equal ['() -> String'], greet.type_signature_lines
+      assert_equal ['() -> String'], @rdoc.store.rbs_signature_for(greet)
     end
-
-    assert_not_include err, 'Error parsing'
-
-    example = @rdoc.store.find_class_or_module 'Example'
-    greet = example.find_method 'greet', false
-    assert_equal "RBS method docs.", greet.comment.to_s.strip
-    assert_equal ['() -> String'], greet.type_signature_lines
-    assert_equal ['() -> String'], @rdoc.store.rbs_signature_for(greet)
   end
 
   def test_check_for_changes_parses_rbs_sources
-    @server.instance_variable_set(:@file_mtimes, @rdoc.last_modified.keys.to_h { |file|
-      [file, File.mtime(file)]
-    })
+    with_running_server do |port|
+      File.write File.join(@dir, 'sample.rbs'), <<~RBS
+        class Sample
+          def greet: () -> String
+        end
+      RBS
 
-    File.write File.join(@dir, 'sample.rbs'), <<~RBS
-      class Sample
-        def greet: () -> String
+      wait_for('class page to include the new RBS source') do
+        get(port, '/Sample.html').code == '200'
       end
-    RBS
 
-    _out, err = capture_output do
-      assert @server.send(:check_for_changes)
+      sample = @rdoc.store.find_class_or_module 'Sample'
+      greet = sample.find_method 'greet', false
+      assert_equal ['() -> String'], greet.type_signature_lines
     end
-
-    assert_not_include err, 'Error parsing'
-
-    sample = @rdoc.store.find_class_or_module 'Sample'
-    greet = sample.find_method 'greet', false
-    assert_equal ['() -> String'], greet.type_signature_lines
   end
 
   def test_current_watch_files_deduplicates_symlinked_source_tree
@@ -161,4 +153,36 @@ def test_current_watch_files_deduplicates_symlinked_source_tree
   rescue NotImplementedError, Errno::EACCES, Errno::EPERM
     omit 'symlinks are not supported'
   end
+
+  private
+
+  def with_running_server
+    port = TCPServer.open('127.0.0.1', 0) { |socket| socket.addr[1] }
+    @server = RDoc::Server.new(@rdoc, port)
+    server_thread = Thread.new { @server.start }
+
+    wait_for('server to start') do
+      get(port, '/__status').code == '200'
+    rescue Errno::ECONNREFUSED
+      false
+    end
+
+    yield port
+  ensure
+    server_thread&.raise(Interrupt) if server_thread&.alive?
+    server_thread&.join
+  end
+
+  def get(port, path)
+    Net::HTTP.start('127.0.0.1', port) { |http| http.get(path) }
+  end
+
+  def wait_for(description)
+    deadline = Process.clock_gettime(Process::CLOCK_MONOTONIC) + 10
+
+    until yield
+      flunk "Timed out waiting for #{description}" if Process.clock_gettime(Process::CLOCK_MONOTONIC) >= deadline
+      sleep 0.05
+    end
+  end
 end

From 362a3ef713f1b6c9a3a9b6178fdde0c600e860f6 Mon Sep 17 00:00:00 2001
From: "Stanislav (Stas) Katkov" <git@skatkov.com>
Date: Wed, 30 Sep 2026 23:15:21 +0200
Subject: [PATCH 11/11] remove tests

---
 test/rdoc/generator/aliki/navigation_test.rb | 109 -------------------
 test/rdoc/rdoc_server_test.rb                |  20 ----
 2 files changed, 129 deletions(-)
 delete mode 100644 test/rdoc/generator/aliki/navigation_test.rb

diff --git a/test/rdoc/generator/aliki/navigation_test.rb b/test/rdoc/generator/aliki/navigation_test.rb
deleted file mode 100644
index 316f5d4714..0000000000
--- a/test/rdoc/generator/aliki/navigation_test.rb
+++ /dev/null
@@ -1,109 +0,0 @@
-# frozen_string_literal: true
-require_relative '../../helper'
-
-return if RUBY_DESCRIPTION =~ /truffleruby/ || RUBY_DESCRIPTION =~ /jruby/
-
-begin
-  require 'mini_racer'
-rescue LoadError
-  return
-end
-
-class RDocGeneratorAlikiNavigationTest < Test::Unit::TestCase
-  def setup
-    @context = MiniRacer::Context.new
-    @context.eval <<~JS
-      class Element {
-        constructor(tag) {
-          this.tag = tag;
-          this.children = [];
-        }
-        appendChild(child) { this.children.push(child); }
-        set innerHTML(value) { throw new Error('Navigation must use textContent'); }
-      }
-      const container = new Element('ul');
-      container.className = 'link-list nav-list';
-      const document = {
-        createElement: tag => new Element(tag),
-        listeners: {},
-        addEventListener(event, callback) { this.listeners[event] = callback; },
-        getElementById: id => id === 'namespace-navigation' ? container : null
-      };
-      function elements(tag, root = container) {
-        return root.children.flatMap(child =>
-          (child.tag === tag ? [child] : []).concat(elements(tag, child)));
-      }
-      const nodes = [
-        {name: 'Foo', path: 'Foo.html', children: [
-          {name: '<Leaf>', path: 'Foo/Leaf.html', children: []}
-        ]},
-        {name: 'FooBar', path: null, children: [
-          {name: 'Child', path: 'FooBar/Child.html', children: []}
-        ]}
-      ];
-    JS
-    @context.eval File.read(File.expand_path('../../../../lib/rdoc/generator/template/aliki/js/navigation.js', __dir__))
-  end
-
-  def teardown
-    @context.dispose
-  end
-
-  def test_all_branches_are_rendered_before_opening
-    @context.eval "buildClassNavigation(container, nodes, '../')"
-    assert_equal ['li', 'li'], @context.eval('container.children.map(child => child.tag)')
-    assert_equal [false, false], @context.eval('elements("details").map(branch => branch.open)')
-    assert_equal ['Foo', '<Leaf>', 'Child'], @context.eval('elements("a").map(link => link.textContent)')
-  end
-
-  def test_single_root_expands_but_descendants_remain_closed
-    @context.eval <<~JS
-      buildClassNavigation(container, [
-        {name: 'Root', path: 'Root.html', children: nodes}
-      ], './');
-    JS
-    assert_equal [true, false, false], @context.eval('elements("details").map(branch => branch.open)')
-  end
-
-  def test_tree_from_search_index_synthesizes_unlinked_ancestors
-    @context.eval <<~JS
-      const index = [
-        {type: 'class', full_name: 'Hidden::Middle::Leaf', path: 'Hidden/Middle/Leaf.html'},
-        {type: 'instance_method', full_name: 'Hidden::Middle::Leaf#call', path: 'Hidden/Middle/Leaf.html#method-i-call'},
-        {type: 'constant', full_name: 'Hidden::Middle::Leaf::VALUE', path: 'Hidden/Middle/Leaf.html'},
-        {type: 'module', full_name: 'Visible', path: 'Visible.html'},
-        {type: 'class', full_name: 'Visible::Child', path: 'Visible/Child.html'}
-      ];
-      const tree = buildClassTree(index);
-      buildClassNavigation(container, tree, '../');
-    JS
-
-    assert_equal ['Hidden', 'Middle', 'Leaf', 'Visible', 'Child'], @context.eval('tree.flatMap(node => [node.name, ...node.children.flatMap(child => [child.name, ...child.children.map(leaf => leaf.name)])])')
-    assert_equal ['../Hidden/Middle/Leaf.html', '../Visible.html', '../Visible/Child.html'], @context.eval('elements("a").map(link => link.href)')
-  end
-
-  def test_visible_parent_is_linked_even_when_child_appears_first
-    @context.eval <<~JS
-      const tree = buildClassTree([
-        {type: 'class', full_name: 'Parent::Child', path: 'Parent/Child.html'},
-        {type: 'module', full_name: 'Parent', path: 'Parent.html'}
-      ]);
-    JS
-
-    assert_equal 'Parent.html', @context.eval('tree[0].path')
-    assert_equal 'Parent/Child.html', @context.eval('tree[0].children[0].path')
-  end
-
-  def test_navigation_initializes_from_loaded_search_data
-    @context.eval <<~JS
-      var search_data = {index: [
-        {type: 'class', full_name: 'Root::Child', path: 'Root/Child.html'}
-      ]};
-      var index_rel_prefix = '../';
-      document.listeners.DOMContentLoaded();
-    JS
-
-    assert_equal ['../Root/Child.html'], @context.eval('elements("a").map(link => link.href)')
-    assert_equal ['Root'], @context.eval('elements("code").filter(code => code.textContent).map(code => code.textContent)')
-  end
-end
diff --git a/test/rdoc/rdoc_server_test.rb b/test/rdoc/rdoc_server_test.rb
index 35644d940b..9f9a715713 100644
--- a/test/rdoc/rdoc_server_test.rb
+++ b/test/rdoc/rdoc_server_test.rb
@@ -72,26 +72,6 @@ def test_route_serves_index
     assert_equal 'text/html', content_type
   end
 
-  def test_search_data_refreshes_after_file_changes
-    with_running_server do |port|
-      response = get(port, '/js/search_data.js')
-      assert_equal '200', response.code
-      assert_equal 'application/javascript', response.content_type
-      assert_include response.body, 'Example.html'
-
-      File.write File.join(@dir, 'added.rb'), "# Added class\nclass Added; end\n"
-      wait_for('search index to include the added class') do
-        get(port, '/js/search_data.js').body.include?('Added.html')
-      end
-
-      File.unlink File.join(@dir, 'added.rb')
-      wait_for('search index to remove the deleted class') do
-        !get(port, '/js/search_data.js').body.include?('Added.html')
-      end
-      assert_include get(port, '/js/search_data.js').body, 'Example.html'
-    end
-  end
-
   def test_route_returns_404_for_missing_page
     status, content_type, _body = @server.send(:route, '/nonexistent.html')