@salutejs/plasma-new-hope 0.251.0-canary.1730.13052948140.0 → 0.251.1-canary.1712.13062616456.0

package/emotion/cjs/components/Toast/ToastController.js

@@ -5,14 +5,13 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.ToastControllerHoc = void 0;
-var _react = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("react"));
+var _react = /*#__PURE__*/_interopRequireDefault( /*#__PURE__*/require("react"));
 var _Toast = /*#__PURE__*/require("./Toast.tokens");
 var _Toast2 = /*#__PURE__*/require("./Toast.styles");
 var _ToastProvider = /*#__PURE__*/require("./ToastProvider");
 var _utils = /*#__PURE__*/require("./utils");
 var _excluded = ["position", "offset", "fade", "text"];
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(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 _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -30,9 +29,7 @@ var ToastControllerHoc = exports.ToastControllerHoc = function ToastControllerHo
       rest = _objectWithoutProperties(props, _excluded);
     var _useToastInner = (0, _ToastProvider.useToastInner)(),
       hideToast = _useToastInner.hideToast,
-      isVisible = _useToastInner.isVisible,
-      hideTimeout = _useToastInner.hideTimeout,
-      animationRunTimeout = _useToastInner.animationRunTimeout;
+      isVisible = _useToastInner.isVisible;
     var toastKey = "".concat(text).concat(position);
     var showedClass = isVisible ? _Toast.classes.toastShowed : _Toast.classes.toastHidden;
     var showedFadeClass = isVisible ? _Toast.classes.toastFadeShowed : _Toast.classes.toastFadeHidden;
@@ -40,16 +37,6 @@ var ToastControllerHoc = exports.ToastControllerHoc = function ToastControllerHo
       text: text,
       onCloseButtonClick: hideToast
     }, rest);
-    (0, _react.useEffect)(function () {
-      return function () {
-        if (hideTimeout !== null && hideTimeout !== void 0 && hideTimeout.current) {
-          clearTimeout(hideTimeout.current);
-        }
-        if (animationRunTimeout !== null && animationRunTimeout !== void 0 && animationRunTimeout.current) {
-          clearTimeout(animationRunTimeout.current);
-        }
-      };
-    }, []);
     if (!text) {
       return null;
     }

package/emotion/cjs/components/Toast/ToastProvider/ToastProvider.js

@@ -153,13 +153,13 @@ var ToastProviderHoc = exports.ToastProviderHoc = function ToastProviderHoc(Toas
     var onHide = toastInfo.onHide,
       timeout = toastInfo.timeout;
     var hideToast = (0, _react.useCallback)(function () {
-      if (!isVisible) {
-        return;
-      }
       if (hideTimeout !== null && hideTimeout !== void 0 && hideTimeout.current) {
         clearTimeout(hideTimeout.current);
         hideTimeout.current = null;
       }
+      if (!isVisible) {
+        return;
+      }
       onHide === null || onHide === void 0 || onHide();
       setIsVisible(false);
       animationRunTimeout.current = setTimeout(function () {
@@ -172,13 +172,26 @@ var ToastProviderHoc = exports.ToastProviderHoc = function ToastProviderHoc(Toas
         clearTimeout(animationRunTimeout.current);
         animationRunTimeout.current = null;
       }
+      return function () {
+        if (animationRunTimeout !== null && animationRunTimeout !== void 0 && animationRunTimeout.current) {
+          clearTimeout(animationRunTimeout.current);
+        }
+      };
     }, [timeout]);
+
+    // очистка таймаутов перенесена из ToastController, т. к. в StrictМоde react делает дополнительный unmount
     (0, _react.useEffect)(function () {
       if (timeout && isVisible) {
         hideTimeout.current = setTimeout(function () {
           hideToast();
         }, timeout);
       }
+      return function () {
+        if (hideTimeout !== null && hideTimeout !== void 0 && hideTimeout.current) {
+          clearTimeout(hideTimeout.current);
+          hideTimeout.current = null;
+        }
+      };
     }, [isVisible, timeout]);
     return /*#__PURE__*/_react["default"].createElement(ToastContext.Provider, {
       value: {

package/emotion/es/components/Portal/Portal.js

@@ -1,5 +1,6 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
+import { canUseDOM } from '../../utils';
 /**
  * Вспомогательный компонент. Используется в Popup, Popover.
  * Представляет собой ReactDOM.createPortal() в форме компонента.
@@ -9,6 +10,9 @@ export var Portal = function Portal(_ref) {
     container = _ref.container,
     _ref$disabled = _ref.disabled,
     disabled = _ref$disabled === void 0 ? false : _ref$disabled;
+  if (!canUseDOM) {
+    return null;
+  }
   var portalContainer = typeof container === 'function' ? container() : container;
-  return /*#__PURE__*/React.createElement(React.Fragment, null, disabled || !portalContainer ? children : /*#__PURE__*/ReactDOM.createPortal(children, portalContainer));
+  return /*#__PURE__*/React.createElement(React.Fragment, null, (disabled || !portalContainer) && children, !disabled && portalContainer && /*#__PURE__*/ReactDOM.createPortal(children, portalContainer));
 };