vrr/readest
2
0
Fork 0
mirror of https://github.com/readest/readest.git synced 2026-05-19 07:53:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

fix(progress): show remaining pages for current section instead of all loaded sections (#3550)

Browse source
This commit is contained in:
Huang Xin 2026-03-17 16:18:39 +08:00 • committed by GitHub
parent 3dfe6bd65e
commit 3bec89c85d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 28 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

48
apps/readest-app/src/app/reader/components/ProgressBar.tsx
View file

@ -53,32 +53,30 @@ const ProgressBar: React.FC<ProgressBarProps> = ({
const pageInfo = bookData?.isFixedLayout ? section : pageinfo;
const progressInfo = formatProgress(pageInfo?.current, pageInfo?.total, template, localize, lang);
const { page = 0, pages = 0 } = view?.renderer || {};
const current = page;
const total = pages;
const pagesLeft = Math.max(total - current - 1, 0);
const timeLeftStr =
total - 1 > current
? _('{{time}} min left in chapter', {
time: formatNumber(
Math.round((pagesLeft * SIZE_PER_LOC) / SIZE_PER_TIME_UNIT),
localize,
lang,
),
const { sectionPage: current = 0, sectionPages: total = 0 } = view?.renderer || {};
const pagesLeft = Math.min(
Math.max(total - current, 1),
pageInfo ? pageInfo.total - pageInfo.current : total,
);
const showPagesLeft = total > 0;
const timeLeftStr = showPagesLeft
? _('{{time}} min left in chapter', {
time: formatNumber(
Math.round((pagesLeft * SIZE_PER_LOC) / SIZE_PER_TIME_UNIT),
localize,
lang,
),
})
: '';
const pagesLeftStr = showPagesLeft
? localize
? _('{{number}} pages left in chapter', {
number: formatNumber(pagesLeft, localize, lang),
})
: '';
const pagesLeftStr =
total - 1 > current
? localize
? _('{{number}} pages left in chapter', {
number: formatNumber(pagesLeft, localize, lang),
})
: _('{{count}} pages left in chapter', {
count: pagesLeft,
})
: '';
const showPagesLeft = total - 1 > current;
: _('{{count}} pages left in chapter', {
count: pagesLeft,
})
: '';
const [progressBarMode, setProgressBarMode] = useState<string>(viewSettings.progressInfoMode);

6
apps/readest-app/src/types/view.ts
View file

@ -66,8 +66,10 @@ export interface FoliateView extends HTMLElement {
viewSize: number; // whole document view height
start: number;
end: number;
page: number;
pages: number;
page: number; // rendered page index (0-based)
pages: number; // rendered page count
sectionPage: number; // current page index in the current section
sectionPages: number; // page count in the current section
atStart: boolean;
atEnd: boolean;
containerPosition: number;

2
packages/foliate-js

@ -1 +1 @@
Subproject commit e925e9d95ed08e6da75a4b1d55e1be778aadd00e
Subproject commit d81d1d42657580ce15a68c522ab46c77232fbb76