@annotorious/annotorious 3.6.5 → 3.6.7

package/dist/state/spatialTree.d.ts

@@ -1,5 +1,5 @@
 import { ImageAnnotationTarget } from '../model';
-import { Annotation, AnnotationTarget, Filter } from '@annotorious/core';
+import { AnnotationTarget } from '@annotorious/core';
 interface IndexedTarget {
     minX: number;
     minY: number;
@@ -10,7 +10,7 @@ interface IndexedTarget {
 export declare const createSpatialTree: () => {
     all: () => IndexedTarget[];
     clear: () => void;
-    getAt: (x: number, y: number, filter?: Filter<Annotation>, buffer?: number) => ImageAnnotationTarget[];
+    getAt: (x: number, y: number, buffer?: number) => ImageAnnotationTarget[];
     getIntersecting: (x: number, y: number, width: number, height: number) => ImageAnnotationTarget[];
     insert: (target: AnnotationTarget) => void;
     remove: (target: AnnotationTarget) => void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@annotorious/annotorious",
-  "version": "3.6.5",
+  "version": "3.6.7",
   "description": "Add image annotation functionality to any web page with a few lines of JavaScript",
   "author": "Rainer Simon",
   "license": "BSD-3-Clause",
@@ -49,7 +49,7 @@
     "vitest": "^3.2.4"
   },
   "dependencies": {
-    "@annotorious/core": "3.6.5",
+    "@annotorious/core": "3.6.7",
     "dequal": "^2.0.3",
     "rbush": "^4.0.1",
     "simplify-js": "^1.2.4",

package/src/Annotorious.css

@@ -19,12 +19,12 @@
           user-select: none;
 }
 
-.a9s-annotationlayer.hidden {
-  display: none;
+.a9s-annotationlayer.hover {
+  cursor: pointer;
 }
 
-.a9s-annotationlayer .a9s-annotation {
-  cursor: pointer;
+.a9s-annotationlayer.hidden {
+  display: none;
 }
 
 .a9s-annotationlayer ellipse, 

package/src/model/core/polyline/polylineUtils.ts

@@ -38,12 +38,12 @@ export const approximateAsPolygon = (corners: PolylinePoint[], closed = false):
     
     // If there's a curve to the next point, approximate it
     if (i < corners.length - 1 || closed) {
-      const hasCurve = currentPoint.outHandle || nextPoint.inHandle;
+      const hasCurve = currentPoint.type === 'CURVE' || nextPoint.type == 'CURVE';
       if (hasCurve) {
         const curvePoints = approximateBezierCurve(
           currentPoint.point,
-          currentPoint.outHandle || currentPoint.point,
-          nextPoint.inHandle || nextPoint.point,
+          currentPoint.type === 'CURVE' ? currentPoint.outHandle || currentPoint.point : currentPoint.point,
+          nextPoint.type === 'CURVE' ? nextPoint.inHandle || nextPoint.point : nextPoint.point,
           nextPoint.point,
           10 // number of approximation segments
         );
@@ -85,12 +85,12 @@ const isPointNearPath = (geom: PolylineGeometry, point: [number, number], buffer
     const currentPoint = geom.points[i];
     const nextPoint = geom.points[i + 1];
     
-    const hasCurve = currentPoint.outHandle || nextPoint.inHandle;
+    const hasCurve = currentPoint.type === 'CURVE' || nextPoint.type === 'CURVE';
     if (hasCurve) {
       const curvePoints = approximateBezierCurve(
         currentPoint.point,
-        currentPoint.outHandle || currentPoint.point,
-        nextPoint.inHandle || nextPoint.point,
+        currentPoint.type === 'CURVE' ? currentPoint.outHandle || currentPoint.point : currentPoint.point,
+        nextPoint.type === 'CURVE' ? nextPoint.inHandle || nextPoint.point : nextPoint.point,
         nextPoint.point,
         20 // TODO make configurable? Based on scale factor? Length?
       );
@@ -174,8 +174,7 @@ export const computeSVGPath = (geom: PolylineGeometry) => {
     const lastPoint = geom.points[geom.points.length - 1];
     const firstPointRef = geom.points[0];
     
-    const hasClosingCurve = lastPoint.outHandle || firstPointRef.inHandle;
-    
+    const hasClosingCurve = lastPoint.type === 'CURVE' || firstPointRef.type === 'CURVE';
     if (hasClosingCurve) {
       const cp1 = lastPoint.outHandle || lastPoint.point;
       const cp2 = firstPointRef.inHandle || firstPointRef.point;

package/src/state/ImageAnnotatorState.ts

@@ -55,7 +55,7 @@ export const createImageAnnotatorState = <I extends Annotation, E extends unknow
   });
 
   const getAt = (x: number, y: number, filter?: Filter<I>, buffer?: number): I | undefined => {
-    const targets = tree.getAt(x, y, filter as Filter<Annotation>, buffer);
+    const targets = tree.getAt(x, y, buffer);
 
     if (filter) {
       // Resolve annotations first, so we can filter
@@ -72,8 +72,8 @@ export const createImageAnnotatorState = <I extends Annotation, E extends unknow
 
   const getIntersecting = (x: number, y: number, width: number, height: number) =>
     tree.getIntersecting(x, y, width, height)
-    .map(target => store.getAnnotation(target.annotation) as I)
-    .filter(Boolean); // Race conditions may have deleted annotations concurrently
+      .map(target => store.getAnnotation(target.annotation) as I)
+      .filter(Boolean); // Race conditions may have deleted annotations concurrently
 
   return {
     store: {

package/src/state/spatialTree.ts

@@ -75,7 +75,7 @@ export const createSpatialTree = () => {
   };
 
 
-  const getAt = (x: number, y: number, filter?: Filter<Annotation>, buffer: number = 0): ImageAnnotationTarget[] => {
+  const getAt = (x: number, y: number, buffer: number = 0): ImageAnnotationTarget[] => {
     const idxHits = tree.search({
       minX: x - buffer,
       minY: y - buffer,