fix(html): post-sidepanel fixes (#570)

denoland · May 5, 2024 · ac747f9 · ac747f9
1 parent 0f0f513
commit ac747f9
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 20 deletions.
diff --git a/src/html/mod.rs b/src/html/mod.rs
@@ -103,8 +103,8 @@ pub struct GenerateCtx<'ctx> {
   pub href_resolver: Rc<dyn HrefResolver>,
   pub usage_composer: Option<UsageComposer>,
   pub rewrite_map: Option<IndexMap<ModuleSpecifier, String>>,
+  pub main_entrypoint: Option<Rc<ShortPath>>,
   pub file_mode: FileMode,
-  pub sidebar_hide_all_symbols: bool,
 }
 
 impl<'ctx> GenerateCtx<'ctx> {
@@ -114,6 +114,8 @@ impl<'ctx> GenerateCtx<'ctx> {
     file_mode: FileMode,
     doc_nodes_by_url: IndexMap<ModuleSpecifier, Vec<DocNode>>,
   ) -> Result<Self, anyhow::Error> {
+    let mut main_entrypoint = None;
+
     let doc_nodes = doc_nodes_by_url
       .into_iter()
       .map(|(specifier, nodes)| {
@@ -124,6 +126,10 @@ impl<'ctx> GenerateCtx<'ctx> {
           common_ancestor.as_ref(),
         ));
 
+        if short_path.is_main {
+          main_entrypoint = Some(short_path.clone());
+        }
+
         let nodes = nodes
           .into_iter()
           .map(|node| DocNodeWithContext {
@@ -150,7 +156,7 @@ impl<'ctx> GenerateCtx<'ctx> {
       href_resolver: options.href_resolver,
       usage_composer: options.usage_composer,
       rewrite_map: options.rewrite_map,
-      sidebar_hide_all_symbols: file_mode == FileMode::SingleDts,
+      main_entrypoint,
       file_mode,
     })
   }
@@ -568,21 +574,16 @@ pub fn generate(
 
   // Index page
   {
-    let main_entrypoint = ctx
-      .doc_nodes
-      .iter()
-      .find(|(short_path, _)| short_path.is_main);
-
     let partitions_for_entrypoint_nodes =
-      if let Some((_, doc_nodes)) = main_entrypoint {
-        get_partitions_for_file(&ctx, doc_nodes)
+      if let Some(entrypoint) = ctx.main_entrypoint.as_ref() {
+        get_partitions_for_file(&ctx, ctx.doc_nodes.get(entrypoint).unwrap())
       } else {
         Default::default()
       };
 
     let index = pages::IndexCtx::new(
       &ctx,
-      main_entrypoint.map(|(short_path, _)| short_path.clone()),
+      ctx.main_entrypoint.clone(),
       partitions_for_entrypoint_nodes,
     );
 

diff --git a/src/html/render_context.rs b/src/html/render_context.rs
@@ -111,13 +111,7 @@ impl<'ctx> RenderContext<'ctx> {
               .get_file()
               .cloned()
               .unwrap_or_else(|| {
-                (**self
-                  .ctx
-                  .doc_nodes
-                  .keys()
-                  .find(|short_path| short_path.is_main)
-                  .unwrap())
-                .clone()
+                (**self.ctx.main_entrypoint.as_ref().unwrap()).clone()
               }),
             symbol: target_symbol,
           },

diff --git a/src/html/templates/toc.hbs b/src/html/templates/toc.hbs
@@ -17,7 +17,7 @@
             </li>
           {{~/each~}}
         </ul>
-        {{~#if (gt (len top_symbols.symbols) 5)~}}
+        {{~#if (gt top_symbols.total_symbols 5)~}}
           <a class="flex items-center gap-0.5" href="{{top_symbols.all_symbols_href}}">
             <span class="leading-none">view all {{top_symbols.total_symbols}} symbols</span>
             {{~> icons/arrow ~}}

diff --git a/src/html/util.rs b/src/html/util.rs
@@ -227,7 +227,7 @@ impl NamespacedGlobalSymbols {
 }
 
 /// Different current and target locations
-#[derive(Debug, Clone, Copy)]
+#[derive(Debug, Clone, Copy, Eq, PartialEq)]
 pub enum UrlResolveKind<'a> {
   Root,
   AllSymbols,
@@ -649,7 +649,13 @@ impl ToCCtx {
     usage_doc_nodes: &[DocNodeWithContext],
   ) -> Self {
     Self {
-      usages: UsagesCtx::new(&ctx, usage_doc_nodes),
+      usages: if ctx.get_current_resolve() == UrlResolveKind::Root
+        && ctx.ctx.main_entrypoint.is_none()
+      {
+        None
+      } else {
+        UsagesCtx::new(&ctx, usage_doc_nodes)
+      },
       top_symbols: if include_top_symbols {
         TopSymbolsCtx::new(&ctx)
       } else {