@salesforcedevs/docs-components 1.3.282-scroll-fix-alpha1 → 1.3.282-scroll-fix-alpha2

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@salesforcedevs/docs-components",
-    "version": "1.3.282-scroll-fix-alpha1",
+    "version": "1.3.282-scroll-fix-alpha2",
     "description": "Docs Lightning web components for DSC",
     "license": "MIT",
     "main": "index.js",

package/src/modules/doc/content/content.css

@@ -385,7 +385,6 @@ mark {
 /* offset page jump link due to fixed header */
 [id] {
     scroll-margin-top: calc(
-        var(--dx-g-global-header-height) + var(--dx-g-doc-header-height) +
-            var(--dx-g-spacing-4xl) - var(--dx-g-spacing-xs)
+        var(--dx-g-global-header-height) + var(--dx-g-doc-header-height)
     );
 }

package/src/modules/doc/contentLayout/contentLayout.css

@@ -42,7 +42,9 @@ dx-toc {
 
 /* offset page jump link due to fixed header */
 ::slotted(doc-heading) {
-    scroll-margin-top: calc(var(--dx-c-content-sidebar-sticky-top) + 30px);
+    scroll-margin-top: calc(
+        var(--dx-g-global-header-height) + var(--dx-g-doc-header-height)
+    );
 }
 
 .content {

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

@@ -231,20 +231,37 @@ export default class ContentLayout extends LightningElement {
                 (globalNavEl.getBoundingClientRect().height !== 72 ? 0 : 72) +
                 contextNavEl.getBoundingClientRect().height;
             const docHeaderHeight = docHeaderEl.getBoundingClientRect().height;
+            const totalHeaderHeight = globalNavHeight + docHeaderHeight;
+
+            const docHeadingEls = Array.from(
+                document.querySelectorAll("doc-heading")
+            );
+            const rightNavBarEl = this.template.querySelector(".right-nav-bar");
+
             sidebarEl.style.setProperty(
                 "--dx-c-content-sidebar-sticky-top",
                 `${globalNavHeight + docHeaderHeight}px`
             );
 
-            docHeaderEl.style.setProperty(
-                "--dx-g-global-header-height",
-                `${globalNavHeight}px`
-            );
-
-            const rnbEl = this.template.querySelector(".right-nav-bar");
-
-            if (rnbEl) {
-                rnbEl.style.top = `${globalNavHeight + docHeaderHeight + 30}px`;
+            docHeadingEls.forEach((docHeadingEl) => {
+                (docHeadingEl as any).style.scrollMarginTop = docPhaseEl
+                    ? `${
+                          totalHeaderHeight +
+                          docPhaseEl.getBoundingClientRect().height
+                      }px`
+                    : `${totalHeaderHeight + 30}px`;
+            });
+
+            if (rightNavBarEl) {
+                rightNavBarEl.style.setProperty(
+                    "--dx-c-content-sidebar-sticky-top",
+                    docPhaseEl
+                        ? `${
+                              totalHeaderHeight +
+                              docPhaseEl.getBoundingClientRect().height
+                          }px`
+                        : `${totalHeaderHeight}px`
+                );
             }
 
             // If doc phase element exists, we need to account for its sticky position. Mobile should include the sidebar height (since it becomes sticky aswell).
@@ -259,30 +276,6 @@ export default class ContentLayout extends LightningElement {
                             : globalNavHeight + docHeaderHeight
                     }px`
                 );
-
-                // Adjust scroll margin for doc headings when doc phase is present
-                const docHeadingEls = Array.from(
-                    document.querySelectorAll("doc-heading")
-                );
-                docHeadingEls.forEach((docHeadingEl) => {
-                    (docHeadingEl as any).style.scrollMarginTop = `${
-                        globalNavHeight +
-                        docHeaderHeight +
-                        docPhaseEl.getBoundingClientRect().height
-                    }px`;
-                });
-
-                // Adjust right nav bar position when doc phase is present
-                const rightNavBarEl =
-                    this.template.querySelector(".right-nav-bar");
-
-                if (rightNavBarEl) {
-                    rightNavBarEl.style.top = `${
-                        globalNavHeight +
-                        docHeaderHeight +
-                        docPhaseEl.getBoundingClientRect().height
-                    }px`;
-                }
             }
         });
     };