carbon-react 152.2.0 → 152.3.1

package/lib/__internal__/fieldset/fieldset.style.js

@@ -12,6 +12,7 @@ function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return
 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; }
 const StyledFieldset = exports.StyledFieldset = _styledComponents.default.fieldset`
   margin: 0;
+  margin-bottom: var(--fieldSpacing);
   ${_styledSystem.margin}
   border: none;
   padding: 0;

package/lib/__internal__/form-field/form-field.component.js

@@ -12,7 +12,7 @@ var _fieldHelp = _interopRequireDefault(require("../field-help"));
 var _tags = _interopRequireDefault(require("../utils/helpers/tags/tags"));
 var _tab = _interopRequireDefault(require("../../components/tabs/tab/__internal__/tab.context"));
 var _useIsAboveBreakpoint = _interopRequireDefault(require("../../hooks/__internal__/useIsAboveBreakpoint"));
-var _useFormSpacing = _interopRequireDefault(require("../../hooks/__internal__/useFormSpacing"));
+var _utils = require("../../style/utils");
 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; }
@@ -70,7 +70,7 @@ const FormField = ({
     setWarning,
     setInfo
   } = (0, _react.useContext)(_tab.default);
-  const marginProps = (0, _useFormSpacing.default)(rest);
+  const marginProps = (0, _utils.filterStyledSystemMarginProps)(rest);
   const isMounted = (0, _react.useRef)(false);
   (0, _react.useLayoutEffect)(() => {
     isMounted.current = true;

package/lib/__internal__/form-field/form-field.style.js

@@ -10,6 +10,7 @@ var _themes = require("../../style/themes");
 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; }
 const FormFieldStyle = _styledComponents.default.div`
+  margin-bottom: var(--fieldSpacing);
   & + & {
     margin-top: 16px;
   }

package/lib/__internal__/utils/helpers/events/events.d.ts

@@ -17,7 +17,7 @@ declare const Events: {
     /**
      * Determines if event is a keyboard event
      */
-    isKeyboardEvent: (ev: React.SyntheticEvent | Event) => ev is React.KeyboardEvent<Element> | KeyboardEvent;
+    isKeyboardEvent: (ev: React.SyntheticEvent | Event) => ev is KeyboardEvent | React.KeyboardEvent<Element>;
     /**
      * Determines if a number key along the top of the keyboard or a number key on the
      * keypad is pressed

package/lib/components/button/button-types.style.js

@@ -83,6 +83,16 @@ var _default = (isDisabled, destructive, isWhite) => ({
         ${makeColors("var(--colorsActionMajorYang100)")};
       }
 
+      ${isWhite && (!isDisabled || !destructive) ? `
+          border-color: var(--colorsActionMajorYang100);
+          ${makeColors("var(--colorsActionMajorYang100)")};
+          &:hover {
+            background: var(--colorsActionMajorYang100);
+            border-color: var(--colorsActionMajorYang100);
+            ${makeColors("var(--colorsYin100)")};
+          }
+          ` : ""}
+
       ${destructive ? `
             border-color: var(--colorsSemanticNegative500);
             ${makeColors("var(--colorsSemanticNegative500)")}
@@ -93,7 +103,7 @@ var _default = (isDisabled, destructive, isWhite) => ({
             }
           ` : ""}
 
-      ${isDisabled ? `
+      ${isDisabled && !isWhite ? `
             border-color: var(--colorsActionDisabled500);
             ${makeColors("var(--colorsActionMajorYin030)")};
             &:hover {

package/lib/components/button/button.component.js

@@ -73,13 +73,13 @@ const Button = /*#__PURE__*/_react.default.forwardRef(({
   children,
   destructive = false,
   disabled = false,
+  isWhite = false,
   fullWidth: fullWidthProp = false,
   href,
   iconPosition: iconPositionProp = "before",
   iconTooltipMessage,
   iconTooltipPosition,
   iconType,
-  isWhite = false,
   m = 0,
   noWrap,
   onClick,

package/lib/components/checkbox/checkbox-group/checkbox-group.component.js

@@ -10,7 +10,6 @@ var _tags = _interopRequireDefault(require("../../../__internal__/utils/helpers/
 var _fieldset = _interopRequireDefault(require("../../../__internal__/fieldset"));
 var _utils = require("../../../style/utils");
 var _tooltipProvider = require("../../../__internal__/tooltip-provider");
-var _formSpacingProvider = _interopRequireDefault(require("../../../__internal__/form-spacing-provider"));
 var _newValidation = _interopRequireDefault(require("../../carbon-provider/__internal__/new-validation.context"));
 var _validationMessage = _interopRequireDefault(require("../../../__internal__/validation-message/validation-message.component"));
 var _box = _interopRequireDefault(require("../../box"));
@@ -93,9 +92,7 @@ const CheckboxGroup = ({
       error: !!error,
       warning: !!warning
     }
-  }, /*#__PURE__*/_react.default.createElement(_formSpacingProvider.default, {
-    marginBottom: undefined
-  }, children))))) : /*#__PURE__*/_react.default.createElement(_tooltipProvider.TooltipProvider, {
+  }, children)))) : /*#__PURE__*/_react.default.createElement(_tooltipProvider.TooltipProvider, {
     tooltipPosition: tooltipPosition
   }, /*#__PURE__*/_react.default.createElement(_fieldset.default, _extends({
     id: uniqueId,
@@ -123,9 +120,7 @@ const CheckboxGroup = ({
       warning: !!warning,
       info: !!info
     }
-  }, /*#__PURE__*/_react.default.createElement(_formSpacingProvider.default, {
-    marginBottom: undefined
-  }, children))))));
+  }, children)))));
 };
 exports.CheckboxGroup = CheckboxGroup;
 CheckboxGroup.displayName = "CheckboxGroup";

