@annotorious/annotorious 3.0.18 → 3.0.20

package/dist/index.d.ts

@@ -6,5 +6,5 @@ export * from './annotation/tools';
 export * from './Annotorious';
 export * from './AnnotoriousOpts';
 export * from './keyboardCommands';
-export type { Annotation, AnnotationBody, AnnotationTarget, Annotator, AnnotatorState, Appearance, AppearanceProvider, ChangeSet, Color, DrawingStyle, Filter, FormatAdapter, HoverState, LifecycleEvents, ParseResult, PresentUser, Selection, SelectionState, Store, StoreChangeEvent, StoreObserver, User, W3CAnnotation, W3CAnnotationBody, W3CAnnotationTarget } from '@annotorious/core';
+export type { Annotation, AnnotationBody, AnnotationTarget, Annotator, AnnotatorState, Appearance, AppearanceProvider, ChangeSet, Color, DrawingStyle, Filter, FormatAdapter, History, HoverState, LifecycleEvents, ParseResult, PresentUser, Selection, SelectionState, Store, StoreChangeEvent, StoreObserver, User, W3CAnnotation, W3CAnnotationBody, W3CAnnotationTarget } from '@annotorious/core';
 export { chainStyles, computeStyle, createBody, defaultColorProvider, UserSelectAction } from '@annotorious/core';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@annotorious/annotorious",
-  "version": "3.0.18",
+  "version": "3.0.20",
   "description": "Add image annotation functionality to any web page with a few lines of JavaScript",
   "author": "Rainer Simon",
   "license": "BSD-3-Clause",
@@ -46,10 +46,10 @@
     "typescript": "5.7.2",
     "vite": "^5.4.11",
     "vite-plugin-dts": "^4.3.0",
-    "vitest": "^2.1.6"
+    "vitest": "^2.1.8"
   },
   "dependencies": {
-    "@annotorious/core": "3.0.18",
+    "@annotorious/core": "3.0.20",
     "rbush": "^4.0.1",
     "uuid": "^11.0.3"
   }

package/src/Annotorious.ts

@@ -114,10 +114,8 @@ export const createImageAnnotator = <I extends Annotation = ImageAnnotation, E e
   // Most of the external API functions are covered in the base annotator
   const base = createBaseAnnotator<I, E>(state, undoStack, opts.adapter);
 
-  const cancelDrawing = () => {
-    annotationLayer.$set({ drawingEnabled: false });
-    setTimeout(() => annotationLayer.$set({ drawingEnabled: true }), 1);
-  }
+  const cancelDrawing = () =>
+    annotationLayer.cancelDrawing();
 
   const destroy = () => {
     // Destroy Svelte annotation layer

package/src/AnnotoriousOpts.ts

@@ -1,4 +1,4 @@
-import type { Annotation, ChangeSet, DrawingStyleExpression, FormatAdapter, UserSelectActionExpression } from '@annotorious/core';
+import type { Annotation, DrawingStyleExpression, FormatAdapter, History, UserSelectActionExpression } from '@annotorious/core';
 import type { ImageAnnotation } from './model';
 
 export interface AnnotoriousOpts<I extends Annotation = ImageAnnotation, E extends unknown = ImageAnnotation> {
@@ -13,7 +13,7 @@ export interface AnnotoriousOpts<I extends Annotation = ImageAnnotation, E exten
   // 'drag': starts drawing on drag, single click always selects
   drawingMode?: DrawingMode;
 
-  initialHistory?: ChangeSet<I>[];
+  initialHistory?: History<I>;
 
   // Modal selection mode WILL NOT CHANGE OR DE-SELECT THE CURRENT SELECTION if another 
   // annotation or empty space is clicked. Warning: this means that the user is no longer

package/src/annotation/SVGAnnotationLayer.svelte

@@ -23,7 +23,11 @@
   export let user: User;
   export let visible = true;
 
+  // Trick to force tool re-mounting on cancelDrawing
+  let toolMountKey = 0;
+
   /** API methods */
+  export const cancelDrawing = () => toolMountKey += 1;
   export const getDrawingTool = () => toolName;
   export const isDrawingEnabled = () => drawingEnabled;
 
@@ -195,7 +199,7 @@
           {/if}
         {/each}
       {:else if (tool && drawingEnabled)} 
-        {#key toolName}
+        {#key `${toolName}-${toolMountKey}`}
           <ToolMount 
             target={drawingEl}
             tool={tool}

package/src/annotation/tools/polygon/RubberbandPolygon.svelte

@@ -181,7 +181,7 @@
         
     {#if isClosable}
       <rect 
-        class="a9s-corner-handle"
+        class="a9s-handle"
         x={points[0][0] - handleSize / 2} 
         y={points[0][1] - handleSize / 2} 
         height={handleSize} 

package/src/index.ts

@@ -21,6 +21,7 @@ export type {
   DrawingStyle,
   Filter,
   FormatAdapter,
+  History,
   HoverState,
   LifecycleEvents,
   ParseResult,