lightning-base-components 1.21.1-alpha → 1.21.2-alpha

package/src/lightning/dualListbox/dual-listbox.slds.css

@@ -29,12 +29,12 @@
   }
 
   :host([data-render-mode="shadow"]) .slds-dueling-list__column > lightning-button-icon {
-    margin-block: var(--sds-g-spacing-4, 1rem);
-    margin-inline: var(--sds-g-spacing-1, 0.25rem);
+    margin-block: var(--slds-g-spacing-4);
+    margin-inline: var(--slds-g-spacing-1);
   }
 
   :host([data-render-mode="shadow"]) .slds-dueling-list__column > lightning-button-icon:first-of-type {
-    margin-block-start: var(--sds-g-spacing-5, 1.5rem);
+    margin-block-start: var(--slds-g-spacing-5);
   }
 
   /* Changes the layout of the dueling picklist to be responsive */
@@ -42,7 +42,7 @@
     flex: 1 1 15rem;
     flex-wrap: wrap;
     overflow: hidden;
-    min-width: calc(var(--sds-g-sizing-9, 2rem) * 3);
+    min-width: calc(var(--slds-g-sizing-9) * 3);
   }
 
   :host([data-render-mode="shadow"]) .slds-dueling-list__column_responsive .slds-dueling-list__options {
@@ -52,26 +52,26 @@
 
   /* Bounding visual container for listbox of options */
   :host([data-render-mode="shadow"]) .slds-dueling-list__options {
-    border: var(--sds-g-sizing-border-1, 1px) solid var(--sds-g-color-neutral-base-80, #c9c9c9);
-    border-radius: var(--sds-g-radius-border-2, 0.25rem);
-    padding-block: var(--sds-g-spacing-1, 0.25rem);
+    border: var(--slds-g-sizing-border-1) solid var(--slds-g-color-border-1);
+    border-radius: var(--slds-g-radius-border-2);
+    padding-block: var(--slds-g-spacing-1);
     padding-inline: 0;
-    width: var(--sds-g-sizing-14, 15rem);
-    height: var(--sds-g-sizing-14, 15rem);
-    background-color: var(--sds-g-color-neutral-base-100, #ffffff);
+    width: var(--slds-g-sizing-14);
+    height: var(--slds-g-sizing-14);
+    background-color: var(--slds-g-color-surface-container-1);
     overflow: auto;
   }
 
   /* Selected/dragging state of a listbox option, not currently supported by lbc */
   :host([data-render-mode="shadow"]) .slds-dueling-list__options [aria-selected='true'] {
-    background-color: var(--sds-g-color-brand-base-50, #0176d3);
-    color: var(--sds-g-color-neutral-base-100, #ffffff);
+    background-color: var(--slds-g-color-accent-container-2);
+    color: var(--slds-g-color-on-accent-1);
   }
 
   :host([data-render-mode="shadow"]) .slds-dueling-list__options [aria-selected='true']:hover,:host([data-render-mode="shadow"]) 
   .slds-dueling-list__options [aria-selected='true']:focus {
-    background: var(--sds-g-color-brand-base-30, #014486);
-    color: var(--sds-g-color-neutral-base-100, #ffffff);
+    background: var(--slds-g-color-accent-container-3);
+    color: var(--slds-g-color-on-accent-1);
   }
 
   :host([data-render-mode="shadow"]) .slds-dueling-list__options .slds-is-grabbed {
@@ -80,9 +80,9 @@
 
   /* Disabled state of a picklist option */
   :host([data-render-mode="shadow"]) .slds-dueling-list__options.slds-is-disabled {
-    background-color: var(--sds-g-color-neutral-base-95, #f3f3f3);
-    border-color: var(--sds-g-color-neutral-base-80, #c9c9c9);
-    color: var(--sds-g-color-neutral-base-30, #444444);
+    background-color: var(--slds-g-color-disabled-container-1);
+    border-color: var(--slds-g-color-border-disabled-1);
+    color: var(--slds-g-color-on-disabled-1);
   }
 
   :host([data-render-mode="shadow"]) .slds-dueling-list__options.slds-is-disabled:hover {
@@ -99,10 +99,10 @@
   }
 
   :host([data-render-mode="shadow"][variant='label-inline']) {
-    margin-block-end: var(--sds-g-spacing-2, 0.5rem);
+    margin-block-end: var(--slds-g-spacing-2);
     width: 100%;
     flex-basis: 100%;
-    padding: var(--sds-g-spacing-1, 0.25rem);
+    padding: var(--slds-g-spacing-1);
   }
 
   :host([data-render-mode="shadow"][variant='label-inline']).slds-form-element {
@@ -124,11 +124,11 @@
 
   :host([data-render-mode="shadow"]) .slds-media__figure {
     flex-shrink: 0;
-    margin-inline-end: var(--sds-g-spacing-3, 0.75rem);
+    margin-inline-end: var(--slds-g-spacing-3);
   }
 
   :host([data-render-mode="shadow"]) .slds-media__figure_fixed-width {
-    min-width: var(--sds-g-sizing-10, 3rem);
+    min-width: var(--slds-g-sizing-10);
   }
 
   :host([data-render-mode="shadow"]) .slds-media__body {
@@ -147,19 +147,19 @@
   }
 
   :host([data-render-mode="shadow"]) .slds-media_small .slds-media__figure {
-    margin-inline-end: var(--sds-g-spacing-1, 0.25rem);
+    margin-inline-end: var(--slds-g-spacing-1);
   }
 
   :host([data-render-mode="shadow"]) .slds-media_small .slds-media__figure_reverse {
-    margin-inline-start: var(--sds-g-spacing-1, 0.25rem);
+    margin-inline-start: var(--slds-g-spacing-1);
   }
 
   :host([data-render-mode="shadow"]) .slds-media_large .slds-media__figure {
-    margin-inline-end: var(--sds-g-spacing-5, 1.5rem);
+    margin-inline-end: var(--slds-g-spacing-5);
   }
 
   :host([data-render-mode="shadow"]) .slds-media_large .slds-media__figure_reverse {
-    margin-inline-start: var(--sds-g-spacing-5, 1.5rem);
+    margin-inline-start: var(--slds-g-spacing-5);
   }
 
   :host([data-render-mode="shadow"]) .slds-media_inline .slds-media__body {
@@ -172,7 +172,7 @@
 
   :host([data-render-mode="shadow"]) .slds-media__figure_reverse {
     margin-block: 0;
-    margin-inline-start: var(--sds-g-spacing-3, 0.75rem);
+    margin-inline-start: var(--slds-g-spacing-3);
     margin-inline-end: 0;
   }
 
@@ -184,7 +184,7 @@
 
     :host([data-render-mode="shadow"]) .slds-media_responsive .slds-media__figure {
       margin-block: 0;
-      margin-inline-start: var(--sds-g-spacing-3, 0.75rem);
+      margin-inline-start: var(--slds-g-spacing-3);
       margin-inline-end: 0;
     }
   }

package/src/lightning/dualListbox/dualListbox.css

@@ -1,8 +1,2 @@
-/* @import 'lightning/sldsCommon';
-@import "./form-element.slds.css";
-@import './listbox.slds.css';
-@import './dual-listbox.slds.css'; */
-
-:host {
-    display: block;
-}
+@import './dualListbox.lbc.synthetic.css';
+@import './dualListbox.lbc.native.css';

package/src/lightning/dualListbox/dualListbox.js

@@ -19,7 +19,8 @@ import labelMovedOptionsSingular from '@salesforce/label/LightningDualListbox.mo
 import labelMovedOptionsPlural from '@salesforce/label/LightningDualListbox.movedOptionsPlural';
 import labelVerticallyMovedOptionsText from '@salesforce/label/LightningDualListbox.verticallyMovedOptions';
 import labelHelpTextAlternativeText from '@salesforce/label/LightningInput.helptextAlternativeText';
-import { LightningElement, api, track } from 'lwc';
+import { api, track } from 'lwc';
+import LightningShadowBaseClass from 'lightning/shadowBaseClassPrivate';
 import { handleKeyDownOnOption } from './keyboard';
 import { classSet, formatLabel } from 'lightning/utils';
 import {
@@ -28,6 +29,7 @@ import {
     getRealDOMId,
     classListMutation,
     reflectAttribute,
+    isCSR,
 } from 'lightning/utilsPrivate';
 import {
     InteractingState,
@@ -63,7 +65,8 @@ const i18n = {
 /**
  * A pair of listboxes that enables multiple options to be selected and reordered.
  */
-export default class LightningDualListbox extends LightningElement {
+export default class LightningDualListbox extends LightningShadowBaseClass {
+    static validationOptOut = ['class'];
     // Component attributes
     /**
      * Label for the source options listbox.
@@ -112,22 +115,22 @@ export default class LightningDualListbox extends LightningElement {
      */
     @api name;
 
-    @track _showActivityIndicator = false;
+    _showActivityIndicator = false;
     @track _requiredOptions = [];
     @track _selectedValues = [];
-    @track _variant;
-    @track _disabled;
-    @track _disableReordering = false;
-    @track _required = false;
-    @track _addButtonLabel;
-    @track _removeButtonLabel;
-    @track _upButtonLabel;
-    @track _downButtonLabel;
-    @track _size;
-    @track errorMessage = '';
+    _variant;
+    _disabled;
+    _disableReordering = false;
+    _required = false;
+    _addButtonLabel;
+    _removeButtonLabel;
+    _upButtonLabel;
+    _downButtonLabel;
+    _size;
+    errorMessage = '';
     @track highlightedOptions = [];
-    @track focusableInSource;
-    @track focusableInSelected;
+    focusableInSource;
+    focusableInSelected;
     @track highlightedOptionsLabel = [];
 
     _messageToDisplay = '';
@@ -302,7 +305,9 @@ export default class LightningDualListbox extends LightningElement {
     focus() {
         // focus on the first option from either list
         // if nothing on source, then it'll pick the one on selected
-        const firstOption = this.template.querySelector(`div[data-index='0']`);
+        const firstOption = isCSR
+            ? this.template.querySelector(`div[data-index='0']`)
+            : null;
         if (firstOption) {
             firstOption.focus();
             this.updateSelectedOptions(firstOption, true, false);
@@ -358,6 +363,7 @@ export default class LightningDualListbox extends LightningElement {
     }
 
     connectedCallback() {
+        super.connectedCallback();
         this.classList.add('slds-form-element');
         this.updateClassList();
         this.keyboardInterface = this.selectKeyboardInterface();
@@ -370,11 +376,15 @@ export default class LightningDualListbox extends LightningElement {
             debounceInteraction: true,
         });
         this.interactingState.onenter(() => {
-            this.dispatchEvent(new CustomEvent('focus'));
+            if (isCSR) {
+                this.dispatchEvent(new CustomEvent('focus'));
+            }
         });
         this.interactingState.onleave(() => {
             this.showHelpMessageIfInvalid();
-            this.dispatchEvent(new CustomEvent('blur'));
+            if (isCSR) {
+                this.dispatchEvent(new CustomEvent('blur'));
+            }
 
             // reset the optionToFocus otherwise dualListbox will steal the focus any time it's rerendered.
             this.optionToFocus = null;
@@ -397,9 +407,14 @@ export default class LightningDualListbox extends LightningElement {
 
         if (this.optionToFocus) {
             // value could have an apostrophe, which is why we need to escape it otherwise the queryselector will not work
-            const option = this.template.querySelector(
-                `div[data-value='${this.optionToFocus.replace(/'/g, "\\'")}']`
-            );
+            const option = isCSR
+                ? this.template.querySelector(
+                      `div[data-value='${this.optionToFocus.replace(
+                          /'/g,
+                          "\\'"
+                      )}']`
+                  )
+                : null;
             if (option) {
                 this.isFocusOnList = true;
                 option.focus();
@@ -412,13 +427,15 @@ export default class LightningDualListbox extends LightningElement {
     }
 
     get computedSourceListId() {
-        return getRealDOMId(this.template.querySelector('[data-source-list]'));
+        return isCSR
+            ? getRealDOMId(this.template.querySelector('[data-source-list]'))
+            : 'source-list';
     }
 
     get computedSelectedListId() {
-        return getRealDOMId(
-            this.template.querySelector('[data-selected-list]')
-        );
+        return isCSR
+            ? getRealDOMId(this.template.querySelector('[data-selected-list]'))
+            : 'selected-list';
     }
 
     get ariaDisabled() {
@@ -976,14 +993,16 @@ export default class LightningDualListbox extends LightningElement {
     }
 
     dispatchChangeEvent(values) {
-        // the change event needs to propagate to elements outside of the light-DOM, hence making it composed.
-        this.dispatchEvent(
-            new CustomEvent('change', {
-                composed: true,
-                bubbles: true,
-                detail: { value: values },
-            })
-        );
+        if (isCSR) {
+            // the change event needs to propagate to elements outside of the light-DOM, hence making it composed.
+            this.dispatchEvent(
+                new CustomEvent('change', {
+                    composed: true,
+                    bubbles: true,
+                    detail: { value: values },
+                })
+            );
+        }
     }
 
     assertRequiredAttributes() {
@@ -1012,9 +1031,9 @@ export default class LightningDualListbox extends LightningElement {
     }
 
     getElementsOfList(listId) {
-        const elements = this.template.querySelectorAll(
-            `div[data-type='${listId}']`
-        );
+        const elements = isCSR
+            ? this.template.querySelectorAll(`div[data-type='${listId}']`)
+            : null;
         return elements ? elements : [];
     }
 

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

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

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

@@ -0,0 +1,4 @@
+@import 'lightning/sldsCommon';
+@import "./form-element.slds.css";
+@import './listbox.slds.css';
+@import './dual-listbox.slds.css';

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

@@ -0,0 +1,3 @@
+:host {
+    display: block;
+}

package/src/lightning/dualListbox/form-element.slds.css

@@ -1,7 +1,31 @@
 
 /* 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: '') {
+
+/**
+ * sldsFormElementUtils.css and form-element.css have many similarities
+ * however, they are used for very different use cases, and this is why
+ * they both exist, separate of each other. the 2 files are not 1:1.
+ *
+ * form-element.css is used for inclusion by LBC engineers (internal)
+ * in many of our lightning-input components, and is written with
+ * part attributes in mind. Some unneeded form element blueprint sections
+ * are not included in form-element.css, but could be added as needed later
+ *
+ * sldsFormElementUtils.css is used by customers (external) to get the
+ * specific layout styles that are provided by the form element blueprint
+ * https://www.lightningdesignsystem.com/components/form-element/
+ * there are no part attribute rules in this file
+ * the main use case of this utility is LightningModal for styling
+ * form layout for Form Element variants: Stacked, Horizontal, Compound
+ * sldsFormElementUtils.css is imported by customers via LWC CSS files:
+ * @import 'lightning/sldsFormElementUtils';
+ *
+ * **NOTE:** If you are updating this file, also check sldsFormElementUtils.css
+ * for any needed updates to keep these files in sync
+ */
+
+@supports (--styling-hooks: '') {
     /* TODO: Swap with utility classes */
     :host([data-render-mode="shadow"]) fieldset {
       border: 0;
@@ -20,11 +44,11 @@
         word-wrap: break-word;
         hyphens: auto;
         display: inline-block;
-        color: var(--sds-g-color-neutral-base-30, #444444);
-        font-size: var(--sds-g-font-scale-neg-3, 0.75rem);
-        padding-inline-end: var(--sds-g-spacing-2, 0.5rem);
-        padding-block-start: var(--sds-g-spacing-1, 0.25rem);
-        margin-block-end: calc(var(--sds-g-spacing-1, 0.25rem) / 2);
+        color: var(--slds-g-color-on-surface-2);
+        font-size: var(--slds-g-font-scale-neg-3);
+        padding-inline-end: var(--slds-g-spacing-2);
+        padding-block-start: var(--slds-g-spacing-1);
+        margin-block-end: calc(var(--slds-g-spacing-1) / 2);
     }
 
     :host([data-render-mode="shadow"]) .slds-form-element__label:empty {
@@ -36,12 +60,16 @@
         position: relative;
     }
 
+    :host([data-render-mode="shadow"]) .slds-form-element__control .slds-radio {
+      display: block;
+    }
+
     :host([data-render-mode="shadow"]) .slds-form-element__icon {
         display: inline-block;
         position: relative;
-        padding-block-start: var(--sds-g-spacing-1, 0.25rem);
+        padding-block-start: var(--slds-g-spacing-1);
         vertical-align: top;
-        line-height: var(--sds-g-font-lineheight-1, 1);
+        line-height: var(--slds-g-font-lineheight-1);
         z-index: 1;
     }
 
@@ -51,24 +79,24 @@
 
     :host([data-render-mode="shadow"]) .slds-form-element__help,:host([data-render-mode="shadow"]) 
     .slds-form-element__helper {
-        font-size: var(--sds-g-font-scale-neg-3, 0.75rem);
-        margin-block-start: calc(var(--sds-g-spacing-1, 0.25rem) / 2);
+        font-size: var(--slds-g-font-scale-neg-3);
+        margin-block-start: calc(var(--slds-g-spacing-1) / 2);
         display: block;
     }
 
     :host([data-render-mode="shadow"]) .slds-form-element_edit .slds-form-element__static {
-        width: calc(100% - var(--sds-g-sizing-7, 1.5rem));
+        width: calc(100% - var(--slds-g-sizing-7));
     }
 
     :host([data-render-mode="shadow"]) .slds-form-element_readonly {
         flex-basis: 0%;
-        border-bottom: var(--sds-g-sizing-border-1, 1px) solid var(--sds-g-color-neutral-base-90, #e5e5e5);
+        border-bottom: var(--slds-g-sizing-border-1) solid var(--slds-g-color-border-1);
         margin-block-end: 0;
     }
 
     :host([data-render-mode="shadow"]) .slds-form-element_readonly .slds-form-element__control {
-        padding-block-start: calc(var(--sds-g-spacing-1, 0.25rem) / 2);
-        padding-block-end: calc(var(--sds-g-spacing-1, 0.25rem) / 2);
+        padding-block-start: calc(var(--slds-g-spacing-1) / 2);
+        padding-block-end: calc(var(--slds-g-spacing-1) / 2);
     }
 
     :host([data-render-mode="shadow"]) .slds-form-element_readonly .slds-form-element__label {
@@ -76,7 +104,7 @@
     }
 
     :host([data-render-mode="shadow"]) .slds-form-element__legend {
-        font-weight: var(--sds-g-font-weight-7, 700);
+        font-weight: var(--slds-g-font-weight-7);
         float: left;
     }
 
@@ -84,8 +112,8 @@
         display: inline-block;
         margin-block-start: 0;
         margin-block-end: 0;
-        margin-inline-start: var(--sds-g-spacing-2, 0.5rem);
-        margin-inline-end: var(--sds-g-spacing-2, 0.5rem);
+        margin-inline-start: var(--slds-g-spacing-2);
+        margin-inline-end: var(--slds-g-spacing-2);
         align-self: center;
     }
 
@@ -94,9 +122,9 @@
         word-wrap: break-word;
         word-break: break-word;
         display: inline-block;
-        font-size: var(--sds-g-font-scale-neg-1, 0.875rem);
-        font-weight: var(--sds-g-font-weight-4, 400);
-        color: var(--sds-g-color-neutral-base-10, #181818);
+        font-size: var(--slds-g-font-scale-neg-1);
+        font-weight: var(--slds-g-font-weight-4);
+        color: var(--slds-g-color-neutral-base-10);
         width: 100%;
     }
 
@@ -105,28 +133,28 @@
     }
 
     :host([data-render-mode="shadow"]) .slds-form-element__static:empty {
-        min-height: calc(var(--sds-g-sizing-6, 1.25rem) + 1px);
+        min-height: calc(var(--slds-g-sizing-6) + 1px);
         vertical-align: bottom;
     }
 
     :host([data-render-mode="shadow"]) .slds-form-element__static--edit {
-        width: calc(100% - var(--sds-g-sizing-7, 1.5rem));
+        width: calc(100% - var(--slds-g-sizing-7));
     }
 
     :host([data-render-mode="shadow"]) .slds-required {
-        color: var(--sds-g-color-error-base-50, #ea001e);
+        color: var(--slds-g-color-error-base-50);
         margin-block-start: 0;
         margin-block-end: 0;
-        margin-inline-start: calc(var(--sds-g-spacing-1, 0.25rem) / 2);
-        margin-inline-end: calc(var(--sds-g-spacing-1, 0.25rem) / 2);
+        margin-inline-start: calc(var(--slds-g-spacing-1) / 2);
+        margin-inline-end: calc(var(--slds-g-spacing-1) / 2);
     }
 
     :host([data-render-mode="shadow"]) .slds-has-error .slds-form-element__help {
-        color: var(--sds-g-color-error-base-50, #ea001e);
+        color: var(--slds-g-color-error-1);
     }
 
     :host([data-render-mode="shadow"][invalid]) .slds-form-element__help {
-        color: var(--sds-g-color-error-base-50, #ea001e);
+        color: var(--slds-g-color-error-1);
     }
 
     /* --------------------------------------- */
@@ -140,11 +168,11 @@
     /* TODO: Using `:not` is currently not working, and it could break the build because of issues with the dist script */
 
     /* :host([variant='label-stacked']):not(.slds-form-element_readonly) {
-        margin-block-end: var(--sds-g-spacing-2);
+        margin-block-end: var(--slds-g-spacing-2);
     }
 
     :host([variant='label-stacked']):not(.slds-is-editing) {
-        padding: 0 var(--sds-g-spacing-1);
+        padding: 0 var(--slds-g-spacing-1);
     } */
 
     /* :host([variant='label-stacked']):not([class*="slds-size"]) {
@@ -170,7 +198,7 @@
 
     :host([data-render-mode="shadow"][variant='label-stacked']) .slds-form-element__icon {
         float: none;
-        padding-block-start: var(--sds-g-spacing-1, 0.25rem);
+        padding-block-start: var(--slds-g-spacing-1);
     }
 
     /* --------------------------------------- */
@@ -188,14 +216,14 @@
     */
 
     :host([data-render-mode="shadow"][variant='label-inline'].slds-form-element_horizontal) {
-        padding: var(--sds-g-spacing-1, 0.25rem);
-        margin-block-end: var(--sds-g-spacing-2, 0.5rem);
+        padding: var(--slds-g-spacing-1);
+        margin-block-end: var(--slds-g-spacing-2);
     }
 
     /* TODO: Using `:not` is currently not working, and it could break the build because of issues with the dist script */
 
     /* :host([variant='label-inline']):not(.slds-form-element_readonly) {
-        margin-block-end: var(--sds-g-spacing-2);
+        margin-block-end: var(--slds-g-spacing-2);
     }
 
     :host([variant='label-inline']):not([class*="slds-size"]) {
@@ -204,18 +232,17 @@
     }
 
     :host([variant='label-inline']:not(.slds-is-editing)) {
-        padding: var(--sds-g-spacing-1);
+        padding: var(--slds-g-spacing-1);
     } */
 
     :host([data-render-mode="shadow"][variant='label-inline']).slds-is-edited {
-        padding-block-start: var(--sds-g-sizing-6, 1.25rem)
+        padding-block-start: var(--slds-g-sizing-6)
     }
 
     @media (width >= 48em) {
         :host([data-render-mode="shadow"][variant='label-inline']) .slds-form-element__label {
-          float: left;
-          max-width: calc(33% - var(--sds-g-sizing-6, 1.25rem)); /* Removing icon width for when the help-text icon is present */
-          flex-basis: calc(33% - var(--sds-g-sizing-6, 1.25rem)); /* Some form element controls are set to display:flex */
+          max-width: calc(33% - var(--slds-g-sizing-6)); /* Removing icon width for when the help-text icon is present */
+          flex-basis: calc(33% - var(--slds-g-sizing-6)); /* Some form element controls are set to display:flex */
           flex-grow: 1; /* For IE and Safari which didn't auto expand to the available space */
           margin-block-end: 0;
           position: relative;
@@ -260,9 +287,9 @@
 
     :host([data-render-mode="shadow"]) .slds-form-element_compound .slds-form-element__row {
       display: flex;
-      margin-bottom: var(--sds-g-spacing-1, 0.25rem);
-      margin-left: calc(var(--sds-g-spacing-1, 0.25rem) * -1);
-      margin-right: calc(var(--sds-g-spacing-1, 0.25rem) * -1);
+      margin-bottom: var(--slds-g-spacing-1);
+      margin-left: calc(var(--slds-g-spacing-1) * -1);
+      margin-right: calc(var(--slds-g-spacing-1) * -1);
     }
 
     :host([data-render-mode="shadow"]) .slds-form-element_compound .slds-form-element__row .slds-form-element__label {
@@ -270,8 +297,8 @@
     }
 
     :host([data-render-mode="shadow"]) .slds-form-element_compound .slds-form-element {
-      padding-left: var(--sds-g-spacing-1, 0.25rem);
-      padding-right: var(--sds-g-spacing-1, 0.25rem);
+      padding-left: var(--slds-g-spacing-1);
+      padding-right: var(--slds-g-spacing-1);
     }
 
     :host([data-render-mode="shadow"]) .slds-form-element_address .slds-form-element__row {