Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(Modal): wrap the overlay and modal inside a container, to allow portaling with layer provider to the container #2703

Merged
merged 3 commits into from
Jan 7, 2025
Merged

feat(Modal): wrap the overlay and modal inside a container, to allow portaling with layer provider to the container #2703

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
32fb729
feat(Modal): wrap the overlay and modal inside a container, to allow …
YossiSaadi Jan 6, 2025
9e297fd
trigger [prerelease]
YossiSaadi Jan 6, 2025
5eb50f4
chore: remove commented code
YossiSaadi Jan 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
83 changes: 43 additions & 40 deletions packages/core/src/components/Modal/Modal/Modal.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,47 +1,50 @@
$modal-default-z-index: 10000;

.overlay {
.container {
position: fixed;
inset: 0;
background-color: var(--color-surface);
z-index: var(--monday-modal-z-index, $modal-default-z-index);
}

.modal {
--top-actions-spacing: var(--spacing-large);
--top-actions-width: var(--spacing-xl);
--modal-inline-padding: var(--spacing-xl);

position: fixed;
top: 50%;
left: 50%;
z-index: var(--monday-modal-z-index, $modal-default-z-index);

display: flex;
flex-direction: column;
width: var(--modal-width);
max-height: var(--modal-max-height);
background-color: var(--primary-background-color);
overflow: hidden;
border-radius: var(--border-radius-big);
box-shadow: var(--box-shadow-large);

&.withHeaderAction {
--top-actions-width: calc(var(--spacing-xl) * 2);
}

&.sizeSmall {
--modal-max-height: 50%;
--modal-width: 480px;
}
z-index: var(--monday-modal-z-index, 10000);

&.sizeMedium {
--modal-max-height: 80%;
--modal-width: 580px;
.overlay {
position: fixed;
inset: 0;
height: 100%;
background-color: var(--color-surface);
}

&.sizeLarge {
--modal-max-height: 80%;
--modal-width: 840px;
.modal {
--top-actions-spacing: var(--spacing-large);
--top-actions-width: var(--spacing-xl);
--modal-inline-padding: var(--spacing-xl);

position: relative;
top: 50%;
left: 50%;

display: flex;
flex-direction: column;
width: var(--modal-width);
max-height: var(--modal-max-height);
background-color: var(--primary-background-color);
overflow: hidden;
border-radius: var(--border-radius-big);
box-shadow: var(--box-shadow-large);

&.withHeaderAction {
--top-actions-width: calc(var(--spacing-xl) * 2);
}

&.sizeSmall {
--modal-max-height: 50%;
--modal-width: 480px;
}

&.sizeMedium {
--modal-max-height: 80%;
--modal-width: 580px;
}

&.sizeLarge {
--modal-max-height: 80%;
--modal-width: 840px;
}
}
}
37 changes: 17 additions & 20 deletions packages/core/src/components/Modal/Modal/Modal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ const Modal = forwardRef(

const modalRef = useRef<HTMLDivElement>(null);
const modalMergedRef = useMergeRef<HTMLDivElement>(ref, modalRef);
const overlayRef = useRef<HTMLDivElement>(null);
const containerRef = useRef<HTMLDivElement>(null);

const [titleId, setTitleId] = useState<string>();
const [descriptionId, setDescriptionId] = useState<string>();
Expand Down Expand Up @@ -103,28 +103,25 @@ const Modal = forwardRef(
: modalAnimationCenterPopVariants;

const zIndexStyle = zIndex ? ({ "--monday-modal-z-index": zIndex } as React.CSSProperties) : {};
const modalStyle = { ...zIndexStyle, ...style };

return (
<AnimatePresence>
{show && (
<LayerProvider layerRef={overlayRef}>
<LayerProvider layerRef={containerRef}>
<ModalProvider value={contextValue}>
{createPortal(
<>
<motion.div
ref={overlayRef}
variants={modalAnimationOverlayVariants}
initial="initial"
animate="enter"
exit="exit"
data-testid={getTestId(ComponentDefaultTestId.MODAL_NEXT_OVERLAY, id)}
className={styles.overlay}
onClick={onBackdropClick}
aria-hidden
style={zIndexStyle}
/>
<FocusLockComponent returnFocus>
<FocusLockComponent returnFocus>
<div ref={containerRef} className={styles.container} style={zIndexStyle}>
<motion.div
variants={modalAnimationOverlayVariants}
initial="initial"
animate="enter"
exit="exit"
data-testid={getTestId(ComponentDefaultTestId.MODAL_NEXT_OVERLAY, id)}
className={styles.overlay}
onClick={onBackdropClick}
aria-hidden
/>
<RemoveScroll forwardProps ref={modalMergedRef}>
<motion.div
variants={modalAnimationVariants}
Expand All @@ -144,7 +141,7 @@ const Modal = forwardRef(
aria-modal
aria-labelledby={ariaLabelledby || titleId}
aria-describedby={ariaDescribedby || descriptionId}
style={modalStyle}
style={style}
onKeyDown={onModalKeyDown}
tabIndex={-1}
>
Expand All @@ -157,8 +154,8 @@ const Modal = forwardRef(
/>
</motion.div>
</RemoveScroll>
</FocusLockComponent>
</>,
</div>
</FocusLockComponent>,
portalTargetElement
)}
</ModalProvider>
Expand Down
Loading