carbon-react 143.2.5 → 144.0.1

package/lib/components/dialog/dialog.component.js

@@ -10,9 +10,7 @@ var _guid = _interopRequireDefault(require("../../__internal__/utils/helpers/gui
 var _modal = _interopRequireDefault(require("../modal"));
 var _heading = _interopRequireDefault(require("../heading"));
 var _tags = _interopRequireDefault(require("../../__internal__/utils/helpers/tags"));
-var _useResizeObserver = _interopRequireDefault(require("../../hooks/__internal__/useResizeObserver"));
 var _dialog = require("./dialog.style");
-var _dialog2 = require("./dialog.config");
 var _focusTrap = _interopRequireDefault(require("../../__internal__/focus-trap"));
 var _iconButton = _interopRequireDefault(require("../icon-button"));
 var _icon = _interopRequireDefault(require("../icon"));
@@ -53,11 +51,7 @@ const Dialog = exports.Dialog = /*#__PURE__*/(0, _react.forwardRef)(({
 }, ref) => {
   const locale = (0, _useLocale.default)();
   const containerRef = (0, _react.useRef)(null);
-  const innerContentRef = (0, _react.useRef)(null);
   const titleRef = (0, _react.useRef)(null);
-  const [breakpointOffset, setBreakpointOffset] = (0, _react.useState)(undefined);
-  const isDialogMaximised = size === "maximise";
-  const listenersAdded = (0, _react.useRef)(false);
   const {
     current: titleId
   } = (0, _react.useRef)((0, _guid.default)());
@@ -70,93 +64,29 @@ const Dialog = exports.Dialog = /*#__PURE__*/(0, _react.forwardRef)(({
       containerRef.current?.focus();
     }
   }), []);
-  const centerDialog = (0, _react.useCallback)(() => {
-    /* istanbul ignore if */
-    if (!containerRef.current) {
-      return;
-    }
-    const {
-      width: dialogWidth,
-      height: dialogHeight
-    } = containerRef.current.getBoundingClientRect();
-    let midPointY = window.innerHeight / 2;
-    let midPointX = window.innerWidth / 2;
-    midPointY -= dialogHeight / 2;
-    midPointX -= dialogWidth / 2;
-    if (midPointY < _dialog2.TOP_MARGIN) {
-      midPointY = _dialog2.TOP_MARGIN;
-    }
-    if (midPointX < 0) {
-      midPointX = 0;
-    }
-    if (isDialogMaximised) {
-      const breakPoint = window.innerWidth > 960 ? 32 : 16;
-      midPointX = breakPoint;
-      midPointY = breakPoint;
-      setBreakpointOffset(breakPoint);
-    }
-    containerRef.current.style.top = `${midPointY}px`;
-    containerRef.current.style.left = `${midPointX}px`;
-  }, [size]);
-  (0, _useResizeObserver.default)(innerContentRef, centerDialog, !open);
-  const addListeners = (0, _react.useCallback)(() => {
-    /* istanbul ignore else */
-    if (!listenersAdded.current) {
-      window.addEventListener("resize", centerDialog);
-      listenersAdded.current = true;
-    }
-  }, [centerDialog]);
-  const removeListeners = (0, _react.useCallback)(() => {
-    if (listenersAdded.current) {
-      window.removeEventListener("resize", centerDialog);
-      listenersAdded.current = false;
-    }
-  }, [centerDialog]);
-  (0, _react.useEffect)(() => {
-    if (open) {
-      addListeners();
-    }
-    if (!open) {
-      removeListeners();
-    }
-    return () => {
-      removeListeners();
-    };
-  }, [open, addListeners, removeListeners]);
-  (0, _react.useLayoutEffect)(() => {
-    if (open) {
-      centerDialog();
-    }
-  }, [centerDialog, open, height]);
-  const closeIcon = () => {
-    if (!showCloseIcon || !onCancel) return null;
-    return /*#__PURE__*/_react.default.createElement(_iconButton.default, _extends({
-      "aria-label": locale.dialog.ariaLabels.close(),
-      onClick: onCancel,
-      disabled: disableClose
-    }, (0, _tags.default)("close", {
-      "data-element": "close",
-      ...closeButtonDataProps
-    })), /*#__PURE__*/_react.default.createElement(_icon.default, {
-      type: "close"
-    }));
-  };
-  const dialogTitle = () => {
-    if (!title) return null;
-    return /*#__PURE__*/_react.default.createElement(_dialog.StyledDialogTitle, {
-      showCloseIcon: showCloseIcon,
-      hasSubtitle: !!subtitle,
-      ref: titleRef
-    }, typeof title === "string" ? /*#__PURE__*/_react.default.createElement(_heading.default, {
-      "data-element": "dialog-title",
-      title: title,
-      titleId: titleId,
-      subheader: subtitle,
-      subtitleId: subtitleId,
-      divider: false,
-      help: help
-    }) : title);
-  };
+  const closeIcon = showCloseIcon && onCancel && /*#__PURE__*/_react.default.createElement(_iconButton.default, _extends({
+    "aria-label": locale.dialog.ariaLabels.close(),
+    onClick: onCancel,
+    disabled: disableClose
+  }, (0, _tags.default)("close", {
+    "data-element": "close",
+    ...closeButtonDataProps
+  })), /*#__PURE__*/_react.default.createElement(_icon.default, {
+    type: "close"
+  }));
+  const dialogTitle = title && /*#__PURE__*/_react.default.createElement(_dialog.StyledDialogTitle, {
+    showCloseIcon: showCloseIcon,
+    hasSubtitle: !!subtitle,
+    ref: titleRef
+  }, typeof title === "string" ? /*#__PURE__*/_react.default.createElement(_heading.default, {
+    "data-element": "dialog-title",
+    title: title,
+    titleId: titleId,
+    subheader: subtitle,
+    subtitleId: subtitleId,
+    divider: false,
+    help: help
+  }) : title);
   let dialogHeight = height;
   if (height && height.match(/px$/)) {
     dialogHeight = height.replace("px", "");
@@ -183,25 +113,21 @@ const Dialog = exports.Dialog = /*#__PURE__*/(0, _react.forwardRef)(({
     wrapperRef: containerRef,
     isOpen: open,
     additionalWrapperRefs: focusableContainers
-  }, /*#__PURE__*/_react.default.createElement(_dialog.StyledDialog, _extends({
+  }, /*#__PURE__*/_react.default.createElement(_dialog.DialogPositioner, null, /*#__PURE__*/_react.default.createElement(_dialog.StyledDialog, _extends({
     "data-component": dataComponent,
     "data-element": dataElement,
     "data-role": dataRole,
     "aria-modal": isTopModal ? true : undefined,
-    ref: containerRef,
-    topMargin: isDialogMaximised && breakpointOffset ? breakpointOffset * 2 : _dialog2.TOP_MARGIN
+    ref: containerRef
   }, dialogProps, {
     role: role,
     tabIndex: -1
   }, contentPadding, {
     backgroundColor: greyBackground ? "var(--colorsUtilityMajor025)" : "var(--colorsUtilityYang100)"
-  }), dialogTitle(), closeIcon(), /*#__PURE__*/_react.default.createElement(_dialog.StyledDialogContent, _extends({}, contentPadding, {
+  }), dialogTitle, closeIcon, /*#__PURE__*/_react.default.createElement(_dialog.StyledDialogContent, _extends({}, contentPadding, {
     "data-role": "dialog-content",
     tabIndex: -1
-  }), /*#__PURE__*/_react.default.createElement(_dialog.StyledDialogInnerContent, _extends({
-    "data-role": "dialog-inner-content",
-    ref: innerContentRef
-  }, contentPadding), children)))));
+  }), children)))));
 });
 if (process.env.NODE_ENV !== "production") {
   Dialog.propTypes = {

package/lib/components/dialog/dialog.config.d.ts

@@ -1,6 +1,2 @@
 export declare const DIALOG_SIZES: readonly ["auto", "extra-small", "small", "medium-small", "medium", "medium-large", "large", "extra-large", "maximise"];
-export declare const TOP_MARGIN = 20;
-export declare const CONTENT_TOP_PADDING = 24;
-export declare const HORIZONTAL_PADDING = 32;
-export declare const CONTENT_BOTTOM_PADDING = 30;
 export declare type DialogSizes = typeof DIALOG_SIZES[number];

package/lib/components/dialog/dialog.config.js

@@ -3,9 +3,5 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.TOP_MARGIN = exports.HORIZONTAL_PADDING = exports.DIALOG_SIZES = exports.CONTENT_TOP_PADDING = exports.CONTENT_BOTTOM_PADDING = void 0;
-const DIALOG_SIZES = exports.DIALOG_SIZES = ["auto", "extra-small", "small", "medium-small", "medium", "medium-large", "large", "extra-large", "maximise"];
-const TOP_MARGIN = exports.TOP_MARGIN = 20;
-const CONTENT_TOP_PADDING = exports.CONTENT_TOP_PADDING = 24;
-const HORIZONTAL_PADDING = exports.HORIZONTAL_PADDING = 32;
-const CONTENT_BOTTOM_PADDING = exports.CONTENT_BOTTOM_PADDING = 30;
+exports.DIALOG_SIZES = void 0;
+const DIALOG_SIZES = exports.DIALOG_SIZES = ["auto", "extra-small", "small", "medium-small", "medium", "medium-large", "large", "extra-large", "maximise"];

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

@@ -1,21 +1,13 @@
-import { DialogSizes } from "./dialog.config";
-import { ContentPaddingInterface } from "./dialog.component";
-declare type StyledDialogProps = {
-    topMargin: number;
-    size?: DialogSizes;
-    dialogHeight?: string;
+import { ContentPaddingInterface, DialogProps } from "./dialog.component";
+declare const DialogPositioner: import("styled-components").StyledComponent<"div", any, {}, never>;
+declare const StyledDialog: import("styled-components").StyledComponent<"div", any, Required<Pick<DialogProps, "size">> & {
+    dialogHeight?: string | undefined;
     backgroundColor: string;
-};
-declare const StyledDialog: import("styled-components").StyledComponent<"div", any, {
-    isDialogMaximised: boolean;
-    isDialogMaximisedSmallViewport: boolean;
-    isDialogMaximisedLargeViewport: boolean;
-} & StyledDialogProps & ContentPaddingInterface, "isDialogMaximised" | "isDialogMaximisedSmallViewport" | "isDialogMaximisedLargeViewport">;
+} & ContentPaddingInterface, never>;
 declare type StyledDialogTitleProps = {
     showCloseIcon?: boolean;
     hasSubtitle?: boolean;
 };
 declare const StyledDialogTitle: import("styled-components").StyledComponent<"div", any, StyledDialogTitleProps, never>;
 declare const StyledDialogContent: import("styled-components").StyledComponent<"div", any, ContentPaddingInterface, never>;
-declare const StyledDialogInnerContent: import("styled-components").StyledComponent<"div", any, ContentPaddingInterface, never>;
-export { StyledDialog, StyledDialogTitle, StyledDialogContent, StyledDialogInnerContent, };
+export { DialogPositioner, StyledDialog, StyledDialogTitle, StyledDialogContent, };

package/lib/components/dialog/dialog.style.js

@@ -3,15 +3,13 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.StyledDialogTitle = exports.StyledDialogInnerContent = exports.StyledDialogContent = exports.StyledDialog = void 0;
+exports.StyledDialogTitle = exports.StyledDialogContent = exports.StyledDialog = exports.DialogPositioner = void 0;
 var _styledComponents = _interopRequireWildcard(require("styled-components"));
 var _styledSystem = require("styled-system");
 var _base = _interopRequireDefault(require("../../style/themes/base"));
-var _formStyleUtils = require("../../style/utils/form-style-utils");
-var _form = require("../form/form.style");
 var _heading = require("../heading/heading.style");
 var _iconButton = _interopRequireDefault(require("../icon-button/icon-button.style"));
-var _dialog = require("./dialog.config");
+var _form = require("../form/form.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; }
@@ -25,38 +23,38 @@ const dialogSizes = {
   large: "960px",
   "extra-large": "1080px"
 };
-const calculatePaddingTopInnerContent = ({
-  py,
-  p
-}) => [py, p].some(padding => padding !== undefined) ? 0 : `${_dialog.CONTENT_TOP_PADDING}px`;
-const StyledDialog = exports.StyledDialog = _styledComponents.default.div.attrs(({
-  topMargin,
-  size
-}) => {
-  const isDialogMaximised = size === "maximise";
-  const isDialogMaximisedSmallViewport = topMargin === 32;
-  const isDialogMaximisedLargeViewport = topMargin === 64;
-  return {
-    isDialogMaximised,
-    isDialogMaximisedSmallViewport,
-    isDialogMaximisedLargeViewport
-  };
-})`
-  box-shadow: var(--boxShadow300);
-  display: flex;
-  flex-direction: column;
-  border-radius: var(--borderRadius200);
+const DialogPositioner = exports.DialogPositioner = _styledComponents.default.div`
   position: fixed;
-  top: 50%;
+  inset: 0;
+  display: flex;
+  justify-content: center;
+  align-items: center;
   z-index: ${({
   theme
 }) => theme.zIndex.modal};
-  max-height: ${({
-  topMargin
-}) => `calc(100vh - ${topMargin}px)`};
+`;
+const StyledDialog = exports.StyledDialog = _styledComponents.default.div`
+  box-shadow: var(--boxShadow300);
+  display: flex;
+  flex-direction: column;
+  position: relative;
+  border-radius: var(--borderRadius200);
+
   ${({
-  isDialogMaximised
-}) => isDialogMaximised && "height: 100%"};
+  size
+}) => size === "maximise" ? (0, _styledComponents.css)`
+          height: calc(100% - var(--spacing400));
+          width: calc(100% - var(--spacing400));
+
+          @media screen and (min-width: 960px) {
+            height: calc(100% - var(--spacing800));
+            width: calc(100% - var(--spacing800));
+          }
+        ` : (0, _styledComponents.css)`
+          max-height: 90vh;
+          max-width: ${dialogSizes[size]};
+          width: 100%;
+        `};
 
   &:focus {
     outline: none;
@@ -68,46 +66,12 @@ const StyledDialog = exports.StyledDialog = _styledComponents.default.div.attrs(
       background-color: ${backgroundColor};
     `}
 
-  ${({
-  size,
-  topMargin
-}) => size && (0, _styledComponents.css)`
-      max-width: ${size === "maximise" ? `calc(100vw - ${topMargin}px)` : dialogSizes[size]};
-      width: 100%;
-    `}
-
   ${({
   dialogHeight
 }) => dialogHeight && (0, _styledComponents.css)`
       height: ${dialogHeight}px;
     `}
-
-  /* We're overriding the max-height on the form content to account for a larger height when in a smaller viewport.
-  TODO: Remove this upon the completion of FE-6643. */
-  ${_form.StyledForm} {
-    ${({
-  isDialogMaximised,
-  isDialogMaximisedSmallViewport
-}) => isDialogMaximised && (0, _styledComponents.css)`
-        ${isDialogMaximisedSmallViewport && "max-height: calc(100vh - 184px);"}
-        height: 100%;
-      `}
-
-    padding-bottom: 0px;
-    box-sizing: border-box;
-  }
-
-  ${_form.StyledFormContent}.sticky {
-    ${props => (0, _formStyleUtils.calculateFormSpacingValues)(props, true)}
-  }
-
-  ${_form.StyledFormFooter}.sticky {
-    ${_formStyleUtils.calculateWidthValue}
-    ${props => (0, _formStyleUtils.calculateFormSpacingValues)(props, false)}
-    border-bottom-right-radius: var(--borderRadius200);
-    border-bottom-left-radius: var(--borderRadius200);
-  }
-
+  
   > ${_iconButton.default} {
     margin: 0;
     position: absolute;
@@ -122,7 +86,7 @@ const StyledDialog = exports.StyledDialog = _styledComponents.default.div.attrs(
 `;
 const StyledDialogTitle = exports.StyledDialogTitle = _styledComponents.default.div`
   background-color: var(--colorsUtilityYang100);
-  padding: 23px ${_dialog.HORIZONTAL_PADDING}px 0;
+  padding: 23px 32px 0;
   border-bottom: 1px solid #ccd6db;
   border-top-right-radius: var(--borderRadius200);
   border-top-left-radius: var(--borderRadius200);
@@ -150,26 +114,33 @@ const StyledDialogTitle = exports.StyledDialogTitle = _styledComponents.default.
 `;
 const StyledDialogContent = exports.StyledDialogContent = _styledComponents.default.div`
   box-sizing: border-box;
-  display: flex;
-  flex-direction: column;
+  display: block;
   overflow-y: auto;
-
-  /* Delegate handling overflow to child form if it has a sticky footer */
-  &:has(${_form.StyledFormContent}.sticky) {
-    overflow-y: inherit;
-  }
-
   width: 100%;
-  flex: 1;
-  padding: 0px ${_dialog.HORIZONTAL_PADDING}px ${_dialog.CONTENT_BOTTOM_PADDING}px;
+  flex-grow: 1;
+
+  padding: 24px 32px 30px;
   ${_styledSystem.padding}
+
+  &:has(${_form.StyledForm}.sticky) {
+    display: flex;
+    flex-direction: column;
+    padding: 0;
+
+    ${_form.StyledForm}.sticky {
+      ${_form.StyledFormContent} {
+        padding: 24px 32px 30px;
+        ${_styledSystem.padding}
+      }
+
+      ${_form.StyledFormFooter} {
+        border-bottom-right-radius: var(--borderRadius200);
+        border-bottom-left-radius: var(--borderRadius200);
+      }
+    }
+  }
 `;
-const StyledDialogInnerContent = exports.StyledDialogInnerContent = _styledComponents.default.div`
-  position: relative;
-  flex: 1;
-  padding-top: ${calculatePaddingTopInnerContent};
-`;
-StyledDialog.defaultProps = {
+DialogPositioner.defaultProps = {
   theme: _base.default
 };
 StyledDialogContent.defaultProps = {

package/lib/components/dialog-full-screen/content.style.js

@@ -8,88 +8,46 @@ var _styledComponents = _interopRequireWildcard(require("styled-components"));
 var _form = require("../form/form.style");
 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; }
+function computePadding() {
+  return (0, _styledComponents.css)`
+    padding: 0 16px;
+    @media screen and (min-width: 600px) {
+      padding: 0 24px;
+    }
+    @media screen and (min-width: 960px) {
+      padding: 0 32px;
+    }
+    @media screen and (min-width: 1260px) {
+      padding: 0 40px;
+    }
+  `;
+}
 const StyledContent = _styledComponents.default.div`
+  box-sizing: border-box;
+  display: block;
   overflow-y: auto;
-  padding: 0 16px;
-  flex: 1;
 
-  /* Delegate handling overflow to child form if it has a sticky footer */
-  &:has(${_form.StyledFormContent}.sticky) {
-    overflow-y: inherit;
-  }
+  flex: 1;
+  width: 100%;
 
   ${({
   disableContentPadding
-}) => (0, _styledComponents.css)`
-    ${!disableContentPadding && (0, _styledComponents.css)`
-      @media screen and (min-width: 600px) {
-        padding: 0 24px;
-      }
-      @media screen and (min-width: 960px) {
-        padding: 0 32px;
-      }
-      @media screen and (min-width: 1260px) {
-        padding: 0 40px;
-      }
+}) => disableContentPadding ? "padding: 0" : computePadding()}
 
-      ${_form.StyledFormContent}.sticky {
-        padding-right: 16px;
-        padding-left: 16px;
-        margin-right: -16px;
-        margin-left: -16px;
-
-        @media screen and (min-width: 600px) {
-          padding-right: 24px;
-          padding-left: 24px;
-          margin-right: -24px;
-          margin-left: -24px;
-        }
-        @media screen and (min-width: 960px) {
-          padding-right: 32px;
-          padding-left: 32px;
-          margin-right: -32px;
-          margin-left: -32px;
-        }
-        @media screen and (min-width: 1260px) {
-          padding-right: 40px;
-          padding-left: 40px;
-          margin-right: -40px;
-          margin-left: -40px;
-        }
-      }
+  &:has(${_form.StyledForm}.sticky) {
+    display: flex;
+    flex-direction: column;
+    overflow-y: hidden;
+    padding: 0;
 
-      ${_form.StyledFormFooter}.sticky {
-        padding: 16px;
-
-        margin-right: -16px;
-        margin-left: -16px;
-        width: calc(100% + 32px);
-
-        @media screen and (min-width: 600px) {
-          padding: 16px 24px;
-          margin-right: -24px;
-          margin-left: -24px;
-          width: calc(100% + 48px);
-        }
-        @media screen and (min-width: 960px) {
-          padding: 16px 32px;
-          margin-right: -32px;
-          margin-left: -32px;
-          width: calc(100% + 64px);
-        }
-        @media screen and (min-width: 1260px) {
-          padding: 16px 40px;
-          margin-right: -40px;
-          margin-left: -40px;
-          width: calc(100% + 80px);
-        }
+    ${_form.StyledForm}.sticky {
+      ${_form.StyledFormContent} {
+        ${({
+  disableContentPadding
+}) => disableContentPadding ? "padding: 0" : computePadding()}
       }
-    `}
-
-    ${disableContentPadding && (0, _styledComponents.css)`
-      padding: 0;
-    `}
-  `}
+    }
+  }
 
   ${({
   hasHeader

package/lib/components/dialog-full-screen/dialog-full-screen.style.js

@@ -10,7 +10,6 @@ var _content = _interopRequireDefault(require("./content.style"));
 var _iconButton = _interopRequireDefault(require("../icon-button/icon-button.style"));
 var _fullScreenHeading = _interopRequireDefault(require("../../__internal__/full-screen-heading/full-screen-heading.style"));
 var _heading = require("../heading/heading.style");
-var _form = require("../form/form.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; }
@@ -31,10 +30,6 @@ const StyledDialogFullScreen = _styledComponents.default.div`
   display: flex;
   flex-direction: column;
 
-  ${_form.StyledForm} {
-    min-height: 100%;
-  }
-
   ${_heading.StyledHeaderContent} {
     align-items: baseline;
   }

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

@@ -6,12 +6,11 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = exports.Form = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
-var _sidebar = _interopRequireDefault(require("../sidebar/__internal__/sidebar.context"));
-var _modal = _interopRequireDefault(require("../modal/__internal__/modal.context"));
 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); }
 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; }
