@alfalab/core-components 42.0.0-beta.2 → 42.1.0

package/bottom-sheet/modern/component.js

@@ -8,30 +8,32 @@ import { getDataTestId } from '../../shared/modern';
 import { Footer } from './components/footer/Component.js';
 import { Header } from './components/header/Component.js';
 import { SwipeableBackdrop } from './components/swipeable-backdrop/Component.js';
-import { convertPercentToNumber, HEADER_OFFSET, TIMEOUT, MARKER_HEIGHT, SCROLL_OFFSET, SWIPE_VELOCITY, CLOSE_OFFSET } from './utils.js';
+import { convertPercentToNumber, TIMEOUT, MARKER_HEIGHT, SCROLL_OFFSET, SWIPE_VELOCITY, CLOSE_OFFSET } from './utils.js';
 import '../../navigation-bar/modern';
 import '../../backdrop/modern';
 
-const styles = {"modal":"bottom-sheet__modal_x9ovx","wrapper":"bottom-sheet__wrapper_x9ovx","component":"bottom-sheet__component_x9ovx","withTransition":"bottom-sheet__withTransition_x9ovx","scrollableContainer":"bottom-sheet__scrollableContainer_x9ovx","marker":"bottom-sheet__marker_x9ovx","content":"bottom-sheet__content_x9ovx","noHeader":"bottom-sheet__noHeader_x9ovx","noFooter":"bottom-sheet__noFooter_x9ovx","scrollLocked":"bottom-sheet__scrollLocked_x9ovx","hiddenScrollbar":"bottom-sheet__hiddenScrollbar_x9ovx","disabledPointerEvents":"bottom-sheet__disabledPointerEvents_x9ovx","appear":"bottom-sheet__appear_x9ovx","enter":"bottom-sheet__enter_x9ovx","appearActive":"bottom-sheet__appearActive_x9ovx","enterActive":"bottom-sheet__enterActive_x9ovx","enterDone":"bottom-sheet__enterDone_x9ovx","appearDone":"bottom-sheet__appearDone_x9ovx","exit":"bottom-sheet__exit_x9ovx","exitActive":"bottom-sheet__exitActive_x9ovx","background-accent":"bottom-sheet__background-accent_x9ovx","background-info":"bottom-sheet__background-info_x9ovx","background-attention-muted":"bottom-sheet__background-attention-muted_x9ovx","background-positive-muted":"bottom-sheet__background-positive-muted_x9ovx","background-negative-muted":"bottom-sheet__background-negative-muted_x9ovx","background-primary":"bottom-sheet__background-primary_x9ovx","background-primary-inverted":"bottom-sheet__background-primary-inverted_x9ovx","background-secondary":"bottom-sheet__background-secondary_x9ovx","background-secondary-inverted":"bottom-sheet__background-secondary-inverted_x9ovx","background-tertiary":"bottom-sheet__background-tertiary_x9ovx","background-tertiary-inverted":"bottom-sheet__background-tertiary-inverted_x9ovx","background-quaternary":"bottom-sheet__background-quaternary_x9ovx","background-quaternary-inverted":"bottom-sheet__background-quaternary-inverted_x9ovx","background-specialbg-component":"bottom-sheet__background-specialbg-component_x9ovx","background-specialbg-component-inverted":"bottom-sheet__background-specialbg-component-inverted_x9ovx","background-specialbg-primary-grouped":"bottom-sheet__background-specialbg-primary-grouped_x9ovx","background-specialbg-secondary-grouped":"bottom-sheet__background-specialbg-secondary-grouped_x9ovx","background-specialbg-tertiary-grouped":"bottom-sheet__background-specialbg-tertiary-grouped_x9ovx","background-specialbg-secondary-transparent":"bottom-sheet__background-specialbg-secondary-transparent_x9ovx","background-specialbg-secondary-transparent-inverted":"bottom-sheet__background-specialbg-secondary-transparent-inverted_x9ovx","background-specialbg-tertiary-transparent":"bottom-sheet__background-specialbg-tertiary-transparent_x9ovx","background-specialbg-tertiary-transparent-inverted":"bottom-sheet__background-specialbg-tertiary-transparent-inverted_x9ovx"};
+const styles = {"modal":"bottom-sheet__modal_upth1","wrapper":"bottom-sheet__wrapper_upth1","fullscreen":"bottom-sheet__fullscreen_upth1","component":"bottom-sheet__component_upth1","withTransition":"bottom-sheet__withTransition_upth1","scrollableContainer":"bottom-sheet__scrollableContainer_upth1","marker":"bottom-sheet__marker_upth1","content":"bottom-sheet__content_upth1","noHeader":"bottom-sheet__noHeader_upth1","noFooter":"bottom-sheet__noFooter_upth1","scrollLocked":"bottom-sheet__scrollLocked_upth1","hiddenScrollbar":"bottom-sheet__hiddenScrollbar_upth1","disabledPointerEvents":"bottom-sheet__disabledPointerEvents_upth1","appear":"bottom-sheet__appear_upth1","enter":"bottom-sheet__enter_upth1","appearActive":"bottom-sheet__appearActive_upth1","enterActive":"bottom-sheet__enterActive_upth1","enterDone":"bottom-sheet__enterDone_upth1","appearDone":"bottom-sheet__appearDone_upth1","exit":"bottom-sheet__exit_upth1","exitActive":"bottom-sheet__exitActive_upth1","background-accent":"bottom-sheet__background-accent_upth1","background-info":"bottom-sheet__background-info_upth1","background-attention-muted":"bottom-sheet__background-attention-muted_upth1","background-positive-muted":"bottom-sheet__background-positive-muted_upth1","background-negative-muted":"bottom-sheet__background-negative-muted_upth1","background-primary":"bottom-sheet__background-primary_upth1","background-primary-inverted":"bottom-sheet__background-primary-inverted_upth1","background-secondary":"bottom-sheet__background-secondary_upth1","background-secondary-inverted":"bottom-sheet__background-secondary-inverted_upth1","background-tertiary":"bottom-sheet__background-tertiary_upth1","background-tertiary-inverted":"bottom-sheet__background-tertiary-inverted_upth1","background-quaternary":"bottom-sheet__background-quaternary_upth1","background-quaternary-inverted":"bottom-sheet__background-quaternary-inverted_upth1","background-specialbg-component":"bottom-sheet__background-specialbg-component_upth1","background-specialbg-component-inverted":"bottom-sheet__background-specialbg-component-inverted_upth1","background-specialbg-primary-grouped":"bottom-sheet__background-specialbg-primary-grouped_upth1","background-specialbg-secondary-grouped":"bottom-sheet__background-specialbg-secondary-grouped_upth1","background-specialbg-tertiary-grouped":"bottom-sheet__background-specialbg-tertiary-grouped_upth1","background-specialbg-secondary-transparent":"bottom-sheet__background-specialbg-secondary-transparent_upth1","background-specialbg-secondary-transparent-inverted":"bottom-sheet__background-specialbg-secondary-transparent-inverted_upth1","background-specialbg-tertiary-transparent":"bottom-sheet__background-specialbg-tertiary-transparent_upth1","background-specialbg-tertiary-transparent-inverted":"bottom-sheet__background-specialbg-tertiary-transparent-inverted_upth1"};
 require('./index.css');
 
