@salesforcedevs/docs-components 0.67.0 → 0.68.3-alpha.19

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@salesforcedevs/docs-components",
-    "version": "0.67.0",
+    "version": "0.68.3-alpha.19+dc9e7409",
     "description": "Docs Lightning web components for DSC",
     "license": "MIT",
     "main": "index.js",
@@ -24,5 +24,5 @@
         "@types/lodash.orderby": "^4.6.7",
         "@types/lodash.uniqby": "^4.7.7"
     },
-    "gitHead": "187d8abcbea7dd2ec9f0352c3563662c44abbde8"
+    "gitHead": "dc9e74091d9f224cc819c9171fe8fb152bfd6a41"
 }

package/src/modules/doc/amfReference/amfReference.ts

@@ -204,7 +204,7 @@ export default class AmfReference extends LightningElement {
     }
 
     restoreScroll() {
-        document.body.scrollTop = document.documentElement.scrollTop = window.history.state.scrollValue;
+        document.body.scrollTop = document.documentElement.scrollTop = window.history.state?.scrollValue;
     }
 
     renderedCallback(): void {
@@ -845,7 +845,6 @@ export default class AmfReference extends LightningElement {
      */
     protected onApiNavigationChanged(): void {
         this.saveScroll();
-        document.body.scrollTop = document.documentElement.scrollTop = 0;
 
         const specBasedReference = this.isSpecBasedReference(
             this._currentReferenceId
@@ -1275,7 +1274,6 @@ export default class AmfReference extends LightningElement {
 
     onNavSelect(event: CustomEvent): void {
         this.saveScroll();
-        document.body.scrollTop = document.documentElement.scrollTop = 0;
         
         const name = event.detail.name;
         if (name) {

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

@@ -78,6 +78,8 @@ export default class ContentLayout extends LightningElement {
     private anchoredElements: AnchorMap = {};
     private lastScrollPosition: number;
     private observer?: IntersectionObserver;
+    private hasRendered: boolean = false;
+    
     private searchSyncer = new SearchSyncer({
         callbacks: {
             onUrlChange: (nextSearchString: string): void => {
@@ -125,6 +127,7 @@ export default class ContentLayout extends LightningElement {
         this._scrollInterval = window.setInterval(() => {
             this.saveScroll();
           }, 1000);
+
           
     }
 
@@ -138,7 +141,10 @@ export default class ContentLayout extends LightningElement {
             this.attachInteractionObserver,
             OBSERVER_ATTACH_WAIT_TIME
         );
-        this.restoreScroll();
+        if(!this.hasRendered) {
+            this.hasRendered = true;
+            this.restoreScroll();
+        }
     }
 
     disconnectedCallback(): void {
@@ -158,7 +164,7 @@ export default class ContentLayout extends LightningElement {
     }
 
     restoreScroll() {
-        document.body.scrollTop = document.documentElement.scrollTop = window.history.state.scrollValue;
+        document.body.scrollTop = document.documentElement.scrollTop = window.history.state?.scrollValue;
     }
 
     clearRenderObserverTimer = () => {

package/src/modules/doc/xmlContent/xmlContent.html

@@ -26,7 +26,7 @@
             </dx-dropdown>
         </div>
         <doc-breadcrumbs
-            if:true={breadcrumbs}
+            if:true={showBreadcrumbs}
             breadcrumbs={breadcrumbs}
             pixel-per-character={breadcrumbPixelPerCharacter}
         ></doc-breadcrumbs>

package/src/modules/doc/xmlContent/xmlContent.ts

@@ -18,11 +18,6 @@ import { Breadcrumb, Language } from "typings/custom";
 // TODO: Imitating from actual implementation as doc-content use it like this. We should refactor it later.
 const handleContentError = (error): void => console.log(error);
 
-const FIRST_CRUMB = {
-    href: "/docs",
-    label: "Documentation"
-};
-
 const PIXEL_PER_CHARACTER_MAP: { [key: string]: number } = {
     default: 7.7,
     "ja-jp": 12.5
@@ -581,6 +576,10 @@ export default class DocXmlContent extends LightningElementWithState<{
         );
     }
 
+    get showBreadcrumbs(): boolean {
+        return this.breadcrumbs && this.breadcrumbs.length > 0;
+    }
+
     private buildBreadcrumbs(): void {
         const { contentDocumentId } = this.pageReference;
         if (!contentDocumentId) {
@@ -588,23 +587,29 @@ export default class DocXmlContent extends LightningElementWithState<{
         }
 
         const currentNode = this.tocMap[contentDocumentId];
-        this.breadcrumbs = this.nodeToBreadcrumb(currentNode);
+
+        
+        if(currentNode?.parent) {
+            this.breadcrumbs = this.nodeToBreadcrumb(currentNode);
+        } else {
+            this.breadcrumbs = [];
+        }
     }
 
-    private nodeToBreadcrumb(node?: TreeNode): Breadcrumb[] {
-        if (!node) {
-            return [FIRST_CRUMB];
+    private nodeToBreadcrumb(node: TreeNode): Breadcrumb[] {
+        const item = {
+            href: this.pageReferenceToString({
+                ...this.pageReference,
+                contentDocumentId: node.name
+            }),
+            label: node.label
+        };
+
+        if (node.parent) {
+            return [...this.nodeToBreadcrumb(node.parent), item];
         }
-        return [
-            ...this.nodeToBreadcrumb(node.parent),
-            {
-                href: this.pageReferenceToString({
-                    ...this.pageReference,
-                    contentDocumentId: node.name
-                }),
-                label: node.label
-            }
-        ];
+
+        return [item];
     }
 
     addMetatags(): void {