Refactor page grouping logic to combine parent and map retrieval, improving efficiency and readability. Update sidebar filter to handle navigation more robustly by ensuring the correct element is clicked.

Author: Dobrunia

src/backend/controllers/pages.ts

@@ -109,10 +109,9 @@ class Pages {
   public static async getParentSelectOptions(
     excludePageId?: EntityId
   ): Promise<Array<{ page: Page; depth: number; indent: string }>> {
-    const pages = excludePageId
-      ? await this.groupByParent(excludePageId)
-      : await this.groupByParent();
-    const pagesMap = await this.getPagesMap();
+    const { pages, pagesMap } = excludePageId
+      ? await this.groupByParentWithMap(excludePageId)
+      : await this.groupByParentWithMap('' as EntityId);
     const indentUnit = '\u00a0\u00a0';
 
     return pages.map((page) => {
@@ -123,21 +122,20 @@ class Pages {
   }
 
   /**
-   * Group all pages by their parents
-   * If the pageId is passed, it excludes passed page from result pages
-   *
-   * @param {string} pageId - pageId to exclude from result pages
-   * @returns {Page[]}
+   * Same as {@link groupByParent} but returns the pages map from the same load (no second getPagesMap).
    */
-  public static async groupByParent(pageId = '' as EntityId): Promise<Page[]> {
+  private static async groupByParentWithMap(pageId = '' as EntityId): Promise<{
+    pages: Page[];
+    pagesMap: Map<string, Page>;
+  }> {
     const rootPageOrder = await PagesOrder.getRootPageOrder(); // get order of the root pages
     const childPageOrder = await PagesOrder.getChildPageOrder(); // get order of the all other pages
 
     /**
      * If there is no root and child page order, then it returns an empty array
      */
     if (!rootPageOrder || (!rootPageOrder && childPageOrder.length <= 0)) {
-      return [];
+      return { pages: [], pagesMap: new Map() };
     }
 
     const pagesMap = await this.getPagesMap();
@@ -176,16 +174,31 @@ class Pages {
      * Otherwise just returns result itself
      */
     if (pageId) {
-      return this.removeChildren(result, pageId).reduce((prev, curr) => {
+      const pages = this.removeChildren(result, pageId).reduce((prev, curr) => {
         if (curr instanceof Page) {
           prev.push(curr);
         }
 
         return prev;
       }, Array<Page>());
-    } else {
-      return result;
+
+      return { pages, pagesMap };
     }
+
+    return { pages: result, pagesMap };
+  }
+
+  /**
+   * Group all pages by their parents
+   * If the pageId is passed, it excludes passed page from result pages
+   *
+   * @param {string} pageId - pageId to exclude from result pages
+   * @returns {Page[]}
+   */
+  public static async groupByParent(pageId = '' as EntityId): Promise<Page[]> {
+    const { pages } = await this.groupByParentWithMap(pageId);
+
+    return pages;
   }
 
   /**

src/frontend/js/classes/sidebar-filter.js

@@ -96,8 +96,10 @@ export default class SidebarFilter {
 
     // handle enter key when item is focused.
     if (e.code === 'Enter' && this.selectedSearchResultIndex !== null) {
-      // navigate to focused item.
-      this.searchResults[this.selectedSearchResultIndex].element.click();
+      const raw = this.searchResults[this.selectedSearchResultIndex].element;
+      const navigateEl = raw.closest('a') || raw;
+
+      navigateEl.click();
       // prevent default action.
       e.preventDefault();
       e.stopPropagation();

src/frontend/js/modules/sidebar.js

@@ -7,6 +7,11 @@ import SidebarFilter from '../classes/sidebar-filter';
 const LOCAL_STORAGE_KEY = 'docs_sidebar_state';
 const SIDEBAR_VISIBILITY_KEY = 'docs_sidebar_visibility';
 
+/**
+ * Slack beyond scrollHeight + vertical borders for max-height (subpixels, hover radius).
+ */
+const SIDEBAR_LIST_MAX_HEIGHT_SLACK_PX = 4;
+
 /**
  * Sidebar module
  */
@@ -94,7 +99,7 @@ export default class Sidebar {
       this.nodes.rootSections,
       this.nodes.sidebarContent,
       this.nodes.search,
-      this.setSectionCollapsed
+      this.setSectionCollapsed.bind(this)
     );
 
     this.ready();
@@ -150,7 +155,12 @@ export default class Sidebar {
         if (!list) {
           return;
         }
-        list.style.maxHeight = `${list.scrollHeight + 4}px`;
+        const cs = globalThis.getComputedStyle(list);
+        const borderY =
+          (Number.parseFloat(cs.borderTopWidth) || 0) +
+          (Number.parseFloat(cs.borderBottomWidth) || 0);
+
+        list.style.maxHeight = `${list.scrollHeight + borderY + SIDEBAR_LIST_MAX_HEIGHT_SLACK_PX}px`;
       });
     });
   }