carbon-react 144.4.1 → 144.6.0

package/lib/components/switch/switch.component.js

@@ -6,17 +6,17 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = exports.Switch = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
-var _switch = _interopRequireWildcard(require("./switch.style"));
+var _box = _interopRequireDefault(require("../box"));
 var _checkableInput = _interopRequireDefault(require("../../__internal__/checkable-input"));
-var _switchSlider = _interopRequireDefault(require("./__internal__/switch-slider.component"));
-var _useIsAboveBreakpoint = _interopRequireDefault(require("../../hooks/__internal__/useIsAboveBreakpoint"));
+var _label = _interopRequireDefault(require("../../__internal__/label"));
 var _tooltipProvider = require("../../__internal__/tooltip-provider");
-var _logger = _interopRequireDefault(require("../../__internal__/utils/logger"));
-var _useFormSpacing = _interopRequireDefault(require("../../hooks/__internal__/useFormSpacing"));
 var _newValidation = _interopRequireDefault(require("../carbon-provider/__internal__/new-validation.context"));
+var _logger = _interopRequireDefault(require("../../__internal__/utils/logger"));
 var _validationMessage = _interopRequireDefault(require("../../__internal__/validation-message/validation-message.component"));
-var _box = _interopRequireDefault(require("../box"));
-var _label = _interopRequireDefault(require("../../__internal__/label"));
+var _useFormSpacing = _interopRequireDefault(require("../../hooks/__internal__/useFormSpacing"));
+var _useIsAboveBreakpoint = _interopRequireDefault(require("../../hooks/__internal__/useIsAboveBreakpoint"));
+var _switch = _interopRequireWildcard(require("./switch.style"));
+var _switchSlider = _interopRequireDefault(require("./__internal__/switch-slider.component"));
 var _guid = _interopRequireDefault(require("../../__internal__/utils/helpers/guid"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
@@ -54,6 +54,7 @@ const Switch = exports.Switch = /*#__PURE__*/_react.default.forwardRef(({
   "data-element": dataElement,
   "data-role": dataRole,
   helpAriaLabel,
+  isDarkBackground = false,
   ...rest
 }, ref) => {
   const isControlled = checked !== undefined;
@@ -86,6 +87,7 @@ const Switch = exports.Switch = /*#__PURE__*/_react.default.forwardRef(({
     "data-role": dataRole,
     "data-element": dataElement,
     checked: isControlled ? checked : checkedInternal,
+    isDarkBackground,
     fieldHelpInline,
     labelInline: shouldLabelBeInline,
     labelSpacing,
@@ -98,6 +100,7 @@ const Switch = exports.Switch = /*#__PURE__*/_react.default.forwardRef(({
     checked: isControlled ? checked : checkedInternal,
     disabled: disabled || loading,
     loading,
+    isDarkBackground,
     size,
     error,
     warning,
@@ -118,6 +121,7 @@ const Switch = exports.Switch = /*#__PURE__*/_react.default.forwardRef(({
     labelInline: shouldLabelBeInline,
     labelSpacing,
     onBlur,
+    isDarkBackground,
     onFocus,
     onChange: isControlled ? onChange : onChangeInternal,
     id,
@@ -141,6 +145,8 @@ const Switch = exports.Switch = /*#__PURE__*/_react.default.forwardRef(({
     "data-role": dataRole,
     "data-element": dataElement,
     checked: isControlled ? checked : checkedInternal,
+    labelInline: shouldLabelBeInline,
+    isDarkBackground,
     size,
     ...marginProps
   };
@@ -148,6 +154,7 @@ const Switch = exports.Switch = /*#__PURE__*/_react.default.forwardRef(({
     checked: isControlled ? checked : checkedInternal,
     disabled: disabled || loading,
     loading,
+    isDarkBackground,
     size,
     error,
     warning
@@ -156,10 +163,12 @@ const Switch = exports.Switch = /*#__PURE__*/_react.default.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,
@@ -174,30 +183,66 @@ const Switch = exports.Switch = /*#__PURE__*/_react.default.forwardRef(({
   };
   const applyValidation = error || warning;
   const ariaDescribedBy = [labelHelp && inputHintId.current, applyValidation && validationMessageId.current].filter(Boolean).join(" ");
-  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, validationRedesignOptIn ? /*#__PURE__*/_react.default.createElement(_switch.default, switchStylePropsForNewValidation, /*#__PURE__*/_react.default.createElement(_label.default, {
+  if (!validationRedesignOptIn) {
+    return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_tooltipProvider.TooltipProvider, {
+      helpAriaLabel: helpAriaLabel,
+      tooltipPosition: tooltipPosition
+    }, /*#__PURE__*/_react.default.createElement(_switch.default, switchStyleProps, /*#__PURE__*/_react.default.createElement(_checkableInput.default, inputProps, /*#__PURE__*/_react.default.createElement(_switchSlider.default, 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.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_switch.default, switchStylePropsForNewValidation, /*#__PURE__*/_react.default.createElement(_box.default, {
+    "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.default.createElement(_box.default, {
+    "data-role": "label-wrapper"
+    // width={labelInline ? rest.labelWidth : 30}
+    // minWidth={label && labelInline ? "32px" : 0}
+  }, /*#__PURE__*/_react.default.createElement(_label.default, {
+    isDarkBackground: isDarkBackground,
     labelId: labelId.current,
     disabled: disabled,
     isRequired: required,
     optional: isOptional
-  }, label), labelHelp && /*#__PURE__*/_react.default.createElement(_switch.StyledHintText, {
+  }, label), labelHelp && /*#__PURE__*/_react.default.createElement(_box.default, {
+    "data-role": "hint-text-wrapper",
+    mb: labelInline ? 0 : 1,
+    mr: reverse ? 0 : 1,
+    ml: reverse ? 0 : 1
+  }, /*#__PURE__*/_react.default.createElement(_switch.StyledHintText, {
     "data-role": "hint-text",
-    id: inputHintId.current
-  }, labelHelp), /*#__PURE__*/_react.default.createElement(_box.default, {
-    position: "relative"
+    id: inputHintId.current,
+    isDarkBackground: isDarkBackground
+  }, labelHelp))), /*#__PURE__*/_react.default.createElement(_box.default, {
+    ml: reverse ? errorMargin : defaultInputWrapperMargin,
+    mr: !reverse ? errorMargin : defaultInputWrapperMargin,
+    position: "relative",
+    id: "input-wrapper"
   }, /*#__PURE__*/_react.default.createElement(_validationMessage.default, {
     error: error,
     warning: warning,
-    validationId: validationMessageId.current
+    validationId: validationMessageId.current,
+    isDarkBackground: isDarkBackground
   }), applyValidation && /*#__PURE__*/_react.default.createElement(_switch.ErrorBorder, {
     "data-role": "error-border",
-    warning: !!(!error && warning)
+    warning: !!(!error && warning),
+    reverse: !reverse,
+    isDarkBackground: isDarkBackground
   }), /*#__PURE__*/_react.default.createElement(_checkableInput.default, _extends({
     ariaLabelledBy: `${label && labelId.current}`,
     ariaDescribedBy: ariaDescribedBy
-  }, inputPropsForNewValidation), /*#__PURE__*/_react.default.createElement(_switchSlider.default, switchSliderPropsForNewValidation)))) : /*#__PURE__*/_react.default.createElement(_tooltipProvider.TooltipProvider, {
-    helpAriaLabel: helpAriaLabel,
-    tooltipPosition: tooltipPosition
-  }, /*#__PURE__*/_react.default.createElement(_switch.default, switchStyleProps, /*#__PURE__*/_react.default.createElement(_checkableInput.default, inputProps, /*#__PURE__*/_react.default.createElement(_switchSlider.default, switchSliderProps)))));
+  }, inputPropsForNewValidation, {
+    fieldHelp: labelInline ? undefined : rest.fieldHelp
+  }), /*#__PURE__*/_react.default.createElement(_switchSlider.default, switchSliderPropsForNewValidation))))), labelInline && rest.fieldHelp && /*#__PURE__*/_react.default.createElement(_box.default, {
+    color: isDarkBackground ? "var(--colorsUtilityYang100)" : "var(--colorsUtilityYin090)"
+  }, rest.fieldHelp));
 });
 if (process.env.NODE_ENV !== "production") {
   Switch.propTypes = {
@@ -350,6 +395,7 @@ if (process.env.NODE_ENV !== "production") {
     "inputMode": _propTypes.default.oneOf(["decimal", "email", "none", "numeric", "search", "tel", "text", "url"]),
     "inputWidth": _propTypes.default.number,
     "is": _propTypes.default.string,
+    "isDarkBackground": _propTypes.default.bool,
     "isOptional": _propTypes.default.bool,
     "itemID": _propTypes.default.string,
     "itemProp": _propTypes.default.string,

package/lib/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;

package/lib/components/switch/switch.style.js

@@ -6,15 +6,15 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = exports.StyledHintText = exports.ErrorBorder = void 0;
 var _styledComponents = _interopRequireWildcard(require("styled-components"));
 var _styledSystem = require("styled-system");
-var _base = _interopRequireDefault(require("../../style/themes/base"));
-var _fieldHelp = _interopRequireDefault(require("../../__internal__/field-help/field-help.style"));
+var _checkableInput = require("../../__internal__/checkable-input/checkable-input.style");
 var _hiddenCheckableInput = _interopRequireDefault(require("../../__internal__/checkable-input/hidden-checkable-input.style"));
+var _fieldHelp = _interopRequireDefault(require("../../__internal__/field-help/field-help.style"));
+var _formField = require("../../__internal__/form-field/form-field.style");
 var _label = require("../../__internal__/label/label.style");
-var _checkableInput = require("../../__internal__/checkable-input/checkable-input.style");
-var _switchSlider = _interopRequireDefault(require("./__internal__/switch-slider.style"));
 var _validationIcon = _interopRequireDefault(require("../../__internal__/validations/validation-icon.style"));
-var _formField = require("../../__internal__/form-field/form-field.style");
+var _base = _interopRequireDefault(require("../../style/themes/base"));
 var _addFocusStyling = _interopRequireDefault(require("../../style/utils/add-focus-styling"));
+var _switchSlider = _interopRequireDefault(require("./__internal__/switch-slider.style"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
@@ -23,23 +23,33 @@ const oldFocusStyling = `
 `;
 const ErrorBorder = exports.ErrorBorder = _styledComponents.default.span`
   ${({
-  warning
-}) => (0, _styledComponents.css)`
-    position: absolute;
-    z-index: 6;
-    width: 2px;
-    background-color: ${warning ? "var(--colorsSemanticCaution500)" : "var(--colorsSemanticNegative500)"};
-    left: -12px;
-    bottom: -4px;
-    top: 2px;
-  `}
+  reverse,
+  warning,
+  isDarkBackground
+}) => {
+  const darkBgColour = isDarkBackground ? "var(--colorsSemanticNegative450)" : "var(--colorsSemanticNegative500)";
+  return (0, _styledComponents.css)`
+      position: absolute;
+      z-index: 6;
+      width: 2px;
+      background-color: ${warning ? "var(--colorsSemanticCaution500)" : darkBgColour};
+      ${reverse ? "right" : "left"}: -12px;
+      bottom: -4px;
+      top: 2px;
+    `;
+}}
 `;
 const StyledHintText = exports.StyledHintText = _styledComponents.default.div`
   margin-top: 8px;
   margin-bottom: 8px;
-  color: var(--colorsUtilityYin055);
   font-size: 14px;
   font-weight: 400;
+  max-width: 160px;
+  ${({
+  isDarkBackground
+}) => (0, _styledComponents.css)`
+    color: ${isDarkBackground ? "var(--colorsUtilityYang065)" : "var(--colorsUtilityYin055)"};
+  `}
 `;
 const StyledSwitch = _styledComponents.default.div`
   ${({
@@ -60,6 +70,9 @@ const StyledSwitch = _styledComponents.default.div`
       `}
     }
 
+    display: flex;
+    flex-flow: ${labelInline ? "row wrap" : "column wrap"};
+
     ${_checkableInput.StyledCheckableInput}, ${_hiddenCheckableInput.default} {
       border: none;
       box-sizing: border-box;

package/lib/components/time/time.style.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-export declare const StyledLabel: import("styled-components").StyledComponent<import("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, }: import("../../__internal__/label").LabelProps) => import("react").JSX.Element>, any, {}, never>;
+export declare const StyledLabel: import("styled-components").StyledComponent<import("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, }: import("../../__internal__/label").LabelProps) => import("react").JSX.Element>, any, {}, never>;
 export declare const StyledHintText: import("styled-components").StyledComponent<"div", any, {
     isDisabled?: boolean | undefined;
     hasError?: boolean | undefined;

package/lib/locales/en-gb.js

@@ -41,7 +41,8 @@ const enGB = {
     ariaLabels: {
       previousMonthButton: () => "Previous month",
       nextMonthButton: () => "Next month"
-    }
+    },
+    dateFormatOverride: undefined
   },
   dialog: {
     ariaLabels: {

package/lib/locales/locale.d.ts

@@ -34,6 +34,7 @@ interface Locale {
             previousMonthButton: () => string;
             nextMonthButton: () => string;
         };
+        dateFormatOverride?: string;
     };
     dialog: {
         ariaLabels: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "carbon-react",
-  "version": "144.4.1",
+  "version": "144.6.0",
   "description": "A library of reusable React components for easily building user interfaces.",
   "files": [
     "lib",