@alfalab/core-components-base-modal 3.1.0 → 4.0.1

package/CHANGELOG.md

@@ -3,6 +3,34 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [4.0.0](https://github.com/alfa-laboratory/core-components/compare/@alfalab/core-components-base-modal@3.2.0...@alfalab/core-components-base-modal@4.0.0) (2022-03-24)
+
+
+### Features
+
+* **bottom-sheet:** update-bottom-sheet ([#1025](https://github.com/alfa-laboratory/core-components/issues/1025)) ([26fa9aa](https://github.com/alfa-laboratory/core-components/commit/26fa9aab68bebf0f7093a38bc0f18a9b596ccf37)), closes [#1032](https://github.com/alfa-laboratory/core-components/issues/1032)
+
+
+### BREAKING CHANGES
+
+* **bottom-sheet:** Большое обновление стилей, множество дополнительных настроек
+
+
+
+
+
+# [3.2.0](https://github.com/alfa-laboratory/core-components/compare/@alfalab/core-components-base-modal@3.1.0...@alfalab/core-components-base-modal@3.2.0) (2022-03-01)
+
+
+### Features
+
+* **base-modal:** add component ref for base modal ([#1008](https://github.com/alfa-laboratory/core-components/issues/1008)) ([fb13dbd](https://github.com/alfa-laboratory/core-components/commit/fb13dbdf6352b10b80a74fa87edfcb1f54b76d5a))
+* Исправить импорты в сторях. ([#998](https://github.com/alfa-laboratory/core-components/issues/998)) ([e6a654a](https://github.com/alfa-laboratory/core-components/commit/e6a654a0599451c7d149484cb61d8067eed083b7))
+
+
+
+
+
 # [3.1.0](https://github.com/alfa-laboratory/core-components/compare/@alfalab/core-components-base-modal@3.0.2...@alfalab/core-components-base-modal@3.1.0) (2022-01-17)
 
 

package/dist/Component.d.ts

@@ -108,6 +108,10 @@ type BaseModalProps = {
      * z-index компонента
      */
     zIndex?: number;
+    /**
+     * Реф, который должен быть установлен компонентной области
+     */
+    componentRef?: MutableRefObject<HTMLDivElement | null>;
 };
 type BaseModalContext = {
     hasFooter?: boolean;
@@ -115,6 +119,8 @@ type BaseModalContext = {
     hasScroll?: boolean;
     headerHighlighted?: boolean;
     footerHighlighted?: boolean;
+    headerOffset?: number;
+    setHeaderOffset: (offset: number) => void;
     contentRef: Ref<HTMLElement>;
     setHasHeader: (exists: boolean) => void;
     setHasFooter: (exists: boolean) => void;

package/dist/Component.js

@@ -48,7 +48,7 @@ var __assign = function () {
     return __assign.apply(this, arguments);
 };
 
-var styles = {"component":"base-modal__component_rp8e5","wrapper":"base-modal__wrapper_rp8e5","content":"base-modal__content_rp8e5","hidden":"base-modal__hidden_rp8e5","backdrop":"base-modal__backdrop_rp8e5","appear":"base-modal__appear_rp8e5","enter":"base-modal__enter_rp8e5","appearActive":"base-modal__appearActive_rp8e5","enterActive":"base-modal__enterActive_rp8e5","exit":"base-modal__exit_rp8e5","exitActive":"base-modal__exitActive_rp8e5","exitDone":"base-modal__exitDone_rp8e5"};
+var styles = {"component":"base-modal__component_1rup9","wrapper":"base-modal__wrapper_1rup9","content":"base-modal__content_1rup9","hidden":"base-modal__hidden_1rup9","backdrop":"base-modal__backdrop_1rup9","appear":"base-modal__appear_1rup9","enter":"base-modal__enter_1rup9","appearActive":"base-modal__appearActive_1rup9","enterActive":"base-modal__enterActive_1rup9","exit":"base-modal__exit_1rup9","exitActive":"base-modal__exitActive_1rup9","exitDone":"base-modal__exitDone_1rup9"};
 require('./index.css')
 
 var BaseModalContext = React__default['default'].createContext({
@@ -57,20 +57,23 @@ var BaseModalContext = React__default['default'].createContext({
     hasScroll: false,
     headerHighlighted: false,
     footerHighlighted: false,
+    headerOffset: 0,
+    setHeaderOffset: function () { return null; },
     contentRef: function () { return null; },
     setHasHeader: function () { return null; },
     setHasFooter: function () { return null; },
     onClose: function () { return null; },
 });
 var BaseModal = React.forwardRef(function (_a, ref) {
-    var open = _a.open, container = _a.container, children = _a.children, _b = _a.scrollHandler, scrollHandler = _b === void 0 ? 'wrapper' : _b, _c = _a.Backdrop, Backdrop = _c === void 0 ? coreComponentsBackdrop.Backdrop : _c, _d = _a.backdropProps, backdropProps = _d === void 0 ? {} : _d, _e = _a.transitionProps, transitionProps = _e === void 0 ? {} : _e, disableBackdropClick = _a.disableBackdropClick, _f = _a.disableAutoFocus, disableAutoFocus = _f === void 0 ? false : _f, _g = _a.disableFocusLock, disableFocusLock = _g === void 0 ? false : _g, _h = _a.disableEscapeKeyDown, disableEscapeKeyDown = _h === void 0 ? false : _h, _j = _a.disableRestoreFocus, disableRestoreFocus = _j === void 0 ? false : _j, _k = _a.keepMounted, keepMounted = _k === void 0 ? false : _k, className = _a.className, contentClassName = _a.contentClassName, wrapperClassName = _a.wrapperClassName, onBackdropClick = _a.onBackdropClick, onClose = _a.onClose, onEscapeKeyDown = _a.onEscapeKeyDown, onMount = _a.onMount, onUnmount = _a.onUnmount, dataTestId = _a.dataTestId, _l = _a.zIndex, zIndex = _l === void 0 ? coreComponentsStack.stackingOrder.MODAL : _l;
-    var _m = React.useState(!open), exited = _m[0], setExited = _m[1];
-    var _o = React.useState(false), hasScroll = _o[0], setHasScroll = _o[1];
-    var _p = React.useState(false), hasHeader = _p[0], setHasHeader = _p[1];
-    var _q = React.useState(false), hasFooter = _q[0], setHasFooter = _q[1];
-    var _r = React.useState(false), headerHighlighted = _r[0], setHeaderHighlighted = _r[1];
-    var _s = React.useState(false), footerHighlighted = _s[0], setFooterHighlighted = _s[1];
-    var componentRef = React.useRef(null);
+    var open = _a.open, container = _a.container, children = _a.children, _b = _a.scrollHandler, scrollHandler = _b === void 0 ? 'wrapper' : _b, _c = _a.Backdrop, Backdrop = _c === void 0 ? coreComponentsBackdrop.Backdrop : _c, _d = _a.backdropProps, backdropProps = _d === void 0 ? {} : _d, _e = _a.transitionProps, transitionProps = _e === void 0 ? {} : _e, disableBackdropClick = _a.disableBackdropClick, _f = _a.disableAutoFocus, disableAutoFocus = _f === void 0 ? false : _f, _g = _a.disableFocusLock, disableFocusLock = _g === void 0 ? false : _g, _h = _a.disableEscapeKeyDown, disableEscapeKeyDown = _h === void 0 ? false : _h, _j = _a.disableRestoreFocus, disableRestoreFocus = _j === void 0 ? false : _j, _k = _a.keepMounted, keepMounted = _k === void 0 ? false : _k, className = _a.className, contentClassName = _a.contentClassName, wrapperClassName = _a.wrapperClassName, onBackdropClick = _a.onBackdropClick, onClose = _a.onClose, onEscapeKeyDown = _a.onEscapeKeyDown, onMount = _a.onMount, onUnmount = _a.onUnmount, dataTestId = _a.dataTestId, _l = _a.zIndex, zIndex = _l === void 0 ? coreComponentsStack.stackingOrder.MODAL : _l, _m = _a.componentRef, componentRef = _m === void 0 ? null : _m;
+    var _o = React.useState(!open), exited = _o[0], setExited = _o[1];
+    var _p = React.useState(false), hasScroll = _p[0], setHasScroll = _p[1];
+    var _q = React.useState(false), hasHeader = _q[0], setHasHeader = _q[1];
+    var _r = React.useState(false), hasFooter = _r[0], setHasFooter = _r[1];
+    var _s = React.useState(false), headerHighlighted = _s[0], setHeaderHighlighted = _s[1];
+    var _t = React.useState(false), footerHighlighted = _t[0], setFooterHighlighted = _t[1];
+    var _u = React.useState(0), headerOffset = _u[0], setHeaderOffset = _u[1];
+    var componentNodeRef = React.useRef(null);
     var wrapperRef = React.useRef(null);
     var scrollableNodeRef = React.useRef(null);
     var contentNodeRef = React.useRef(null);
@@ -104,17 +107,18 @@ var BaseModal = React.forwardRef(function (_a, ref) {
         }
     }, [resizeObserver$1]);
     var handleScroll = React.useCallback(function () {
-        if (!scrollableNodeRef.current || !componentRef.current)
+        if (!scrollableNodeRef.current || !componentNodeRef.current)
             return;
         if (hasHeader) {
             setHeaderHighlighted(!utils.isScrolledToTop(scrollableNodeRef.current) &&
-                componentRef.current.getBoundingClientRect().top <= 0);
+                componentNodeRef.current.getBoundingClientRect().top - headerOffset <= 0);
         }
         if (hasFooter) {
             setFooterHighlighted(!utils.isScrolledToBottom(scrollableNodeRef.current) &&
-                componentRef.current.getBoundingClientRect().bottom >= window.innerHeight);
+                componentNodeRef.current.getBoundingClientRect().bottom >=
+                    window.innerHeight);
         }
-    }, [hasFooter, hasHeader]);
+    }, [hasFooter, hasHeader, headerOffset]);
     var handleClose = React.useCallback(function (event, reason) {
         if (onClose) {
             onClose(event, reason);
@@ -150,7 +154,7 @@ var BaseModal = React.forwardRef(function (_a, ref) {
         if (scrollHandler === 'wrapper')
             return wrapperRef.current;
         if (scrollHandler === 'content')
-            return componentRef.current;
+            return componentNodeRef.current;
         return scrollHandler.current || wrapperRef.current;
     }, [scrollHandler]);
     var handleEntered = React.useCallback(function (node, isAppearing) {
@@ -209,6 +213,8 @@ var BaseModal = React.forwardRef(function (_a, ref) {
         hasScroll: hasScroll,
         headerHighlighted: headerHighlighted,
         footerHighlighted: footerHighlighted,
+        headerOffset: headerOffset,
+        setHeaderOffset: setHeaderOffset,
         contentRef: contentRef,
         setHasHeader: setHasHeader,
         setHasFooter: setHasFooter,
@@ -220,6 +226,8 @@ var BaseModal = React.forwardRef(function (_a, ref) {
         hasScroll,
         headerHighlighted,
         footerHighlighted,
+        headerOffset,
+        setHeaderOffset,
         handleClose,
     ]);
     if (!shouldRender)
@@ -238,7 +246,7 @@ var BaseModal = React.forwardRef(function (_a, ref) {
                             zIndex: computedZIndex,
                         } },
                         React__default['default'].createElement(reactTransitionGroup.CSSTransition, __assign({ appear: true, timeout: 200, classNames: styles }, transitionProps, { in: open, onEntered: handleEntered, onExited: handleExited }),
-                            React__default['default'].createElement("div", { className: cn__default['default'](styles.component, className), ref: componentRef },
+                            React__default['default'].createElement("div", { className: cn__default['default'](styles.component, className), ref: mergeRefs__default['default']([componentRef, componentNodeRef]) },
                                 React__default['default'].createElement("div", { className: cn__default['default'](styles.content, contentClassName) }, children))))))));
     }));
 });

package/dist/cssm/Component.d.ts

@@ -108,6 +108,10 @@ type BaseModalProps = {
      * z-index компонента
      */
     zIndex?: number;
+    /**
+     * Реф, который должен быть установлен компонентной области
+     */
+    componentRef?: MutableRefObject<HTMLDivElement | null>;
 };
 type BaseModalContext = {
     hasFooter?: boolean;
@@ -115,6 +119,8 @@ type BaseModalContext = {
     hasScroll?: boolean;
     headerHighlighted?: boolean;
     footerHighlighted?: boolean;
+    headerOffset?: number;
+    setHeaderOffset: (offset: number) => void;
     contentRef: Ref<HTMLElement>;
     setHasHeader: (exists: boolean) => void;
     setHasFooter: (exists: boolean) => void;

package/dist/cssm/Component.js

@@ -56,20 +56,23 @@ var BaseModalContext = React__default['default'].createContext({
     hasScroll: false,
     headerHighlighted: false,
     footerHighlighted: false,
+    headerOffset: 0,
+    setHeaderOffset: function () { return null; },
     contentRef: function () { return null; },
     setHasHeader: function () { return null; },
     setHasFooter: function () { return null; },
     onClose: function () { return null; },
 });
 var BaseModal = React.forwardRef(function (_a, ref) {
-    var open = _a.open, container = _a.container, children = _a.children, _b = _a.scrollHandler, scrollHandler = _b === void 0 ? 'wrapper' : _b, _c = _a.Backdrop, Backdrop = _c === void 0 ? coreComponentsBackdrop.Backdrop : _c, _d = _a.backdropProps, backdropProps = _d === void 0 ? {} : _d, _e = _a.transitionProps, transitionProps = _e === void 0 ? {} : _e, disableBackdropClick = _a.disableBackdropClick, _f = _a.disableAutoFocus, disableAutoFocus = _f === void 0 ? false : _f, _g = _a.disableFocusLock, disableFocusLock = _g === void 0 ? false : _g, _h = _a.disableEscapeKeyDown, disableEscapeKeyDown = _h === void 0 ? false : _h, _j = _a.disableRestoreFocus, disableRestoreFocus = _j === void 0 ? false : _j, _k = _a.keepMounted, keepMounted = _k === void 0 ? false : _k, className = _a.className, contentClassName = _a.contentClassName, wrapperClassName = _a.wrapperClassName, onBackdropClick = _a.onBackdropClick, onClose = _a.onClose, onEscapeKeyDown = _a.onEscapeKeyDown, onMount = _a.onMount, onUnmount = _a.onUnmount, dataTestId = _a.dataTestId, _l = _a.zIndex, zIndex = _l === void 0 ? coreComponentsStack.stackingOrder.MODAL : _l;
-    var _m = React.useState(!open), exited = _m[0], setExited = _m[1];
-    var _o = React.useState(false), hasScroll = _o[0], setHasScroll = _o[1];
-    var _p = React.useState(false), hasHeader = _p[0], setHasHeader = _p[1];
-    var _q = React.useState(false), hasFooter = _q[0], setHasFooter = _q[1];
-    var _r = React.useState(false), headerHighlighted = _r[0], setHeaderHighlighted = _r[1];
-    var _s = React.useState(false), footerHighlighted = _s[0], setFooterHighlighted = _s[1];
-    var componentRef = React.useRef(null);
+    var open = _a.open, container = _a.container, children = _a.children, _b = _a.scrollHandler, scrollHandler = _b === void 0 ? 'wrapper' : _b, _c = _a.Backdrop, Backdrop = _c === void 0 ? coreComponentsBackdrop.Backdrop : _c, _d = _a.backdropProps, backdropProps = _d === void 0 ? {} : _d, _e = _a.transitionProps, transitionProps = _e === void 0 ? {} : _e, disableBackdropClick = _a.disableBackdropClick, _f = _a.disableAutoFocus, disableAutoFocus = _f === void 0 ? false : _f, _g = _a.disableFocusLock, disableFocusLock = _g === void 0 ? false : _g, _h = _a.disableEscapeKeyDown, disableEscapeKeyDown = _h === void 0 ? false : _h, _j = _a.disableRestoreFocus, disableRestoreFocus = _j === void 0 ? false : _j, _k = _a.keepMounted, keepMounted = _k === void 0 ? false : _k, className = _a.className, contentClassName = _a.contentClassName, wrapperClassName = _a.wrapperClassName, onBackdropClick = _a.onBackdropClick, onClose = _a.onClose, onEscapeKeyDown = _a.onEscapeKeyDown, onMount = _a.onMount, onUnmount = _a.onUnmount, dataTestId = _a.dataTestId, _l = _a.zIndex, zIndex = _l === void 0 ? coreComponentsStack.stackingOrder.MODAL : _l, _m = _a.componentRef, componentRef = _m === void 0 ? null : _m;
+    var _o = React.useState(!open), exited = _o[0], setExited = _o[1];
+    var _p = React.useState(false), hasScroll = _p[0], setHasScroll = _p[1];
+    var _q = React.useState(false), hasHeader = _q[0], setHasHeader = _q[1];
+    var _r = React.useState(false), hasFooter = _r[0], setHasFooter = _r[1];
+    var _s = React.useState(false), headerHighlighted = _s[0], setHeaderHighlighted = _s[1];
+    var _t = React.useState(false), footerHighlighted = _t[0], setFooterHighlighted = _t[1];
+    var _u = React.useState(0), headerOffset = _u[0], setHeaderOffset = _u[1];
+    var componentNodeRef = React.useRef(null);
     var wrapperRef = React.useRef(null);
     var scrollableNodeRef = React.useRef(null);
     var contentNodeRef = React.useRef(null);
@@ -103,17 +106,18 @@ var BaseModal = React.forwardRef(function (_a, ref) {
         }
     }, [resizeObserver$1]);
     var handleScroll = React.useCallback(function () {
-        if (!scrollableNodeRef.current || !componentRef.current)
+        if (!scrollableNodeRef.current || !componentNodeRef.current)
             return;
         if (hasHeader) {
             setHeaderHighlighted(!utils.isScrolledToTop(scrollableNodeRef.current) &&
-                componentRef.current.getBoundingClientRect().top <= 0);
+                componentNodeRef.current.getBoundingClientRect().top - headerOffset <= 0);
         }
         if (hasFooter) {
             setFooterHighlighted(!utils.isScrolledToBottom(scrollableNodeRef.current) &&
-                componentRef.current.getBoundingClientRect().bottom >= window.innerHeight);
+                componentNodeRef.current.getBoundingClientRect().bottom >=
+                    window.innerHeight);
         }
-    }, [hasFooter, hasHeader]);
+    }, [hasFooter, hasHeader, headerOffset]);
     var handleClose = React.useCallback(function (event, reason) {
         if (onClose) {
             onClose(event, reason);
@@ -149,7 +153,7 @@ var BaseModal = React.forwardRef(function (_a, ref) {
         if (scrollHandler === 'wrapper')
             return wrapperRef.current;
         if (scrollHandler === 'content')
-            return componentRef.current;
+            return componentNodeRef.current;
         return scrollHandler.current || wrapperRef.current;
     }, [scrollHandler]);
     var handleEntered = React.useCallback(function (node, isAppearing) {
@@ -208,6 +212,8 @@ var BaseModal = React.forwardRef(function (_a, ref) {
         hasScroll: hasScroll,
         headerHighlighted: headerHighlighted,
         footerHighlighted: footerHighlighted,
+        headerOffset: headerOffset,
+        setHeaderOffset: setHeaderOffset,
         contentRef: contentRef,
         setHasHeader: setHasHeader,
         setHasFooter: setHasFooter,
@@ -219,6 +225,8 @@ var BaseModal = React.forwardRef(function (_a, ref) {
         hasScroll,
         headerHighlighted,
         footerHighlighted,
+        headerOffset,
+        setHeaderOffset,
         handleClose,
     ]);
     if (!shouldRender)
@@ -237,7 +245,7 @@ var BaseModal = React.forwardRef(function (_a, ref) {
                             zIndex: computedZIndex,
                         } },
                         React__default['default'].createElement(reactTransitionGroup.CSSTransition, __assign({ appear: true, timeout: 200, classNames: styles__default['default'] }, transitionProps, { in: open, onEntered: handleEntered, onExited: handleExited }),
-                            React__default['default'].createElement("div", { className: cn__default['default'](styles__default['default'].component, className), ref: componentRef },
+                            React__default['default'].createElement("div", { className: cn__default['default'](styles__default['default'].component, className), ref: mergeRefs__default['default']([componentRef, componentNodeRef]) },
                                 React__default['default'].createElement("div", { className: cn__default['default'](styles__default['default'].content, contentClassName) }, children))))))));
     }));
 });

package/dist/esm/Component.d.ts

@@ -108,6 +108,10 @@ type BaseModalProps = {
      * z-index компонента
      */
     zIndex?: number;
+    /**
+     * Реф, который должен быть установлен компонентной области
+     */
+    componentRef?: MutableRefObject<HTMLDivElement | null>;
 };
 type BaseModalContext = {
     hasFooter?: boolean;
@@ -115,6 +119,8 @@ type BaseModalContext = {
     hasScroll?: boolean;
     headerHighlighted?: boolean;
     footerHighlighted?: boolean;
+    headerOffset?: number;
+    setHeaderOffset: (offset: number) => void;
     contentRef: Ref<HTMLElement>;
     setHasHeader: (exists: boolean) => void;
     setHasFooter: (exists: boolean) => void;

package/dist/esm/Component.js

@@ -37,7 +37,7 @@ var __assign = function () {
     return __assign.apply(this, arguments);
 };
 
-var styles = {"component":"base-modal__component_rp8e5","wrapper":"base-modal__wrapper_rp8e5","content":"base-modal__content_rp8e5","hidden":"base-modal__hidden_rp8e5","backdrop":"base-modal__backdrop_rp8e5","appear":"base-modal__appear_rp8e5","enter":"base-modal__enter_rp8e5","appearActive":"base-modal__appearActive_rp8e5","enterActive":"base-modal__enterActive_rp8e5","exit":"base-modal__exit_rp8e5","exitActive":"base-modal__exitActive_rp8e5","exitDone":"base-modal__exitDone_rp8e5"};
+var styles = {"component":"base-modal__component_1rup9","wrapper":"base-modal__wrapper_1rup9","content":"base-modal__content_1rup9","hidden":"base-modal__hidden_1rup9","backdrop":"base-modal__backdrop_1rup9","appear":"base-modal__appear_1rup9","enter":"base-modal__enter_1rup9","appearActive":"base-modal__appearActive_1rup9","enterActive":"base-modal__enterActive_1rup9","exit":"base-modal__exit_1rup9","exitActive":"base-modal__exitActive_1rup9","exitDone":"base-modal__exitDone_1rup9"};
 require('./index.css')
 
 var BaseModalContext = React.createContext({
@@ -46,20 +46,23 @@ var BaseModalContext = React.createContext({
     hasScroll: false,
     headerHighlighted: false,
     footerHighlighted: false,
+    headerOffset: 0,
+    setHeaderOffset: function () { return null; },
     contentRef: function () { return null; },
     setHasHeader: function () { return null; },
     setHasFooter: function () { return null; },
     onClose: function () { return null; },
 });
 var BaseModal = forwardRef(function (_a, ref) {
-    var open = _a.open, container = _a.container, children = _a.children, _b = _a.scrollHandler, scrollHandler = _b === void 0 ? 'wrapper' : _b, _c = _a.Backdrop, Backdrop$1 = _c === void 0 ? Backdrop : _c, _d = _a.backdropProps, backdropProps = _d === void 0 ? {} : _d, _e = _a.transitionProps, transitionProps = _e === void 0 ? {} : _e, disableBackdropClick = _a.disableBackdropClick, _f = _a.disableAutoFocus, disableAutoFocus = _f === void 0 ? false : _f, _g = _a.disableFocusLock, disableFocusLock = _g === void 0 ? false : _g, _h = _a.disableEscapeKeyDown, disableEscapeKeyDown = _h === void 0 ? false : _h, _j = _a.disableRestoreFocus, disableRestoreFocus = _j === void 0 ? false : _j, _k = _a.keepMounted, keepMounted = _k === void 0 ? false : _k, className = _a.className, contentClassName = _a.contentClassName, wrapperClassName = _a.wrapperClassName, onBackdropClick = _a.onBackdropClick, onClose = _a.onClose, onEscapeKeyDown = _a.onEscapeKeyDown, onMount = _a.onMount, onUnmount = _a.onUnmount, dataTestId = _a.dataTestId, _l = _a.zIndex, zIndex = _l === void 0 ? stackingOrder.MODAL : _l;
-    var _m = useState(!open), exited = _m[0], setExited = _m[1];
-    var _o = useState(false), hasScroll = _o[0], setHasScroll = _o[1];
-    var _p = useState(false), hasHeader = _p[0], setHasHeader = _p[1];
-    var _q = useState(false), hasFooter = _q[0], setHasFooter = _q[1];
-    var _r = useState(false), headerHighlighted = _r[0], setHeaderHighlighted = _r[1];
-    var _s = useState(false), footerHighlighted = _s[0], setFooterHighlighted = _s[1];
-    var componentRef = useRef(null);
+    var open = _a.open, container = _a.container, children = _a.children, _b = _a.scrollHandler, scrollHandler = _b === void 0 ? 'wrapper' : _b, _c = _a.Backdrop, Backdrop$1 = _c === void 0 ? Backdrop : _c, _d = _a.backdropProps, backdropProps = _d === void 0 ? {} : _d, _e = _a.transitionProps, transitionProps = _e === void 0 ? {} : _e, disableBackdropClick = _a.disableBackdropClick, _f = _a.disableAutoFocus, disableAutoFocus = _f === void 0 ? false : _f, _g = _a.disableFocusLock, disableFocusLock = _g === void 0 ? false : _g, _h = _a.disableEscapeKeyDown, disableEscapeKeyDown = _h === void 0 ? false : _h, _j = _a.disableRestoreFocus, disableRestoreFocus = _j === void 0 ? false : _j, _k = _a.keepMounted, keepMounted = _k === void 0 ? false : _k, className = _a.className, contentClassName = _a.contentClassName, wrapperClassName = _a.wrapperClassName, onBackdropClick = _a.onBackdropClick, onClose = _a.onClose, onEscapeKeyDown = _a.onEscapeKeyDown, onMount = _a.onMount, onUnmount = _a.onUnmount, dataTestId = _a.dataTestId, _l = _a.zIndex, zIndex = _l === void 0 ? stackingOrder.MODAL : _l, _m = _a.componentRef, componentRef = _m === void 0 ? null : _m;
+    var _o = useState(!open), exited = _o[0], setExited = _o[1];
+    var _p = useState(false), hasScroll = _p[0], setHasScroll = _p[1];
+    var _q = useState(false), hasHeader = _q[0], setHasHeader = _q[1];
+    var _r = useState(false), hasFooter = _r[0], setHasFooter = _r[1];
+    var _s = useState(false), headerHighlighted = _s[0], setHeaderHighlighted = _s[1];
+    var _t = useState(false), footerHighlighted = _t[0], setFooterHighlighted = _t[1];
+    var _u = useState(0), headerOffset = _u[0], setHeaderOffset = _u[1];
+    var componentNodeRef = useRef(null);
     var wrapperRef = useRef(null);
     var scrollableNodeRef = useRef(null);
     var contentNodeRef = useRef(null);
@@ -93,17 +96,18 @@ var BaseModal = forwardRef(function (_a, ref) {
         }
     }, [resizeObserver]);
     var handleScroll = useCallback(function () {
-        if (!scrollableNodeRef.current || !componentRef.current)
+        if (!scrollableNodeRef.current || !componentNodeRef.current)
             return;
         if (hasHeader) {
             setHeaderHighlighted(!isScrolledToTop(scrollableNodeRef.current) &&
-                componentRef.current.getBoundingClientRect().top <= 0);
+                componentNodeRef.current.getBoundingClientRect().top - headerOffset <= 0);
         }
         if (hasFooter) {
             setFooterHighlighted(!isScrolledToBottom(scrollableNodeRef.current) &&
-                componentRef.current.getBoundingClientRect().bottom >= window.innerHeight);
+                componentNodeRef.current.getBoundingClientRect().bottom >=
+                    window.innerHeight);
         }
-    }, [hasFooter, hasHeader]);
+    }, [hasFooter, hasHeader, headerOffset]);
     var handleClose = useCallback(function (event, reason) {
         if (onClose) {
             onClose(event, reason);
@@ -139,7 +143,7 @@ var BaseModal = forwardRef(function (_a, ref) {
         if (scrollHandler === 'wrapper')
             return wrapperRef.current;
         if (scrollHandler === 'content')
-            return componentRef.current;
+            return componentNodeRef.current;
         return scrollHandler.current || wrapperRef.current;
     }, [scrollHandler]);
     var handleEntered = useCallback(function (node, isAppearing) {
@@ -198,6 +202,8 @@ var BaseModal = forwardRef(function (_a, ref) {
         hasScroll: hasScroll,
         headerHighlighted: headerHighlighted,
         footerHighlighted: footerHighlighted,
+        headerOffset: headerOffset,
+        setHeaderOffset: setHeaderOffset,
         contentRef: contentRef,
         setHasHeader: setHasHeader,
         setHasFooter: setHasFooter,
@@ -209,6 +215,8 @@ var BaseModal = forwardRef(function (_a, ref) {
         hasScroll,
         headerHighlighted,
         footerHighlighted,
+        headerOffset,
+        setHeaderOffset,
         handleClose,
     ]);
     if (!shouldRender)
@@ -227,7 +235,7 @@ var BaseModal = forwardRef(function (_a, ref) {
                             zIndex: computedZIndex,
                         } },
                         React.createElement(CSSTransition, __assign({ appear: true, timeout: 200, classNames: styles }, transitionProps, { in: open, onEntered: handleEntered, onExited: handleExited }),
-                            React.createElement("div", { className: cn(styles.component, className), ref: componentRef },
+                            React.createElement("div", { className: cn(styles.component, className), ref: mergeRefs([componentRef, componentNodeRef]) },
                                 React.createElement("div", { className: cn(styles.content, contentClassName) }, children))))))));
     }));
 });

package/dist/esm/index.css

@@ -1,4 +1,4 @@
-/* hash: 1pbe4 */
+/* hash: 1shy2 */
 :root {
     --color-light-bg-primary: #fff;
 }
@@ -10,14 +10,14 @@
 
     /* Hard up */
 }
-.base-modal__component_rp8e5 {
+.base-modal__component_1rup9 {
     position: relative;
     box-sizing: border-box;
     background: var(--color-light-bg-primary);
     margin: auto;
     flex-shrink: 0;
 }
-.base-modal__wrapper_rp8e5 {
+.base-modal__wrapper_1rup9 {
     position: fixed;
     top: 0;
     left: 0;
@@ -30,33 +30,33 @@
     align-items: center;
     outline: 0;
 }
-.base-modal__content_rp8e5 {
+.base-modal__content_1rup9 {
     width: 100%;
     height: 100%;
     display: flex;
     flex-direction: column;
     flex: 1;
 }
-.base-modal__hidden_rp8e5 {
+.base-modal__hidden_1rup9 {
     display: none;
 }
-.base-modal__backdrop_rp8e5 {
+.base-modal__backdrop_1rup9 {
     z-index: 0;
 }
-.base-modal__appear_rp8e5,
-.base-modal__enter_rp8e5 {
+.base-modal__appear_1rup9,
+.base-modal__enter_1rup9 {
     opacity: 0;
 }
-.base-modal__appearActive_rp8e5,
-.base-modal__enterActive_rp8e5 {
+.base-modal__appearActive_1rup9,
+.base-modal__enterActive_1rup9 {
     opacity: 1;
     transition: opacity 200ms ease-in;
 }
-.base-modal__exit_rp8e5 {
+.base-modal__exit_1rup9 {
     opacity: 1;
 }
-.base-modal__exitActive_rp8e5,
-.base-modal__exitDone_rp8e5 {
+.base-modal__exitActive_1rup9,
+.base-modal__exitDone_1rup9 {
     opacity: 0;
     transition: opacity 200ms ease-out;
 }

package/dist/index.css

@@ -1,4 +1,4 @@
-/* hash: 1pbe4 */
+/* hash: 1shy2 */
 :root {
     --color-light-bg-primary: #fff;
 }
@@ -10,14 +10,14 @@
 
     /* Hard up */
 }
-.base-modal__component_rp8e5 {
+.base-modal__component_1rup9 {
     position: relative;
     box-sizing: border-box;
     background: var(--color-light-bg-primary);
     margin: auto;
     flex-shrink: 0;
 }
-.base-modal__wrapper_rp8e5 {
+.base-modal__wrapper_1rup9 {
     position: fixed;
     top: 0;
     left: 0;
@@ -30,33 +30,33 @@
     align-items: center;
     outline: 0;
 }
-.base-modal__content_rp8e5 {
+.base-modal__content_1rup9 {
     width: 100%;
     height: 100%;
     display: flex;
     flex-direction: column;
     flex: 1;
 }
-.base-modal__hidden_rp8e5 {
+.base-modal__hidden_1rup9 {
     display: none;
 }
-.base-modal__backdrop_rp8e5 {
+.base-modal__backdrop_1rup9 {
     z-index: 0;
 }
-.base-modal__appear_rp8e5,
-.base-modal__enter_rp8e5 {
+.base-modal__appear_1rup9,
+.base-modal__enter_1rup9 {
     opacity: 0;
 }
-.base-modal__appearActive_rp8e5,
-.base-modal__enterActive_rp8e5 {
+.base-modal__appearActive_1rup9,
+.base-modal__enterActive_1rup9 {
     opacity: 1;
     transition: opacity 200ms ease-in;
 }
-.base-modal__exit_rp8e5 {
+.base-modal__exit_1rup9 {
     opacity: 1;
 }
-.base-modal__exitActive_rp8e5,
-.base-modal__exitDone_rp8e5 {
+.base-modal__exitActive_1rup9,
+.base-modal__exitDone_1rup9 {
     opacity: 0;
     transition: opacity 200ms ease-out;
 }

package/dist/modern/Component.d.ts

@@ -108,6 +108,10 @@ type BaseModalProps = {
      * z-index компонента
      */
     zIndex?: number;
+    /**
+     * Реф, который должен быть установлен компонентной области
+     */
+    componentRef?: MutableRefObject<HTMLDivElement | null>;
 };
 type BaseModalContext = {
     hasFooter?: boolean;
@@ -115,6 +119,8 @@ type BaseModalContext = {
     hasScroll?: boolean;
     headerHighlighted?: boolean;
     footerHighlighted?: boolean;
+    headerOffset?: number;
+    setHeaderOffset: (offset: number) => void;
     contentRef: Ref<HTMLElement>;
     setHasHeader: (exists: boolean) => void;
     setHasFooter: (exists: boolean) => void;

package/dist/modern/Component.js

@@ -10,7 +10,7 @@ import { stackingOrder, Stack } from '@alfalab/core-components-stack/dist/modern
 import '@alfalab/core-components-global-store/dist/modern';
 import { isScrolledToTop, isScrolledToBottom, handleContainer, restoreContainerStyles, hasScrollbar } from './utils.js';
 
-var styles = {"component":"base-modal__component_rp8e5","wrapper":"base-modal__wrapper_rp8e5","content":"base-modal__content_rp8e5","hidden":"base-modal__hidden_rp8e5","backdrop":"base-modal__backdrop_rp8e5","appear":"base-modal__appear_rp8e5","enter":"base-modal__enter_rp8e5","appearActive":"base-modal__appearActive_rp8e5","enterActive":"base-modal__enterActive_rp8e5","exit":"base-modal__exit_rp8e5","exitActive":"base-modal__exitActive_rp8e5","exitDone":"base-modal__exitDone_rp8e5"};
+var styles = {"component":"base-modal__component_1rup9","wrapper":"base-modal__wrapper_1rup9","content":"base-modal__content_1rup9","hidden":"base-modal__hidden_1rup9","backdrop":"base-modal__backdrop_1rup9","appear":"base-modal__appear_1rup9","enter":"base-modal__enter_1rup9","appearActive":"base-modal__appearActive_1rup9","enterActive":"base-modal__enterActive_1rup9","exit":"base-modal__exit_1rup9","exitActive":"base-modal__exitActive_1rup9","exitDone":"base-modal__exitDone_1rup9"};
 require('./index.css')
 
 /* eslint-disable jsx-a11y/no-noninteractive-element-interactions */
@@ -20,19 +20,22 @@ const BaseModalContext = React.createContext({
     hasScroll: false,
     headerHighlighted: false,
     footerHighlighted: false,
+    headerOffset: 0,
+    setHeaderOffset: () => null,
     contentRef: () => null,
     setHasHeader: () => null,
     setHasFooter: () => null,
     onClose: () => null,
 });
-const BaseModal = forwardRef(({ open, container, children, scrollHandler = 'wrapper', Backdrop: Backdrop$1 = Backdrop, backdropProps = {}, transitionProps = {}, disableBackdropClick, disableAutoFocus = false, disableFocusLock = false, disableEscapeKeyDown = false, disableRestoreFocus = false, keepMounted = false, className, contentClassName, wrapperClassName, onBackdropClick, onClose, onEscapeKeyDown, onMount, onUnmount, dataTestId, zIndex = stackingOrder.MODAL, }, ref) => {
+const BaseModal = forwardRef(({ open, container, children, scrollHandler = 'wrapper', Backdrop: Backdrop$1 = Backdrop, backdropProps = {}, transitionProps = {}, disableBackdropClick, disableAutoFocus = false, disableFocusLock = false, disableEscapeKeyDown = false, disableRestoreFocus = false, keepMounted = false, className, contentClassName, wrapperClassName, onBackdropClick, onClose, onEscapeKeyDown, onMount, onUnmount, dataTestId, zIndex = stackingOrder.MODAL, componentRef = null, }, ref) => {
     const [exited, setExited] = useState(!open);
     const [hasScroll, setHasScroll] = useState(false);
     const [hasHeader, setHasHeader] = useState(false);
     const [hasFooter, setHasFooter] = useState(false);
     const [headerHighlighted, setHeaderHighlighted] = useState(false);
     const [footerHighlighted, setFooterHighlighted] = useState(false);
-    const componentRef = useRef(null);
+    const [headerOffset, setHeaderOffset] = useState(0);
+    const componentNodeRef = useRef(null);
     const wrapperRef = useRef(null);
     const scrollableNodeRef = useRef(null);
     const contentNodeRef = useRef(null);
@@ -66,17 +69,18 @@ const BaseModal = forwardRef(({ open, container, children, scrollHandler = 'wrap
         }
     }, [resizeObserver]);
     const handleScroll = useCallback(() => {
-        if (!scrollableNodeRef.current || !componentRef.current)
+        if (!scrollableNodeRef.current || !componentNodeRef.current)
             return;
         if (hasHeader) {
             setHeaderHighlighted(!isScrolledToTop(scrollableNodeRef.current) &&
-                componentRef.current.getBoundingClientRect().top <= 0);
+                componentNodeRef.current.getBoundingClientRect().top - headerOffset <= 0);
         }
         if (hasFooter) {
             setFooterHighlighted(!isScrolledToBottom(scrollableNodeRef.current) &&
-                componentRef.current.getBoundingClientRect().bottom >= window.innerHeight);
+                componentNodeRef.current.getBoundingClientRect().bottom >=
+                    window.innerHeight);
         }
-    }, [hasFooter, hasHeader]);
+    }, [hasFooter, hasHeader, headerOffset]);
     const handleClose = useCallback((event, reason) => {
         if (onClose) {
             onClose(event, reason);
@@ -112,7 +116,7 @@ const BaseModal = forwardRef(({ open, container, children, scrollHandler = 'wrap
         if (scrollHandler === 'wrapper')
             return wrapperRef.current;
         if (scrollHandler === 'content')
-            return componentRef.current;
+            return componentNodeRef.current;
         return scrollHandler.current || wrapperRef.current;
     }, [scrollHandler]);
     const handleEntered = useCallback((node, isAppearing) => {
@@ -171,6 +175,8 @@ const BaseModal = forwardRef(({ open, container, children, scrollHandler = 'wrap
         hasScroll,
         headerHighlighted,
         footerHighlighted,
+        headerOffset,
+        setHeaderOffset,
         contentRef,
         setHasHeader,
         setHasFooter,
@@ -182,6 +188,8 @@ const BaseModal = forwardRef(({ open, container, children, scrollHandler = 'wrap
         hasScroll,
         headerHighlighted,
         footerHighlighted,
+        headerOffset,
+        setHeaderOffset,
         handleClose,
     ]);
     if (!shouldRender)
@@ -198,7 +206,7 @@ const BaseModal = forwardRef(({ open, container, children, scrollHandler = 'wrap
                         zIndex: computedZIndex,
                     } },
                     React.createElement(CSSTransition, Object.assign({ appear: true, timeout: 200, classNames: styles }, transitionProps, { in: open, onEntered: handleEntered, onExited: handleExited }),
-                        React.createElement("div", { className: cn(styles.component, className), ref: componentRef },
+                        React.createElement("div", { className: cn(styles.component, className), ref: mergeRefs([componentRef, componentNodeRef]) },
                             React.createElement("div", { className: cn(styles.content, contentClassName) }, children))))))))));
 });
 

package/dist/modern/index.css

@@ -1,4 +1,4 @@
-/* hash: 1pbe4 */
+/* hash: 1shy2 */
 :root {
     --color-light-bg-primary: #fff;
 }
@@ -10,14 +10,14 @@
 
     /* Hard up */
 }
-.base-modal__component_rp8e5 {
+.base-modal__component_1rup9 {
     position: relative;
     box-sizing: border-box;
     background: var(--color-light-bg-primary);
     margin: auto;
     flex-shrink: 0;
 }
-.base-modal__wrapper_rp8e5 {
+.base-modal__wrapper_1rup9 {
     position: fixed;
     top: 0;
     left: 0;
@@ -30,33 +30,33 @@
     align-items: center;
     outline: 0;
 }
-.base-modal__content_rp8e5 {
+.base-modal__content_1rup9 {
     width: 100%;
     height: 100%;
     display: flex;
     flex-direction: column;
     flex: 1;
 }
-.base-modal__hidden_rp8e5 {
+.base-modal__hidden_1rup9 {
     display: none;
 }
-.base-modal__backdrop_rp8e5 {
+.base-modal__backdrop_1rup9 {
     z-index: 0;
 }
-.base-modal__appear_rp8e5,
-.base-modal__enter_rp8e5 {
+.base-modal__appear_1rup9,
+.base-modal__enter_1rup9 {
     opacity: 0;
 }
-.base-modal__appearActive_rp8e5,
-.base-modal__enterActive_rp8e5 {
+.base-modal__appearActive_1rup9,
+.base-modal__enterActive_1rup9 {
     opacity: 1;
     transition: opacity 200ms ease-in;
 }
-.base-modal__exit_rp8e5 {
+.base-modal__exit_1rup9 {
     opacity: 1;
 }
-.base-modal__exitActive_rp8e5,
-.base-modal__exitDone_rp8e5 {
+.base-modal__exitActive_1rup9,
+.base-modal__exitDone_1rup9 {
     opacity: 0;
     transition: opacity 200ms ease-out;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@alfalab/core-components-base-modal",
-    "version": "3.1.0",
+    "version": "4.0.1",
     "description": "BaseModal component",
     "keywords": [],
     "license": "MIT",
@@ -15,15 +15,15 @@
         "access": "public"
     },
     "dependencies": {
-        "@alfalab/core-components-backdrop": "^2.0.1",
+        "@alfalab/core-components-backdrop": "^2.0.2",
         "@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",
-        "react-focus-lock": "^2.5.0",
-        "react-merge-refs": "^1.1.0",
-        "react-transition-group": "^4.3.0",
-        "resize-observer": "^1.0.0"
+        "classnames": "2.2.6",
+        "react-focus-lock": "2.5.0",
+        "react-merge-refs": "1.1.0",
+        "react-transition-group": "4.4.1",
+        "resize-observer": "1.0.0"
     },
     "devDependencies": {
         "@types/react-transition-group": "^4.2.4"
@@ -31,5 +31,5 @@
     "peerDependencies": {
         "react": "^16.9.0 || ^17.0.1"
     },
-    "gitHead": "d35b2d43cbc90ecb7665c682a2de13733bc03eb0"
+    "gitHead": "0363f194b7d8e6d2949795b8f0570262d7028aff"
 }