From f55682d75e4ec7645684384a577d8afdd849ccac Mon Sep 17 00:00:00 2001
From: Martijn Laarman <Mpdreamz@gmail.com>
Date: Tue, 18 Feb 2025 18:29:23 +0100
Subject: [PATCH 1/2] merge

---
 src/Elastic.Markdown/Slices/HtmlWriter.cs             | 6 ++++--
 src/Elastic.Markdown/Slices/Layout/_TocTreeNav.cshtml | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/Elastic.Markdown/Slices/HtmlWriter.cs b/src/Elastic.Markdown/Slices/HtmlWriter.cs
index d4b10fa39..a9fd8645c 100644
--- a/src/Elastic.Markdown/Slices/HtmlWriter.cs
+++ b/src/Elastic.Markdown/Slices/HtmlWriter.cs
@@ -41,12 +41,14 @@ private async Task<string> RenderNavigation(MarkdownFile markdown, Cancel ctx =
 		return await slice.RenderAsync(cancellationToken: ctx);
 	}
 
+	private string? _renderedNavigation;
+
 	public async Task<string> RenderLayout(MarkdownFile markdown, Cancel ctx = default)
 	{
 		var document = await markdown.ParseFullAsync(ctx);
 		var html = markdown.CreateHtml(document);
 		await DocumentationSet.Tree.Resolve(ctx);
-		var navigationHtml = await RenderNavigation(markdown, ctx);
+		_renderedNavigation ??= await RenderNavigation(markdown, ctx);
 
 		var previous = DocumentationSet.GetPrevious(markdown);
 		var next = DocumentationSet.GetNext(markdown);
@@ -66,7 +68,7 @@ public async Task<string> RenderLayout(MarkdownFile markdown, Cancel ctx = defau
 			CurrentDocument = markdown,
 			PreviousDocument = previous,
 			NextDocument = next,
-			NavigationHtml = navigationHtml,
+			NavigationHtml = _renderedNavigation,
 			UrlPathPrefix = markdown.UrlPathPrefix,
 			Applies = markdown.YamlFrontMatter?.AppliesTo,
 			GithubEditUrl = editUrl,
diff --git a/src/Elastic.Markdown/Slices/Layout/_TocTreeNav.cshtml b/src/Elastic.Markdown/Slices/Layout/_TocTreeNav.cshtml
index de329fe3c..445bb9b28 100644
--- a/src/Elastic.Markdown/Slices/Layout/_TocTreeNav.cshtml
+++ b/src/Elastic.Markdown/Slices/Layout/_TocTreeNav.cshtml
@@ -53,7 +53,7 @@
 			</label>
 			@if (g.NavigationItems.Count > 0)
 			{
-				<ul class="h-0 w-full overflow-y-hidden peer-has-checked:h-auto peer-has-[:focus]:h-auto has-[:focus]:h-auto peer-has-checked:my-1" data-has-current="@g.ContainsCurrentPage(Model.CurrentDocument)">
+				<ul class="h-0 w-full overflow-y-hidden peer-has-checked:h-auto peer-has-[:focus]:h-auto has-[:focus]:h-auto peer-has-checked:my-1">
 					@await RenderPartialAsync(_TocTreeNav.Create(new NavigationTreeItem
 					{
 						Level = g.Depth,

From 8a321e218931bc37d2574abff56599f2962f377d Mon Sep 17 00:00:00 2001
From: Martijn Laarman <Mpdreamz@gmail.com>
Date: Tue, 18 Feb 2025 20:41:17 +0100
Subject: [PATCH 2/2] ensure current page is selected and its parents expanded

---
 src/Elastic.Markdown/Assets/pages-nav.ts      | 59 ++++++++++++++-----
 src/Elastic.Markdown/IO/MarkdownFile.cs       | 20 ++++++-
 .../IO/Navigation/DocumentationGroup.cs       | 18 +++++-
 .../Slices/Layout/_PagesNav.cshtml            |  7 ++-
 .../Slices/Layout/_TocTreeNav.cshtml          | 25 ++++----
 src/Elastic.Markdown/Slices/_ViewModels.cs    |  5 ++
 6 files changed, 100 insertions(+), 34 deletions(-)

diff --git a/src/Elastic.Markdown/Assets/pages-nav.ts b/src/Elastic.Markdown/Assets/pages-nav.ts
index 999556d41..ff9df8073 100644
--- a/src/Elastic.Markdown/Assets/pages-nav.ts
+++ b/src/Elastic.Markdown/Assets/pages-nav.ts
@@ -1,33 +1,62 @@
 import {$, $$} from "select-dom";
 
-type NavExpandState = { [key: string]: boolean };
+type NavExpandState = {
+	current:string,
+	selected: Record<string, boolean>
+};
 const PAGE_NAV_EXPAND_STATE_KEY = 'pagesNavState';
-const navState = JSON.parse(sessionStorage.getItem(PAGE_NAV_EXPAND_STATE_KEY) ?? "{}") as NavExpandState
 
 // Initialize the nav state from the session storage
 // Return a function to keep the nav state in the session storage that should be called before the page is unloaded
 function keepNavState(nav: HTMLElement): () => void {
-	const inputs = $$('input[type="checkbox"]', nav);
-	if (navState) {
-		inputs.forEach(input => {
-			const key = input.id;
-			if ('shouldExpand' in input.dataset && input.dataset['shouldExpand'] === 'true') {
+
+	const currentNavigation = nav.dataset.currentNavigation;
+	const currentPageId = nav.dataset.currentPageId;
+
+	let navState = JSON.parse(sessionStorage.getItem(PAGE_NAV_EXPAND_STATE_KEY) ?? "{}") as NavExpandState
+	if (navState.current !== currentNavigation)
+	{
+		sessionStorage.removeItem(PAGE_NAV_EXPAND_STATE_KEY);
+		navState = { current: currentNavigation } as NavExpandState;
+	}
+	if (currentPageId)
+	{
+		const currentPageLink = $('a[id="page-' + currentPageId + '"]', nav);
+		currentPageLink.classList.add('current');
+		currentPageLink.classList.add('pointer-events-none');
+		currentPageLink.classList.add('text-blue-elastic!');
+		currentPageLink.classList.add('font-semibold');
+
+		const parentIds = nav.dataset.currentPageParentIds?.split(',') ?? [];
+		for (const parentId of parentIds)
+		{
+			const input = $('input[type="checkbox"][id=\"'+parentId+'\"]', nav) as HTMLInputElement;
+			if (input) {
 				input.checked = true;
-			} else {
-				if (key in navState) {
-					input.checked = navState[key];
-				}
+				const link = input.nextElementSibling as HTMLAnchorElement;
+				link.classList.add('font-semibold');
 			}
-		});
+		}
+	}
+
+	// expand items previously selected
+	for (const groupId in navState.selected)
+	{
+		const input = $('input[type="checkbox"][id=\"'+groupId+'\"]', nav) as HTMLInputElement;
+		input.checked = navState.selected[groupId];
 	}
-	
+
 	return () => {
-		const inputs = $$('input[type="checkbox"]', nav);
-		const state: NavExpandState = inputs.reduce((state: NavExpandState, input) => {
+		// store all expanded groups
+		const inputs = $$('input[type="checkbox"]:checked', nav);
+		const selectedMap: Record<string, boolean> = inputs
+			.filter(input => input.checked)
+			.reduce((state: Record<string, boolean>, input) => {
 			const key = input.id;
 			const value = input.checked;
 			return { ...state, [key]: value};
 		}, {});
+		const state = { current: currentNavigation, selected: selectedMap };
 		sessionStorage.setItem(PAGE_NAV_EXPAND_STATE_KEY, JSON.stringify(state));
 	}
 }
diff --git a/src/Elastic.Markdown/IO/MarkdownFile.cs b/src/Elastic.Markdown/IO/MarkdownFile.cs
index a3dcd45ef..87505ca37 100644
--- a/src/Elastic.Markdown/IO/MarkdownFile.cs
+++ b/src/Elastic.Markdown/IO/MarkdownFile.cs
@@ -13,7 +13,6 @@
 using Markdig;
 using Markdig.Extensions.Yaml;
 using Markdig.Syntax;
-using YamlDotNet.Serialization;
 
 namespace Elastic.Markdown.IO;
 
@@ -32,6 +31,8 @@ public MarkdownFile(IFileInfo sourceFile, IDirectoryInfo rootPath, MarkdownParse
 		Collector = context.Collector;
 	}
 
+	public string Id { get; } = Guid.NewGuid().ToString("N")[..8];
+
 	private DiagnosticsCollector Collector { get; }
 
 	public DocumentationGroup? Parent
@@ -76,10 +77,11 @@ public string? NavigationTitle
 
 	public int NavigationIndex { get; internal set; } = -1;
 
+	public string? GroupId { get; set; }
+
 	private bool _instructionsParsed;
 	private DocumentationGroup? _parent;
 	private string? _title;
-
 	public MarkdownFile[] YieldParents()
 	{
 		var parents = new List<MarkdownFile>();
@@ -92,6 +94,20 @@ public MarkdownFile[] YieldParents()
 		} while (parent != null);
 		return parents.ToArray();
 	}
+	public string[] YieldParentGroups()
+	{
+		var parents = new List<string>();
+		if (GroupId is not null)
+			parents.Add(GroupId);
+		var parent = Parent;
+		do
+		{
+			if (parent is not null)
+				parents.Add(parent.Id);
+			parent = parent?.Parent;
+		} while (parent != null);
+		return [.. parents];
+	}
 
 	public async Task<MarkdownDocument> MinimalParseAsync(Cancel ctx)
 	{
diff --git a/src/Elastic.Markdown/IO/Navigation/DocumentationGroup.cs b/src/Elastic.Markdown/IO/Navigation/DocumentationGroup.cs
index 2a2c07d65..bb067ea69 100644
--- a/src/Elastic.Markdown/IO/Navigation/DocumentationGroup.cs
+++ b/src/Elastic.Markdown/IO/Navigation/DocumentationGroup.cs
@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information
 
 using Elastic.Markdown.Diagnostics;
+using Elastic.Markdown.Helpers;
 using Elastic.Markdown.IO.Configuration;
 
 namespace Elastic.Markdown.IO.Navigation;
@@ -11,14 +12,24 @@ public interface INavigationItem
 {
 	int Order { get; }
 	int Depth { get; }
+	string Id { get; }
 }
 
-public record GroupNavigation(int Order, int Depth, DocumentationGroup Group) : INavigationItem;
-public record FileNavigation(int Order, int Depth, MarkdownFile File) : INavigationItem;
+public record GroupNavigation(int Order, int Depth, DocumentationGroup Group) : INavigationItem
+{
+	public string Id { get; } = Group.Id;
+}
+
+public record FileNavigation(int Order, int Depth, MarkdownFile File) : INavigationItem
+{
+	public string Id { get; } = File.Id;
+}
 
 
 public class DocumentationGroup
 {
+	public string Id { get; } = Guid.NewGuid().ToString("N")[..8];
+
 	public MarkdownFile? Index { get; set; }
 
 	private IReadOnlyCollection<MarkdownFile> FilesInOrder { get; }
@@ -51,6 +62,9 @@ public DocumentationGroup(
 	{
 		Depth = depth;
 		Index = ProcessTocItems(context, index, toc, lookup, folderLookup, depth, ref fileIndex, out var groups, out var files, out var navigationItems);
+		if (Index is not null)
+			Index.GroupId = Id;
+
 
 		GroupsInOrder = groups;
 		FilesInOrder = files;
diff --git a/src/Elastic.Markdown/Slices/Layout/_PagesNav.cshtml b/src/Elastic.Markdown/Slices/Layout/_PagesNav.cshtml
index 0b2f69564..52d8ed4db 100644
--- a/src/Elastic.Markdown/Slices/Layout/_PagesNav.cshtml
+++ b/src/Elastic.Markdown/Slices/Layout/_PagesNav.cshtml
@@ -1,6 +1,11 @@
 @inherits RazorSlice<LayoutViewModel>
 <aside class="sidebar hidden lg:block order-1 w-100 border-r-1 border-r-gray-200">
-	<nav id="pages-nav" class="sidebar-nav pr-6">
+	<nav id="pages-nav" class="sidebar-nav pr-6"
+	     data-current-page-id="@Model.CurrentDocument.Id"
+	     data-current-page-parent-ids="@(string.Join(",",Model.ParentIds))"
+	     @* used to invalidate session storage *@
+	     data-current-navigation="@LayoutViewModel.CurrentNavigationId">
+
 		@(new HtmlString(Model.NavigationHtml))
 	</nav>
 	<script src="@Model.Static("pages-nav.js")"></script>
diff --git a/src/Elastic.Markdown/Slices/Layout/_TocTreeNav.cshtml b/src/Elastic.Markdown/Slices/Layout/_TocTreeNav.cshtml
index 445bb9b28..512c14695 100644
--- a/src/Elastic.Markdown/Slices/Layout/_TocTreeNav.cshtml
+++ b/src/Elastic.Markdown/Slices/Layout/_TocTreeNav.cshtml
@@ -3,16 +3,16 @@
 @inherits RazorSlice<NavigationTreeItem>
 @foreach (var item in Model.SubTree.NavigationItems)
 {
+	var id = item.Id;
 	if (item is FileNavigation file)
 	{
 		var f = file.File;
-		var isCurrent = f == Model.CurrentDocument;
-		<li class="block ml-2 pl-2 border-l-1 border-l-gray-200 group/li @(isCurrent ? "current" : string.Empty)">
+		<li class="block ml-2 pl-2 border-l-1 border-l-gray-200 group/li">
 			<div class="flex">
 				<a
-					class="sidebar-link my-1 ml-5 group-[.current]/li:text-blue-elastic! @(isCurrent ? "pointer-events-none" : string.Empty)"
-					href="@f.Url"
-					@(isCurrent ? "aria-current=page" : string.Empty)>
+					class="sidebar-link my-1 ml-5 group-[.current]/li:text-blue-elastic!"
+					id="page-@id"
+					href="@f.Url">
 					@f.NavigationTitle
 				</a>
 			</div>
@@ -21,13 +21,10 @@
 	else if (item is GroupNavigation folder)
 	{
 		var g = folder.Group;
-		var isCurrent = g.Index == Model.CurrentDocument;
 		const int initialExpandLevel = 1;
-		var containsCurrent = g.HoldsCurrent(Model.CurrentDocument) || g.ContainsCurrentPage(Model.CurrentDocument);
-		var shouldInitiallyExpand = containsCurrent || g.Depth <= initialExpandLevel;
-		var uuid = Guid.NewGuid().ToString();
-		<li class="flex flex-wrap @(g.Depth > 1 ? "ml-2 pl-2 border-l-1 border-l-gray-200" : string.Empty)">
-			<label for="@uuid" class="peer group/label flex items-center overflow-hidden @(g.Depth == 1 ? "mt-2" : "")">
+		var shouldInitiallyExpand = g.Depth <= initialExpandLevel;
+		<li class="flex flex-wrap group-navigation @(g.Depth > 1 ? "ml-2 pl-2 border-l-1 border-l-gray-200" : string.Empty)">
+			<label for="@id" class="peer group/label flex items-center overflow-hidden @(g.Depth == 1 ? "mt-2" : "")">
 				<svg
 					xmlns="http://www.w3.org/2000/svg"
 					fill="none"
@@ -38,16 +35,16 @@
 					<path stroke-linecap="round" stroke-linejoin="round" d="m19.5 8.25-7.5 7.5-7.5-7.5"/>
 				</svg>
 				<input
-					id="@uuid"
+					id="@id"
 					type="checkbox"
 					class="hidden"
 					aria-hidden="true"
-					data-should-expand="@((containsCurrent).ToLowerString())"
 					@(shouldInitiallyExpand ? "checked" : string.Empty)
 				>
 				<a
 					href="@g.Index?.Url"
-					class="sidebar-link inline-block my-1 @(g.Depth == 1 ? "uppercase tracking-[0.05em] text-ink-light font-semibold" : string.Empty) @(containsCurrent ? "font-semibold" : string.Empty) @(isCurrent ? "current pointer-events-none text-blue-elastic!" : string.Empty)">
+					id="page-@g.Index?.Id"
+					class="sidebar-link inline-block my-1 @(g.Depth == 1 ? "uppercase tracking-[0.05em] text-ink-light font-semibold" : string.Empty)">
 					@g.Index?.NavigationTitle
 				</a>
 			</label>
diff --git a/src/Elastic.Markdown/Slices/_ViewModels.cs b/src/Elastic.Markdown/Slices/_ViewModels.cs
index e50ea5651..e6e54ddd1 100644
--- a/src/Elastic.Markdown/Slices/_ViewModels.cs
+++ b/src/Elastic.Markdown/Slices/_ViewModels.cs
@@ -26,10 +26,15 @@ public class IndexViewModel
 
 public class LayoutViewModel
 {
+	/// Used to identify the navigation for the current compilation
+	/// We want to reset users sessionStorage every time this changes to invalidate
+	/// the guids that no longer exist
+	public static string CurrentNavigationId { get; } = Guid.NewGuid().ToString("N")[..8];
 	public string Title { get; set; } = "Elastic Documentation";
 	public string RawTitle { get; set; } = "Elastic Documentation";
 	public required IReadOnlyCollection<PageTocItem> PageTocItems { get; init; }
 	public required DocumentationGroup Tree { get; init; }
+	public string[] ParentIds => [.. CurrentDocument.YieldParentGroups()];
 	public required MarkdownFile CurrentDocument { get; init; }
 	public required MarkdownFile? Previous { get; init; }
 	public required MarkdownFile? Next { get; init; }