package/lib/components/checkbox/checkbox.component.js

@@ -13,8 +13,8 @@ var _useIsAboveBreakpoint = _interopRequireDefault(require("../../hooks/__intern
 var _tooltipProvider = require("../../__internal__/tooltip-provider");
 var _checkboxGroup = _interopRequireDefault(require("./checkbox-group/__internal__/checkbox-group.context"));
 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 _utils = require("../../style/utils");
 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; }
@@ -106,7 +106,7 @@ const Checkbox = exports.Checkbox = /*#__PURE__*/_react.default.forwardRef(({
       info: contextInfo || info
     })
   };
-  const marginProps = (0, _useFormSpacing.default)(rest);
+  const marginProps = (0, _utils.filterStyledSystemMarginProps)(rest);
   const componentToRender = /*#__PURE__*/_react.default.createElement(_checkbox.default, _extends({
     disabled: disabled,
     labelSpacing: labelSpacing,

package/lib/components/checkbox/checkbox.style.js

@@ -18,6 +18,7 @@ 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; }
 const StyledCheckbox = _styledComponents.default.div`
+  margin-bottom: var(--fieldSpacing);
   ${_styledSystem.margin}
   ${({
   disabled,

package/lib/components/date/date.component.js

@@ -15,7 +15,6 @@ var _textbox = _interopRequireDefault(require("../textbox"));
 var _datePicker = _interopRequireDefault(require("./__internal__/date-picker"));
 var _dateRange = _interopRequireDefault(require("../date-range/__internal__/date-range.context"));
 var _useClickAwayListener = _interopRequireDefault(require("../../hooks/__internal__/useClickAwayListener"));
-var _useFormSpacing = _interopRequireDefault(require("../../hooks/__internal__/useFormSpacing"));
 var _guid = _interopRequireDefault(require("../../__internal__/utils/helpers/guid"));
 var _tags = _interopRequireDefault(require("../../__internal__/utils/helpers/tags/tags"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
@@ -291,7 +290,7 @@ const DateInput = exports.DateInput = /*#__PURE__*/_react.default.forwardRef(({
     }
     return value;
   };
-  const marginProps = (0, _useFormSpacing.default)(rest);
+  const marginProps = (0, _utils2.filterStyledSystemMarginProps)(rest);
   return /*#__PURE__*/_react.default.createElement(_date.default, _extends({
     ref: wrapperRef,
     role: "presentation",

package/lib/components/date/date.style.js

@@ -21,6 +21,7 @@ const datePickerWidth = {
   small: "120px"
 };
 const StyledDateInput = _styledComponents.default.div`
+  margin-bottom: var(--fieldSpacing);
   ${_styledSystem.margin}
 
   & ${_inputPresentation.default} {

package/lib/components/date-range/date-range.style.js

@@ -12,6 +12,7 @@ var _inputPresentation = require("../../__internal__/input/input-presentation.st
 var _base = _interopRequireDefault(require("../../style/themes/base"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const StyledDateRange = _styledComponents.default.div`
+  margin-bottom: var(--fieldSpacing);
   ${_styledSystem.margin}
 
   & ${_date.default} {

package/lib/components/fieldset/fieldset.component.js

@@ -8,8 +8,7 @@ var _react = _interopRequireWildcard(require("react"));
 var _tags = _interopRequireDefault(require("../../__internal__/utils/helpers/tags"));
 var _fieldset = require("./fieldset.style");
 var _newValidation = _interopRequireDefault(require("../carbon-provider/__internal__/new-validation.context"));
-var _formSpacingProvider = _interopRequireDefault(require("../../__internal__/form-spacing-provider"));
-var _useFormSpacing = _interopRequireDefault(require("../../hooks/__internal__/useFormSpacing"));
+var _utils = require("../../style/utils");
 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; }
@@ -22,7 +21,7 @@ const Fieldset = ({
   ...rest
 }) => {
   const [ref, setRef] = (0, _react.useState)(null);
-  const marginProps = (0, _useFormSpacing.default)(rest);
+  const marginProps = (0, _utils.filterStyledSystemMarginProps)(rest);
   const {
     validationRedesignOptIn
   } = (0, _react.useContext)(_newValidation.default);
@@ -40,9 +39,7 @@ const Fieldset = ({
     "data-element": "legend",
     isRequired: required,
     isOptional: isOptional
-  }, legend), validationRedesignOptIn ? children : /*#__PURE__*/_react.default.createElement(_formSpacingProvider.default, {
-    marginBottom: undefined
-  }, children));
+  }, legend), children);
 };
 exports.Fieldset = Fieldset;
 Fieldset.displayName = "Fieldset";

package/lib/components/fieldset/fieldset.style.js

@@ -14,6 +14,7 @@ function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return
 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; }
 const FieldsetStyle = exports.FieldsetStyle = _styledComponents.default.fieldset`
   margin: 0;
+  margin-bottom: var(--fieldSpacing);
   ${_styledSystem.margin}
   border: none;
   padding: 0;
@@ -21,6 +22,10 @@ const FieldsetStyle = exports.FieldsetStyle = _styledComponents.default.fieldset
   ${({
   newValidation
 }) => !newValidation && (0, _styledComponents.css)`
+      & * {
+        --fieldSpacing: 0;
+      }
+
       &&&& ${_formField.default} {
         margin-top: 0;
         margin-bottom: -1px;

package/lib/components/form/form.component.js

@@ -9,7 +9,6 @@ var _tags = _interopRequireDefault(require("../../__internal__/utils/helpers/tag
 var _formSummary = _interopRequireDefault(require("./__internal__/form-summary.component"));
 var _form = require("./form.style");
 var _form2 = require("./form.config");
-var _formSpacingProvider = _interopRequireDefault(require("../../__internal__/form-spacing-provider"));
 var _modal = _interopRequireDefault(require("../modal/__internal__/modal.context"));
 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); }
@@ -44,7 +43,6 @@ const Form = ({
     stickyFooter: stickyFooter,
     onSubmit: onSubmit,
     "data-component": "form",
-    fieldSpacing: fieldSpacing,
     noValidate: noValidate,
     height: height,
     isInModal: isInModal
@@ -53,10 +51,9 @@ const Form = ({
     "data-role": "form-content",
     stickyFooter: stickyFooter,
     tabIndex: -1,
-    isInModal: isInModal
-  }, /*#__PURE__*/_react.default.createElement(_formSpacingProvider.default, {
-    marginBottom: _form2.formSpacing[fieldSpacing]
-  }, children)), renderFooter && /*#__PURE__*/_react.default.createElement(_form.StyledFormFooter, _extends({
+    isInModal: isInModal,
+    fieldSpacing: _form2.formSpacing[fieldSpacing]
+  }, children), renderFooter && /*#__PURE__*/_react.default.createElement(_form.StyledFormFooter, _extends({
     "data-element": "form-footer",
     "data-role": "form-footer",
     ref: formFooterRef,

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

@@ -2,6 +2,7 @@ import { FormButtonAlignment } from "./form.config";
 interface StyledFormContentProps {
     stickyFooter?: boolean;
     isInModal?: boolean;
+    fieldSpacing?: string;
 }
 export declare const StyledFormContent: import("styled-components").StyledComponent<"div", any, StyledFormContentProps, never>;
 interface StyledFormFooterProps {
@@ -12,7 +13,6 @@ interface StyledFormFooterProps {
 export declare const StyledFormFooter: import("styled-components").StyledComponent<"div", any, StyledFormFooterProps, never>;
 interface StyledFormProps extends StyledFormContentProps {
     height?: string;
-    fieldSpacing: 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7;
 }
 export declare const StyledForm: import("styled-components").StyledComponent<"form", any, StyledFormProps, never>;
 export declare const StyledRightButtons: import("styled-components").StyledComponent<"div", any, {

package/lib/components/form/form.style.js

@@ -8,9 +8,10 @@ var _styledComponents = _interopRequireWildcard(require("styled-components"));
 var _styledSystem = require("styled-system");
 var _formField = _interopRequireDefault(require("../../__internal__/form-field/form-field.style"));
 var _base = _interopRequireDefault(require("../../style/themes/base"));
-var _search = _interopRequireDefault(require("../search/search.style"));
-var _textarea = _interopRequireDefault(require("../textarea/textarea.style"));
-var _numeralDate = require("../numeral-date/numeral-date.style");
+var _inlineInputs = _interopRequireDefault(require("../inline-inputs/inline-inputs.style"));
+var _select = _interopRequireDefault(require("../select/select.style"));
+var _multiSelect = require("../select/multi-select/multi-select.style");
+var _switch = _interopRequireDefault(require("../switch/switch.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; }
@@ -21,6 +22,22 @@ const StyledFormContent = exports.StyledFormContent = _styledComponents.default.
       flex-grow: 1;
       min-height: 0;
       overflow-y: auto;
+    `, ({
+  fieldSpacing
+}) => fieldSpacing && (0, _styledComponents.css)`
+      --fieldSpacing: ${fieldSpacing};
+
+      ${_formField.default} {
+        margin-top: var(--spacing000);
+      }
+
+      // field spacing is also applied to form field here so we need to override
+      ${_inlineInputs.default} ${_formField.default},
+      ${_inlineInputs.default} ${_select.default},
+      ${_inlineInputs.default} ${_multiSelect.StyledSelectMultiSelect},
+      ${_switch.default} ${_formField.default} {
+        margin-bottom: var(--spacing000);
+      }
     `);
 const StyledFormFooter = exports.StyledFormFooter = _styledComponents.default.div`
   align-items: center;
@@ -73,14 +90,6 @@ const StyledForm = exports.StyledForm = _styledComponents.default.form`
       height: ${height};
     `}
 
-  // field spacing is also applied to form field here so we need to override
-  ${_search.default} ${_formField.default}, 
-  ${_textarea.default} ${_formField.default}, 
-  [data-component="time"] ${_formField.default}, 
-  ${_numeralDate.StyledNumeralDate} ${_formField.default} {
-    margin-bottom: var(--spacing000);
-  }
-
   ${({
   stickyFooter,
   isInModal

package/lib/components/hr/hr.style.js

@@ -15,7 +15,7 @@ const heightMap = {
 };
 const StyledHr = _styledComponents.default.hr`
   ${_styledSystem.margin}
-  width: inherit;
+  width: 100%;
   border: 0;
   height: ${({
   height

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

@@ -34,5 +34,5 @@ declare const StyledImage: import("styled-components").StyledComponent<"div", an
     bottom: string | undefined;
     left: string | undefined;
     as?: string | undefined;
-} & StyledImageProps, "hidden" | "children" | "left" | "right" | "top" | "bottom" | "src" | "as" | "position">;
+} & StyledImageProps, "hidden" | "children" | "left" | "right" | "top" | "bottom" | "as" | "src" | "position">;
 export { StyledImage };

package/lib/components/inline-inputs/inline-inputs.component.js

@@ -7,10 +7,9 @@ exports.default = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _label = _interopRequireDefault(require("../../__internal__/label"));
 var _inlineInputs = _interopRequireWildcard(require("./inline-inputs.style"));
-var _formSpacingProvider = _interopRequireDefault(require("../../__internal__/form-spacing-provider"));
 var _useIsAboveBreakpoint = _interopRequireDefault(require("../../hooks/__internal__/useIsAboveBreakpoint"));
-var _useFormSpacing = _interopRequireDefault(require("../../hooks/__internal__/useFormSpacing"));
 var _tags = _interopRequireDefault(require("../../__internal__/utils/helpers/tags"));
+var _utils = require("../../style/utils");
 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; }
@@ -55,7 +54,7 @@ const InlineInputs = ({
       optional: isOptional
     }, label);
   }
-  const marginProps = (0, _useFormSpacing.default)(rest);
+  const marginProps = (0, _utils.filterStyledSystemMarginProps)(rest);
   (0, _react.useEffect)(() => {
     if (required) {
       const elements = Array.from(ref.current?.querySelectorAll("input") || /* istanbul ignore next */[]);
@@ -72,9 +71,7 @@ const InlineInputs = ({
     "data-element": "inline-inputs-container",
     "data-role": "inline-inputs-container",
     inputWidth: inputWidth
-  }, /*#__PURE__*/_react.default.createElement(_formSpacingProvider.default, {
-    marginBottom: undefined
-  }, columnWrapper(children, gutter))));
+  }, columnWrapper(children, gutter)));
 };
 InlineInputs.displayName = "InlineInputs";
 var _default = exports.default = InlineInputs;

package/lib/components/inline-inputs/inline-inputs.style.js

@@ -70,6 +70,7 @@ const StyledContentContainer = exports.StyledContentContainer = _styledComponent
     `}
 `;
 const StyledInlineInputs = _styledComponents.default.div`
+  margin-bottom: var(--fieldSpacing);
   ${_styledSystem.margin}
 
   display: ${({

package/lib/components/message/message.component.d.ts

@@ -1,7 +1,11 @@
 import React from "react";
 import { MarginProps } from "styled-system";
 import { TagProps } from "../../__internal__/utils/helpers/tags/tags";
-export declare type MessageVariant = "error" | "info" | "success" | "warning" | "neutral";
+export interface TypeIconProps {
+    transparent?: boolean;
+    variant: MessageVariant;
+}
+export declare type MessageVariant = "error" | "info" | "success" | "warning" | "neutral" | "ai";
 export interface MessageProps extends MarginProps, TagProps {
     /** Set the component's content */
     children?: React.ReactNode;

package/lib/components/message/message.component.js

@@ -6,12 +6,12 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = exports.Message = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _typography = _interopRequireDefault(require("../typography"));
-var _message = _interopRequireDefault(require("./message.style"));
-var _typeIcon = _interopRequireDefault(require("./__internal__/type-icon/type-icon.component"));
-var _messageContent = _interopRequireDefault(require("./__internal__/message-content/message-content.component"));
+var _content = _interopRequireDefault(require("../content"));
+var _message = _interopRequireWildcard(require("./message.style"));
 var _tags = _interopRequireDefault(require("../../__internal__/utils/helpers/tags/tags"));
 var _icon = _interopRequireDefault(require("../icon"));
 var _iconButton = _interopRequireDefault(require("../icon-button"));
+var _aiIcon = _interopRequireDefault(require("../../__internal__/ai-icon"));
 var _utils = require("../../style/utils");
 var _useLocale = _interopRequireDefault(require("../../hooks/__internal__/useLocale"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
@@ -31,38 +31,52 @@ const Message = exports.Message = /*#__PURE__*/_react.default.forwardRef(({
   width,
   ...props
 }, ref) => {
-  const messageRef = (0, _react.useRef)(null);
-  const refToPass = ref || messageRef;
+  const localRef = (0, _react.useRef)(null);
+  const messageRef = ref || localRef;
+  const locale = (0, _useLocale.default)();
   const marginProps = (0, _utils.filterStyledSystemMarginProps)(props);
-  const l = (0, _useLocale.default)();
-  const renderCloseIcon = () => {
-    if (!showCloseIcon || !onDismiss) return null;
-    return /*#__PURE__*/_react.default.createElement(_iconButton.default, {
-      "data-element": "close",
-      "aria-label": closeButtonAriaLabel || l.message.closeButtonAriaLabel(),
-      onClick: onDismiss
-    }, /*#__PURE__*/_react.default.createElement(_icon.default, {
-      type: "close"
-    }));
+  const VARIANT_ICON_MAP = {
+    neutral: "info",
+    success: "tick_circle",
+    error: "error",
+    warning: "warning",
+    info: "info"
   };
-  return open ? /*#__PURE__*/_react.default.createElement(_message.default, _extends({}, (0, _tags.default)("Message", props), {
+  if (!open) {
+    return null;
+  }
+  return /*#__PURE__*/_react.default.createElement(_message.default, _extends({}, (0, _tags.default)("Message", props), {
     transparent: transparent,
     variant: variant,
     id: id,
     width: width,
-    ref: refToPass
+    ref: messageRef
   }, marginProps, {
     tabIndex: -1
-  }), /*#__PURE__*/_react.default.createElement(_typeIcon.default, {
+  }), /*#__PURE__*/_react.default.createElement(_message.TypeIconStyle, {
     variant: variant,
     transparent: transparent
-  }), /*#__PURE__*/_react.default.createElement(_typography.default, {
+  }, variant === "ai" ? /*#__PURE__*/_react.default.createElement(_aiIcon.default, {
+    "data-role": "ai-icon"
+  }) : /*#__PURE__*/_react.default.createElement(_icon.default, {
+    "data-role": "category-icon",
+    type: VARIANT_ICON_MAP[variant]
+  })), /*#__PURE__*/_react.default.createElement(_typography.default, {
     screenReaderOnly: true
-  }, l.message[variant]()), /*#__PURE__*/_react.default.createElement(_messageContent.default, {
-    showCloseIcon: showCloseIcon,
-    title: title,
-    reduceLeftPadding: transparent
-  }, children), renderCloseIcon()) : null;
+  }, locale.message?.[variant]?.()), /*#__PURE__*/_react.default.createElement(_message.MessageContent, {
+    "data-element": "message-content",
+    "data-role": "message-content"
+  }, !showCloseIcon || !onDismiss ? /*#__PURE__*/_react.default.createElement(_content.default, {
+    title: title
+  }, children) : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_content.default, {
+    title: title
+  }, children), /*#__PURE__*/_react.default.createElement(_iconButton.default, {
+    "data-element": "close",
+    "aria-label": closeButtonAriaLabel || locale.message.closeButtonAriaLabel(),
+    onClick: onDismiss
+  }, /*#__PURE__*/_react.default.createElement(_icon.default, {
+    type: "close"
+  })))));
 });
 Message.displayName = "Message";
 var _default = exports.default = Message;

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

@@ -1,9 +1,12 @@
 import { MarginProps } from "styled-system";
-import { MessageVariant } from "./message.component";
+import { MessageVariant, TypeIconProps } from "./message.component";
 declare type MessageStyleProps = {
     variant?: MessageVariant;
     transparent?: boolean;
     width?: string;
 };
 declare const MessageStyle: import("styled-components").StyledComponent<"div", any, MessageStyleProps & MarginProps<Required<import("styled-system").Theme<import("styled-system").TLengthStyledSystem>>>, never>;
+declare const MessageContent: import("styled-components").StyledComponent<"div", any, {}, never>;
+declare const TypeIconStyle: import("styled-components").StyledComponent<"div", any, TypeIconProps, never>;
 export default MessageStyle;
+export { MessageContent, TypeIconStyle };

package/lib/components/message/message.style.js

@@ -3,11 +3,10 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports.default = exports.TypeIconStyle = exports.MessageContent = void 0;
 var _styledComponents = _interopRequireWildcard(require("styled-components"));
 var _styledSystem = require("styled-system");
 var _base = _interopRequireDefault(require("../../style/themes/base"));
-var _iconButton = _interopRequireDefault(require("../icon-button/icon-button.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; }
@@ -16,13 +15,12 @@ const messageVariants = {
   info: "var(--colorsSemanticInfo500)",
   success: "var(--colorsSemanticPositive500)",
   warning: "var(--colorsSemanticCaution500)",
-  neutral: "var(--colorsSemanticNeutral500)"
+  neutral: "var(--colorsSemanticNeutral500)",
+  ai: "var(--colorsUtilityYin100)"
 };
 const MessageStyle = _styledComponents.default.div`
   position: relative;
   display: flex;
-  justify-content: flex-start;
-  align-content: center;
   border-radius: var(--borderRadius100);
   overflow: hidden;
   border: 1px solid ${({
@@ -42,19 +40,46 @@ const MessageStyle = _styledComponents.default.div`
       background: transparent;
     `}
 
-  ${_iconButton.default} {
-    position: absolute;
-    right: 20px;
-    top: 50%;
-    transform: translateY(-50%);
-  }
-
   ${({
   width
 }) => width && `width: ${width};`}
-
   ${_styledSystem.margin}
 `;
+const MessageContent = exports.MessageContent = _styledComponents.default.div`
+  width: 100%;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: var(--spacing200);
+  gap: var(--spacing300);
+`;
+const TypeIconStyle = exports.TypeIconStyle = _styledComponents.default.div`
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  background-color: ${({
+  variant
+}) => messageVariants[variant]};
+  min-width: 30px;
+
+  span {
+    &:before {
+      color: var(--colorsUtilityYang100);
+    }
+  }
+
+  ${({
+  transparent,
+  variant
+}) => transparent && (0, _styledComponents.css)`
+      background-color: transparent;
+      span {
+        &:before {
+          color: ${messageVariants[variant]};
+        }
+      }
+    `}
+`;
 MessageStyle.defaultProps = {
   theme: _base.default
 };

package/lib/components/numeral-date/numeral-date.component.js

@@ -294,7 +294,8 @@ const NumeralDate = exports.NumeralDate = /*#__PURE__*/(0, _react.forwardRef)(({
         info
       }, {
         tooltipPosition: tooltipPosition,
-        tooltipId: validationId
+        tooltipId: validationId,
+        my: 0 // prevents any form spacing being applied
       }))));
     }));
   };