Merge branch 'main' into mbostock/stdlib

mbostock · mbostock · commit 7afd8c70d5d9 · 2023-12-04T08:55:58.000-08:00
diff --git a/src/render.ts b/src/render.ts
@@ -129,6 +129,9 @@ function renderSidebar(title = "Home", pages: (Page | Section)[], path: string):
       case "false": if (!details.classList.contains("observablehq-section-active")) details.open = false; break;
     }
   }
+  addEventListener("beforeunload", () => sessionStorage.setItem("observablehq-sidebar-scrolly", document.querySelector("#observablehq-sidebar").scrollTop));
+  const scrolly = +sessionStorage.getItem("observablehq-sidebar-scrolly");
+  if (scrolly) document.querySelector("#observablehq-sidebar").scrollTop = scrolly;
 }</script>`;
 }
 
diff --git a/test/output/build/archives/tar.html b/test/output/build/archives/tar.html
@@ -77,6 +77,9 @@
       case "false": if (!details.classList.contains("observablehq-section-active")) details.open = false; break;
     }
   }
+  addEventListener("beforeunload", () => sessionStorage.setItem("observablehq-sidebar-scrolly", document.querySelector("#observablehq-sidebar").scrollTop));
+  const scrolly = +sessionStorage.getItem("observablehq-sidebar-scrolly");
+  if (scrolly) document.querySelector("#observablehq-sidebar").scrollTop = scrolly;
 }</script>
 <div id="observablehq-center">
 <main id="observablehq-main" class="observablehq">
diff --git a/test/output/build/archives/zip.html b/test/output/build/archives/zip.html
@@ -63,6 +63,9 @@
       case "false": if (!details.classList.contains("observablehq-section-active")) details.open = false; break;
     }
   }
+  addEventListener("beforeunload", () => sessionStorage.setItem("observablehq-sidebar-scrolly", document.querySelector("#observablehq-sidebar").scrollTop));
+  const scrolly = +sessionStorage.getItem("observablehq-sidebar-scrolly");
+  if (scrolly) document.querySelector("#observablehq-sidebar").scrollTop = scrolly;
 }</script>
 <div id="observablehq-center">
 <main id="observablehq-main" class="observablehq">
diff --git a/test/output/build/config/closed/page.html b/test/output/build/config/closed/page.html
@@ -42,6 +42,9 @@
       case "false": if (!details.classList.contains("observablehq-section-active")) details.open = false; break;
     }
   }
+  addEventListener("beforeunload", () => sessionStorage.setItem("observablehq-sidebar-scrolly", document.querySelector("#observablehq-sidebar").scrollTop));
+  const scrolly = +sessionStorage.getItem("observablehq-sidebar-scrolly");
+  if (scrolly) document.querySelector("#observablehq-sidebar").scrollTop = scrolly;
 }</script>
 <div id="observablehq-center">
 <main id="observablehq-main" class="observablehq">
diff --git a/test/output/build/config/index.html b/test/output/build/config/index.html
@@ -42,6 +42,9 @@
       case "false": if (!details.classList.contains("observablehq-section-active")) details.open = false; break;
     }
   }
+  addEventListener("beforeunload", () => sessionStorage.setItem("observablehq-sidebar-scrolly", document.querySelector("#observablehq-sidebar").scrollTop));
+  const scrolly = +sessionStorage.getItem("observablehq-sidebar-scrolly");
+  if (scrolly) document.querySelector("#observablehq-sidebar").scrollTop = scrolly;
 }</script>
 <div id="observablehq-center">
 <main id="observablehq-main" class="observablehq">
diff --git a/test/output/build/config/one.html b/test/output/build/config/one.html
@@ -42,6 +42,9 @@
       case "false": if (!details.classList.contains("observablehq-section-active")) details.open = false; break;
     }
   }
+  addEventListener("beforeunload", () => sessionStorage.setItem("observablehq-sidebar-scrolly", document.querySelector("#observablehq-sidebar").scrollTop));
+  const scrolly = +sessionStorage.getItem("observablehq-sidebar-scrolly");
+  if (scrolly) document.querySelector("#observablehq-sidebar").scrollTop = scrolly;
 }</script>
 <div id="observablehq-center">
 <main id="observablehq-main" class="observablehq">
diff --git a/test/output/build/config/sub/two.html b/test/output/build/config/sub/two.html
@@ -42,6 +42,9 @@
       case "false": if (!details.classList.contains("observablehq-section-active")) details.open = false; break;
     }
   }
+  addEventListener("beforeunload", () => sessionStorage.setItem("observablehq-sidebar-scrolly", document.querySelector("#observablehq-sidebar").scrollTop));
+  const scrolly = +sessionStorage.getItem("observablehq-sidebar-scrolly");
+  if (scrolly) document.querySelector("#observablehq-sidebar").scrollTop = scrolly;
 }</script>
 <div id="observablehq-center">
 <main id="observablehq-main" class="observablehq">
diff --git a/test/output/build/config/toc-override.html b/test/output/build/config/toc-override.html
@@ -42,6 +42,9 @@
       case "false": if (!details.classList.contains("observablehq-section-active")) details.open = false; break;
     }
   }
+  addEventListener("beforeunload", () => sessionStorage.setItem("observablehq-sidebar-scrolly", document.querySelector("#observablehq-sidebar").scrollTop));
+  const scrolly = +sessionStorage.getItem("observablehq-sidebar-scrolly");
+  if (scrolly) document.querySelector("#observablehq-sidebar").scrollTop = scrolly;
 }</script>
 <aside id="observablehq-toc" data-selector="#observablehq-main h1:not(:first-of-type), #observablehq-main h2:not(h1 + h2)">
 <nav>
diff --git a/test/output/build/config/toc.html b/test/output/build/config/toc.html
@@ -42,6 +42,9 @@
       case "false": if (!details.classList.contains("observablehq-section-active")) details.open = false; break;
     }
   }
+  addEventListener("beforeunload", () => sessionStorage.setItem("observablehq-sidebar-scrolly", document.querySelector("#observablehq-sidebar").scrollTop));
+  const scrolly = +sessionStorage.getItem("observablehq-sidebar-scrolly");
+  if (scrolly) document.querySelector("#observablehq-sidebar").scrollTop = scrolly;
 }</script>
 <aside id="observablehq-toc" data-selector="#observablehq-main h1:not(:first-of-type), #observablehq-main h2:not(h1 + h2)">
 <nav>
diff --git a/test/output/build/fetches/foo.html b/test/output/build/fetches/foo.html
@@ -44,6 +44,9 @@
       case "false": if (!details.classList.contains("observablehq-section-active")) details.open = false; break;
     }
   }
+  addEventListener("beforeunload", () => sessionStorage.setItem("observablehq-sidebar-scrolly", document.querySelector("#observablehq-sidebar").scrollTop));
+  const scrolly = +sessionStorage.getItem("observablehq-sidebar-scrolly");
+  if (scrolly) document.querySelector("#observablehq-sidebar").scrollTop = scrolly;
 }</script>
 <div id="observablehq-center">
 <main id="observablehq-main" class="observablehq">
diff --git a/test/output/build/fetches/top.html b/test/output/build/fetches/top.html
@@ -47,6 +47,9 @@
       case "false": if (!details.classList.contains("observablehq-section-active")) details.open = false; break;
     }
   }
+  addEventListener("beforeunload", () => sessionStorage.setItem("observablehq-sidebar-scrolly", document.querySelector("#observablehq-sidebar").scrollTop));
+  const scrolly = +sessionStorage.getItem("observablehq-sidebar-scrolly");
+  if (scrolly) document.querySelector("#observablehq-sidebar").scrollTop = scrolly;
 }</script>
 <div id="observablehq-center">
 <main id="observablehq-main" class="observablehq">
diff --git a/test/output/build/files/files.html b/test/output/build/files/files.html
@@ -58,6 +58,9 @@
       case "false": if (!details.classList.contains("observablehq-section-active")) details.open = false; break;
     }
   }
+  addEventListener("beforeunload", () => sessionStorage.setItem("observablehq-sidebar-scrolly", document.querySelector("#observablehq-sidebar").scrollTop));
+  const scrolly = +sessionStorage.getItem("observablehq-sidebar-scrolly");
+  if (scrolly) document.querySelector("#observablehq-sidebar").scrollTop = scrolly;
 }</script>
 <div id="observablehq-center">
 <main id="observablehq-main" class="observablehq">
diff --git a/test/output/build/files/subsection/subfiles.html b/test/output/build/files/subsection/subfiles.html
@@ -58,6 +58,9 @@
       case "false": if (!details.classList.contains("observablehq-section-active")) details.open = false; break;
     }
   }
+  addEventListener("beforeunload", () => sessionStorage.setItem("observablehq-sidebar-scrolly", document.querySelector("#observablehq-sidebar").scrollTop));
+  const scrolly = +sessionStorage.getItem("observablehq-sidebar-scrolly");
+  if (scrolly) document.querySelector("#observablehq-sidebar").scrollTop = scrolly;
 }</script>
 <div id="observablehq-center">
 <main id="observablehq-main" class="observablehq">
diff --git a/test/output/build/imports/foo/foo.html b/test/output/build/imports/foo/foo.html
@@ -50,6 +50,9 @@
       case "false": if (!details.classList.contains("observablehq-section-active")) details.open = false; break;
     }
   }
+  addEventListener("beforeunload", () => sessionStorage.setItem("observablehq-sidebar-scrolly", document.querySelector("#observablehq-sidebar").scrollTop));
+  const scrolly = +sessionStorage.getItem("observablehq-sidebar-scrolly");
+  if (scrolly) document.querySelector("#observablehq-sidebar").scrollTop = scrolly;
 }</script>
 <div id="observablehq-center">
 <main id="observablehq-main" class="observablehq">
diff --git a/test/output/build/missing-file/index.html b/test/output/build/missing-file/index.html
@@ -40,6 +40,9 @@
       case "false": if (!details.classList.contains("observablehq-section-active")) details.open = false; break;
     }
   }
+  addEventListener("beforeunload", () => sessionStorage.setItem("observablehq-sidebar-scrolly", document.querySelector("#observablehq-sidebar").scrollTop));
+  const scrolly = +sessionStorage.getItem("observablehq-sidebar-scrolly");
+  if (scrolly) document.querySelector("#observablehq-sidebar").scrollTop = scrolly;
 }</script>
 <div id="observablehq-center">
 <main id="observablehq-main" class="observablehq">
diff --git a/test/output/build/missing-import/index.html b/test/output/build/missing-import/index.html
@@ -41,6 +41,9 @@
       case "false": if (!details.classList.contains("observablehq-section-active")) details.open = false; break;
     }
   }
+  addEventListener("beforeunload", () => sessionStorage.setItem("observablehq-sidebar-scrolly", document.querySelector("#observablehq-sidebar").scrollTop));
+  const scrolly = +sessionStorage.getItem("observablehq-sidebar-scrolly");
+  if (scrolly) document.querySelector("#observablehq-sidebar").scrollTop = scrolly;
 }</script>
 <div id="observablehq-center">
 <main id="observablehq-main" class="observablehq">
diff --git a/test/output/build/multi/index.html b/test/output/build/multi/index.html
@@ -51,6 +51,9 @@
       case "false": if (!details.classList.contains("observablehq-section-active")) details.open = false; break;
     }
   }
+  addEventListener("beforeunload", () => sessionStorage.setItem("observablehq-sidebar-scrolly", document.querySelector("#observablehq-sidebar").scrollTop));
+  const scrolly = +sessionStorage.getItem("observablehq-sidebar-scrolly");
+  if (scrolly) document.querySelector("#observablehq-sidebar").scrollTop = scrolly;
 }</script>
 <div id="observablehq-center">
 <main id="observablehq-main" class="observablehq">
diff --git a/test/output/build/multi/subsection/index.html b/test/output/build/multi/subsection/index.html
@@ -35,6 +35,9 @@
       case "false": if (!details.classList.contains("observablehq-section-active")) details.open = false; break;
     }
   }
+  addEventListener("beforeunload", () => sessionStorage.setItem("observablehq-sidebar-scrolly", document.querySelector("#observablehq-sidebar").scrollTop));
+  const scrolly = +sessionStorage.getItem("observablehq-sidebar-scrolly");
+  if (scrolly) document.querySelector("#observablehq-sidebar").scrollTop = scrolly;
 }</script>
 <div id="observablehq-center">
 <main id="observablehq-main" class="observablehq">
diff --git a/test/output/build/simple-public/index.html b/test/output/build/simple-public/index.html
@@ -34,6 +34,9 @@
       case "false": if (!details.classList.contains("observablehq-section-active")) details.open = false; break;
     }
   }
+  addEventListener("beforeunload", () => sessionStorage.setItem("observablehq-sidebar-scrolly", document.querySelector("#observablehq-sidebar").scrollTop));
+  const scrolly = +sessionStorage.getItem("observablehq-sidebar-scrolly");
+  if (scrolly) document.querySelector("#observablehq-sidebar").scrollTop = scrolly;
 }</script>
 <div id="observablehq-center">
 <main id="observablehq-main" class="observablehq">
diff --git a/test/output/build/simple/simple.html b/test/output/build/simple/simple.html
@@ -43,6 +43,9 @@
       case "false": if (!details.classList.contains("observablehq-section-active")) details.open = false; break;
     }
   }
+  addEventListener("beforeunload", () => sessionStorage.setItem("observablehq-sidebar-scrolly", document.querySelector("#observablehq-sidebar").scrollTop));
+  const scrolly = +sessionStorage.getItem("observablehq-sidebar-scrolly");
+  if (scrolly) document.querySelector("#observablehq-sidebar").scrollTop = scrolly;
 }</script>
 <div id="observablehq-center">
 <main id="observablehq-main" class="observablehq">
diff --git a/test/output/build/subtitle/index.html b/test/output/build/subtitle/index.html
@@ -34,6 +34,9 @@
       case "false": if (!details.classList.contains("observablehq-section-active")) details.open = false; break;
     }
   }
+  addEventListener("beforeunload", () => sessionStorage.setItem("observablehq-sidebar-scrolly", document.querySelector("#observablehq-sidebar").scrollTop));
+  const scrolly = +sessionStorage.getItem("observablehq-sidebar-scrolly");
+  if (scrolly) document.querySelector("#observablehq-sidebar").scrollTop = scrolly;
 }</script>
 <aside id="observablehq-toc" data-selector="#observablehq-main h1:not(:first-of-type), #observablehq-main h2:not(h1 + h2)">
 <nav>

Original file line number	Diff line number	Diff line change
`@@ -129,6 +129,9 @@ function renderSidebar(title = "Home", pages: (Page \| Section)[], path: string):`
`129`	`129`	`case "false": if (!details.classList.contains("observablehq-section-active")) details.open = false; break;`
`130`	`130`	`}`
`131`	`131`	`}`
	`132`	`+ addEventListener("beforeunload", () => sessionStorage.setItem("observablehq-sidebar-scrolly", document.querySelector("#observablehq-sidebar").scrollTop));`
	`133`	`+ const scrolly = +sessionStorage.getItem("observablehq-sidebar-scrolly");`
	`134`	`+ if (scrolly) document.querySelector("#observablehq-sidebar").scrollTop = scrolly;`
`132`	`135`	}</script>`;
`133`	`136`	`}`
`134`	`137`
Original file line number	Diff line number	Diff line change
`@@ -77,6 +77,9 @@`
`77`	`77`	`case "false": if (!details.classList.contains("observablehq-section-active")) details.open = false; break;`
`78`	`78`	`}`
`79`	`79`	`}`
	`80`	`+ addEventListener("beforeunload", () => sessionStorage.setItem("observablehq-sidebar-scrolly", document.querySelector("#observablehq-sidebar").scrollTop));`
	`81`	`+ const scrolly = +sessionStorage.getItem("observablehq-sidebar-scrolly");`
	`82`	`+ if (scrolly) document.querySelector("#observablehq-sidebar").scrollTop = scrolly;`
