Extract logic from "ReaderViewer" into functions and hooks
This commit is contained in:
@@ -24,38 +24,35 @@ import { ReaderService } from '@/modules/reader/services/ReaderService.ts';
|
|||||||
import {
|
import {
|
||||||
IReaderSettings,
|
IReaderSettings,
|
||||||
PageInViewportType,
|
PageInViewportType,
|
||||||
ReadingDirection,
|
|
||||||
ReadingMode,
|
ReadingMode,
|
||||||
TReaderScrollbarContext,
|
TReaderScrollbarContext,
|
||||||
} from '@/modules/reader/types/Reader.types.ts';
|
} from '@/modules/reader/types/Reader.types.ts';
|
||||||
import { ReaderPagedPager } from '@/modules/reader/components/viewer/pager/ReaderPagedPager.tsx';
|
|
||||||
import { ReaderDoublePagedPager } from '@/modules/reader/components/viewer/pager/ReaderDoublePagedPager.tsx';
|
|
||||||
import { ReaderHorizontalPager } from '@/modules/reader/components/viewer/pager/ReaderHorizontalPager.tsx';
|
|
||||||
import { ReaderVerticalPager } from '@/modules/reader/components/viewer/pager/ReaderVerticalPager.tsx';
|
|
||||||
import { userReaderStatePagesContext } from '@/modules/reader/contexts/state/ReaderStatePagesContext.tsx';
|
import { userReaderStatePagesContext } from '@/modules/reader/contexts/state/ReaderStatePagesContext.tsx';
|
||||||
import {
|
import { getDoublePageModePages } from '@/modules/reader/utils/ReaderPager.utils.tsx';
|
||||||
createPagesData,
|
|
||||||
getDoublePageModePages,
|
|
||||||
getScrollIntoViewInlineOption,
|
|
||||||
getScrollToXForReadingDirection,
|
|
||||||
isSpreadPage,
|
|
||||||
} from '@/modules/reader/utils/ReaderPager.utils.tsx';
|
|
||||||
import { useReaderScrollbarContext } from '@/modules/reader/contexts/ReaderScrollbarContext.tsx';
|
import { useReaderScrollbarContext } from '@/modules/reader/contexts/ReaderScrollbarContext.tsx';
|
||||||
import { MediaQuery } from '@/modules/core/utils/MediaQuery.tsx';
|
import { MediaQuery } from '@/modules/core/utils/MediaQuery.tsx';
|
||||||
import { ReaderControls } from '@/modules/reader/services/ReaderControls.ts';
|
import { ReaderControls } from '@/modules/reader/services/ReaderControls.ts';
|
||||||
import { getNextIndexFromPage, getPage } from '@/modules/reader/utils/ReaderProgressBar.utils.tsx';
|
|
||||||
import {
|
import {
|
||||||
|
getPagerForReadingMode,
|
||||||
isContinuousReadingMode,
|
isContinuousReadingMode,
|
||||||
isContinuousVerticalReadingMode,
|
isContinuousVerticalReadingMode,
|
||||||
} from '@/modules/reader/utils/ReaderSettings.utils.tsx';
|
} from '@/modules/reader/utils/ReaderSettings.utils.tsx';
|
||||||
import { useMouseDragScroll } from '@/modules/core/hooks/useMouseDragScroll.tsx';
|
import { useMouseDragScroll } from '@/modules/core/hooks/useMouseDragScroll.tsx';
|
||||||
import { DirectionOffset } from '@/Base.types.ts';
|
|
||||||
import { useReaderOverlayContext } from '@/modules/reader/contexts/ReaderOverlayContext.tsx';
|
import { useReaderOverlayContext } from '@/modules/reader/contexts/ReaderOverlayContext.tsx';
|
||||||
import { applyStyles } from '@/modules/core/utils/ApplyStyles.ts';
|
import { applyStyles } from '@/modules/core/utils/ApplyStyles.ts';
|
||||||
import { TReaderOverlayContext } from '@/modules/reader/types/ReaderOverlay.types.ts';
|
import { TReaderOverlayContext } from '@/modules/reader/types/ReaderOverlay.types.ts';
|
||||||
import { ReaderStatePages } from '@/modules/reader/types/ReaderProgressBar.types.ts';
|
import { ReaderStatePages } from '@/modules/reader/types/ReaderProgressBar.types.ts';
|
||||||
import { withPropsFrom } from '@/modules/core/hoc/withPropsFrom.tsx';
|
import { withPropsFrom } from '@/modules/core/hoc/withPropsFrom.tsx';
|
||||||
import { useReaderAutoScrollContext } from '@/modules/reader/contexts/ReaderAutoScrollContext.tsx';
|
import { useReaderAutoScrollContext } from '@/modules/reader/contexts/ReaderAutoScrollContext.tsx';
|
||||||
|
import {
|
||||||
|
createUpdateReaderPageLoadState,
|
||||||
|
useReaderAutoScroll,
|
||||||
|
useReaderConvertPagesForReadingMode,
|
||||||
|
useReaderHandlePageSelection,
|
||||||
|
useReaderHideCursorOnInactivity,
|
||||||
|
useReaderHideOverlayOnUserScroll,
|
||||||
|
useReaderHorizontalModeInvertXYScrolling,
|
||||||
|
} from '@/modules/reader/utils/Reader.utils.ts';
|
||||||
|
|
||||||
const READING_MODE_TO_IN_VIEWPORT_TYPE: Record<ReadingMode, PageInViewportType> = {
|
const READING_MODE_TO_IN_VIEWPORT_TYPE: Record<ReadingMode, PageInViewportType> = {
|
||||||
[ReadingMode.SINGLE_PAGE]: PageInViewportType.X,
|
[ReadingMode.SINGLE_PAGE]: PageInViewportType.X,
|
||||||
@@ -129,7 +126,6 @@ const BaseReaderViewer = forwardRef(
|
|||||||
|
|
||||||
const handleClick = ReaderControls.useHandleClick(scrollElementRef.current);
|
const handleClick = ReaderControls.useHandleClick(scrollElementRef.current);
|
||||||
|
|
||||||
const [wasDoublePageMode, setWasDoublePageMode] = useState(readingMode === ReadingMode.DOUBLE_PAGE);
|
|
||||||
const [pagesToSpreadState, setPagesToSpreadState] = useState(Array(totalPages).fill(false));
|
const [pagesToSpreadState, setPagesToSpreadState] = useState(Array(totalPages).fill(false));
|
||||||
|
|
||||||
const imageRefs = useRef<(HTMLElement | null)[]>(pages.map(() => null));
|
const imageRefs = useRef<(HTMLElement | null)[]>(pages.map(() => null));
|
||||||
@@ -152,60 +148,19 @@ const BaseReaderViewer = forwardRef(
|
|||||||
return pages;
|
return pages;
|
||||||
}, [pagesToSpreadState, readingMode, shouldOffsetDoubleSpreads, readingDirection]);
|
}, [pagesToSpreadState, readingMode, shouldOffsetDoubleSpreads, readingDirection]);
|
||||||
|
|
||||||
const Pager = useMemo(() => {
|
const Pager = useMemo(() => getPagerForReadingMode(readingMode), [readingMode]);
|
||||||
switch (readingMode) {
|
|
||||||
case ReadingMode.SINGLE_PAGE:
|
|
||||||
return ReaderPagedPager;
|
|
||||||
case ReadingMode.DOUBLE_PAGE:
|
|
||||||
return ReaderDoublePagedPager;
|
|
||||||
case ReadingMode.CONTINUOUS_VERTICAL:
|
|
||||||
case ReadingMode.WEBTOON:
|
|
||||||
return ReaderVerticalPager;
|
|
||||||
case ReadingMode.CONTINUOUS_HORIZONTAL:
|
|
||||||
return ReaderHorizontalPager;
|
|
||||||
default:
|
|
||||||
throw new Error(`Unexpected "ReadingMode" (${readingMode})`);
|
|
||||||
}
|
|
||||||
}, [readingMode]);
|
|
||||||
|
|
||||||
const inViewportType = READING_MODE_TO_IN_VIEWPORT_TYPE[readingMode];
|
const inViewportType = READING_MODE_TO_IN_VIEWPORT_TYPE[readingMode];
|
||||||
|
|
||||||
const onLoad = useCallback(
|
const onLoad = useMemo(
|
||||||
(pagesIndex: number, isPrimary: boolean = true) => {
|
() =>
|
||||||
const page = actualPages[pagesIndex];
|
createUpdateReaderPageLoadState(
|
||||||
const { index, url } = isPrimary ? page.primary : page.secondary!;
|
actualPages,
|
||||||
|
pagesToSpreadState,
|
||||||
if (readingMode === ReadingMode.DOUBLE_PAGE) {
|
setPagesToSpreadState,
|
||||||
const img = new Image();
|
pageLoadStates,
|
||||||
img.onload = () => {
|
setPageLoadStates,
|
||||||
const isSpreadPageFlag = isSpreadPage(img);
|
readingMode,
|
||||||
if (!isSpreadPageFlag || pagesToSpreadState[index] === isSpreadPageFlag) {
|
),
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
setPagesToSpreadState((prevState) => {
|
|
||||||
if (pagesToSpreadState[index] === isSpreadPageFlag) {
|
|
||||||
return prevState;
|
|
||||||
}
|
|
||||||
|
|
||||||
return prevState.toSpliced(index, 1, isSpreadPageFlag);
|
|
||||||
});
|
|
||||||
};
|
|
||||||
img.src = url;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (pageLoadStates[index].loaded) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
setPageLoadStates((statePageLoadStates) => {
|
|
||||||
if (statePageLoadStates[index].loaded) {
|
|
||||||
return statePageLoadStates;
|
|
||||||
}
|
|
||||||
|
|
||||||
return statePageLoadStates.toSpliced(index, 1, { loaded: true });
|
|
||||||
});
|
|
||||||
},
|
|
||||||
// do not add "pagesToSpreadState" and "pageLoadStates" as a dependency, otherwise, every page gets re-rendered
|
// do not add "pagesToSpreadState" and "pageLoadStates" as a dependency, otherwise, every page gets re-rendered
|
||||||
// when they change which impacts the performance massively (depending on the total page count)
|
// when they change which impacts the performance massively (depending on the total page count)
|
||||||
[actualPages, readingMode],
|
[actualPages, readingMode],
|
||||||
@@ -222,142 +177,33 @@ const BaseReaderViewer = forwardRef(
|
|||||||
setPagesToSpreadState(Array(totalPages).fill(false));
|
setPagesToSpreadState(Array(totalPages).fill(false));
|
||||||
}, [totalPages]);
|
}, [totalPages]);
|
||||||
|
|
||||||
// optionally convert pages to normal or double page mode
|
useReaderConvertPagesForReadingMode(
|
||||||
useLayoutEffect(() => {
|
currentPageIndex,
|
||||||
const convertPagesToNormalPageMode = wasDoublePageMode && readingMode !== ReadingMode.DOUBLE_PAGE;
|
totalPages,
|
||||||
if (convertPagesToNormalPageMode) {
|
actualPages,
|
||||||
setWasDoublePageMode(false);
|
pageUrls,
|
||||||
setPages(createPagesData(pageUrls));
|
setPages,
|
||||||
setPagesToSpreadState(Array(totalPages).fill(false));
|
setPagesToSpreadState,
|
||||||
return;
|
updateCurrentPageIndex,
|
||||||
}
|
readingMode,
|
||||||
|
);
|
||||||
const convertPagesToDoublePageMode = readingMode === ReadingMode.DOUBLE_PAGE;
|
useReaderHandlePageSelection(
|
||||||
if (convertPagesToDoublePageMode) {
|
pageToScrollToIndex,
|
||||||
if (!wasDoublePageMode) {
|
currentPageIndex,
|
||||||
updateCurrentPageIndex(getNextIndexFromPage(getPage(currentPageIndex, actualPages)));
|
pages,
|
||||||
}
|
totalPages,
|
||||||
setPages(actualPages);
|
setPageToScrollToIndex,
|
||||||
setWasDoublePageMode(readingMode === ReadingMode.DOUBLE_PAGE);
|
updateCurrentPageIndex,
|
||||||
}
|
isContinuousReadingModeActive,
|
||||||
}, [actualPages, readingMode]);
|
imageRefs,
|
||||||
|
themeDirection,
|
||||||
// handle user page selection
|
readingDirection,
|
||||||
useLayoutEffect(() => {
|
scrollElementRef,
|
||||||
if (pageToScrollToIndex == null) {
|
);
|
||||||
return;
|
useReaderHideCursorOnInactivity(scrollElementRef);
|
||||||
}
|
useReaderHorizontalModeInvertXYScrolling(readingMode, readingDirection, scrollElementRef);
|
||||||
|
useReaderHideOverlayOnUserScroll(isOverlayVisible, setIsOverlayVisible, scrollElementRef);
|
||||||
const pageToScrollTo = getPage(pageToScrollToIndex, pages);
|
useReaderAutoScroll(isOverlayVisible, automaticScrolling);
|
||||||
|
|
||||||
if (isContinuousReadingModeActive) {
|
|
||||||
const directionOffset =
|
|
||||||
pageToScrollToIndex > currentPageIndex ? DirectionOffset.PREVIOUS : DirectionOffset.NEXT;
|
|
||||||
const imageRef = imageRefs.current[pageToScrollTo.pagesIndex];
|
|
||||||
|
|
||||||
imageRef?.scrollIntoView({
|
|
||||||
block: 'start',
|
|
||||||
inline: getScrollIntoViewInlineOption(directionOffset, themeDirection, readingDirection),
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!isContinuousReadingModeActive) {
|
|
||||||
scrollElementRef.current?.scrollTo(
|
|
||||||
getScrollToXForReadingDirection(scrollElementRef.current, themeDirection, readingDirection),
|
|
||||||
0,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
const newPageIndex = getNextIndexFromPage(pageToScrollTo);
|
|
||||||
const isLastPage = newPageIndex === totalPages - 1;
|
|
||||||
|
|
||||||
setPageToScrollToIndex(null);
|
|
||||||
updateCurrentPageIndex(newPageIndex, !isLastPage);
|
|
||||||
}, [pageToScrollToIndex]);
|
|
||||||
|
|
||||||
// hide cursor on mouse inactivity
|
|
||||||
const mouseInactiveTimeout = useRef<NodeJS.Timeout>();
|
|
||||||
useEffect(() => {
|
|
||||||
const setCursorVisibility = (visible: boolean) => {
|
|
||||||
const scrollElement = scrollElementRef.current;
|
|
||||||
if (!scrollElement) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
scrollElement.style.cursor = visible ? 'default' : 'none';
|
|
||||||
};
|
|
||||||
|
|
||||||
const handleMouseMove = () => {
|
|
||||||
setCursorVisibility(true);
|
|
||||||
clearTimeout(mouseInactiveTimeout.current);
|
|
||||||
mouseInactiveTimeout.current = setTimeout(() => {
|
|
||||||
setCursorVisibility(false);
|
|
||||||
}, 5000);
|
|
||||||
};
|
|
||||||
|
|
||||||
handleMouseMove();
|
|
||||||
window.addEventListener('mousemove', handleMouseMove);
|
|
||||||
return () => {
|
|
||||||
setCursorVisibility(true);
|
|
||||||
window.removeEventListener('mousemove', handleMouseMove);
|
|
||||||
clearTimeout(mouseInactiveTimeout.current);
|
|
||||||
};
|
|
||||||
}, []);
|
|
||||||
|
|
||||||
// invert x and y scrolling for the continuous horizontal reading mode
|
|
||||||
useEffect(() => {
|
|
||||||
if (readingMode !== ReadingMode.CONTINUOUS_HORIZONTAL) {
|
|
||||||
return () => {};
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!scrollElementRef.current) {
|
|
||||||
return () => {};
|
|
||||||
}
|
|
||||||
|
|
||||||
const handleScroll = (e: WheelEvent) => {
|
|
||||||
e.preventDefault();
|
|
||||||
|
|
||||||
if (e.shiftKey) {
|
|
||||||
scrollElementRef.current?.scrollBy({
|
|
||||||
top: e.deltaY,
|
|
||||||
});
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
scrollElementRef.current?.scrollBy({
|
|
||||||
left: readingDirection === ReadingDirection.LTR ? e.deltaY : e.deltaY * -1,
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
scrollElementRef.current.addEventListener('wheel', handleScroll);
|
|
||||||
return () => scrollElementRef.current?.removeEventListener('wheel', handleScroll);
|
|
||||||
}, [readingMode, readingDirection]);
|
|
||||||
|
|
||||||
// hide overlay on user triggered scroll
|
|
||||||
useEffect(() => {
|
|
||||||
const handleScroll = () => {
|
|
||||||
if (isOverlayVisible) {
|
|
||||||
setIsOverlayVisible(false);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
scrollElementRef.current?.addEventListener('wheel', handleScroll);
|
|
||||||
scrollElementRef.current?.addEventListener('touchmove', handleScroll);
|
|
||||||
return () => {
|
|
||||||
scrollElementRef.current?.removeEventListener('wheel', handleScroll);
|
|
||||||
scrollElementRef.current?.removeEventListener('touchmove', handleScroll);
|
|
||||||
};
|
|
||||||
}, [isOverlayVisible]);
|
|
||||||
|
|
||||||
// handle auto scrolling
|
|
||||||
useEffect(() => {
|
|
||||||
if (isOverlayVisible) {
|
|
||||||
automaticScrolling.pause();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
automaticScrolling.resume();
|
|
||||||
}, [isOverlayVisible, automaticScrolling.isPaused]);
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Stack
|
<Stack
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ import { memo } from 'react';
|
|||||||
import { BasePager } from '@/modules/reader/components/viewer/pager/BasePager.tsx';
|
import { BasePager } from '@/modules/reader/components/viewer/pager/BasePager.tsx';
|
||||||
import { ReaderPagerProps } from '@/modules/reader/types/Reader.types.ts';
|
import { ReaderPagerProps } from '@/modules/reader/types/Reader.types.ts';
|
||||||
import { createReaderPage } from '@/modules/reader/utils/ReaderPager.utils.tsx';
|
import { createReaderPage } from '@/modules/reader/utils/ReaderPager.utils.tsx';
|
||||||
|
import { withPropsFrom } from '@/modules/core/hoc/withPropsFrom';
|
||||||
|
|
||||||
const BaseReaderPagedPager = ({
|
const BaseReaderPagedPager = ({
|
||||||
onLoad,
|
onLoad,
|
||||||
@@ -48,4 +49,4 @@ const BaseReaderPagedPager = ({
|
|||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
export const ReaderPagedPager = memo(BaseReaderPagedPager);
|
export const ReaderPagedPager = withPropsFrom(memo(BaseReaderPagedPager), [], []);
|
||||||
|
|||||||
@@ -6,11 +6,25 @@
|
|||||||
* file, You can obtain one at https://mozilla.org/MPL/2.0/.
|
* file, You can obtain one at https://mozilla.org/MPL/2.0/.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import { ReaderResumeMode } from '@/modules/reader/types/Reader.types.ts';
|
import { MutableRefObject, useEffect, useLayoutEffect, useRef, useState } from 'react';
|
||||||
|
import { Direction } from '@mui/material/styles';
|
||||||
|
import { ReaderResumeMode, ReadingDirection, ReadingMode } from '@/modules/reader/types/Reader.types.ts';
|
||||||
import { UpdateChapterPatchInput } from '@/lib/graphql/generated/graphql.ts';
|
import { UpdateChapterPatchInput } from '@/lib/graphql/generated/graphql.ts';
|
||||||
import { TChapterReader } from '@/modules/chapter/Chapter.types.ts';
|
import { TChapterReader } from '@/modules/chapter/Chapter.types.ts';
|
||||||
import { ChapterIdInfo, Chapters } from '@/modules/chapter/services/Chapters.ts';
|
import { ChapterIdInfo, Chapters } from '@/modules/chapter/services/Chapters.ts';
|
||||||
import { CHAPTER_READER_FIELDS } from '@/lib/graphql/fragments/ChapterFragments.ts';
|
import { CHAPTER_READER_FIELDS } from '@/lib/graphql/fragments/ChapterFragments.ts';
|
||||||
|
import { useAutomaticScrolling } from '@/modules/core/hooks/useAutomaticScrolling.ts';
|
||||||
|
import { TReaderOverlayContext } from '@/modules/reader/types/ReaderOverlay.types.ts';
|
||||||
|
import { getNextIndexFromPage, getPage } from '@/modules/reader/utils/ReaderProgressBar.utils.tsx';
|
||||||
|
import { DirectionOffset } from '@/Base.types.ts';
|
||||||
|
import {
|
||||||
|
createPagesData,
|
||||||
|
getScrollIntoViewInlineOption,
|
||||||
|
getScrollToXForReadingDirection,
|
||||||
|
isSpreadPage,
|
||||||
|
} from '@/modules/reader/utils/ReaderPager.utils.tsx';
|
||||||
|
import { ReaderStatePages } from '@/modules/reader/types/ReaderProgressBar.types.ts';
|
||||||
|
import { ReaderControls } from '@/modules/reader/services/ReaderControls.ts';
|
||||||
|
|
||||||
export const getInitialReaderPageIndex = (
|
export const getInitialReaderPageIndex = (
|
||||||
resumeMode: ReaderResumeMode,
|
resumeMode: ReaderResumeMode,
|
||||||
@@ -104,3 +118,227 @@ export const getChapterIdsForDownloadAhead = (
|
|||||||
.map((unreadUnDownloadedNextChapter) => unreadUnDownloadedNextChapter.id)
|
.map((unreadUnDownloadedNextChapter) => unreadUnDownloadedNextChapter.id)
|
||||||
.filter((id) => !Chapters.isDownloading(id));
|
.filter((id) => !Chapters.isDownloading(id));
|
||||||
};
|
};
|
||||||
|
|
||||||
|
export const createUpdateReaderPageLoadState =
|
||||||
|
(
|
||||||
|
actualPages: ReaderStatePages['pages'],
|
||||||
|
pagesToSpreadState: boolean[],
|
||||||
|
setPagesToSpreadState: React.Dispatch<React.SetStateAction<boolean[]>>,
|
||||||
|
pageLoadStates: ReaderStatePages['pageLoadStates'],
|
||||||
|
setPageLoadStates: ReaderStatePages['setPageLoadStates'],
|
||||||
|
readingMode: ReadingMode,
|
||||||
|
) =>
|
||||||
|
(pagesIndex: number, isPrimary: boolean = true) => {
|
||||||
|
const page = actualPages[pagesIndex];
|
||||||
|
const { index, url } = isPrimary ? page.primary : page.secondary!;
|
||||||
|
|
||||||
|
if (readingMode === ReadingMode.DOUBLE_PAGE) {
|
||||||
|
const img = new Image();
|
||||||
|
img.onload = () => {
|
||||||
|
const isSpreadPageFlag = isSpreadPage(img);
|
||||||
|
if (!isSpreadPageFlag || pagesToSpreadState[index] === isSpreadPageFlag) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
setPagesToSpreadState((prevState) => {
|
||||||
|
if (pagesToSpreadState[index] === isSpreadPageFlag) {
|
||||||
|
return prevState;
|
||||||
|
}
|
||||||
|
|
||||||
|
return prevState.toSpliced(index, 1, isSpreadPageFlag);
|
||||||
|
});
|
||||||
|
};
|
||||||
|
img.src = url;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (pageLoadStates[index].loaded) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
setPageLoadStates((statePageLoadStates) => {
|
||||||
|
if (statePageLoadStates[index].loaded) {
|
||||||
|
return statePageLoadStates;
|
||||||
|
}
|
||||||
|
|
||||||
|
return statePageLoadStates.toSpliced(index, 1, { loaded: true });
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
export const useReaderConvertPagesForReadingMode = (
|
||||||
|
currentPageIndex: number,
|
||||||
|
totalPages: number,
|
||||||
|
actualPages: ReaderStatePages['pages'],
|
||||||
|
pageUrls: ReaderStatePages['pageUrls'],
|
||||||
|
setPages: ReaderStatePages['setPages'],
|
||||||
|
setPagesToSpreadState: (states: boolean[]) => void,
|
||||||
|
updateCurrentPageIndex: ReturnType<typeof ReaderControls.useUpdateCurrentPageIndex>,
|
||||||
|
readingMode: ReadingMode,
|
||||||
|
) => {
|
||||||
|
const [wasDoublePageMode, setWasDoublePageMode] = useState(readingMode === ReadingMode.DOUBLE_PAGE);
|
||||||
|
|
||||||
|
useLayoutEffect(() => {
|
||||||
|
const convertPagesToNormalPageMode = wasDoublePageMode && readingMode !== ReadingMode.DOUBLE_PAGE;
|
||||||
|
if (convertPagesToNormalPageMode) {
|
||||||
|
setWasDoublePageMode(false);
|
||||||
|
setPages(createPagesData(pageUrls));
|
||||||
|
setPagesToSpreadState(Array(totalPages).fill(false));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const convertPagesToDoublePageMode = readingMode === ReadingMode.DOUBLE_PAGE;
|
||||||
|
if (convertPagesToDoublePageMode) {
|
||||||
|
if (!wasDoublePageMode) {
|
||||||
|
updateCurrentPageIndex(getNextIndexFromPage(getPage(currentPageIndex, actualPages)));
|
||||||
|
}
|
||||||
|
setPages(actualPages);
|
||||||
|
setWasDoublePageMode(readingMode === ReadingMode.DOUBLE_PAGE);
|
||||||
|
}
|
||||||
|
}, [actualPages, readingMode]);
|
||||||
|
};
|
||||||
|
|
||||||
|
export const useReaderHandlePageSelection = (
|
||||||
|
pageToScrollToIndex: ReaderStatePages['pageToScrollToIndex'],
|
||||||
|
currentPageIndex: number,
|
||||||
|
pages: ReaderStatePages['pages'],
|
||||||
|
totalPages: number,
|
||||||
|
setPageToScrollToIndex: ReaderStatePages['setPageToScrollToIndex'],
|
||||||
|
updateCurrentPageIndex: ReturnType<typeof ReaderControls.useUpdateCurrentPageIndex>,
|
||||||
|
isContinuousReadingModeActive: boolean,
|
||||||
|
imageRefs: MutableRefObject<(HTMLElement | null)[]>,
|
||||||
|
themeDirection: Direction,
|
||||||
|
readingDirection: ReadingDirection,
|
||||||
|
scrollElementRef: MutableRefObject<HTMLDivElement | null>,
|
||||||
|
) => {
|
||||||
|
useLayoutEffect(() => {
|
||||||
|
if (pageToScrollToIndex == null) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const pageToScrollTo = getPage(pageToScrollToIndex, pages);
|
||||||
|
|
||||||
|
if (isContinuousReadingModeActive) {
|
||||||
|
const directionOffset =
|
||||||
|
pageToScrollToIndex > currentPageIndex ? DirectionOffset.PREVIOUS : DirectionOffset.NEXT;
|
||||||
|
const imageRef = imageRefs.current[pageToScrollTo.pagesIndex];
|
||||||
|
|
||||||
|
imageRef?.scrollIntoView({
|
||||||
|
block: 'start',
|
||||||
|
inline: getScrollIntoViewInlineOption(directionOffset, themeDirection, readingDirection),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!isContinuousReadingModeActive) {
|
||||||
|
scrollElementRef.current?.scrollTo(
|
||||||
|
getScrollToXForReadingDirection(scrollElementRef.current, themeDirection, readingDirection),
|
||||||
|
0,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
const newPageIndex = getNextIndexFromPage(pageToScrollTo);
|
||||||
|
const isLastPage = newPageIndex === totalPages - 1;
|
||||||
|
|
||||||
|
setPageToScrollToIndex(null);
|
||||||
|
updateCurrentPageIndex(newPageIndex, !isLastPage);
|
||||||
|
}, [pageToScrollToIndex]);
|
||||||
|
};
|
||||||
|
|
||||||
|
export const useReaderHideCursorOnInactivity = (scrollElementRef: MutableRefObject<HTMLDivElement | null>) => {
|
||||||
|
const mouseInactiveTimeout = useRef<NodeJS.Timeout>();
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
const setCursorVisibility = (visible: boolean) => {
|
||||||
|
const scrollElement = scrollElementRef.current;
|
||||||
|
if (!scrollElement) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
scrollElement.style.cursor = visible ? 'default' : 'none';
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleMouseMove = () => {
|
||||||
|
setCursorVisibility(true);
|
||||||
|
clearTimeout(mouseInactiveTimeout.current);
|
||||||
|
mouseInactiveTimeout.current = setTimeout(() => {
|
||||||
|
setCursorVisibility(false);
|
||||||
|
}, 5000);
|
||||||
|
};
|
||||||
|
|
||||||
|
handleMouseMove();
|
||||||
|
window.addEventListener('mousemove', handleMouseMove);
|
||||||
|
return () => {
|
||||||
|
setCursorVisibility(true);
|
||||||
|
window.removeEventListener('mousemove', handleMouseMove);
|
||||||
|
clearTimeout(mouseInactiveTimeout.current);
|
||||||
|
};
|
||||||
|
}, []);
|
||||||
|
};
|
||||||
|
|
||||||
|
export const useReaderHorizontalModeInvertXYScrolling = (
|
||||||
|
readingMode: ReadingMode,
|
||||||
|
readingDirection: ReadingDirection,
|
||||||
|
scrollElementRef: MutableRefObject<HTMLDivElement | null>,
|
||||||
|
) => {
|
||||||
|
// invert x and y scrolling for the continuous horizontal reading mode
|
||||||
|
useEffect(() => {
|
||||||
|
if (readingMode !== ReadingMode.CONTINUOUS_HORIZONTAL) {
|
||||||
|
return () => {};
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!scrollElementRef.current) {
|
||||||
|
return () => {};
|
||||||
|
}
|
||||||
|
|
||||||
|
const handleScroll = (e: WheelEvent) => {
|
||||||
|
e.preventDefault();
|
||||||
|
|
||||||
|
if (e.shiftKey) {
|
||||||
|
scrollElementRef.current?.scrollBy({
|
||||||
|
top: e.deltaY,
|
||||||
|
});
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
scrollElementRef.current?.scrollBy({
|
||||||
|
left: readingDirection === ReadingDirection.LTR ? e.deltaY : e.deltaY * -1,
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
scrollElementRef.current.addEventListener('wheel', handleScroll);
|
||||||
|
return () => scrollElementRef.current?.removeEventListener('wheel', handleScroll);
|
||||||
|
}, [readingMode, readingDirection]);
|
||||||
|
};
|
||||||
|
|
||||||
|
export const useReaderHideOverlayOnUserScroll = (
|
||||||
|
isOverlayVisible: boolean,
|
||||||
|
setIsOverlayVisible: TReaderOverlayContext['setIsVisible'],
|
||||||
|
scrollElementRef: MutableRefObject<HTMLDivElement | null>,
|
||||||
|
) => {
|
||||||
|
useEffect(() => {
|
||||||
|
const handleScroll = () => {
|
||||||
|
if (isOverlayVisible) {
|
||||||
|
setIsOverlayVisible(false);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
scrollElementRef.current?.addEventListener('wheel', handleScroll);
|
||||||
|
scrollElementRef.current?.addEventListener('touchmove', handleScroll);
|
||||||
|
return () => {
|
||||||
|
scrollElementRef.current?.removeEventListener('wheel', handleScroll);
|
||||||
|
scrollElementRef.current?.removeEventListener('touchmove', handleScroll);
|
||||||
|
};
|
||||||
|
}, [isOverlayVisible]);
|
||||||
|
};
|
||||||
|
|
||||||
|
export const useReaderAutoScroll = (
|
||||||
|
isOverlayVisible: boolean,
|
||||||
|
automaticScrolling: ReturnType<typeof useAutomaticScrolling>,
|
||||||
|
): void => {
|
||||||
|
useEffect(() => {
|
||||||
|
if (isOverlayVisible) {
|
||||||
|
automaticScrolling.pause();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
automaticScrolling.resume();
|
||||||
|
}, [isOverlayVisible, automaticScrolling.isPaused]);
|
||||||
|
};
|
||||||
|
|||||||
@@ -6,14 +6,20 @@
|
|||||||
* file, You can obtain one at https://mozilla.org/MPL/2.0/.
|
* file, You can obtain one at https://mozilla.org/MPL/2.0/.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
import { ForwardRefExoticComponent, MemoExoticComponent, RefAttributes } from 'react';
|
||||||
import {
|
import {
|
||||||
IReaderSettings,
|
IReaderSettings,
|
||||||
IReaderSettingsWithDefaultFlag,
|
IReaderSettingsWithDefaultFlag,
|
||||||
|
ReaderPagerProps,
|
||||||
ReaderPageScaleMode,
|
ReaderPageScaleMode,
|
||||||
ReadingMode,
|
ReadingMode,
|
||||||
} from '@/modules/reader/types/Reader.types.ts';
|
} from '@/modules/reader/types/Reader.types.ts';
|
||||||
import { MangaGenreInfo, MangaSourceNameInfo } from '@/modules/manga/Manga.types.ts';
|
import { MangaGenreInfo, MangaSourceNameInfo } from '@/modules/manga/Manga.types.ts';
|
||||||
import { Mangas } from '@/modules/manga/services/Mangas.ts';
|
import { Mangas } from '@/modules/manga/services/Mangas.ts';
|
||||||
|
import { ReaderPagedPager } from '@/modules/reader/components/viewer/pager/ReaderPagedPager.tsx';
|
||||||
|
import { ReaderDoublePagedPager } from '@/modules/reader/components/viewer/pager/ReaderDoublePagedPager.tsx';
|
||||||
|
import { ReaderVerticalPager } from '@/modules/reader/components/viewer/pager/ReaderVerticalPager.tsx';
|
||||||
|
import { ReaderHorizontalPager } from '@/modules/reader/components/viewer/pager/ReaderHorizontalPager.tsx';
|
||||||
|
|
||||||
export const isOffsetDoubleSpreadPagesEditable = (readingMode: IReaderSettings['readingMode']): boolean =>
|
export const isOffsetDoubleSpreadPagesEditable = (readingMode: IReaderSettings['readingMode']): boolean =>
|
||||||
readingMode === ReadingMode.DOUBLE_PAGE;
|
readingMode === ReadingMode.DOUBLE_PAGE;
|
||||||
@@ -32,3 +38,21 @@ export const isAutoWebtoonMode = (
|
|||||||
shouldUseAutoWebtoonMode: IReaderSettings['shouldUseAutoWebtoonMode'],
|
shouldUseAutoWebtoonMode: IReaderSettings['shouldUseAutoWebtoonMode'],
|
||||||
readingMode: IReaderSettingsWithDefaultFlag['readingMode'],
|
readingMode: IReaderSettingsWithDefaultFlag['readingMode'],
|
||||||
): boolean => shouldUseAutoWebtoonMode && readingMode.isDefault && Mangas.isLongStripType(manga);
|
): boolean => shouldUseAutoWebtoonMode && readingMode.isDefault && Mangas.isLongStripType(manga);
|
||||||
|
|
||||||
|
export const getPagerForReadingMode = (
|
||||||
|
readingMode: ReadingMode,
|
||||||
|
): MemoExoticComponent<ForwardRefExoticComponent<Omit<ReaderPagerProps, never> & RefAttributes<HTMLElement>>> => {
|
||||||
|
switch (readingMode) {
|
||||||
|
case ReadingMode.SINGLE_PAGE:
|
||||||
|
return ReaderPagedPager;
|
||||||
|
case ReadingMode.DOUBLE_PAGE:
|
||||||
|
return ReaderDoublePagedPager;
|
||||||
|
case ReadingMode.CONTINUOUS_VERTICAL:
|
||||||
|
case ReadingMode.WEBTOON:
|
||||||
|
return ReaderVerticalPager;
|
||||||
|
case ReadingMode.CONTINUOUS_HORIZONTAL:
|
||||||
|
return ReaderHorizontalPager;
|
||||||
|
default:
|
||||||
|
throw new Error(`Unexpected "ReadingMode" (${readingMode})`);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|||||||
Reference in New Issue
Block a user