@annotorious/annotorious 3.3.5 → 3.3.6

package/dist/state/ImageAnnotationStore.d.ts

@@ -1,8 +1,7 @@
-import { Annotation, Store, SvelteAnnotatorState, SvelteStore } from '@annotorious/core';
-import { ImageAnnotation } from '../model';
+import { Annotation, Filter, Store, SvelteAnnotatorState, SvelteStore } from '@annotorious/core';
 export type ImageAnnotationStore<I extends Annotation> = Store<I> & {
-    getAt(x: number, y: number): ImageAnnotation | undefined;
-    getIntersecting(x: number, y: number, width: number, height: number): ImageAnnotation[];
+    getAt(x: number, y: number, filter?: Filter<I>): I | undefined;
+    getIntersecting(x: number, y: number, width: number, height: number): I[];
 };
 export type SvelteImageAnnotationStore<I extends Annotation = Annotation> = SvelteStore<I> & ImageAnnotationStore<I>;
 export type SvelteImageAnnotatorState<I extends Annotation = Annotation, E extends unknown = Annotation> = SvelteAnnotatorState<I, E> & {

package/dist/state/spatialTree.d.ts

@@ -1,5 +1,5 @@
 import { ImageAnnotationTarget } from '../model';
-import { AnnotationTarget } from '@annotorious/core';
+import { Annotation, AnnotationTarget, Filter } 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) => ImageAnnotationTarget | undefined;
+    getAt: (x: number, y: number, filter?: Filter<Annotation>) => 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.3.5",
+  "version": "3.3.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.1.2"
   },
   "dependencies": {
-    "@annotorious/core": "3.3.5",
+    "@annotorious/core": "3.3.6",
     "rbush": "^4.0.1",
     "svg-pathdata": "^7.2.0",
     "uuid": "^11.1.0"

package/src/state/ImageAnnotationStore.ts

@@ -1,11 +1,10 @@
-import type { Annotation, Store, SvelteAnnotatorState, SvelteStore } from '@annotorious/core';
-import type { ImageAnnotation } from '../model';
+import type { Annotation, Filter, Store, SvelteAnnotatorState, SvelteStore } from '@annotorious/core';
 
 export type ImageAnnotationStore<I extends Annotation> = Store<I> & {
 
-  getAt(x: number, y: number): ImageAnnotation | undefined;
+  getAt(x: number, y: number, filter?: Filter<I>): I | undefined;
 
-  getIntersecting(x: number, y: number, width: number, height: number): ImageAnnotation[];
+  getIntersecting(x: number, y: number, width: number, height: number): I[];
 
 }
 

package/src/state/ImageAnnotatorState.ts

@@ -6,6 +6,7 @@ import {
   toSvelteStore,
   type Annotation,
   type AnnotatorState, 
+  type Filter, 
   type HoverState,
   type SelectionState
 } from '@annotorious/core';
@@ -53,13 +54,24 @@ export const createImageAnnotatorState = <I extends Annotation, E extends unknow
       tree.update(oldValue.target, newValue.target));
   });
 
-  const getAt = (x: number, y: number): ImageAnnotation | undefined => {
-    const target = tree.getAt(x, y);
-    return target ? store.getAnnotation(target.annotation) as unknown as ImageAnnotation : undefined; 
+  const getAt = (x: number, y: number, filter?: Filter<I>): I | undefined => {
+    const targets = tree.getAt(x, y, filter as Filter<Annotation>);
+
+    if (filter) {
+      // Resolve annotations first, so we can filter
+      const annotations = targets.map(t => store.getAnnotation(t.annotation)!)
+        .filter(Boolean)
+        .filter(filter);
+        
+      return annotations[0];
+    } else {
+      const top = targets[0];
+      return top ? store.getAnnotation(top.annotation) : undefined;
+    }
   }
 
   const getIntersecting = (x: number, y: number, width: number, height: number) =>
-    tree.getIntersecting(x, y, width, height).map(target => store.getAnnotation(target.annotation) as unknown as ImageAnnotation);
+    tree.getIntersecting(x, y, width, height).map(target => store.getAnnotation(target.annotation) as I);
 
   return {
     store: {

package/src/state/spatialTree.ts

@@ -1,7 +1,7 @@
 import RBush from 'rbush';
 import { ShapeType,computeArea, intersects, isImageAnnotationTarget } from '../model';
 import type { ImageAnnotationTarget } from '../model';
-import type { AnnotationTarget } from '@annotorious/core';
+import type { Annotation, AnnotationTarget, Filter } from '@annotorious/core';
 
 interface IndexedTarget {
 
@@ -74,7 +74,8 @@ export const createSpatialTree = () => {
     tree.load(indexedTargets);
   };
 
-  const getAt = (x: number, y: number): ImageAnnotationTarget | undefined => {
+
+  const getAt = (x: number, y: number, filter?: Filter<Annotation>): ImageAnnotationTarget[] => {
     const idxHits = tree.search({
       minX: x,
       minY: y,
@@ -91,7 +92,9 @@ export const createSpatialTree = () => {
     // Get smallest shape
     if (exactHits.length > 0) {
       exactHits.sort((a, b) => computeArea(a.selector) - computeArea(b.selector));
-      return exactHits[0];
+      return exactHits;
+    } else {
+      return [];
     }
   };