`80`	`83`	`}</script>`
`81`	`84`	`<div id="observablehq-center">`
`82`	`85`	`<main id="observablehq-main" class="observablehq">`
Original file line number	Diff line number	Diff line change
`@@ -63,6 +63,9 @@`
`63`	`63`	`case "false": if (!details.classList.contains("observablehq-section-active")) details.open = false; break;`
`64`	`64`	`}`
`65`	`65`	`}`
	`66`	`+ addEventListener("beforeunload", () => sessionStorage.setItem("observablehq-sidebar-scrolly", document.querySelector("#observablehq-sidebar").scrollTop));`
	`67`	`+ const scrolly = +sessionStorage.getItem("observablehq-sidebar-scrolly");`
	`68`	`+ if (scrolly) document.querySelector("#observablehq-sidebar").scrollTop = scrolly;`
`66`	`69`	`}</script>`
`67`	`70`	`<div id="observablehq-center">`
`68`	`71`	`<main id="observablehq-main" class="observablehq">`
Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,9 @@`
`42`	`42`	`case "false": if (!details.classList.contains("observablehq-section-active")) details.open = false; break;`
`43`	`43`	`}`
`44`	`44`	`}`
	`45`	`+ addEventListener("beforeunload", () => sessionStorage.setItem("observablehq-sidebar-scrolly", document.querySelector("#observablehq-sidebar").scrollTop));`
	`46`	`+ const scrolly = +sessionStorage.getItem("observablehq-sidebar-scrolly");`
	`47`	`+ if (scrolly) document.querySelector("#observablehq-sidebar").scrollTop = scrolly;`
`45`	`48`	`}</script>`
`46`	`49`	`<div id="observablehq-center">`
`47`	`50`	`<main id="observablehq-main" class="observablehq">`
Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,9 @@`
`44`	`44`	`case "false": if (!details.classList.contains("observablehq-section-active")) details.open = false; break;`
`45`	`45`	`}`
`46`	`46`	`}`
	`47`	`+ addEventListener("beforeunload", () => sessionStorage.setItem("observablehq-sidebar-scrolly", document.querySelector("#observablehq-sidebar").scrollTop));`
	`48`	`+ const scrolly = +sessionStorage.getItem("observablehq-sidebar-scrolly");`
	`49`	`+ if (scrolly) document.querySelector("#observablehq-sidebar").scrollTop = scrolly;`
`47`	`50`	`}</script>`
`48`	`51`	`<div id="observablehq-center">`
`49`	`52`	`<main id="observablehq-main" class="observablehq">`