diff --git a/src/renderer/src/business/voice/VoiceStatement.tsx b/src/renderer/src/business/voice/VoiceStatement.tsx index eab21ca71..492f27c08 100644 --- a/src/renderer/src/business/voice/VoiceStatement.tsx +++ b/src/renderer/src/business/voice/VoiceStatement.tsx @@ -120,7 +120,7 @@ export const VoiceStatement = ({ setShowPersonalize(undefined)} + onClose={() => setShowPersonalize(undefined)} onCancel={() => { setState && setState(showPersonalize as IVoicePerm); setShowPersonalize(undefined); diff --git a/src/renderer/src/components/App/OrgHead.tsx b/src/renderer/src/components/App/OrgHead.tsx index a4bc5d459..eb641555b 100644 --- a/src/renderer/src/components/App/OrgHead.tsx +++ b/src/renderer/src/components/App/OrgHead.tsx @@ -242,7 +242,7 @@ export const OrgHead = () => { orgRec?.attributes?.name || '' )} isOpen={openMember} - onOpen={setOpenMember} + onClose={() => setOpenMember(false)} bp={isMobile ? BigDialogBp.mobile : BigDialogBp.md} > @@ -261,7 +261,7 @@ export const OrgHead = () => { ) } isOpen={workflowVisible} - onOpen={handleWorkflowClose} + onClose={() => handleWorkflowClose(false)} bp={isMobile ? BigDialogBp.mobile : BigDialogBp.md} > { setSortVisible(false)} bp={isMobile ? BigDialogBp.mobile : BigDialogBp.md} > setSortVisible(false)} /> diff --git a/src/renderer/src/components/AudioTab/AudioTab.tsx b/src/renderer/src/components/AudioTab/AudioTab.tsx index 3c9c10fe5..28b1e3bde 100644 --- a/src/renderer/src/components/AudioTab/AudioTab.tsx +++ b/src/renderer/src/components/AudioTab/AudioTab.tsx @@ -400,7 +400,7 @@ export function AudioTab() { setAttachVisible(false)} onCancel={handleAttachCancel} > { /> )} {showMove && ( - + )} diff --git a/src/renderer/src/components/Discussions/DiscussionList.tsx b/src/renderer/src/components/Discussions/DiscussionList.tsx index acef6a5ca..85dea672e 100644 --- a/src/renderer/src/components/Discussions/DiscussionList.tsx +++ b/src/renderer/src/components/Discussions/DiscussionList.tsx @@ -622,7 +622,7 @@ export function DiscussionList({ onClose }: DiscussionListProps) { { handleCatFilter(initCatFilter); setCategoryOpen(false); diff --git a/src/renderer/src/components/FilterContent.tsx b/src/renderer/src/components/FilterContent.tsx index b78baa6b5..791d44fc1 100644 --- a/src/renderer/src/components/FilterContent.tsx +++ b/src/renderer/src/components/FilterContent.tsx @@ -293,7 +293,7 @@ function FilterContent(props: FilterProps) { return ( handleDialogOpenChange(false)} title={filterStrings.title.replace('{0}', filterData.label)} bp={BigDialogBp.sm} > diff --git a/src/renderer/src/components/MediaUpload.tsx b/src/renderer/src/components/MediaUpload.tsx index 66999304b..8ea4d3612 100644 --- a/src/renderer/src/components/MediaUpload.tsx +++ b/src/renderer/src/components/MediaUpload.tsx @@ -112,7 +112,7 @@ function MediaUpload(props: IProps) { return ( diff --git a/src/renderer/src/components/PassageDataTable.tsx b/src/renderer/src/components/PassageDataTable.tsx index 03bef0e68..d75a651fc 100644 --- a/src/renderer/src/components/PassageDataTable.tsx +++ b/src/renderer/src/components/PassageDataTable.tsx @@ -465,7 +465,7 @@ export const PassageDataTable = (props: IProps) => { } isOpen={termsCheck !== undefined} - onOpen={handleTermsCancel} + onClose={handleTermsCancel} > <> {termsOfUse(curTermsCheck)} diff --git a/src/renderer/src/components/PassageDetail/ConsultantCheck.tsx b/src/renderer/src/components/PassageDetail/ConsultantCheck.tsx index b20ecd149..1c6de043c 100644 --- a/src/renderer/src/components/PassageDetail/ConsultantCheck.tsx +++ b/src/renderer/src/components/PassageDetail/ConsultantCheck.tsx @@ -348,7 +348,7 @@ export function ConsultantCheck({ width }: IProps) { handleCompareOpen(false)} + onClose={() => handleCompareOpen(false)} > } isOpen={previewOpen} - onOpen={(isOpen: boolean) => { - setPreviewOpen(isOpen); - if (!isOpen) setPreviewItem(null); + onClose={() => { + setPreviewOpen(false); + setPreviewItem(null); }} bp={isMobileWidth ? BigDialogBp.mobile : BigDialogBp.sm} mobileNoHorizontalScroll diff --git a/src/renderer/src/components/PassageDetail/Internalization/PassageDetailArtifacts.tsx b/src/renderer/src/components/PassageDetail/Internalization/PassageDetailArtifacts.tsx index 0d7007a2f..2668b2e66 100644 --- a/src/renderer/src/components/PassageDetail/Internalization/PassageDetailArtifacts.tsx +++ b/src/renderer/src/components/PassageDetail/Internalization/PassageDetailArtifacts.tsx @@ -1243,7 +1243,7 @@ export function PassageDetailArtifacts() { title={t.findResource.replace('{0}', passageRef(passage) || '')} description={{t.findResourceDesc}} isOpen={findOpen} - onOpen={handleFindVisible} + onClose={() => handleFindVisible(false)} bp={BigDialogBp.sm} > handleSharedResourceVisible(false)} bp={BigDialogBp.md} > handleProjectResourceVisible(false)} > { @@ -1297,7 +1297,7 @@ export function PassageDetailArtifacts() { } isOpen={projResPassageVisible} - onOpen={handleProjResPassageVisible} + onClose={() => handleProjResPassageVisible(false)} disableBackdropClose > {projResPassageVisible ? ( @@ -1324,7 +1324,7 @@ export function PassageDetailArtifacts() { : t.editAudioResource } isOpen={projResWizVisible} - onOpen={handleProjResWizVisible} + onClose={() => handleProjResWizVisible(false)} bp={BigDialogBp.md} disableBackdropClose // Flex column so ProjectResourceConfigure can fill the height and pin @@ -1349,7 +1349,7 @@ export function PassageDetailArtifacts() { handleEditResourceVisible(false)} onSave={allowEditSave ? handleEditSave : undefined} onCancel={handleEditCancel} bp={BigDialogBp.sm} @@ -1405,7 +1405,7 @@ export function PassageDetailArtifacts() { setMarkDoan('')} + onClose={() => setMarkDoan('')} bp={BigDialogBp.sm} > @@ -1415,7 +1415,7 @@ export function PassageDetailArtifacts() { setAudioScriptureVisible(false)} + onClose={() => setAudioScriptureVisible(false)} bp={BigDialogBp.sm} setCloseRequested={setBiblebrainClose} > diff --git a/src/renderer/src/components/PassageDetail/Internalization/PassageDetailsArtifactsMobile.tsx b/src/renderer/src/components/PassageDetail/Internalization/PassageDetailsArtifactsMobile.tsx index 503a057fa..527e64210 100644 --- a/src/renderer/src/components/PassageDetail/Internalization/PassageDetailsArtifactsMobile.tsx +++ b/src/renderer/src/components/PassageDetail/Internalization/PassageDetailsArtifactsMobile.tsx @@ -1213,7 +1213,7 @@ export function PassageDetailArtifactsMobile() { } isOpen={findOpen} - onOpen={handleFindVisible} + onClose={() => handleFindVisible(false)} bp={BigDialogBp.mobile} mobilePaperWidth="min(356px, calc(100vw - 4px))" dialogContentSx={{ @@ -1240,7 +1240,7 @@ export function PassageDetailArtifactsMobile() { : t.passageResource )} isOpen={sharedResourceVisible} - onOpen={handleSharedResourceVisible} + onClose={() => handleSharedResourceVisible(false)} bp={BigDialogBp.mobile} > handleProjectResourceVisible(false)} > { @@ -1277,7 +1277,7 @@ export function PassageDetailArtifactsMobile() { } isOpen={projResPassageVisible} - onOpen={handleProjResPassageVisible} + onClose={() => handleProjResPassageVisible(false)} disableBackdropClose > {projResPassageVisible ? ( @@ -1300,7 +1300,7 @@ export function PassageDetailArtifactsMobile() { handleProjResWizVisible(false)} bp={BigDialogBp.md} disableBackdropClose > @@ -1320,7 +1320,7 @@ export function PassageDetailArtifactsMobile() { handleEditResourceVisible(false)} onSave={allowEditSave ? handleEditSave : undefined} onCancel={handleEditCancel} bp={BigDialogBp.mobile} @@ -1384,7 +1384,7 @@ export function PassageDetailArtifactsMobile() { mobileThickScrollbar mobileNoHorizontalScroll isOpen={Boolean(markDown)} - onOpen={() => { + onClose={() => { setMarkDoan(''); setMarkDownTitle(''); }} @@ -1397,7 +1397,7 @@ export function PassageDetailArtifactsMobile() { setAudioScriptureVisible(false)} + onClose={() => setAudioScriptureVisible(false)} bp={BigDialogBp.mobile} setCloseRequested={setBiblebrainClose} > diff --git a/src/renderer/src/components/PassageDetail/Keyterms/KeyTerms.tsx b/src/renderer/src/components/PassageDetail/Keyterms/KeyTerms.tsx index 5d2cf30a5..911f16c45 100644 --- a/src/renderer/src/components/PassageDetail/Keyterms/KeyTerms.tsx +++ b/src/renderer/src/components/PassageDetail/Keyterms/KeyTerms.tsx @@ -171,7 +171,7 @@ const KeyTerms = ({ width }: IProps) => { { setChooser(false)} > diff --git a/src/renderer/src/components/PassageDetail/lwcTranscription/BoldClauseTranscriptionEditor.tsx b/src/renderer/src/components/PassageDetail/lwcTranscription/BoldClauseTranscriptionEditor.tsx index c88b9da79..1d9020707 100644 --- a/src/renderer/src/components/PassageDetail/lwcTranscription/BoldClauseTranscriptionEditor.tsx +++ b/src/renderer/src/components/PassageDetail/lwcTranscription/BoldClauseTranscriptionEditor.tsx @@ -428,9 +428,7 @@ export default function BoldClauseTranscriptionEditor({ { - if (!open) handleAsrClose(); - }} + onClose={() => handleAsrClose()} bp={isMobile ? BigDialogBp.mobile : BigDialogBp.sm} mobileNoHorizontalScroll={isMobile} mobilePaperWidth={ @@ -455,7 +453,7 @@ export default function BoldClauseTranscriptionEditor({ handleAsrLanguageClose(true)} + onClose={() => handleAsrLanguageClose(true)} bp={isMobile ? BigDialogBp.mobile : BigDialogBp.sm} mobileNoHorizontalScroll={isMobile} mobilePaperWidth={ diff --git a/src/renderer/src/components/PassageDetail/mobile/transcribe/PassageDetailTranscribeMobile.tsx b/src/renderer/src/components/PassageDetail/mobile/transcribe/PassageDetailTranscribeMobile.tsx index f41ac6f16..6d3ee6c00 100644 --- a/src/renderer/src/components/PassageDetail/mobile/transcribe/PassageDetailTranscribeMobile.tsx +++ b/src/renderer/src/components/PassageDetail/mobile/transcribe/PassageDetailTranscribeMobile.tsx @@ -937,7 +937,7 @@ export function PassageDetailTranscribeMobileContent({ width }: IProps) { asr.handleAsrLanguageClose(true)} + onClose={() => asr.handleAsrLanguageClose(true)} bp={BigDialogBp.mobile} > asr.setAsrProgressVisible(false)} bp={BigDialogBp.mobile} mobileNoHorizontalScroll={true} mobilePaperWidth="min(356px, calc(100vw - 4px))" diff --git a/src/renderer/src/components/PolicyDialog.tsx b/src/renderer/src/components/PolicyDialog.tsx index 18e6a385b..58e2b3143 100644 --- a/src/renderer/src/components/PolicyDialog.tsx +++ b/src/renderer/src/components/PolicyDialog.tsx @@ -19,7 +19,7 @@ export const PolicyDialog = (props: PolicyDialogProps) => { diff --git a/src/renderer/src/components/ProjectDownloadAlert.tsx b/src/renderer/src/components/ProjectDownloadAlert.tsx index a943006cf..b16ac0b25 100644 --- a/src/renderer/src/components/ProjectDownloadAlert.tsx +++ b/src/renderer/src/components/ProjectDownloadAlert.tsx @@ -384,7 +384,7 @@ export const ProjectDownloadAlert = (props: IProps) => { @@ -579,7 +579,7 @@ export const ProjectDownloadAlert = (props: IProps) => { setShowMissingFiles(false)} + onClose={() => setShowMissingFiles(false)} bp={BigDialogBp.md} > diff --git a/src/renderer/src/components/Sheet/ScriptureTable.tsx b/src/renderer/src/components/Sheet/ScriptureTable.tsx index dd0d948b2..f2ad6897b 100644 --- a/src/renderer/src/components/Sheet/ScriptureTable.tsx +++ b/src/renderer/src/components/Sheet/ScriptureTable.tsx @@ -2339,7 +2339,7 @@ export function ScriptureTable(props: IProps) { {editRow && (shared || isNote) ? ( { setOpen(false)} onSave={handleSave} onCancel={handleCancel} > diff --git a/src/renderer/src/components/StepEditor/StepEditor.cy.tsx b/src/renderer/src/components/StepEditor/StepEditor.cy.tsx index 99ab1de68..e861e9fe7 100644 --- a/src/renderer/src/components/StepEditor/StepEditor.cy.tsx +++ b/src/renderer/src/components/StepEditor/StepEditor.cy.tsx @@ -180,7 +180,7 @@ function StepEditorInDialog({ org }: { org: string }) { setOpen(false)} bp={BigDialogBp.md} > diff --git a/src/renderer/src/components/StepEditor/StepEditor.tsx b/src/renderer/src/components/StepEditor/StepEditor.tsx index 527b43308..c12c724c4 100644 --- a/src/renderer/src/components/StepEditor/StepEditor.tsx +++ b/src/renderer/src/components/StepEditor/StepEditor.tsx @@ -593,7 +593,7 @@ export const StepEditor = ({ process, org }: IProps) => { isOpen={ (rows[toolSettingsRow] as IStepRow).tool === ToolSlug.Transcribe } - onOpen={setToolSettingsOpen} + onClose={() => setToolSettingsOpen(false)} bp={BigDialogBp.sm} > { isOpen={ (rows[toolSettingsRow] as IStepRow).tool === ToolSlug.Paratext } - onOpen={setToolSettingsOpen} + onClose={() => setToolSettingsOpen(false)} bp={BigDialogBp.sm} > { setToolSettingsOpen(false)} bp={BigDialogBp.sm} > { setToolSettingsOpen(false)} bp={BigDialogBp.sm} > { (rows[toolSettingsRow] as IStepRow).tool === ToolSlug.PhraseBackTranslate } - onOpen={setToolSettingsOpen} + onClose={() => setToolSettingsOpen(false)} bp={BigDialogBp.sm} > { handleWorkflow(false)} > setSortVisible(false)} + onClose={() => setSortVisible(false)} > setSortVisible(false)} /> diff --git a/src/renderer/src/components/Team/ProjectCard.tsx b/src/renderer/src/components/Team/ProjectCard.tsx index 16e282fb6..13f8b816e 100644 --- a/src/renderer/src/components/Team/ProjectCard.tsx +++ b/src/renderer/src/components/Team/ProjectCard.tsx @@ -680,7 +680,7 @@ export const ProjectCard = (props: IProps) => { setOpenIntegration(false)} > {openIntegration ? ( { setOpenExport(false)} dialogContentSx={{ display: 'flex', flexDirection: 'column' }} > { : t.editPersonalCategory } isOpen={openCategory} - onOpen={setOpenCategory} + onClose={() => setOpenCategory(false)} > ( onOpen(false)} onSave={onSave} onCancel={onCancel} title={title} diff --git a/src/renderer/src/components/Team/TeamItem.tsx b/src/renderer/src/components/Team/TeamItem.tsx index 83a59e2b1..fa682e3bc 100644 --- a/src/renderer/src/components/Team/TeamItem.tsx +++ b/src/renderer/src/components/Team/TeamItem.tsx @@ -157,7 +157,7 @@ export const TeamItem = (props: IProps) => { setOpenMember(false)} bp={BigDialogBp.md} > @@ -168,14 +168,14 @@ export const TeamItem = (props: IProps) => { `- ${team?.attributes?.name || ''}` )} isOpen={showWorkflow} - onOpen={handleWorkflow} + onClose={() => handleWorkflow(false)} > setSortVisible(false)} + onClose={() => setSortVisible(false)} > setSortVisible(false)} /> diff --git a/src/renderer/src/components/Team/TeamSettings.tsx b/src/renderer/src/components/Team/TeamSettings.tsx index 3b538c5bc..375a6d974 100644 --- a/src/renderer/src/components/Team/TeamSettings.tsx +++ b/src/renderer/src/components/Team/TeamSettings.tsx @@ -248,7 +248,7 @@ export function TeamSettings(props: IProps) { setVoiceVisible(false)} + onClose={() => setVoiceVisible(false)} description={{t.convertPrompt}} bp={BigDialogBp.sm} > diff --git a/src/renderer/src/components/Transcriber.tsx b/src/renderer/src/components/Transcriber.tsx index 713c9999e..358c1fee7 100644 --- a/src/renderer/src/components/Transcriber.tsx +++ b/src/renderer/src/components/Transcriber.tsx @@ -1631,7 +1631,7 @@ export function Transcriber(props: IProps) { handleEditorSettings(false)} > handleAsrLanguageClose(true)} + onClose={() => handleAsrLanguageClose(true)} bp={BigDialogBp.sm} > handleAsrProgressVisible(false)} bp={isMobile ? BigDialogBp.mobile : BigDialogBp.sm} mobileNoHorizontalScroll={isMobile} mobilePaperWidth={ diff --git a/src/renderer/src/components/WSAudioPlayer.tsx b/src/renderer/src/components/WSAudioPlayer.tsx index 1bc2a466d..579519c40 100644 --- a/src/renderer/src/components/WSAudioPlayer.tsx +++ b/src/renderer/src/components/WSAudioPlayer.tsx @@ -1865,7 +1865,7 @@ function WSAudioPlayer(props: IProps) { } isOpen={voiceVisible} - onOpen={handleCloseVoice} + onClose={handleCloseVoice} bp={effectiveMobileView ? BigDialogBp.mobile : BigDialogBp.sm} mobileNoHorizontalScroll={effectiveMobileView} mobilePaperWidth={ diff --git a/src/renderer/src/control/MediaTitle.tsx b/src/renderer/src/control/MediaTitle.tsx index 23afb4272..2f6c5da47 100644 --- a/src/renderer/src/control/MediaTitle.tsx +++ b/src/renderer/src/control/MediaTitle.tsx @@ -490,7 +490,7 @@ export default function MediaTitle(props: IProps) { { setOpenIntegration(false)} > {openIntegration ? : <>} setOpenExport(false)} dialogContentSx={{ display: 'flex', flexDirection: 'column' }} > { const longTitle = 'Provide audio for Matthew 1:1-25 — a very long dialog title'; render( - {}}> + {}}>
body
); diff --git a/src/renderer/src/hoc/BigDialog.tsx b/src/renderer/src/hoc/BigDialog.tsx index d9b9fe56d..1f807cae2 100644 --- a/src/renderer/src/hoc/BigDialog.tsx +++ b/src/renderer/src/hoc/BigDialog.tsx @@ -184,7 +184,8 @@ interface IProps { dialogContentSx?: SxProps; children: React.JSX.Element; isOpen: boolean; - onOpen: (isOpen: boolean) => void; + /** Called when the dialog requests to close (top X, backdrop, or escape). */ + onClose: () => void; onCancel?: (() => void) | undefined; onSave?: (() => void) | undefined; bp?: BigDialogBp | undefined; @@ -209,7 +210,20 @@ export function BigDialog({ dialogContentSx, children, isOpen, - onOpen, + // Future cleanup to do: BigDialog has three + // dismiss paths that behave inconsistently. The bottom Cancel button + // (onClick={onCancel}, below) bypasses handleClose entirely, so it skips the + // importexportBusy guard, setCloseRequested(true), the enableOffsite reset, + // AND the now-required onClose() — unlike the X / backdrop / escape / bottom + // Close button, which all route through here. onCancel is also overloaded: + // it both renders the Cancel button and acts as a second dismiss callback. + // Collapse this to a single dismiss path: route the Cancel button through + // handleClose too (Cancel-vs-Close becomes a pure label choice), make + // onClose the one teardown handler, and keep a separate onCancel only if + // "cancel" must mean something different from "dismiss" (and if so, route + // the X through it consistently). Behavioral change — touches ~8 onCancel + // callers; needs its own PR + per-dialog testing. + onClose, onCancel, onSave, bp, @@ -234,7 +248,11 @@ export function BigDialog({ } setCloseRequested && setCloseRequested(true); if (enableOffsite) setEnableOffsite(false); - onOpen && onOpen(false); + // Dismissing the dialog (top X, backdrop, or escape) runs BOTH onClose and + // onCancel; onCancel is also wired to the bottom Cancel button, so a caller + // that wants distinct close-vs-cancel handling must not rely on onCancel + // firing only on the explicit Cancel action. + onClose(); onCancel && onCancel(); }; diff --git a/src/renderer/src/routes/ProjectsScreen.tsx b/src/renderer/src/routes/ProjectsScreen.tsx index 4876b2fef..4e328e517 100644 --- a/src/renderer/src/routes/ProjectsScreen.tsx +++ b/src/renderer/src/routes/ProjectsScreen.tsx @@ -272,7 +272,7 @@ export const ProjectsScreenInner = () => { `- ${thisTeam?.attributes?.name || ''}` )} isOpen={showWorkflow} - onOpen={handleWorkflowOpen} + onClose={() => handleWorkflowOpen(false)} > {/* Use defaultWorkflow, same as TeamItem */}