carbon-react 106.6.9 → 107.0.0

package/esm/__internal__/focus-trap/focus-trap-utils.js

@@ -1,11 +1,35 @@
 const defaultFocusableSelectors = 'button:not([disabled]), [href], input:not([type="hidden"]):not([disabled]), select:not([disabled]), textarea:not([disabled]), [tabindex]';
 
+const waitForVisibleAndFocus = element => {
+  const INTERVAL = 10;
+  const MAX_TIME = 100;
+  let timeSoFar = 0;
+
+  const stylesMatch = () => {
+    const actualStyles = window.getComputedStyle(element);
+    return actualStyles.visibility === "visible";
+  };
+
+  const check = () => {
+    /* istanbul ignore else */
+    if (stylesMatch()) {
+      element.focus();
+    } else if (timeSoFar < MAX_TIME) {
+      setTimeout(check, INTERVAL);
+      timeSoFar += INTERVAL;
+    } // just "fail" silently if maxTime exceeded - callback will never be called
+
+  };
+
+  check();
+};
+
 function setElementFocus(element) {
   if (typeof element === "function") {
     element();
   } else {
     const el = element.current || element;
-    el.focus();
+    waitForVisibleAndFocus(el);
   }
 }
 

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

@@ -1,10 +1,11 @@
 export default FocusTrap;
