Merge branch 'refs/heads/main' into staging

# Conflicts: # package-lock.json # packages/text-annotator-react/package.json # packages/text-annotator-react/src/index.ts # packages/text-annotator/package.json
oleksandr-danylchenko · Jun 5, 2024 · 137357c · 137357c
2 parents e85cd6e + 58d2d1c
commit 137357c
Show file tree

Hide file tree

Showing 8 changed files with 1,387 additions and 544 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@recogito/text-annotator-monorepo",
-  "version": "3.0.0-rc.28",
+  "version": "3.0.0-rc.29",
   "description": "Recogito Text Annotator monorepo",
   "author": "Rainer Simon",
   "repository": {

diff --git a/packages/extension-tei/package.json b/packages/extension-tei/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@recogito/text-annotator-tei",
-  "version": "3.0.0-rc.28",
+  "version": "3.0.0-rc.29",
   "description": "Recogito Text Annotator TEI extension",
   "author": "Rainer Simon",
   "license": "BSD-3-Clause",
@@ -28,11 +28,11 @@
   "devDependencies": {
     "CETEIcean": "^1.9.2",
     "typescript": "^5.4.5",
-    "vite": "^5.2.11",
+    "vite": "^5.2.12",
     "vite-plugin-dts": "^3.9.1"
   },
   "peerDependencies": {
-    "@annotorious/core": "^3.0.0-rc.25",
-    "@recogito/text-annotator": "3.0.0-rc.28"
+    "@annotorious/core": "^3.0.0-rc.27",
+    "@recogito/text-annotator": "3.0.0-rc.29"
   }
 }
diff --git a/packages/text-annotator-react/package.json b/packages/text-annotator-react/package.json
@@ -25,25 +25,31 @@
   "types": "./dist/index.d.ts",
   "devDependencies": {
     "@types/react-dom": "^18.3.0",
-    "@vitejs/plugin-react": "^4.2.1",
+    "@vitejs/plugin-react": "^4.3.0",
     "openseadragon": "4.1.1",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "typescript": "^5.4.5",
-    "vite": "^5.2.11",
+    "vite": "^5.2.12",
     "vite-plugin-dts": "^3.9.1",
     "vite-tsconfig-paths": "^4.3.2"
   },
   "peerDependencies": {
+    "openseadragon": "^3.0.0 || ^4.0.0",
     "react": "16.8.0 || >=17.x || >=18.x",
     "react-dom": "16.8.0 || >=17.x || >=18.x"
   },
+  "peerDependenciesMeta": {
+    "openseadragon": {
+      "optional": true
+    }
+  },
   "dependencies": {
-    "@annotorious/core": "^3.0.0-rc.25",
-    "@annotorious/react": "^3.0.0-rc.25",
+    "@annotorious/core": "^3.0.0-rc.27",
+    "@annotorious/react": "^3.0.0-rc.27",
     "@floating-ui/react": "^0.26.15",
     "@soomo/text-annotator": "^3.0.0-staging.16",
-    "@recogito/text-annotator-tei": "3.0.0-rc.28",
+    "@recogito/text-annotator-tei": "3.0.0-rc.29",
     "CETEIcean": "^1.9.2"
   }
 }
diff --git a/packages/text-annotator-react/src/index.ts b/packages/text-annotator-react/src/index.ts
@@ -50,3 +50,7 @@ export type {
   TextAnnotator as RecogitoTextAnnotator,
   TextAnnotationStore
 } from '@soomo/text-annotator';
+
+export {
+  W3CTextFormat
+} from '@recogito/text-annotator';
diff --git a/packages/text-annotator/package.json b/packages/text-annotator/package.json
@@ -26,18 +26,18 @@
     "./dist/text-annotator.css": "./dist/text-annotator.css"
   },
   "devDependencies": {
-    "@types/jsdom": "^21.1.6",
+    "@types/jsdom": "^21.1.7",
     "@types/rbush": "^3.0.3",
     "@types/uuid": "^9.0.8",
-    "jsdom": "^24.0.0",
+    "jsdom": "^24.1.0",
     "svelte": "^4.2.17",
     "typescript": "^5.4.5",
-    "vite": "^5.2.11",
+    "vite": "^5.2.12",
     "vite-plugin-dts": "^3.9.1",
     "vitest": "^1.6.0"
   },
   "dependencies": {
-    "@annotorious/core": "^3.0.0-rc.25",
+    "@annotorious/core": "^3.0.0-rc.27",
     "colord": "^2.9.3",
     "dequal": "^2.0.3",
     "rbush": "^3.0.1",

diff --git a/packages/text-annotator/src/highlight/baseRenderer.ts b/packages/text-annotator/src/highlight/baseRenderer.ts
@@ -100,7 +100,7 @@ export const createBaseRenderer = (
       const hovered = annotation.id === hover.current;
 
       return { annotation, rects, state: { selected, hover: hovered }};
-    })
+    });
 
     renderer.redraw(highlights, bounds, currentStyle, currentPainter, lazy);
 

diff --git a/packages/text-annotator/src/highlight/span/spansRenderer.ts b/packages/text-annotator/src/highlight/span/spansRenderer.ts
@@ -48,7 +48,7 @@ const createRenderer = (container: HTMLElement): RendererImplementation => {
     // Don't redraw the SPANs - but redraw the painter, if any!
     const shouldRedraw = !(noChanges && lazy);
 
-    if (!painter) return;
+    if (!painter && !shouldRedraw) return;
 
     if (shouldRedraw)
       highlightLayer.innerHTML = '';