@carbon/react 1.7.0 → 1.9.0-rc.0

package/es/components/Notification/Notification.js

@@ -5,34 +5,66 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import { objectWithoutProperties as _objectWithoutProperties, extends as _extends, defineProperty as _defineProperty, slicedToArray as _slicedToArray } from '../../_virtual/_rollupPluginBabelHelpers.js';
+import { objectWithoutProperties as _objectWithoutProperties, defineProperty as _defineProperty, extends as _extends, slicedToArray as _slicedToArray } from '../../_virtual/_rollupPluginBabelHelpers.js';
 import PropTypes from 'prop-types';
 import React__default, { useState, useRef, useEffect } from 'react';
 import cx from 'classnames';
 import { Close, WarningAltFilled, InformationFilled, InformationSquareFilled, ErrorFilled, CheckmarkFilled, WarningFilled } from '@carbon/icons-react';
 import Button from '../Button/Button.js';
+import useIsomorphicEffect from '../../internal/useIsomorphicEffect.js';
+import { useNoInteractiveChildren } from '../../internal/useNoInteractiveChildren.js';
 import { usePrefix } from '../../internal/usePrefix.js';
+import { matches } from '../../internal/keyboard/match.js';
+import { Escape } from '../../internal/keyboard/keys.js';
 
 var _iconTypes;
 
