@salesforcedevs/docs-components 1.28.7-alpha.8 → 1.28.7-alpha.9

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@salesforcedevs/docs-components",
-    "version": "1.28.7-alpha.8",
+    "version": "1.28.7-alpha.9",
     "description": "Docs Lightning web components for DSC",
     "license": "MIT",
     "main": "index.js",
@@ -25,5 +25,5 @@
         "@types/lodash.orderby": "4.6.9",
         "@types/lodash.uniqby": "4.7.9"
     },
-    "gitHead": "e0ed02338af544308c36882f3b23049b126c6c9d"
+    "gitHead": "c742ad7d26b81c3e78806e5dc0641c23c640f898"
 }

package/src/modules/doc/contentLayout/contentLayout.html

@@ -1,32 +1,34 @@
 <template>
     <div class="content">
-        <dx-sidebar
-            lwc:if={showDataCloudSidebar}
-            class="is-sticky left-nav-bar"
-            trees={sidebarContent}
-            value={sidebarValue}
-            header={sidebarHeader}
-            ontogglesidebar={onToggleSidebar}
-        >
-            <slot name="sidebar-header" slot="version-picker"></slot>
-        </dx-sidebar>
-        <dx-sidebar-old
-            lwc:else
-            class="is-sticky left-nav-bar"
-            trees={sidebarContent}
-            value={sidebarValue}
-            header={sidebarHeader}
-            ontogglesidebar={onToggleSidebar}
-            languages={languages}
-            language={language}
-            bail-href={bailHref}
-            bail-label={bailLabel}
-            dev-center={devCenter}
-            brand={brand}
-            empty-state-message={emptyStateMessage}
-        >
-            <slot name="sidebar-header" slot="version-picker"></slot>
-        </dx-sidebar-old>
+        <template lwc:if={showDataCloudSidebar}>
+            <dx-sidebar
+                class="is-sticky left-nav-bar"
+                trees={sidebarContent}
+                value={sidebarValue}
+                header={sidebarHeader}
+                ontogglesidebar={onToggleSidebar}
+            >
+                <slot name="sidebar-header" slot="version-picker"></slot>
+            </dx-sidebar>
+        </template>
+        <template lwc:if={showOldSidebar}>
+            <dx-sidebar-old
+                class="is-sticky left-nav-bar"
+                trees={sidebarContent}
+                value={sidebarValue}
+                header={sidebarHeader}
+                ontogglesidebar={onToggleSidebar}
+                languages={languages}
+                language={language}
+                bail-href={bailHref}
+                bail-label={bailLabel}
+                dev-center={devCenter}
+                brand={brand}
+                empty-state-message={emptyStateMessage}
+            >
+                <slot name="sidebar-header" slot="version-picker"></slot>
+            </dx-sidebar-old>
+        </template>
         <div class="content-body-doc-phase-container">
             <div class="doc-phase-wrapper">
                 <slot name="doc-phase"></slot>

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

@@ -114,6 +114,13 @@ export default class ContentLayout extends LightningElement {
         return !this.useOldSidebar && this.hasDataCloudResults === true;
     }
 
+    /** Show legacy sidebar when explicitly requested or when Data Cloud has no results. Don't show until we know (avoids flash). */
+    protected get showOldSidebar(): boolean {
+        return (
+            this.useOldSidebar === true || this.hasDataCloudResults === false
+        );
+    }
+
     @track
     protected _sidebarContent: unknown;
 
@@ -271,7 +278,9 @@ export default class ContentLayout extends LightningElement {
         We have to account for the global nav changing height due to animations.
     */
     adjustNavPosition = () => {
-        const sidebarEl = this.template.querySelector("dx-sidebar-old");
+        const sidebarEl =
+            this.template.querySelector("dx-sidebar") ||
+            this.template.querySelector("dx-sidebar-old");
         const globalNavEl = document.querySelector(
             "hgf-c360nav"
         ) as HTMLElement;