Skip to content

Ensure we set rootnavigation to the top level item, not the overall set #1130

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 15, 2025
Merged

Ensure we set rootnavigation to the top level item, not the overall set #1130

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cbd5feb
Ensure we set rootnavigation to the top level item, not the overall set
Mpdreamz Apr 15, 2025
17b7c69
address compiler warnings and erroneous assignment
Mpdreamz Apr 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion src/Elastic.Markdown/IO/Navigation/DocumentationGroup.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,8 @@ internal TableOfContentsTree(
TreeCollector.Collect(source, this);
}

protected override DocumentationGroup DefaultNavigation => this;

}

[DebuggerDisplay("Group >{Depth} {FolderName} ({NavigationItems.Count} items)")]
Expand Down Expand Up @@ -147,6 +149,8 @@ public class DocumentationGroup : INavigationGroup

public string FolderName { get; }

protected virtual DocumentationGroup DefaultNavigation => this;

protected DocumentationGroup(
TableOfContentsTreeCollector treeCollector,
BuildContext context,
Expand Down Expand Up @@ -178,7 +182,13 @@ protected DocumentationGroup(
NavigationSource = navigationSource;
_treeCollector = treeCollector;
Depth = depth;
toplevelTree ??= this;
// Virtual calls don't use state so while ugly not an issue
// We'll need to address this more structurally
// ReSharper disable VirtualMemberCallInConstructor
toplevelTree ??= DefaultNavigation;
if (parent?.Depth == 0)
toplevelTree = DefaultNavigation;
// ReSharper enable VirtualMemberCallInConstructor
NavigationRoot = toplevelTree;
// ReSharper restore VirtualMemberCallInConstructor
Index = ProcessTocItems(context, toplevelTree, index, lookups, depth, ref fileIndex, out var groups, out var files, out var navigationItems);
Expand Down
Loading