src/components/DrawPDFFields/index.tsx

@@ -9,16 +9,8 @@ import {
 } from '@mui/material'
 import styles from './style.module.scss'
 import React, { useEffect, useState } from 'react'
-import {
-  ProfileMetadata,
-  User,
-  UserRole,
-  KeyboardCode,
-  MouseState,
-  PdfPage,
-  DrawnField,
-  DrawTool
-} from '../../types'
+import { ProfileMetadata, User, UserRole } from '../../types'
+import { MouseState, PdfPage, DrawnField, DrawTool } from '../../types/drawing'
 import { hexToNpub, npubToHex, getProfileUsername } from '../../utils'
 import { SigitFile } from '../../utils/file'
 import { getToolboxLabelByMarkType } from '../../utils/mark'
@@ -49,10 +41,6 @@ export const DrawPDFFields = (props: Props) => {
   const signers = users.filter((u) => u.role === UserRole.signer)
   const defaultSignerNpub = signers.length ? hexToNpub(signers[0].pubkey) : ''
   const [lastSigner, setLastSigner] = useState(defaultSignerNpub)
-  const [hideSignersForDrawnField, setHideSignersForDrawnField] = useState<{
-    [key: number]: boolean
-  } | null>()
-
   /**
    * Return first pubkey that is present in the signers list
    * @param pubkeys
@@ -373,7 +361,6 @@ export const DrawPDFFields = (props: Props) => {
       rect
     }
   }
-
   /**
    * Renders the pdf pages and drawing elements
    */
@@ -505,90 +492,62 @@ export const DrawPDFFields = (props: Props) => {
                       fileIndex,
                       pageIndex,
                       drawnFieldIndex
-                    ) &&
-                      (!hideSignersForDrawnField ||
-                        !hideSignersForDrawnField[drawnFieldIndex]) && (
-                        <div
-                          onPointerDown={handleUserSelectPointerDown}
-                          className={styles.userSelect}
-                        >
-                          <FormControl fullWidth size="small">
-                            <InputLabel id="counterparts">
-                              Counterpart
-                            </InputLabel>
-                            <Select
-                              value={getAvailableSigner(drawnField.counterpart)}
-                              onChange={(event) => {
-                                drawnField.counterpart = event.target.value
-                                setLastSigner(event.target.value)
-                                refreshPdfFiles()
-                              }}
-                              labelId="counterparts"
-                              label="Counterparts"
-                              sx={{
-                                background: 'white'
-                              }}
-                              renderValue={(value) =>
-                                renderCounterpartValue(value)
-                              }
-                              onClose={(event: React.SyntheticEvent) => {
-                                // get native event
-                                const { nativeEvent } = event
+                    ) && (
+                      <div
+                        onPointerDown={handleUserSelectPointerDown}
+                        className={styles.userSelect}
+                      >
+                        <FormControl fullWidth size="small">
+                          <InputLabel id="counterparts">Counterpart</InputLabel>
+                          <Select
+                            value={getAvailableSigner(drawnField.counterpart)}
+                            onChange={(event) => {
+                              drawnField.counterpart = event.target.value
+                              setLastSigner(event.target.value)
+                              refreshPdfFiles()
+                            }}
+                            labelId="counterparts"
+                            label="Counterparts"
+                            sx={{
+                              background: 'white'
+                            }}
+                            renderValue={(value) =>
+                              renderCounterpartValue(value)
+                            }
+                          >
+                            {signers.map((signer, index) => {
+                              const npub = hexToNpub(signer.pubkey)
+                              const metadata = props.metadata[signer.pubkey]
+                              const displayValue = getProfileUsername(
+                                npub,
+                                metadata
+                              )
 
-                                // check if event is a keyboard event
-                                if (nativeEvent instanceof KeyboardEvent) {
-                                  // check if event code is Escape
-                                  if (
-                                    nativeEvent.code === KeyboardCode.Escape
-                                  ) {
-                                    // set hide signers for this DrawnField
-                                    if (hideSignersForDrawnField) {
-                                      setHideSignersForDrawnField((prev) => ({
-                                        ...prev,
-                                        [drawnFieldIndex]: true
-                                      }))
-                                    } else {
-                                      setHideSignersForDrawnField({
-                                        [drawnFieldIndex]: true
-                                      })
-                                    }
-                                  }
-                                }
-                              }}
-                            >
-                              {signers.map((signer, index) => {
-                                const npub = hexToNpub(signer.pubkey)
-                                const metadata = props.metadata[signer.pubkey]
-                                const displayValue = getProfileUsername(
-                                  npub,
-                                  metadata
-                                )
-
-                                return (
-                                  <MenuItem key={index} value={npub}>
-                                    <ListItemIcon>
-                                      <AvatarIconButton
-                                        src={metadata?.picture}
-                                        hexKey={signer.pubkey}
-                                        aria-label={`account of user ${displayValue}`}
-                                        color="inherit"
-                                        sx={{
-                                          padding: 0,
-                                          '> img': {
-                                            width: '30px',
-                                            height: '30px'
-                                          }
-                                        }}
-                                      />
-                                    </ListItemIcon>
-                                    <ListItemText>{displayValue}</ListItemText>
-                                  </MenuItem>
-                                )
-                              })}
-                            </Select>
-                          </FormControl>
-                        </div>
-                      )}
+                              return (
+                                <MenuItem key={index} value={npub}>
+                                  <ListItemIcon>
+                                    <AvatarIconButton
+                                      src={metadata?.picture}
+                                      hexKey={signer.pubkey}
+                                      aria-label={`account of user ${displayValue}`}
+                                      color="inherit"
+                                      sx={{
+                                        padding: 0,
+                                        '> img': {
+                                          width: '30px',
+                                          height: '30px'
+                                        }
+                                      }}
+                                    />
+                                  </ListItemIcon>
+                                  <ListItemText>{displayValue}</ListItemText>
+                                </MenuItem>
+                              )
+                            })}
+                          </Select>
+                        </FormControl>
+                      </div>
+                    )}
                   </div>
                 )
               })}

