@eventcatalog/core 2.31.2 → 2.31.4

package/dist/analytics/analytics.cjs

@@ -37,7 +37,7 @@ var import_axios = __toESM(require("axios"), 1);
 var import_os = __toESM(require("os"), 1);
 
 // package.json
-var version = "2.31.2";
+var version = "2.31.4";
 
 // src/constants.ts
 var VERSION = version;

package/dist/analytics/analytics.js

@@ -1,7 +1,7 @@
 import {
   raiseEvent
-} from "../chunk-DETRHSB6.js";
-import "../chunk-5RIG3ETK.js";
+} from "../chunk-W5HUNIMM.js";
+import "../chunk-H5QIDJHP.js";
 export {
   raiseEvent
 };

package/dist/analytics/log-build.cjs

@@ -106,7 +106,7 @@ var import_axios = __toESM(require("axios"), 1);
 var import_os = __toESM(require("os"), 1);
 
 // package.json
-var version = "2.31.2";
+var version = "2.31.4";
 
 // src/constants.ts
 var VERSION = version;

package/dist/analytics/log-build.js

@@ -1,8 +1,8 @@
 import {
   log_build_default
-} from "../chunk-U2LUOMEZ.js";
-import "../chunk-DETRHSB6.js";
-import "../chunk-5RIG3ETK.js";
+} from "../chunk-C3M26NRD.js";
+import "../chunk-W5HUNIMM.js";
+import "../chunk-H5QIDJHP.js";
 import "../chunk-E7TXTI7G.js";
 export {
   log_build_default as default

package/dist/{chunk-U2LUOMEZ.js → chunk-C3M26NRD.js}

@@ -1,6 +1,6 @@
 import {
   raiseEvent
-} from "./chunk-DETRHSB6.js";
+} from "./chunk-W5HUNIMM.js";
 import {
   getEventCatalogConfigFile,
   verifyRequiredFieldsAreInCatalogConfigFile

package/dist/{chunk-5RIG3ETK.js → chunk-H5QIDJHP.js}

@@ -1,5 +1,5 @@
 // package.json
-var version = "2.31.2";
+var version = "2.31.4";
 
 // src/constants.ts
 var VERSION = version;

package/dist/{chunk-DETRHSB6.js → chunk-W5HUNIMM.js}

@@ -1,6 +1,6 @@
 import {
   VERSION
-} from "./chunk-5RIG3ETK.js";
+} from "./chunk-H5QIDJHP.js";
 
 // src/analytics/analytics.js
 import axios from "axios";

package/dist/constants.cjs

@@ -25,7 +25,7 @@ __export(constants_exports, {
 module.exports = __toCommonJS(constants_exports);
 
 // package.json
-var version = "2.31.2";
+var version = "2.31.4";
 
 // src/constants.ts
 var VERSION = version;

package/dist/constants.js

@@ -1,6 +1,6 @@
 import {
   VERSION
-} from "./chunk-5RIG3ETK.js";
+} from "./chunk-H5QIDJHP.js";
 export {
   VERSION
 };

package/dist/eventcatalog.cjs

@@ -157,7 +157,7 @@ var import_axios = __toESM(require("axios"), 1);
 var import_os = __toESM(require("os"), 1);
 
 // package.json
-var version = "2.31.2";
+var version = "2.31.4";
 
 // src/constants.ts
 var VERSION = version;

package/dist/eventcatalog.js

@@ -6,15 +6,15 @@ import {
 } from "./chunk-UKJ7F5WR.js";
 import {
   log_build_default
-} from "./chunk-U2LUOMEZ.js";
-import "./chunk-DETRHSB6.js";
+} from "./chunk-C3M26NRD.js";
+import "./chunk-W5HUNIMM.js";
 import {
   catalogToAstro,
   checkAndConvertMdToMdx
 } from "./chunk-7SI5EVOX.js";
 import {
   VERSION
-} from "./chunk-5RIG3ETK.js";
+} from "./chunk-H5QIDJHP.js";
 import {
   isBackstagePluginEnabled,
   isEventCatalogProEnabled

package/eventcatalog/src/enterprise/custom-documentation/pages/index.astro

@@ -8,6 +8,7 @@ import mdxComponents from '@components/MDX/components';
 import OwnersList from '@components/Lists/OwnersList';
 import { getOwner } from '@utils/collections/owners';
 import CustomDocsNav from '@components/SideNav/CustomDocsNav.astro';
+import { getAdjacentPages } from '../utils/custom-docs';
 
 const props = Astro.props;
 const doc = props.data;
@@ -53,12 +54,7 @@ sidebar.forEach((section: SidebarSection) => {
   }
 });
 
