@salutejs/plasma-new-hope 0.337.0-canary.2237.17801180282.0 → 0.337.0-canary.2237.17941275054.0

package/emotion/cjs/hooks/useFocusTrap.js

@@ -47,14 +47,14 @@ var processNode = function(node, firstFocusSelector, ref) {
 };
 var focusManager = new _focusManager.FocusManager();
 var useFocusTrap = function() {
-    var active = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : true, firstFocusSelector = arguments.length > 1 ? arguments[1] : void 0, focusAfterNode = arguments.length > 2 ? arguments[2] : void 0, focusAfterAnimation = arguments.length > 3 ? arguments[3] : void 0;
+    var active = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : true, firstFocusSelector = arguments.length > 1 ? arguments[1] : void 0, focusAfterNode = arguments.length > 2 ? arguments[2] : void 0, focusAfterAnimation = arguments.length > 3 ? arguments[3] : void 0, enableOnFirstMount = arguments.length > 4 ? arguments[4] : void 0;
     var ref = (0, _react.useRef)();
     var setRef = (0, _react.useCallback)(function(node) {
         if (ref.current) {
             focusManager.teardownScopedFocus();
             focusManager.returnFocus();
         }
-        if (active && node) {
+        if ((active || enableOnFirstMount) && node) {
             focusManager.setupScopedFocus(node);
             focusManager.markForFocusAfter(focusAfterNode);
             // Delay processing the HTML node by a frame. This ensures focus is assigned correctly.
@@ -73,15 +73,21 @@ var useFocusTrap = function() {
         ref.current = null;
     }, [
         active,
+        enableOnFirstMount,
         firstFocusSelector
     ]);
     (0, _react.useEffect)(function() {
-        if (!active) {
+        if (!active && !enableOnFirstMount) {
             return;
         }
         var handleKeyDown = function(event) {
             if (event.key === 'Tab' && ref.current) {
-                (0, _scopeTab.scopeTab)(ref.current, event);
+                (0, _scopeTab.scopeTab)(ref.current, event, active);
+                if (enableOnFirstMount) {
+                    setTimeout(function() {
+                        focusManager.teardownScopedFocus();
+                    });
+                }
             }
         };
         document.addEventListener('keydown', handleKeyDown);
@@ -89,7 +95,8 @@ var useFocusTrap = function() {
             document.removeEventListener('keydown', handleKeyDown);
         };
     }, [
-        active
+        active,
+        enableOnFirstMount
     ]);
     return setRef;
 };

package/emotion/cjs/utils/scopeTab.js

@@ -9,7 +9,7 @@ Object.defineProperty(exports, "scopeTab", {
     }
 });
 var _tabbable = require("./tabbable");
-var scopeTab = function(node, event) {
+var scopeTab = function(node, event, activeFocusTrap) {
     var tabbable = (0, _tabbable.findTabbableDescendants)(node);
     if (!tabbable.length) {
         event.preventDefault();
@@ -19,7 +19,7 @@ var scopeTab = function(node, event) {
     var finalTabbable = tabbable[event.shiftKey ? 0 : tabbable.length - 1];
     var leavingFinalTabbable = finalTabbable === document.activeElement || node === document.activeElement;
     // если не является, то передаем обработку таба самому браузеру
-    if (!leavingFinalTabbable) {
+    if (!leavingFinalTabbable || !activeFocusTrap) {
         return;
     }
     // иначе зацкливаемся

package/emotion/es/components/Modal/Modal.js

@@ -74,7 +74,7 @@ var Popup = component(popupConfig);
  * Управляет показом/скрытием, подложкой и анимацией визуальной части модального окна.
  */ export var modalRoot = function(Root) {
     return /*#__PURE__*/ forwardRef(function(_param, outerRootRef) {
-        var id = _param.id, withAnimation = _param.withAnimation, onClose = _param.onClose, onOverlayClick = _param.onOverlayClick, onEscKeyDown = _param.onEscKeyDown, _param_closeOnEsc = _param.closeOnEsc, closeOnEsc = _param_closeOnEsc === void 0 ? true : _param_closeOnEsc, _param_closeOnOverlayClick = _param.closeOnOverlayClick, closeOnOverlayClick = _param_closeOnOverlayClick === void 0 ? true : _param_closeOnOverlayClick, withBlur = _param.withBlur, initialFocusRef = _param.initialFocusRef, focusAfterRef = _param.focusAfterRef, zIndex = _param.zIndex, popupInfo = _param.popupInfo, children = _param.children, view = _param.view, opened = _param.opened, isOpen = _param.isOpen, hasBody = _param.hasBody, hasClose = _param.hasClose, resizable = _param.resizable, draggable = _param.draggable, rest = _object_without_properties(_param, [
+        var id = _param.id, withAnimation = _param.withAnimation, onClose = _param.onClose, onOverlayClick = _param.onOverlayClick, onEscKeyDown = _param.onEscKeyDown, _param_closeOnEsc = _param.closeOnEsc, closeOnEsc = _param_closeOnEsc === void 0 ? true : _param_closeOnEsc, _param_closeOnOverlayClick = _param.closeOnOverlayClick, closeOnOverlayClick = _param_closeOnOverlayClick === void 0 ? true : _param_closeOnOverlayClick, withBlur = _param.withBlur, _param_isFocusTrapped = _param.isFocusTrapped, isFocusTrapped = _param_isFocusTrapped === void 0 ? true : _param_isFocusTrapped, initialFocusRef = _param.initialFocusRef, focusAfterRef = _param.focusAfterRef, zIndex = _param.zIndex, popupInfo = _param.popupInfo, children = _param.children, view = _param.view, opened = _param.opened, isOpen = _param.isOpen, hasBody = _param.hasBody, hasClose = _param.hasClose, resizable = _param.resizable, draggable = _param.draggable, rest = _object_without_properties(_param, [
             "id",
             "withAnimation",
             "onClose",
@@ -83,6 +83,7 @@ var Popup = component(popupConfig);
             "closeOnEsc",
             "closeOnOverlayClick",
             "withBlur",
+            "isFocusTrapped",
             "initialFocusRef",
             "focusAfterRef",
             "zIndex",
@@ -98,7 +99,7 @@ var Popup = component(popupConfig);
         ]);
         var innerIsOpen = Boolean(isOpen || opened);
         var innerHasClose = hasClose === undefined && hasBody || hasClose;
-        var trapRef = useFocusTrap(true, initialFocusRef, focusAfterRef, true);
+        var trapRef = useFocusTrap(isFocusTrapped, initialFocusRef, focusAfterRef, true, !isFocusTrapped);
         var popupController = usePopupContext();
         var innerRef = useForkRef(trapRef, outerRootRef);
         var uniqId = safeUseId();