@salesforcedevs/docs-components 1.3.345-refactor-tab-alpha → 1.3.345-refactor-tab-alpha2

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@salesforcedevs/docs-components",
-    "version": "1.3.345-refactor-tab-alpha",
+    "version": "1.3.345-refactor-tab-alpha2",
     "description": "Docs Lightning web components for DSC",
     "license": "MIT",
     "main": "index.js",

package/src/modules/doc/lwcContentLayout/lwcContentLayout.ts

@@ -1,5 +1,3 @@
-/* eslint-disable @lwc/lwc/no-document-query */
-import { closest } from "kagekiri";
 import ContentLayout from "doc/contentLayout";
 
 const TOC_HEADER_TAG = "doc-heading";
@@ -103,17 +101,6 @@ export default class LwcContentLayout extends ContentLayout {
     };
 
     connectedCallback(): void {
-        const hasParentHighlightListener = closest(
-            "doc-xml-content",
-            this.template.host
-        );
-        if (!hasParentHighlightListener) {
-            window.addEventListener(
-                "highlightedtermchange",
-                this.updateHighlighted
-            );
-            this.searchSyncer.init();
-        }
         window.addEventListener("popstate", this.handlePopState);
     }
 
@@ -175,6 +162,13 @@ export default class LwcContentLayout extends ContentLayout {
             this.setRNBByTab();
             if (this.showTabBasedRNB) {
                 window.addEventListener("tabchanged", this.onTabChanged);
+                window.addEventListener(
+                    "specificationdatarendered",
+                    this.onTabChanged
+                );
+                window.addEventListener("selectedcontent", (event) =>
+                    this.onRNBClick(event as CustomEvent)
+                );
                 this.restoreTabSelection();
             }
             this.restoreScroll();
@@ -182,6 +176,14 @@ export default class LwcContentLayout extends ContentLayout {
     }
 
     disconnectedCallback(): void {
+        this.disconnectObserver();
+        window.removeEventListener(
+            "highlightedtermchange",
+            this.updateHighlighted
+        );
+        window.removeEventListener("scroll", this.adjustNavPosition);
+        window.removeEventListener("resize", this.adjustNavPosition);
+
         if (this.showTabBasedRNB) {
             window.removeEventListener("tabchanged", this.onTabChanged);
             window.removeEventListener(
@@ -193,6 +195,10 @@ export default class LwcContentLayout extends ContentLayout {
             );
             window.removeEventListener("popstate", this.handlePopState);
         }
+        this.searchSyncer.dispose();
+        this.clearRenderObserverTimer();
+
+        window.clearInterval(this._scrollInterval);
     }
 
     attachInteractionObserver = (): void => {