From 72f8349ce127badf6836bc5831613a1dcb79f142 Mon Sep 17 00:00:00 2001
From: pusztaienike <eniko.pusztai@sensenet.com>
Date: Wed, 24 Mar 2021 14:16:05 +0100
Subject: [PATCH] fix marker placing

---
 .../src/components/comment/create-comment.tsx                 | 4 ++--
 packages/sn-document-viewer-react/src/components/page.tsx     | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/sn-document-viewer-react/src/components/comment/create-comment.tsx b/packages/sn-document-viewer-react/src/components/comment/create-comment.tsx
index af505baef..cfe7d96c6 100644
--- a/packages/sn-document-viewer-react/src/components/comment/create-comment.tsx
+++ b/packages/sn-document-viewer-react/src/components/comment/create-comment.tsx
@@ -52,14 +52,14 @@ export function CreateComment() {
       try {
         api.commentActions.addPreviewComment({
           document: documentData,
-          comment: { ...commentState.draft, text, page: viewerState.activePage },
+          comment: { ...commentState.draft, text, page: commentState.draft.page },
           abortController: new AbortController(),
         })
       } catch (error) {
         console.log(error)
       }
     },
-    [api.commentActions, commentState.draft, documentData, viewerState],
+    [api.commentActions, commentState.draft, documentData],
   )
 
   const clearState = useCallback(() => {
diff --git a/packages/sn-document-viewer-react/src/components/page.tsx b/packages/sn-document-viewer-react/src/components/page.tsx
index 9a6cc5243..ced7e21fc 100644
--- a/packages/sn-document-viewer-react/src/components/page.tsx
+++ b/packages/sn-document-viewer-react/src/components/page.tsx
@@ -108,7 +108,7 @@ export const Page: React.FC<PageProps> = (props) => {
         x: `${xCoord - MARKER_SIZE}`,
         y: `${yCoord - MARKER_SIZE}`,
         id: 'draft',
-        page: viewerState.activePage,
+        page: page.image?.Index || viewerState.activePage,
       }
       commentState.setDraft(newCommentMarker)
     },
@@ -116,6 +116,7 @@ export const Page: React.FC<PageProps> = (props) => {
       commentState,
       imageRotation,
       page.image?.Height,
+      page.image?.Index,
       page.image?.Width,
       props.page.Height,
       props.page.Width,