Skip to content

fix(ui): keep Create Project form open when Escape dismisses a child picker #258

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

Merged
martian56 merged 1 commit into from
Jul 5, 2026
Merged

fix(ui): keep Create Project form open when Escape dismisses a child picker #258

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
26 changes: 17 additions & 9 deletions apps/web/src/components/CreateProjectModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { useEffect, useState } from 'react';
import { useCallback, useEffect, useState } from 'react';
import { createPortal } from 'react-dom';
import { Button, Input, Tooltip } from './ui';
import { CoverImageModal } from './CoverImageModal';
Expand Down Expand Up @@ -86,7 +86,7 @@ export function CreateProjectModal({
const [coverModalOpen, setCoverModalOpen] = useState(false);
const [iconModalOpen, setIconModalOpen] = useState(false);

const handleClose = () => {
const handleClose = useCallback(() => {
setName('');
setIdentifier('');
setDescription('');
Expand All @@ -97,7 +97,7 @@ export function CreateProjectModal({
setProjectLeadId(null);
setError('');
onClose();
};
}, [onClose]);

const handleSubmit = async (e: React.FormEvent) => {
e.preventDefault();
Expand Down Expand Up @@ -132,10 +132,6 @@ export function CreateProjectModal({
useEffect(() => {
if (!open) return;

const handleEscape = (e: KeyboardEvent) => {
if (e.key === 'Escape') onClose();
};
document.addEventListener('keydown', handleEscape);
document.body.style.overflow = 'hidden';

// Load workspace members for project lead dropdown
Expand All @@ -147,10 +143,22 @@ export function CreateProjectModal({
});

return () => {
document.removeEventListener('keydown', handleEscape);
document.body.style.overflow = '';
};
}, [open, onClose, workspaceSlug]);
}, [open, workspaceSlug]);

// Escape closes the whole form — but not while a nested cover/icon picker is
// open, since that picker handles Escape itself. Using handleClose (not the
// raw onClose) ensures the form state is reset so a reopen starts clean.
useEffect(() => {
if (!open) return;
const handleEscape = (e: KeyboardEvent) => {
if (e.key !== 'Escape' || coverModalOpen || iconModalOpen) return;
handleClose();
};
document.addEventListener('keydown', handleEscape);
return () => document.removeEventListener('keydown', handleEscape);
}, [open, coverModalOpen, iconModalOpen, handleClose]);

if (!open) return null;

Expand Down
Loading