Merge pull request #4374 from brantsrasmus/fix/session-modal-dismiss-outside-click
fix: dismiss session modals when clicking the side margins
This commit is contained in:
4 files changed
+98
-4
No files matched your search
@@ -0,0 +1,3 @@
|
||||
.modal {
|
||||
width: min(calc(100dvw - 48px), 1320px);
|
||||
}
|
||||
@@ -2,12 +2,13 @@
|
||||
import { Column, Dialog, Modal, type ModalProps } from '@umami/react-zen';
|
||||
import { SessionProfile } from '@/app/(main)/websites/[websiteId]/sessions/SessionProfile';
|
||||
import { useNavigation } from '@/components/hooks';
|
||||
import styles from './SessionModal.module.css';
|
||||
|
||||
export interface SessionModalProps extends ModalProps {
|
||||
websiteId: string;
|
||||
}
|
||||
|
||||
export function SessionModal({ websiteId, ...props }: SessionModalProps) {
|
||||
export function SessionModal({ websiteId, className, ...props }: SessionModalProps) {
|
||||
const {
|
||||
router,
|
||||
pathname,
|
||||
@@ -25,12 +26,13 @@ export function SessionModal({ websiteId, ...props }: SessionModalProps) {
|
||||
<Modal
|
||||
placement="bottom"
|
||||
offset="80px"
|
||||
className={[styles.modal, className].filter(Boolean).join(' ')}
|
||||
isOpen={!!session}
|
||||
onOpenChange={handleOpenChange}
|
||||
isDismissable
|
||||
{...props}
|
||||
>
|
||||
<Column height="100%" maxWidth="1320px" style={{ margin: '0 auto' }}>
|
||||
<Column height="100%">
|
||||
<Dialog variant="sheet" className="rounded-lg">
|
||||
{({ close }) => (
|
||||
<Column padding="10">
|
||||
|
||||
@@ -3,6 +3,7 @@ import { Column, Dialog, Modal } from '@umami/react-zen';
|
||||
import { useRouter, useSearchParams } from 'next/navigation';
|
||||
import { buildPath } from '@/lib/url';
|
||||
import { SessionProfile } from './SessionProfile';
|
||||
import styles from './SessionModal.module.css';
|
||||
|
||||
export function SessionProfileModal({
|
||||
websiteId,
|
||||
@@ -28,8 +29,15 @@ export function SessionProfileModal({
|
||||
};
|
||||
|
||||
return (
|
||||
<Modal placement="bottom" offset="80px" isOpen onOpenChange={handleOpenChange} isDismissable>
|
||||
<Column height="100%" maxWidth="1320px" style={{ margin: '0 auto' }}>
|
||||
<Modal
|
||||
placement="bottom"
|
||||
offset="80px"
|
||||
className={styles.modal}
|
||||
isOpen
|
||||
onOpenChange={handleOpenChange}
|
||||
isDismissable
|
||||
>
|
||||
<Column height="100%">
|
||||
<Dialog variant="sheet" className="rounded-lg">
|
||||
<Column padding="10">
|
||||
<SessionProfile websiteId={websiteId} sessionId={sessionId} onClose={closeModal} />
|
||||
|
||||
Reference in new issue
Block a user