ChoChoX/suwayomi-material-you-webui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Hide chapter transition page in single/double pagers

Browse Source 
Transition page got opened and never closed again due to not correctly detecting that a transition page is currently visible
This commit is contained in:
schroda
2024-12-30 19:56:41 +01:00
parent 1f3a3b6c39
commit 55dc9471d9
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/modules/reader/services/ReaderControls.ts
View File

@@ -281,7 +281,6 @@ export class ReaderControls {
const isFirstPage = currentPage.primary.index === 0; const isFirstPage = currentPage.primary.index === 0;
const isLastPage = currentPageIndex === indexOfLastPage; const isLastPage = currentPageIndex === indexOfLastPage;
const isATransitionPageVisible = isTransitionPageVisible(transitionPageMode, readingMode.value); const isATransitionPageVisible = isTransitionPageVisible(transitionPageMode, readingMode.value);
const isContinuousReadingModeActive = isContinuousReadingMode(readingMode.value);
return useCallback( return useCallback(
(page, forceDirection = direction, hideOverlay: boolean = true) => { (page, forceDirection = direction, hideOverlay: boolean = true) => {
@@ -318,7 +317,7 @@ export class ReaderControls {
return; return;
} }
const needToHideTransitionPage = isATransitionPageVisible && !isContinuousReadingModeActive; const needToHideTransitionPage = isATransitionPageVisible;
switch (convertedPage) { switch (convertedPage) {
case 'previous': case 'previous':
if (isFirstPage) { if (isFirstPage) {
@@ -360,7 +359,6 @@ export class ReaderControls {
nextPageIndex, nextPageIndex,
indexOfLastPage, indexOfLastPage,
isATransitionPageVisible, isATransitionPageVisible,
isContinuousReadingModeActive,
isFirstPage, isFirstPage,
isLastPage, isLastPage,
openChapter, openChapter,

5
src/modules/reader/utils/ReaderPager.utils.tsx
View File

@@ -484,9 +484,10 @@ export const getPageIndexesToLoad = (
export const isTransitionPageVisible = ( export const isTransitionPageVisible = (
activeMode: ReaderTransitionPageMode, activeMode: ReaderTransitionPageMode,
readingMode: IReaderSettings['readingMode'], readingMode: IReaderSettings['readingMode'],
transitionPageType?: ReaderTransitionPageMode, transitionPageType: ReaderTransitionPageMode = activeMode,
): boolean => ): boolean =>
[ReaderTransitionPageMode.BOTH, transitionPageType].includes(activeMode) || isContinuousReadingMode(readingMode); (activeMode !== ReaderTransitionPageMode.NONE && activeMode === transitionPageType) ||
isContinuousReadingMode(readingMode);
export const getScrollIntoViewInlineOption = ( export const getScrollIntoViewInlineOption = (
offset: DirectionOffset, offset: DirectionOffset,