@alfalab/core-components-universal-modal 3.0.7 → 3.1.0

package/modern/desktop/components/center-modal/center-modal.js

@@ -2,7 +2,7 @@ import React, { forwardRef, useRef } from 'react';
 import cn from 'classnames';
 import { BaseModal } from '@alfalab/core-components-base-modal/modern';
 import { isMacOS, isSafari } from '@alfalab/core-components-shared/modern';
-import { useModalWheel } from '../../hooks/useModalWheel.js';
+import { useScrollableContainerRef } from '../../hooks/use-scrollable-container-ref.js';
 import { getFullSizeModalTransitions } from '../../utils/get-full-size-modal-transitions.js';
 import { getHeightStyle } from '../../utils/get-height-style.js';
 import { getMarginStyles } from '../../utils/get-margin-styles.js';
@@ -15,23 +15,27 @@ import transitions from './transitions/transitions.module.css.js';
 // в safari некорректно отрабатывает transform:scale (???), поэтому применяем немного другую анимацию
 const transitionProps = isMacOS() && isSafari() ? safariTransitions : transitions;
 const CenterModal = forwardRef((props, ref) => {
-    const { dataTestId, className, open, children, width = 500, height = 'hugContent', verticalAlign = 'center', overlay = true, margin, scrollableContainerRef, onClose, ...restProps } = props;
+    const { dataTestId, className, open, children, width = 500, height = 'hugContent', verticalAlign = 'center', overlay = true, margin, scrollableContainerRef: scrollableContainerRefProp, onClose, ...restProps } = props;
     const componentRef = useRef(null);
-    const { wheelDeltaY, handleWheel } = useModalWheel(overlay);
+    const { handleWheel, scrollableContainerRef } = useScrollableContainerRef({
+        overlay,
+        refObject: scrollableContainerRefProp,
+    });
     const { isFullSizeModal, componentTransitions: fullSizeModalContentTransitions, backdropTransitions: fullSizeModalBackdropTransitions, } = getFullSizeModalTransitions({ verticalAlign, width, height });
-    return (React.createElement(BaseModal, { ...restProps, open: open, dataTestId: dataTestId, ref: ref, componentRef: componentRef, scrollHandler: 'content', disableBlockingScroll: !overlay, wrapperClassName: cn({
+    const withoutOverlay = !overlay;
+    return (React.createElement(BaseModal, { ...restProps, open: open, dataTestId: dataTestId, ref: ref, componentRef: componentRef, scrollHandler: 'content', disableBlockingScroll: withoutOverlay, wrapperClassName: cn(styles.baseModalContainer, {
             [styles.wrapperJustifyStart]: verticalAlign === 'top',
             [styles.wrapperJustifyCenter]: verticalAlign === 'center',
             [styles.wrapperJustifyEnd]: verticalAlign === 'bottom',
-        }), className: cn(styles.component, className, {
-            [styles.overlayHidden]: !overlay,
+            [styles.withoutOverlay]: withoutOverlay,
+        }), className: cn(styles.component, className, styles.baseModalComponent, {
             ...getMarginStyles({ styles, margin }),
         }), transitionProps: {
             classNames: transitionProps,
             ...(isFullSizeModal && fullSizeModalContentTransitions),
             ...restProps.transitionProps,
         }, backdropProps: {
-            transparent: !overlay,
+            shouldRender: overlay,
             ...(isFullSizeModal && fullSizeModalBackdropTransitions),
             ...restProps.backdropProps,
         }, componentDivProps: {
@@ -40,7 +44,7 @@ const CenterModal = forwardRef((props, ref) => {
                 ...getHeightStyle(height, margin),
             },
         }, onWheel: handleWheel, onClose: onClose },
-        React.createElement(ModalContent, { height: height, wheelDeltaY: wheelDeltaY, scrollableContainerRef: scrollableContainerRef }, children)));
+        React.createElement(ModalContent, { height: height, scrollableContainerRef: scrollableContainerRef }, children)));
 });
 
 export { CenterModal };

package/modern/desktop/components/center-modal/center-modal.js.map

@@ -1 +1 @@
-{"version":3,"file":"center-modal.js","sources":["../../../../src/desktop/components/center-modal/center-modal.tsx"],"sourcesContent":["import React, { forwardRef, useRef } from 'react';\nimport cn from 'classnames';\n\nimport { BaseModal } from '@alfalab/core-components-base-modal';\nimport { isMacOS, isSafari } from '@alfalab/core-components-shared';\n\nimport { useModalWheel } from '../../hooks/useModalWheel';\nimport { type UniversalModalDesktopProps } from '../../types/props';\nimport { getFullSizeModalTransitions } from '../../utils/get-full-size-modal-transitions';\nimport { getHeightStyle } from '../../utils/get-height-style';\nimport { getMarginStyles } from '../../utils/get-margin-styles';\nimport { getWidthStyle } from '../../utils/get-width-style';\nimport { ModalContent } from '../modal-content/modal-content';\n\nimport styles from './index.module.css';\nimport safariTransitions from './transitions/safari-transitions.module.css';\nimport transitions from './transitions/transitions.module.css';\n\n// в safari некорректно отрабатывает transform:scale (???), поэтому применяем немного другую анимацию\nconst transitionProps = isMacOS() && isSafari() ? safariTransitions : transitions;\n\nexport const CenterModal = forwardRef<HTMLDivElement, UniversalModalDesktopProps>((props, ref) => {\n    const {\n        dataTestId,\n        className,\n        open,\n        children,\n        width = 500,\n        height = 'hugContent',\n        verticalAlign = 'center',\n        overlay = true,\n        margin,\n        scrollableContainerRef,\n        onClose,\n        ...restProps\n    } = props;\n\n    const componentRef = useRef<HTMLDivElement>(null);\n\n    const { wheelDeltaY, handleWheel } = useModalWheel(overlay);\n\n    const {\n        isFullSizeModal,\n        componentTransitions: fullSizeModalContentTransitions,\n        backdropTransitions: fullSizeModalBackdropTransitions,\n    } = getFullSizeModalTransitions({ verticalAlign, width, height });\n\n    return (\n        <BaseModal\n            {...restProps}\n            open={open}\n            dataTestId={dataTestId}\n            ref={ref}\n            componentRef={componentRef}\n            scrollHandler='content'\n            disableBlockingScroll={!overlay}\n            wrapperClassName={cn({\n                [styles.wrapperJustifyStart]: verticalAlign === 'top',\n                [styles.wrapperJustifyCenter]: verticalAlign === 'center',\n                [styles.wrapperJustifyEnd]: verticalAlign === 'bottom',\n            })}\n            className={cn(styles.component, className, {\n                [styles.overlayHidden]: !overlay,\n                ...getMarginStyles({ styles, margin }),\n            })}\n            transitionProps={{\n                classNames: transitionProps,\n                ...(isFullSizeModal && fullSizeModalContentTransitions),\n                ...restProps.transitionProps,\n            }}\n            backdropProps={{\n                transparent: !overlay,\n                ...(isFullSizeModal && fullSizeModalBackdropTransitions),\n                ...restProps.backdropProps,\n            }}\n            componentDivProps={{\n                style: {\n                    width: getWidthStyle(width, margin),\n                    ...getHeightStyle(height, margin),\n                },\n            }}\n            onWheel={handleWheel}\n            onClose={onClose}\n        >\n            <ModalContent\n                height={height}\n                wheelDeltaY={wheelDeltaY}\n                scrollableContainerRef={scrollableContainerRef}\n            >\n                {children}\n            </ModalContent>\n        </BaseModal>\n    );\n});\n"],"names":[],"mappings":";;;;;;;;;;;;;;AAkBA;AACA,MAAM,eAAe,GAAG,OAAO,EAAE,IAAI,QAAQ,EAAE,GAAG,iBAAiB,GAAG,WAAW;AAEpE,MAAA,WAAW,GAAG,UAAU,CAA6C,CAAC,KAAK,EAAE,GAAG,KAAI;AAC7F,IAAA,MAAM,EACF,UAAU,EACV,SAAS,EACT,IAAI,EACJ,QAAQ,EACR,KAAK,GAAG,GAAG,EACX,MAAM,GAAG,YAAY,EACrB,aAAa,GAAG,QAAQ,EACxB,OAAO,GAAG,IAAI,EACd,MAAM,EACN,sBAAsB,EACtB,OAAO,EACP,GAAG,SAAS,EACf,GAAG,KAAK;AAET,IAAA,MAAM,YAAY,GAAG,MAAM,CAAiB,IAAI,CAAC;IAEjD,MAAM,EAAE,WAAW,EAAE,WAAW,EAAE,GAAG,aAAa,CAAC,OAAO,CAAC;IAE3D,MAAM,EACF,eAAe,EACf,oBAAoB,EAAE,+BAA+B,EACrD,mBAAmB,EAAE,gCAAgC,GACxD,GAAG,2BAA2B,CAAC,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC;AAEjE,IAAA,QACI,KAAA,CAAA,aAAA,CAAC,SAAS,EAAA,EAAA,GACF,SAAS,EACb,IAAI,EAAE,IAAI,EACV,UAAU,EAAE,UAAU,EACtB,GAAG,EAAE,GAAG,EACR,YAAY,EAAE,YAAY,EAC1B,aAAa,EAAC,SAAS,EACvB,qBAAqB,EAAE,CAAC,OAAO,EAC/B,gBAAgB,EAAE,EAAE,CAAC;AACjB,YAAA,CAAC,MAAM,CAAC,mBAAmB,GAAG,aAAa,KAAK,KAAK;AACrD,YAAA,CAAC,MAAM,CAAC,oBAAoB,GAAG,aAAa,KAAK,QAAQ;AACzD,YAAA,CAAC,MAAM,CAAC,iBAAiB,GAAG,aAAa,KAAK,QAAQ;SACzD,CAAC,EACF,SAAS,EAAE,EAAE,CAAC,MAAM,CAAC,SAAS,EAAE,SAAS,EAAE;AACvC,YAAA,CAAC,MAAM,CAAC,aAAa,GAAG,CAAC,OAAO;AAChC,YAAA,GAAG,eAAe,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;SACzC,CAAC,EACF,eAAe,EAAE;AACb,YAAA,UAAU,EAAE,eAAe;AAC3B,YAAA,IAAI,eAAe,IAAI,+BAA+B,CAAC;YACvD,GAAG,SAAS,CAAC,eAAe;AAC/B,SAAA,EACD,aAAa,EAAE;YACX,WAAW,EAAE,CAAC,OAAO;AACrB,YAAA,IAAI,eAAe,IAAI,gCAAgC,CAAC;YACxD,GAAG,SAAS,CAAC,aAAa;AAC7B,SAAA,EACD,iBAAiB,EAAE;AACf,YAAA,KAAK,EAAE;AACH,gBAAA,KAAK,EAAE,aAAa,CAAC,KAAK,EAAE,MAAM,CAAC;AACnC,gBAAA,GAAG,cAAc,CAAC,MAAM,EAAE,MAAM,CAAC;AACpC,aAAA;AACJ,SAAA,EACD,OAAO,EAAE,WAAW,EACpB,OAAO,EAAE,OAAO,EAAA;AAEhB,QAAA,KAAA,CAAA,aAAA,CAAC,YAAY,EACT,EAAA,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,WAAW,EACxB,sBAAsB,EAAE,sBAAsB,EAAA,EAE7C,QAAQ,CACE,CACP;AAEpB,CAAC;;;;"}
+{"version":3,"file":"center-modal.js","sources":["../../../../src/desktop/components/center-modal/center-modal.tsx"],"sourcesContent":["import React, { forwardRef, useRef } from 'react';\nimport cn from 'classnames';\n\nimport { BaseModal } from '@alfalab/core-components-base-modal';\nimport { isMacOS, isSafari } from '@alfalab/core-components-shared';\n\nimport { useScrollableContainerRef } from '../../hooks/use-scrollable-container-ref';\nimport { type UniversalModalDesktopProps } from '../../types/props';\nimport { getFullSizeModalTransitions } from '../../utils/get-full-size-modal-transitions';\nimport { getHeightStyle } from '../../utils/get-height-style';\nimport { getMarginStyles } from '../../utils/get-margin-styles';\nimport { getWidthStyle } from '../../utils/get-width-style';\nimport { ModalContent } from '../modal-content/modal-content';\n\nimport styles from './index.module.css';\nimport safariTransitions from './transitions/safari-transitions.module.css';\nimport transitions from './transitions/transitions.module.css';\n\n// в safari некорректно отрабатывает transform:scale (???), поэтому применяем немного другую анимацию\nconst transitionProps = isMacOS() && isSafari() ? safariTransitions : transitions;\n\nexport const CenterModal = forwardRef<HTMLDivElement, UniversalModalDesktopProps>((props, ref) => {\n    const {\n        dataTestId,\n        className,\n        open,\n        children,\n        width = 500,\n        height = 'hugContent',\n        verticalAlign = 'center',\n        overlay = true,\n        margin,\n        scrollableContainerRef: scrollableContainerRefProp,\n        onClose,\n        ...restProps\n    } = props;\n\n    const componentRef = useRef<HTMLDivElement>(null);\n    const { handleWheel, scrollableContainerRef } = useScrollableContainerRef({\n        overlay,\n        refObject: scrollableContainerRefProp,\n    });\n\n    const {\n        isFullSizeModal,\n        componentTransitions: fullSizeModalContentTransitions,\n        backdropTransitions: fullSizeModalBackdropTransitions,\n    } = getFullSizeModalTransitions({ verticalAlign, width, height });\n\n    const withoutOverlay = !overlay;\n\n    return (\n        <BaseModal\n            {...restProps}\n            open={open}\n            dataTestId={dataTestId}\n            ref={ref}\n            componentRef={componentRef}\n            scrollHandler='content'\n            disableBlockingScroll={withoutOverlay}\n            wrapperClassName={cn(styles.baseModalContainer, {\n                [styles.wrapperJustifyStart]: verticalAlign === 'top',\n                [styles.wrapperJustifyCenter]: verticalAlign === 'center',\n                [styles.wrapperJustifyEnd]: verticalAlign === 'bottom',\n                [styles.withoutOverlay]: withoutOverlay,\n            })}\n            className={cn(styles.component, className, styles.baseModalComponent, {\n                ...getMarginStyles({ styles, margin }),\n            })}\n            transitionProps={{\n                classNames: transitionProps,\n                ...(isFullSizeModal && fullSizeModalContentTransitions),\n                ...restProps.transitionProps,\n            }}\n            backdropProps={{\n                shouldRender: overlay,\n                ...(isFullSizeModal && fullSizeModalBackdropTransitions),\n                ...restProps.backdropProps,\n            }}\n            componentDivProps={{\n                style: {\n                    width: getWidthStyle(width, margin),\n                    ...getHeightStyle(height, margin),\n                },\n            }}\n            onWheel={handleWheel}\n            onClose={onClose}\n        >\n            <ModalContent height={height} scrollableContainerRef={scrollableContainerRef}>\n                {children}\n            </ModalContent>\n        </BaseModal>\n    );\n});\n"],"names":[],"mappings":";;;;;;;;;;;;;;AAkBA;AACA,MAAM,eAAe,GAAG,OAAO,EAAE,IAAI,QAAQ,EAAE,GAAG,iBAAiB,GAAG,WAAW;AAEpE,MAAA,WAAW,GAAG,UAAU,CAA6C,CAAC,KAAK,EAAE,GAAG,KAAI;AAC7F,IAAA,MAAM,EACF,UAAU,EACV,SAAS,EACT,IAAI,EACJ,QAAQ,EACR,KAAK,GAAG,GAAG,EACX,MAAM,GAAG,YAAY,EACrB,aAAa,GAAG,QAAQ,EACxB,OAAO,GAAG,IAAI,EACd,MAAM,EACN,sBAAsB,EAAE,0BAA0B,EAClD,OAAO,EACP,GAAG,SAAS,EACf,GAAG,KAAK;AAET,IAAA,MAAM,YAAY,GAAG,MAAM,CAAiB,IAAI,CAAC;AACjD,IAAA,MAAM,EAAE,WAAW,EAAE,sBAAsB,EAAE,GAAG,yBAAyB,CAAC;QACtE,OAAO;AACP,QAAA,SAAS,EAAE,0BAA0B;AACxC,KAAA,CAAC;IAEF,MAAM,EACF,eAAe,EACf,oBAAoB,EAAE,+BAA+B,EACrD,mBAAmB,EAAE,gCAAgC,GACxD,GAAG,2BAA2B,CAAC,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC;AAEjE,IAAA,MAAM,cAAc,GAAG,CAAC,OAAO;AAE/B,IAAA,QACI,KAAC,CAAA,aAAA,CAAA,SAAS,EACF,EAAA,GAAA,SAAS,EACb,IAAI,EAAE,IAAI,EACV,UAAU,EAAE,UAAU,EACtB,GAAG,EAAE,GAAG,EACR,YAAY,EAAE,YAAY,EAC1B,aAAa,EAAC,SAAS,EACvB,qBAAqB,EAAE,cAAc,EACrC,gBAAgB,EAAE,EAAE,CAAC,MAAM,CAAC,kBAAkB,EAAE;AAC5C,YAAA,CAAC,MAAM,CAAC,mBAAmB,GAAG,aAAa,KAAK,KAAK;AACrD,YAAA,CAAC,MAAM,CAAC,oBAAoB,GAAG,aAAa,KAAK,QAAQ;AACzD,YAAA,CAAC,MAAM,CAAC,iBAAiB,GAAG,aAAa,KAAK,QAAQ;AACtD,YAAA,CAAC,MAAM,CAAC,cAAc,GAAG,cAAc;AAC1C,SAAA,CAAC,EACF,SAAS,EAAE,EAAE,CAAC,MAAM,CAAC,SAAS,EAAE,SAAS,EAAE,MAAM,CAAC,kBAAkB,EAAE;AAClE,YAAA,GAAG,eAAe,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;SACzC,CAAC,EACF,eAAe,EAAE;AACb,YAAA,UAAU,EAAE,eAAe;AAC3B,YAAA,IAAI,eAAe,IAAI,+BAA+B,CAAC;YACvD,GAAG,SAAS,CAAC,eAAe;AAC/B,SAAA,EACD,aAAa,EAAE;AACX,YAAA,YAAY,EAAE,OAAO;AACrB,YAAA,IAAI,eAAe,IAAI,gCAAgC,CAAC;YACxD,GAAG,SAAS,CAAC,aAAa;AAC7B,SAAA,EACD,iBAAiB,EAAE;AACf,YAAA,KAAK,EAAE;AACH,gBAAA,KAAK,EAAE,aAAa,CAAC,KAAK,EAAE,MAAM,CAAC;AACnC,gBAAA,GAAG,cAAc,CAAC,MAAM,EAAE,MAAM,CAAC;AACpC,aAAA;AACJ,SAAA,EACD,OAAO,EAAE,WAAW,EACpB,OAAO,EAAE,OAAO,EAAA;AAEhB,QAAA,KAAA,CAAA,aAAA,CAAC,YAAY,EAAA,EAAC,MAAM,EAAE,MAAM,EAAE,sBAAsB,EAAE,sBAAsB,EACvE,EAAA,QAAQ,CACE,CACP;AAEpB,CAAC;;;;"}