@salesforcedevs/dx-components 1.3.223 → 1.3.224-alpha.2

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@salesforcedevs/dx-components",
-    "version": "1.3.223",
+    "version": "1.3.224-alpha.2",
     "description": "DX Lightning web components",
     "license": "MIT",
     "engines": {
@@ -43,6 +43,5 @@
     },
     "volta": {
         "node": "16.19.1"
-    },
-    "gitHead": "0a4fd810f3803ee837ebdb36dd194e973ce2f34e"
+    }
 }

package/src/modules/dx/mainContentHeader/mainContentHeader.ts

@@ -14,19 +14,25 @@ export default class MainContentHeader extends LightningElement {
     @api imgSrcMobile!: string;
     @api ctaTarget?: string | null = null;
     @api ctaTargetSecondary?: string | null = null;
-    @api backgroundColor?: string;
-    @api backgroundColorDark: boolean = false;
+    @api backgroundGradientColor?: string;
+    @api backgroundGradientDark: boolean = false;
     @api hasSwoop: boolean = false;
 
     private get style() {
         return cx(
-            this.backgroundColor &&
-                `background-color: var(--dx-g-${this.backgroundColor});`
+            this.backgroundGradientColor &&
+                !this.backgroundGradientDark &&
+                `background: linear-gradient(180deg, rgba(255, 255, 255, 0) 0%, #ffff 100%), var(--dx-g-${this.backgroundGradientColor});`,
+            this.backgroundGradientDark &&
+                `background: linear-gradient(90deg, var(--dx-g-indigo-vibrant-20) 0%, var(--dx-g-indigo-vibrant-30) 100%);`
         );
     }
 
     private get textStyle() {
-        return cx("text-container", this.backgroundColorDark && "light-text");
+        return cx(
+            "text-container",
+            this.backgroundGradientDark && "light-text"
+        );
     }
 
     private onCtaClick(e: Event) {

package/src/modules/dx/searchResults/searchResults.ts

@@ -8,6 +8,9 @@ import {
 import { getContentTypeColorVariables } from "dxUtils/contentTypes";
 import { pollUntil } from "dxUtils/async";
 
+// Max height for breadcrumb without wrapping
+const MAX_BREADCRUMB_HEIGHT = 16;
+
 interface CoveoSearch {
     state: typeof CoveoSDK.state;
     get: typeof CoveoSDK.get;
@@ -141,10 +144,10 @@ const processParts = (parts: string[], internalFlag = false) => {
     return parts.filter(filterFn).map((part) => {
         // Remove special characters & .htm/.xml extension
         part = part
-            .replace(/_/g, " ")
-            .replace(/-/g, " ")
-            .replace(/.html*/g, " ")
-            .replace(/.xml/g, " ")
+            .replace(/_/g, "")
+            .replace(/-/g, "")
+            .replace(/.html*/g, "")
+            .replace(/.xml/g, "")
             .replace(/b2c/g, "B2C");
 
         // Capitalize first letter of each word
@@ -367,17 +370,16 @@ export default class SearchResults extends LightningElement {
                 1000
             );
 
-            this.processBreadcrumbs(this.root!);
+            this.processBreadcrumbs(root);
 
             window.onresize = () => this.processBreadcrumbs(root);
         });
     }
 
-    // Checks if text is wrapping by comparing it with an element's text that doesn't wrap
-    private isTextWrapping = (
-        elementOne: HTMLElement,
-        elementTwo: HTMLElement
-    ) => elementOne.offsetHeight > elementTwo.offsetHeight;
+    // check if the breadcrumb is overflowing or not based on the height of a single character in the text element
+    private isTextWrapping = (element: HTMLElement) => {
+        return element.offsetHeight > MAX_BREADCRUMB_HEIGHT;
+    };
 
     private truncateBreadcrumbText = (breadcrumbItems: HTMLElement[]) => {
         breadcrumbItems.forEach((breadcrumbItem: HTMLElement) => {
@@ -396,12 +398,29 @@ export default class SearchResults extends LightningElement {
         breadcrumb: HTMLElement
     ) => {
         for (let i = 1; i < breadcrumbItems.length; i++) {
-            if (this.isTextWrapping(breadcrumb, breadcrumbItems[0])) {
-                breadcrumbItems[i].textContent = "...";
+            if (this.isTextWrapping(breadcrumb)) {
+                // if the previous element is an ellipsis, make it empty (in order to avoid multiple grouped ellipsis)
+                if (breadcrumbItems[i - 1]?.textContent === "...") {
+                    breadcrumbItems[i].innerHTML = "";
+                } else {
+                    breadcrumbItems[i].textContent = "...";
+                }
             } else {
                 break; // Exit the loop if the breadcrumb is no longer overflowing
             }
         }
+
+        // remove any empty breadcrumb items
+        breadcrumb.innerHTML = breadcrumb.innerHTML
+            .replace(
+                / ?\/ +<span class="breadcrumb-item"><\/span> +\/ ?/g,
+                " / "
+            )
+            // when first loading the page on mobile, the breadcrumb items are not grouped correctly
+            .replace(
+                `<span class="breadcrumb-item">...</span> / <span class="breadcrumb-item">...</span>`,
+                `<span class="breadcrumb-item">...</span>`
+            );
     };
 
     private formatBreadcrumbs = (breadcrumbs: HTMLElement[]) => {
@@ -411,7 +430,7 @@ export default class SearchResults extends LightningElement {
                 breadcrumb.querySelectorAll(".breadcrumb-item");
 
             // Check if the breadcrumb is overflowing by comparing it's height to the height of the first breadcrumb item
-            if (this.isTextWrapping(breadcrumb, breadcrumbItems[0])) {
+            if (this.isTextWrapping(breadcrumb)) {
                 // it is overflowing, so we need to truncate long titles to 30 characters
                 this.truncateBreadcrumbText(breadcrumbItems);
 
@@ -419,7 +438,7 @@ export default class SearchResults extends LightningElement {
                 this.addBreadcrumbEllipsis(breadcrumbItems, breadcrumb);
 
                 // After processing all breadcrumb items, if it's still overflowing, hide the breadcrumb element
-                if (this.isTextWrapping(breadcrumb, breadcrumbItems[0])) {
+                if (this.isTextWrapping(breadcrumb)) {
                     breadcrumb.style.display = "none";
                 }
             }

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.