Improve var/func naming

This commit is contained in:
schroda
2026-06-04 15:36:09 +02:00
parent ad7e7f1771
commit 848753022a

View File

@@ -131,11 +131,11 @@ const BaseReaderViewer = ({
}, [scrollbarXSize, scrollbarYSize]); }, [scrollbarXSize, scrollbarYSize]);
const imageRefs = useRef<(HTMLElement | null)[]>(pages.map(() => null)); const imageRefs = useRef<(HTMLElement | null)[]>(pages.map(() => null));
const [{ minChapterViewWidth, minChapterViewHeight, minChapterSizeSourceChapterId }, setChapterViewerSize] = const [{ minChapterViewerWidth, minChapterViewerHeight, minChapterViewerSourceChapterId }, setChapterViewerSize] =
useState({ useState({
minChapterViewWidth: 0, minChapterViewerWidth: 0,
minChapterViewHeight: 0, minChapterViewerHeight: 0,
minChapterSizeSourceChapterId: -1, minChapterViewerSourceChapterId: -1,
}); });
const [, setTriggerReRender] = useState({}); const [, setTriggerReRender] = useState({});
@@ -159,41 +159,41 @@ const BaseReaderViewer = ({
[currentChapter, chaptersToRender], [currentChapter, chaptersToRender],
); );
const onChapterViewSizeChange = useCallback( const onChapterViewerSizeChange = useCallback(
(width: number, height: number, chapterId: ChapterIdInfo['id']) => { (width: number, height: number, chapterId: ChapterIdInfo['id']) => {
if (!isContinuousReadingModeActive) { if (!isContinuousReadingModeActive) {
return; return;
} }
const isSameChapterId = chapterId === minChapterSizeSourceChapterId; const isSameChapterId = chapterId === minChapterViewerSourceChapterId;
if (isContinuousVerticalReadingModeActive) { if (isContinuousVerticalReadingModeActive) {
if (!isSameChapterId && minChapterViewWidth >= width) { if (!isSameChapterId && minChapterViewerWidth >= width) {
return; return;
} }
setChapterViewerSize({ setChapterViewerSize({
minChapterViewWidth: width, minChapterViewerWidth: width,
minChapterViewHeight: 0, minChapterViewerHeight: 0,
minChapterSizeSourceChapterId: chapterId, minChapterViewerSourceChapterId: chapterId,
}); });
return; return;
} }
if (isSameChapterId || minChapterViewHeight < height) { if (isSameChapterId || minChapterViewerHeight < height) {
setChapterViewerSize({ setChapterViewerSize({
minChapterViewWidth: 0, minChapterViewerWidth: 0,
minChapterViewHeight: height, minChapterViewerHeight: height,
minChapterSizeSourceChapterId: chapterId, minChapterViewerSourceChapterId: chapterId,
}); });
} }
}, },
[ [
isContinuousReadingModeActive, isContinuousReadingModeActive,
isContinuousVerticalReadingModeActive, isContinuousVerticalReadingModeActive,
minChapterViewWidth, minChapterViewerWidth,
minChapterViewHeight, minChapterViewerHeight,
minChapterSizeSourceChapterId, minChapterViewerSourceChapterId,
], ],
); );
@@ -234,9 +234,9 @@ const BaseReaderViewer = ({
useLayoutEffect(() => { useLayoutEffect(() => {
setChapterViewerSize({ setChapterViewerSize({
minChapterViewWidth: 0, minChapterViewerWidth: 0,
minChapterViewHeight: 0, minChapterViewerHeight: 0,
minChapterSizeSourceChapterId: -1, minChapterViewerSourceChapterId: -1,
}); });
setTriggerReRender({}); setTriggerReRender({});
}, [readingMode]); }, [readingMode]);
@@ -287,6 +287,8 @@ const BaseReaderViewer = ({
const nextChapter = const nextChapter =
chaptersToRender[chapterIndex - 1] ?? chapters[initialChapterIndex - visibleChapters.trailing - 1]; chaptersToRender[chapterIndex - 1] ?? chapters[initialChapterIndex - visibleChapters.trailing - 1];
const isChapterViewerSourceChapter = chapter.id === minChapterViewerSourceChapterId;
const isInitialChapter = chapter.id === initialChapter.id; const isInitialChapter = chapter.id === initialChapter.id;
const isCurrentChapter = chapter.id === currentChapter.id; const isCurrentChapter = chapter.id === currentChapter.id;
const isPreviousChapter = chapter.id === chaptersToRender[currentChapterIndex + 1]?.id; const isPreviousChapter = chapter.id === chaptersToRender[currentChapterIndex + 1]?.id;
@@ -308,8 +310,6 @@ const BaseReaderViewer = ({
visibleChapters, visibleChapters,
); );
const isChapterSizeSourceChapter = chapter.id === minChapterSizeSourceChapterId;
const currentChapterCurrentPageIndex = isAdjacentChapterToCurrentChapter const currentChapterCurrentPageIndex = isAdjacentChapterToCurrentChapter
? getReaderChapterViewerCurrentPageIndex( ? getReaderChapterViewerCurrentPageIndex(
currentPageIndex, currentPageIndex,
@@ -384,9 +384,9 @@ const BaseReaderViewer = ({
customFilter={customFilter} customFilter={customFilter}
shouldStretchPage={shouldStretchPage} shouldStretchPage={shouldStretchPage}
readerNavBarWidth={readerNavBarWidth} readerNavBarWidth={readerNavBarWidth}
onSizeChange={onChapterViewSizeChange} onSizeChange={onChapterViewerSizeChange}
minWidth={isChapterSizeSourceChapter ? 0 : minChapterViewWidth} minWidth={isChapterViewerSourceChapter ? 0 : minChapterViewerWidth}
minHeight={isChapterSizeSourceChapter ? 0 : minChapterViewHeight} minHeight={isChapterViewerSourceChapter ? 0 : minChapterViewerHeight}
scrollElement={scrollElementRef.current} scrollElement={scrollElementRef.current}
/> />
); );