-declare function FocusTrap({ children, autoFocus, focusFirstElement, bespokeTrap, wrapperRef, }: {
+declare function FocusTrap({ children, autoFocus, focusFirstElement, bespokeTrap, wrapperRef, isOpen, }: {
     children: any;
     autoFocus?: boolean | undefined;
     focusFirstElement: any;
     bespokeTrap: any;
     wrapperRef: any;
+    isOpen: any;
 }): JSX.Element;
 declare namespace FocusTrap {
     namespace propTypes {
@@ -17,6 +18,7 @@ declare namespace FocusTrap {
         const wrapperRef: PropTypes.Requireable<PropTypes.InferProps<{
             current: PropTypes.Requireable<any>;
         }>>;
+        const isOpen: PropTypes.Requireable<boolean>;
     }
 }
 import PropTypes from "prop-types";

package/esm/__internal__/focus-trap/focus-trap.component.js

@@ -2,22 +2,23 @@ import React, { useCallback, useContext, useEffect, useLayoutEffect, useRef, use
 import PropTypes from "prop-types";
 import { defaultFocusableSelectors, nextNonRadioElementIndex, isRadio, setElementFocus } from "./focus-trap-utils";
 import { ModalContext } from "../../components/modal/modal.component";
+import usePrevious from "../../hooks/__internal__/usePrevious";
 
 const FocusTrap = ({
   children,
   autoFocus = true,
   focusFirstElement,
   bespokeTrap,
-  wrapperRef
+  wrapperRef,
+  isOpen
 }) => {
   const trapRef = useRef(null);
-  const firstOpen = useRef(true);
   const [focusableElements, setFocusableElements] = useState();
   const [firstElement, setFirstElement] = useState();
   const [lastElement, setLastElement] = useState();
   const [currentFocusedElement, setCurrentFocusedElement] = useState();
   const {
-    isAnimationComplete,
+    isAnimationComplete = true,
     triggerRefocusFlag
   } = useContext(ModalContext);
   const hasNewInputs = useCallback(candidate => {
@@ -53,12 +54,13 @@ const FocusTrap = ({
   useLayoutEffect(() => {
     updateFocusableElements();
   }, [children, updateFocusableElements]);
+  const shouldSetFocus = autoFocus && isOpen && isAnimationComplete && (focusFirstElement || (wrapperRef === null || wrapperRef === void 0 ? void 0 : wrapperRef.current));
+  const prevShouldSetFocus = usePrevious(shouldSetFocus);
   useEffect(() => {
-    if (autoFocus && firstOpen.current && isAnimationComplete && (focusFirstElement || firstElement)) {
-      setElementFocus(focusFirstElement || firstElement);
-      firstOpen.current = false;
+    if (shouldSetFocus && !prevShouldSetFocus) {
+      setElementFocus(focusFirstElement || (wrapperRef === null || wrapperRef === void 0 ? void 0 : wrapperRef.current));
     }
-  }, [autoFocus, firstElement, focusFirstElement, isAnimationComplete]);
+  }, [shouldSetFocus, prevShouldSetFocus, focusFirstElement, wrapperRef]);
   useEffect(() => {
     const trapFn = ev => {
       if (bespokeTrap) {
@@ -76,7 +78,7 @@ const FocusTrap = ({
           ev.preventDefault();
         } else if (ev.shiftKey) {
           /* shift + tab */
-          if (activeElement === firstElement) {
+          if (activeElement === firstElement || activeElement === wrapperRef.current) {
             lastElement.focus();
             ev.preventDefault();
           } // If current element is radio button -
@@ -99,7 +101,7 @@ const FocusTrap = ({
     return function cleanup() {
       document.removeEventListener("keydown", trapFn);
     };
-  }, [firstElement, lastElement, focusableElements, bespokeTrap]);
+  }, [firstElement, lastElement, focusableElements, bespokeTrap, wrapperRef]);
   const updateCurrentFocusedElement = useCallback(() => {
     const element = focusableElements === null || focusableElements === void 0 ? void 0 : focusableElements.find(el => el === document.activeElement);
 
@@ -114,22 +116,49 @@ const FocusTrap = ({
     };
   }, [updateCurrentFocusedElement]);
   const refocusTrap = useCallback(() => {
+    var _wrapperRef$current;
+
     /* istanbul ignore else */
     if (currentFocusedElement && !currentFocusedElement.hasAttribute("disabled")) {
       // the trap breaks if it tries to refocus a disabled element
       setElementFocus(currentFocusedElement);
+    } else if (wrapperRef !== null && wrapperRef !== void 0 && (_wrapperRef$current = wrapperRef.current) !== null && _wrapperRef$current !== void 0 && _wrapperRef$current.hasAttribute("tabindex")) {
+      setElementFocus(wrapperRef.current);
     } else if (firstElement) {
       setElementFocus(firstElement);
     }
-  }, [currentFocusedElement, firstElement]);
+  }, [currentFocusedElement, firstElement, wrapperRef]);
   useEffect(() => {
     if (triggerRefocusFlag) {
       refocusTrap();
     }
   }, [triggerRefocusFlag, refocusTrap]);
+  const [tabIndex, setTabIndex] = useState(0);
+  useEffect(() => {
+    // issue in cypress prevents setting tabIndex to -1, instead tabIndex is set to 0 and removed on blur.
+    if (!isOpen) {
+      setTabIndex(0);
+    }
+  }, [isOpen]);
+
+  const onBlur = () => {
+    /* istanbul ignore else */
+    if (isOpen) {
+      setTabIndex(undefined);
+    }
+  };
+
+  const focusProps = {
+    tabIndex,
+    onBlur
+  }; // passes focusProps if no tabindex has been explicitly set on the wrapper
+
+  const clonedChildren = React.Children.map(children, child => {
+    return child.props.tabIndex === undefined ? /*#__PURE__*/React.cloneElement(child, focusProps) : child;
+  });
   return /*#__PURE__*/React.createElement("div", {
     ref: trapRef
-  }, children);
+  }, clonedChildren);
 };
 
 FocusTrap.propTypes = {
@@ -149,6 +178,9 @@ FocusTrap.propTypes = {
   /** a ref to the container wrapping the focusable elements */
   wrapperRef: PropTypes.shape({
     current: PropTypes.any
-  })
+  }),
+
+  /* whether the modal (etc.) component that the focus trap is inside is open or not */
+  isOpen: PropTypes.bool
 };
 export default FocusTrap;

package/esm/components/advanced-color-picker/advanced-color-picker.component.js

@@ -48,17 +48,17 @@ const AdvancedColorPicker = ({
       setSelectedColorRef(selected.ref.current);
     }
   }, [colors, currentColor, dialogOpen, isOpen]);
-  const handleFocus = useCallback((e, firstFocusableElement, lastFocusableElement) => {
+  const handleFocus = useCallback((e, firstFocusableElement) => {
     if (e.key === "Tab") {
       /* istanbul ignore else */
       if (e.shiftKey) {
         /* istanbul ignore else */
-        if (document.activeElement === selectedColorRef) {
-          lastFocusableElement.focus();
+        if (document.activeElement === firstFocusableElement) {
+          selectedColorRef.focus();
           e.preventDefault();
         }
-      } else if (document.activeElement === lastFocusableElement) {
-        selectedColorRef.focus();
+      } else if (document.activeElement === selectedColorRef) {
+        firstFocusableElement.focus();
         e.preventDefault();
       }
     }

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

@@ -3,7 +3,7 @@ import Icon from "../icon";
 declare const StyledBadgeWrapper: import("styled-components").StyledComponent<"div", any, {}, never>;
 declare const StyledCounter: import("styled-components").StyledComponent<"div", any, {}, never>;
 declare const StyledButton: import("styled-components").StyledComponent<{
-    ({ size, subtext, as, children, forwardRef, "aria-label": ariaLabel, disabled, destructive, buttonType: buttonTypeProp, iconType, iconPosition, href, m, px, noWrap, target, rel, iconTooltipMessage, iconTooltipPosition, fullWidth, ...rest }: import("../button").ButtonProps): JSX.Element;
+    ({ size, subtext, children, forwardRef, "aria-label": ariaLabel, disabled, destructive, buttonType: buttonTypeProp, iconType, iconPosition, href, m, px, noWrap, target, rel, iconTooltipMessage, iconTooltipPosition, fullWidth, ...rest }: import("../button").ButtonProps): JSX.Element;
     displayName: string;
 }, any, {}, never>;
 declare const StyledCrossIcon: import("styled-components").StyledComponent<typeof Icon, any, {}, never>;

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

@@ -10,8 +10,6 @@ export interface ButtonProps extends SpaceProps {
      * This is required to comply with WCAG 4.1.2 - Buttons must have discernible text
      */
     "aria-label"?: string;
-    /** [Legacy] Button types for legacy theme: "primary" | "secondary" */
-    as?: ButtonTypes;
     /** Color variants for new business themes: "primary" | "secondary" | "tertiary" | "darkBackground" */
     buttonType?: ButtonTypes;
     /** The text the button displays */
@@ -60,7 +58,7 @@ export interface ButtonProps extends SpaceProps {
     rel?: string;
 }
 declare const Button: {
-    ({ size, subtext, as, children, forwardRef, "aria-label": ariaLabel, disabled, destructive, buttonType: buttonTypeProp, iconType, iconPosition, href, m, px, noWrap, target, rel, iconTooltipMessage, iconTooltipPosition, fullWidth, ...rest }: ButtonProps): JSX.Element;
+    ({ size, subtext, children, forwardRef, "aria-label": ariaLabel, disabled, destructive, buttonType: buttonTypeProp, iconType, iconPosition, href, m, px, noWrap, target, rel, iconTooltipMessage, iconTooltipPosition, fullWidth, ...rest }: ButtonProps): JSX.Element;
     displayName: string;
 };
 declare const ButtonWithForwardRef: React.ForwardRefExoticComponent<ButtonProps & React.RefAttributes<HTMLButtonElement>>;

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

@@ -7,7 +7,6 @@ import Icon from "../icon";
 import StyledButton, { StyledButtonSubtext } from "./button.style";
 import tagComponent from "../../__internal__/utils/helpers/tags/tags";
 import { TooltipProvider } from "../../__internal__/tooltip-provider";
-import Logger from "../../__internal__/utils/logger";
 
 function renderChildren({
   /* eslint-disable react/prop-types */
@@ -74,12 +73,10 @@ renderChildren.propTypes = {
     }
   }
 };
-let deprecatedWarnTriggered = false;
 
 const Button = ({
   size = "medium",
   subtext = "",
-  as,
   children,
   forwardRef,
   "aria-label": ariaLabel,
@@ -99,12 +96,6 @@ const Button = ({
   fullWidth = false,
   ...rest
 }) => {
-  if (!deprecatedWarnTriggered && as) {
-    deprecatedWarnTriggered = true;
-    Logger.deprecate( // eslint-disable-next-line max-len
-    "The `as` prop is deprecated and will soon be removed from the `Button` component interface. You should use the `buttonType` prop to achieve the same styling. The following codemod is available to help with updating your code https://github.com/Sage/carbon-codemod/tree/master/transforms/rename-prop");
-  }
-
   invariant(!!(children || iconType), "Either prop `iconType` must be defined or this node must have children.");
 
   if (subtext) {
@@ -112,7 +103,7 @@ const Button = ({
   }
 
   const [internalRef, setInternalRef] = useState();
-  const buttonType = as || buttonTypeProp;
+  const buttonType = buttonTypeProp;
   let paddingX;
 
   const handleLinkKeyDown = event => {
@@ -182,7 +173,6 @@ const Button = ({
 
 Button.propTypes = {
   "aria-label": PropTypes.string,
-  "as": PropTypes.oneOf(["darkBackground", "dashed", "primary", "secondary", "tertiary"]),
   "buttonType": PropTypes.oneOf(["darkBackground", "dashed", "primary", "secondary", "tertiary"]),
   "children": PropTypes.node,
   "destructive": PropTypes.bool,
@@ -522,7 +512,6 @@ const ButtonWithForwardRef = /*#__PURE__*/React.forwardRef((props, ref) => /*#__
 }, props)));
 ButtonWithForwardRef.propTypes = {
   "aria-label": PropTypes.string,
-  "as": PropTypes.oneOf(["darkBackground", "dashed", "primary", "secondary", "tertiary"]),
   "buttonType": PropTypes.oneOf(["darkBackground", "dashed", "primary", "secondary", "tertiary"]),
   "children": PropTypes.node,
   "destructive": PropTypes.bool,

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

@@ -1,6 +1,6 @@
 import { SpaceProps } from "styled-system";
 import { ButtonProps } from "./button.component";
-declare const StyledButton: import("styled-components").StyledComponent<"button", any, SpaceProps<Required<import("styled-system").Theme<import("styled-system").TLengthStyledSystem>>, string | number | symbol> & Omit<ButtonProps, "as"> & {
+declare const StyledButton: import("styled-components").StyledComponent<"button", any, SpaceProps<Required<import("styled-system").Theme<import("styled-system").TLengthStyledSystem>>, string | number | symbol> & ButtonProps & {
     iconOnly?: boolean | undefined;
 }, never>;
 export declare const StyledButtonSubtext: import("styled-components").StyledComponent<"span", any, {}, never>;

package/esm/components/button-toggle-group/button-toggle-group.component.js

@@ -6,7 +6,7 @@ import styledSystemPropTypes from "@styled-system/prop-types";
 import FormField from "../../__internal__/form-field";
 import ButtonToggleGroupStyle from "./button-toggle-group.style";
 import ButtonToggle from "../button-toggle";
-import RadioButtonMapper from "../radio-button/radio-button-mapper.component";
+import RadioButtonMapper from "../../__internal__/radio-button-mapper/radio-button-mapper.component";
 import ValidationIcon from "../../__internal__/validations/validation-icon.component";
 import { InputGroupBehaviour } from "../../__internal__/input-behaviour";
 import { filterStyledSystemMarginProps } from "../../style/utils";

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

@@ -1,12 +1,11 @@
 export default Confirm;
-declare function Confirm({ "aria-labelledby": ariaLabelledBy, "aria-describedby": ariaDescribedBy, "aria-label": ariaLabel, open, children, destructive, cancelButtonDestructive, confirmButtonDestructive, cancelButtonType, confirmButtonType, cancelButtonIconType, cancelButtonIconPosition, confirmButtonIconType, confirmButtonIconPosition, cancelLabel, onCancel, disableCancel, onConfirm, isLoadingConfirm, disableConfirm, confirmLabel, iconType, subtitle, title, ...rest }: {
+declare function Confirm({ "aria-labelledby": ariaLabelledBy, "aria-describedby": ariaDescribedBy, "aria-label": ariaLabel, open, children, cancelButtonDestructive, confirmButtonDestructive, cancelButtonType, confirmButtonType, cancelButtonIconType, cancelButtonIconPosition, confirmButtonIconType, confirmButtonIconPosition, cancelLabel, onCancel, disableCancel, onConfirm, isLoadingConfirm, disableConfirm, confirmLabel, iconType, subtitle, title, ...rest }: {
     [x: string]: any;
     "aria-labelledby": any;
     "aria-describedby": any;
     "aria-label": any;
     open: any;
     children: any;
-    destructive: any;
     cancelButtonDestructive: any;
     confirmButtonDestructive: any;
     cancelButtonType: any;
@@ -30,7 +29,6 @@ declare namespace Confirm {
     namespace defaultProps {
         const size: string;
         const showCloseIcon: boolean;
-        const destructive: boolean;
         const cancelButtonDestructive: boolean;
         const confirmButtonDestructive: boolean;
         const iconType: null;
@@ -81,8 +79,6 @@ declare namespace Confirm {
         confirmLabel: PropTypes.Requireable<string>;
         /** Customise the cancel button label */
         cancelLabel: PropTypes.Requireable<string>;
-        /** Apply destructive style to the buttons */
-        destructive: PropTypes.Requireable<boolean>;
         /** Apply destructive style to the cancel button */
         cancelButtonDestructive: PropTypes.Requireable<boolean>;
         /** Apply destructive style to the confirm button */

package/esm/components/confirm/confirm.component.js

@@ -3,7 +3,6 @@ function _extends() { _extends = Object.assign || function (target) { for (var i
 import React, { useRef } from "react";
 import PropTypes from "prop-types";
 import createGuid from "../../__internal__/utils/helpers/guid";
-import Logger from "../../__internal__/utils/logger";
 import Heading from "../heading";
 import Dialog from "../dialog";
 import { StyledConfirmButtons, StyledConfirmHeading } from "./confirm.style";
@@ -11,7 +10,6 @@ import Button from "../button/button.component";
 import Icon from "../icon";
 import Loader from "../loader";
 import useLocale from "../../hooks/__internal__/useLocale";
-let deprecatedWarnTriggered = false;
 
 const Confirm = ({
   "aria-labelledby": ariaLabelledBy,
@@ -19,7 +17,6 @@ const Confirm = ({
   "aria-label": ariaLabel,
   open,
   children,
-  destructive,
   cancelButtonDestructive,
   confirmButtonDestructive,
   cancelButtonType,
@@ -40,11 +37,6 @@ const Confirm = ({
   title,
   ...rest
 }) => {
-  if (!deprecatedWarnTriggered && destructive) {
-    deprecatedWarnTriggered = true;
-    Logger.deprecate("`destructive` prop is deprecated and will soon be removed. Please use `cancelButtonDestructive` and `confirmButtonDestructive` props.");
-  }
-
   const l = useLocale();
   const {
     current: titleId
@@ -72,7 +64,7 @@ const Confirm = ({
       onClick: onCancel,
       "data-element": "cancel",
       buttonType: cancelButtonType,
-      destructive: destructive || cancelButtonDestructive,
+      destructive: cancelButtonDestructive,
       disabled: disableCancel,
       iconType: cancelButtonIconType,
       iconPosition: cancelButtonIconPosition
@@ -83,7 +75,7 @@ const Confirm = ({
     onClick: onConfirm,
     "data-element": "confirm",
     buttonType: confirmButtonType,
-    destructive: destructive || confirmButtonDestructive,
+    destructive: confirmButtonDestructive,
     disabled: isLoadingConfirm || disableConfirm,
     ml: 2,
     iconType: confirmButtonIconType,
@@ -127,7 +119,6 @@ const Confirm = ({
 Confirm.defaultProps = {
   size: "extra-small",
   showCloseIcon: false,
-  destructive: false,
   cancelButtonDestructive: false,
   confirmButtonDestructive: false,
   iconType: null,
@@ -195,9 +186,6 @@ Confirm.propTypes = {
   /** Customise the cancel button label */
   cancelLabel: PropTypes.string,
 
-  /** Apply destructive style to the buttons */
-  destructive: PropTypes.bool,
-
   /** Apply destructive style to the cancel button */
   cancelButtonDestructive: PropTypes.bool,
 

package/esm/components/confirm/confirm.d.ts

@@ -21,8 +21,6 @@ export interface ConfirmProps extends DialogProps {
   cancelLabel?: string;
   /** Customise the confirm button label */
   confirmLabel?: string;
-  /** Apply destructive style to the buttons */
-  destructive?: boolean;
   /** Apply destructive style to the cancel button */
   cancelButtonDestructive?: boolean;
   /** Apply destructive style to the confirm button */

package/esm/components/date/__internal__/date-picker/date-picker.component.js

@@ -17,7 +17,8 @@ const DatePicker = /*#__PURE__*/React.forwardRef(({
   disablePortal,
   onDayClick,
   pickerMouseDown,
-  pickerProps
+  pickerProps,
+  open
 }, ref) => {
   const l = useLocale();
   const {
@@ -27,22 +28,27 @@ const DatePicker = /*#__PURE__*/React.forwardRef(({
   const {
     weekStartsOn
   } = options;
-  const monthsLong = Array.from({
+  const monthsLong = useMemo(() => Array.from({
     length: 12
-  }).map((_, i) => localize.month(i));
-  const monthsShort = Array.from({
+  }).map((_, i) => {
+    const month = localize.month(i);
+    return month[0].toUpperCase() + month.slice(1);
+  }), [localize]);
+  const monthsShort = useMemo(() => Array.from({
     length: 12
   }).map((_, i) => localize.month(i, {
     width: "abbreviated"
-  }).substring(0, 3));
-  const weekdaysLong = Array.from({
+  }).substring(0, 3)), [localize]);
+  const weekdaysLong = useMemo(() => Array.from({
     length: 7
-  }).map((_, i) => localize.day(i));
-  const weekdaysShort = Array.from({
+  }).map((_, i) => localize.day(i)), [localize]);
+  const weekdaysShort = useMemo(() => Array.from({
     length: 7
-  }).map((_, i) => localize.day(i, l.locale() === "de" ? {} : {
+  }).map((_, i) => localize.day(i, ["de", "pl"].filter(str => l.locale().includes(str)).length ? {
+    width: "wide"
+  } : {
     width: "abbreviated"
-  }).substring(0, 3));
+  }).substring(0, 3)), [l, localize]);
   const popoverModifiers = useMemo(() => [{
     name: "offset",
     options: {
@@ -65,6 +71,10 @@ const DatePicker = /*#__PURE__*/React.forwardRef(({
 
   const formatDay = date => `${weekdaysShort[date.getDay()]} ${date.getDate()} ${monthsShort[date.getMonth()]} ${date.getFullYear()}`;
 
+  if (!open) {
+    return null;
+  }
+
   return /*#__PURE__*/React.createElement(Popover, {
     placement: "bottom-start",
     reference: inputElement,
@@ -125,6 +135,9 @@ DatePicker.propTypes = {
   pickerProps: PropTypes.object,
 
   /** Callback to handle mousedown event on picker */
-  pickerMouseDown: PropTypes.func
+  pickerMouseDown: PropTypes.func,
+
+  /** Sets whether the picker should be displayed */
+  open: PropTypes.bool
 };
 export default DatePicker;

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

@@ -16,6 +16,8 @@ export interface DatePickerProps extends Pick<DayPickerProps, "onDayClick"> {
   selectedDays?: Date;
   /** Callback to handle mousedown event on picker container */
   pickerMouseDown?: () => void;
+  /** Sets whether the picker should be displayed */
+  open?: boolean;
 }
 
 declare function DatePicker(

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

@@ -310,7 +310,7 @@ const DateInput = ({
     size: size,
     disabled: disabled,
     readOnly: readOnly
-  })), open && /*#__PURE__*/React.createElement(DatePicker, {
+  })), /*#__PURE__*/React.createElement(DatePicker, {
     disablePortal: disablePortal,
     inputElement: parentRef,
     pickerProps: pickerProps,
@@ -320,7 +320,8 @@ const DateInput = ({
     minDate: minDate,
     maxDate: maxDate,
     ref: pickerRef,
-    pickerMouseDown: handlePickerMouseDown
+    pickerMouseDown: handlePickerMouseDown,
+    open: open
   }));
 };
 

package/esm/components/dialog/dialog.component.js

@@ -155,7 +155,8 @@ const Dialog = ({
     autoFocus: !disableAutoFocus,
     focusFirstElement: focusFirstElement,
     bespokeTrap: bespokeFocusTrap,
-    wrapperRef: dialogRef
+    wrapperRef: dialogRef,
+    isOpen: open
   }, /*#__PURE__*/React.createElement(DialogStyle, _extends({
     "aria-modal": true,
     ref: dialogRef,
@@ -165,9 +166,9 @@ const Dialog = ({
     "data-element": "dialog",
     "data-role": rest["data-role"],
     role: role
-  }, contentPadding), dialogTitle(), /*#__PURE__*/React.createElement(DialogContentStyle, contentPadding, /*#__PURE__*/React.createElement(DialogInnerContentStyle, _extends({
+  }, contentPadding), dialogTitle(), closeIcon(), /*#__PURE__*/React.createElement(DialogContentStyle, contentPadding, /*#__PURE__*/React.createElement(DialogInnerContentStyle, _extends({
     ref: innerContentRef
-  }, contentPadding), children)), closeIcon())));
+  }, contentPadding), children)))));
 };
 
 Dialog.propTypes = {

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

@@ -80,15 +80,9 @@ const StyledContent = styled.div`
 
   ${({
   hasHeader
-}) => !hasHeader && `
-    padding-top: 0;
-    margin-top: -25px;
-
-    .carbon-app-wrapper {
-      max-width: 100%;
-      padding: 0;
-      height: 70px;
-    }
-  `}
+}) => !hasHeader && css`
+      padding-top: 0;
+      margin-top: -25px;
+    `}
 `;
 export default StyledContent;

package/esm/components/dialog-full-screen/dialog-full-screen.component.js

@@ -85,7 +85,8 @@ const DialogFullScreen = ({
   }, componentTags), /*#__PURE__*/React.createElement(FocusTrap, {
     autoFocus: !disableAutoFocus,
     focusFirstElement: focusFirstElement,
-    wrapperRef: dialogRef
+    wrapperRef: dialogRef,
+    isOpen: open
   }, /*#__PURE__*/React.createElement(StyledDialogFullScreen, _extends({
     "aria-modal": role === "dialog" ? true : undefined
   }, ariaProps, {
@@ -93,12 +94,12 @@ const DialogFullScreen = ({
     "data-element": "dialog-full-screen",
     pagesStyling: pagesStyling,
     role: role
-  }), dialogTitle(), /*#__PURE__*/React.createElement(StyledContent, {
+  }), dialogTitle(), closeIcon(), /*#__PURE__*/React.createElement(StyledContent, {
     hasHeader: title !== undefined,
     "data-element": "content",
     ref: contentRef,
     disableContentPadding: disableContentPadding
-  }, children), closeIcon())));
+  }, children))));
 };
 
 DialogFullScreen.defaultProps = {