@annotorious/annotorious 3.0.0-rc.18 → 3.0.0-rc.2

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

@@ -1,27 +1,27 @@
-<script lang="ts">
+<script type="ts">
   import { boundsFromPoints } from '../../../model';
-  import type { Polygon, PolygonGeometry, Shape } from '../../../model';
+  import type { Polygon } from '../../../model';
   import type { Transform } from '../../Transform';
   import { Editor, Handle } from '..';
 
   /** Props */
   export let shape: Polygon;
-  export let computedStyle: string | undefined;
+  export let computedStyle: string = undefined;
   export let transform: Transform;
   export let viewportScale: number = 1;
 
   $: geom = shape.geometry;
 
-  const editor = (polygon: Shape, handle: string, delta: [number, number]) => {
-    let points: [number, number][];
+  $: handleSize = 10 / viewportScale;
 
-    const geom = (polygon.geometry) as PolygonGeometry;
+  const editor = (polygon: Polygon, handle: Handle, delta: [number, number]) => {
+    let points: [number, number][];
 
-    if (handle === 'SHAPE') {
-      points = geom.points.map(([x, y]) => [x + delta[0], y + delta[1]]);
+    if (handle === Handle.SHAPE) {
+      points = polygon.geometry.points.map(([x, y]) => [x + delta[0], y + delta[1]]);
     } else {
-      points = geom.points.map(([x, y], idx) =>
-        handle === `HANDLE-${idx}` ? [x + delta[0], y + delta[1]] : [x, y]
+      points = polygon.geometry.points.map(([x, y], idx) =>
+        handle === Handle(idx) ? [x + delta[0], y + delta[1]] : [x, y]
       );
     }
 
@@ -46,19 +46,19 @@
   <polygon
     class="a9s-outer"
     style={computedStyle ? 'display:none;' : undefined}
-    on:pointerdown={grab('SHAPE')}
+    on:pointerdown={grab(Handle.SHAPE)}
     points={geom.points.map(xy => xy.join(',')).join(' ')} />
 
   <polygon
     class="a9s-inner a9s-shape-handle"
     style={computedStyle}
-    on:pointerdown={grab('SHAPE')}
+    on:pointerdown={grab(Handle.SHAPE)}
     points={geom.points.map(xy => xy.join(',')).join(' ')} />
 
   {#each geom.points as point, idx}
-    <Handle 
-      on:pointerdown={grab(`HANDLE-${idx}`)}
-      x={point[0]} y={point[1]} 
-      scale={viewportScale} />
+    <rect 
+      class="a9s-corner-handle"
+      on:pointerdown={grab(Handle(idx))}
+      x={point[0] - handleSize / 2} y={point[1] - handleSize / 2} height={handleSize} width={handleSize} />
   {/each}
 </Editor>

package/src/annotation/editors/rectangle/RectangleEditor.svelte

@@ -1,18 +1,19 @@
-<script lang="ts">
-  import Handle from '../Handle.svelte';
-  import type { Rectangle, Shape } from '../../../model';
+<script type="ts">
+  import type { Rectangle } from '../../../model';
   import type { Transform } from '../../Transform';
-  import { Editor } from '..';
+  import { Editor, Handle } from '..';
 
   /** Props */
   export let shape: Rectangle;
-  export let computedStyle: string | undefined;
+  export let computedStyle: string = undefined;
   export let transform: Transform;
   export let viewportScale: number = 1;
 
   $: geom = shape.geometry;
 
-  const editor = (rectangle: Shape, handle: string, delta: [number, number]) => {
+  $: handleSize = 10 / viewportScale;
+
+  const editor = (rectangle: Rectangle, handle: Handle, delta: [number, number]) => {
     const initialBounds = rectangle.geometry.bounds;
 
     let [x0, y0] = [initialBounds.minX, initialBounds.minY];
@@ -20,39 +21,39 @@
 
     const [dx, dy] = delta;
 
-    if (handle === 'SHAPE') {
+    if (handle === Handle.SHAPE) {
       x0 += dx;
       x1 += dx;
       y0 += dy;
       y1 += dy;
     } else {
       switch (handle) {
-        case 'TOP':
-        case 'TOP_LEFT':
-        case 'TOP_RIGHT': {
+        case Handle.TOP:
+        case Handle.TOP_LEFT:
+        case Handle.TOP_RIGHT: {
           y0 += dy;
           break;
         }
 
-        case 'BOTTOM':
-        case 'BOTTOM_LEFT':
-        case 'BOTTOM_RIGHT': {
+        case Handle.BOTTOM:
+        case Handle.BOTTOM_LEFT:
+        case Handle.BOTTOM_RIGHT: {
           y1 += dy;
           break;
         }
       }
 
       switch (handle) {
-        case 'LEFT':
-        case 'TOP_LEFT':
-        case 'BOTTOM_LEFT': {
+        case Handle.LEFT:
+        case Handle.TOP_LEFT:
+        case Handle.BOTTOM_LEFT: {
           x0 += dx;
           break;
         }
 
-        case 'RIGHT':
-        case 'TOP_RIGHT':
-        case 'BOTTOM_RIGHT': {
+        case Handle.RIGHT:
+        case Handle.TOP_RIGHT:
+        case Handle.BOTTOM_RIGHT: {
           x1 += dx;
           break;
         }
@@ -91,56 +92,52 @@
   <rect 
     class="a9s-outer"
     style={computedStyle ? 'display:none;' : undefined}
-    on:pointerdown={grab('SHAPE')}
+    on:pointerdown={grab(Handle.SHAPE)}
     x={geom.x} y={geom.y} width={geom.w} height={geom.h} />
 
   <rect 
     class="a9s-inner a9s-shape-handle"
     style={computedStyle}
-    on:pointerdown={grab('SHAPE')}
+    on:pointerdown={grab(Handle.SHAPE)}
     x={geom.x} y={geom.y} width={geom.w} height={geom.h} />
 
   <rect 
     class="a9s-edge-handle a9s-edge-handle-top" 
-    on:pointerdown={grab('TOP')}
+    on:pointerdown={grab(Handle.TOP)}
     x={geom.x} y={geom.y} height={1} width={geom.w} />
 
   <rect 
     class="a9s-edge-handle a9s-edge-handle-right"
-    on:pointerdown={grab('RIGHT')}
+    on:pointerdown={grab(Handle.RIGHT)}
     x={geom.x + geom.w} y={geom.y} height={geom.h} width={1}/>
 
   <rect 
     class="a9s-edge-handle a9s-edge-handle-bottom" 
-    on:pointerdown={grab('BOTTOM')}
+    on:pointerdown={grab(Handle.BOTTOM)}
     x={geom.x} y={geom.y + geom.h} height={1} width={geom.w} />
 
   <rect 
     class="a9s-edge-handle a9s-edge-handle-left" 
-    on:pointerdown={grab('LEFT')}
+    on:pointerdown={grab(Handle.LEFT)}
     x={geom.x} y={geom.y} height={geom.h} width={1} />
 
-  <Handle
-    class="a9s-corner-handle-topleft"
-    on:pointerdown={grab('TOP_LEFT')}
-    x={geom.x} y={geom.y}
-    scale={viewportScale} /> 
-
-  <Handle
-    class="a9s-corner-handle-topright"
-    on:pointerdown={grab('TOP_RIGHT')}
-    x={geom.x + geom.w} y={geom.y} 
-    scale={viewportScale} />
+  <rect 
+    class="a9s-corner-handle a9s-corner-handle-topleft"
+    on:pointerdown={grab(Handle.TOP_LEFT)}
+    x={geom.x - handleSize / 2} y={geom.y - handleSize / 2} height={handleSize} width={handleSize} />
+
+  <rect 
+    class="a9s-corner-handle a9s-corner-handle-topright"
+    on:pointerdown={grab(Handle.TOP_RIGHT)}
+    x={geom.x + geom.w - handleSize / 2} y={geom.y - handleSize / 2} height={handleSize} width={handleSize} />
   
-  <Handle 
-    class="a9s-corner-handle-bottomright"
-    on:pointerdown={grab('BOTTOM_RIGHT')}
-    x={geom.x + geom.w} y={geom.y + geom.h} 
-    scale={viewportScale} />
+  <rect 
+    class="a9s-corner-handle a9s-corner-handle-bottomright"
+    on:pointerdown={grab(Handle.BOTTOM_RIGHT)}
+    x={geom.x + geom.w - handleSize / 2} y={geom.y + geom.h - handleSize / 2} height={handleSize} width={handleSize} />
     
-  <Handle 
-    class="a9s-corner-handle-bottomleft"
-    on:pointerdown={grab('BOTTOM_LEFT')}
-    x={geom.x} y={geom.y + geom.h} 
-    scale={viewportScale} />
+  <rect 
+    class="a9s-corner-handle a9s-corner-handle-bottomleft"
+    on:pointerdown={grab(Handle.BOTTOM_LEFT)}
+    x={geom.x - handleSize / 2} y={geom.y + geom.h - handleSize / 2} height={handleSize} width={handleSize} />
 </Editor>

package/src/annotation/shapes/Ellipse.svelte

@@ -1,4 +1,4 @@
-<script lang="ts">
+<script type="ts">
   import type { DrawingStyle } from '@annotorious/core';
   import type { Geometry, EllipseGeometry, ImageAnnotation } from '../../model';
   import { computeStyle } from '../utils/styling';
@@ -6,7 +6,7 @@
   /** Props */
   export let annotation: ImageAnnotation;
   export let geom: Geometry;
-  export let style: DrawingStyle | ((annotation: ImageAnnotation) => DrawingStyle) | undefined;
+  export let style: DrawingStyle | ((annotation: ImageAnnotation) => DrawingStyle) = undefined;
 
   $: computedStyle = computeStyle(annotation, style);
 

package/src/annotation/shapes/Polygon.svelte

@@ -1,4 +1,4 @@
-<script lang="ts">
+<script type="ts">
   import type { DrawingStyle } from '@annotorious/core';
   import type { Geometry, ImageAnnotation, PolygonGeometry } from '../../model';
   import { computeStyle } from '../utils/styling';
@@ -6,7 +6,7 @@
   /** Props **/
   export let annotation: ImageAnnotation;
   export let geom: Geometry;
-  export let style: DrawingStyle | ((annotation: ImageAnnotation) => DrawingStyle) | undefined;
+  export let style: DrawingStyle | ((annotation: ImageAnnotation) => DrawingStyle) = undefined;
 
   $: computedStyle = computeStyle(annotation, style);
 

package/src/annotation/shapes/Rectangle.svelte

@@ -1,4 +1,4 @@
-<script lang="ts">
+<script type="ts">
   import type { DrawingStyle } from '@annotorious/core';
   import type { Geometry, ImageAnnotation, RectangleGeometry } from '../../model';
   import { computeStyle } from '../utils/styling';
@@ -6,11 +6,11 @@
   /** Props **/
   export let annotation: ImageAnnotation;
   export let geom: Geometry;
-  export let style: DrawingStyle | ((annotation: ImageAnnotation) => DrawingStyle) | undefined;
+  export let style: DrawingStyle | ((annotation: ImageAnnotation) => DrawingStyle) = undefined;
 
   $: computedStyle = computeStyle(annotation, style);
 
-  $: ({ x, y, w, h } = geom as RectangleGeometry);
+  const { x, y, w, h } = geom as RectangleGeometry;
 </script>
 
 <g data-id={annotation.id}>

package/src/annotation/tools/ToolMount.svelte

@@ -23,9 +23,9 @@
 
     const cleanup: Function[] = [];
 
-    const addEventListener = (name: keyof SVGSVGElementEventMap, handler: EventListenerOrEventListenerObject, capture?: boolean) => {
-      svg?.addEventListener(name, handler, capture);
-      cleanup.push(() => svg?.removeEventListener(name, handler, capture));
+    const addEventListener = (name: string, handler: (evt: PointerEvent) => void, capture?: boolean) => {
+      svg.addEventListener(name, handler, capture);
+      cleanup.push(() => svg.removeEventListener(name, handler, capture));
     }
 
     toolComponent = new tool({

package/src/annotation/tools/drawingToolsRegistry.ts

@@ -9,11 +9,10 @@ export type DrawingToolOpts = {
 
   drawingMode?: DrawingMode;
 
-  [key: string]: any;
+  [key: string]: string;
 
 }
 
-// @ts-ignore
 const REGISTERED = new Map<DrawingTool, { tool: typeof SvelteComponent, opts?: DrawingToolOpts }>([
   ['rectangle', { tool: RubberbandRectangle }],
   ['polygon', { tool: RubberbandPolygon }]

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

@@ -1,7 +1,7 @@
-<script lang="ts">
+<script type="ts">
   import { onMount, createEventDispatcher } from 'svelte';
   import type { DrawingMode } from '../../../AnnotoriousOpts';
-  import { boundsFromPoints, computeArea, ShapeType, type Polygon } from '../../../model';
+  import { boundsFromPoints, ShapeType, type Polygon } from '../../../model';
   import { distance } from '../../utils';
   import type { Transform } from '../..';
 
@@ -13,31 +13,22 @@
   export let transform: Transform;
   export let viewportScale = 1;
 
-  let lastPointerDown: { timeStamp: number, offsetX: number, offsetY: number };
+  let container: SVGGElement;
+
+  let lastPointerDown: number;
 
   let points: [number, number][] = [];
   
-  let cursor: [number, number] | undefined;
-
-  // Keep track of the user keeping the finger
-  // in place. Long pauses will be interpreted like a 
-  // double click and close the shape.
-  let touchPauseTimer: number | undefined;
+  let cursor: [number, number] = null;
 
   let isClosable: boolean = false;
 
   const CLOSE_DISTANCE = 20;
 
-  const TOUCH_PAUSE_LIMIT = 1500;
-
   $: handleSize = 10 / viewportScale;
 
-  const onPointerDown = (event: Event) => {
-    const evt = event as PointerEvent;
-
-    // Note that the event itself is ephemeral!
-    const { timeStamp, offsetX, offsetY } = evt;
-    lastPointerDown = { timeStamp, offsetX, offsetY };
+  const onPointerDown = (evt: PointerEvent) => {
+    lastPointerDown = performance.now();
 
     if (drawingMode === 'drag') {
       if (points.length === 0) {
@@ -49,11 +40,7 @@
     }
   }
 
-  const onPointerMove = (event: Event) => {
-    const evt = event as PointerEvent;
-
-    if (touchPauseTimer) clearTimeout(touchPauseTimer);
-
+  const onPointerMove = (evt: PointerEvent) => {
     if (points.length > 0) {
       cursor = transform.elementToImage(evt.offsetX, evt.offsetY);
 
@@ -61,28 +48,19 @@
         const d = distance(cursor, points[0]) * viewportScale;
         isClosable = d < CLOSE_DISTANCE;
       }
-
-      if (evt.pointerType === 'touch') {
-        touchPauseTimer = setTimeout(() => {
-          onDblClick();
-        }, TOUCH_PAUSE_LIMIT);
-      }
     }
   }
 
-  const onPointerUp = (event: Event) => {
-    const evt = event as PointerEvent;
+  const onPointerUp = (evt: PointerEvent) => {
+    const timeDifference = performance.now() - lastPointerDown;
 
     if (drawingMode === 'click') {
-      const timeDifference = evt.timeStamp - lastPointerDown.timeStamp;
-
-      const d = distance(
-        [lastPointerDown.offsetX, lastPointerDown.offsetY], 
-        [evt.offsetX, evt.offsetY]);
-
-      if (timeDifference > 300 || d > 15) // Not a single click - ignore
+      // Not a single click - ignore
+      if (timeDifference > 300)
         return;
 
+      evt.stopPropagation();
+
       if (isClosable) {
         stopDrawing();
       } else if (points.length === 0) {
@@ -92,17 +70,17 @@
 
         cursor = point;
       } else {
-        points.push(cursor!);
+        points.push(cursor);
       }
     } else {
       // Require minimum drag of 4px
       if (points.length === 1) {
-        const dist = distance(points[0], cursor!);
+        const dist = distance(points[0], cursor);
 
         if (dist <= 4) {
           // Cancel
           points = [];
-          cursor = undefined;
+          cursor = null;
 
           return;
         }
@@ -114,33 +92,28 @@
       if (isClosable) {
         stopDrawing();
       } else {
-        points.push(cursor!);
+        points.push(cursor);
       }
     }
   }
 
   const onDblClick = () => {
-    if (!cursor) return;
-
-    // Require min 3 points (incl. cursor) and minimum
-    // polygon area
+    console.log('dblclick');
+    
     const p = [...points, cursor];
 
     const shape: Polygon = {
-      type: ShapeType.POLYGON, 
-      geometry: {
-        bounds: boundsFromPoints(p),
-        points: p
+        type: ShapeType.POLYGON, 
+        geometry: {
+          bounds: boundsFromPoints(p),
+          points: p
+        }
       }
-    }
 
-    const area = computeArea(shape);
-    if (area > 4) {
       points = [];
-      cursor = undefined;
+      cursor = null;
     
       dispatch('create', shape);
-    }
   }
 
   const stopDrawing = () => {
@@ -153,7 +126,7 @@
     }
 
     points = [];
-    cursor = undefined;
+    cursor = null;
   
     dispatch('create', shape);
   }
@@ -166,7 +139,10 @@
   });
 </script>
 
-<g class="a9s-annotation a9s-rubberband">
+<g 
+  bind:this={container}
+  class="a9s-annotation a9s-rubberband">
+
   {#if cursor}
     {@const coords = (isClosable ? points : [...points, cursor]).map(xy => xy.join(',')).join(' ')}
       <polygon 

package/src/annotation/tools/rectangle/RubberbandRectangle.svelte

@@ -1,4 +1,4 @@
-<script lang="ts">
+<script type="ts">
   import { createEventDispatcher, onMount } from 'svelte';
   import type { DrawingMode } from '../../../AnnotoriousOpts';
   import { ShapeType, type Rectangle } from '../../../model';
@@ -10,18 +10,18 @@
   export let addEventListener: (type: string, fn: EventListener, capture?: boolean) => void;
   export let drawingMode: DrawingMode;
   export let transform: Transform;
+  
+  let container: SVGGElement;
 
   let lastPointerDown: number;
 
-  let origin: [x: number, y: number] | undefined; 
+  let origin: [x: number, y: number]; 
 
-  let anchor: [number, number] | undefined;
+  let anchor: [number, number];
 
   let x: number, y: number, w: number, h: number;
 
-  const onPointerDown = (event: Event) => {
-    const evt = event as PointerEvent;
-
+  const onPointerDown = (evt: PointerEvent) => {
     lastPointerDown = performance.now();
 
     if (drawingMode === 'drag') {
@@ -35,9 +35,7 @@
     }
   }
 
-  const onPointerMove = (event: Event) => {
-    const evt = event as PointerEvent;
-
+  const onPointerMove = (evt: PointerEvent) => {
     if (origin) {
       anchor = transform.elementToImage(evt.offsetX, evt.offsetY);
 
@@ -48,9 +46,7 @@
     }
   }
     
-  const onPointerUp = (event: Event) => {
-    const evt = event as PointerEvent;
-
+  const onPointerUp = (evt: PointerEvent) => {
     const timeDifference = performance.now() - lastPointerDown;
 
     if (drawingMode === 'click') {
@@ -77,8 +73,8 @@
         evt.stopPropagation();
         stopDrawing();
       } else {
-        origin = undefined;
-        anchor = undefined;
+        origin = null;
+        anchor = null;
       }
     }
   }
@@ -102,8 +98,8 @@
       dispatch('create', shape);
     }
     
-    origin = undefined;
-    anchor = undefined;
+    origin = null;
+    anchor = null;
   }
 
   onMount(() => {
@@ -113,7 +109,10 @@
   });
 </script>
 
-<g class="a9s-annotation a9s-rubberband">
+<g 
+  bind:this={container}
+  class="a9s-annotation a9s-rubberband">
+  
   {#if origin}
     <rect
       class="a9s-outer"

package/src/annotation/utils/responsive.ts

@@ -42,7 +42,7 @@ export const enableResponsive = (image: HTMLImageElement | HTMLCanvasElement, sv
       set(scale);
     });
   
-    resizeObserver.observe(svg.parentElement!);
+    resizeObserver.observe(svg.parentElement);
   }
 
   const destroy = () => {

package/src/annotation/utils/touch.ts

@@ -1,4 +1 @@
-export const isTouch = 'ontouchstart' in window 
-  || navigator.maxTouchPoints > 0
-  // @ts-ignore
-  || navigator.msMaxTouchPoints > 0;
+export const isTouch = 'ontouchstart' in window || navigator.maxTouchPoints > 0;

package/src/index.ts

@@ -5,33 +5,16 @@ export * from './themes';
 export * from './annotation/tools';
 export * from './Annotorious';
 export * from './AnnotoriousOpts';
-export * from './keyboardCommands';
 
-// Essential re-exports from @annotorious/core
-export type {
-  Annotation,
-  AnnotationBody,
-  AnnotationTarget,
-  Annotator,
-  AnnotatorState,
-  Appearance,
-  AppearanceProvider,
-  Color,
-  DrawingStyle,
-  Filter,
-  FormatAdapter,
+// Re-export essentials from @annotorious/core utilities for convenience
+export * from '@annotorious/core/src/model';
+export * from '@annotorious/core/src/presence';
+export * from '@annotorious/core/src/utils';
+
+export type { 
   HoverState,
-  LifecycleEvents,
-  ParseResult,
-  PresentUser,
-  Purpose,
   Selection,
   SelectionState,
   Store,
-  StoreChangeEvent,
-  StoreObserver,
-  User,
-  W3CAnnotation,
-  W3CAnnotationBody,
-  W3CAnnotationTarget
-} from '@annotorious/core';
+  StoreObserver
+} from '@annotorious/core/src/state';