From dd4cc266cd39d7cecfd7215e683b0c6499fc4a36 Mon Sep 17 00:00:00 2001
From: Jake Leahy <jake@leahy.dev>
Date: Sun, 19 Jun 2022 15:36:33 +1000
Subject: [PATCH] Fixes #19900 (#19906)

Fixed tocRoot placement
---
 config/nimdoc.cfg                                      | 4 ++--
 nimdoc/rst2html/expected/rst_examples.html             | 2 +-
 nimdoc/test_out_index_dot_html/expected/index.html     | 2 +-
 nimdoc/testproject/expected/subdir/subdir_b/utils.html | 2 +-
 nimdoc/testproject/expected/testproject.html           | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/config/nimdoc.cfg b/config/nimdoc.cfg
index 725f9e0a52..3b0afe8d68 100644
--- a/config/nimdoc.cfg
+++ b/config/nimdoc.cfg
@@ -149,11 +149,11 @@ doc.body_toc_group = """
         onkeyup="search()" />
     </div>
     $body_toc_groupsection
-    <div id="tocRoot"></div>
     $tableofcontents
   </div>
   <div class="nine columns" id="content">
     $seeSrc
+    <div id="tocRoot"></div>
     $deprecationMsg
     <p class="module-desc">$moduledesc</p>
     $content
@@ -188,11 +188,11 @@ doc.body_toc_group = """
         <option value="type">Type</option>
       </select>
     </div>
-    <div id="tocRoot"></div>
     $tableofcontents
   </div>
   <div class="nine columns" id="content">
     $seeSrc
+    <div id="tocRoot"></div>
     $deprecationMsg
     <p class="module-desc">$moduledesc</p>
     $content
diff --git a/nimdoc/rst2html/expected/rst_examples.html b/nimdoc/rst2html/expected/rst_examples.html
index 532917055c..efc8ac414f 100644
--- a/nimdoc/rst2html/expected/rst_examples.html
+++ b/nimdoc/rst2html/expected/rst_examples.html
@@ -49,7 +49,6 @@
         <option value="type">Type</option>
       </select>
     </div>
-    <div id="tocRoot"></div>
     <ul class="simple simple-toc" id="toc-list">
   <li><a class="reference" id="about-this-document_toc" href="#about-this-document">About this document</a></li>
 <ul class="simple"><li><a class="reference" id="about-this-document-encoding_toc" href="#about-this-document-encoding">Encoding</a></li>
@@ -75,6 +74,7 @@
   </div>
   <div class="nine columns" id="content">
     
+    <div id="tocRoot"></div>
     
     <p class="module-desc"><table class="docinfo" frame="void" rules="none"><col class="docinfo-name" /><col class="docinfo-content" /><tbody valign="top"><tr><th class="docinfo-name">Authors:</th><td>Andreas Rumpf, Zahary Karadjov</td></tr>
 <tr><th class="docinfo-name">Version:</th><td>|nimversion|</td></tr>
diff --git a/nimdoc/test_out_index_dot_html/expected/index.html b/nimdoc/test_out_index_dot_html/expected/index.html
index 0c0dc22684..43285db6b6 100644
--- a/nimdoc/test_out_index_dot_html/expected/index.html
+++ b/nimdoc/test_out_index_dot_html/expected/index.html
@@ -49,7 +49,6 @@
         <option value="type">Type</option>
       </select>
     </div>
-    <div id="tocRoot"></div>
     <ul class="simple simple-toc" id="toc-list">
   <li>
   <details open>
@@ -69,6 +68,7 @@
   </div>
   <div class="nine columns" id="content">
     
+    <div id="tocRoot"></div>
     
     <p class="module-desc"></p>
     <div class="section" id="12">
diff --git a/nimdoc/testproject/expected/subdir/subdir_b/utils.html b/nimdoc/testproject/expected/subdir/subdir_b/utils.html
index d5a3b84c76..4d753ad8f8 100644
--- a/nimdoc/testproject/expected/subdir/subdir_b/utils.html
+++ b/nimdoc/testproject/expected/subdir/subdir_b/utils.html
@@ -49,7 +49,6 @@
         <option value="type">Type</option>
       </select>
     </div>
-    <div id="tocRoot"></div>
     <ul class="simple simple-toc" id="toc-list">
   <li><a class="reference" id="this-is-now-a-header_toc" href="#this-is-now-a-header">This is now a header</a></li>
 <ul class="simple"><li><a class="reference" id="this-is-now-a-header-next-header_toc" href="#this-is-now-a-header-next-header">Next header</a></li>
@@ -197,6 +196,7 @@
   </div>
   <div class="nine columns" id="content">
     
+    <div id="tocRoot"></div>
     
     <p class="module-desc"><p>This is a description of the utils module.</p>
 <p>Links work:</p>
diff --git a/nimdoc/testproject/expected/testproject.html b/nimdoc/testproject/expected/testproject.html
index 49f24d204f..24dfdc13f6 100644
--- a/nimdoc/testproject/expected/testproject.html
+++ b/nimdoc/testproject/expected/testproject.html
@@ -49,7 +49,6 @@
         <option value="type">Type</option>
       </select>
     </div>
-    <div id="tocRoot"></div>
     <ul class="simple simple-toc" id="toc-list">
   <li>
   <details open>
@@ -335,6 +334,7 @@
   </div>
   <div class="nine columns" id="content">
     
+    <div id="tocRoot"></div>
     
     <p class="module-desc">This is the top level module.
 <p><strong class="examples_text">Example:</strong></p>