From 8df5084703baf2b7ae416af8d8d5064cec13ee19 Mon Sep 17 00:00:00 2001
From: enes <enes@nostrdev.com>
Date: Mon, 23 Dec 2024 16:39:24 +0100
Subject: [PATCH 1/3] fix(sign): always show PdfView

---
 src/components/PDFView/PdfMarking.tsx | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/components/PDFView/PdfMarking.tsx b/src/components/PDFView/PdfMarking.tsx
index f0d4f60..6346944 100644
--- a/src/components/PDFView/PdfMarking.tsx
+++ b/src/components/PDFView/PdfMarking.tsx
@@ -152,17 +152,15 @@ const PdfMarking = (props: PdfMarkingProps) => {
           centerIcon={faPen}
           rightIcon={faCircleInfo}
         >
-          {currentUserMarks?.length > 0 && (
-            <PdfView
-              currentFile={currentFile}
-              files={files}
-              handleMarkClick={handleMarkClick}
-              selectedMarkValue={selectedMarkValue}
-              selectedMark={selectedMark}
-              currentUserMarks={currentUserMarks}
-              otherUserMarks={otherUserMarks}
-            />
-          )}
+          <PdfView
+            currentFile={currentFile}
+            files={files}
+            handleMarkClick={handleMarkClick}
+            selectedMarkValue={selectedMarkValue}
+            selectedMark={selectedMark}
+            currentUserMarks={currentUserMarks}
+            otherUserMarks={otherUserMarks}
+          />
         </StickySideColumns>
         {selectedMark !== null && (
           <MarkFormField

From 92f23bab91225d888c101c3670868eae132114e9 Mon Sep 17 00:00:00 2001
From: enes <enes@nostrdev.com>
Date: Mon, 23 Dec 2024 17:44:33 +0100
Subject: [PATCH 2/3] fix(sign): allow signing without selectedMark - no
 currentUserMarks

---
 src/components/MarkFormField/index.tsx | 29 ++++++++++++--------------
 src/utils/mark.ts                      | 18 +++++++++-------
 2 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/src/components/MarkFormField/index.tsx b/src/components/MarkFormField/index.tsx
index 99b9b7f..fde0922 100644
--- a/src/components/MarkFormField/index.tsx
+++ b/src/components/MarkFormField/index.tsx
@@ -17,7 +17,7 @@ interface MarkFormFieldProps {
   handleCurrentUserMarkChange: (mark: CurrentUserMark) => void
   handleSelectedMarkValueChange: (value: string) => void
   handleSubmit: (event: React.MouseEvent<HTMLButtonElement>) => void
-  selectedMark: CurrentUserMark
+  selectedMark: CurrentUserMark | null
   selectedMarkValue: string
 }
 
@@ -34,26 +34,23 @@ const MarkFormField = ({
 }: MarkFormFieldProps) => {
   const [displayActions, setDisplayActions] = useState(true)
   const [complete, setComplete] = useState(false)
-
   const isReadyToSign = () =>
     isCurrentUserMarksComplete(currentUserMarks) ||
     isCurrentValueLast(currentUserMarks, selectedMark, selectedMarkValue)
   const isCurrent = (currentMark: CurrentUserMark) =>
-    currentMark.id === selectedMark.id && !complete
+    currentMark.id === selectedMark?.id && !complete
   const isDone = (currentMark: CurrentUserMark) =>
     isCurrent(currentMark) ? !!selectedMarkValue : currentMark.isCompleted
   const findNext = () => {
     return (
-      currentUserMarks[selectedMark.id] ||
+      currentUserMarks[selectedMark!.id] ||
       findNextIncompleteCurrentUserMark(currentUserMarks)
     )
   }
   const handleFormSubmit = (event: React.FormEvent<HTMLFormElement>) => {
     event.preventDefault()
-    console.log('handle form submit runs...')
-
     // Without this line, we lose mark values when switching
-    handleCurrentUserMarkChange(selectedMark)
+    handleCurrentUserMarkChange(selectedMark!)
 
     if (!complete) {
       isReadyToSign()
@@ -63,15 +60,16 @@ const MarkFormField = ({
   }
 
   const toggleActions = () => setDisplayActions(!displayActions)
-  const markLabel = getToolboxLabelByMarkType(selectedMark.mark.type)
-
+  const markLabel = selectedMark
+    ? getToolboxLabelByMarkType(selectedMark.mark.type)
+    : ''
   const handleCurrentUserMarkClick = (mark: CurrentUserMark) => {
     setComplete(false)
     handleCurrentUserMarkChange(mark)
   }
 
   const handleSelectCompleteMark = () => {
-    handleCurrentUserMarkChange(selectedMark)
+    if (currentUserMarks.length) handleCurrentUserMarkChange(selectedMark!)
     setComplete(true)
   }
 
@@ -106,14 +104,15 @@ const MarkFormField = ({
         <div className={styles.actionsWrapper}>
           <div className={styles.actionsTop}>
             <div className={styles.actionsTopInfo}>
-              {!complete && (
+              {!complete && selectedMark ? (
                 <p className={styles.actionsTopInfoText}>Add {markLabel}</p>
+              ) : (
+                <p className={styles.actionsTopInfoText}>Finish</p>
               )}
-              {complete && <p className={styles.actionsTopInfoText}>Finish</p>}
             </div>
           </div>
           <div className={styles.inputWrapper}>
-            {!complete && (
+            {!complete && selectedMark ? (
               <form onSubmit={(e) => handleFormSubmit(e)}>
                 <MarkInput
                   markType={selectedMark.mark.type}
@@ -129,9 +128,7 @@ const MarkFormField = ({
                   </Button>
                 </div>
               </form>
-            )}
-
-            {complete && (
+            ) : (
               <div className={styles.actionsBottom}>
                 <Button
                   onClick={handleSignAndComplete}
diff --git a/src/utils/mark.ts b/src/utils/mark.ts
index 2c0b339..f455ea9 100644
--- a/src/utils/mark.ts
+++ b/src/utils/mark.ts
@@ -123,15 +123,19 @@ const isLast = <T>(index: number, arr: T[]) => index === arr.length - 1
 
 const isCurrentValueLast = (
   currentUserMarks: CurrentUserMark[],
-  selectedMark: CurrentUserMark,
+  selectedMark: CurrentUserMark | null,
   selectedMarkValue: string
 ) => {
-  const filteredMarks = currentUserMarks.filter(
-    (mark) => mark.id !== selectedMark.id
-  )
-  return (
-    isCurrentUserMarksComplete(filteredMarks) && selectedMarkValue.length > 0
-  )
+  if (selectedMark && currentUserMarks.length > 0) {
+    const filteredMarks = currentUserMarks.filter(
+      (mark) => mark.id !== selectedMark.id
+    )
+    return (
+      isCurrentUserMarksComplete(filteredMarks) && selectedMarkValue.length > 0
+    )
+  }
+
+  return true
 }
 
 const getUpdatedMark = (

From cb0d2dd7bc98a7e16c3d2e53fba4bd86a0c8a89d Mon Sep 17 00:00:00 2001
From: enes <enes@nostrdev.com>
Date: Mon, 23 Dec 2024 17:45:13 +0100
Subject: [PATCH 3/3] fix(sign): allow sumit without selectedMark

---
 src/components/PDFView/PdfMarking.tsx | 45 +++++++++++++--------------
 1 file changed, 22 insertions(+), 23 deletions(-)

diff --git a/src/components/PDFView/PdfMarking.tsx b/src/components/PDFView/PdfMarking.tsx
index 6346944..cbd3907 100644
--- a/src/components/PDFView/PdfMarking.tsx
+++ b/src/components/PDFView/PdfMarking.tsx
@@ -101,21 +101,22 @@ const PdfMarking = (props: PdfMarkingProps) => {
    */
   const handleSubmit = (event: React.MouseEvent<HTMLButtonElement>) => {
     event.preventDefault()
-    if (!selectedMarkValue || !selectedMark) return
+    if (selectedMarkValue && selectedMark) {
+      const updatedMark: CurrentUserMark = getUpdatedMark(
+        selectedMark,
+        selectedMarkValue
+      )
 
-    const updatedMark: CurrentUserMark = getUpdatedMark(
-      selectedMark,
-      selectedMarkValue
-    )
+      setSelectedMarkValue(EMPTY)
+      const updatedCurrentUserMarks = updateCurrentUserMarks(
+        currentUserMarks,
+        updatedMark
+      )
+      setCurrentUserMarks(updatedCurrentUserMarks)
+      setSelectedMark(null)
+      setUpdatedMarks(updatedMark.mark)
+    }
 
-    setSelectedMarkValue(EMPTY)
-    const updatedCurrentUserMarks = updateCurrentUserMarks(
-      currentUserMarks,
-      updatedMark
-    )
-    setCurrentUserMarks(updatedCurrentUserMarks)
-    setSelectedMark(null)
-    setUpdatedMarks(updatedMark.mark)
     handleSign()
   }
 
@@ -162,16 +163,14 @@ const PdfMarking = (props: PdfMarkingProps) => {
             otherUserMarks={otherUserMarks}
           />
         </StickySideColumns>
-        {selectedMark !== null && (
-          <MarkFormField
-            handleSubmit={handleSubmit}
-            handleSelectedMarkValueChange={handleChange}
-            selectedMark={selectedMark}
-            selectedMarkValue={selectedMarkValue}
-            currentUserMarks={currentUserMarks}
-            handleCurrentUserMarkChange={handleCurrentUserMarkChange}
-          />
-        )}
+        <MarkFormField
+          handleSubmit={handleSubmit}
+          handleSelectedMarkValueChange={handleChange}
+          selectedMark={selectedMark}
+          selectedMarkValue={selectedMarkValue}
+          currentUserMarks={currentUserMarks}
+          handleCurrentUserMarkChange={handleCurrentUserMarkChange}
+        />
       </Container>
     </>
   )