-// Find current page index in flattened items
-const currentIndex = flattenedItems.findIndex((item) => currentSlug === item.slug);
-
-// Get previous and next items
-const prevItem = currentIndex > 0 ? flattenedItems[currentIndex - 1] : null;
-const nextItem = currentIndex < flattenedItems.length - 1 ? flattenedItems[currentIndex + 1] : null;
+const { prev, next } = await getAdjacentPages(currentSlug.replace());
 
 const ownersRaw = doc?.owners || [];
 const owners = await Promise.all<ReturnType<typeof getOwner>>(ownersRaw.map(getOwner));
@@ -83,7 +79,7 @@ const badges = doc?.badges || [];
     </aside>
 
     <!-- Main Content Area - Independent scrolling -->
-    <main class="sidebar-transition w-full max-h-content ml-[22em] 2xl:ml-[24em] mr-80 lg:mr-[26em] max-w-5xl mx-auto">
+    <main class="sidebar-transition w-full max-h-content ml-[22em] 2xl:ml-[24em] mr-80 lg:mr-[20em] max-w-5xl mx-auto">
       <div class="max-w-7xl mx-auto px-6 py-10">
         <div class="border-b border-gray-200 flex justify-between items-start md:pb-6">
           <div>
@@ -119,27 +115,27 @@ const badges = doc?.badges || [];
         <div class="py-8 border-t border-gray-200 mt-8">
           <div class="flex flex-col sm:flex-row justify-between w-full gap-4">
             {
-              prevItem && (
+              prev && (
                 <a
-                  href={buildUrl(`/docs/custom/${prevItem.slug}`)}
+                  href={buildUrl(`/docs/custom/${prev.slug}`)}
                   class="group flex flex-col border border-gray-200 rounded-lg p-4 hover:border-gray-300 hover:bg-gray-50 transition-colors w-full sm:w-1/2"
                 >
                   <span class="text-sm text-gray-500 mb-1">Previous</span>
-                  <span class="font-medium group-hover:text-primary-600 transition-colors">{prevItem.label}</span>
+                  <span class="font-medium group-hover:text-primary-600 transition-colors">{prev.label}</span>
                 </a>
               )
             }
 
-            {!prevItem && <div class="w-full sm:w-1/2" />}
+            {!prev && <div class="w-full sm:w-1/2" />}
 
             {
-              nextItem && (
+              next && (
                 <a
-                  href={buildUrl(`/docs/custom/${nextItem.slug}`)}
+                  href={buildUrl(`/docs/custom/${next.slug}`)}
                   class="group flex flex-col items-end text-right border border-gray-200 rounded-lg p-4 hover:border-gray-300 hover:bg-gray-50 transition-colors w-full sm:w-1/2"
                 >
                   <span class="text-sm text-gray-500 mb-1">Next</span>
-                  <span class="font-medium group-hover:text-primary-600 transition-colors">{nextItem.label}</span>
+                  <span class="font-medium group-hover:text-primary-600 transition-colors">{next.label}</span>
                 </a>
               )
             }
@@ -150,7 +146,7 @@ const badges = doc?.badges || [];
 
     <!-- Right Sidebar TOC -->
     <aside
-      class="fixed right-0 top-16 bottom-0 w-96 overflow-y-auto border-l border-gray-100 bg-white p-6 flex-shrink-0 hidden lg:block z-10"
+      class="fixed right-0 top-16 bottom-0 w-80 2xl:w-96 overflow-y-auto border-l border-gray-100 bg-white p-6 flex-shrink-0 hidden lg:block z-10"
     >
       <div>
         <div>
@@ -227,7 +223,7 @@ const badges = doc?.badges || [];
       let observerPaused = false;
 
       // Function to highlight a TOC item
-      function highlightTocItem(id) {
+      function highlightTocItem(id: string) {
         // Remove active class from all links
         document.querySelectorAll('.active-toc-item').forEach((link) => {
           link.classList.remove('active-toc-item', 'text-purple-600', 'font-light');

package/eventcatalog/src/enterprise/custom-documentation/utils/custom-docs.ts

@@ -29,6 +29,16 @@ type SideBarConfigurationItem = {
   collapsed?: boolean;
 };
 
+type AdjacentPage = {
+  label: string;
+  slug: string;
+};
+
+type AdjacentPages = {
+  prev: AdjacentPage | null;
+  next: AdjacentPage | null;
+};
+
 const DOCS_DIR = 'docs';
 
 /**
@@ -112,6 +122,72 @@ const processSidebarItems = async (items: SideBarConfigurationItem[]): Promise<S
   return processedItems;
 };
 
+/**
+ * Flatten all navigation items into a single array of pages with slugs
+ * This is used to find previous and next pages for navigation
+ */
+const flattenNavigationItems = (items: SidebarItem[]): AdjacentPage[] => {
+  const flatPages: AdjacentPage[] = [];
+
+  const processItem = (item: SidebarItem) => {
+    // Add the current item if it has a slug
+    if (item.slug) {
+      flatPages.push({
+        label: item.label,
+        slug: item.slug,
+      });
+    }
+
+    // Process nested items if they exist
+    if (item.items && item.items.length > 0) {
+      item.items.forEach(processItem);
+    }
+  };
+
+  items.forEach(processItem);
+  return flatPages;
+};
+
+/**
+ * Get the previous and next pages for a given slug
+ * Returns null for prev if it's the first page, and null for next if it's the last page
+ */
+export const getAdjacentPages = async (slug: string): Promise<AdjacentPages> => {
+  const navigationItems = await getNavigationItems();
+  const flatPages = flattenNavigationItems(navigationItems);
+
+  // Normalize the slug by removing 'docs/' prefix if it exists
+  // and ensure consistent formatting with or without leading slash
+  let normalizedSlug = slug;
+  if (normalizedSlug.startsWith('docs/')) {
+    normalizedSlug = normalizedSlug.substring(5); // Remove 'docs/' prefix
+  }
+
+  // Find the current page by comparing normalized slugs
+  const currentIndex = flatPages.findIndex((page) => {
+    // Normalize page slug for comparison
+    let pageSlug = page.slug;
+    if (pageSlug.startsWith('/')) {
+      pageSlug = pageSlug.substring(1);
+    }
+
+    return pageSlug === normalizedSlug;
+  });
+
+  // If page not found, return null for both prev and next
+  if (currentIndex === -1) {
+    return { prev: null, next: null };
+  }
+
+  // Get previous page if it exists
+  const prev = currentIndex > 0 ? flatPages[currentIndex - 1] : null;
+
+  // Get next page if it exists
+  const next = currentIndex < flatPages.length - 1 ? flatPages[currentIndex + 1] : null;
+
+  return { prev, next };
+};
+
 export const getNavigationItems = async (): Promise<SidebarItem[]> => {
   const configuredSidebar = config.customDocs.sidebar;
   return processSidebarItems(configuredSidebar as SideBarConfigurationItem[]);

package/eventcatalog/src/pages/docs/[type]/[id]/[version]/index.astro

@@ -268,126 +268,13 @@ const pagefindAttributes =
       if (document.getElementsByClassName('mermaid').length > 0) {
         renderDiagrams(graphs);
       }
-
-      // Set up TOC highlighting and scrolling
-      setupTOCHighlighting();
     });
 
-    /**
-     * Setup TOC highlighting and scrolling
-     */
-    function setupTOCHighlighting() {
-      // Check if there's a sidebar with navigation
-      const sidebarNav = document.querySelector('aside nav');
-      if (!sidebarNav) return;
-
-      const observerOptions = {
-        rootMargin: '0px 0px -40% 0px',
-        threshold: 0.1,
-      };
-
-      // Flag to temporarily disable observer after click
-      let observerPaused = false;
-
-      /**
-       * Highlights a TOC item and scrolls it into view
-       * @param {string} id - The ID of the heading to highlight in the TOC
-       */
-      function highlightTocItem(id) {
-        // Remove active class from all links
-        document.querySelectorAll('.active-toc-item').forEach((link) => {
-          link.classList.remove('active-toc-item', 'text-primary-600', 'font-medium');
-          link.classList.add('text-gray-400');
-        });
-
-        // Add active class to current link
-        const tocLink = document.querySelector(`aside nav a[href="#${id}"]`);
-        if (tocLink) {
-          tocLink.classList.add('active-toc-item', 'text-primary-600', 'font-medium');
-          tocLink.classList.remove('text-gray-400');
-
-          // Scroll the highlighted item into view with a small delay to ensure DOM updates first
-          setTimeout(() => {
-            tocLink.scrollIntoView({ behavior: 'smooth', block: 'nearest', inline: 'nearest' });
-          }, 10);
-        }
-      }
-
-      // Set up the intersection observer for scrolling
-      const observer = new IntersectionObserver((entries) => {
-        // If observer is paused, don't process entries
-        if (observerPaused) return;
-
-        entries.forEach((entry) => {
-          try {
-            const id = entry.target.getAttribute('id');
-            if (entry.isIntersecting && id) {
-              highlightTocItem(id);
-            }
-          } catch (entryError) {
-            console.error('Error processing intersection entry:', entryError);
-          }
-        });
-      }, observerOptions);
-
-      // Find all headings in the content area
-      const prose = document.querySelector('.prose');
-      if (!prose) return;
-
-      // First try to find headings with IDs
-      const headings = prose.querySelectorAll('h1[id], h2[id], h3[id]');
-
-      if (headings.length > 0) {
-        headings.forEach((heading) => {
-          observer.observe(heading);
-        });
-      } else {
-        // Fallback: If no headings with IDs found, attach IDs to them
-        const allHeadings = prose.querySelectorAll('h1, h2, h3');
-
-        allHeadings.forEach((heading) => {
-          // Only add ID if it doesn't exist
-          if (!heading.id) {
-            const text = heading.textContent || '';
-            const slug = text
-              .toLowerCase()
-              .replace(/[^\w\s-]/g, '')
-              .replace(/\s+/g, '-');
-            heading.id = slug;
-          }
-          observer.observe(heading);
-        });
-      }
-
-      // Add click event listeners to all TOC links
-      const tocLinks = document.querySelectorAll('aside nav a[href^="#"]');
-      tocLinks.forEach((link) => {
-        link.addEventListener('click', (e) => {
-          // Get the ID from the href attribute
-          const hrefAttr = link.getAttribute('href');
-          if (!hrefAttr) return;
-
-          const id = hrefAttr.substring(1);
-
-          // Highlight the clicked item
-          highlightTocItem(id);
-
-          // Temporarily pause the observer to prevent immediate highlighting changes
-          observerPaused = true;
-
-          // Resume the observer after a delay
-          setTimeout(() => {
-            observerPaused = false;
-          }, 500);
-        });
-      });
-    }
-
     /**
      * Renders mermaid diagrams in the page
      * @param {HTMLCollectionOf<HTMLElement>} graphs - The collection of mermaid graph elements
      */
-    async function renderDiagrams(graphs) {
+    async function renderDiagrams(graphs: any) {
       const { default: mermaid } = await import('mermaid');
 
       if (window.eventcatalog.mermaid) {
@@ -395,7 +282,7 @@ const pagefindAttributes =
         const { iconPacks = [] } = window.eventcatalog.mermaid ?? {};
 
         if (iconPacks.length > 0) {
-          const iconPacksToRegister = iconPacks.map((name) => {
+          const iconPacksToRegister = iconPacks.map((name: any) => {
             return {
               name,
               icons,

package/package.json

@@ -6,7 +6,7 @@
     "url": "https://github.com/event-catalog/eventcatalog.git"
   },
   "type": "module",
-  "version": "2.31.2",
+  "version": "2.31.4",
   "publishConfig": {
     "access": "public"
   },