@alfalab/core-components-base-modal 3.0.1 → 3.2.0

package/dist/modern/utils.d.ts

@@ -1,5 +1,6 @@
 declare function isScrolledToTop(target: HTMLElement): boolean;
 declare function isScrolledToBottom(target: HTMLElement): boolean;
 declare function hasScrollbar(target: HTMLElement): boolean;
-declare const handleContainer: (container: HTMLElement) => () => void;
-export { isScrolledToTop, isScrolledToBottom, hasScrollbar, handleContainer };
+declare const restoreContainerStyles: (container: HTMLElement) => void;
+declare const handleContainer: (container?: HTMLElement | undefined) => void;
+export { isScrolledToTop, isScrolledToBottom, hasScrollbar, restoreContainerStyles, handleContainer };

package/dist/modern/utils.js

@@ -1,3 +1,5 @@
+import { getModalStore } from '@alfalab/core-components-global-store/dist/modern';
+
 function isScrolledToTop(target) {
     return target.scrollTop <= 0;
 }
@@ -28,12 +30,39 @@ const isOverflowing = (container) => {
 const getPaddingRight = (node) => {
     return parseInt(window.getComputedStyle(node).paddingRight, 10) || 0;
 };
+const restoreContainerStyles = (container) => {
+    const modalRestoreStyles = getModalStore().getRestoreStyles();
+    const index = modalRestoreStyles.findIndex(s => s.container === container);
+    const existingStyles = modalRestoreStyles[index];
+    if (!existingStyles)
+        return;
+    existingStyles.modals -= 1;
+    if (existingStyles.modals <= 0) {
+        modalRestoreStyles.splice(index, 1);
+        existingStyles.styles.forEach(({ value, el, key }) => {
+            if (value) {
+                el.style.setProperty(key, value);
+            }
+            else {
+                el.style.removeProperty(key);
+            }
+        });
+    }
+};
 const handleContainer = (container) => {
-    const restoreStyle = [];
+    if (!container)
+        return;
+    const modalRestoreStyles = getModalStore().getRestoreStyles();
+    const existingStyles = modalRestoreStyles.find(s => s.container === container);
+    if (existingStyles) {
+        existingStyles.modals += 1;
+        return;
+    }
+    const containerStyles = [];
     if (isOverflowing(container)) {
         // Вычисляет размер до применения `overflow hidden` для избежания скачков
         const scrollbarSize = getScrollbarSize();
-        restoreStyle.push({
+        containerStyles.push({
             value: container.style.paddingRight,
             key: 'padding-right',
             el: container,
@@ -52,23 +81,18 @@ const handleContainer = (container) => {
         : container;
     // Блокируем скролл даже если отсутствует скроллбар
     if (scrollContainer.style.overflow !== 'hidden') {
-        restoreStyle.push({
+        containerStyles.push({
             value: scrollContainer.style.overflow,
             key: 'overflow',
             el: scrollContainer,
         });
     }
     scrollContainer.style.overflow = 'hidden';
-    return () => {
-        restoreStyle.forEach(({ value, el, key }) => {
-            if (value) {
-                el.style.setProperty(key, value);
-            }
-            else {
-                el.style.removeProperty(key);
-            }
-        });
-    };
+    modalRestoreStyles.push({
+        container,
+        modals: 1,
+        styles: containerStyles,
+    });
 };
 
-export { handleContainer, hasScrollbar, isScrolledToBottom, isScrolledToTop };
+export { handleContainer, hasScrollbar, isScrolledToBottom, isScrolledToTop, restoreContainerStyles };

package/dist/utils.d.ts

@@ -1,5 +1,6 @@
 declare function isScrolledToTop(target: HTMLElement): boolean;
 declare function isScrolledToBottom(target: HTMLElement): boolean;
 declare function hasScrollbar(target: HTMLElement): boolean;
-declare const handleContainer: (container: HTMLElement) => () => void;
-export { isScrolledToTop, isScrolledToBottom, hasScrollbar, handleContainer };
+declare const restoreContainerStyles: (container: HTMLElement) => void;
+declare const handleContainer: (container?: HTMLElement | undefined) => void;
+export { isScrolledToTop, isScrolledToBottom, hasScrollbar, restoreContainerStyles, handleContainer };

package/dist/utils.js

@@ -2,6 +2,8 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var coreComponentsGlobalStore = require('@alfalab/core-components-global-store');
+
 function isScrolledToTop(target) {
     return target.scrollTop <= 0;
 }
@@ -32,12 +34,40 @@ var isOverflowing = function (container) {
 var getPaddingRight = function (node) {
     return parseInt(window.getComputedStyle(node).paddingRight, 10) || 0;
 };
+var restoreContainerStyles = function (container) {
+    var modalRestoreStyles = coreComponentsGlobalStore.getModalStore().getRestoreStyles();
+    var index = modalRestoreStyles.findIndex(function (s) { return s.container === container; });
+    var existingStyles = modalRestoreStyles[index];
+    if (!existingStyles)
+        return;
+    existingStyles.modals -= 1;
+    if (existingStyles.modals <= 0) {
+        modalRestoreStyles.splice(index, 1);
+        existingStyles.styles.forEach(function (_a) {
+            var value = _a.value, el = _a.el, key = _a.key;
+            if (value) {
+                el.style.setProperty(key, value);
+            }
+            else {
+                el.style.removeProperty(key);
+            }
+        });
+    }
+};
 var handleContainer = function (container) {
-    var restoreStyle = [];
+    if (!container)
+        return;
+    var modalRestoreStyles = coreComponentsGlobalStore.getModalStore().getRestoreStyles();
+    var existingStyles = modalRestoreStyles.find(function (s) { return s.container === container; });
+    if (existingStyles) {
+        existingStyles.modals += 1;
+        return;
+    }
+    var containerStyles = [];
     if (isOverflowing(container)) {
         // Вычисляет размер до применения `overflow hidden` для избежания скачков
         var scrollbarSize = getScrollbarSize();
-        restoreStyle.push({
+        containerStyles.push({
             value: container.style.paddingRight,
             key: 'padding-right',
             el: container,
@@ -56,27 +86,22 @@ var handleContainer = function (container) {
         : container;
     // Блокируем скролл даже если отсутствует скроллбар
     if (scrollContainer.style.overflow !== 'hidden') {
-        restoreStyle.push({
+        containerStyles.push({
             value: scrollContainer.style.overflow,
             key: 'overflow',
             el: scrollContainer,
         });
     }
     scrollContainer.style.overflow = 'hidden';
-    return function () {
-        restoreStyle.forEach(function (_a) {
-            var value = _a.value, el = _a.el, key = _a.key;
-            if (value) {
-                el.style.setProperty(key, value);
-            }
-            else {
-                el.style.removeProperty(key);
-            }
-        });
-    };
+    modalRestoreStyles.push({
+        container: container,
+        modals: 1,
+        styles: containerStyles,
+    });
 };
 
 exports.handleContainer = handleContainer;
 exports.hasScrollbar = hasScrollbar;
 exports.isScrolledToBottom = isScrolledToBottom;
 exports.isScrolledToTop = isScrolledToTop;
+exports.restoreContainerStyles = restoreContainerStyles;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@alfalab/core-components-base-modal",
-    "version": "3.0.1",
+    "version": "3.2.0",
     "description": "BaseModal component",
     "keywords": [],
     "license": "MIT",
@@ -16,6 +16,7 @@
     },
     "dependencies": {
         "@alfalab/core-components-backdrop": "^2.0.1",
+        "@alfalab/core-components-global-store": "^1.1.0",
         "@alfalab/core-components-portal": "^2.0.1",
         "@alfalab/core-components-stack": "^3.0.1",
         "classnames": "^2.2.6",
@@ -30,5 +31,5 @@
     "peerDependencies": {
         "react": "^16.9.0 || ^17.0.1"
     },
-    "gitHead": "0934905ac76c93940e8dd2b0ea9bb3131908ac00"
+    "gitHead": "ddf4fab6035139cf412e0acb7174ef388f23e4f2"
 }