Skip to content

fix: ProgramContentEbookReader modalState to modalType and merge modal state #582

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

Open
LoisChen68 wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

fix: ProgramContentEbookReader modalState to modalType and merge modal state #582

Show file tree
Hide file tree
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
0 src/components/ebook/EbookCommentModel.tsx → src/components/ebook/EbookCommentModal.tsx
View file
Open in desktop
File renamed without changes.
0 ...ponents/ebook/EbookDeleteCommentModel.tsx → ...ponents/ebook/EbookDeleteCommentModal.tsx
View file
Open in desktop
File renamed without changes.
36 changes: 17 additions & 19 deletions src/components/program/ProgramContentEbookReader.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ import { useEbookHighlight, useGetEbookTrialPercentage } from '../../hooks/ebook
import { Highlight } from '../../hooks/model/api/ebookHighlightQraphql'
import CommonModal from '../common/CommonModal'
import { deleteProgramContentEbookBookmark } from '../ebook/EbookBookmarkModal'
import EbookCommentModal from '../ebook/EbookCommentModel'
import EbookDeleteHighlightModal from '../ebook/EbookDeleteCommentModel'
import EbookCommentModal from '../ebook/EbookCommentModal'
import EbookDeleteHighlightModal from '../ebook/EbookDeleteCommentModal'
import { EbookReaderControlBar } from '../ebook/EbookReaderControlBar'
import EbookTextSelectionToolbar from '../ebook/EbookTextSelectionToolbar'
import { decryptData } from './decryptUtils'
Expand Down Expand Up @@ -160,7 +160,7 @@ const ProgramContentEbookReader: React.VFC<{
useMutationProgramContentEbookTocProgress()

const [sliderValue, setSliderValue] = useState<number>(0)
const [modalState, setModalState] = useState<'trialComplete' | null | string>(null)
const [modalType, setModalType] = useState<'trialComplete' | 'comment' | 'deleteHighLight' | null | string>(null)
const [isTrialCompleted, setIsTrialCompleted] = useState(false)
const [isLocationGenerated, setIsLocationGenerated] = useState<boolean>(false)
const [currentPageBookmarkIds, setCurrentPageBookmarkIds] = useState<string[]>([])
Expand All @@ -178,8 +178,6 @@ const ProgramContentEbookReader: React.VFC<{
cfiRange: null,
contents: null,
})
const [openCommentModel, setOpenCommentModel] = useState(false)
const [openDeleteHighlightModel, setDeleteHighlightModel] = useState(false)
const [isRenditionReady, setIsRenditionReady] = useState(false)
const [reRenderHighlightQueue, setReRenderHighlightQueue] = useState<string[]>([])
const [forceReapplyHighlight, setForceReapplyHighlight] = useState(false)
Expand All @@ -191,7 +189,7 @@ const ProgramContentEbookReader: React.VFC<{
const originalPrevRef = useRef<(() => Promise<void>) | undefined>()

if (rendition.current) {
if (!!openCommentModel || !isLocationGenerated) {
if (modalType === 'comment' || !isLocationGenerated) {
rendition.current.next = () => {
return Promise.resolve()
}
Expand Down Expand Up @@ -234,7 +232,7 @@ const ProgramContentEbookReader: React.VFC<{
}

setAnnotation(highlightToComment)
setOpenCommentModel(true)
setModalType('comment')
setToolbarVisible(false)
}

Expand Down Expand Up @@ -264,13 +262,13 @@ const ProgramContentEbookReader: React.VFC<{
}

setAnnotation(null)
setOpenCommentModel(false)
setModalType(null)
setToolbarVisible(false)
}
}

const handleCommentCancel = () => {
setOpenCommentModel(false)
setModalType(null)
setToolbarVisible(false)
}

Expand All @@ -281,7 +279,7 @@ const ProgramContentEbookReader: React.VFC<{

if (existingHighlight) {
setHighlightToDelete(existingHighlight)
setDeleteHighlightModel(true)
setModalType('deleteHighLight')
setToolbarVisible(false)
}
}
Expand All @@ -293,14 +291,14 @@ const ProgramContentEbookReader: React.VFC<{
rendition.current?.annotations.remove(highlightToDelete.cfiRange, 'highlight')
rendition.current?.annotations.remove(highlightToDelete.cfiRange, 'underline')

setDeleteHighlightModel(false)
setModalType(null)
setToolbarVisible(false)
setHighlightToDelete(null)
}
}

const handleDeleteHighlightModalCancel = () => {
setDeleteHighlightModel(false)
setModalType(null)
setToolbarVisible(false)
}

Expand Down Expand Up @@ -580,24 +578,24 @@ const ProgramContentEbookReader: React.VFC<{
<Box height={{ base: `${!!isSafari ? '90vh' : '100vh'}`, md: '85vh' }}>
<CommonModal
isCentered
isOpen={modalState === 'trialComplete'}
isOpen={modalType === 'trialComplete'}
title={formatMessage(programMessages.ProgramContentEbookReader.trialCompleted)}
onClose={() => {
setModalState(null)
setModalType(null)
}}
renderFooter={() => <Button colorScheme="primary">{formatMessage(commonMessages.ui.purchase)}</Button>}
>
<Text marginTop="16px">{formatMessage(programMessages.ProgramContentEbookReader.trialCompletedMessage)}</Text>
</CommonModal>
<EbookDeleteHighlightModal
visible={openDeleteHighlightModel}
visible={modalType === 'deleteHighLight'}
onOk={() => {
handleDeleteHighlightModalOk()
}}
onCancel={handleDeleteHighlightModalCancel}
/>
<EbookCommentModal
visible={openCommentModel}
visible={modalType === 'comment'}
onOk={handleCommentOk}
onCancel={handleCommentCancel}
annotation={annotation}
Expand Down Expand Up @@ -643,7 +641,7 @@ const ProgramContentEbookReader: React.VFC<{
setIsTrialCompleted(false)
setSliderValue(sliderPercentage)
if (isTrial && sliderPercentage >= ebookTrialPercentage) {
setModalState('trialComplete')
setModalType('trialComplete')
setIsTrialCompleted(true)
} else {
setIsTrialCompleted(false)
Expand Down Expand Up @@ -851,7 +849,7 @@ const ProgramContentEbookReader: React.VFC<{
style={{ ...readerStyles.arrow, ...readerStyles.next }}
onClick={async () => {
if (isTrialCompleted) {
setModalState('trialComplete')
setModalType('trialComplete')
} else {
await rendition.current?.next()
setForceReapplyHighlight(!forceReapplyHighlight)
Expand All @@ -872,7 +870,7 @@ const ProgramContentEbookReader: React.VFC<{
<EbookReaderControlBar
isLocationGenerated={isLocationGenerated}
sliderValue={sliderValue}
onModalStateChange={setModalState}
onModalStateChange={setModalType}
onSliderValueChange={setSliderValue}
ebookTrialPercentage={ebookTrialPercentage}
isTrial={isTrial}
Expand Down