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

package/LICENSE

@@ -0,0 +1,12 @@
+Copyright (c) 2020, Salesforce.com, Inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+* Neither the name of Salesforce.com nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

package/package.json

@@ -1,29 +1,29 @@
 {
-  "name": "@salesforcedevs/docs-components",
-  "version": "1.29.0-toolbar-alpha3",
-  "description": "Docs Lightning web components for DSC",
-  "license": "MIT",
-  "main": "index.js",
-  "engines": {
-    "node": "22.x"
-  },
-  "publishConfig": {
-    "access": "public"
-  },
-  "dependencies": {
-    "@api-components/amf-helper-mixin": "4.5.29",
-    "classnames": "2.5.1",
-    "dompurify": "3.2.4",
-    "kagekiri": "1.4.2",
-    "lodash.orderby": "4.6.0",
-    "lodash.uniqby": "4.7.0",
-    "query-string": "7.1.3",
-    "sentence-case": "3.0.4"
-  },
-  "devDependencies": {
-    "@types/classnames": "2.3.1",
-    "@types/lodash.orderby": "4.6.9",
-    "@types/lodash.uniqby": "4.7.9"
-  },
-  "gitHead": "4629fdd9ca18a13480044ad43515b91945d16aad"
-}
+    "name": "@salesforcedevs/docs-components",
+    "version": "1.30.0",
+    "description": "Docs Lightning web components for DSC",
+    "license": "MIT",
+    "main": "index.js",
+    "engines": {
+        "node": "22.x"
+    },
+    "publishConfig": {
+        "access": "public"
+    },
+    "dependencies": {
+        "@api-components/amf-helper-mixin": "4.5.29",
+        "classnames": "2.5.1",
+        "dompurify": "3.2.4",
+        "kagekiri": "1.4.2",
+        "lodash.orderby": "4.6.0",
+        "lodash.uniqby": "4.7.0",
+        "query-string": "7.1.3",
+        "sentence-case": "3.0.4"
+    },
+    "devDependencies": {
+        "@types/classnames": "2.3.1",
+        "@types/lodash.orderby": "4.6.9",
+        "@types/lodash.uniqby": "4.7.9"
+    },
+    "gitHead": "f3e8e2c6ae6c8792b316e41021344648d4a07bec"
+}

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;
         }