carbon-react 144.4.1 → 144.6.0

package/esm/__internal__/checkable-input/checkable-input.style.js

@@ -1,10 +1,10 @@
 import styled, { css } from "styled-components";
 import FieldHelpStyle from "../field-help/field-help.style";
 import { FieldLineStyle } from "../form-field/form-field.style";
-import HiddenCheckableInputStyle from "./hidden-checkable-input.style";
 import LabelStyle, { StyledLabelContainer } from "../label/label.style";
-import StyledHelp from "../../components/help/help.style";
 import StyledValidationIcon from "../validations/validation-icon.style";
+import StyledHelp from "../../components/help/help.style";
+import HiddenCheckableInputStyle from "./hidden-checkable-input.style";
 const StyledCheckableInput = styled.div`
   display: inline-block;
   position: relative;
@@ -18,6 +18,8 @@ const StyledCheckableInputWrapper = styled.div`
   labelInline,
   reverse
 }) => css`
+    width: 100% !important;
+
     ${FieldLineStyle} {
       display: flex;
     }
@@ -86,6 +88,7 @@ const StyledCheckableInputWrapper = styled.div`
     ${inputWidth !== undefined && inputWidth !== 0 && css`
       ${StyledCheckableInput} {
         width: ${inputWidth}% !important;
+        min-width: 67px;
       }
     `}
 

package/esm/__internal__/label/label.component.d.ts

@@ -24,7 +24,9 @@ export interface LabelProps extends ValidationProps, StyledLabelProps, StyledLab
     className?: string;
     /** Sets aria-label for label element */
     "aria-label"?: string;
+    /** Whether this component is shown against a dark background */
+    isDarkBackground?: boolean;
 }
-export declare const Label: ({ align, as, children, disabled, error, help, helpIcon, htmlFor, info, inline, isRequired, labelId, optional, pr, pl, tooltipId, useValidationIcon, validationIconId, warning, width, className, "aria-label": ariaLabel, }: LabelProps) => React.JSX.Element;
-declare const _default: React.MemoExoticComponent<({ align, as, children, disabled, error, help, helpIcon, htmlFor, info, inline, isRequired, labelId, optional, pr, pl, tooltipId, useValidationIcon, validationIconId, warning, width, className, "aria-label": ariaLabel, }: LabelProps) => React.JSX.Element>;
+export declare const Label: ({ align, as, children, disabled, error, help, helpIcon, htmlFor, info, inline, isDarkBackground, isRequired, labelId, optional, pr, pl, tooltipId, useValidationIcon, validationIconId, warning, width, className, "aria-label": ariaLabel, }: LabelProps) => React.JSX.Element;
+declare const _default: React.MemoExoticComponent<({ align, as, children, disabled, error, help, helpIcon, htmlFor, info, inline, isDarkBackground, isRequired, labelId, optional, pr, pl, tooltipId, useValidationIcon, validationIconId, warning, width, className, "aria-label": ariaLabel, }: LabelProps) => React.JSX.Element>;
 export default _default;

package/esm/__internal__/label/label.component.js

@@ -34,6 +34,7 @@ export const Label = ({
   htmlFor,
   info,
   inline,
+  isDarkBackground = false,
   isRequired,
   labelId,
   optional,
@@ -116,7 +117,8 @@ export const Label = ({
     onMouseLeave: handleMouseLeave,
     isRequired: isRequired,
     as: as,
-    "aria-label": ariaLabel
+    "aria-label": ariaLabel,
+    isDarkBackground: isDarkBackground
   }), children), icon());
 };
 export default /*#__PURE__*/React.memo(Label);

package/esm/__internal__/label/label.style.d.ts

