@annotorious/core 3.0.0-pre-alpha-53 → 3.0.0-pre-alpha-54

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@annotorious/core",
-  "version": "3.0.0-pre-alpha-53",
+  "version": "3.0.0-pre-alpha-54",
   "description": "Annotorious core types and functions",
   "author": "Rainer Simon",
   "license": "BSD-3-Clause",

package/src/model/Annotator.ts

@@ -3,8 +3,8 @@ import type { User } from './User';
 import type { PresenceProvider } from '../presence';
 import { Origin, type HoverState, type SelectionState, type Store, type ViewportState } from '../state';
 import type { LifecycleEvents } from '../lifecycle';
-import type { Formatter } from './Formatter';
 import { parseAll, type FormatAdapter } from './FormatAdapter';
+import type { DrawingStyle } from './DrawingStyle';
 
 /**
  * Base annotator interface.
@@ -13,6 +13,8 @@ import { parseAll, type FormatAdapter } from './FormatAdapter';
  */
 export interface Annotator<I extends Annotation = Annotation, E extends unknown = Annotation> {
 
+  style: DrawingStyle | ((annotation: I) => DrawingStyle) | undefined;
+
   addAnnotation(annotation: E): void;
 
   clearAnnotations(): void;
@@ -31,8 +33,6 @@ export interface Annotator<I extends Annotation = Annotation, E extends unknown
 
   setAnnotations(annotations: E[]): void;
 
-  setFormatter(formatter: Formatter): void;
-
   setPresenceProvider?(provider: PresenceProvider): void;
 
   setSelected(arg?: string | string[]): void;

package/src/model/{Formatter.ts → DrawingStyle.ts}

@@ -1,5 +1,3 @@
-import type { Annotation } from './Annotation';
-
 type RGB = `rgb(${number}, ${number}, ${number})`;
 
 type RGBA = `rgba(${number}, ${number}, ${number}, ${number})`;
@@ -14,6 +12,4 @@ export interface DrawingStyle {
 
   fillOpacity?: number;
 
-}
-
-export type Formatter = <T extends Annotation = Annotation>(annotation: T, isSelected?: boolean) => DrawingStyle;
+}

package/src/model/index.ts

@@ -1,6 +1,6 @@
 export * from './Annotation';
 export * from './Annotator';
+export * from './DrawingStyle';
 export * from './FormatAdapter';
-export * from './Formatter';
 export * from './User';
 export * from './W3CAnnotation';