Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
36 changes: 34 additions & 2 deletions packages/ui/src/elements/DocumentDrawer/DrawerHeader/index.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use client'

import { useCallback } from 'react'
import { useCallback, useEffect } from 'react'

import { Gutter } from '../../../elements/Gutter/index.js'
import { useModal } from '../../../elements/Modal/index.js'
Expand All @@ -22,7 +22,7 @@ export const DocumentDrawerHeader: React.FC<{
drawerSlug: string
showDocumentID?: boolean
}> = ({ AfterHeader, drawerSlug, showDocumentID = true }) => {
const { closeModal, openModal } = useModal()
const { closeModal, isModalOpen, openModal } = useModal()
const { t } = useTranslation()
const isModified = useFormModified()

Expand All @@ -34,6 +34,38 @@ export const DocumentDrawerHeader: React.FC<{
}
}, [isModified, openModal, closeModal, drawerSlug])

useEffect(() => {
if (!isModified) {
return
}

const drawerCloseButton = document.getElementById(`close-drawer__${drawerSlug}`)

const handleDrawerCloseClick = (event: MouseEvent) => {
if (isModalOpen(leaveWithoutSavingModalSlug)) return

event.preventDefault()
event.stopPropagation()
handleOnClose()
}

const handleKeyDown = (event: KeyboardEvent) => {
if (event.key !== 'Escape' || !isModalOpen(leaveWithoutSavingModalSlug)) return

event.preventDefault()
event.stopPropagation()
handleOnClose()
}

drawerCloseButton?.addEventListener('click', handleDrawerCloseClick)
document.addEventListener('keydown', handleKeyDown)

return () => {
drawerCloseButton?.removeEventListener('click', handleDrawerCloseClick)
document.removeEventListener('keydown', handleKeyDown)
}
}, [drawerSlug, handleOnClose, isModalOpen, isModified])

return (
<Gutter className={`${documentDrawerBaseClass}__header`}>
<div className={`${documentDrawerBaseClass}__header-content`}>
Expand Down
11 changes: 10 additions & 1 deletion test/admin/e2e/document-view/e2e.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -911,7 +911,16 @@ describe('Document View', () => {
await expect(leaveModal).toBeVisible()
await leaveModal.locator('#confirm-cancel').click()
await expect(editModal).toBeVisible()
await closeButton.click()

const gutterCloseButton = page.locator('.drawer--is-open > .drawer__close')
await gutterCloseButton.click()
await expect(leaveModal).toBeVisible()
await leaveModal.locator('#confirm-cancel').click()
await expect(editModal).toBeVisible()

await page.keyboard.press('Escape')
await expect(leaveModal).toBeVisible()

await leaveModal.locator('#confirm-action').click()
await expect(editModal).toBeHidden()
})
Expand Down
Loading