lightning-base-components 1.21.1-alpha → 1.21.3-alpha

package/src/lightning/colorPickerPanel/colorPickerPanel.css

@@ -1,12 +1,2 @@
-/* @import 'lightning/sldsCommon';
-@import './color-picker-panel.slds.css';
-@import './popover.slds.css'; */
-
-/* Fix for footer button centering issue, for details see: W-11543875
- *
- * :host:not([data-render-mode]) - specifies that this style will only be applied in synthetic shadow mode
- */
-
-:host:not([data-render-mode]) .fix-slds-color-picker__selector-footer > lightning-button {
-    flex: 1;
- }
+@import './colorPickerPanel.lbc.synthetic.css';
+@import './colorPickerPanel.lbc.native.css';

package/src/lightning/colorPickerPanel/colorPickerPanel.js

@@ -2,7 +2,8 @@ import labelCancelButton from '@salesforce/label/LightningColorPicker.cancelButt
 import labelCustomTab from '@salesforce/label/LightningColorPickerPanel.customTab';
 import labelDefaultTab from '@salesforce/label/LightningColorPickerPanel.defaultTab';
 import labelDoneButton from '@salesforce/label/LightningColorPicker.doneButton';
-import { LightningElement, api, track } from 'lwc';
+import { api, track } from 'lwc';
+import LightningShadowBaseClass from 'lightning/shadowBaseClassPrivate';
 import { classSet } from 'lightning/utils';
 import { keyCodes } from 'lightning/utilsPrivate';
 
@@ -14,13 +15,14 @@ const i18n = {
 };
 
 const DEFAULT_COLOR = '#000000';
