Benature/omnivore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix delete article note not being displayed

Browse Source
This commit is contained in:
Jackson Harper
2023-04-19 11:06:03 +08:00
parent e943f91acf
commit 9a4a4e89d3
2 changed files with 29 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
packages/web/components/templates/article/Notebook.tsx
View File

@ -40,6 +40,9 @@ type NotebookProps = {
highlights: Highlight[],
deletedAnnotations: Highlight[]
) => void
showConfirmDeleteNote?: boolean
setShowConfirmDeleteNote?: (show: boolean) => void
}
export const getHighlightLocation = (patch: string): number | undefined => {
@ -61,13 +64,16 @@ type AnnotationInfo = {
export function Notebook(props: NotebookProps): JSX.Element {
const [showConfirmDeleteHighlightId, setShowConfirmDeleteHighlightId] =
useState<undefined | string>(undefined)
const [labelsTarget, setLabelsTarget] =
useState<Highlight | undefined>(undefined)
const [showConfirmDeleteNote, setShowConfirmDeleteNote] = useState(false)
const [notesEditMode, setNotesEditMode] =
useState<'edit' | 'preview'>('preview')
const [labelsTarget, setLabelsTarget] = useState<Highlight | undefined>(
undefined
)
const [notesEditMode, setNotesEditMode] = useState<'edit' | 'preview'>(
'preview'
)
const [, updateState] = useState({})
console.log('props.showConfirmDeleteNote', props.showConfirmDeleteNote)
const annotationsReducer = (
state: AnnotationInfo,
action: {
@ -398,15 +404,21 @@ export function Notebook(props: NotebookProps): JSX.Element {
}}
/>
)}
{showConfirmDeleteNote && (
{props.showConfirmDeleteNote && (
<ConfirmationModal
message="Are you sure you want to delete the note from this document?"
acceptButtonLabel="Delete"
onAccept={() => {
deleteDocumentNote()
setShowConfirmDeleteNote(false)
if (props.setShowConfirmDeleteNote) {
props.setShowConfirmDeleteNote(false)
}
}}
onOpenChange={() => {
if (props.setShowConfirmDeleteNote) {
props.setShowConfirmDeleteNote(false)
}
}}
onOpenChange={() => setShowConfirmDeleteNote(false)}
/>
)}
</VStack>

14
packages/web/components/templates/article/NotebookModal.tsx
View File

@ -40,10 +40,12 @@ export const getHighlightLocation = (patch: string): number | undefined => {
export function NotebookModal(props: NotebookModalProps): JSX.Element {
const [sizeMode, setSizeMode] = useState<'normal' | 'maximized'>('normal')
const [showConfirmDeleteNote, setShowConfirmDeleteNote] = useState(false)
const [allAnnotations, setAllAnnotations] =
useState<Highlight[] | undefined>(undefined)
const [deletedAnnotations, setDeletedAnnotations] =
useState<Highlight[] | undefined>(undefined)
const [allAnnotations, setAllAnnotations] = useState<Highlight[] | undefined>(
undefined
)
const [deletedAnnotations, setDeletedAnnotations] = useState<
Highlight[] | undefined
>(undefined)
const handleClose = useCallback(() => {
props.onClose(allAnnotations ?? [], deletedAnnotations ?? [])
@ -136,7 +138,7 @@ export function NotebookModal(props: NotebookModalProps): JSX.Element {
onSelect={() => {
setShowConfirmDeleteNote(true)
}}
title="Delete Document Note"
title="Delete Article Note"
/>
</Dropdown>
<CloseButton close={handleClose} />
@ -147,6 +149,8 @@ export function NotebookModal(props: NotebookModalProps): JSX.Element {
sizeMode={sizeMode}
viewInReader={viewInReader}
onAnnotationsChanged={handleAnnotationsChange}
showConfirmDeleteNote={showConfirmDeleteNote}
setShowConfirmDeleteNote={setShowConfirmDeleteNote}
/>
</ModalContent>
</ModalRoot>