filtering by language and chain fams

Author: khadni

src/components/DocsNavigation/DocsNavigationMobile/SubProductContent.tsx

@@ -2,7 +2,6 @@ import React, { useEffect, useRef } from "react"
 import { useStore } from "@nanostores/react"
 import { selectedLanguage } from "~/lib/languageStore.js"
 import { selectedChainType } from "~/stores/chainType.js"
-import { applyChainTypeFilter } from "~/utils/chainType.js"
 import { BackArrowIcon } from "./BackArrowIcon.js"
 import { Page } from "../../Header/Nav/config.js"
 import styles from "./subProductContent.module.css"
@@ -84,9 +83,25 @@ export const SubProductContent = ({ subProducts, onSubproductClick, currentPath
   const currentLang = useStore(selectedLanguage)
   const currentChain = useStore(selectedChainType)
 
-  // Apply chain type filtering using shared utility (same as desktop sidebar)
+  // Apply unified chain type filtering that respects both language AND chain filters
   useEffect(() => {
-    applyChainTypeFilter(currentChain)
+    const sidebarItems = document.querySelectorAll<HTMLElement>("[data-chain-types]")
+
+    sidebarItems.forEach((item) => {
+      const chainTypesAttr = item.getAttribute("data-chain-types")
+
+      let chainVisible = true
+      if (chainTypesAttr === "universal" || !chainTypesAttr) {
+        chainVisible = true // Always show universal/legacy content
+      } else {
+        const itemChains = chainTypesAttr.split(",")
+        chainVisible = itemChains.includes(currentChain)
+      }
+
+      // Don't overwrite language filtering - only hide if chain doesn't match
+      // Language filtering is already handled in renderPages function above
+      item.style.display = chainVisible ? "" : "none"
+    })
   }, [currentChain])
 
   if (!subProducts) {

src/components/LeftSidebar/LeftSidebar.astro

@@ -161,14 +161,14 @@ const sidebarSections = getSidebarSections(section)
 
 <script>
   import { selectedChainType } from "~/stores/chainType"
-  import { applyChainTypeFilter } from "~/utils/chainType.js"
 
   /**
    * Filters sidebar items based on selected chain type
-   * Uses shared utility function for consistency with mobile drawer
+   * Triggers the unified filter in RecursiveSidebar that respects BOTH chain type AND language
    */
   function filterSidebarByChainType() {
-    applyChainTypeFilter(selectedChainType.get())
+    // trigger a languageChanged event to run the unified filter
+    window.dispatchEvent(new CustomEvent("languageChanged"))
   }
 
   // Run on initial load

src/components/LeftSidebar/RecursiveSidebar.astro

@@ -164,9 +164,38 @@ function shouldExpandSection(item: SectionContent, currentPage: string): boolean
 </ul>
 
 <script>
+  /**
+   * Unified filter that checks BOTH language AND chain type criteria
+   * This prevents one filter from overwriting the other's display property
+   */
+  function shouldShowSidebarItem(item: HTMLElement, currentLang: string, currentChain?: string): boolean {
+    // Check language filter
+    const sdkLang = item.getAttribute("data-sdk-lang")
+    const langVisible =
+      sdkLang === "both" || // Always show language-agnostic items
+      !sdkLang || // Items without sdkLang attribute
+      sdkLang === currentLang // Matches current language
+
+    // Check chain type filter (only if chain filtering is active)
+    let chainVisible = true
+    if (currentChain) {
+      const chainTypesAttr = item.getAttribute("data-chain-types")
+      if (chainTypesAttr === "universal" || !chainTypesAttr) {
+        chainVisible = true // Always show universal/legacy content
+      } else {
+        const itemChains = chainTypesAttr.split(",")
+        chainVisible = itemChains.includes(currentChain)
+      }
+    }
+
+    // Item is visible only if BOTH filters pass
+    return langVisible && chainVisible
+  }
+
   /**
    * Filters sidebar items based on selected SDK language
    * - Hides items with data-sdk-lang that don't match current selection
+   * - Respects chain type filtering if active
    * - Runs on initial load and when language changes
    */
   function filterSidebarByLanguage() {
@@ -181,22 +210,23 @@ function shouldExpandSection(item: SectionContent, currentPage: string): boolean
       // Fallback to default
     }
 
+    // Get current chain type if chain filtering is active (for CCIP section)
+    let currentChain: string | undefined
+    try {
+      const chainStore = localStorage.getItem("chainlink-docs-chain-type")
+      if (chainStore) {
+        currentChain = chainStore
+      }
+    } catch {
+      // Chain filtering not active in this section
+    }
+
     // Find all sidebar items with data-sdk-lang attribute
     const sidebarItems = document.querySelectorAll<HTMLElement>("[data-sdk-lang]")
 
     sidebarItems.forEach((item) => {
-      const sdkLang = item.getAttribute("data-sdk-lang")
-
-      if (sdkLang === "both") {
-        // Always show items that are language-agnostic
-        item.style.display = ""
-      } else if (sdkLang !== currentLang) {
-        // Hide items that don't match current language
-        item.style.display = "none"
-      } else {
-        // Show items that match current language
-        item.style.display = ""
-      }
+      const visible = shouldShowSidebarItem(item, currentLang, currentChain)
+      item.style.display = visible ? "" : "none"
     })
   }