-var _excluded = ["children", "className", "onClick"],
-    _excluded2 = ["ariaLabel", "className", "iconDescription", "type", "renderIcon", "name", "notificationType"],
-    _excluded3 = ["title", "subtitle", "caption", "notificationType", "children"],
-    _excluded4 = ["role", "notificationType", "onClose", "onCloseButtonClick", "iconDescription", "statusIconDescription", "className", "caption", "subtitle", "title", "kind", "lowContrast", "hideCloseButton", "children", "timeout"],
-    _excluded5 = ["actions", "role", "notificationType", "onClose", "onCloseButtonClick", "iconDescription", "statusIconDescription", "className", "subtitle", "title", "kind", "lowContrast", "hideCloseButton", "children"];
+var _excluded = ["children", "className", "onClick", "inline"],
+    _excluded2 = ["ariaLabel", "className", "type", "renderIcon", "name", "notificationType"],
+    _excluded3 = ["role", "onClose", "onCloseButtonClick", "statusIconDescription", "className", "children", "kind", "lowContrast", "hideCloseButton", "timeout", "title", "caption", "subtitle"],
+    _excluded4 = ["children", "title", "subtitle", "role", "onClose", "onCloseButtonClick", "statusIconDescription", "className", "kind", "lowContrast", "hideCloseButton"],
+    _excluded5 = ["actionButtonLabel", "ariaLabel", "children", "role", "onActionButtonClick", "onClose", "onCloseButtonClick", "statusIconDescription", "className", "inline", "kind", "lowContrast", "hideCloseButton", "hasFocus", "closeOnEscape", "title", "subtitle"];
+/**
+ * Conditionally call a callback when the escape key is pressed
+ * @param {node} ref - ref of the container element to scope the functionality to
+ * @param {func} callback - function to be called
+ * @param {bool} override - escape hatch to conditionally call the callback
+ */
+
+function useEscapeToClose(ref, callback) {
+  var override = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
+
+  var handleKeyDown = function handleKeyDown(event) {
+    // The callback should only be called when focus is on or within the container
+    var elementContainsFocus = ref.current && document.activeElement === ref.current || ref.current.contains(document.activeElement);
+
+    if (matches(event, [Escape]) && override && elementContainsFocus) {
+      callback(event);
+    }
+  };
+
+  useIsomorphicEffect(function () {
+    document.addEventListener('keydown', handleKeyDown, false);
+    return function () {
+      return document.removeEventListener('keydown', handleKeyDown, false);
+    };
+  });
+}
+
 function NotificationActionButton(_ref) {
   var children = _ref.children,
       customClassName = _ref.className,
       onClick = _ref.onClick,
+      inline = _ref.inline,
       rest = _objectWithoutProperties(_ref, _excluded);
 
   var prefix = usePrefix();
-  var className = cx(customClassName, "".concat(prefix, "--inline-notification__action-button"));
+  var className = cx(customClassName, _defineProperty({}, "".concat(prefix, "--actionable-notification__action-button"), true));
   return /*#__PURE__*/React__default.createElement(Button, _extends({
     className: className,
-    kind: "ghost",
+    kind: inline ? 'ghost' : 'tertiary',
     onClick: onClick,
-    size: "small"
+    size: "sm"
   }, rest), children);
 }
 NotificationActionButton.propTypes = {
@@ -46,6 +78,11 @@ NotificationActionButton.propTypes = {
    */
   className: PropTypes.string,
 
+  /**
+   * Specify if the visual treatment of the button should be for an inline notification
+   */
+  inline: PropTypes.bool,
+
   /**
    * Optionally specify a click handler for the notification action button.
    */
@@ -54,7 +91,6 @@ NotificationActionButton.propTypes = {
 function NotificationButton(_ref2) {
   var ariaLabel = _ref2.ariaLabel,
       className = _ref2.className,
-      iconDescription = _ref2.iconDescription,
       type = _ref2.type,
       IconTag = _ref2.renderIcon,
       name = _ref2.name,
@@ -67,11 +103,10 @@ function NotificationButton(_ref2) {
   return /*#__PURE__*/React__default.createElement("button", _extends({}, rest, {
     // eslint-disable-next-line react/button-has-type
     type: type,
-    "aria-label": iconDescription,
-    title: iconDescription,
+    "aria-label": ariaLabel,
+    title: ariaLabel,
     className: buttonClassName
   }), IconTag && /*#__PURE__*/React__default.createElement(IconTag, {
-    "aria-label": ariaLabel,
     className: iconClassName,
     name: name
   }));
@@ -87,11 +122,6 @@ NotificationButton.propTypes = {
    */
   className: PropTypes.string,
 
-  /**
-   * Provide a description for "close" icon that can be read by screen readers
-   */
-  iconDescription: PropTypes.string,
-
   /**
    * Specify an optional icon for the Button through a string,
    * if something but regular "close" icon is desirable
@@ -101,7 +131,7 @@ NotificationButton.propTypes = {
   /**
    * Specify the notification type
    */
-  notificationType: PropTypes.oneOf(['toast', 'inline']),
+  notificationType: PropTypes.oneOf(['toast', 'inline', 'actionable']),
 
   /**
    * Optional prop to allow overriding the icon rendering.
@@ -116,84 +146,20 @@ NotificationButton.propTypes = {
 };
 NotificationButton.defaultProps = {
   ariaLabel: 'close notification',
-  // TODO: deprecate this prop
   notificationType: 'toast',
   type: 'button',
-  iconDescription: 'close icon',
   renderIcon: Close
 };
-function NotificationTextDetails(_ref3) {
-  var title = _ref3.title,
-      subtitle = _ref3.subtitle,
-      caption = _ref3.caption,
-      notificationType = _ref3.notificationType,
-      children = _ref3.children,
-      rest = _objectWithoutProperties(_ref3, _excluded3);
-
-  var prefix = usePrefix();
-
-  if (notificationType === 'toast') {
-    return /*#__PURE__*/React__default.createElement("div", _extends({}, rest, {
-      className: "".concat(prefix, "--toast-notification__details")
-    }), /*#__PURE__*/React__default.createElement("h3", {
-      className: "".concat(prefix, "--toast-notification__title")
-    }, title), /*#__PURE__*/React__default.createElement("div", {
-      className: "".concat(prefix, "--toast-notification__subtitle")
-    }, subtitle), caption && /*#__PURE__*/React__default.createElement("div", {
-      className: "".concat(prefix, "--toast-notification__caption")
-    }, caption), children);
-  }
-
-  if (notificationType === 'inline') {
-    return /*#__PURE__*/React__default.createElement("div", _extends({}, rest, {
-      className: "".concat(prefix, "--inline-notification__text-wrapper")
-    }), /*#__PURE__*/React__default.createElement("p", {
-      className: "".concat(prefix, "--inline-notification__title")
-    }, title), /*#__PURE__*/React__default.createElement("div", {
-      className: "".concat(prefix, "--inline-notification__subtitle")
-    }, subtitle), children);
-  }
-}
-NotificationTextDetails.propTypes = {
-  /**
-   * Specify the caption
-   */
-  caption: PropTypes.node,
-
-  /**
-   * Pass in the children that will be rendered in NotificationTextDetails
-   */
-  children: PropTypes.node,
-
-  /**
-   * Specify the notification type
-   */
-  notificationType: PropTypes.oneOf(['toast', 'inline']),
-
-  /**
-   * Specify the sub-title
-   */
-  subtitle: PropTypes.node,
-
-  /**
-   * Specify the title
-   */
-  title: PropTypes.string
-};
-NotificationTextDetails.defaultProps = {
-  title: 'title',
-  notificationType: 'toast'
-};
 var iconTypes = (_iconTypes = {
   error: ErrorFilled,
   success: CheckmarkFilled,
   warning: WarningFilled
 }, _defineProperty(_iconTypes, 'warning-alt', WarningAltFilled), _defineProperty(_iconTypes, "info", InformationFilled), _defineProperty(_iconTypes, 'info-square', InformationSquareFilled), _iconTypes);
 
-function NotificationIcon(_ref4) {
-  var iconDescription = _ref4.iconDescription,
-      kind = _ref4.kind,
-      notificationType = _ref4.notificationType;
+function NotificationIcon(_ref3) {
+  var iconDescription = _ref3.iconDescription,
+      kind = _ref3.kind,
+      notificationType = _ref3.notificationType;
   var prefix = usePrefix();
   var IconForKind = iconTypes[kind];
 
@@ -211,34 +177,33 @@ NotificationIcon.propTypes = {
   kind: PropTypes.oneOf(['error', 'success', 'warning', 'warning-alt', 'info', 'info-square']).isRequired,
   notificationType: PropTypes.oneOf(['inline', 'toast']).isRequired
 };
-function ToastNotification(_ref5) {
-  var _cx3;
-
-  var role = _ref5.role,
-      notificationType = _ref5.notificationType,
-      onClose = _ref5.onClose,
-      onCloseButtonClick = _ref5.onCloseButtonClick,
-      iconDescription = _ref5.iconDescription,
-      statusIconDescription = _ref5.statusIconDescription,
-      className = _ref5.className,
-      caption = _ref5.caption,
-      subtitle = _ref5.subtitle,
-      title = _ref5.title,
-      kind = _ref5.kind,
-      lowContrast = _ref5.lowContrast,
-      hideCloseButton = _ref5.hideCloseButton,
-      children = _ref5.children,
-      timeout = _ref5.timeout,
-      rest = _objectWithoutProperties(_ref5, _excluded4);
+function ToastNotification(_ref4) {
+  var _cx4;
 
-  var prefix = usePrefix();
+  var role = _ref4.role,
+      onClose = _ref4.onClose,
+      onCloseButtonClick = _ref4.onCloseButtonClick,
+      statusIconDescription = _ref4.statusIconDescription,
+      className = _ref4.className,
+      children = _ref4.children,
+      kind = _ref4.kind,
+      lowContrast = _ref4.lowContrast,
+      hideCloseButton = _ref4.hideCloseButton,
+      timeout = _ref4.timeout,
+      title = _ref4.title,
+      caption = _ref4.caption,
+      subtitle = _ref4.subtitle,
+      rest = _objectWithoutProperties(_ref4, _excluded3);
 
   var _useState = useState(true),
       _useState2 = _slicedToArray(_useState, 2),
       isOpen = _useState2[0],
       setIsOpen = _useState2[1];
 
-  var containerClassName = cx(className, (_cx3 = {}, _defineProperty(_cx3, "".concat(prefix, "--toast-notification"), true), _defineProperty(_cx3, "".concat(prefix, "--toast-notification--low-contrast"), lowContrast), _defineProperty(_cx3, "".concat(prefix, "--toast-notification--").concat(kind), kind), _cx3));
+  var prefix = usePrefix();
+  var containerClassName = cx(className, (_cx4 = {}, _defineProperty(_cx4, "".concat(prefix, "--toast-notification"), true), _defineProperty(_cx4, "".concat(prefix, "--toast-notification--low-contrast"), lowContrast), _defineProperty(_cx4, "".concat(prefix, "--toast-notification--").concat(kind), kind), _cx4));
+  var contentRef = useRef(null);
+  useNoInteractiveChildren(contentRef);
 
   var handleClose = function handleClose(evt) {
     if (!onClose || onClose(evt) !== false) {
@@ -246,6 +211,8 @@ function ToastNotification(_ref5) {
     }
   };
 
+  var ref = useRef(null);
+
   function handleCloseButtonClick(event) {
     onCloseButtonClick(event);
     handleClose(event);
@@ -276,33 +243,44 @@ function ToastNotification(_ref5) {
     return null;
   }
 
-  return /*#__PURE__*/React__default.createElement("div", _extends({}, rest, {
+  return /*#__PURE__*/React__default.createElement("div", _extends({
+    ref: ref
+  }, rest, {
     role: role,
-    kind: kind,
     className: containerClassName
   }), /*#__PURE__*/React__default.createElement(NotificationIcon, {
-    notificationType: notificationType,
+    notificationType: "toast",
     kind: kind,
     iconDescription: statusIconDescription || "".concat(kind, " icon")
-  }), /*#__PURE__*/React__default.createElement(NotificationTextDetails, {
-    title: title,
-    subtitle: subtitle,
-    caption: caption,
-    notificationType: notificationType
-  }, children), !hideCloseButton && /*#__PURE__*/React__default.createElement(NotificationButton, {
-    iconDescription: iconDescription,
-    notificationType: notificationType,
-    onClick: handleCloseButtonClick
+  }), /*#__PURE__*/React__default.createElement("div", {
+    ref: contentRef,
+    className: "".concat(prefix, "--toast-notification__details")
+  }, title && /*#__PURE__*/React__default.createElement("div", {
+    className: "".concat(prefix, "--toast-notification__title")
+  }, title), subtitle && /*#__PURE__*/React__default.createElement("div", {
+    className: "".concat(prefix, "--toast-notification__subtitle")
+  }, subtitle), caption && /*#__PURE__*/React__default.createElement("div", {
+    className: "".concat(prefix, "--toast-notification__caption")
+  }, caption), children), !hideCloseButton && /*#__PURE__*/React__default.createElement(NotificationButton, {
+    notificationType: "toast",
+    onClick: handleCloseButtonClick,
+    "aria-hidden": "true",
+    tabIndex: "-1"
   }));
 }
 ToastNotification.propTypes = {
+  /**
+   * Provide a description for "close" icon button that can be read by screen readers
+   */
+  ariaLabel: PropTypes.string,
+
   /**
    * Specify the caption
    */
-  caption: PropTypes.node,
+  caption: PropTypes.string,
 
   /**
-   * Pass in the children that will be rendered within the ToastNotification
+   * Specify the content
    */
   children: PropTypes.node,
 
@@ -316,27 +294,16 @@ ToastNotification.propTypes = {
    */
   hideCloseButton: PropTypes.bool,
 
-  /**
-   * Provide a description for "close" icon that can be read by screen readers
-   */
-  iconDescription: PropTypes.string,
-
   /**
    * Specify what state the notification represents
    */
-  kind: PropTypes.oneOf(['error', 'info', 'info-square', 'success', 'warning', 'warning-alt']).isRequired,
+  kind: PropTypes.oneOf(['error', 'info', 'info-square', 'success', 'warning', 'warning-alt']),
 
   /**
    * Specify whether you are using the low contrast variant of the ToastNotification.
    */
   lowContrast: PropTypes.bool,
 
-  /**
-   * By default, this value is "toast". You can also provide an alternate type
-   * if it makes sense for the underlying `<NotificationTextDetails>` and `<NotificationButton>`
-   */
-  notificationType: PropTypes.string,
-
   /**
    * Provide a function that is called when menu is closed
    */
@@ -348,10 +315,10 @@ ToastNotification.propTypes = {
   onCloseButtonClick: PropTypes.func,
 
   /**
-   * By default, this value is "alert". You can also provide an alternate
+   * By default, this value is "status". You can also provide an alternate
    * role if it makes sense from the accessibility-side
    */
-  role: PropTypes.string.isRequired,
+  role: PropTypes.oneOf(['alert', 'log', 'status']),
 
   /**
    * Provide a description for "status" icon that can be read by screen readers
@@ -361,7 +328,7 @@ ToastNotification.propTypes = {
   /**
    * Specify the sub-title
    */
-  subtitle: PropTypes.node,
+  subtitle: PropTypes.string,
 
   /**
    * Specify an optional duration the notification should be closed in
@@ -371,45 +338,181 @@ ToastNotification.propTypes = {
   /**
    * Specify the title
    */
-  title: PropTypes.string.isRequired
+  title: PropTypes.string
 };
 ToastNotification.defaultProps = {
   kind: 'error',
-  title: 'provide a title',
-  role: 'alert',
-  notificationType: 'toast',
-  iconDescription: 'closes notification',
+  role: 'status',
   onCloseButtonClick: function onCloseButtonClick() {},
   hideCloseButton: false,
   timeout: 0
 };
-function InlineNotification(_ref6) {
-  var _cx4;
+function InlineNotification(_ref5) {
+  var _cx5;
+
+  var children = _ref5.children,
+      title = _ref5.title,
+      subtitle = _ref5.subtitle,
+      role = _ref5.role,
+      onClose = _ref5.onClose,
+      onCloseButtonClick = _ref5.onCloseButtonClick,
+      statusIconDescription = _ref5.statusIconDescription,
+      className = _ref5.className,
+      kind = _ref5.kind,
+      lowContrast = _ref5.lowContrast,
+      hideCloseButton = _ref5.hideCloseButton,
+      rest = _objectWithoutProperties(_ref5, _excluded4);
+
+  var _useState3 = useState(true),
+      _useState4 = _slicedToArray(_useState3, 2),
+      isOpen = _useState4[0],
+      setIsOpen = _useState4[1];
+
+  var prefix = usePrefix();
+  var containerClassName = cx(className, (_cx5 = {}, _defineProperty(_cx5, "".concat(prefix, "--inline-notification"), true), _defineProperty(_cx5, "".concat(prefix, "--inline-notification--low-contrast"), lowContrast), _defineProperty(_cx5, "".concat(prefix, "--inline-notification--").concat(kind), kind), _defineProperty(_cx5, "".concat(prefix, "--inline-notification--hide-close-button"), hideCloseButton), _cx5));
+  var contentRef = useRef(null);
+  useNoInteractiveChildren(contentRef);
+
+  var handleClose = function handleClose(evt) {
+    if (!onClose || onClose(evt) !== false) {
+      setIsOpen(false);
+    }
+  };
+
+  var ref = useRef(null);
+
+  function handleCloseButtonClick(event) {
+    onCloseButtonClick(event);
+    handleClose(event);
+  }
 
-  var actions = _ref6.actions,
+  if (!isOpen) {
+    return null;
+  }
+
+  return /*#__PURE__*/React__default.createElement("div", _extends({
+    ref: ref
+  }, rest, {
+    role: role,
+    className: containerClassName
+  }), /*#__PURE__*/React__default.createElement("div", {
+    className: "".concat(prefix, "--inline-notification__details")
+  }, /*#__PURE__*/React__default.createElement(NotificationIcon, {
+    notificationType: "inline",
+    kind: kind,
+    iconDescription: statusIconDescription || "".concat(kind, " icon")
+  }), /*#__PURE__*/React__default.createElement("div", {
+    ref: contentRef,
+    className: "".concat(prefix, "--inline-notification__text-wrapper")
+  }, title && /*#__PURE__*/React__default.createElement("div", {
+    className: "".concat(prefix, "--inline-notification__title")
+  }, title), subtitle && /*#__PURE__*/React__default.createElement("div", {
+    className: "".concat(prefix, "--inline-notification__subtitle")
+  }, subtitle), children)), !hideCloseButton && /*#__PURE__*/React__default.createElement(NotificationButton, {
+    notificationType: "inline",
+    onClick: handleCloseButtonClick,
+    "aria-hidden": "true",
+    tabIndex: "-1"
+  }));
+}
+InlineNotification.propTypes = {
+  /**
+   * Specify the content
+   */
+  children: PropTypes.node,
+
+  /**
+   * Specify an optional className to be applied to the notification box
+   */
+  className: PropTypes.string,
+
+  /**
+   * Specify the close button should be disabled, or not
+   */
+  hideCloseButton: PropTypes.bool,
+
+  /**
+   * Specify what state the notification represents
+   */
+  kind: PropTypes.oneOf(['error', 'info', 'info-square', 'success', 'warning', 'warning-alt']),
+
+  /**
+   * Specify whether you are using the low contrast variant of the InlineNotification.
+   */
+  lowContrast: PropTypes.bool,
+
+  /**
+   * Provide a function that is called when menu is closed
+   */
+  onClose: PropTypes.func,
+
+  /**
+   * Provide a function that is called when the close button is clicked
+   */
+  onCloseButtonClick: PropTypes.func,
+
+  /**
+   * By default, this value is "status". You can also provide an alternate
+   * role if it makes sense from the accessibility-side.
+   */
+  role: PropTypes.oneOf(['alert', 'log', 'status']),
+
+  /**
+   * Provide a description for "status" icon that can be read by screen readers
+   */
+  statusIconDescription: PropTypes.string,
+
+  /**
+   * Specify the sub-title
+   */
+  subtitle: PropTypes.string,
+
+  /**
+   * Specify the title
+   */
+  title: PropTypes.string
+};
+InlineNotification.defaultProps = {
+  kind: 'error',
+  role: 'status',
+  onCloseButtonClick: function onCloseButtonClick() {},
+  hideCloseButton: false
+};
+function ActionableNotification(_ref6) {
+  var _cx6;
+
+  var actionButtonLabel = _ref6.actionButtonLabel,
+      ariaLabel = _ref6.ariaLabel,
+      children = _ref6.children,
       role = _ref6.role,
-      notificationType = _ref6.notificationType,
+      onActionButtonClick = _ref6.onActionButtonClick,
       onClose = _ref6.onClose,
       onCloseButtonClick = _ref6.onCloseButtonClick,
-      iconDescription = _ref6.iconDescription,
       statusIconDescription = _ref6.statusIconDescription,
       className = _ref6.className,
-      subtitle = _ref6.subtitle,
-      title = _ref6.title,
+      inline = _ref6.inline,
       kind = _ref6.kind,
       lowContrast = _ref6.lowContrast,
       hideCloseButton = _ref6.hideCloseButton,
-      children = _ref6.children,
+      hasFocus = _ref6.hasFocus,
+      closeOnEscape = _ref6.closeOnEscape,
+      title = _ref6.title,
+      subtitle = _ref6.subtitle,
       rest = _objectWithoutProperties(_ref6, _excluded5);
 
-  var prefix = usePrefix();
-
-  var _useState3 = useState(true),
-      _useState4 = _slicedToArray(_useState3, 2),
-      isOpen = _useState4[0],
-      setIsOpen = _useState4[1];
+  var _useState5 = useState(true),
+      _useState6 = _slicedToArray(_useState5, 2),
+      isOpen = _useState6[0],
+      setIsOpen = _useState6[1];
 
-  var containerClassName = cx(className, (_cx4 = {}, _defineProperty(_cx4, "".concat(prefix, "--inline-notification"), true), _defineProperty(_cx4, "".concat(prefix, "--inline-notification--low-contrast"), lowContrast), _defineProperty(_cx4, "".concat(prefix, "--inline-notification--").concat(kind), kind), _defineProperty(_cx4, "".concat(prefix, "--inline-notification--hide-close-button"), hideCloseButton), _cx4));
+  var prefix = usePrefix();
+  var containerClassName = cx(className, (_cx6 = {}, _defineProperty(_cx6, "".concat(prefix, "--actionable-notification"), true), _defineProperty(_cx6, "".concat(prefix, "--actionable-notification--toast"), !inline), _defineProperty(_cx6, "".concat(prefix, "--actionable-notification--low-contrast"), lowContrast), _defineProperty(_cx6, "".concat(prefix, "--actionable-notification--").concat(kind), kind), _defineProperty(_cx6, "".concat(prefix, "--actionable-notification--hide-close-button"), hideCloseButton), _cx6));
+  var ref = useRef(null);
+  useIsomorphicEffect(function () {
+    if (ref.current && hasFocus) {
+      ref.current.focus();
+    }
+  });
 
   var handleClose = function handleClose(evt) {
     if (!onClose || onClose(evt) !== false) {
@@ -417,6 +520,8 @@ function InlineNotification(_ref6) {
     }
   };
 
+  useEscapeToClose(ref, handleCloseButtonClick, closeOnEscape);
+
   function handleCloseButtonClick(event) {
     onCloseButtonClick(event);
     handleClose(event);
@@ -427,33 +532,50 @@ function InlineNotification(_ref6) {
   }
 
   return /*#__PURE__*/React__default.createElement("div", _extends({}, rest, {
+    ref: ref,
     role: role,
-    kind: kind,
     className: containerClassName
   }), /*#__PURE__*/React__default.createElement("div", {
-    className: "".concat(prefix, "--inline-notification__details")
+    className: "".concat(prefix, "--actionable-notification__details")
   }, /*#__PURE__*/React__default.createElement(NotificationIcon, {
-    notificationType: notificationType,
+    notificationType: inline ? 'inline' : 'toast',
     kind: kind,
     iconDescription: statusIconDescription || "".concat(kind, " icon")
-  }), /*#__PURE__*/React__default.createElement(NotificationTextDetails, {
-    title: title,
-    subtitle: subtitle,
-    notificationType: notificationType
-  }, children)), actions, !hideCloseButton && /*#__PURE__*/React__default.createElement(NotificationButton, {
-    iconDescription: iconDescription,
-    notificationType: notificationType,
+  }), /*#__PURE__*/React__default.createElement("div", {
+    className: "".concat(prefix, "--actionable-notification__text-wrapper")
+  }, /*#__PURE__*/React__default.createElement("div", {
+    className: "".concat(prefix, "--actionable-notification__content")
+  }, title && /*#__PURE__*/React__default.createElement("div", {
+    className: "".concat(prefix, "--actionable-notification__title")
+  }, title), subtitle && /*#__PURE__*/React__default.createElement("div", {
+    className: "".concat(prefix, "--actionable-notification__subtitle")
+  }, subtitle), children))), /*#__PURE__*/React__default.createElement(NotificationActionButton, {
+    onClick: onActionButtonClick,
+    inline: inline
+  }, actionButtonLabel), !hideCloseButton && /*#__PURE__*/React__default.createElement(NotificationButton, {
+    "aria-label": ariaLabel,
+    notificationType: "actionable",
     onClick: handleCloseButtonClick
   }));
 }
-InlineNotification.propTypes = {
+ActionableNotification.propTypes = {
+  /**
+   * Pass in the action button label that will be rendered within the ActionableNotification.
+   */
+  actionButtonLabel: PropTypes.string.isRequired,
+
   /**
-   * Pass in the action nodes that will be rendered within the InlineNotification
+   * Provide a description for "close" icon button that can be read by screen readers
+   */
+  ariaLabel: PropTypes.string,
+
+  /**
+   * Specify the caption
    */
-  actions: PropTypes.node,
+  caption: PropTypes.string,
 
   /**
-   * Pass in the children that will be rendered within the InlineNotification
+   * Specify the content
    */
   children: PropTypes.node,
 
@@ -462,15 +584,25 @@ InlineNotification.propTypes = {
    */
   className: PropTypes.string,
 
+  /**
+   * Specify if pressing the escape key should close notifications
+   */
+  closeOnEscape: PropTypes.bool,
+
+  /**
+   * Specify if focus should be moved to the component when the notification contains actions
+   */
+  hasFocus: PropTypes.bool,
+
   /**
    * Specify the close button should be disabled, or not
    */
   hideCloseButton: PropTypes.bool,
 
-  /**
-   * Provide a description for "close" icon that can be read by screen readers
+  /*
+   * Specify if the notification should have inline styling applied instead of toast
    */
-  iconDescription: PropTypes.string,
+  inline: PropTypes.bool,
 
   /**
    * Specify what state the notification represents
@@ -478,15 +610,14 @@ InlineNotification.propTypes = {
   kind: PropTypes.oneOf(['error', 'info', 'info-square', 'success', 'warning', 'warning-alt']).isRequired,
 
   /**
-   * Specify whether you are using the low contrast variant of the InlineNotification.
+   * Specify whether you are using the low contrast variant of the ActionableNotification.
    */
   lowContrast: PropTypes.bool,
 
   /**
-   * By default, this value is "inline". You can also provide an alternate type
-   * if it makes sense for the underlying `<NotificationTextDetails>` and `<NotificationButton>`
+   * Provide a function that is called when the action is clicked
    */
-  notificationType: PropTypes.string,
+  onActionButtonClick: PropTypes.func,
 
   /**
    * Provide a function that is called when menu is closed
@@ -499,10 +630,10 @@ InlineNotification.propTypes = {
   onCloseButtonClick: PropTypes.func,
 
   /**
-   * By default, this value is "alert". You can also provide an alternate
-   * role if it makes sense from the accessibility-side
+   * By default, this value is "alertdialog". You can also provide an alternate
+   * role if it makes sense from the accessibility-side.
    */
-  role: PropTypes.string.isRequired,
+  role: PropTypes.string,
 
   /**
    * Provide a description for "status" icon that can be read by screen readers
@@ -512,19 +643,21 @@ InlineNotification.propTypes = {
   /**
    * Specify the sub-title
    */
-  subtitle: PropTypes.node,
+  subtitle: PropTypes.string,
 
   /**
    * Specify the title
    */
-  title: PropTypes.string.isRequired
+  title: PropTypes.string
 };
-InlineNotification.defaultProps = {
-  role: 'alert',
-  notificationType: 'inline',
-  iconDescription: 'closes notification',
+ActionableNotification.defaultProps = {
+  kind: 'error',
+  role: 'alertdialog',
   onCloseButtonClick: function onCloseButtonClick() {},
-  hideCloseButton: false
+  hideCloseButton: false,
+  hasFocus: true,
+  closeOnEscape: true,
+  inline: false
 };
 
-export { InlineNotification, NotificationActionButton, NotificationButton, NotificationTextDetails, ToastNotification };
+export { ActionableNotification, InlineNotification, NotificationActionButton, NotificationButton, ToastNotification };