Skip to content

Commit bffd26d

Browse files
committed
Merge remote-tracking branch 'origin/master'
2 parents 9e67b03 + 04f99bc commit bffd26d

File tree

3 files changed

+11
-3
lines changed

3 files changed

+11
-3
lines changed

.changeset/calm-clocks-rush.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@orca-fe/pdf-viewer': patch
3+
---
4+
5+
fix: 缩小时,调整页码的位置不对的 bug

packages/pdf-viewer/src/PDFViewer.tsx

+3-1
Original file line numberDiff line numberDiff line change
@@ -283,8 +283,10 @@ const PDFViewer = React.forwardRef<PDFViewerHandle, PDFViewerProps>((props, pRef
283283
const dom = pageContainerRef.current;
284284
if (dom) {
285285
const top = pageTopArr[page];
286+
const height = viewports[page]?.height * scale * PixelsPerInch.PDF_TO_CSS_UNITS;
287+
const containerHeight = dom.getBoundingClientRect().height;
286288
dom.scrollTo({
287-
top,
289+
top: Math.min(top, top + 0.5 * (height - containerHeight)),
288290
behavior: anim ? 'smooth' : 'auto',
289291
});
290292
}

packages/pdf-viewer/src/ZoomAndPageController/ZoomAndPageController.tsx

+3-2
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,9 @@ const ZoomAndPageController = (props: ZoomAndPageControllerProps) => {
3939
}
4040
}}
4141
onChange={(value) => {
42-
if (!Number.isNaN(Number(value) - 1)) {
43-
pdfViewer.changePage(Number(value) - 1);
42+
const newPage = Number(value) - 1;
43+
if (!Number.isNaN(newPage) && pdfViewer.getCurrentPage() !== newPage) {
44+
pdfViewer.changePage(newPage);
4445
}
4546
}}
4647
/>

0 commit comments

Comments
 (0)