@@ -18,7 +18,6 @@ import { useReaderStateChaptersContext } from '@/modules/reader/contexts/state/R
|
|||||||
import { ChapterIdInfo } from '@/modules/chapter/services/Chapters.ts';
|
import { ChapterIdInfo } from '@/modules/chapter/services/Chapters.ts';
|
||||||
import {
|
import {
|
||||||
IReaderSettings,
|
IReaderSettings,
|
||||||
ReaderPageScaleMode,
|
|
||||||
ReaderTransitionPageMode,
|
ReaderTransitionPageMode,
|
||||||
ReadingMode,
|
ReadingMode,
|
||||||
TReaderScrollbarContext,
|
TReaderScrollbarContext,
|
||||||
@@ -84,7 +83,6 @@ const BaseReaderTransitionPage = ({
|
|||||||
type,
|
type,
|
||||||
transitionPageMode,
|
transitionPageMode,
|
||||||
readingMode,
|
readingMode,
|
||||||
pageScaleMode,
|
|
||||||
backgroundColor,
|
backgroundColor,
|
||||||
manga,
|
manga,
|
||||||
currentChapterName,
|
currentChapterName,
|
||||||
@@ -97,7 +95,7 @@ const BaseReaderTransitionPage = ({
|
|||||||
scrollbarYSize,
|
scrollbarYSize,
|
||||||
readerNavBarWidth,
|
readerNavBarWidth,
|
||||||
handleBack,
|
handleBack,
|
||||||
}: Pick<IReaderSettings, 'readingMode' | 'pageScaleMode' | 'backgroundColor'> &
|
}: Pick<IReaderSettings, 'readingMode' | 'backgroundColor'> &
|
||||||
Pick<TReaderStateMangaContext, 'manga'> &
|
Pick<TReaderStateMangaContext, 'manga'> &
|
||||||
Pick<TReaderScrollbarContext, 'scrollbarXSize' | 'scrollbarYSize'> &
|
Pick<TReaderScrollbarContext, 'scrollbarXSize' | 'scrollbarYSize'> &
|
||||||
Pick<ReaderStatePages, 'transitionPageMode'> &
|
Pick<ReaderStatePages, 'transitionPageMode'> &
|
||||||
@@ -121,7 +119,6 @@ const BaseReaderTransitionPage = ({
|
|||||||
|
|
||||||
const isFirstChapter = !!currentChapterName && !previousChapterName;
|
const isFirstChapter = !!currentChapterName && !previousChapterName;
|
||||||
const isLastChapter = !!currentChapterName && !nextChapterName;
|
const isLastChapter = !!currentChapterName && !nextChapterName;
|
||||||
const isFitWidthPageScaleMode = [ReaderPageScaleMode.SCREEN, ReaderPageScaleMode.WIDTH].includes(pageScaleMode);
|
|
||||||
|
|
||||||
if (!isTransitionPageVisible(type, transitionPageMode, readingMode)) {
|
if (!isTransitionPageVisible(type, transitionPageMode, readingMode)) {
|
||||||
return null;
|
return null;
|
||||||
@@ -142,7 +139,6 @@ const BaseReaderTransitionPage = ({
|
|||||||
left: 0,
|
left: 0,
|
||||||
maxWidth: `calc(100vw - ${scrollbarYSize}px - ${readerNavBarWidth}px)`,
|
maxWidth: `calc(100vw - ${scrollbarYSize}px - ${readerNavBarWidth}px)`,
|
||||||
minHeight: `calc(100vh - ${scrollbarXSize}px)`,
|
minHeight: `calc(100vh - ${scrollbarXSize}px)`,
|
||||||
...applyStyles(!isFitWidthPageScaleMode, { alignItems: 'baseline' }),
|
|
||||||
}),
|
}),
|
||||||
...applyStyles(readingMode === ReadingMode.CONTINUOUS_HORIZONTAL, {
|
...applyStyles(readingMode === ReadingMode.CONTINUOUS_HORIZONTAL, {
|
||||||
top: 0,
|
top: 0,
|
||||||
@@ -293,7 +289,6 @@ export const ReaderTransitionPage = withPropsFrom(
|
|||||||
'backgroundColor',
|
'backgroundColor',
|
||||||
'transitionPageMode',
|
'transitionPageMode',
|
||||||
'readingMode',
|
'readingMode',
|
||||||
'pageScaleMode',
|
|
||||||
'handleBack',
|
'handleBack',
|
||||||
],
|
],
|
||||||
);
|
);
|
||||||
|
|||||||
Reference in New Issue
Block a user