src/components/MarkFormField/index.tsx

@@ -1,4 +1,4 @@
-import { CurrentUserMark } from '../../types'
+import { CurrentUserMark } from '../../types/mark.ts'
 import styles from './style.module.scss'
 import {
   findNextIncompleteCurrentUserMark,

src/components/PDFView/PdfItem.tsx

@@ -1,4 +1,4 @@
-import { CurrentUserMark, Mark } from '../../types'
+import { CurrentUserMark, Mark } from '../../types/mark.ts'
 import { SigitFile } from '../../utils/file.ts'
 import { ExtensionFileBox } from '../ExtensionFileBox.tsx'
 import PdfPageItem from './PdfPageItem.tsx'

src/components/PDFView/PdfMarkItem.tsx

@@ -1,4 +1,4 @@
-import { CurrentUserMark } from '../../types'
+import { CurrentUserMark } from '../../types/mark.ts'
 import styles from '../DrawPDFFields/style.module.scss'
 import { FONT_SIZE, FONT_TYPE, inPx } from '../../utils/pdf.ts'
 import { useScale } from '../../hooks/useScale.tsx'

src/components/PDFView/PdfMarking.tsx

@@ -1,6 +1,6 @@
 import PdfView from './index.tsx'
 import MarkFormField from '../MarkFormField'
-import { CurrentUserMark, Mark, CurrentUserFile, Meta } from '../../types'
+import { CurrentUserMark, Mark } from '../../types/mark.ts'
 import React, { useState, useEffect } from 'react'
 import {
   findNextIncompleteCurrentUserMark,
@@ -10,9 +10,11 @@ import {
 import { EMPTY } from '../../utils/const.ts'
 import { Container } from '../Container'
 import signPageStyles from '../../pages/sign/style.module.scss'
+import { CurrentUserFile } from '../../types/file.ts'
 import FileList from '../FileList'
 import { StickySideColumns } from '../../layouts/StickySideColumns.tsx'
 import { UsersDetails } from '../UsersDetails.tsx'
+import { Meta } from '../../types'
 import {
   faCircleInfo,
   faFileDownload,

src/components/PDFView/PdfPageItem.tsx

@@ -1,5 +1,6 @@
 import styles from '../DrawPDFFields/style.module.scss'
-import { PdfPage, CurrentUserMark, Mark } from '../../types'
+import { PdfPage } from '../../types/drawing.ts'
+import { CurrentUserMark, Mark } from '../../types/mark.ts'
 import PdfMarkItem from './PdfMarkItem.tsx'
 import { useEffect, useRef } from 'react'
 import pdfViewStyles from './style.module.scss'

src/components/PDFView/index.tsx

@@ -1,5 +1,6 @@
 import PdfItem from './PdfItem.tsx'
-import { CurrentUserMark, Mark, CurrentUserFile } from '../../types'
+import { CurrentUserMark, Mark } from '../../types/mark.ts'
+import { CurrentUserFile } from '../../types/file.ts'
 import { useEffect, useRef } from 'react'
 import { FileDivider } from '../FileDivider.tsx'
 import React from 'react'

src/hooks/useProfileMetadata.tsx

@@ -1,5 +1,5 @@
 import { useEffect, useState } from 'react'
-import { ProfileMetadata } from '../types'
+import { ProfileMetadata } from '../types/profile'
 import { MetadataController } from '../controllers/MetadataController'
 import { Event, kinds } from 'nostr-tools'
 

src/hooks/useSigitMeta.tsx

@@ -3,10 +3,9 @@ import {
   CreateSignatureEventContent,
   DocSignatureEvent,
   Meta,
-  SignedEventContent,
-  Mark,
-  MetaParseError
+  SignedEventContent
 } from '../types'
+import { Mark } from '../types/mark'
 import {
   fromUnixTimestamp,
   hexToNpub,
@@ -20,6 +19,7 @@ import { verifyEvent } from 'nostr-tools'
 import { Event } from 'nostr-tools'
 import store from '../store/store'
 import { NostrController } from '../controllers'
+import { MetaParseError } from '../types/errors/MetaParseError'
 
 /**
  * Flattened interface that combines properties `Meta`, `CreateSignatureEventContent`,

src/pages/create/index.tsx

@@ -20,9 +20,7 @@ import {
   Meta,
   ProfileMetadata,
   User,
-  UserRole,
-  DrawTool,
-  Mark
+  UserRole
 } from '../../types'
 import {
   encryptArrayBuffer,
@@ -45,7 +43,9 @@ import {
 } from '../../utils'
 import { Container } from '../../components/Container'
 import fileListStyles from '../../components/FileList/style.module.scss'
+import { DrawTool } from '../../types/drawing'
 import { DrawPDFFields } from '../../components/DrawPDFFields'
+import { Mark } from '../../types/mark.ts'
 import { StickySideColumns } from '../../layouts/StickySideColumns.tsx'
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import {

src/pages/sign/index.tsx

@@ -12,13 +12,7 @@ import { toast } from 'react-toastify'
 import { LoadingSpinner } from '../../components/LoadingSpinner'
 import { NostrController } from '../../controllers'
 import { appPublicRoutes } from '../../routes'
-import {
-  CreateSignatureEventContent,
-  Meta,
-  SignedEvent,
-  CurrentUserMark,
-  Mark
-} from '../../types'
+import { CreateSignatureEventContent, Meta, SignedEvent } from '../../types'
 import {
   decryptArrayBuffer,
   encryptArrayBuffer,
@@ -44,6 +38,7 @@ import {
 import { Container } from '../../components/Container'
 import { DisplayMeta } from './internal/displayMeta'
 import styles from './style.module.scss'
+import { CurrentUserMark, Mark } from '../../types/mark.ts'
 import { getLastSignersSig, isFullySigned } from '../../utils/sign.ts'
 import {
   filterMarksByPubkey,

src/pages/verify/index.tsx

@@ -5,7 +5,7 @@ import { useEffect, useRef, useState } from 'react'
 import { toast } from 'react-toastify'
 import { LoadingSpinner } from '../../components/LoadingSpinner'
 import { NostrController } from '../../controllers'
-import { DocSignatureEvent, Meta, CurrentUserFile, Mark } from '../../types'
+import { DocSignatureEvent, Meta } from '../../types'
 import {
   decryptArrayBuffer,
   getHash,
@@ -28,6 +28,8 @@ import { useSigitMeta } from '../../hooks/useSigitMeta.tsx'
 import { StickySideColumns } from '../../layouts/StickySideColumns.tsx'
 import { UsersDetails } from '../../components/UsersDetails.tsx/index.tsx'
 import FileList from '../../components/FileList'
+import { CurrentUserFile } from '../../types/file.ts'
+import { Mark } from '../../types/mark.ts'
 import React from 'react'
 import {
   convertToSigitFile,

src/services/LoginMethodStrategy/loginMethodStrategy.ts

@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
 import { EventTemplate, UnsignedEvent } from 'nostr-tools'
-import { SignedEvent } from '../../types'
+import { SignedEvent } from '../../types/nostr'
 
 /**
  * This interface holds all operations that are dependant on the login method and is used as the basis for the login strategies.

src/types/errors/index.ts

@@ -27,7 +27,3 @@ export function handleError(error: unknown): Error {
 
   return new Error(`Wrapped Error: ${stringified}`)
 }
-
-export * from './DecryptionError'
-export * from './MetaParseError'
-export * from './TimeoutError'

src/types/event.ts

@@ -1,4 +0,0 @@
-export enum KeyboardCode {
-  Escape = 'Escape',
-  Enter = 'Enter'
-}

src/types/index.ts

@@ -4,8 +4,3 @@ export * from './nostr'
 export * from './profile'
 export * from './relay'
 export * from './zip'
-export * from './event'
-export * from './drawing'
-export * from './file'
-export * from './mark'
-export * from './errors'

src/utils/crypto.ts

@@ -4,7 +4,7 @@ import {
   stringToHex,
   uint8ArrayToHexString
 } from '.'
-import { DecryptionError } from '../types'
+import { DecryptionError } from '../types/errors/DecryptionError'
 
 const ENCRYPTION_ALGO_NAME = 'AES-GCM'
 

src/utils/file.ts

@@ -1,5 +1,5 @@
 import { Meta } from '../types'
-import { PdfPage } from '../types'
+import { PdfPage } from '../types/drawing.ts'
 import { MOST_COMMON_MEDIA_TYPES } from './const.ts'
 import { extractMarksFromSignedMeta } from './mark.ts'
 import {

src/utils/mark.ts

@@ -1,14 +1,9 @@
-import {
-  CurrentUserMark,
-  Mark,
-  Meta,
-  SignedEventContent,
-  DrawTool,
-  MarkType
-} from '../types'
+import { CurrentUserMark, Mark } from '../types/mark.ts'
 import { hexToNpub } from './nostr.ts'
+import { Meta, SignedEventContent } from '../types'
 import { Event } from 'nostr-tools'
 import { EMPTY } from './const.ts'
+import { DrawTool, MarkType } from '../types/drawing.ts'
 import {
   faT,
   faSignature,

src/utils/meta.ts

@@ -1,14 +1,13 @@
-import {
-  CreateSignatureEventContent,
-  Meta,
-  MetaParseError,
-  MetaParseErrorType,
-  handleError
-} from '../types'
+import { CreateSignatureEventContent, Meta } from '../types'
 import { fromUnixTimestamp, parseJson } from '.'
 import { Event, verifyEvent } from 'nostr-tools'
 import { toast } from 'react-toastify'
 import { extractFileExtensions } from './file'
+import { handleError } from '../types/errors'
+import {
+  MetaParseError,
+  MetaParseErrorType
+} from '../types/errors/MetaParseError'
 
 export enum SignStatus {
   Signed = 'Signed',

src/utils/pdf.ts

@@ -1,5 +1,6 @@
-import { PdfPage, Mark } from '../types'
+import { PdfPage } from '../types/drawing.ts'
 import { PDFDocument, PDFFont, PDFPage, rgb } from 'pdf-lib'
+import { Mark } from '../types/mark.ts'
 import * as PDFJS from 'pdfjs-dist'
 import PDFJSWorker from 'pdfjs-dist/build/pdf.worker.min.mjs?worker'
 if (!PDFJS.GlobalWorkerOptions.workerPort) {

src/utils/utils.ts

@@ -1,4 +1,5 @@
-import { TimeoutError, CurrentUserFile } from '../types'
+import { TimeoutError } from '../types/errors/TimeoutError.ts'
+import { CurrentUserFile } from '../types/file.ts'
 import { SigitFile } from './file.ts'
 
 export const compareObjects = (