@salesforcedevs/dx-components 1.3.4 → 1.3.5-lightdom-2

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@salesforcedevs/dx-components",
-    "version": "1.3.4",
+    "version": "1.3.5-lightdom-2",
     "description": "DX Lightning web components",
     "license": "MIT",
     "engines": {
@@ -35,6 +35,5 @@
         "@types/uuid": "^8.3.4",
         "@types/vimeo__player": "^2.16.2",
         "eventsourcemock": "^2.0.0"
-    },
-    "gitHead": "fcd28123dc3734ee192fd4c8b2fa50a43f38fa91"
+    }
 }

package/src/modules/dx/brandThemeProvider/brandThemeProvider.html

@@ -1,3 +1,4 @@
-<template>
+<template lwc:render-mode="light">
     <slot></slot>
+    <div id="extra_brand_styles"></div>
 </template>

package/src/modules/dx/brandThemeProvider/brandThemeProvider.ts

@@ -3,7 +3,7 @@ import brandCssVars from "./brandCssVars";
 import { Brand } from "typings/custom";
 
 export const toCss = (brand: Brand | null) => `
-  :host {
+    body, header, dx-card-small {
     ${brandCssVars.reduce(
         (acc, v) => `
           ${acc}
@@ -15,6 +15,8 @@ export const toCss = (brand: Brand | null) => `
 `;
 
 export default class BrandThemeProvider extends LightningElement {
+    static renderMode = "light";
+
     @api brand: Brand | null = null;
 
     private get css() {
@@ -30,17 +32,18 @@ export default class BrandThemeProvider extends LightningElement {
     }
 
     setBrandVars() {
-        let style = this.template.querySelector("style");
+        let style = this.querySelector("style");
+
         if (!style) {
             style = document.createElement("style");
-            this.template.appendChild(style);
+            this.querySelector("#extra_brand_styles")?.appendChild(style);
         }
 
-        if (style.firstChild) {
+        if (style?.firstChild) {
             style.removeChild(style.firstChild);
         }
 
         const css = document.createTextNode(this.css);
-        style.appendChild(css);
+        style?.appendChild(css);
     }
 }

package/src/modules/dx/button/button.html

@@ -1,4 +1,4 @@
-<template>
+<template lwc:render-mode="light">
     <button
         if:false={href}
         class={className}
@@ -7,8 +7,9 @@
         aria-label={ariaLabel}
         part="container"
     >
-        <span if:false={loading}>
-            <slot onslotchange={onSlotChange}></slot>
+        <span if:false={loading} class="button-content">
+            {buttonText}
+            <slot></slot>
         </span>
         <dx-icon
             if:true={showIcon}
@@ -29,8 +30,9 @@
         aria-label={ariaLabel}
         part="container"
     >
-        <span if:false={loading}>
-            <slot onslotchange={onSlotChange}></slot>
+        <span if:false={loading} class="button-content">
+            {buttonText}
+            <slot></slot>
         </span>
         <dx-icon
             if:true={showIcon}

package/src/modules/dx/button/{button.css → button.scoped.css}

@@ -1,5 +1,3 @@
-@import "dxHelpers/reset";
-
 :host {
     width: min-content;
     font-size: inherit;

package/src/modules/dx/button/button.ts

@@ -5,11 +5,12 @@ import {
     ButtonVariant,
     IconSprite,
     IconSize,
-    IconSymbol,
-    LightningSlotElement
+    IconSymbol
 } from "typings/custom";
 
 export default class Button extends LightningElement {
+    static renderMode = "light";
+
     @api ariaLabel: string = "";
     @api disabled: boolean | null = null;
     @api iconSize?: IconSize = "small";
@@ -23,6 +24,7 @@ export default class Button extends LightningElement {
     @api font: "display" | "sans" = "display";
     @api name?: string;
     @api value?: any;
+    @api buttonText?: string;
 
     // button props
     @api type: "submit" | "reset" | "button" = "button";
@@ -34,13 +36,17 @@ export default class Button extends LightningElement {
     @api rel: string | null = null;
 
     @api focus() {
-        const button = this.template.querySelector(".button");
+        const button = this.querySelector(".button");
         if (button) {
             button.focus();
         }
     }
 
-    private isSlotEmpty: boolean = true;
+    _isSlotEmpty: boolean = true;
+
+    renderedCallback(): void {
+        this._isSlotEmpty = this.isSlotEmpty();
+    }
 
     private get showIcon(): boolean {
         return !!this.iconSymbol && !this.loading;
@@ -55,14 +61,16 @@ export default class Button extends LightningElement {
             this.loading && "state-loading",
             `size-${this.size}`,
             !!this.iconSymbol && "style-icon",
-            this.isSlotEmpty && "slot-empty",
+            this._isSlotEmpty && "slot-empty",
             `font-${this.font}`,
             this.iconPosition === "right" ? "icon-right" : "icon-left"
         );
     }
 
-    private onSlotChange(e: LightningSlotElement) {
-        const slot = e.target;
-        this.isSlotEmpty = slot.assignedElements().length !== 0;
+    private isSlotEmpty() {
+        return (
+            !this.querySelector(".button-content")?.childElementCount &&
+            !this.querySelector(".button-content")?.textContent
+        );
     }
 }

package/src/modules/dx/cardTrial/cardTrial.html

@@ -50,6 +50,8 @@
                 value={typeBadgeValue}
                 color={typeBadgeColor}
                 size={typeBadgeSize}
+                dark={typeBadgeDark}
+                variant={typeBadgeVariant}
             ></dx-type-badge>
         </div>
         <dx-card-title

package/src/modules/dx/cardTrial/cardTrial.ts

@@ -30,8 +30,10 @@ export default class CardTrial extends LightningElement {
     @api twoColTarget?: string;
     @api twoColHref!: string;
     @api typeBadgeValue?: string;
+    @api typeBadgeVariant?: string;
     @api typeBadgeColor?: string;
     @api typeBadgeSize?: string = "default";
+    @api typeBadgeDark?: boolean = false;
 
     @api
     get details() {

package/src/modules/dx/dropdown/dropdown.css

@@ -1,6 +1,5 @@
-@import "dxHelpers/reset";
-
-.menu-nested::part(content) {
+.menu-nested::part(content),
+.menu-nested .popover.popover-content {
     padding-top: var(--dx-g-spacing-sm);
     width: 354px;
 }
@@ -11,7 +10,8 @@
     flex-wrap: nowrap;
 }
 
-.menu-hidden::part(content) {
+.menu-hidden::part(content),
+.menu-hidden .popover.popover-content {
     display: none;
 }
 
@@ -24,7 +24,8 @@
 }
 
 @media screen and (min-width: 1000px) {
-    .menu-nested-2-col::part(content) {
+    .menu-nested-2-col::part(content),
+    .menu-nested-2-col .popover.popover-content {
         width: 592px;
     }
 

package/src/modules/dx/dropdown/dropdown.html

@@ -1,4 +1,4 @@
-<template>
+<template lwc:render-mode="light">
     <dx-popover
         aria-label={ariaLabel}
         class={className}
@@ -12,7 +12,10 @@
         small={small}
         width={width}
     >
-        <slot slot="control"></slot>
+        <div slot="control">
+            <slot></slot>
+        </div>
+
         <div
             class="menu_list"
             if:false={areOptionsEmpty}

package/src/modules/dx/dropdown/dropdown.ts

@@ -20,6 +20,8 @@ interface DropdownOption extends OptionWithNested {
 }
 
 export default class Dropdown extends LightningElement {
+    static renderMode = "light";
+
     @api value: string | null = null; // "active option" id
     @api valuePath: string = "id"; // path to match for the active value (useful for url matching)
     @api stayOpenAfterChange?: boolean = false;
@@ -98,7 +100,7 @@ export default class Dropdown extends LightningElement {
     }
 
     private get optionsElements() {
-        return this.template.querySelectorAll("dx-dropdown-option");
+        return this.querySelectorAll("dx-dropdown-option");
     }
 
     private get areOptionsEmpty() {
@@ -187,7 +189,7 @@ export default class Dropdown extends LightningElement {
 
     renderedCallback() {
         if (!this.popoverEl) {
-            this.popoverEl = this.template.querySelector("dx-popover");
+            this.popoverEl = this.querySelector("dx-popover");
         }
     }
 }

package/src/modules/dx/header/header.css

@@ -1,99 +1 @@
 @import "dxHelpers/commonHeader";
-
-:host {
-    --dx-c-header-search-width: 316px;
-    --dx-g-text-xs: 14px;
-}
-
-dx-header-mobile-nav-menu {
-    --dx-c-color-background: var(--dx-g-brand-current-color-background);
-    --dx-c-button-color-background-inactive: var(
-        --dx-g-brand-current-button-color-background-inactive
-    );
-    --dx-c-button-color-background-active: var(
-        --dx-g-brand-current-button-color-background-active
-    );
-    --dx-c-color: var(--dx-g-brand-current-color);
-    --dx-c-color-border: var(--dx-g-brand-current-color-border);
-    --dx-c-color-background-2: var(--dx-g-brand-current-color-background-2);
-    --dx-c-button-color-background-inactive-hover: var(
-        --dx-g-brand-current-button-color-background-inactive-hover
-    );
-    --dx-c-color-border-2: var(--dx-g-brand-current-color-border-2);
-}
-
-.header_l2_group-title {
-    margin-right: var(--dx-g-spacing-4xl);
-}
-
-.header_l2_group-nav_menu-ctas {
-    display: none;
-    position: relative;
-    justify-content: center;
-    align-items: center;
-    padding-right: var(--dx-g-spacing-sm);
-    height: 100%;
-}
-
-.header_l2_group-nav_menu-ctas::after {
-    content: "";
-    position: absolute;
-    right: 0;
-    top: var(--dx-g-spacing-sm);
-    height: calc(100% - var(--dx-g-spacing-md));
-    width: 1px;
-    background: transparent;
-    transition: var(--dx-g-transition-hue-1x);
-}
-
-header.has-navscrollshadow .header_l2_group-nav_menu-ctas::after {
-    background: var(--dx-g-brand-current-color-border);
-}
-
-.header_l2_group-nav_menu-button {
-    --dx-c-button-primary-color: var(--dx-g-blue-vibrant-20);
-    --dx-c-button-secondary-color-hover: var(
-        --dx-g-brand-current-button-color-background-inactive
-    );
-}
-
-@media (max-width: 1024px) {
-    .header_l2 {
-        flex-wrap: wrap;
-        height: unset;
-        padding: 0;
-    }
-
-    .header_l2_group-title {
-        margin-right: 0;
-        padding: 12px var(--dx-g-page-padding-horizontal);
-    }
-
-    .header_l2_group {
-        width: 100%;
-    }
-
-    .header_l2_group-nav {
-        height: var(--dx-g-spacing-3xl);
-        padding: 0;
-        padding-left: var(--dx-g-spacing-sm);
-    }
-
-    .header_l2_group-nav_overflow {
-        margin-right: var(--dx-g-spacing-sm);
-    }
-
-    .header_version-dropdown {
-        margin-left: auto;
-    }
-
-    .has-nav-items .header_l2_group-title {
-        border-bottom: 1px solid var(--dx-g-brand-current-color-border-2);
-    }
-}
-
-@media (max-width: 768px) {
-    .header_l2_group-nav > .header_l2_group-nav_menu-ctas {
-        display: flex;
-    }
-}

package/src/modules/dx/header/header.html

@@ -1,4 +1,4 @@
-<template>
+<template lwc:render-mode="light">
     <dx-brand-theme-provider brand={brand}>
         <header class={className}>
             <dx-skip-nav-link></dx-skip-nav-link>

package/src/modules/dx/header/header.scoped.css

@@ -0,0 +1,97 @@
+:host {
+    --dx-c-header-search-width: 316px;
+    --dx-g-text-xs: 14px;
+}
+
+dx-header-mobile-nav-menu {
+    --dx-c-color-background: var(--dx-g-brand-current-color-background);
+    --dx-c-button-color-background-inactive: var(
+        --dx-g-brand-current-button-color-background-inactive
+    );
+    --dx-c-button-color-background-active: var(
+        --dx-g-brand-current-button-color-background-active
+    );
+    --dx-c-color: var(--dx-g-brand-current-color);
+    --dx-c-color-border: var(--dx-g-brand-current-color-border);
+    --dx-c-color-background-2: var(--dx-g-brand-current-color-background-2);
+    --dx-c-button-color-background-inactive-hover: var(
+        --dx-g-brand-current-button-color-background-inactive-hover
+    );
+    --dx-c-color-border-2: var(--dx-g-brand-current-color-border-2);
+}
+
+.header_l2_group-title {
+    margin-right: var(--dx-g-spacing-4xl);
+}
+
+.header_l2_group-nav_menu-ctas {
+    display: none;
+    position: relative;
+    justify-content: center;
+    align-items: center;
+    padding-right: var(--dx-g-spacing-sm);
+    height: 100%;
+}
+
+.header_l2_group-nav_menu-ctas::after {
+    content: "";
+    position: absolute;
+    right: 0;
+    top: var(--dx-g-spacing-sm);
+    height: calc(100% - var(--dx-g-spacing-md));
+    width: 1px;
+    background: transparent;
+    transition: var(--dx-g-transition-hue-1x);
+}
+
+header.has-navscrollshadow .header_l2_group-nav_menu-ctas::after {
+    background: var(--dx-g-brand-current-color-border);
+}
+
+.header_l2_group-nav_menu-button {
+    --dx-c-button-primary-color: var(--dx-g-blue-vibrant-20);
+    --dx-c-button-secondary-color-hover: var(
+        --dx-g-brand-current-button-color-background-inactive
+    );
+}
+
+@media (max-width: 1024px) {
+    .header_l2 {
+        flex-wrap: wrap;
+        height: unset;
+        padding: 0;
+    }
+
+    .header_l2_group-title {
+        margin-right: 0;
+        padding: 12px var(--dx-g-page-padding-horizontal);
+    }
+
+    .header_l2_group {
+        width: 100%;
+    }
+
+    .header_l2_group-nav {
+        height: var(--dx-g-spacing-3xl);
+        padding: 0;
+        padding-left: var(--dx-g-spacing-sm);
+    }
+
+    .header_l2_group-nav_overflow {
+        margin-right: var(--dx-g-spacing-sm);
+    }
+
+    .header_version-dropdown {
+        margin-left: auto;
+    }
+
+    .has-nav-items .header_l2_group-title {
+        border-bottom: 1px solid var(--dx-g-brand-current-color-border-2);
+    }
+}
+
+@media (max-width: 768px) {
+    .header_l2_group-nav > .header_l2_group-nav_menu-ctas {
+        display: flex;
+    }
+}

package/src/modules/dx/header/header.ts

@@ -1,6 +1,8 @@
 import { HeaderBase } from "dxBaseElements/headerBase";
 
 export default class Header extends HeaderBase {
+    static renderMode = "light";
+
     private get showTbidLogin(): boolean {
         return this.showSignup;
     }

package/src/modules/dx/icon/icon.scoped.css

@@ -0,0 +1,5 @@
+:host {
+    display: block;
+
+    --dx-c-icon-color: currentColor;
+}

package/src/modules/dx/popover/popover.html

@@ -1,5 +1,5 @@
-<template>
-    <slot name="control" onslotchange={onSlotChange}></slot>
+<template lwc:render-mode="light">
+    <slot name="control"></slot>
     <div class={containerClassName}>
         <div class="popover-arrow" if:true={showArrow}></div>
         <div

package/src/modules/dx/popover/{popover.css → popover.scoped.css}

@@ -1,5 +1,3 @@
-@import "dxHelpers/reset";
-
 :host {
     --popover-border-radius: var(
         --dx-c-popover-border-radius,

package/src/modules/dx/popover/popover.ts

@@ -1,9 +1,5 @@
 import { LightningElement, api } from "lwc";
-import {
-    LightningSlotElement,
-    PopoverRequestCloseType,
-    PopperPlacement
-} from "typings/custom";
+import { PopoverRequestCloseType, PopperPlacement } from "typings/custom";
 
 import { computePosition, flip, size, shift, arrow } from "@floating-ui/dom";
 import cx from "classnames";
@@ -23,6 +19,8 @@ const isEventOutsideElements = (
         );
 
 export default class Popover extends LightningElement {
+    static renderMode = "light";
+
     @api ariaLabel: string | null = null;
     @api offset?: "small" | "medium";
     @api pagePadding?: number = 16; // padding between dropdown and the edge of the page
@@ -121,14 +119,17 @@ export default class Popover extends LightningElement {
 
     renderedCallback() {
         if (!this.popover) {
-            this.popover = this.template.querySelector(".popover-container");
+            this.popover = this.querySelector(".popover-container");
         }
+
         if (!this.popoverContent) {
-            this.popoverContent = this.template.querySelector(".popover");
+            this.popoverContent = this.querySelector(".popover");
         }
         if (!this.arrow && this.showArrow) {
-            this.arrow = this.template.querySelector(".popover-arrow");
+            this.arrow = this.querySelector(".popover-arrow");
         }
+
+        this.doWeirdControlStuff();
     }
 
     // GETTERS
@@ -136,6 +137,7 @@ export default class Popover extends LightningElement {
     private get className() {
         return cx(
             "popover",
+            "popover-content",
             this.offset && `popover-offset-${this.offset}`,
             this.small && "popover-small",
             this.width && "popover-overridewidth",
@@ -241,25 +243,15 @@ export default class Popover extends LightningElement {
         this.openPopover();
     };
 
-    private onSlotChange(e: Event) {
-        const slot = e.target as LightningSlotElement;
-        const elements = slot.assignedElements();
-        const slotted = elements.length === 0 ? null : elements[0];
-        // allows dropdown/select to compose popover
-        const slotElement = (
-            slotted?.tagName === "SLOT" ? slotted.firstChild : slotted
-        ) as HTMLElement | null;
-        const isWorkToDo =
-            slotElement &&
-            (!this.control || !slotElement.isSameNode(this.control));
-
-        if (!isWorkToDo) {
-            return;
+    private doWeirdControlStuff() {
+        const control = this.querySelector('[slot="control"]');
+
+        if (control) {
+            control.setAttribute("aria-haspopup", "true");
+            control.style.cursor = this.openOnHover ? "default" : "cursor";
+            this.control = control;
         }
 
-        slotElement.setAttribute("aria-haspopup", "true");
-        slotElement.style.cursor = this.openOnHover ? "default" : "cursor";
-        this.control = slotElement;
         this.addControlListeners();
         this.setPosition();
     }

package/src/modules/dxHelpers/commonSidebar/commonSidebar.css

@@ -33,7 +33,7 @@ dx-tree:not(:last-child) {
     line-height: inherit;
 }
 
-.header-toggle-button {
+dx-button.header-toggle-button {
     position: absolute;
     right: calc((-1 * (var(--dx-g-spacing-xl) / 2)) - 1px);
 

package/src/modules/dxHelpers/reset/reset.css

@@ -488,7 +488,6 @@ h4,
 h5,
 h6 {
     font-size: inherit;
-    font-weight: inherit;
 }
 
 /**

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.