diff --git a/client/app/readerprototype/components/ReaderSearchBar.jsx b/client/app/readerprototype/components/ReaderSearchBar.jsx index 725d5f4b565..c6685fd312d 100644 --- a/client/app/readerprototype/components/ReaderSearchBar.jsx +++ b/client/app/readerprototype/components/ReaderSearchBar.jsx @@ -58,7 +58,9 @@ const ReaderSearchBar = () => { // handle keyboard control of search results useEffect(() => { const keyHandler = (event) => { - if (event.metaKey && event.code === 'KeyG') { + const metaKey = navigator.appVersion.includes('Win') ? 'ctrlKey' : 'metaKey'; + + if (event[metaKey] && event.code === 'KeyG') { event.preventDefault(); if (event.shiftKey) { previous(); diff --git a/client/app/readerprototype/components/TextLayer.jsx b/client/app/readerprototype/components/TextLayer.jsx index 81c0b9c24ae..802ff49355b 100644 --- a/client/app/readerprototype/components/TextLayer.jsx +++ b/client/app/readerprototype/components/TextLayer.jsx @@ -12,11 +12,10 @@ const TextLayer = memo((props) => { // tracking this, the search bar will report double the number of found instances const [hasRenderedText, setHasRenderedText] = useState(false); - const viewport = page.getViewport({ scale: zoomLevel / 100 }); + const viewport = page.getViewport({ scale: 1 }); const textLayerRef = useRef(null); let positionX = 0; let positionY = 0; - const fullSizeViewport = page.getViewport({ scale: 1 }); if (rotation.includes('90')) { positionX = viewport.height; @@ -30,8 +29,8 @@ const TextLayer = memo((props) => { } const textLayerStyle = { - width: `${fullSizeViewport.width}px`, - height: `${fullSizeViewport.height}px`, + width: `${viewport.width}px`, + height: `${viewport.height}px`, transformOrigin: 'left top', opacity: 1, position: 'absolute',