Merge branch 'recogito#71-fix-losing-styleClass' into local-dev

oleksandr-danylchenko · Feb 29, 2024 · 955a976 · 955a976
2 parents 96b3dff + 666e392
commit 955a976
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 4 deletions.
diff --git a/packages/text-annotator-react/vite.config.js b/packages/text-annotator-react/vite.config.js
@@ -41,4 +41,4 @@ export default defineConfig(({ command, mode }) => ({
     },
     sourcemap: true
   }
-}));
+}));
diff --git a/packages/text-annotator/src/highlight/canvas/highlightRenderer.ts b/packages/text-annotator/src/highlight/canvas/highlightRenderer.ts
@@ -74,7 +74,7 @@ export const createCanvasHighlightRenderer = (
   container.addEventListener('pointermove', onPointerMove);
 
   const refresh = () => requestAnimationFrame(() => {
-    const bounds = getViewportBounds(container);   
+    const bounds = getViewportBounds(container);
 
     const { top, left, minX, minY, maxX, maxY } = bounds;
 

diff --git a/packages/text-annotator/src/model/core/TextAnnotation.ts b/packages/text-annotator/src/model/core/TextAnnotation.ts
@@ -10,6 +10,8 @@ export interface TextAnnotationTarget extends AnnotationTarget {
 
   selector: TextSelector[];
 
+  styleClass?: string;
+
 }
 
 export interface TextSelector {

diff --git a/packages/text-annotator/src/model/w3c/W3CTextFormatAdapter.ts b/packages/text-annotator/src/model/w3c/W3CTextFormatAdapter.ts
@@ -38,13 +38,17 @@ const parseW3CTextTargets = (annotation: W3CTextAnnotation) => {
   } = annotation;
 
   const w3cTargets = Array.isArray(target) ? target : [target];
+  if (w3cTargets.length === 0) {
+    return { error: Error(`No targets found for annotation: ${annotation.id}`) };
+  }
 
   const parsed: TextAnnotationTarget = {
     creator: parseW3CUser(creator),
     created: created ? new Date(created) : undefined,
     updated: modified ? new Date(modified) : undefined,
     annotation: annotationId,
-    selector: []
+    selector: [],
+    styleClass: w3cTargets[0].styleClass
   };
 
   for (const w3cTarget of w3cTargets) {

diff --git a/packages/text-annotator/vite.config.js b/packages/text-annotator/vite.config.js
@@ -25,4 +25,4 @@ export default defineConfig({
       }
     }
   }
-});
+});