diff --git a/packages/web/src/javascripts/Components/NotesOptions/NotesOptions.tsx b/packages/web/src/javascripts/Components/NotesOptions/NotesOptions.tsx index 4a4405451..890571a1f 100644 --- a/packages/web/src/javascripts/Components/NotesOptions/NotesOptions.tsx +++ b/packages/web/src/javascripts/Components/NotesOptions/NotesOptions.tsx @@ -504,7 +504,7 @@ const NotesOptions = ({ notes, closeMenu }: NotesOptionsProps) => { )} - + > ) diff --git a/packages/web/src/javascripts/Components/NotesOptions/SuperExportModal.tsx b/packages/web/src/javascripts/Components/NotesOptions/SuperExportModal.tsx index 186b5e8c6..e32068052 100644 --- a/packages/web/src/javascripts/Components/NotesOptions/SuperExportModal.tsx +++ b/packages/web/src/javascripts/Components/NotesOptions/SuperExportModal.tsx @@ -1,17 +1,19 @@ -import { PrefKey, PrefValue } from '@standardnotes/snjs' +import { PrefKey, PrefValue, SNNote } from '@standardnotes/snjs' import { useApplication } from '../ApplicationProvider' import Modal from '../Modal/Modal' import usePreference from '@/Hooks/usePreference' import RadioButtonGroup from '../RadioButtonGroup/RadioButtonGroup' import { useEffect } from 'react' import Switch from '../Switch/Switch' +import { noteHasEmbeddedFiles } from '@/Utils/NoteExportUtils' type Props = { + notes: SNNote[] exportNotes: () => void close: () => void } -const SuperExportModal = ({ exportNotes, close }: Props) => { +const SuperExportModal = ({ notes, exportNotes, close }: Props) => { const application = useApplication() const superNoteExportFormat = usePreference(PrefKey.SuperNoteExportFormat) const superNoteExportEmbedBehavior = usePreference(PrefKey.SuperNoteExportEmbedBehavior) @@ -26,6 +28,8 @@ const SuperExportModal = ({ exportNotes, close }: Props) => { } }, [application, superNoteExportEmbedBehavior, superNoteExportFormat]) + const someNotesHaveEmbeddedFiles = notes.some(noteHasEmbeddedFiles) + return ( { )} - {superNoteExportFormat !== 'json' && ( + {superNoteExportFormat !== 'json' && someNotesHaveEmbeddedFiles && ( How do you want embedded files to be handled? { return note.noteType === NoteType.Super } -const noteHasEmbeddedFiles = (note: SNNote) => { +export const noteHasEmbeddedFiles = (note: SNNote) => { return note.text.includes('"type":"snfile"') }