@salesforcedevs/docs-components 1.29.0-toolbar-alpha3 → 1.30.0-fix-alpha

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforcedevs/docs-components",
-  "version": "1.29.0-toolbar-alpha3",
+  "version": "1.30.0-fix-alpha",
   "description": "Docs Lightning web components for DSC",
   "license": "MIT",
   "main": "index.js",

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

@@ -73,16 +73,7 @@ export default class AmfReference extends LightningElement {
         return this.isSpecBasedReference(this._currentReferenceId);
     }
 
-    /**
-     * Content action toolbar is only enabled for markdown-based references in the en-us locale.
-     */
-    get showContentActionToolbar(): boolean {
-        if (this.showSpecBasedReference) {
-            return false;
-        }
-        const locale = this.language?.toLowerCase() ?? "en-us";
-        return locale === "en-us";
-    }
+    @api showContentActionToolbar = false;
 
     @api
     get referenceSetConfig(): ReferenceSetConfig {

package/src/modules/doc/contentActionToolbar/contentActionToolbar.html

@@ -1,5 +1,5 @@
 <template>
-    <div class="toolbar">
+    <div class="toolbar" lwc:if={markdownUrl}>
         <dx-tooltip placement="top-right" label={copyMarkdownLabel}>
             <dx-button
                 class="toolbar-button"

package/src/modules/doc/contentActionToolbar/contentActionToolbar.ts

@@ -3,7 +3,7 @@ import { track } from "dxUtils/analytics";
 
 const DEFAULT_COPY_TOOLTIP_LABEL = "Click to copy";
 const COPIED_TOOLTIP_LABEL = "Copied!";
-const COPIED_TOOLTIP_RESET_MS = 2000;
+const COPIED_TOOLTIP_RESET_MS = 1000;
 
 const ANALYTICS_CONTENT_CATEGORY = "content action toolbar";
 const COPY_MARKDOWN_LABEL = "Copy as Markdown";
@@ -20,7 +20,6 @@ export default class ContentActionToolbar extends LightningElement {
             return;
         }
         this._pageUrl = value;
-        this.markdownUrl = this.deriveMarkdownUrl();
     }
     private _pageUrl?: string;
 
@@ -29,7 +28,27 @@ export default class ContentActionToolbar extends LightningElement {
 
     private copyTooltipResetTimeout: number | null = null;
 
-    private markdownUrl: string | null = this.deriveMarkdownUrl();
+    /**
+     * Returns the `.md` equivalent of `pageUrl` with any hash and query
+     * string stripped, or `null` when `pageUrl` is not set or does not end
+     * with `.html`.
+     */
+    get markdownUrl(): string | null {
+        if (!this.pageUrl) {
+            return null;
+        }
+
+        const url = new URL(this.pageUrl, window.location.href);
+        url.hash = "";
+        url.search = "";
+
+        if (!url.pathname.endsWith(".html")) {
+            return null;
+        }
+
+        url.pathname = url.pathname.replace(/\.html$/, ".md");
+        return url.toString();
+    }
 
     get copyMarkdownButtonText(): string {
         return COPY_MARKDOWN_LABEL;
@@ -118,25 +137,6 @@ export default class ContentActionToolbar extends LightningElement {
         });
     }
 
-    /**
-     * Returns the `.md` equivalent of the current page URL with any hash and
-     * query string stripped, or `null` when the current page does not end
-     * with `.html`.
-     */
-    private deriveMarkdownUrl(): string | null {
-        const sourceHref = this._pageUrl || window.location.href;
-        const url = new URL(sourceHref, window.location.href);
-        url.hash = "";
-        url.search = "";
-
-        if (!url.pathname.endsWith(".html")) {
-            return null;
-        }
-
-        url.pathname = url.pathname.replace(/\.html$/, ".md");
-        return url.toString();
-    }
-
     private flashCopied(labelKey: "copyMarkdownLabel" | "copyUrlLabel") {
         if (this.copyTooltipResetTimeout !== null) {
             window.clearTimeout(this.copyTooltipResetTimeout);

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

@@ -289,7 +289,7 @@ export default class ContentLayout extends LightningElement {
      * after the first H1 found inside this layout.
      */
     protected updateContentActionToolbar(): void {
-        if (!this.showContentActionToolbar) {
+        if (!this.showContentActionToolbar || !this.sidebarValue) {
             this.removeContentActionToolbar();
             return;
         }