From 4c04bcffa8b5f792cd1cd4c33b2b83280b2f96b9 Mon Sep 17 00:00:00 2001 From: Jackson Harper Date: Tue, 31 Jan 2023 15:42:58 +0800 Subject: [PATCH] Rename HighlightsModal to NotebookModal --- .../templates/article/HighlightsLayer.tsx | 14 ++++++++------ .../{HighlightsModal.tsx => NotebookModal.tsx} | 9 +++++---- .../templates/article/PdfArticleContainer.tsx | 14 ++++++++------ 3 files changed, 21 insertions(+), 16 deletions(-) rename packages/web/components/templates/article/{HighlightsModal.tsx => NotebookModal.tsx} (97%) diff --git a/packages/web/components/templates/article/HighlightsLayer.tsx b/packages/web/components/templates/article/HighlightsLayer.tsx index 38acad310..c29fec273 100644 --- a/packages/web/components/templates/article/HighlightsLayer.tsx +++ b/packages/web/components/templates/article/HighlightsLayer.tsx @@ -19,7 +19,7 @@ import { removeHighlights } from '../../../lib/highlights/deleteHighlight' import { createHighlight } from '../../../lib/highlights/createHighlight' import { HighlightNoteModal } from './HighlightNoteModal' import { ShareHighlightModal } from './ShareHighlightModal' -import { HighlightsModal } from './HighlightsModal' +import { NotebookModal } from './NotebookModal' import { useCanShareNative } from '../../../lib/hooks/useCanShareNative' import { showErrorToast } from '../../../lib/toastHelpers' import { ArticleMutations } from '../../../lib/articleActions' @@ -69,16 +69,18 @@ export function HighlightsLayer(props: HighlightsLayerProps): JSX.Element { >([]) const focusedHighlightMousePos = useRef({ pageX: 0, pageY: 0 }) - const [focusedHighlight, setFocusedHighlight] = - useState(undefined) + const [focusedHighlight, setFocusedHighlight] = useState< + Highlight | undefined + >(undefined) const [selectionData, setSelectionData] = useSelection( highlightLocations, false //noteModal.open, ) - const [labelsTarget, setLabelsTarget] = - useState(undefined) + const [labelsTarget, setLabelsTarget] = useState( + undefined + ) const canShareNative = useCanShareNative() @@ -641,7 +643,7 @@ export function HighlightsLayer(props: HighlightsLayerProps): JSX.Element { if (props.showHighlightsModal) { return ( - props.setShowHighlightsModal(false)} deleteHighlightAction={(highlightId: string) => { diff --git a/packages/web/components/templates/article/HighlightsModal.tsx b/packages/web/components/templates/article/NotebookModal.tsx similarity index 97% rename from packages/web/components/templates/article/HighlightsModal.tsx rename to packages/web/components/templates/article/NotebookModal.tsx index e507652ba..4215435c4 100644 --- a/packages/web/components/templates/article/HighlightsModal.tsx +++ b/packages/web/components/templates/article/NotebookModal.tsx @@ -28,7 +28,7 @@ import { setLabelsForHighlight } from '../../../lib/networking/mutations/setLabe import { updateHighlightMutation } from '../../../lib/networking/mutations/updateHighlightMutation' import { showErrorToast, showSuccessToast } from '../../../lib/toastHelpers' -type HighlightsModalProps = { +type NotebookModalProps = { highlights: Highlight[] scrollToHighlight?: (arg: string) => void updateHighlight: (highlight: Highlight) => void @@ -36,11 +36,12 @@ type HighlightsModalProps = { onOpenChange: (open: boolean) => void } -export function HighlightsModal(props: HighlightsModalProps): JSX.Element { +export function NotebookModal(props: NotebookModalProps): JSX.Element { const [showConfirmDeleteHighlightId, setShowConfirmDeleteHighlightId] = useState(undefined) - const [labelsTarget, setLabelsTarget] = - useState(undefined) + const [labelsTarget, setLabelsTarget] = useState( + undefined + ) const [, updateState] = useState({}) return ( diff --git a/packages/web/components/templates/article/PdfArticleContainer.tsx b/packages/web/components/templates/article/PdfArticleContainer.tsx index a222fcdae..e2bffea2a 100644 --- a/packages/web/components/templates/article/PdfArticleContainer.tsx +++ b/packages/web/components/templates/article/PdfArticleContainer.tsx @@ -15,7 +15,7 @@ import { ShareHighlightModal } from './ShareHighlightModal' import { useCanShareNative } from '../../../lib/hooks/useCanShareNative' import { webBaseURL } from '../../../lib/appConfig' import { pspdfKitKey } from '../../../lib/appConfig' -import { HighlightsModal } from './HighlightsModal' +import { NotebookModal } from './NotebookModal' import { HighlightNoteModal } from './HighlightNoteModal' export type PdfArticleContainerProps = { @@ -29,11 +29,13 @@ export default function PdfArticleContainer( props: PdfArticleContainerProps ): JSX.Element { const containerRef = useRef(null) - const [shareTarget, setShareTarget] = - useState(undefined) + const [shareTarget, setShareTarget] = useState( + undefined + ) const [noteTarget, setNoteTarget] = useState(undefined) - const [noteTargetPageIndex, setNoteTargetPageIndex] = - useState(undefined) + const [noteTargetPageIndex, setNoteTargetPageIndex] = useState< + number | undefined + >(undefined) const highlightsRef = useRef([]) const canShareNative = useCanShareNative() @@ -423,7 +425,7 @@ export default function PdfArticleContainer( /> )} {props.showHighlightsModal && ( - props.setShowHighlightsModal(false)} /* eslint-disable @typescript-eslint/no-empty-function */