@salesforcedevs/dx-components 1.20.16 → 1.20.17-cb-plain-loading-1

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@salesforcedevs/dx-components",
-    "version": "1.20.16",
+    "version": "1.20.17-cb-plain-loading-1",
     "description": "DX Lightning web components",
     "license": "MIT",
     "engines": {
@@ -46,6 +46,5 @@
     "volta": {
         "node": "20.19.0",
         "yarn": "1.22.19"
-    },
-    "gitHead": "07815cdf681065e2c2f967ab36c2482ed4819662"
+    }
 }

package/src/modules/dx/codeBlock/codeBlock.css

@@ -30,11 +30,13 @@ pre {
 }
 
 div.dx-theme-dark {
+    position: relative;
     border: var(--dx-g-dark-mode-toggle-button-border);
     border-radius: var(--dx-code-block-toolbar-border-radius, 0.3em);
 }
 
 div.dx-theme-light {
+    position: relative;
     border: var(--dx-g-light-mode-code-block-border);
     border-radius: var(--dx-code-block-toolbar-border-radius, 0.3em);
 }
@@ -130,3 +132,21 @@ pre[class*="shiki"] {
 dx-button {
     --dx-g-button-icon-color: var(--dx-g-cloud-blue-vibrant-50);
 }
+
+.code-block-loader {
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    background-color: rgb(255 255 255 / 90%);
+    border-radius: 0 0 0.3em 0.3em;
+    z-index: 10;
+}
+
+.dx-theme-dark .code-block-loader {
+    background-color: rgb(0 0 0 / 90%);
+}

package/src/modules/dx/codeBlock/codeBlock.html

@@ -73,6 +73,9 @@
                 </div>
             </div>
             <div class="code-block-content" lwc:dom="manual"></div>
+            <div class="code-block-loader" if:true={showLoaderUI}>
+                <dx-spinner size="medium" variant="brand"></dx-spinner>
+            </div>
         </div>
     </template>
     <template if:false={codeBlock}>No content provided</template>

package/src/modules/dx/codeBlock/codeBlock.ts

@@ -3,6 +3,7 @@ import { CodeBlockTheme, CodeBlockLanguage } from "typings/custom";
 import cx from "classnames";
 import { track as gtmTrack } from "dxUtils/analytics";
 import { highlightCode } from "dxUtils/shiki";
+import { normalizeBoolean } from "dxUtils/normalizers";
 
 /*
     Custom language support is handled by the Shiki wrapper module
@@ -31,6 +32,8 @@ export default class CodeBlock extends LightningElement {
     @api isEncoded = false;
 
     private _codeBlockRendered: boolean = false;
+    private _showLoadingIndicator: boolean = false;
+    private _isCbHeightCalculated: boolean = false;
     private markupLangs = ["visualforce", "html", "xml"];
     private componentLoaded: boolean = false;
     private showLanguageDropdown: boolean = false;
@@ -82,6 +85,7 @@ export default class CodeBlock extends LightningElement {
     }
     set codeBlock(value: string) {
         this._codeBlockRendered = false;
+        this._isCbHeightCalculated = false;
         let match;
         this._codeBlock = (
             (match = preTagRegexp.exec(value.trim())) === null
@@ -90,6 +94,15 @@ export default class CodeBlock extends LightningElement {
         ).trim();
     }
 
+    @api
+    get showLoadingIndicator() {
+        return this._showLoadingIndicator;
+    }
+
+    set showLoadingIndicator(value) {
+        this._showLoadingIndicator = normalizeBoolean(value);
+    }
+
     get updateThemeBtnText(): string {
         return `Switch to ${this.theme === DARK ? "Light" : "Dark"} mode`;
     }
@@ -102,6 +115,66 @@ export default class CodeBlock extends LightningElement {
         return cx(`dx-theme-${this.theme}`);
     }
 
+    get showLoaderUI(): boolean {
+        return (
+            this.showLoadingIndicator &&
+            this._isCbHeightCalculated &&
+            !this._codeBlockRendered
+        );
+    }
+
+    private calculateContainerHeight(): number | null {
+        const computedStyle = window.getComputedStyle(this.template.host);
+        const customHeight = computedStyle.getPropertyValue(
+            "--dx-code-block-height"
+        );
+
+        // If custom height is set, use it
+        if (
+            customHeight &&
+            customHeight !== "unset" &&
+            !customHeight.includes("auto")
+        ) {
+            return parseFloat(customHeight);
+        }
+
+        // If no custom height, calculate from number of lines + padding
+        if (this.codeBlock) {
+            const lines = this.codeBlock.split("\n").length;
+
+            const textSmValue =
+                parseFloat(computedStyle.getPropertyValue("--dx-g-text-sm")) ||
+                14;
+            const spacingMlgValue =
+                parseFloat(
+                    computedStyle.getPropertyValue("--dx-g-spacing-mlg")
+                ) || 20;
+
+            const codeLineHeight = spacingMlgValue;
+            const codeVerticalPadding = textSmValue * 2;
+
+            return lines * codeLineHeight + codeVerticalPadding;
+        }
+
+        return null;
+    }
+
+    private setupLoadingIndicator(): void {
+        if (!this.showLoadingIndicator) {
+            return;
+        }
+        const containerHeight = this.calculateContainerHeight();
+        if (containerHeight) {
+            const contentContainer = this.template.querySelector(
+                ".code-block-content"
+            ) as HTMLElement;
+            if (contentContainer) {
+                contentContainer.style.height = `${containerHeight}px`;
+            }
+            this._isCbHeightCalculated = true;
+        }
+    }
+
     private initializeTheme() {
         window.addEventListener(EVENT_NAME, this.toggleTheme);
         const darkModeSetting = localStorage.getItem(
@@ -119,6 +192,9 @@ export default class CodeBlock extends LightningElement {
     }
 
     async formatCodeBlock() {
+        // Show loading indicator immediately
+        this.setupLoadingIndicator();
+
         const divEl = this.template.querySelector("div.code-block-content");
         const templateEl = document.createElement("template");
 
@@ -217,6 +293,7 @@ export default class CodeBlock extends LightningElement {
                 }
             }
         }
+        this._codeBlockRendered = true;
     }
 
     onLanguageChange(newLang: any) {
@@ -304,7 +381,6 @@ export default class CodeBlock extends LightningElement {
         this.selectedLanguageLabel = this.selectedLanguage.label;
         this.selectedLanguageId = this.selectedLanguage.id;
         this.formatCodeBlock();
-        this._codeBlockRendered = true;
     }
 
     disconnectedCallback(): void {

package/src/modules/dx/tabbedCodeBlock/tabbedCodeBlock.html

@@ -9,6 +9,7 @@
                     language={codeBlockItem.language}
                     source-link={codeBlockItem.sourceLink}
                     is-encoded={codeBlockItem.isEncoded}
+                    show-loading-indicator={showLoadingIndicator}
                 ></dx-code-block>
             </dx-tab-panel>
         </template>

package/src/modules/dx/tabbedCodeBlock/tabbedCodeBlock.ts

@@ -1,14 +1,24 @@
 import { LightningElement, api } from "lwc";
 import { CodeBlockItem } from "typings/custom";
-import { safeDecodeURI, toJson } from "dxUtils/normalizers";
+import { safeDecodeURI, toJson, normalizeBoolean } from "dxUtils/normalizers";
 import { DARK } from "dx/codeBlock";
 
 export default class TabbedCodeBlock extends LightningElement {
     _codeBlocks: CodeBlockItem[] = [];
+    private _showLoadingIndicator: boolean = false;
 
     // By default, we want a dark theme for the tabbed code block; however, if the user changes the theme of any code block, it updates the same across the entire website.
     @api defaultTheme = DARK;
 
+    @api
+    get showLoadingIndicator() {
+        return this._showLoadingIndicator;
+    }
+
+    set showLoadingIndicator(value) {
+        this._showLoadingIndicator = normalizeBoolean(value);
+    }
+
     get tabs(): string {
         // Use the code block headers to create a tabs array as a JSON string
         return JSON.stringify(

package/LICENSE

@@ -1,12 +0,0 @@
-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.