-const BottomSheet = forwardRef(({ open, title, container, usePortal, backgroundColor, titleSize = 'default', subtitle, actionButton, contentClassName, containerClassName, containerProps, headerClassName, footerClassName, addonClassName, closerClassName, backerClassName, modalClassName, modalWrapperClassName, className, leftAddons, rightAddons, bottomAddons, hasCloser, hasBacker, titleAlign = 'left', trimTitle, stickyHeader, stickyFooter = true, initialHeight = 'default', hideOverlay, hideScrollbar, hideHeader, disableOverlayClick, disableBlockingScroll, disableFocusLock, children, zIndex, transitionProps = {}, magneticAreas: magneticAreasProp, initialActiveAreaIndex, dataTestId, swipeable = true, scrollLocked: scrollLockedProp, backdropProps, scrollableContainerRef = () => null, bottomSheetInstanceRef, sheetContainerRef = () => null, onClose, onBack, onMagnetize, }, ref) => {
+const BottomSheet = forwardRef(({ open, title, container, usePortal, backgroundColor, titleSize = 'default', subtitle, actionButton, contentClassName, containerClassName, containerProps, headerClassName, footerClassName, addonClassName, closerClassName, backerClassName, modalClassName, modalWrapperClassName, className, leftAddons, rightAddons, bottomAddons, hasCloser, hasBacker, titleAlign = 'left', trimTitle, stickyHeader, stickyFooter = true, initialHeight = 'default', hideOverlay, hideScrollbar, hideHeader, disableOverlayClick, disableBlockingScroll, disableFocusLock, children, zIndex, transitionProps = {}, magneticAreas: magneticAreasProp, initialActiveAreaIndex, dataTestId, swipeable = true, swipeableContent = true, swipeThreshold = 5, scrollLocked: scrollLockedProp, backdropProps, scrollableContainerRef = () => null, bottomSheetInstanceRef, sheetContainerRef = () => null, headerOffset = 24, onClose, onBack, onMagnetize, disableRestoreFocus, disableAutoFocus, disableEscapeKeyDown, keepMounted, onMagnetizeEnd, onOffsetChange, }, ref) => {
     const hasInitialIdx = initialActiveAreaIndex !== undefined;
     const fullHeight = use100vh() || 0;
     // Хук use100vh рассчитывает высоту вьюпорта в useEffect, поэтому на первый рендер всегда возвращает null.
     const isFirstRender = fullHeight === 0;
     const magneticAreas = useMemo(() => {
         if (magneticAreasProp) {
-            return magneticAreasProp.map((area) => convertPercentToNumber(area, fullHeight));
+            return magneticAreasProp.map((area) => convertPercentToNumber(area, fullHeight, headerOffset));
         }
-        return [0, fullHeight - HEADER_OFFSET];
-    }, [fullHeight, magneticAreasProp]);
+        return [0, fullHeight - headerOffset];
+    }, [fullHeight, headerOffset, magneticAreasProp]);
     const lastMagneticArea = magneticAreas[magneticAreas.length - 1];
     const [sheetOffset, setSheetOffset] = useState(0);
     const [backdropOpacity, setBackdropOpacity] = useState(1);
     const [activeArea, setActiveArea] = useState(0);
-    const swipingInProgress = useRef(null);
+    const [swipingInProgress, setSwipingInProgress] = useState(null);
+    const scrollOccurred = useRef(false);
     const headerRef = useRef(null);
+    const contentRef = useRef(null);
     const sheetHeight = useRef(0);
     const sheetRef = useRef(null);
     const scrollableContainer = useRef(null);
@@ -43,6 +45,7 @@ const BottomSheet = forwardRef(({ open, title, container, usePortal, backgroundC
             : { title: title ? title?.toString() : undefined }),
         scrollableParentRef: scrollableContainer,
         headerRef,
+        headerOffset,
         className: headerClassName,
         addonClassName,
         closerClassName,
@@ -85,8 +88,14 @@ const BottomSheet = forwardRef(({ open, title, container, usePortal, backgroundC
             sheetHeight.current = sheetRef.current.getBoundingClientRect().height - sheetOffset;
         }
     };
+    const handleTransitionEnd = (event) => {
+        setSheetHeight();
+        if (event.propertyName === 'transform' && event.target === event.currentTarget) {
+            onMagnetizeEnd?.();
+        }
+    };
     const scrollToArea = (idx) => {
-        swipingInProgress.current = false;
+        setSwipingInProgress(false);
         const nextArea = magneticAreas[idx];
         if (nextArea === 0) {
             onClose();
@@ -95,11 +104,12 @@ const BottomSheet = forwardRef(({ open, title, container, usePortal, backgroundC
         if (nextArea) {
             setActiveArea(nextArea);
             setSheetOffset(lastMagneticArea - nextArea);
+            onMagnetize?.(getActiveAreaIndex(nextArea));
         }
     };
-    const magnetize = (dir, velocity, deltaY) => {
-        const shouldMagnetizeDownByVelocity = dir === 'Down' && velocity >= SWIPE_VELOCITY;
-        const shouldMagnetizeUpByVelocity = dir === 'Up' && velocity >= SWIPE_VELOCITY;
+    const magnetize = (velocity, deltaY) => {
+        const shouldMagnetizeDownByVelocity = deltaY >= 0 && velocity >= SWIPE_VELOCITY;
+        const shouldMagnetizeUpByVelocity = deltaY < 0 && velocity >= SWIPE_VELOCITY;
         if (shouldMagnetizeDownByVelocity) {
             const nextArea = magneticAreas
                 .slice()
@@ -114,6 +124,9 @@ const BottomSheet = forwardRef(({ open, title, container, usePortal, backgroundC
                 : lastMagneticArea - activeArea;
             setSheetOffset(offset);
             setActiveArea((prevState) => nextArea ?? prevState);
+            if (nextArea) {
+                onMagnetize?.(getActiveAreaIndex(nextArea));
+            }
             return;
         }
         if (shouldMagnetizeUpByVelocity) {
@@ -121,13 +134,16 @@ const BottomSheet = forwardRef(({ open, title, container, usePortal, backgroundC
             const offset = nextArea ? lastMagneticArea - nextArea : 0;
             setSheetOffset(offset);
             setActiveArea((prevState) => nextArea ?? prevState);
+            if (nextArea) {
+                onMagnetize?.(getActiveAreaIndex(nextArea));
+            }
             return;
         }
         const offset = getSheetOffset(deltaY);
         const currentSheetHeight = lastMagneticArea - offset;
         const secondArea = magneticAreas[1];
         const isSecondArea = activeArea === secondArea;
-        const canClose = magneticAreas[0] === 0 && dir === 'Down';
+        const canClose = magneticAreas[0] === 0 && deltaY >= 0;
         const shouldCloseByOffset = isSecondArea && canClose && 1 - currentSheetHeight / activeArea > CLOSE_OFFSET;
         if (shouldCloseByOffset) {
             onClose();
@@ -150,16 +166,20 @@ const BottomSheet = forwardRef(({ open, title, container, usePortal, backgroundC
             setSheetOffset(lastMagneticArea - nearestArea);
             setActiveArea(nearestArea);
             setBackdropOpacity(1);
+            onMagnetize?.(getActiveAreaIndex(nearestArea));
         }
     };
     /**
      * Если контент внутри шторки скроллится - то шторка не должна свайпаться
      * Если шапка внутри шторки зафиксирована - то шторка должна свайпаться только в области шапки
      */
-    const shouldSkipSwiping = (dir, startY) => {
+    const shouldSkipSwiping = (deltaY, startY, event) => {
         if (!swipeable)
             return true;
-        if (scrollLockedProp || swipingInProgress.current)
+        if (!swipeableContent && contentRef.current?.contains(event.target)) {
+            return true;
+        }
+        if (scrollLockedProp || swipingInProgress)
             return false;
         const scrollableNode = scrollableContainer.current;
         // Точка верхней границы (y координата)
@@ -171,32 +191,40 @@ const BottomSheet = forwardRef(({ open, title, container, usePortal, backgroundC
                 Math.abs(bottomSheetTopY - startY) <= headerRef.current.clientHeight)) {
             return false;
         }
-        return dir === 'Down'
+        const shouldScroll = deltaY >= 0
             ? scrollableNode.scrollTop > 0
             : scrollableNode.scrollHeight -
                 scrollableNode.scrollTop -
                 scrollableNode.clientHeight >
                 SCROLL_OFFSET;
+        if (!scrollOccurred.current && shouldScroll) {
+            scrollOccurred.current = true;
+        }
+        return shouldScroll;
     };
-    const handleSheetSwipe = ({ dir, initial, velocity, deltaY }) => {
-        if (shouldSkipSwiping(dir, initial[1])) {
+    const handleSheetSwipe = ({ initial, velocity, deltaY, event }) => {
+        if (scrollOccurred.current || shouldSkipSwiping(deltaY, initial[1], event)) {
             return;
         }
-        magnetize(dir, velocity, deltaY);
+        magnetize(velocity, deltaY);
     };
-    const handleSheetSwipeStart = ({ dir, initial }) => {
-        if (shouldSkipSwiping(dir, initial[1])) {
+    const handleSheetSwipeStart = ({ deltaY, initial, event }) => {
+        if (shouldSkipSwiping(deltaY, initial[1], event)) {
             return;
         }
-        swipingInProgress.current = true;
+        setSwipingInProgress(true);
     };
-    const handleSheetSwiped = () => {
-        swipingInProgress.current = false;
+    const handleTouchEnd = () => {
+        setSwipingInProgress(false);
+        scrollOccurred.current = false;
     };
-    const handleSheetSwiping = ({ initial, deltaY, dir }) => {
-        if (shouldSkipSwiping(dir, initial[1])) {
+    const handleSheetSwiping = ({ initial, deltaY, event }) => {
+        if (scrollOccurred.current || shouldSkipSwiping(deltaY, initial[1], event)) {
             return;
         }
+        if (!swipingInProgress) {
+            setSwipingInProgress(true);
+        }
         const offset = getSheetOffset(deltaY);
         const opacity = getBackdropOpacity(offset);
         setSheetOffset(offset);
@@ -205,26 +233,40 @@ const BottomSheet = forwardRef(({ open, title, container, usePortal, backgroundC
     const sheetSwipeableHandlers = useSwipeable({
         onSwipeStart: handleSheetSwipeStart,
         onSwiping: handleSheetSwiping,
-        onSwipedDown: handleSheetSwipe,
-        onSwipedUp: handleSheetSwipe,
-        onSwiped: handleSheetSwiped,
+        onSwiped: handleSheetSwipe,
+        onTouchEndOrOnMouseUp: handleTouchEnd,
         trackMouse: swipeable,
-        delta: 5,
+        delta: swipeThreshold,
     });
     const handleExited = (node) => {
         const idx = initialActiveAreaIndex;
+        const nextArea = hasInitialIdx ? magneticAreas[idx] : lastMagneticArea;
         setBackdropOpacity(1);
         setSheetOffset(hasInitialIdx ? lastMagneticArea - magneticAreas[idx] : magneticAreas[0]);
-        setActiveArea(hasInitialIdx ? magneticAreas[idx] : lastMagneticArea);
+        setActiveArea(nextArea);
+        onMagnetizeEnd?.();
         if (transitionProps.onExited) {
             transitionProps.onExited(node);
         }
     };
+    const handleEnter = (node, isAppearing) => {
+        onMagnetize?.(initialActiveAreaIndex || magneticAreas.length - 1);
+        if (transitionProps.onEnter) {
+            transitionProps.onEnter(node, isAppearing);
+        }
+    };
+    const handleExit = (node) => {
+        onMagnetize?.(0);
+        if (transitionProps.onExit) {
+            transitionProps.onExit(node);
+        }
+    };
     const handleEntered = (node, isAppearing) => {
         setBackdropOpacity(1);
         setSheetHeight();
         // Ready for swiping
-        swipingInProgress.current = false;
+        setSwipingInProgress(false);
+        onMagnetizeEnd?.();
         if (transitionProps.onEntered) {
             transitionProps.onEntered(node, isAppearing);
         }
@@ -238,9 +280,13 @@ const BottomSheet = forwardRef(({ open, title, container, usePortal, backgroundC
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [isFirstRender]);
     useEffect(() => {
-        onMagnetize?.(open ? getActiveAreaIndex(activeArea) : 0);
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [activeArea, open]);
+        if (!sheetRef.current)
+            return;
+        const maxOffset = fullHeight - headerOffset;
+        const offset = open ? sheetOffset : maxOffset;
+        const percent = (offset / maxOffset) * 100;
+        onOffsetChange?.(offset, percent);
+    }, [fullHeight, headerOffset, onOffsetChange, open, sheetOffset]);
     useImperativeHandle(bottomSheetInstanceRef, () => ({
         scrollToArea,
     }));
@@ -265,21 +311,25 @@ const BottomSheet = forwardRef(({ open, title, container, usePortal, backgroundC
             ...transitionProps,
             onExited: handleExited,
             onEntered: handleEntered,
-        } },
-        React.createElement("div", { style: { ...getHeightStyles() }, className: styles.wrapper, onTransitionEnd: setSheetHeight },
+            onEnter: handleEnter,
+            onExit: handleExit,
+        }, disableAutoFocus: disableAutoFocus, disableEscapeKeyDown: disableEscapeKeyDown, disableRestoreFocus: disableRestoreFocus, keepMounted: keepMounted },
+        React.createElement("div", { style: { ...getHeightStyles() }, className: cn(styles.wrapper, {
+                [styles.fullscreen]: headerOffset === 0 && sheetOffset === 0,
+            }), onTransitionEnd: setSheetHeight },
             React.createElement("div", { className: cn(styles.component, bgClassName, className, {
-                    [styles.withTransition]: swipingInProgress.current === false,
+                    [styles.withTransition]: swipingInProgress === false,
                 }), style: {
                     ...getSwipeStyles(),
                     ...getHeightStyles(),
-                }, ...sheetSwipeableHandlers, ref: mergeRefs([sheetRef, sheetContainerRef, sheetSwipeableHandlers.ref]), onTransitionEnd: setSheetHeight },
+                }, ...sheetSwipeableHandlers, ref: mergeRefs([sheetRef, sheetContainerRef, sheetSwipeableHandlers.ref]), onTransitionEnd: handleTransitionEnd },
                 React.createElement("div", { ...containerProps, className: cn(styles.scrollableContainer, containerProps?.className, containerClassName, {
-                        [styles.scrollLocked]: scrollLockedProp || swipingInProgress.current,
+                        [styles.scrollLocked]: scrollLockedProp || swipingInProgress,
                         [styles.hiddenScrollbar]: hideScrollbar,
                     }), ref: mergeRefs([scrollableContainer, scrollableContainerRef]) },
                     swipeable && React.createElement("div", { className: cn(styles.marker) }),
                     !hideHeader && !emptyHeader && React.createElement(Header, { ...headerProps }),
-                    React.createElement("div", { className: cn(styles.content, contentClassName, {
+                    React.createElement("div", { ref: contentRef, className: cn(styles.content, contentClassName, {
                             [styles.noHeader]: hideHeader || emptyHeader,
                             [styles.noFooter]: !actionButton,
                         }) }, children),

package/bottom-sheet/modern/components/footer/Component.js

@@ -2,7 +2,7 @@ import React, { useContext, useEffect } from 'react';
 import cn from 'classnames';
 import { BaseModalContext } from '../../../../base-modal/modern';
 
-const styles = {"footer":"bottom-sheet__footer_nvf94","sticky":"bottom-sheet__sticky_nvf94","highlighted":"bottom-sheet__highlighted_nvf94","background-accent":"bottom-sheet__background-accent_nvf94","background-info":"bottom-sheet__background-info_nvf94","background-attention-muted":"bottom-sheet__background-attention-muted_nvf94","background-positive-muted":"bottom-sheet__background-positive-muted_nvf94","background-negative-muted":"bottom-sheet__background-negative-muted_nvf94","background-primary":"bottom-sheet__background-primary_nvf94","background-primary-inverted":"bottom-sheet__background-primary-inverted_nvf94","background-secondary":"bottom-sheet__background-secondary_nvf94","background-secondary-inverted":"bottom-sheet__background-secondary-inverted_nvf94","background-tertiary":"bottom-sheet__background-tertiary_nvf94","background-tertiary-inverted":"bottom-sheet__background-tertiary-inverted_nvf94","background-quaternary":"bottom-sheet__background-quaternary_nvf94","background-quaternary-inverted":"bottom-sheet__background-quaternary-inverted_nvf94","background-specialbg-component":"bottom-sheet__background-specialbg-component_nvf94","background-specialbg-component-inverted":"bottom-sheet__background-specialbg-component-inverted_nvf94","background-specialbg-primary-grouped":"bottom-sheet__background-specialbg-primary-grouped_nvf94","background-specialbg-secondary-grouped":"bottom-sheet__background-specialbg-secondary-grouped_nvf94","background-specialbg-tertiary-grouped":"bottom-sheet__background-specialbg-tertiary-grouped_nvf94","background-specialbg-secondary-transparent":"bottom-sheet__background-specialbg-secondary-transparent_nvf94","background-specialbg-secondary-transparent-inverted":"bottom-sheet__background-specialbg-secondary-transparent-inverted_nvf94","background-specialbg-tertiary-transparent":"bottom-sheet__background-specialbg-tertiary-transparent_nvf94","background-specialbg-tertiary-transparent-inverted":"bottom-sheet__background-specialbg-tertiary-transparent-inverted_nvf94"};
+const styles = {"footer":"bottom-sheet__footer_1kbgr","sticky":"bottom-sheet__sticky_1kbgr","highlighted":"bottom-sheet__highlighted_1kbgr","background-accent":"bottom-sheet__background-accent_1kbgr","background-info":"bottom-sheet__background-info_1kbgr","background-attention-muted":"bottom-sheet__background-attention-muted_1kbgr","background-positive-muted":"bottom-sheet__background-positive-muted_1kbgr","background-negative-muted":"bottom-sheet__background-negative-muted_1kbgr","background-primary":"bottom-sheet__background-primary_1kbgr","background-primary-inverted":"bottom-sheet__background-primary-inverted_1kbgr","background-secondary":"bottom-sheet__background-secondary_1kbgr","background-secondary-inverted":"bottom-sheet__background-secondary-inverted_1kbgr","background-tertiary":"bottom-sheet__background-tertiary_1kbgr","background-tertiary-inverted":"bottom-sheet__background-tertiary-inverted_1kbgr","background-quaternary":"bottom-sheet__background-quaternary_1kbgr","background-quaternary-inverted":"bottom-sheet__background-quaternary-inverted_1kbgr","background-specialbg-component":"bottom-sheet__background-specialbg-component_1kbgr","background-specialbg-component-inverted":"bottom-sheet__background-specialbg-component-inverted_1kbgr","background-specialbg-primary-grouped":"bottom-sheet__background-specialbg-primary-grouped_1kbgr","background-specialbg-secondary-grouped":"bottom-sheet__background-specialbg-secondary-grouped_1kbgr","background-specialbg-tertiary-grouped":"bottom-sheet__background-specialbg-tertiary-grouped_1kbgr","background-specialbg-secondary-transparent":"bottom-sheet__background-specialbg-secondary-transparent_1kbgr","background-specialbg-secondary-transparent-inverted":"bottom-sheet__background-specialbg-secondary-transparent-inverted_1kbgr","background-specialbg-tertiary-transparent":"bottom-sheet__background-specialbg-tertiary-transparent_1kbgr","background-specialbg-tertiary-transparent-inverted":"bottom-sheet__background-specialbg-tertiary-transparent-inverted_1kbgr"};
 require('./index.css');
 
 const Footer = ({ children, className, sticky }) => {

package/bottom-sheet/modern/components/footer/index.css

@@ -1,4 +1,4 @@
-/* hash: 1d4ol */
+/* hash: dw3xi */
 :root {
 } /* deprecated */ :root {
     --color-light-bg-accent: #ef3124;
@@ -41,58 +41,58 @@
 } :root {
     --bottom-sheet-footer-border-top: 1px solid var(--color-light-border-secondary);
     --bottom-sheet-footer-background-color: var(--color-light-bg-primary);
-} .bottom-sheet__footer_nvf94 {
+} .bottom-sheet__footer_1kbgr {
     padding: var(--gap-m) var(--gap-m);
     background-color: var(--color-light-bg-primary);
-} .bottom-sheet__sticky_nvf94 {
+} .bottom-sheet__sticky_1kbgr {
     position: sticky;
     bottom: 0;
     z-index: 1;
-} .bottom-sheet__highlighted_nvf94 {
+} .bottom-sheet__highlighted_1kbgr {
     border-top: var(--bottom-sheet-footer-border-top);
     background-color: var(--bottom-sheet-footer-background-color);
-} .bottom-sheet__background-accent_nvf94 {
+} .bottom-sheet__background-accent_1kbgr {
             background-color: var(--color-light-bg-accent);
-        } .bottom-sheet__background-info_nvf94 {
+        } .bottom-sheet__background-info_1kbgr {
             background-color: var(--color-light-bg-info);
-        } .bottom-sheet__background-attention-muted_nvf94 {
+        } .bottom-sheet__background-attention-muted_1kbgr {
             background-color: var(--color-light-bg-attention-muted);
-        } .bottom-sheet__background-positive-muted_nvf94 {
+        } .bottom-sheet__background-positive-muted_1kbgr {
             background-color: var(--color-light-bg-positive-muted);
-        } .bottom-sheet__background-negative-muted_nvf94 {
+        } .bottom-sheet__background-negative-muted_1kbgr {
             background-color: var(--color-light-bg-negative-muted);
-        } .bottom-sheet__background-primary_nvf94 {
+        } .bottom-sheet__background-primary_1kbgr {
             background-color: var(--color-light-bg-primary);
-        } .bottom-sheet__background-primary-inverted_nvf94 {
+        } .bottom-sheet__background-primary-inverted_1kbgr {
             background-color: var(--color-light-bg-primary-inverted);
-        } .bottom-sheet__background-secondary_nvf94 {
+        } .bottom-sheet__background-secondary_1kbgr {
             background-color: var(--color-light-bg-secondary);
-        } .bottom-sheet__background-secondary-inverted_nvf94 {
+        } .bottom-sheet__background-secondary-inverted_1kbgr {
             background-color: var(--color-light-bg-secondary-inverted);
-        } .bottom-sheet__background-tertiary_nvf94 {
+        } .bottom-sheet__background-tertiary_1kbgr {
             background-color: var(--color-light-bg-tertiary);
-        } .bottom-sheet__background-tertiary-inverted_nvf94 {
+        } .bottom-sheet__background-tertiary-inverted_1kbgr {
             background-color: var(--color-light-bg-tertiary-inverted);
-        } .bottom-sheet__background-quaternary_nvf94 {
+        } .bottom-sheet__background-quaternary_1kbgr {
             background-color: var(--color-light-bg-quaternary);
-        } .bottom-sheet__background-quaternary-inverted_nvf94 {
+        } .bottom-sheet__background-quaternary-inverted_1kbgr {
             background-color: var(--color-light-bg-quaternary-inverted);
-        } .bottom-sheet__background-specialbg-component_nvf94 {
+        } .bottom-sheet__background-specialbg-component_1kbgr {
             background-color: var(--color-light-specialbg-component);
-        } .bottom-sheet__background-specialbg-component-inverted_nvf94 {
+        } .bottom-sheet__background-specialbg-component-inverted_1kbgr {
             background-color: var(--color-light-specialbg-component-inverted);
-        } .bottom-sheet__background-specialbg-primary-grouped_nvf94 {
+        } .bottom-sheet__background-specialbg-primary-grouped_1kbgr {
             background-color: var(--color-light-specialbg-primary-grouped);
-        } .bottom-sheet__background-specialbg-secondary-grouped_nvf94 {
+        } .bottom-sheet__background-specialbg-secondary-grouped_1kbgr {
             background-color: var(--color-light-specialbg-secondary-grouped);
-        } .bottom-sheet__background-specialbg-tertiary-grouped_nvf94 {
+        } .bottom-sheet__background-specialbg-tertiary-grouped_1kbgr {
             background-color: var(--color-light-specialbg-tertiary-grouped);
-        } .bottom-sheet__background-specialbg-secondary-transparent_nvf94 {
+        } .bottom-sheet__background-specialbg-secondary-transparent_1kbgr {
             background-color: var(--color-light-specialbg-secondary-transparent);
-        } .bottom-sheet__background-specialbg-secondary-transparent-inverted_nvf94 {
+        } .bottom-sheet__background-specialbg-secondary-transparent-inverted_1kbgr {
             background-color: var(--color-light-specialbg-secondary-transparent-inverted);
-        } .bottom-sheet__background-specialbg-tertiary-transparent_nvf94 {
+        } .bottom-sheet__background-specialbg-tertiary-transparent_1kbgr {
             background-color: var(--color-light-specialbg-tertiary-transparent);
-        } .bottom-sheet__background-specialbg-tertiary-transparent-inverted_nvf94 {
+        } .bottom-sheet__background-specialbg-tertiary-transparent-inverted_1kbgr {
             background-color: var(--color-light-specialbg-tertiary-transparent-inverted);
         }

package/bottom-sheet/modern/components/header/Component.d.ts

@@ -2,6 +2,7 @@ import { FC, RefObject } from 'react';
 import { NavigationBarProps } from "../../../../navigation-bar";
 type HeaderProps = Omit<NavigationBarProps, 'view' | 'size'> & {
     headerRef: RefObject<HTMLDivElement>;
+    headerOffset: number;
 };
 declare const Header: FC<HeaderProps>;
 export { HeaderProps, Header };

package/bottom-sheet/modern/components/header/Component.js

@@ -2,16 +2,15 @@ import React, { useContext, useEffect } from 'react';
 import cn from 'classnames';
 import { BaseModalContext } from '../../../../base-modal/modern';
 import { NavigationBar } from '../../../../navigation-bar/modern';
-import { HEADER_OFFSET } from '../../utils.js';
 
-const styles = {"headerWrapper":"bottom-sheet__headerWrapper_1v4ea","hasContent":"bottom-sheet__hasContent_1v4ea","header":"bottom-sheet__header_1v4ea","sticky":"bottom-sheet__sticky_1v4ea","highlighted":"bottom-sheet__highlighted_1v4ea","justifyEnd":"bottom-sheet__justifyEnd_1v4ea","addon":"bottom-sheet__addon_1v4ea","addonFixed":"bottom-sheet__addonFixed_1v4ea","title":"bottom-sheet__title_1v4ea","titleCenter":"bottom-sheet__titleCenter_1v4ea","titleLeft":"bottom-sheet__titleLeft_1v4ea","trimTitle":"bottom-sheet__trimTitle_1v4ea"};
+const styles = {"headerWrapper":"bottom-sheet__headerWrapper_57cdj","hasContent":"bottom-sheet__hasContent_57cdj","header":"bottom-sheet__header_57cdj","sticky":"bottom-sheet__sticky_57cdj","highlighted":"bottom-sheet__highlighted_57cdj","justifyEnd":"bottom-sheet__justifyEnd_57cdj","addon":"bottom-sheet__addon_57cdj","addonFixed":"bottom-sheet__addonFixed_57cdj","title":"bottom-sheet__title_57cdj","titleCenter":"bottom-sheet__titleCenter_57cdj","titleLeft":"bottom-sheet__titleLeft_57cdj","trimTitle":"bottom-sheet__trimTitle_57cdj"};
 require('./index.css');
 
-const Header = ({ className, sticky, headerRef, title, children, ...restProps }) => {
+const Header = ({ className, sticky, headerRef, headerOffset, title, children, ...restProps }) => {
     const { setHeaderOffset, setHasHeader, headerHighlighted, onClose } = useContext(BaseModalContext);
     useEffect(() => {
-        setHeaderOffset(HEADER_OFFSET);
-    }, [setHeaderOffset]);
+        setHeaderOffset(headerOffset);
+    }, [headerOffset, setHeaderOffset]);
     useEffect(() => {
         setHasHeader(true);
     }, [setHasHeader]);

package/bottom-sheet/modern/components/header/index.css

@@ -1,4 +1,4 @@
-/* hash: gjzzi */
+/* hash: 1fskn */
 :root {
 } /* deprecated */ :root {
     --color-light-border-secondary: #e9e9eb; /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */
@@ -27,42 +27,42 @@
     --bottom-sheet-title-font-weight: 700;
     --bottom-sheet-title-line-height: 24px;
     --bottom-sheet-title-font-family: var(--font-family-system);
-} .bottom-sheet__headerWrapper_1v4ea {
+} .bottom-sheet__headerWrapper_57cdj {
     padding: var(--gap-s) var(--gap-xs) var(--gap-2xs);
     border-top-right-radius: var(--border-radius-xl);
     border-top-left-radius: var(--border-radius-xl);
     z-index: 1;
-} .bottom-sheet__hasContent_1v4ea {
+} .bottom-sheet__hasContent_57cdj {
     background-color: inherit;
-} .bottom-sheet__header_1v4ea {
+} .bottom-sheet__header_57cdj {
     display: flex;
-} .bottom-sheet__sticky_1v4ea {
+} .bottom-sheet__sticky_57cdj {
     position: sticky;
     top: 0;
-} .bottom-sheet__highlighted_1v4ea {
+} .bottom-sheet__highlighted_57cdj {
     border-bottom: var(--bottom-sheet-header-border-bottom);
-} .bottom-sheet__justifyEnd_1v4ea {
+} .bottom-sheet__justifyEnd_57cdj {
     justify-content: flex-end;
-} .bottom-sheet__addon_1v4ea {
+} .bottom-sheet__addon_57cdj {
     display: flex;
     justify-content: center;
     align-items: center;
     min-width: 48px;
     height: 48px;
-} .bottom-sheet__addonFixed_1v4ea {
+} .bottom-sheet__addonFixed_57cdj {
     position: fixed;
-} .bottom-sheet__title_1v4ea {
+} .bottom-sheet__title_57cdj {
     padding: var(--gap-s) var(--gap-xs);
     width: 100%;
     font-size: var(--bottom-sheet-title-font-size);
     font-weight: var(--bottom-sheet-title-font-weight);
     line-height: var(--bottom-sheet-title-line-height);
     font-family: var(--bottom-sheet-title-font-family);
-} .bottom-sheet__titleCenter_1v4ea {
+} .bottom-sheet__titleCenter_57cdj {
     text-align: center;
-} .bottom-sheet__titleLeft_1v4ea {
+} .bottom-sheet__titleLeft_57cdj {
     text-align: left;
-} .bottom-sheet__trimTitle_1v4ea {
+} .bottom-sheet__trimTitle_57cdj {
     white-space: nowrap;
     overflow: hidden;
     text-overflow: ellipsis;