@@ -3,6 +3,8 @@ export interface StyledLabelProps {
     disabled?: boolean;
     /** Flag to configure component as mandatory */
     isRequired?: boolean;
+    /** Flag to determine whether to use colours for dark backgrounds */
+    isDarkBackground?: boolean;
 }
 declare const StyledLabel: import("styled-components").StyledComponent<"label", any, StyledLabelProps, never>;
 export interface StyledLabelContainerProps {

package/esm/__internal__/label/label.style.js

@@ -1,6 +1,10 @@
 import styled, { css } from "styled-components";
 const StyledLabel = styled.label`
-  color: var(--colorsUtilityYin090);
+  ${({
+  isDarkBackground
+}) => css`
+    color: ${isDarkBackground ? "var(--colorsUtilityYang100)" : "var(--colorsUtilityYin090)"};
+  `}
   display: block;
   font-weight: var(--fontWeights500);
 

package/esm/__internal__/validation-message/validation-message.component.d.ts

@@ -8,6 +8,8 @@ export interface ValidationMessageProps {
     /** Indicate that warning has occurred
     Pass string to display hint with warning */
     warning?: boolean | string;
+    /** Whether this component resides on a dark background */
+    isDarkBackground?: boolean;
 }
-declare const ValidationMessage: ({ error, validationId, warning, }: ValidationMessageProps) => React.JSX.Element | null;
+declare const ValidationMessage: ({ error, validationId, warning, isDarkBackground, }: ValidationMessageProps) => React.JSX.Element | null;
 export default ValidationMessage;

package/esm/__internal__/validation-message/validation-message.component.js

@@ -4,14 +4,16 @@ import StyledValidationMessage from "./validation-message.style";
 const ValidationMessage = ({
   error,
   validationId,
-  warning
+  warning,
+  isDarkBackground
 }) => {
   const validation = error || warning;
   const isStringValidation = typeof validation === "string";
   return isStringValidation ? /*#__PURE__*/React.createElement(StyledValidationMessage, {
     id: validationId,
     isWarning: !!(!error && warning),
-    "data-role": "validation-message"
+    "data-role": "validation-message",
+    isDarkBackground: isDarkBackground
   }, validation) : null;
 };
 export default ValidationMessage;

package/esm/__internal__/validation-message/validation-message.style.d.ts

@@ -1,5 +1,6 @@
 interface StyledValidationMessageProps {
     isWarning?: boolean;
+    isDarkBackground?: boolean;
 }
 declare const StyledValidationMessage: import("styled-components").StyledComponent<"p", any, StyledValidationMessageProps, never>;
 export default StyledValidationMessage;

package/esm/__internal__/validation-message/validation-message.style.js

@@ -1,12 +1,16 @@
 import styled, { css } from "styled-components";
 const StyledValidationMessage = styled.p`
   ${({
-  isWarning
-}) => css`
-    color: ${isWarning ? "var(--colorsSemanticCaution600)" : "var(--colorsSemanticNegative500)"};
-    font-weight: ${isWarning ? "normal" : "500"};
-    margin-top: 0px;
-    margin-bottom: 8px;
-  `}
+  isWarning,
+  isDarkBackground
+}) => {
+  const darkBgColour = isDarkBackground ? "var(--colorsSemanticNegative450)" : "var(--colorsSemanticNegative500)";
+  return css`
+      color: ${isWarning ? "var(--colorsSemanticCaution600)" : darkBgColour};
+      font-weight: ${isWarning ? "normal" : "500"};
+      margin-top: 0px;
+      margin-bottom: 8px;
+    `;
+}}
 `;
 export default StyledValidationMessage;

package/esm/components/date/__internal__/date-formats/index.d.ts

@@ -3,5 +3,5 @@ interface LocaleFormats {
     formats: string[];
     format: string;
 }
-declare const getFormatData: ({ code }: DateFnsLocale) => LocaleFormats;
+declare const getFormatData: ({ code }: DateFnsLocale, dateFormatOverride?: string) => LocaleFormats;
 export default getFormatData;

package/esm/components/date/__internal__/date-formats/index.js

@@ -72,7 +72,31 @@ const getTrailingChar = format => {
 };
 const getFormatData = ({
   code = "en-GB"
-}) => {
+}, dateFormatOverride) => {
+  if (dateFormatOverride) {
+    const {
+      format
+    } = getOutputFormatForLocale(code);
+    let formatFromLocale;
+    switch (code) {
+      case "en-CA":
+      case "en-US":
+        formatFromLocale = "MM/dd/yyyy";
+        break;
+      case "ar-EG":
+      case "en-ZA":
+      case "fr-CA":
+        formatFromLocale = "dd/MM/yyyy";
+        break;
+      default:
+        formatFromLocale = format;
+    }
+    const formatsForLocale = getInputFormatsArrayForLocale(formatFromLocale);
+    return {
+      format: dateFormatOverride,
+      formats: generateFormats(formatsForLocale, "/")
+    };
+  }
   if (["en-CA", "en-US"].includes(code)) {
     const format = "MM/dd/yyyy";
     const formats = getInputFormatsArrayForLocale(format);

package/esm/components/date/date.component.d.ts

@@ -42,6 +42,8 @@ export interface DateInputProps extends Omit<TextboxProps, "value" | "formattedV
     onPickerOpen?: () => void;
     /** Callback triggered when the picker is closed */
     onPickerClose?: () => void;
+    /** Date format string to be applied to the date inputs */
+    dateFormatOverride?: string;
 }
 export declare const DateInput: React.ForwardRefExoticComponent<DateInputProps & React.RefAttributes<HTMLInputElement>>;
 export default DateInput;

package/esm/components/date/date.component.js

@@ -52,12 +52,13 @@ const DateInput = /*#__PURE__*/React.forwardRef(({
   const blockClose = useRef(false);
   const locale = useLocale();
   const {
-    dateFnsLocale
+    dateFnsLocale,
+    dateFormatOverride
   } = locale.date;
   const {
     format,
     formats
-  } = useMemo(() => getFormatData(dateFnsLocale()), [dateFnsLocale]);
+  } = useMemo(() => getFormatData(dateFnsLocale(), dateFormatOverride), [dateFnsLocale, dateFormatOverride]);
   const {
     inputRefMap,
     setInputRefMap
@@ -480,6 +481,7 @@ if (process.env.NODE_ENV !== "production") {
     "data-element": PropTypes.string,
     "data-role": PropTypes.string,
     "datatype": PropTypes.string,
+    "dateFormatOverride": PropTypes.string,
     "defaultChecked": PropTypes.bool,
     "defaultValue": PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.string), PropTypes.number, PropTypes.string]),
     "dir": PropTypes.string,

package/esm/components/date-range/date-range.component.d.ts

@@ -85,6 +85,8 @@ export interface DateRangeProps extends StyledDateRangeProps, MarginProps, TagPr
     required?: boolean;
     /** Flag to configure component as optional. */
     isOptional?: boolean;
+    /** Date format string to be applied to the date inputs */
+    dateFormatOverride?: string;
 }
 export declare const DateRange: {
     ({ endDateProps, id, labelsInline, name, onBlur, onChange, startDateProps, tooltipPosition, validationOnLabel, value, startRef, endRef, required, isOptional, ...rest }: DateRangeProps): React.JSX.Element;

package/esm/components/date-range/date-range.component.js

@@ -35,11 +35,12 @@ export const DateRange = ({
   const labelsInlineWithNewValidation = validationRedesignOptIn ? false : labelsInline;
   const l = useLocale();
   const {
-    dateFnsLocale
+    dateFnsLocale,
+    dateFormatOverride
   } = l.date;
   const {
     format
-  } = useMemo(() => getFormatData(dateFnsLocale()), [dateFnsLocale]);
+  } = useMemo(() => getFormatData(dateFnsLocale(), dateFormatOverride), [dateFnsLocale, dateFormatOverride]);
   const inlineLabelWidth = 40;
   const [lastChangedDate, setLastChangedDate] = useState("");
   const computedValue = useCallback(valueString => {

package/esm/components/flat-table/flat-table.component.d.ts

@@ -35,9 +35,11 @@ export interface FlatTableProps extends MarginProps, Omit<TagProps, "data-compon
     overflowX?: string;
     /** Width of the table. Any valid CSS string */
     width?: string;
+    /** The title to describe the table when one or more tables are used on a single page */
+    title?: string;
 }
 export declare const FlatTable: {
-    ({ caption, children, hasStickyHead, colorTheme, footer, hasStickyFooter, height, isZebra, size, hasMaxHeight, hasOuterVerticalBorders, bottomBorderRadius, ariaDescribedby, minHeight, overflowX, width, ...rest }: FlatTableProps): React.JSX.Element;
+    ({ caption, children, hasStickyHead, colorTheme, footer, hasStickyFooter, height, isZebra, size, hasMaxHeight, hasOuterVerticalBorders, bottomBorderRadius, ariaDescribedby, minHeight, overflowX, width, title, ...rest }: FlatTableProps): React.JSX.Element;
     displayName: string;
 };
 export default FlatTable;

package/esm/components/flat-table/flat-table.component.js

@@ -23,6 +23,7 @@ export const FlatTable = ({
   minHeight,
   overflowX,
   width,
+  title,
   ...rest
 }) => {
   const wrapperRef = useRef(null);
@@ -162,7 +163,8 @@ export const FlatTable = ({
     onKeyDown: handleKeyDown,
     isFocused: focused
   }, rest, {
-    "data-component": "flat-table-wrapper"
+    "data-component": "flat-table-wrapper",
+    title: title
   }), /*#__PURE__*/React.createElement(StyledTableContainer, {
     ref: container,
     onFocus: () => {

package/esm/components/switch/__internal__/switch-slider-panel.style.d.ts

@@ -2,6 +2,7 @@ import { SwitchProps } from "../switch.component";
 export interface SwitchSliderPanelProps {
     isLoading?: boolean;
     size?: SwitchProps["size"];
+    isDarkBackground?: boolean;
 }
 declare const SwitchSliderPanel: import("styled-components").StyledComponent<"div", any, SwitchSliderPanelProps, never>;
 export default SwitchSliderPanel;

package/esm/components/switch/__internal__/switch-slider-panel.style.js

@@ -1,24 +1,26 @@
 import styled, { css } from "styled-components";
-import StyledLoader from "../../loader/loader.style";
 import StyledLoaderSquare from "../../loader/loader-square.style";
+import StyledLoader from "../../loader/loader.style";
 const SwitchSliderPanel = styled.div`
   ${({
   isLoading,
-  size
+  size,
+  isDarkBackground
 }) => css`
     border: 0;
-    color: var(--colorsActionMinorYang100);
+    color: ${isDarkBackground ? "var(--colorsUtilityYin100)" : "var(--colorsActionMinorYang100)"};
     margin: auto;
     position: absolute;
     left: 0;
 
     &[type="on"] {
+      color: ${isDarkBackground ? "var(--colorsUtilityYin100)" : "var(--colorsUtilityYang100)"};
       margin-left: 9px;
       padding-right: ${size === "large" ? "43px" : "27px"};
     }
 
     &[type="off"] {
-      color: var(--colorsActionMinor500);
+      color: ${isDarkBackground ? "var(--colorsUtilityYang100)" : "var(--colorsActionMinor500)"};
       margin-right: 9px;
       padding-left: ${size === "large" ? "43px" : "27px"};
     }

package/esm/components/switch/__internal__/switch-slider.component.d.ts

@@ -6,6 +6,7 @@ export interface SwitchSliderProps extends ValidationProps {
     loading?: boolean;
     size?: "small" | "large";
     useValidationIcon?: boolean;
+    isDarkBackground?: boolean;
 }
-declare const SwitchSlider: ({ checked, disabled, loading, size, error, warning, info, useValidationIcon, }: SwitchSliderProps) => React.JSX.Element;
+declare const SwitchSlider: ({ checked, disabled, loading, size, error, warning, info, useValidationIcon, isDarkBackground, }: SwitchSliderProps) => React.JSX.Element;
 export default SwitchSlider;

package/esm/components/switch/__internal__/switch-slider.component.js

@@ -14,7 +14,8 @@ const SwitchSlider = ({
   error,
   warning,
   info,
-  useValidationIcon
+  useValidationIcon,
+  isDarkBackground
 }) => {
   const locale = useLocale();
   const onText = locale.switch.on();
@@ -31,13 +32,15 @@ const SwitchSlider = ({
     size,
     error,
     warning,
-    info
+    info,
+    isDarkBackground
   };
   const sliderPanelStyleProps = {
     isLoading: loading,
     size,
     type: checked ? "on" : "off",
-    disabled
+    disabled,
+    isDarkBackground
   };
   const loaderProps = {
     isInsideButton: true,

package/esm/components/switch/__internal__/switch-slider.style.d.ts

@@ -1,8 +1,9 @@
-import { SwitchSliderProps } from "./switch-slider.component";
 import { ThemeObject } from "../../../style/themes/base";
+import { SwitchSliderProps } from "./switch-slider.component";
 interface StyledSwitchSliderProps extends Pick<SwitchSliderProps, "checked" | "disabled" | "size" | "error" | "warning"> {
     isLoading?: boolean;
     theme?: Partial<ThemeObject>;
+    isDarkBackground?: boolean;
 }
 declare const StyledSwitchSlider: import("styled-components").StyledComponent<"div", any, {}, never>;
 declare const HiddenContent: import("styled-components").StyledComponent<"div", any, Pick<StyledSwitchSliderProps, "size">, never>;

package/esm/components/switch/__internal__/switch-slider.style.js

@@ -1,7 +1,7 @@
 import styled, { css } from "styled-components";
-import SwitchSliderPanel from "./switch-slider-panel.style";
 import StyledValidationIcon from "../../../__internal__/validations/validation-icon.style";
 import baseTheme from "../../../style/themes/base";
+import SwitchSliderPanel from "./switch-slider-panel.style";
 const StyledSwitchSlider = styled.div`
   ${({
   checked,
@@ -10,7 +10,8 @@ const StyledSwitchSlider = styled.div`
   size,
   error,
   warning,
-  theme
+  theme,
+  isDarkBackground
 }) => css`
     display: flex;
     font-size: 12px;
@@ -25,14 +26,14 @@ const StyledSwitchSlider = styled.div`
     z-index: 2;
     border-radius: ${theme?.roundedCornersOptOut ? "90px" : "var(--borderRadius400)"};
     border-style: solid;
-    border-color: var(--colorsActionMinor400);
+    border-color: ${isDarkBackground ? "var(--colorsUtilityYang100)" : "var(--colorsActionMinor400)"};
     border-width: var(--borderWidth200);
     box-sizing: border-box;
     margin-top: ${size === "large" ? "-47px" : "-28px"};
     align-items: center;
 
     &::before {
-      background-color: var(--colorsActionMinor400);
+      background-color: ${isDarkBackground ? "var(--colorsUtilityYang100)" : "var(--colorsActionMinor400)"};
       bottom: 4px;
       content: "";
       height: ${size === "large" ? "var(--spacing400)" : "var(--spacing200)"};
@@ -45,7 +46,7 @@ const StyledSwitchSlider = styled.div`
     }
 
     ${checked && css`
-        background-color: var(--colorsActionMinor500);
+        background-color: ${isDarkBackground ? "var(--colorsUtilityYang100)" : "var(--colorsActionMinor500)"};
         border-color: var(--colorsActionMinorTransparent);
 
         &::before {
@@ -53,7 +54,7 @@ const StyledSwitchSlider = styled.div`
             100% -
               ${size === "large" ? "var(--spacing500)" : "var(--spacing300)"}
           );
-          background-color: var(--colorsActionMinorYang100);
+          background-color: ${isDarkBackground ? "var(--colorsUtilityYin100)" : "var(--colorsActionMinorYang100)"};
         }
       `}
 

package/esm/components/switch/switch.component.d.ts

@@ -24,6 +24,8 @@ export interface SwitchProps extends CommonCheckableInputProps, MarginProps {
     tooltipPosition?: "top" | "bottom" | "left" | "right";
     /** [Legacy] Aria label for rendered help component */
     helpAriaLabel?: string;
+    /** Whether this component resides on a dark background */
+    isDarkBackground?: boolean;
 }
 export declare const Switch: React.ForwardRefExoticComponent<SwitchProps & React.RefAttributes<HTMLInputElement>>;
 export default Switch;

package/esm/components/switch/switch.component.js

@@ -1,17 +1,17 @@
 function _extends() { return _extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends.apply(null, arguments); }
 import React, { useState, useCallback, useContext, useRef } from "react";
 import PropTypes from "prop-types";
-import StyledSwitch, { ErrorBorder, StyledHintText } from "./switch.style";
+import Box from "../box";
 import CheckableInput from "../../__internal__/checkable-input";
-import SwitchSlider from "./__internal__/switch-slider.component";
-import useIsAboveBreakpoint from "../../hooks/__internal__/useIsAboveBreakpoint";
+import Label from "../../__internal__/label";
 import { TooltipProvider } from "../../__internal__/tooltip-provider";
-import Logger from "../../__internal__/utils/logger";
-import useFormSpacing from "../../hooks/__internal__/useFormSpacing";
 import NewValidationContext from "../carbon-provider/__internal__/new-validation.context";
+import Logger from "../../__internal__/utils/logger";
 import ValidationMessage from "../../__internal__/validation-message/validation-message.component";
-import Box from "../box";
-import Label from "../../__internal__/label";
+import useFormSpacing from "../../hooks/__internal__/useFormSpacing";
+import useIsAboveBreakpoint from "../../hooks/__internal__/useIsAboveBreakpoint";
+import StyledSwitch, { ErrorBorder, StyledHintText } from "./switch.style";
+import SwitchSlider from "./__internal__/switch-slider.component";
 import guid from "../../__internal__/utils/helpers/guid";
 let deprecateUncontrolledWarnTriggered = false;
 const Switch = /*#__PURE__*/React.forwardRef(({
@@ -45,6 +45,7 @@ const Switch = /*#__PURE__*/React.forwardRef(({
   "data-element": dataElement,
   "data-role": dataRole,
   helpAriaLabel,
+  isDarkBackground = false,
   ...rest
 }, ref) => {
   const isControlled = checked !== undefined;
@@ -77,6 +78,7 @@ const Switch = /*#__PURE__*/React.forwardRef(({
     "data-role": dataRole,
     "data-element": dataElement,
     checked: isControlled ? checked : checkedInternal,
+    isDarkBackground,
     fieldHelpInline,
     labelInline: shouldLabelBeInline,
     labelSpacing,
@@ -89,6 +91,7 @@ const Switch = /*#__PURE__*/React.forwardRef(({
     checked: isControlled ? checked : checkedInternal,
     disabled: disabled || loading,
     loading,
+    isDarkBackground,
     size,
     error,
     warning,
@@ -109,6 +112,7 @@ const Switch = /*#__PURE__*/React.forwardRef(({
     labelInline: shouldLabelBeInline,
     labelSpacing,
     onBlur,
+    isDarkBackground,
     onFocus,
     onChange: isControlled ? onChange : onChangeInternal,
     id,
@@ -132,6 +136,8 @@ const Switch = /*#__PURE__*/React.forwardRef(({
     "data-role": dataRole,
     "data-element": dataElement,
     checked: isControlled ? checked : checkedInternal,
+    labelInline: shouldLabelBeInline,
+    isDarkBackground,
     size,
     ...marginProps
   };
@@ -139,6 +145,7 @@ const Switch = /*#__PURE__*/React.forwardRef(({
     checked: isControlled ? checked : checkedInternal,
     disabled: disabled || loading,
     loading,
+    isDarkBackground,
     size,
     error,
     warning
@@ -147,10 +154,12 @@ const Switch = /*#__PURE__*/React.forwardRef(({
     autoFocus,
     // set aria-invalid but prevent validationIconId from being added to aria-describedby
     error: !!error,
+    warning,
     disabled: disabled || loading,
     loading,
     checked: isControlled ? checked : checkedInternal,
     onBlur,
+    isDarkBackground,
     onFocus,
     onChange: isControlled ? onChange : onChangeInternal,
     id,
@@ -165,30 +174,66 @@ const Switch = /*#__PURE__*/React.forwardRef(({
   };
   const applyValidation = error || warning;
   const ariaDescribedBy = [labelHelp && inputHintId.current, applyValidation && validationMessageId.current].filter(Boolean).join(" ");
-  return /*#__PURE__*/React.createElement(React.Fragment, null, validationRedesignOptIn ? /*#__PURE__*/React.createElement(StyledSwitch, switchStylePropsForNewValidation, /*#__PURE__*/React.createElement(Label, {
+  if (!validationRedesignOptIn) {
+    return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(TooltipProvider, {
+      helpAriaLabel: helpAriaLabel,
+      tooltipPosition: tooltipPosition
+    }, /*#__PURE__*/React.createElement(StyledSwitch, switchStyleProps, /*#__PURE__*/React.createElement(CheckableInput, inputProps, /*#__PURE__*/React.createElement(SwitchSlider, switchSliderProps)))));
+  }
+  const defaultMargin = labelInline ? 1 : 0;
+  const defaultInputWrapperMargin = labelInline ? 3 : 0;
+  const errorMargin = error || warning ? defaultInputWrapperMargin : defaultMargin;
+  const direction = labelInline ? "row" : "column";
+  const reverseDirection = labelInline ? "row-reverse" : "column";
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(StyledSwitch, switchStylePropsForNewValidation, /*#__PURE__*/React.createElement(Box, {
+    "data-role": "field-reverse-wrapper",
+    display: "flex",
+    flexWrap: "wrap",
+    alignItems: error || warning ? "flex-start" : undefined,
+    flexDirection: !reverse ? reverseDirection : direction,
+    width: labelInline ? "100%" : "auto"
+  }, /*#__PURE__*/React.createElement(Box, {
+    "data-role": "label-wrapper"
+    // width={labelInline ? rest.labelWidth : 30}
+    // minWidth={label && labelInline ? "32px" : 0}
+  }, /*#__PURE__*/React.createElement(Label, {
+    isDarkBackground: isDarkBackground,
     labelId: labelId.current,
     disabled: disabled,
     isRequired: required,
     optional: isOptional
-  }, label), labelHelp && /*#__PURE__*/React.createElement(StyledHintText, {
+  }, label), labelHelp && /*#__PURE__*/React.createElement(Box, {
+    "data-role": "hint-text-wrapper",
+    mb: labelInline ? 0 : 1,
+    mr: reverse ? 0 : 1,
+    ml: reverse ? 0 : 1
+  }, /*#__PURE__*/React.createElement(StyledHintText, {
     "data-role": "hint-text",
-    id: inputHintId.current
-  }, labelHelp), /*#__PURE__*/React.createElement(Box, {
-    position: "relative"
+    id: inputHintId.current,
+    isDarkBackground: isDarkBackground
+  }, labelHelp))), /*#__PURE__*/React.createElement(Box, {
+    ml: reverse ? errorMargin : defaultInputWrapperMargin,
+    mr: !reverse ? errorMargin : defaultInputWrapperMargin,
+    position: "relative",
+    id: "input-wrapper"
   }, /*#__PURE__*/React.createElement(ValidationMessage, {
     error: error,
     warning: warning,
-    validationId: validationMessageId.current
+    validationId: validationMessageId.current,
+    isDarkBackground: isDarkBackground
   }), applyValidation && /*#__PURE__*/React.createElement(ErrorBorder, {
     "data-role": "error-border",
-    warning: !!(!error && warning)
+    warning: !!(!error && warning),
+    reverse: !reverse,
+    isDarkBackground: isDarkBackground
   }), /*#__PURE__*/React.createElement(CheckableInput, _extends({
     ariaLabelledBy: `${label && labelId.current}`,
     ariaDescribedBy: ariaDescribedBy
-  }, inputPropsForNewValidation), /*#__PURE__*/React.createElement(SwitchSlider, switchSliderPropsForNewValidation)))) : /*#__PURE__*/React.createElement(TooltipProvider, {
-    helpAriaLabel: helpAriaLabel,
-    tooltipPosition: tooltipPosition
-  }, /*#__PURE__*/React.createElement(StyledSwitch, switchStyleProps, /*#__PURE__*/React.createElement(CheckableInput, inputProps, /*#__PURE__*/React.createElement(SwitchSlider, switchSliderProps)))));
+  }, inputPropsForNewValidation, {
+    fieldHelp: labelInline ? undefined : rest.fieldHelp
+  }), /*#__PURE__*/React.createElement(SwitchSlider, switchSliderPropsForNewValidation))))), labelInline && rest.fieldHelp && /*#__PURE__*/React.createElement(Box, {
+    color: isDarkBackground ? "var(--colorsUtilityYang100)" : "var(--colorsUtilityYin090)"
+  }, rest.fieldHelp));
 });
 if (process.env.NODE_ENV !== "production") {
   Switch.propTypes = {
@@ -341,6 +386,7 @@ if (process.env.NODE_ENV !== "production") {
     "inputMode": PropTypes.oneOf(["decimal", "email", "none", "numeric", "search", "tel", "text", "url"]),
     "inputWidth": PropTypes.number,
     "is": PropTypes.string,
+    "isDarkBackground": PropTypes.bool,
     "isOptional": PropTypes.bool,
     "itemID": PropTypes.string,
     "itemProp": PropTypes.string,

package/esm/components/switch/switch.style.d.ts

@@ -1,6 +1,11 @@
+interface StyledHintTextProps {
+    isDarkBackground?: boolean;
+}
 export declare const ErrorBorder: import("styled-components").StyledComponent<"span", any, {
+    reverse: boolean;
     warning: boolean;
+    isDarkBackground: boolean;
 }, never>;
-export declare const StyledHintText: import("styled-components").StyledComponent<"div", any, {}, never>;
+export declare const StyledHintText: import("styled-components").StyledComponent<"div", any, StyledHintTextProps, never>;
 declare const StyledSwitch: import("styled-components").StyledComponent<"div", any, {}, never>;
 export default StyledSwitch;