@salesforcedevs/docs-components 1.31.0-md-alpha → 1.31.0-md-alpha2

package/package.json

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

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

@@ -9,9 +9,7 @@ import { buildDocLinkClickHandler } from "dxUtils/analytics";
 import ContentActionToolbar from "doc/contentActionToolbar";
 
 const CONTENT_ACTION_TOOLBAR_TAG = "doc-content-action-toolbar";
-const PAGE_HEADING_SELECTOR = "h1";
-const FALLBACK_HEADING_SELECTOR = "h1, h2, h3, h4, h5, h6";
-const CONTENT_BODY_SELECTOR = ".content-body-container .content-body";
+const PAGE_HEADING_SELECTOR = "h1, doc-heading";
 
 type AnchorMap = { [key: string]: { intersect: boolean; id: string } };
 
@@ -288,8 +286,8 @@ export default class ContentLayout extends LightningElement {
 
     /**
      * Inserts the content action toolbar into the slotted content immediately
-     * after the first H1 found inside this layout, falling back to the first
-     * heading of any level if no H1 exists.
+     * after the first heading (any level) found inside the content body. This is
+     * the page's H1 when present, otherwise the first heading in document order.
      */
     protected updateContentActionToolbar(): void {
         if (!this.showContentActionToolbar || !this.sidebarValue) {
@@ -297,21 +295,11 @@ export default class ContentLayout extends LightningElement {
             return;
         }
 
-        const contentBody = querySelector(
-            CONTENT_BODY_SELECTOR,
+        const heading = querySelector(
+            PAGE_HEADING_SELECTOR,
             this.template.host
         ) as HTMLElement | null;
 
-        if (!contentBody) {
-            return;
-        }
-
-        const heading = (querySelector(PAGE_HEADING_SELECTOR, contentBody) ??
-            querySelector(
-                FALLBACK_HEADING_SELECTOR,
-                contentBody
-            )) as HTMLElement | null;
-
         if (!heading) {
             return;
         }