Skip to content

refactor: allow AnimatedModal to be placed anywhere (@fehmer) #7599

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

Closed
fehmer wants to merge 1 commit into from
Closed

refactor: allow AnimatedModal to be placed anywhere (@fehmer) #7599

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 6 additions & 3 deletions frontend/__tests__/components/common/AnimatedModal.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,12 @@ describe("AnimatedModal", () => {
modalDiv: HTMLDivElement;
} {
const { container } = render(() => (
<AnimatedModal id="Support" {...props}>
<div data-testid="modal-content">Test Content</div>
</AnimatedModal>
<>
<div id="solidmodals"></div>
<AnimatedModal id="Support" {...props}>
<div data-testid="modal-content">Test Content</div>
</AnimatedModal>
</>
));

return {
Expand Down
53 changes: 28 additions & 25 deletions frontend/src/ts/components/common/AnimatedModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import {
ParentProps,
Show,
} from "solid-js";
import { Portal } from "solid-js/web";

import { useRefWithUtils } from "../../hooks/useRefWithUtils";
import {
Expand Down Expand Up @@ -305,31 +306,33 @@ export function AnimatedModal(props: AnimatedModalProps): JSXElement {
});

return (
<dialog
id={`${props.id as string}Modal`}
ref={dialogRef}
class={cn(
"fixed top-0 left-0 z-1000 m-0 hidden h-screen max-h-screen w-screen max-w-screen border-none bg-[rgba(0,0,0,0.5)] p-8 backdrop:bg-transparent",
props.wrapperClass,
)}
onKeyDown={handleKeyDown}
onMouseDown={handleBackdropClick}
>
<div class="pointer-events-none flex h-full w-full items-center justify-center">
<div
class={cn(
"modal pointer-events-auto grid h-max max-h-full w-full max-w-md gap-4 overflow-auto rounded-double bg-bg p-4 text-text ring-4 ring-sub-alt sm:p-8",
props.modalClass,
)}
ref={modalRef}
onScroll={(e) => props.onScroll?.(e)}
>
<Show when={props.title !== undefined && props.title !== ""}>
<div class="text-2xl text-sub">{props.title}</div>
</Show>
{props.children}
<Portal mount={document.getElementById("solidmodals") as HTMLElement}>
<dialog
id={`${props.id as string}Modal`}
ref={dialogRef}
class={cn(
"fixed top-0 left-0 z-1000 m-0 hidden h-screen max-h-screen w-screen max-w-screen border-none bg-[rgba(0,0,0,0.5)] p-8 backdrop:bg-transparent",
props.wrapperClass,
)}
onKeyDown={handleKeyDown}
onMouseDown={handleBackdropClick}
>
<div class="pointer-events-none flex h-full w-full items-center justify-center">
<div
class={cn(
"modal pointer-events-auto grid h-max max-h-full w-full max-w-md gap-4 overflow-auto rounded-double bg-bg p-4 text-text ring-4 ring-sub-alt sm:p-8",
props.modalClass,
)}
ref={modalRef}
onScroll={(e) => props.onScroll?.(e)}
>
<Show when={props.title !== undefined && props.title !== ""}>
<div class="text-2xl text-sub">{props.title}</div>
</Show>
{props.children}
</div>
</div>
</div>
</dialog>
</dialog>
</Portal>
);
}