@alfalab/core-components-base-modal
Advanced tools
Comparing version 5.5.0 to 5.6.0
@@ -75,2 +75,6 @@ /// <reference types="react" /> | ||
/** | ||
* Дополнительные пропсы на dialog wrapper | ||
*/ | ||
wrapperProps?: React.DetailedHTMLProps<React.HTMLAttributes<HTMLDivElement>, HTMLDivElement>; | ||
/** | ||
* Дополнительные пропсы на обертку контента | ||
@@ -77,0 +81,0 @@ */ |
@@ -27,3 +27,3 @@ 'use strict'; | ||
var styles = {"component":"base-modal__component_k89qv","wrapper":"base-modal__wrapper_k89qv","content":"base-modal__content_k89qv","hidden":"base-modal__hidden_k89qv","backdrop":"base-modal__backdrop_k89qv","appear":"base-modal__appear_k89qv","enter":"base-modal__enter_k89qv","appearActive":"base-modal__appearActive_k89qv","enterActive":"base-modal__enterActive_k89qv","exit":"base-modal__exit_k89qv","exitActive":"base-modal__exitActive_k89qv","exitDone":"base-modal__exitDone_k89qv"}; | ||
var styles = {"component":"base-modal__component_svmxx","wrapper":"base-modal__wrapper_svmxx","content":"base-modal__content_svmxx","hidden":"base-modal__hidden_svmxx","backdrop":"base-modal__backdrop_svmxx","appear":"base-modal__appear_svmxx","enter":"base-modal__enter_svmxx","appearActive":"base-modal__appearActive_svmxx","enterActive":"base-modal__enterActive_svmxx","exit":"base-modal__exit_svmxx","exitActive":"base-modal__exitActive_svmxx","exitDone":"base-modal__exitDone_svmxx"}; | ||
require('./index.css') | ||
@@ -48,3 +48,3 @@ | ||
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.disableBlockingScroll, disableBlockingScroll = _k === void 0 ? false : _k, _l = _a.keepMounted, keepMounted = _l === void 0 ? false : _l, className = _a.className, contentClassName = _a.contentClassName, contentProps = _a.contentProps, componentDivProps = _a.componentDivProps, wrapperClassName = _a.wrapperClassName, onBackdropClick = _a.onBackdropClick, onClose = _a.onClose, onEscapeKeyDown = _a.onEscapeKeyDown, onMount = _a.onMount, onUnmount = _a.onUnmount, dataTestId = _a.dataTestId, _m = _a.zIndex, zIndex = _m === void 0 ? coreComponentsStack.stackingOrder.MODAL : _m, _o = _a.componentRef, componentRef = _o === void 0 ? null : _o, _p = _a.usePortal, usePortal = _p === void 0 ? true : _p; | ||
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.disableBlockingScroll, disableBlockingScroll = _k === void 0 ? false : _k, _l = _a.keepMounted, keepMounted = _l === void 0 ? false : _l, className = _a.className, contentClassName = _a.contentClassName, wrapperProps = _a.wrapperProps, contentProps = _a.contentProps, componentDivProps = _a.componentDivProps, wrapperClassName = _a.wrapperClassName, onBackdropClick = _a.onBackdropClick, onClose = _a.onClose, onEscapeKeyDown = _a.onEscapeKeyDown, onMount = _a.onMount, onUnmount = _a.onUnmount, dataTestId = _a.dataTestId, _m = _a.zIndex, zIndex = _m === void 0 ? coreComponentsStack.stackingOrder.MODAL : _m, _o = _a.componentRef, componentRef = _o === void 0 ? null : _o, _p = _a.usePortal, usePortal = _p === void 0 ? true : _p; | ||
var _q = React.useState(null), exited = _q[0], setExited = _q[1]; | ||
@@ -99,3 +99,3 @@ var _r = React.useState(false), hasScroll = _r[0], setHasScroll = _r[1]; | ||
setHeaderHighlighted(!utils.isScrolledToTop(scrollableNodeRef.current) && | ||
componentNodeRef.current.getBoundingClientRect().top - headerOffset <= 0); | ||
componentNodeRef.current.getBoundingClientRect().top - headerOffset <= 1); | ||
} | ||
@@ -105,3 +105,3 @@ if (hasFooter) { | ||
componentNodeRef.current.getBoundingClientRect().bottom >= | ||
window.innerHeight); | ||
window.innerHeight - 1); | ||
} | ||
@@ -248,9 +248,13 @@ }, [hasFooter, hasHeader, headerOffset]); | ||
} }))), | ||
React__default.default.createElement("div", { role: 'dialog', className: cn__default.default(styles.wrapper, wrapperClassName, (_a = {}, | ||
React__default.default.createElement("div", tslib.__assign({}, wrapperProps, { role: 'dialog', className: cn__default.default(styles.wrapper, wrapperClassName, wrapperProps === null || wrapperProps === void 0 ? void 0 : wrapperProps.className, (_a = {}, | ||
_a[styles.hidden] = !open && isExited, | ||
_a)), ref: mergeRefs__default.default([ref, wrapperRef]), onKeyDown: handleKeyDown, onMouseDown: handleBackdropMouseDown, onMouseUp: handleBackdropMouseUp, | ||
_a)), ref: mergeRefs__default.default([ | ||
ref, | ||
wrapperRef, | ||
wrapperProps === null || wrapperProps === void 0 ? void 0 : wrapperProps.ref, | ||
]), onKeyDown: handleKeyDown, onMouseDown: handleBackdropMouseDown, onMouseUp: handleBackdropMouseUp, | ||
// eslint-disable-next-line jsx-a11y/no-noninteractive-tabindex | ||
tabIndex: 0, "data-test-id": dataTestId, style: { | ||
zIndex: computedZIndex, | ||
} }, | ||
} }), | ||
React__default.default.createElement(reactTransitionGroup.CSSTransition, tslib.__assign({ appear: true, timeout: 200, classNames: styles }, transitionProps, { in: open, onEntered: handleEntered, onExited: handleExited }), | ||
@@ -257,0 +261,0 @@ React__default.default.createElement("div", tslib.__assign({}, componentDivProps, { className: cn__default.default(styles.component, className, componentDivProps === null || componentDivProps === void 0 ? void 0 : componentDivProps.className), ref: mergeRefs__default.default([ |
@@ -75,2 +75,6 @@ /// <reference types="react" /> | ||
/** | ||
* Дополнительные пропсы на dialog wrapper | ||
*/ | ||
wrapperProps?: React.DetailedHTMLProps<React.HTMLAttributes<HTMLDivElement>, HTMLDivElement>; | ||
/** | ||
* Дополнительные пропсы на обертку контента | ||
@@ -77,0 +81,0 @@ */ |
@@ -46,3 +46,3 @@ 'use strict'; | ||
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.disableBlockingScroll, disableBlockingScroll = _k === void 0 ? false : _k, _l = _a.keepMounted, keepMounted = _l === void 0 ? false : _l, className = _a.className, contentClassName = _a.contentClassName, contentProps = _a.contentProps, componentDivProps = _a.componentDivProps, wrapperClassName = _a.wrapperClassName, onBackdropClick = _a.onBackdropClick, onClose = _a.onClose, onEscapeKeyDown = _a.onEscapeKeyDown, onMount = _a.onMount, onUnmount = _a.onUnmount, dataTestId = _a.dataTestId, _m = _a.zIndex, zIndex = _m === void 0 ? coreComponentsStack.stackingOrder.MODAL : _m, _o = _a.componentRef, componentRef = _o === void 0 ? null : _o, _p = _a.usePortal, usePortal = _p === void 0 ? true : _p; | ||
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.disableBlockingScroll, disableBlockingScroll = _k === void 0 ? false : _k, _l = _a.keepMounted, keepMounted = _l === void 0 ? false : _l, className = _a.className, contentClassName = _a.contentClassName, wrapperProps = _a.wrapperProps, contentProps = _a.contentProps, componentDivProps = _a.componentDivProps, wrapperClassName = _a.wrapperClassName, onBackdropClick = _a.onBackdropClick, onClose = _a.onClose, onEscapeKeyDown = _a.onEscapeKeyDown, onMount = _a.onMount, onUnmount = _a.onUnmount, dataTestId = _a.dataTestId, _m = _a.zIndex, zIndex = _m === void 0 ? coreComponentsStack.stackingOrder.MODAL : _m, _o = _a.componentRef, componentRef = _o === void 0 ? null : _o, _p = _a.usePortal, usePortal = _p === void 0 ? true : _p; | ||
var _q = React.useState(null), exited = _q[0], setExited = _q[1]; | ||
@@ -97,3 +97,3 @@ var _r = React.useState(false), hasScroll = _r[0], setHasScroll = _r[1]; | ||
setHeaderHighlighted(!utils.isScrolledToTop(scrollableNodeRef.current) && | ||
componentNodeRef.current.getBoundingClientRect().top - headerOffset <= 0); | ||
componentNodeRef.current.getBoundingClientRect().top - headerOffset <= 1); | ||
} | ||
@@ -103,3 +103,3 @@ if (hasFooter) { | ||
componentNodeRef.current.getBoundingClientRect().bottom >= | ||
window.innerHeight); | ||
window.innerHeight - 1); | ||
} | ||
@@ -246,9 +246,13 @@ }, [hasFooter, hasHeader, headerOffset]); | ||
} }))), | ||
React__default.default.createElement("div", { role: 'dialog', className: cn__default.default(styles__default.default.wrapper, wrapperClassName, (_a = {}, | ||
React__default.default.createElement("div", tslib.__assign({}, wrapperProps, { role: 'dialog', className: cn__default.default(styles__default.default.wrapper, wrapperClassName, wrapperProps === null || wrapperProps === void 0 ? void 0 : wrapperProps.className, (_a = {}, | ||
_a[styles__default.default.hidden] = !open && isExited, | ||
_a)), ref: mergeRefs__default.default([ref, wrapperRef]), onKeyDown: handleKeyDown, onMouseDown: handleBackdropMouseDown, onMouseUp: handleBackdropMouseUp, | ||
_a)), ref: mergeRefs__default.default([ | ||
ref, | ||
wrapperRef, | ||
wrapperProps === null || wrapperProps === void 0 ? void 0 : wrapperProps.ref, | ||
]), onKeyDown: handleKeyDown, onMouseDown: handleBackdropMouseDown, onMouseUp: handleBackdropMouseUp, | ||
// eslint-disable-next-line jsx-a11y/no-noninteractive-tabindex | ||
tabIndex: 0, "data-test-id": dataTestId, style: { | ||
zIndex: computedZIndex, | ||
} }, | ||
} }), | ||
React__default.default.createElement(reactTransitionGroup.CSSTransition, tslib.__assign({ appear: true, timeout: 200, classNames: styles__default.default }, transitionProps, { in: open, onEntered: handleEntered, onExited: handleExited }), | ||
@@ -255,0 +259,0 @@ React__default.default.createElement("div", tslib.__assign({}, componentDivProps, { className: cn__default.default(styles__default.default.component, className, componentDivProps === null || componentDivProps === void 0 ? void 0 : componentDivProps.className), ref: mergeRefs__default.default([ |
@@ -75,2 +75,6 @@ /// <reference types="react" /> | ||
/** | ||
* Дополнительные пропсы на dialog wrapper | ||
*/ | ||
wrapperProps?: React.DetailedHTMLProps<React.HTMLAttributes<HTMLDivElement>, HTMLDivElement>; | ||
/** | ||
* Дополнительные пропсы на обертку контента | ||
@@ -77,0 +81,0 @@ */ |
@@ -16,3 +16,3 @@ import { __assign } from 'tslib'; | ||
var styles = {"component":"base-modal__component_k89qv","wrapper":"base-modal__wrapper_k89qv","content":"base-modal__content_k89qv","hidden":"base-modal__hidden_k89qv","backdrop":"base-modal__backdrop_k89qv","appear":"base-modal__appear_k89qv","enter":"base-modal__enter_k89qv","appearActive":"base-modal__appearActive_k89qv","enterActive":"base-modal__enterActive_k89qv","exit":"base-modal__exit_k89qv","exitActive":"base-modal__exitActive_k89qv","exitDone":"base-modal__exitDone_k89qv"}; | ||
var styles = {"component":"base-modal__component_svmxx","wrapper":"base-modal__wrapper_svmxx","content":"base-modal__content_svmxx","hidden":"base-modal__hidden_svmxx","backdrop":"base-modal__backdrop_svmxx","appear":"base-modal__appear_svmxx","enter":"base-modal__enter_svmxx","appearActive":"base-modal__appearActive_svmxx","enterActive":"base-modal__enterActive_svmxx","exit":"base-modal__exit_svmxx","exitActive":"base-modal__exitActive_svmxx","exitDone":"base-modal__exitDone_svmxx"}; | ||
require('./index.css') | ||
@@ -37,3 +37,3 @@ | ||
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.disableBlockingScroll, disableBlockingScroll = _k === void 0 ? false : _k, _l = _a.keepMounted, keepMounted = _l === void 0 ? false : _l, className = _a.className, contentClassName = _a.contentClassName, contentProps = _a.contentProps, componentDivProps = _a.componentDivProps, wrapperClassName = _a.wrapperClassName, onBackdropClick = _a.onBackdropClick, onClose = _a.onClose, onEscapeKeyDown = _a.onEscapeKeyDown, onMount = _a.onMount, onUnmount = _a.onUnmount, dataTestId = _a.dataTestId, _m = _a.zIndex, zIndex = _m === void 0 ? stackingOrder.MODAL : _m, _o = _a.componentRef, componentRef = _o === void 0 ? null : _o, _p = _a.usePortal, usePortal = _p === void 0 ? true : _p; | ||
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.disableBlockingScroll, disableBlockingScroll = _k === void 0 ? false : _k, _l = _a.keepMounted, keepMounted = _l === void 0 ? false : _l, className = _a.className, contentClassName = _a.contentClassName, wrapperProps = _a.wrapperProps, contentProps = _a.contentProps, componentDivProps = _a.componentDivProps, wrapperClassName = _a.wrapperClassName, onBackdropClick = _a.onBackdropClick, onClose = _a.onClose, onEscapeKeyDown = _a.onEscapeKeyDown, onMount = _a.onMount, onUnmount = _a.onUnmount, dataTestId = _a.dataTestId, _m = _a.zIndex, zIndex = _m === void 0 ? stackingOrder.MODAL : _m, _o = _a.componentRef, componentRef = _o === void 0 ? null : _o, _p = _a.usePortal, usePortal = _p === void 0 ? true : _p; | ||
var _q = useState(null), exited = _q[0], setExited = _q[1]; | ||
@@ -88,3 +88,3 @@ var _r = useState(false), hasScroll = _r[0], setHasScroll = _r[1]; | ||
setHeaderHighlighted(!isScrolledToTop(scrollableNodeRef.current) && | ||
componentNodeRef.current.getBoundingClientRect().top - headerOffset <= 0); | ||
componentNodeRef.current.getBoundingClientRect().top - headerOffset <= 1); | ||
} | ||
@@ -94,3 +94,3 @@ if (hasFooter) { | ||
componentNodeRef.current.getBoundingClientRect().bottom >= | ||
window.innerHeight); | ||
window.innerHeight - 1); | ||
} | ||
@@ -237,9 +237,13 @@ }, [hasFooter, hasHeader, headerOffset]); | ||
} }))), | ||
React.createElement("div", { role: 'dialog', className: cn(styles.wrapper, wrapperClassName, (_a = {}, | ||
React.createElement("div", __assign({}, wrapperProps, { role: 'dialog', className: cn(styles.wrapper, wrapperClassName, wrapperProps === null || wrapperProps === void 0 ? void 0 : wrapperProps.className, (_a = {}, | ||
_a[styles.hidden] = !open && isExited, | ||
_a)), ref: mergeRefs([ref, wrapperRef]), onKeyDown: handleKeyDown, onMouseDown: handleBackdropMouseDown, onMouseUp: handleBackdropMouseUp, | ||
_a)), ref: mergeRefs([ | ||
ref, | ||
wrapperRef, | ||
wrapperProps === null || wrapperProps === void 0 ? void 0 : wrapperProps.ref, | ||
]), onKeyDown: handleKeyDown, onMouseDown: handleBackdropMouseDown, onMouseUp: handleBackdropMouseUp, | ||
// eslint-disable-next-line jsx-a11y/no-noninteractive-tabindex | ||
tabIndex: 0, "data-test-id": dataTestId, style: { | ||
zIndex: computedZIndex, | ||
} }, | ||
} }), | ||
React.createElement(CSSTransition, __assign({ appear: true, timeout: 200, classNames: styles }, transitionProps, { in: open, onEntered: handleEntered, onExited: handleExited }), | ||
@@ -246,0 +250,0 @@ React.createElement("div", __assign({}, componentDivProps, { className: cn(styles.component, className, componentDivProps === null || componentDivProps === void 0 ? void 0 : componentDivProps.className), ref: mergeRefs([ |
@@ -75,2 +75,6 @@ /// <reference types="react" /> | ||
/** | ||
* Дополнительные пропсы на dialog wrapper | ||
*/ | ||
wrapperProps?: React.DetailedHTMLProps<React.HTMLAttributes<HTMLDivElement>, HTMLDivElement>; | ||
/** | ||
* Дополнительные пропсы на обертку контента | ||
@@ -77,0 +81,0 @@ */ |
@@ -15,3 +15,3 @@ import React, { forwardRef, useState, useRef, useCallback, useEffect, useMemo } from 'react'; | ||
const styles = {"component":"base-modal__component_k89qv","wrapper":"base-modal__wrapper_k89qv","content":"base-modal__content_k89qv","hidden":"base-modal__hidden_k89qv","backdrop":"base-modal__backdrop_k89qv","appear":"base-modal__appear_k89qv","enter":"base-modal__enter_k89qv","appearActive":"base-modal__appearActive_k89qv","enterActive":"base-modal__enterActive_k89qv","exit":"base-modal__exit_k89qv","exitActive":"base-modal__exitActive_k89qv","exitDone":"base-modal__exitDone_k89qv"}; | ||
const styles = {"component":"base-modal__component_svmxx","wrapper":"base-modal__wrapper_svmxx","content":"base-modal__content_svmxx","hidden":"base-modal__hidden_svmxx","backdrop":"base-modal__backdrop_svmxx","appear":"base-modal__appear_svmxx","enter":"base-modal__enter_svmxx","appearActive":"base-modal__appearActive_svmxx","enterActive":"base-modal__enterActive_svmxx","exit":"base-modal__exit_svmxx","exitActive":"base-modal__exitActive_svmxx","exitDone":"base-modal__exitDone_svmxx"}; | ||
require('./index.css') | ||
@@ -36,3 +36,3 @@ | ||
}); | ||
const BaseModal = forwardRef(({ open, container, children, scrollHandler = 'wrapper', Backdrop: Backdrop$1 = Backdrop, backdropProps = {}, transitionProps = {}, disableBackdropClick, disableAutoFocus = false, disableFocusLock = false, disableEscapeKeyDown = false, disableRestoreFocus = false, disableBlockingScroll = false, keepMounted = false, className, contentClassName, contentProps, componentDivProps, wrapperClassName, onBackdropClick, onClose, onEscapeKeyDown, onMount, onUnmount, dataTestId, zIndex = stackingOrder.MODAL, componentRef = null, usePortal = true, }, ref) => { | ||
const BaseModal = forwardRef(({ open, container, children, scrollHandler = 'wrapper', Backdrop: Backdrop$1 = Backdrop, backdropProps = {}, transitionProps = {}, disableBackdropClick, disableAutoFocus = false, disableFocusLock = false, disableEscapeKeyDown = false, disableRestoreFocus = false, disableBlockingScroll = false, keepMounted = false, className, contentClassName, wrapperProps, contentProps, componentDivProps, wrapperClassName, onBackdropClick, onClose, onEscapeKeyDown, onMount, onUnmount, dataTestId, zIndex = stackingOrder.MODAL, componentRef = null, usePortal = true, }, ref) => { | ||
const [exited, setExited] = useState(null); | ||
@@ -87,3 +87,3 @@ const [hasScroll, setHasScroll] = useState(false); | ||
setHeaderHighlighted(!isScrolledToTop(scrollableNodeRef.current) && | ||
componentNodeRef.current.getBoundingClientRect().top - headerOffset <= 0); | ||
componentNodeRef.current.getBoundingClientRect().top - headerOffset <= 1); | ||
} | ||
@@ -93,3 +93,3 @@ if (hasFooter) { | ||
componentNodeRef.current.getBoundingClientRect().bottom >= | ||
window.innerHeight); | ||
window.innerHeight - 1); | ||
} | ||
@@ -233,5 +233,9 @@ }, [hasFooter, hasHeader, headerOffset]); | ||
} })), | ||
React.createElement("div", { role: 'dialog', className: cn(styles.wrapper, wrapperClassName, { | ||
React.createElement("div", { ...wrapperProps, role: 'dialog', className: cn(styles.wrapper, wrapperClassName, wrapperProps?.className, { | ||
[styles.hidden]: !open && isExited, | ||
}), ref: mergeRefs([ref, wrapperRef]), onKeyDown: handleKeyDown, onMouseDown: handleBackdropMouseDown, onMouseUp: handleBackdropMouseUp, | ||
}), ref: mergeRefs([ | ||
ref, | ||
wrapperRef, | ||
wrapperProps?.ref, | ||
]), onKeyDown: handleKeyDown, onMouseDown: handleBackdropMouseDown, onMouseUp: handleBackdropMouseUp, | ||
// eslint-disable-next-line jsx-a11y/no-noninteractive-tabindex | ||
@@ -238,0 +242,0 @@ tabIndex: 0, "data-test-id": dataTestId, style: { |
{ | ||
"name": "@alfalab/core-components-base-modal", | ||
"version": "5.5.0", | ||
"version": "5.6.0", | ||
"description": "BaseModal component", | ||
@@ -18,3 +18,3 @@ "keywords": [], | ||
"@alfalab/core-components-stack": "^4.1.0", | ||
"@alfalab/core-components-shared": "^0.7.0", | ||
"@alfalab/core-components-shared": "^0.8.0", | ||
"@juggle/resize-observer": "^3.3.1", | ||
@@ -21,0 +21,0 @@ "classnames": "^2.3.1", |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
136792
3130
+ Added@alfalab/core-components-shared@0.8.0(transitive)
- Removed@alfalab/core-components-shared@0.7.0(transitive)