@@ -33,45 +32,37 @@ const Form = ({
   footerPadding = {},
   ...rest
 }) => {
-  const {
-    isInSidebar
-  } = (0, _react.useContext)(_sidebar.default);
+  const formRef = (0, _react.useRef)(null);
+  const formFooterRef = (0, _react.useRef)(null);
   const {
     isInModal
   } = (0, _react.useContext)(_modal.default);
-  const formRef = (0, _react.useRef)(null);
-  const formFooterRef = (0, _react.useRef)(null);
-  const hasPadding = !!Object.keys(footerPadding).length;
   const renderFooter = !!(saveButton || leftSideButtons || rightSideButtons || errorCount || warningCount);
-  const classNames = `${stickyFooter ? "sticky" : ""} ${hasPadding ? "padded" : ""}`.trimEnd();
   return /*#__PURE__*/_react.default.createElement(_form.StyledForm, _extends({
     ref: formRef,
+    className: stickyFooter ? "sticky" : "",
     stickyFooter: stickyFooter,
     onSubmit: onSubmit,
     "data-component": "form",
     fieldSpacing: fieldSpacing,
     noValidate: noValidate,
-    isInSidebar: isInSidebar,
     height: height,
     isInModal: isInModal
   }, rest), /*#__PURE__*/_react.default.createElement(_form.StyledFormContent, {
     "data-element": "form-content",
     "data-role": "form-content",
-    className: stickyFooter ? "sticky" : "",
     stickyFooter: stickyFooter,
-    isInModal: isInModal,
-    tabIndex: -1
+    tabIndex: -1,
+    isInModal: isInModal
   }, /*#__PURE__*/_react.default.createElement(_formSpacingProvider.default, {
     marginBottom: _form2.formSpacing[fieldSpacing]
   }, children)), renderFooter && /*#__PURE__*/_react.default.createElement(_form.StyledFormFooter, _extends({
     "data-element": "form-footer",
     "data-role": "form-footer",
-    className: classNames,
     ref: formFooterRef,
     stickyFooter: stickyFooter,
     buttonAlignment: buttonAlignment,
-    fullWidthButtons: fullWidthButtons,
-    isInModal: isInModal
+    fullWidthButtons: fullWidthButtons
   }, footerPadding), leftSideButtons && /*#__PURE__*/_react.default.createElement(_form.StyledLeftButtons, {
     "data-role": "form-left-buttons",
     buttonAlignment: buttonAlignment

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

@@ -4,17 +4,21 @@ interface StyledFormContentProps {
     isInModal?: boolean;
 }
 export declare const StyledFormContent: import("styled-components").StyledComponent<"div", any, StyledFormContentProps, never>;
-interface ButtonProps extends StyledFormContentProps {
-    buttonAlignment?: FormButtonAlignment;
+interface StyledFormFooterProps {
+    stickyFooter?: boolean;
     fullWidthButtons?: boolean;
+    buttonAlignment?: FormButtonAlignment;
 }
-export declare const StyledFormFooter: import("styled-components").StyledComponent<"div", any, ButtonProps, never>;
+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;
-    isInSidebar?: boolean;
 }
 export declare const StyledForm: import("styled-components").StyledComponent<"form", any, StyledFormProps, never>;
-export declare const StyledRightButtons: import("styled-components").StyledComponent<"div", any, ButtonProps, never>;
-export declare const StyledLeftButtons: import("styled-components").StyledComponent<"div", any, ButtonProps, never>;
+export declare const StyledRightButtons: import("styled-components").StyledComponent<"div", any, {
+    buttonAlignment?: "left" | "right" | undefined;
+}, never>;
+export declare const StyledLeftButtons: import("styled-components").StyledComponent<"div", any, {
+    buttonAlignment?: "left" | "right" | undefined;
+}, never>;
 export {};