@annotorious/annotorious 3.6.4 → 3.6.6

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.4",
+  "version": "3.6.6",
   "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.4",
+    "@annotorious/core": "3.6.6",
     "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/annotation/editors/index.ts

@@ -4,4 +4,5 @@ export * from './editorsRegistry';
 
 export { default as Editor } from './Editor.svelte';
 export { default as EditorMount } from './EditorMount.svelte';
-export { default as Handle } from './Handle.svelte';
+export { default as Handle } from './Handle.svelte';
+export { default as MidpointHandle } from './MidpointHandle.svelte';

package/src/annotation/editors/polygon/PolygonEditor.svelte

@@ -77,7 +77,7 @@
       .reduce((closest, midpoint) =>
         getDistSq(midpoint.point) < getDistSq(closest.point) ? midpoint : closest);
 
-    // Show midpoint of the mouse is at least within THRESHOLD distance
+    // Show midpoint if the mouse is at least within THRESHOLD distance
     // of the midpoint or the closest corner. (Basically a poor man's shape buffering).
     const threshold = Math.pow(MIN_HOVER_DISTANCE / viewportScale, 2);
 

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

@@ -38,7 +38,7 @@ 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,

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,