Merge remote-tracking branch 'origin/master'

orca-team · May 22, 2024 · bffd26d · bffd26d
2 parents 9e67b03 + 04f99bc
commit bffd26d
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/.changeset/calm-clocks-rush.md b/.changeset/calm-clocks-rush.md
@@ -0,0 +1,5 @@
+---
+'@orca-fe/pdf-viewer': patch
+---
+
+fix: 缩小时，调整页码的位置不对的 bug
diff --git a/packages/pdf-viewer/src/PDFViewer.tsx b/packages/pdf-viewer/src/PDFViewer.tsx
@@ -283,8 +283,10 @@ const PDFViewer = React.forwardRef<PDFViewerHandle, PDFViewerProps>((props, pRef
     const dom = pageContainerRef.current;
     if (dom) {
       const top = pageTopArr[page];
+      const height = viewports[page]?.height * scale * PixelsPerInch.PDF_TO_CSS_UNITS;
+      const containerHeight = dom.getBoundingClientRect().height;
       dom.scrollTo({
-        top,
+        top: Math.min(top, top + 0.5 * (height - containerHeight)),
         behavior: anim ? 'smooth' : 'auto',
       });
     }

diff --git a/packages/pdf-viewer/src/ZoomAndPageController/ZoomAndPageController.tsx b/packages/pdf-viewer/src/ZoomAndPageController/ZoomAndPageController.tsx
@@ -39,8 +39,9 @@ const ZoomAndPageController = (props: ZoomAndPageControllerProps) => {
           }
         }}
         onChange={(value) => {
-          if (!Number.isNaN(Number(value) - 1)) {
-            pdfViewer.changePage(Number(value) - 1);
+          const newPage = Number(value) - 1;
+          if (!Number.isNaN(newPage) && pdfViewer.getCurrentPage() !== newPage) {
+            pdfViewer.changePage(newPage);
           }
         }}
       />