-export default class LightningColorPickerPanel extends LightningElement {
+export default class LightningColorPickerPanel extends LightningShadowBaseClass {
     @api currentColor;
 
     @track _isCustomTabActive = false;
     @track _selectedColor = null;
 
     connectedCallback() {
+        super.connectedCallback();
         this._selectedColor = this.currentColor || DEFAULT_COLOR;
     }
 

package/src/lightning/colorPickerPanel/colorPickerPanel.lbc.native.css

@@ -0,0 +1,3 @@
+@import 'lightning/sldsCommon';
+@import './color-picker-panel.slds.css';
+@import './popover.slds.css';

package/src/lightning/colorPickerPanel/colorPickerPanel.lbc.synthetic.css

@@ -0,0 +1,8 @@
+/* Fix for footer button centering issue, for details see: W-11543875
+ *
+ * :host:not([data-render-mode]) - specifies that this style will only be applied in synthetic shadow mode
+ */
+
+:host:not([data-render-mode]) .fix-slds-color-picker__selector-footer > lightning-button {
+    flex: 1;
+ }

package/src/lightning/colorPickerPanel/popover.slds.css

@@ -1,30 +1,28 @@
 
-@supports (--styling-hooks: '') {
   :host([data-render-mode="shadow"]) .slds-popover {
       position: relative;
-      border-radius: var(--sds-g-radius-border-2, 0.25rem);
-      width: var(--sds-g-sizing-15, 20rem);
-      min-height: calc(var(--sds-g-sizing-5, 1rem) * 2);
+      border-radius: var(--slds-g-radius-border-2);
+      width: var(--slds-g-sizing-15);
+      min-height: calc(var(--slds-g-sizing-5) * 2);
       z-index: var(--slds-c-popover-position-zindex, 6000);
       background-color: var(--slds-c-popover-color-background,
-          var(--slds-g-color-neutral-base-100,
-              var(--sds-g-color-neutral-base-100, #ffffff)));
+          var(--slds-g-color-surface-container-1));
       display: inline-block;
       box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 16%);
-      border: var(--sds-g-sizing-border-1, 1px) solid var(--slds-g-color-border-base-1, var(--sds-g-color-border-base-1, #c9c9c9));
+      border: var(--slds-g-sizing-border-1) solid var(--slds-g-color-border-1);
   }
 
   :host([data-render-mode="shadow"]) .slds-popover__meta {
-      margin-block-end: var(--sds-g-sizing-4, 0.75rem);
+      margin-block-end: var(--slds-g-sizing-4);
   }
 
   :host([data-render-mode="shadow"]) .slds-popover__body {
-      padding-block: var(--sds-g-spacing-2, 0.5rem);
-      padding-inline: var(--sds-g-spacing-3, 0.75rem);
+      padding-block: var(--slds-g-spacing-2);
+      padding-inline: var(--slds-g-spacing-3);
   }
 
   :host([data-render-mode="shadow"]) .slds-popover__body .slds-popover__header {
-      padding-block: 0 var(--sds-g-sizing-3, 0.5rem);
+      padding-block: 0 var(--slds-g-sizing-3);
       padding-inline: 0;
   }
 
@@ -32,8 +30,8 @@
   .slds-popover__header,:host([data-render-mode="shadow"]) 
   .slds-popover__footer {
       position: relative;
-      padding-block: var(--sds-g-spacing-2, 0.5rem);
-      padding-inline: var(--sds-g-spacing-3, 0.75rem);
+      padding-block: var(--slds-g-spacing-2);
+      padding-inline: var(--slds-g-spacing-3);
       word-wrap: break-word;
   }
 
@@ -42,38 +40,38 @@
   }
 
   :host([data-render-mode="shadow"]) .slds-popover__footer {
-      border-block-start: var(--sds-g-sizing-border-1, 1px) solid var(--slds-g-color-border-base-1, var(--sds-g-color-border-base-1, #c9c9c9));
-      background-color: var(--slds-g-color-neutral-base-95, var(--sds-g-color-neutral-base-95, #f3f3f3));
+      border-block-start: var(--slds-g-sizing-border-1) solid var(--slds-g-color-border-1);
+      background-color: var(--slds--g-color-surface-container-2);
       border-end-start-radius: inherit;
       border-end-end-radius: inherit;
-      padding-block: var(--sds-g-spacing-2, 0.5rem);
-      padding-inline: var(--sds-g-spacing-3, 0.75rem);
+      padding-block: var(--slds-g-spacing-2);
+      padding-inline: var(--slds-g-spacing-3);
   }
 
   :host([data-render-mode="shadow"]) .slds-popover__footer_form {
       text-align: center;
-      background: var(--slds-g-color-neutral-base-95, var(--sds-g-color-neutral-base-95, #f3f3f3));
-      border-radius: 0 0 var(--sds-g-radius-border-2, 0.25rem) var(--sds-g-radius-border-2, 0.25rem);
+      background: var(--slds-g-color-surface-container-2);
+      border-radius: 0 0 var(--slds-g-radius-border-2) var(--slds-g-radius-border-2);
   }
 
   :host([data-render-mode="shadow"]) .slds-popover__body_small {
-      max-height: var(--sds-g-sizing-14, 15rem);
+      max-height: var(--slds-g-sizing-14);
       overflow-y: auto;
   }
 
   :host([data-render-mode="shadow"]) .slds-popover__close {
       position: relative;
-      margin-block: var(--sds-g-spacing-1, 0.25rem);
-      margin-inline: var(--sds-g-spacing-1, 0.25rem);
+      margin-block: var(--slds-g-spacing-1);
+      margin-inline: var(--slds-g-spacing-1);
       z-index: calc(var(--slds-c-popover-position-zindex, 6000) + 1);
   }
 
   :host([data-render-mode="shadow"]) .slds-popover_small {
-      max-width: var(--sds-g-sizing-14, 15rem);
+      max-width: var(--slds-g-sizing-14);
   }
 
   :host([data-render-mode="shadow"]) .slds-popover_medium {
-      min-width: var(--sds-g-sizing-15, 20rem);
+      min-width: var(--slds-g-sizing-15);
   }
 
   :host([data-render-mode="shadow"]) .slds-popover_large {
@@ -98,24 +96,23 @@
   }
 
   :host([data-render-mode="shadow"]) .slds-popover_dark {
-      background-color: var(--slds-g-color-brand-base-30, var(--sds-g-color-brand-base-30, #014486));
-      color: var(--slds-g-color-neutral-base-100, var(--sds-g-color-neutral-base-100, #ffffff));
+      background-color: var(--slds-g-color-accent-container-3);
+      color: var(--slds-g-color-on-accent-1);
   }
 
   :host([data-render-mode="shadow"]) .slds-popover_dark .slds-badge {
-      background-color: var(--slds-g-color-neutral-base-100, var(--sds-g-color-neutral-base-100, #ffffff));
+      background-color: var(--slds-g-color-surface-container-1);
   }
 
   :host([data-render-mode="shadow"]) .slds-popover_dark .slds-popover__close {
-      color: var(--slds-g-color-neutral-base-100, var(--sds-g-color-neutral-base-100, #ffffff));
+      color: var(--slds-g-color-on-accent-1);
   }
 
   :host([data-render-mode="shadow"]) .slds-popover_dark .slds-icon-text-default {
-      fill: var(--slds-g-color-neutral-base-100, var(--sds-g-color-neutral-base-100, #ffffff));
+      fill: var(--slds-g-color-on-accent-1);
   }
 
   :host([data-render-mode="shadow"]) .slds-popover_dark .slds-popover__footer {
-      border-top-color: var(--slds-g-color-brand-base-10, var(--sds-g-color-brand-base-10, #001639));
-      background-color: var(--slds-g-color-brand-base-20, var(--sds-g-color-brand-base-20, #032d60));
+      border-top-color: var(--slds-g-color-border-accent-2);
+      background-color: var(--slds-g-color-on-accent-2);
   }
-}

package/src/lightning/combobox/combobox.css

@@ -1,21 +1,4 @@
-/* @import 'lightning/sldsCommon';
-@import './form-element.slds.css';
-@import './combobox.slds.css'; */
-
+@import './combobox.lbc.synthetic.css';
+@import './combobox.lbc.native.css';
 @import 'lightning/sldsGenAiUtils';
 
-:host {
-    display: block;
-}
-
-/**
-     This is adding the red border around the combobox input when there's an error
-     Should be removed once SLDS has added support for this (@W-9240038)
-*/
-:host.slds-has-error {
-    --slds-c-input-color-border: var(--slds-g-color-error-base-40, #ea001e);
-    --slds-c-input-shadow: var(--slds-g-color-error-base-40, #ea001e) 0 0 0 1px inset;
-    --slds-c-input-color-background: var(--slds-c-input-color-background, var(--sds-c-input-color-background, var(--slds-g-color-neutral-base-100, #fff)));
-    --slds-c-input-text-color: var(--slds-c-input-text-color, var(--sds-c-input-text-color, var(--slds-g-color-neutral-base-10, #747474)));
-}
-

package/src/lightning/combobox/combobox.html

@@ -1,6 +1,9 @@
 <template>
     <div part="combobox">
-        <label class={computedLabelClass}>
+        <label
+            class={computedLabelClass}
+            onclick={handleLabelClicked}
+        >
             <template if:true={required}>
                 <abbr class="slds-required" title={i18n.required}>*</abbr>
             </template>

package/src/lightning/combobox/combobox.js

@@ -1,7 +1,8 @@
 import labelRequired from '@salesforce/label/LightningControl.required';
 import labelPlaceholder from '@salesforce/label/LightningCombobox.placeholder';
 import labelHelpTextAlternativeText from '@salesforce/label/LightningInput.helptextAlternativeText';
-import { LightningElement, api, track } from 'lwc';
+import { api, track } from 'lwc';
+import LightningShadowBaseClass from 'lightning/shadowBaseClassPrivate';
 import { classSet, formatLabel } from 'lightning/utils';
 import {
     classListMutation,
@@ -18,7 +19,7 @@ import {
     VARIANT,
 } from 'lightning/inputUtils';
 
-import { isCSR } from 'lightning/utilsPrivate';
+import { isCSR, isNativeComponent } from 'lightning/utilsPrivate';
 
 const i18n = {
     required: labelRequired,
@@ -29,7 +30,7 @@ const i18n = {
  * A widget that provides an input field that is readonly,
  * accompanied by a dropdown list of selectable options.
  */
-export default class LightningCombobox extends LightningElement {
+export default class LightningCombobox extends LightningShadowBaseClass {
     static delegatesFocus = true;
     static validationOptOut = ['class'];
 
@@ -95,6 +96,8 @@ export default class LightningCombobox extends LightningElement {
     }
 
     connectedCallback() {
+        super.connectedCallback();
+        this._isNativeShadow = isNativeComponent(this);
         this.classList.add('slds-form-element');
         this.updateClassList();
         this.interactingState = new InteractingState();
@@ -363,6 +366,20 @@ export default class LightningCombobox extends LightningElement {
         this._labelForId = e.detail.id;
     }
 
+    handleLabelClicked() {
+        // @W-12765711 Open combobox when label is clicked in a cross shadow root scenario
+        if (this._isNativeShadow) {
+            const combobox = this.getBaseComboboxElement();
+            combobox.blur();
+            /* setTimeout is required so there is a tick between blur and open to ensure the same behavior between
+               native and synthetic shadow */
+            // eslint-disable-next-line @lwc/lwc/no-async-operation
+            setTimeout(() => {
+                combobox.focusAndOpenDropdownIfNotEmpty();
+            }, 50);
+        }
+    }
+
     synchronizeA11y() {
         synchronizeAttrs(this.template.querySelector('label'), {
             for: this._labelForId,

package/src/lightning/combobox/combobox.js-meta.xml

@@ -3,4 +3,7 @@
     <isExposed>true</isExposed>
     <minApiVersion>0.0</minApiVersion>
     <support>GA</support>
+    <capabilities>
+        <capability>lightning__ServerRenderableWithHydration</capability>
+    </capabilities>
 </LightningComponentBundle>

package/src/lightning/combobox/combobox.lbc.native.css

@@ -0,0 +1,3 @@
+@import 'lightning/sldsCommon';
+@import './form-element.slds.css';
+@import './combobox.slds.css';

package/src/lightning/combobox/combobox.lbc.synthetic.css

@@ -0,0 +1,28 @@
+:host {
+    display: block;
+}
+
+/**
+     This is adding the red border around the combobox input when there's an error
+     Should be removed once SLDS has added support for this (@W-9240038)
+*/
+:host.slds-has-error {
+    --slds-c-input-color-border: var(--slds-g-color-error-base-40, #ea001e);
+    --slds-c-input-shadow: var(--slds-g-color-error-base-40, #ea001e) 0 0 0 1px inset;
+    --slds-c-input-color-background: var(--slds-c-input-color-background, var(--sds-c-input-color-background, var(--slds-g-color-neutral-base-100, #fff)));
+    --slds-c-input-text-color: var(--slds-c-input-text-color, var(--sds-c-input-text-color, var(--slds-g-color-neutral-base-10, #747474)));
+}
+
+/* TODO W-12674349: remove after assistive text util is added */
+.slds-assistive-text {
+    position: absolute !important;
+    margin: -1px !important;
+    border: 0 !important;
+    padding: 0 !important;
+    width: 1px !important;
+    height: 1px !important;
+    overflow: hidden !important;
+    clip: rect(0 0 0 0) !important;
+    text-transform: none !important;
+    white-space: nowrap !important;
+  }

package/src/lightning/combobox/combobox.slds.css

@@ -2,12 +2,11 @@
 /* Copyright (c) 2015-present, salesforce.com, inc. All rights reserved
   Licensed under BSD 3-Clause - see LICENSE.txt or git.io/sfdc-license */
 
-@supports (--styling-hooks: '') {
   /**
    * Invalid State
    */
+
   :host([data-render-mode="shadow"][invalid]) [part='combobox'] {
-    --slds-c-inputtext-color-border: var(--sds-g-color-error-base-50, #ea001e);
-    --slds-c-inputtext-sizing-border: var(--sds-g-sizing-border-1, 1px);
+    --slds-c-inputtext-color-border: var(--slds-g-color-error-base-50);
+    --slds-c-inputtext-sizing-border: var(--slds-g-sizing-border-1);
   }
-}