carbon-react 152.2.0 → 153.0.0-beta.1

package/esm/__internal__/fieldset/fieldset.component.js

@@ -4,9 +4,9 @@ import { StyledFieldset, StyledLegend, StyledLegendContent, StyledIconWrapper }
 import ValidationIcon from "../validations/validation-icon.component";
 import NewValidationContext from "../../components/carbon-provider/__internal__/new-validation.context";
 import { InputGroupBehaviour, InputGroupContext } from "../input-behaviour";
-import useFormSpacing from "../../hooks/__internal__/useFormSpacing";
 import Help from "../../components/help";
 import Typography from "../../components/typography";
+import { filterStyledSystemMarginProps } from "../../style/utils";
 const Fieldset = ({
   legend,
   children,
@@ -29,7 +29,7 @@ const Fieldset = ({
   const {
     validationRedesignOptIn
   } = useContext(NewValidationContext);
-  const marginProps = useFormSpacing(rest);
+  const marginProps = filterStyledSystemMarginProps(rest);
   const [ref, setRef] = useState(null);
   const [isFocused, setFocus] = useState(false);
   useEffect(() => {

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

@@ -1,14 +1,14 @@
-declare type StyledFieldsetProps = {
+type StyledFieldsetProps = {
     width?: string;
 };
 declare const StyledFieldset: import("styled-components").StyledComponent<"fieldset", any, StyledFieldsetProps, never>;
-declare type StyledLegendContentProps = {
+type StyledLegendContentProps = {
     isRequired?: boolean;
     isOptional?: boolean;
     isDisabled?: boolean;
 };
 declare const StyledLegendContent: import("styled-components").StyledComponent<"span", any, StyledLegendContentProps, never>;
-export declare type StyledLegendProps = {
+export type StyledLegendProps = {
     inline?: boolean;
     width?: number;
     align?: "left" | "right";

package/esm/__internal__/fieldset/fieldset.style.js

@@ -3,6 +3,7 @@ import { margin } from "styled-system";
 import BaseTheme from "../../style/themes/base";
 const StyledFieldset = styled.fieldset`
   margin: 0;
+  margin-bottom: var(--fieldSpacing);
   ${margin}
   border: none;
   padding: 0;

package/esm/__internal__/focus-trap/focus-trap-utils.d.ts

@@ -1,4 +1,4 @@
-declare type CustomRefObject<T> = {
+type CustomRefObject<T> = {
     current?: T | null;
 };
 declare const defaultFocusableSelectors = "button:not([disabled]), [href], input:not([type=\"hidden\"]):not([disabled]), select:not([disabled]), textarea:not([disabled]), [tabindex]";

package/esm/__internal__/focus-trap/focus-trap.component.d.ts

@@ -1,7 +1,7 @@
 import React from "react";
 export declare const TAB_GUARD_TOP = "tab-guard-top";
 export declare const TAB_GUARD_BOTTOM = "tab-guard-bottom";
-export declare type CustomRefObject<T> = {
+export type CustomRefObject<T> = {
     current?: T | null;
 };
 export interface FocusTrapProps {

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

@@ -7,7 +7,7 @@ import FieldHelp from "../field-help";
 import tagComponent from "../utils/helpers/tags/tags";
 import TabContext from "../../components/tabs/tab/__internal__/tab.context";
 import useIsAboveBreakpoint from "../../hooks/__internal__/useIsAboveBreakpoint";
-import useFormSpacing from "../../hooks/__internal__/useFormSpacing";
+import { filterStyledSystemMarginProps } from "../../style/utils";
 const FormField = ({
   maxWidth,
   children,
@@ -61,7 +61,7 @@ const FormField = ({
     setWarning,
     setInfo
   } = useContext(TabContext);
-  const marginProps = useFormSpacing(rest);
+  const marginProps = filterStyledSystemMarginProps(rest);
   const isMounted = useRef(false);
   useLayoutEffect(() => {
     isMounted.current = true;

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

@@ -2,6 +2,7 @@ import styled, { css } from "styled-components";
 import { space } from "styled-system";
 import { baseTheme } from "../../style/themes";
 const FormFieldStyle = styled.div`
+  margin-bottom: var(--fieldSpacing);
   & + & {
     margin-top: 16px;
   }

package/esm/__internal__/input/input-presentation.component.d.ts

@@ -1,7 +1,7 @@
 import React from "react";
 import { BorderRadiusType } from "../../components/box/box.component";
 import { ValidationProps } from "../validations";
-export declare type Sizes = "small" | "medium" | "large";
+export type Sizes = "small" | "medium" | "large";
 export interface CommonInputPresentationProps extends ValidationProps {
     children: React.ReactNode;
     /** If true, the component will be disabled */

package/esm/__internal__/input/input-presentation.style.d.ts

@@ -2,5 +2,5 @@ import { CommonInputPresentationProps } from "./input-presentation.component";
 import { InputContextProps } from "../input-behaviour";
 import { CarbonProviderProps } from "../../components/carbon-provider";
 export declare const StyledInputPresentationContainer: import("styled-components").StyledComponent<"div", any, Pick<CommonInputPresentationProps, "maxWidth" | "inputWidth">, never>;
-declare const InputPresentationStyle: import("styled-components").StyledComponent<"div", any, Pick<InputContextProps, "hasFocus"> & Pick<CommonInputPresentationProps, "disabled" | "error" | "info" | "warning" | "prefix" | "align" | "readOnly" | "size" | "borderRadius" | "hasIcon" | "hideBorders"> & Pick<CarbonProviderProps, "validationRedesignOptIn">, never>;
+declare const InputPresentationStyle: import("styled-components").StyledComponent<"div", any, Pick<InputContextProps, "hasFocus"> & Pick<CommonInputPresentationProps, "disabled" | "error" | "info" | "warning" | "prefix" | "align" | "size" | "readOnly" | "borderRadius" | "hasIcon" | "hideBorders"> & Pick<CarbonProviderProps, "validationRedesignOptIn">, never>;
 export default InputPresentationStyle;

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

@@ -1,6 +1,6 @@
 import React from "react";
 import { BorderRadiusType } from "../../components/box/box.component";
-export declare type EnterKeyHintTypes = "enter" | "done" | "go" | "next" | "previous" | "search" | "send";
+export type EnterKeyHintTypes = "enter" | "done" | "go" | "next" | "previous" | "search" | "send";
 export interface CommonInputProps extends Omit<React.InputHTMLAttributes<HTMLInputElement>, "type"> {
     align?: "right" | "left";
     /** The id of the element that describe the input. */

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

@@ -1,6 +1,6 @@
 import React, { MutableRefObject } from "react";
 import { Placement, Middleware } from "@floating-ui/dom";
-declare type CustomRefObject<T> = {
+type CustomRefObject<T> = {
     current?: T | null;
 };
 export interface PopoverProps {

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

@@ -1,5 +1,5 @@
 export declare const StyledBackdrop: import("styled-components").StyledComponent<"div", any, {}, never>;
-declare type StyledPopoverContentProps = {
+type StyledPopoverContentProps = {
     isOpen?: boolean;
 };
 export declare const StyledPopoverContent: import("styled-components").StyledComponent<"div", any, StyledPopoverContentProps, never>;

package/esm/__internal__/validations/validation-icon.component.d.ts

@@ -17,7 +17,7 @@ export interface ValidationProps {
      */
     warning?: boolean | string;
 }
-declare type TooltipPositions = "top" | "bottom" | "left" | "right";
+type TooltipPositions = "top" | "bottom" | "left" | "right";
 export interface ValidationIconProps extends ValidationProps, Pick<MarginProps, "mr" | "ml"> {
     /** A small string to indicate the size of the icon */
     size?: "small" | "medium" | "large";

package/esm/__internal__/validations/validation-icon.style.d.ts

@@ -1,5 +1,5 @@
 import { ValidationIconProps } from "./validation-icon.component";
-declare type ValidationType = "error" | "warning" | "info";
+type ValidationType = "error" | "warning" | "info";
 declare const ValidationIconStyle: import("styled-components").StyledComponent<"span", any, ValidationIconProps & {
     validationType: ValidationType;
 }, never>;

package/esm/components/accordion/accordion-group/accordion-group.component.d.ts

@@ -1,7 +1,7 @@
 import React from "react";
 import { MarginProps } from "styled-system";
 import { TagProps } from "../../../__internal__/utils/helpers/tags";
-declare type AccordionGroupChild = React.ReactElement | boolean | null | undefined | AccordionGroupChildArray;
+type AccordionGroupChild = React.ReactElement | boolean | null | undefined | AccordionGroupChildArray;
 interface AccordionGroupChildArray extends Array<AccordionGroupChild> {
 }
 export interface AccordionGroupProps extends MarginProps, TagProps {

package/esm/components/accordion/accordion.style.js

@@ -72,8 +72,8 @@ const StyledAccordionIcon = styled(Icon)`
   isExpanded,
   iconAlign
 }) => {
-  return isExpanded && (iconAlign === "right" ? "transform: rotate(180deg)" : "transform: rotate(-180deg)");
-}};
+  return isExpanded && (iconAlign === "right" ? "transform: rotate(180deg);" : "transform: rotate(-180deg);");
+}}
 
   color: var(--colorsActionMinor500);
 `;

package/esm/components/action-popover/__internal__/action-popover-utils.d.ts

@@ -1,5 +1,5 @@
 import React from "react";
-declare type ReactItem = React.ReactChild | React.ReactFragment | React.ReactPortal;
+type ReactItem = React.ReactChild | React.ReactFragment | React.ReactPortal;
 export declare const getItems: (children: React.ReactNode | React.ReactNode[]) => ReactItem[];
 export declare const isItemDisabled: (item: ReactItem) => boolean;
 export declare const findFirstFocusableItem: (items: ReactItem[]) => number;

package/esm/components/action-popover/__internal__/action-popover.context.d.ts

@@ -1,6 +1,6 @@
 import React from "react";
-export declare type Alignment = "left" | "right";
-declare type ActionPopoverContextType = {
+export type Alignment = "left" | "right";
+type ActionPopoverContextType = {
     setOpenPopover: (isOpen: boolean) => void;
     focusButton: () => void;
     submenuPosition: Alignment;

package/esm/components/action-popover/action-popover-menu-button/action-popover-menu-button.component.d.ts

@@ -1,7 +1,7 @@
 import React from "react";
 import { ButtonIconPosition, ButtonTypes, SizeOptions } from "../../button/button.component";
 import { IconType } from "../../icon";
-export declare type ActionPopoverMenuButtonAria = {
+export type ActionPopoverMenuButtonAria = {
     "aria-haspopup": string;
     "aria-label"?: string;
     "aria-labelledby"?: string;

package/esm/components/action-popover/action-popover.component.d.ts

@@ -40,7 +40,7 @@ export interface ActionPopoverProps extends MarginProps, TagProps {
     /** Prop to specify an aria-describedby for the component */
     "aria-describedby"?: string;
 }
-export declare type ActionPopoverHandle = {
+export type ActionPopoverHandle = {
     focusButton: () => void;
 } | null;
 export declare const ActionPopover: React.ForwardRefExoticComponent<ActionPopoverProps & React.RefAttributes<ActionPopoverHandle>>;

package/esm/components/action-popover/action-popover.style.d.ts

@@ -2,7 +2,7 @@
 declare const Menu: import("styled-components").StyledComponent<"ul", any, {
     isOpen?: boolean | undefined;
 }, never>;
-declare type StyledMenuItemProps = {
+type StyledMenuItemProps = {
     isDisabled: boolean;
     horizontalAlignment?: "left" | "right";
     submenuPosition?: "left" | "right";

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

@@ -7,7 +7,7 @@ interface StyledBadgeProps {
     isHovered?: boolean;
 }
 declare const StyledBadge: import("styled-components").StyledComponent<"span", any, {
-    as: import("react").ForwardRefExoticComponent<import("../button").ButtonProps & import("react").RefAttributes<HTMLButtonElement>> | undefined;
+    as: import("react").ForwardRefExoticComponent<import("../button").ButtonProps & import("react").RefAttributes<HTMLAnchorElement | HTMLButtonElement>> | undefined;
 } & StyledBadgeProps, "as">;
 declare const StyledCrossIcon: import("styled-components").StyledComponent<import("react").ForwardRefExoticComponent<import("../icon").IconProps & import("react").RefAttributes<HTMLSpanElement>>, any, {}, never>;
 export { StyledBadge, StyledBadgeWrapper, StyledCrossIcon, StyledCounter };

package/esm/components/batch-selection/__internal__/batch-selection.context.d.ts

@@ -1,5 +1,5 @@
 import React from "react";
-export declare type BatchSelectionContextType = {
+export type BatchSelectionContextType = {
     batchSelectionDisabled: boolean;
 };
 declare const BatchSelectionContext: React.Context<BatchSelectionContextType>;

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

@@ -3,12 +3,12 @@ import { SpaceProps, LayoutProps, FlexboxProps, PositionProps, GridProps } from
 import * as DesignTokens from "@sage/design-tokens/js/base/common";
 import { Gap } from "style/utils/box-gap";
 import { TagProps } from "../../__internal__/utils/helpers/tags";
-export declare type OverflowWrap = "break-word" | "anywhere";
-export declare type ScrollVariant = "light" | "dark";
-export declare type BoxSizing = "content-box" | "border-box";
-declare type DesignTokensType = keyof typeof DesignTokens;
-declare type BoxShadowsType = Extract<DesignTokensType, `boxShadow${string}`>;
-export declare type BorderRadiusType = Extract<DesignTokensType, `borderRadius${string}`>;
+export type OverflowWrap = "break-word" | "anywhere";
+export type ScrollVariant = "light" | "dark";
+export type BoxSizing = "content-box" | "border-box";
+type DesignTokensType = keyof typeof DesignTokens;
+type BoxShadowsType = Extract<DesignTokensType, `boxShadow${string}`>;
+export type BorderRadiusType = Extract<DesignTokensType, `borderRadius${string}`>;
 export interface BoxProps extends FlexboxProps, Omit<GridProps, "gridGap" | "gridRowGap" | "gridColumnGap">, LayoutProps, Omit<PositionProps, "zIndex">, SpaceProps, TagProps {
     as?: keyof JSX.IntrinsicElements | React.ComponentType<any>;
     /** Set the ID attribute of the Box component */

package/esm/components/breadcrumbs/__internal__/breadcrumbs.context.d.ts

@@ -1,5 +1,5 @@
 import React from "react";
-export declare type BreadcrumbsContextType = {
+export type BreadcrumbsContextType = {
     isDarkBackground: boolean;
 };
 declare const BreadcrumbsContext: React.Context<BreadcrumbsContextType>;

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

@@ -3,9 +3,9 @@ import { SpaceProps } from "styled-system";
 import { IconType } from "../icon";
 import { TagProps } from "../../__internal__/utils/helpers/tags/tags";
 import { TooltipPositions } from "../tooltip/tooltip.config";
-export declare type ButtonTypes = "primary" | "secondary" | "tertiary" | "darkBackground" | "gradient-grey" | "gradient-white";
-export declare type SizeOptions = "small" | "medium" | "large";
-export declare type ButtonIconPosition = "before" | "after";
+export type ButtonTypes = "primary" | "secondary" | "tertiary" | "darkBackground" | "gradient-grey" | "gradient-white";
+export type SizeOptions = "small" | "medium" | "large";
+export type ButtonIconPosition = "before" | "after";
 export interface ButtonProps extends SpaceProps, TagProps {
     /**
      * Prop to specify the aria-label attribute of the component
@@ -45,13 +45,13 @@ export interface ButtonProps extends SpaceProps, TagProps {
     /** If provided, the text inside a button will not wrap */
     noWrap?: boolean;
     /** Specify a callback triggered on blur */
-    onBlur?: (ev: React.FocusEvent<HTMLButtonElement>) => void;
+    onBlur?: (ev: React.FocusEvent<HTMLButtonElement | HTMLAnchorElement>) => void;
     /** Specify a callback triggered on change */
-    onChange?: (ev: React.ChangeEvent<HTMLButtonElement>) => void;
+    onChange?: (ev: React.FormEvent<HTMLButtonElement | HTMLAnchorElement> | React.ChangeEvent<HTMLButtonElement | HTMLAnchorElement>) => void;
     /** Specify a callback triggered on focus */
-    onFocus?: (ev: React.FocusEvent<HTMLButtonElement>) => void;
+    onFocus?: (ev: React.FocusEvent<HTMLButtonElement | HTMLAnchorElement>) => void;
     /** Specify a callback triggered on keyDown */
-    onKeyDown?: (ev: React.KeyboardEvent<HTMLButtonElement>) => void;
+    onKeyDown?: (ev: React.KeyboardEvent<HTMLButtonElement | HTMLAnchorElement>) => void;
     /** onClick handler */
     onClick?: (event: React.MouseEvent<HTMLAnchorElement | HTMLButtonElement>) => void;
     /** Assigns a size to the button: "small" | "medium" | "large" */
@@ -72,5 +72,5 @@ export interface ButtonProps extends SpaceProps, TagProps {
      */
     className?: string;
 }
-declare const Button: React.ForwardRefExoticComponent<ButtonProps & React.RefAttributes<HTMLButtonElement>>;
+declare const Button: React.ForwardRefExoticComponent<ButtonProps & React.RefAttributes<HTMLAnchorElement | HTMLButtonElement>>;
 export default Button;

package/esm/components/button/button.component.js

@@ -99,7 +99,7 @@ const Button = /*#__PURE__*/React.forwardRef(({
   if (subtext) {
     !(size === "large") ? process.env.NODE_ENV !== "production" ? invariant(false, "subtext prop has no effect unless the button is large.") : invariant(false) : void 0;
   }
-  const [internalRef, setInternalRef] = useState();
+  const [internalRef, setInternalRef] = useState(null);
   const {
     inSplitButton,
     onChildButtonClick

package/esm/components/button/button.style.js

@@ -21,9 +21,10 @@ function stylingForIconOnly(size) {
       dimension = "40px";
   }
   return `
-  padding: 0px;
-  width: ${dimension};
-  min-height: ${dimension}`;
+    padding: 0px; 
+    width: ${dimension}; 
+    min-height: ${dimension};
+  `;
 }
 function stylingForType({
   iconOnly,
@@ -63,7 +64,7 @@ const StyledButton = styled.button`
     align-items: center;
     cursor: ${disabled ? "not-allowed" : "pointer"};
     display: inline-flex;
-    ${noWrap ? "white-space: nowrap;" : "flex-flow: wrap;"}
+    ${noWrap ? "white-space: nowrap" : "flex-flow: wrap"};
     justify-content: center;
     vertical-align: middle;
     outline-offset: 0;
@@ -92,15 +93,28 @@ const StyledButton = styled.button`
   iconType
 }) => css`
     ${StyledIcon} {
-      margin-left: ${!iconOnly && iconPosition === "after" ? "var(--spacing100)" : "0px"};
-      margin-right: ${!iconOnly && iconPosition === "before" ? "var(--spacing100)" : "0px"};
-      margin-bottom: ${iconOnly ? "1px" : "0px"};
+      ${iconOnly && css`
+        margin-left: auto;
+        margin-right: auto;
+        margin-bottom: 1px;
+      `}
+      ${!iconOnly && css`
+        margin-bottom: 0px;
+        ${iconPosition === "after" && `
+          margin-left: var(--spacing100);
+          margin-right: 0px;
+        `}
+        ${iconPosition === "before" && `
+          margin-left: 0px;
+          margin-right: var(--spacing100);
+        `}
+      `}
+
       height: ${additionalIconStyle(iconType)};
       width: 20px;
       svg {
         margin-top: 0;
       }
-      ${iconOnly && "margin-left: auto; margin-right: auto"}
     }
   `}
 `;

package/esm/components/button-minor/button-minor.style.d.ts

@@ -1,4 +1,4 @@
 /// <reference types="react" />
 import { ButtonMinorProps } from "./button-minor.component";
-declare const StyledButtonMinor: import("styled-components").StyledComponent<import("react").ForwardRefExoticComponent<import("../button").ButtonProps & import("react").RefAttributes<HTMLButtonElement>>, any, ButtonMinorProps, never>;
+declare const StyledButtonMinor: import("styled-components").StyledComponent<import("react").ForwardRefExoticComponent<import("../button").ButtonProps & import("react").RefAttributes<HTMLAnchorElement | HTMLButtonElement>>, any, ButtonMinorProps, never>;
 export default StyledButtonMinor;

package/esm/components/button-toggle/button-toggle-group/__internal__/button-toggle-group.context.d.ts

@@ -1,5 +1,5 @@
 import React from "react";
-declare type ButtonToggleGroupContextType = {
+type ButtonToggleGroupContextType = {
     onButtonClick: (value: string) => void;
     handleKeyDown: (ev: React.KeyboardEvent<HTMLButtonElement>) => void;
     pressedButtonValue?: string;

package/esm/components/button-toggle/button-toggle-group/button-toggle-group.style.d.ts

@@ -1,4 +1,4 @@
 import { ButtonToggleGroupProps } from ".";
-declare type StyledButtonToggleGroupProps = Pick<ButtonToggleGroupProps, "inputWidth" | "fullWidth" | "disabled" | "labelInline">;
+type StyledButtonToggleGroupProps = Pick<ButtonToggleGroupProps, "inputWidth" | "fullWidth" | "disabled" | "labelInline">;
 declare const StyledButtonToggleGroup: import("styled-components").StyledComponent<"div", any, StyledButtonToggleGroupProps, never>;
 export default StyledButtonToggleGroup;

package/esm/components/button-toggle/button-toggle.style.d.ts

@@ -1,5 +1,5 @@
 import { IconType } from "../icon";
-export declare type ButtonToggleIconSizes = "small" | "large";
+export type ButtonToggleIconSizes = "small" | "large";
 export declare const heightConfig: {
     small: number;
     medium: number;

package/esm/components/carbon-provider/__internal__/top-modal.context.d.ts

@@ -1,5 +1,5 @@
 import React from "react";
-declare type TopModalContextProps = {
+type TopModalContextProps = {
     topModal: HTMLElement | null;
 };
 declare const _default: React.Context<TopModalContextProps>;

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

@@ -3,8 +3,8 @@ import { MarginProps } from "styled-system";
 import * as DesignTokens from "@sage/design-tokens/js/base/common";
 import { CardContextProps } from "./__internal__/card.context";
 import { TagProps } from "../../__internal__/utils/helpers/tags/tags";
-declare type DesignTokensType = keyof typeof DesignTokens;
-declare type BoxShadowsType = Extract<DesignTokensType, `boxShadow${string}`>;
+type DesignTokensType = keyof typeof DesignTokens;
+type BoxShadowsType = Extract<DesignTokensType, `boxShadow${string}`>;
 export interface CardProps extends MarginProps, Pick<TagProps, "data-element" | "data-role"> {
     /** Action to be executed when card is clicked or enter pressed.
      * Renders a button when passed and no draggable or href props set

package/esm/components/card/card.config.d.ts

@@ -1,4 +1,4 @@
 export declare const CARD_SPACING: readonly ["small", "medium", "large"];
 export declare const CARD_ALIGNS: readonly ["left", "center", "right"];
-export declare type CardAlign = (typeof CARD_ALIGNS)[number];
-export declare type CardSpacing = (typeof CARD_SPACING)[number];
+export type CardAlign = (typeof CARD_ALIGNS)[number];
+export type CardSpacing = (typeof CARD_SPACING)[number];

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

@@ -12,8 +12,8 @@ export declare const marginSizes: {
     medium: string;
     large: string;
 };
-declare type DesignTokensType = keyof typeof DesignTokens;
-export declare type BoxShadowsType = Extract<DesignTokensType, `boxShadow${string}`>;
+type DesignTokensType = keyof typeof DesignTokens;
+export type BoxShadowsType = Extract<DesignTokensType, `boxShadow${string}`>;
 export interface StyledCardProps extends MarginProps, Pick<CardContextProps, "roundness" | "spacing">, Pick<CardProps, "href" | "onClick"> {
     cardWidth: string;
     interactive: boolean;

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

@@ -5,7 +5,6 @@ import tagComponent from "../../../__internal__/utils/helpers/tags/tags";
 import Fieldset from "../../../__internal__/fieldset";
 import { filterStyledSystemMarginProps } from "../../../style/utils";
 import { TooltipProvider } from "../../../__internal__/tooltip-provider";
-import FormSpacingProvider from "../../../__internal__/form-spacing-provider";
 import NewValidationContext from "../../carbon-provider/__internal__/new-validation.context";
 import ValidationMessage from "../../../__internal__/validation-message/validation-message.component";
 import Box from "../../box";
@@ -84,9 +83,7 @@ export const CheckboxGroup = ({
       error: !!error,
       warning: !!warning
     }
-  }, /*#__PURE__*/React.createElement(FormSpacingProvider, {
-    marginBottom: undefined
-  }, children))))) : /*#__PURE__*/React.createElement(TooltipProvider, {
+  }, children)))) : /*#__PURE__*/React.createElement(TooltipProvider, {
     tooltipPosition: tooltipPosition
   }, /*#__PURE__*/React.createElement(Fieldset, _extends({
     id: uniqueId,
@@ -114,9 +111,7 @@ export const CheckboxGroup = ({
       warning: !!warning,
       info: !!info
     }
-  }, /*#__PURE__*/React.createElement(FormSpacingProvider, {
-    marginBottom: undefined
-  }, children))))));
+  }, children)))));
 };
 CheckboxGroup.displayName = "CheckboxGroup";
 export default CheckboxGroup;

package/esm/components/checkbox/checkbox.component.js

@@ -8,8 +8,8 @@ import useIsAboveBreakpoint from "../../hooks/__internal__/useIsAboveBreakpoint"
 import { TooltipProvider } from "../../__internal__/tooltip-provider";
 import CheckboxGroupContext from "./checkbox-group/__internal__/checkbox-group.context";
 import Logger from "../../__internal__/utils/logger";
-import useFormSpacing from "../../hooks/__internal__/useFormSpacing";
 import NewValidationContext from "../carbon-provider/__internal__/new-validation.context";
+import { filterStyledSystemMarginProps } from "../../style/utils";
 let deprecateUncontrolledWarnTriggered = false;
 export const Checkbox = /*#__PURE__*/React.forwardRef(({
   "aria-labelledby": ariaLabelledBy,
@@ -97,7 +97,7 @@ export const Checkbox = /*#__PURE__*/React.forwardRef(({
       info: contextInfo || info
     })
   };
-  const marginProps = useFormSpacing(rest);
+  const marginProps = filterStyledSystemMarginProps(rest);
   const componentToRender = /*#__PURE__*/React.createElement(CheckboxStyle, _extends({
     disabled: disabled,
     labelSpacing: labelSpacing,

package/esm/components/checkbox/checkbox.style.js

@@ -9,6 +9,7 @@ import StyledValidationIcon from "../../__internal__/validations/validation-icon
 import baseTheme from "../../style/themes/base";
 import addFocusStyling from "../../style/utils/add-focus-styling";
 const StyledCheckbox = styled.div`
+  margin-bottom: var(--fieldSpacing);
   ${margin}
   ${({
   disabled,

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

@@ -1,6 +1,6 @@
 import { MarginProps } from "styled-system";
-export declare type AlignOptions = "left" | "center" | "right";
-export declare type VariantOptions = "primary" | "secondary";
+export type AlignOptions = "left" | "center" | "right";
+export type VariantOptions = "primary" | "secondary";
 export interface StyledContentProps extends MarginProps {
     /** Aligns the content (left, center or right) */
     align?: AlignOptions;

package/esm/components/date/__internal__/date-picker/date-picker.component.d.ts

@@ -1,6 +1,6 @@
 import React from "react";
 import { DayPickerProps, Modifiers } from "react-day-picker";
-declare type CustomRefObject<T> = {
+type CustomRefObject<T> = {
     current?: T | null;
 };
 export interface PickerProps extends Omit<DayPickerProps, "mode" | "modifiers"> {

package/esm/components/date/__internal__/weekday/weekday.style.js

@@ -10,7 +10,7 @@ const StyledWeekday = styled.th`
     color: var(--colorsActionMinor500);
     text-transform: uppercase;
     font-size: 12px;
-    //font: var(--typographyDatePickerCalendarDayM) font assets to be updated part of FE-4975
+    //font: var(--typographyDatePickerCalendarDayM); font assets to be updated part of FE-4975
     text-align: center;
     padding: 20px 0 5px;
     box-sizing: border-box;

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

@@ -3,14 +3,13 @@ import React, { useContext, useEffect, useMemo, useRef, useState, useCallback }
 import { additionalYears, findMatchedFormatAndValue, formattedValue, formatToISO, isDateValid, parseDate, parseISODate, checkISOFormatAndLength, getSeparator, isValidLocaleDate } from "./__internal__/utils";
 import useLocale from "../../hooks/__internal__/useLocale";
 import Events from "../../__internal__/utils/helpers/events";
-import { filterOutStyledSystemSpacingProps } from "../../style/utils";
+import { filterOutStyledSystemSpacingProps, filterStyledSystemMarginProps } from "../../style/utils";
 import getFormatData from "./__internal__/date-formats";
 import StyledDateInput from "./date.style";
 import Textbox from "../textbox";
 import DatePicker from "./__internal__/date-picker";
 import DateRangeContext from "../date-range/__internal__/date-range.context";
 import useClickAwayListener from "../../hooks/__internal__/useClickAwayListener";
-import useFormSpacing from "../../hooks/__internal__/useFormSpacing";
 import guid from "../../__internal__/utils/helpers/guid";
 import tagComponent from "../../__internal__/utils/helpers/tags/tags";
 export const DateInput = /*#__PURE__*/React.forwardRef(({
@@ -282,7 +281,7 @@ export const DateInput = /*#__PURE__*/React.forwardRef(({
     }
     return value;
   };
-  const marginProps = useFormSpacing(rest);
+  const marginProps = filterStyledSystemMarginProps(rest);
   return /*#__PURE__*/React.createElement(StyledDateInput, _extends({
     ref: wrapperRef,
     role: "presentation",

package/esm/components/date/date.style.js

@@ -12,6 +12,7 @@ const datePickerWidth = {
   small: "120px"
 };
 const StyledDateInput = styled.div`
+  margin-bottom: var(--fieldSpacing);
   ${margin}
 
   & ${StyledInputPresentation} {

package/esm/components/date-range/__internal__/date-range.context.d.ts

@@ -1,10 +1,10 @@
 import React from "react";
-export declare type InputName = "start" | "end";
-declare type IsBlurBlocked = {
+export type InputName = "start" | "end";
+type IsBlurBlocked = {
     current: boolean;
 };
-declare type SetOpen = null | ((value: boolean) => void);
-export declare type SetInputRefMapValue = {
+type SetOpen = null | ((value: boolean) => void);
+export type SetInputRefMapValue = {
     [id in InputName]?: {
         isBlurBlocked: IsBlurBlocked;
         setOpen: SetOpen;

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

@@ -5,6 +5,7 @@ import { StyledLabelContainer } from "../../__internal__/label/label.style";
 import { StyledInputPresentationContainer } from "../../__internal__/input/input-presentation.style";
 import baseTheme from "../../style/themes/base";
 const StyledDateRange = styled.div`
+  margin-bottom: var(--fieldSpacing);
   ${margin}
 
   & ${StyledDateInput} {

package/esm/components/definition-list/__internal__/dl.context.d.ts

@@ -1,5 +1,5 @@
 import React from "react";
-export declare type ElementAlignment = "left" | "center" | "right";
+export type ElementAlignment = "left" | "center" | "right";
 export interface DlContextProps {
     /** Render the DefinitionList as a single column */
     asSingleColumn?: boolean;