carbon-react 96.0.0 → 98.0.1

package/lib/components/toast/toast.component.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-var _react = _interopRequireDefault(require("react"));
+var _react = _interopRequireWildcard(require("react"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
@@ -27,167 +27,107 @@ var _events = _interopRequireDefault(require("../../__internal__/utils/helpers/e
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
-
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-
-function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
-
-function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
-
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
-
-function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
-
-function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
-
-function _possibleConstructorReturn(self, call) { if (call && (typeof call === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); }
-
-function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
-
-function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
-
-function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
-let Toast = /*#__PURE__*/function (_React$Component) {
-  _inherits(Toast, _React$Component);
-
-  var _super = _createSuper(Toast);
-
-  function Toast(props) {
-    var _this;
+function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
 
-    _classCallCheck(this, Toast);
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
-    _this = _super.call(this, props);
+function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 
-    _defineProperty(_assertThisInitialized(_this), "dismissToast", ev => {
-      const isTopmost = _modalManager.default.isTopmost(_this.toastRef.current);
+const Toast = ({
+  as = "warning",
+  children,
+  className,
+  id,
+  isCenter = true,
+  maxWidth,
+  onDismiss,
+  open = true,
+  targetPortalId,
+  timeout,
+  variant,
+  ...restProps
+}) => {
+  const toastRef = (0, _react.useRef)();
+  const timer = (0, _react.useRef)();
+  const componentClasses = (0, _react.useMemo)(() => {
+    return (0, _classnames.default)(className);
+  }, [className]);
+  const dismissToast = (0, _react.useCallback)(ev => {
+    const isTopmost = _modalManager.default.isTopmost(toastRef.current);
+
+    if (onDismiss && _events.default.isEscKey(ev) && isTopmost) {
+      ev.stopImmediatePropagation();
+      onDismiss(ev);
+    }
+  }, [onDismiss]);
+  (0, _react.useEffect)(() => {
+    const currentElement = toastRef.current;
 
-      if (_this.props.onDismiss && _events.default.isEscKey(ev) && isTopmost) {
-        ev.stopImmediatePropagation();
+    _modalManager.default.addModal(currentElement);
 
-        _this.props.onDismiss(ev);
-      }
-    });
+    document.addEventListener("keyup", dismissToast);
+    return () => {
+      _modalManager.default.removeModal(currentElement);
 
-    _this.toastRef = /*#__PURE__*/_react.default.createRef();
-    _this.timer = /*#__PURE__*/_react.default.createRef();
-    return _this;
-  }
+      document.removeEventListener("keyup", dismissToast);
+    };
+  }, [dismissToast]);
+  (0, _react.useEffect)(() => {
+    clearTimeout(timer.current);
 
-  _createClass(Toast, [{
-    key: "componentClasses",
-    get:
-    /** Classes to be applied to the component. */
-    function () {
-      return (0, _classnames.default)(this.props.className);
+    if (!timeout || !open || !onDismiss) {
+      return;
     }
-  }, {
-    key: "componentDidMount",
-    value: function componentDidMount() {
-      _modalManager.default.addModal(this.toastRef.current);
 
-      document.addEventListener("keyup", this.dismissToast);
-    }
-  }, {
-    key: "componentWillUnmount",
-    value: function componentWillUnmount() {
-      _modalManager.default.removeModal(this.toastRef.current);
+    timer.current = setTimeout(() => onDismiss(), timeout);
+  }, [onDismiss, open, timeout]);
+
+  function renderCloseIcon() {
+    if (!onDismiss) return null;
+    return /*#__PURE__*/_react.default.createElement(_iconButton.default, {
+      "data-element": "close",
+      onAction: onDismiss
+    }, /*#__PURE__*/_react.default.createElement(_icon.default, {
+      type: "close"
+    }));
+  }
 
-      document.removeEventListener("keyup", this.dismissToast);
-    }
-  }, {
-    key: "componentDidUpdate",
-    value: function componentDidUpdate() {
-      const {
-        timeout,
-        open,
-        onDismiss
-      } = this.props;
-      clearTimeout(this.timer.current);
-
-      if (!timeout || !open) {
-        return;
+  function renderToastContent() {
+    if (!open) return null;
+    const toastProps = {
+      isCenter,
+      variant: variant || as,
+      id,
+      maxWidth
+    };
+    return /*#__PURE__*/_react.default.createElement(_reactTransitionGroup.CSSTransition, {
+      enter: true,
+      classNames: "toast",
+      timeout: {
+        appear: 1600,
+        enter: 1500,
+        exit: 500
       }
+    }, /*#__PURE__*/_react.default.createElement(_toast.ToastStyle, _extends({
+      className: componentClasses
+    }, (0, _tags.default)(restProps["data-component"] || "toast", restProps), toastProps), /*#__PURE__*/_react.default.createElement(_toast.TypeIcon, {
+      variant: toastProps.variant
+    }, /*#__PURE__*/_react.default.createElement(_icon.default, {
+      type: toastProps.variant
+    })), /*#__PURE__*/_react.default.createElement(_toast.ToastContentStyle, {
+      variant: toastProps.variant,
+      isDismiss: onDismiss
+    }, children), renderCloseIcon()));
+  }
 
-      this.timer.current = setTimeout(() => onDismiss(), timeout);
-    }
-  }, {
-    key: "closeIcon",
-    value: function closeIcon() {
-      const {
-        onDismiss
-      } = this.props;
-      if (!onDismiss) return null;
-      return /*#__PURE__*/_react.default.createElement(_iconButton.default, {
-        "data-element": "close",
-        onAction: onDismiss
-      }, /*#__PURE__*/_react.default.createElement(_icon.default, {
-        type: "close"
-      }));
-    }
-    /** Content rendered for the toast. */
-
-  }, {
-    key: "toastContent",
-    value: function toastContent() {
-      if (!this.props.open) return null;
-      const {
-        isCenter,
-        variant,
-        id,
-        as,
-        onDismiss,
-        children,
-        maxWidth
-      } = this.props;
-      const toastProps = {
-        isCenter,
-        variant: variant || as,
-        id,
-        maxWidth
-      };
-      return /*#__PURE__*/_react.default.createElement(_reactTransitionGroup.CSSTransition, {
-        enter: true,
-        classNames: "toast",
-        timeout: {
-          appear: 1600,
-          enter: 1500,
-          exit: 500
-        }
-      }, /*#__PURE__*/_react.default.createElement(_toast.ToastStyle, _extends({
-        className: this.componentClasses
-      }, (0, _tags.default)(this.props["data-component"] || "toast", this.props), toastProps), /*#__PURE__*/_react.default.createElement(_toast.TypeIcon, {
-        variant: toastProps.variant
-      }, /*#__PURE__*/_react.default.createElement(_icon.default, {
-        type: toastProps.variant
-      })), /*#__PURE__*/_react.default.createElement(_toast.ToastContentStyle, {
-        variant: toastProps.variant,
-        isDismiss: onDismiss
-      }, children), this.closeIcon()));
-    }
-  }, {
-    key: "render",
-    value: function render() {
-      const {
-        targetPortalId,
-        isCenter
-      } = this.props;
-      return /*#__PURE__*/_react.default.createElement(_toast.StyledPortal, {
-        id: targetPortalId,
-        isCenter: isCenter
-      }, /*#__PURE__*/_react.default.createElement(_toast.ToastWrapper, {
-        isCenter: isCenter,
-        ref: this.toastRef
-      }, /*#__PURE__*/_react.default.createElement(_reactTransitionGroup.TransitionGroup, null, this.toastContent())));
-    }
-  }]);
-
-  return Toast;
-}(_react.default.Component);
+  return /*#__PURE__*/_react.default.createElement(_toast.StyledPortal, {
+    id: targetPortalId,
+    isCenter: isCenter
+  }, /*#__PURE__*/_react.default.createElement(_toast.ToastWrapper, {
+    isCenter: isCenter,
+    ref: toastRef
+  }, /*#__PURE__*/_react.default.createElement(_reactTransitionGroup.TransitionGroup, null, renderToastContent())));
+};
 
 Toast.propTypes = {
   /** Customizes the appearance in the DLS theme */
@@ -226,11 +166,5 @@ Toast.propTypes = {
   /** Maximum toast width */
   maxWidth: _propTypes.default.string
 };
-Toast.defaultProps = {
-  as: "warning",
-  onDismiss: null,
-  open: true,
-  isCenter: true
-};
 var _default = Toast;
 exports.default = _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "carbon-react",
-  "version": "96.0.0",
+  "version": "98.0.1",
   "description": "A library of reusable React components for easily building user interfaces.",
   "engineStrict": true,
   "engines": {
@@ -31,8 +31,7 @@
     "babel": "cross-env NODE_ENV=production babel ./src --config-file ./babel.config.js --out-dir ./lib --ignore '**/*/__spec__.js','**/*.spec.js','**/__definition__.js' --quiet",
     "clean-lib": "rimraf ./lib",
     "copy-files": "cpy \"**/\" \"!**/(*.js|*.md|*.mdx|*.stories.*|*.snap)\" ../lib/ --cwd=src --parents",
-    "commit": "git-cz",
-    "chromatic": "chromatic"
+    "commit": "git-cz"
   },
   "repository": {
     "type": "git",
@@ -89,6 +88,7 @@
     "babel-jest": "^26.6.3",
     "browserslist": "^4.16.6",
     "chalk": "^4.1.1",
+    "chromatic": "^6.0.5",
     "commitizen": "^4.2.4",
     "conventional-changelog-conventionalcommits": "^4.5.0",
     "core-js": "^3.1.4",
@@ -97,6 +97,7 @@
     "cypress": "^8.3.1",
     "cypress-axe": "^0.13.0",
     "cypress-cucumber-preprocessor": "^4.2.0",
+    "cypress-each": "^1.5.0",
     "cypress-plugin-tab": "^1.0.5",
     "cypress-real-events": "^1.5.1",
     "cypress-storybook": "^0.5.1",
@@ -119,6 +120,7 @@
     "events": "~1.1.1",
     "husky": "^4.3.6",
     "jest": "^26.6.3",
+    "jest-canvas-mock": "^2.3.1",
     "jest-styled-components": "^6.3.1",
     "lint-staged": "^10.5.3",
     "mockdate": "^2.0.2",
@@ -137,7 +139,7 @@
   "dependencies": {
     "@octokit/rest": "^18.12.0",
     "@popperjs/core": "^2.9.0",
-    "@sage/design-tokens": "^1.73.0",
+    "@sage/design-tokens": "^1.80.0",
     "@styled-system/prop-types": "^5.1.5",
     "@tippyjs/react": "^4.2.5",
     "classnames": "~2.2.6",