@salesforcedevs/docs-components 1.3.345-refactor-tab-alpha3 → 1.3.345-refactor-tab-alpha5

package/package.json

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

package/src/modules/doc/contentLayout/contentLayout.ts

@@ -152,7 +152,7 @@ export default class ContentLayout extends LightningElement {
     }
 
     // Placeholder for childs renderedCallback
-    protected renderedCallbackForLwcContentLayout?(): void;
+    protected postRenderedCallback?(): void;
 
     renderedCallback(): void {
         /**
@@ -174,7 +174,7 @@ export default class ContentLayout extends LightningElement {
             this.restoreScroll();
 
             // Dynamically call `renderedCallbackForLwcContentLayout` if it exists
-            this.renderedCallbackForLwcContentLayout?.();
+            this.postRenderedCallback?.();
         }
     }
 
@@ -360,6 +360,48 @@ export default class ContentLayout extends LightningElement {
         this.updateHeadingForRNB();
     };
 
+    // eslint-disable-next-line no-undef
+    updateTocItems(headingElements: any): void {
+        const tocOptions = [];
+
+        for (const headingElement of headingElements as any) {
+            headingElement.id = headingElement.hash;
+
+            // Update tocOptions from anchorTags only for H2, consider default as 2 as per component
+            const headingAriaLevel =
+                headingElement.attributes["aria-level"]?.nodeValue || "2";
+            const isH2 = headingAriaLevel === "2";
+
+            if (isH2) {
+                const tocItem = {
+                    anchor: `#${headingElement.hash}`,
+                    id: headingElement.id,
+                    label: headingElement.header
+                };
+                tocOptions.push(tocItem);
+                this.tocOptionIdsSet.add(headingElement.id);
+            }
+        }
+
+        this._tocOptions = tocOptions;
+    }
+
+    setHashAndHeaderForDocHeading(headingElements: any) {
+        for (const headingElement of headingElements as any) {
+            // Sometimes elements hash and header is not being set when slot content is wrapped with div
+            if (!headingElement.hash) {
+                headingElement.hash = headingElement.attributes.hash?.nodeValue;
+            }
+
+            if (!headingElement.header) {
+                headingElement.header =
+                    headingElement.attributes.header?.nodeValue;
+            }
+        }
+
+        this.updateTocItems(headingElements);
+    }
+
     onSlotChange(event: Event): void {
         const slotElements = (
             event.target as HTMLSlotElement
@@ -373,34 +415,7 @@ export default class ContentLayout extends LightningElement {
                     TOC_HEADER_TAG
                 );
 
-            for (const headingElement of headingElements as any) {
-                // Sometimes elements hash and header is not being set when slot content is wrapped with div
-                headingElement.hash = headingElement.attributes.hash?.nodeValue;
-                headingElement.header =
-                    headingElement.attributes.header?.nodeValue;
-            }
-
-            const tocOptions = [];
-            for (const headingElement of headingElements as any) {
-                headingElement.id = headingElement.hash;
-
-                // Update tocOptions from anchorTags only for H2, consider default as 2 as per component
-                const headingAriaLevel =
-                    headingElement.attributes["aria-level"]?.nodeValue || "2";
-                const isH2 = headingAriaLevel === "2";
-
-                if (isH2) {
-                    const tocItem = {
-                        anchor: `#${headingElement.hash}`,
-                        id: headingElement.id,
-                        label: headingElement.header
-                    };
-                    tocOptions.push(tocItem);
-                    this.tocOptionIdsSet.add(headingElement.id);
-                }
-            }
-
-            this._tocOptions = tocOptions;
+            this.setHashAndHeaderForDocHeading(headingElements);
         }
     }
 

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

@@ -35,22 +35,11 @@ export default class LwcContentLayout extends ContentLayout {
 
     updateRNB = () => {
         const headingElements = this.getHeadingElements();
-        headingElements.forEach((headingElement: any) => {
-            // Sometimes elements hash and header is not being set when slot content is wrapped with div
-            if (!headingElement.hash) {
-                headingElement.hash = headingElement.attributes.hash?.nodeValue;
-            }
-
-            if (!headingElement.header) {
-                headingElement.header =
-                    headingElement.attributes.header?.nodeValue;
-            }
-        });
-        this.updateTocItems(headingElements);
+        this.setHashAndHeaderForDocHeading(headingElements);
     };
 
     protected getHeadingElements() {
-        let headingElements = document.querySelectorAll(TOC_HEADER_TAG);
+        let headingElements = super.getHeadingElements();
         if (this.showTabBasedRNB) {
             const tabPanelListItem: any = this.getTabPanelList();
             const tabPanels =
@@ -142,7 +131,7 @@ export default class LwcContentLayout extends ContentLayout {
         });
     }
 
-    renderedCallbackForLwcContentLayout(): void {
+    postRenderedCallback(): void {
         this.setRNBByTab();
         if (this.showTabBasedRNB) {
             window.addEventListener("tabchanged", this.onTabChanged);
@@ -173,44 +162,15 @@ export default class LwcContentLayout extends ContentLayout {
     }
 
     updateHeadingForRNB(): void {
-        // Note: We are doing document.querySelectorAll as a quick fix as we are not getting heading elements reference this.querySelectorAll
-        const headingElements = this.getHeadingElements();
-
         // We only need to update URL in case of /docs and ignore if tabs are used anywhere else in DSC
         if (this.showTabBasedRNB) {
             this.updateURL();
         }
-        this.addObserverAndScroll(headingElements);
+        super.updateHeadingForRNB();
     }
 
     onSlotChange(): void {
         this.updateRNB();
         this.contentLoaded = true;
     }
-
-    // eslint-disable-next-line no-undef
-    private updateTocItems(headingElements: NodeListOf<Element>): void {
-        const tocOptions = [];
-
-        for (const headingElement of headingElements as any) {
-            headingElement.id = headingElement.hash;
-
-            // Update tocOptions from anchorTags only for H2, consider default as 2 as per component
-            const headingAriaLevel =
-                headingElement.attributes["aria-level"]?.nodeValue || "2";
-            const isH2 = headingAriaLevel === "2";
-
-            if (isH2) {
-                const tocItem = {
-                    anchor: `#${headingElement.hash}`,
-                    id: headingElement.id,
-                    label: headingElement.header
-                };
-                tocOptions.push(tocItem);
-                this.tocOptionIdsSet.add(headingElement.id);
-            }
-        }
-
-        this._tocOptions = tocOptions;
-    }
 }