@annotorious/core 3.0.0-rc.3 → 3.0.0-rc.31

package/src/presence/AppearanceProvider.ts

@@ -1,53 +0,0 @@
-import type { User } from '../model';
-import type { Appearance } from './Appearance';
-import type { PresentUser } from './PresentUser';
-import { DEFAULT_PALETTE } from './ColorPalette';
-
-export interface AppearanceProvider {
-
-  addUser(presenceKey: string, user: User): Appearance;
-
-  removeUser(user: PresentUser): void;
-
-}
-
-export const defaultColorProvider = () => {
-
-  const unassignedColors = [...DEFAULT_PALETTE];
-
-  const assignRandomColor = () => {
-    const rnd = Math.floor(Math.random() * unassignedColors.length);
-    const color = unassignedColors[rnd];
-
-    unassignedColors.splice(rnd, 1);
-
-    return color;
-  }
-
-  const releaseColor = (color: string) =>
-    unassignedColors.push(color);
-
-  return { assignRandomColor, releaseColor };
-
-}
-
-export const createDefaultAppearenceProvider = () => {
-
-  const colorProvider = defaultColorProvider();
-
-  const addUser = (presenceKey: string, user: User): Appearance => {
-    const color = colorProvider.assignRandomColor();
-
-    return {
-      label: user.name || user.id,
-      avatar: user.avatar,
-      color
-    };
-  }
-
-  const removeUser = (user: PresentUser) =>
-    colorProvider.releaseColor(user.appearance.color);
-
-  return { addUser, removeUser }
-  
-}

package/src/presence/ColorPalette.ts

@@ -1,14 +0,0 @@
-// SEABORN_BRIGHT
-export const DEFAULT_PALETTE: Palette = [
-  '#ff7c00', // orange
-  '#1ac938', // green
-  '#e8000b', // red
-  '#8b2be2', // purple
-  '#9f4800', // brown
-  '#f14cc1', // pink
-  '#ffc400', // khaki
-  '#00d7ff', // cyan
-  '#023eff'  // blue
-];
-
-export type Palette = string[];

package/src/presence/PresenceEvents.ts

@@ -1,9 +0,0 @@
-import type { PresentUser } from './PresentUser';
-
-export interface PresenceEvents {
-
-  presence: (users: PresentUser[]) => void;
-
-  selectionChange: (from: PresentUser, selection: string[] | null) => void;
-
-}

package/src/presence/PresenceProvider.ts

@@ -1,7 +0,0 @@
-import type { PresenceEvents } from './PresenceEvents';
-
-export interface PresenceProvider {
-
-  on<E extends keyof PresenceEvents>(event: E, callback: PresenceEvents[E]): void;
-
-}

package/src/presence/PresenceState.ts

@@ -1,145 +0,0 @@
-import { nanoid } from 'nanoid';
-import { createNanoEvents, type Unsubscribe } from 'nanoevents';
-import type { User } from '../model';
-import type { PresentUser } from './PresentUser';
-import type { PresenceEvents } from './PresenceEvents';
-import { createDefaultAppearenceProvider } from './AppearanceProvider';
-import type { AppearanceProvider } from './AppearanceProvider';
-
-export interface PresenceState {
-
-  // Get users currently present to this room
-  getPresentUsers(): PresentUser[];
-
-  // Notify of a given present user's activity on the given annotations
-  notifyActivity(presenceKey: string, annotationIds: string[]): void;
-
-  // Add a listener for the given presence event
-  on<E extends keyof PresenceEvents>(event: E, callback: PresenceEvents[E]): Unsubscribe;
-
-  // Initial sync - which users are present under which keys
-  syncUsers(state: { presenceKey: string, user: User }[]): void;
-
-  // Update the selection state for the given prresent user
-  updateSelection(presenceKey: string, selection: string[] | null): void;
-
-}
-
-const isListEqual = (listA: any[], listB: any[]) => 
-  listA.every(a => listA.includes(a)) && listB.every(b => listA.includes(b));
-
-// This client's presence key
-export const PRESENCE_KEY = nanoid();
-
-export const createPresenceState = (
-  appearanceProvider: AppearanceProvider = createDefaultAppearenceProvider()
-): PresenceState => {
-
-  const emitter = createNanoEvents<PresenceEvents>();
-
-  const presentUsers = new Map<string, PresentUser>();
-
-  const selectionStates = new Map<string, string[]>();
-
-  const addUser = (presenceKey: string, user: User) => {
-    if (presentUsers.has(presenceKey)) {
-      console.warn('Attempt to add user that is already present', presenceKey, user);
-      return;    
-    }
-
-    const appearance = appearanceProvider.addUser(presenceKey, user);
-
-    presentUsers.set(presenceKey, { 
-      ...user,
-      presenceKey,
-      appearance
-    });
-  }
-
-  const removeUser = (presenceKey: string) => {
-    const user = presentUsers.get(presenceKey);
-    if (!user) {
-      console.warn('Attempt to remove user that is not present', presenceKey);
-      return;
-    }
-
-    appearanceProvider.removeUser(user);
-
-    presentUsers.delete(presenceKey);
-  }
-
-  const syncUsers = (state: { presenceKey: string, user: User }[]) => {
-    // const keys = new Set(others.map(s => s.presenceKey));
-    const keys = new Set(state.map(s => s.presenceKey));
-
-    // These users need to be added to the presentUsers list
-    // const toAdd = others.filter(({ presenceKey }) => !presentUsers.has(presenceKey));
-    const toAdd = state.filter(({ presenceKey }) => !presentUsers.has(presenceKey));
-
-    // These users need to be dropped from the list
-    const toRemove = Array.from(presentUsers.values()).filter(presentUser =>
-      !keys.has(presentUser.presenceKey));
-
-    toAdd.forEach(({ presenceKey, user }) => addUser(presenceKey, user));
-
-    toRemove.forEach(user => {
-      const { presenceKey } = user;
-
-      // If this user has a selection, fire deselect event
-      if (selectionStates.has(presenceKey))
-        emitter.emit('selectionChange', user, null);
-
-      removeUser(presenceKey)
-    });
-
-    if (toAdd.length > 0 || toRemove.length > 0)
-      emitter.emit('presence', getPresentUsers());
-  }
-
-  const notifyActivity = (presenceKey: string, annotationIds: string[]) => {    
-    const user = presentUsers.get(presenceKey);
-    
-    if (!user) {
-      console.warn('Activity notification from user that is not present');
-      return;
-    }
-
-    const currentSelection = selectionStates.get(presenceKey);
-
-    // Was there a selection change we might have missed?
-    if (!currentSelection || !isListEqual(currentSelection, annotationIds)) {
-      selectionStates.set(presenceKey, annotationIds);
-      emitter.emit('selectionChange', user, annotationIds);
-    }
-  }
-
-  const updateSelection = (presenceKey: string, selection: string[] | null) => {
-    const from = presentUsers.get(presenceKey);
-    if (!from) {
-      console.warn('Selection change for user that is not present', presenceKey);
-      return;
-    }
-
-    if (selection)
-      selectionStates.set(presenceKey, selection);
-    else 
-      selectionStates.delete(presenceKey);
-
-    emitter.emit('selectionChange', from, selection);
-  }
-
-  const getPresentUsers = () =>
-    [...Array.from(presentUsers.values())];
-    
-  const on = <E extends keyof PresenceEvents>(event: E, callback: PresenceEvents[E]) =>
-    emitter.on(event, callback);
-
-  return {
-    getPresentUsers,
-    notifyActivity,
-    on,
-    syncUsers,
-    updateSelection
-  }
-
-}

package/src/presence/PresentUser.ts

@@ -1,10 +0,0 @@
-import type { User } from '../model';
-import type { Appearance } from './Appearance';
-
-export interface PresentUser extends User {
-
-  presenceKey: string;
-
-  appearance: Appearance
-
-}

package/src/state/Hover.ts

@@ -1,34 +0,0 @@
-import { writable } from 'svelte/store';
-import type { Annotation } from '../model';
-import type { Store } from './Store';
-
-export type HoverState<T extends Annotation> = ReturnType<typeof createHoverState<T>>;
-
-export const createHoverState = <T extends Annotation>(store: Store<T>) => {
-
-  const { subscribe, set } = writable<string>(null);
-
-  let currentHover: string = null;
-
-  subscribe(updated => currentHover = updated);
-
-  // Track store delete and update events
-  store.observe(( { changes }) => {    
-    if (currentHover) {
-      const isDeleted = changes.deleted.some(a => a.id === currentHover);
-      if (isDeleted)
-        set(null);
-    
-      const updated = changes.updated.find(({ oldValue }) => oldValue.id === currentHover);
-      if (updated)
-        set(updated.newValue.id);
-    }
-  });
-
-  return { 
-    get current() { return currentHover },
-    subscribe, 
-    set 
-  };
-
-}

package/src/state/Selection.ts

@@ -1,113 +0,0 @@
-import { writable } from 'svelte/store';
-import type {  Annotation } from '../model';
-import type { Store } from './Store';
-   
-export type Selection = {
-
-  selected: { id: string, editable?: boolean }[],
-
-  pointerEvent?: PointerEvent;
-
-}
-
-export type SelectionState<T extends Annotation> = ReturnType<typeof createSelectionState<T>>;
-
-export enum PointerSelectAction {
-
-  EDIT = 'EDIT', // Make annotation target(s) editable on pointer select
-  
-  SELECT = 'SELECT',  // Just select, but don't make editable
-
-  NONE = 'NONE' // Click won't select - annotation is completely inert
-
-}
-
-const EMPTY: Selection = { selected: [] };
-
-export const createSelectionState = <T extends Annotation>(
-  store: Store<T>,
-  selectAction: PointerSelectAction | ((a: Annotation) => PointerSelectAction) = PointerSelectAction.EDIT
-) => {
-  const { subscribe, set } = writable<Selection>(EMPTY);
-
-  let currentSelection: Selection = EMPTY;
-
-  subscribe(updated => currentSelection = updated);
-
-  const clear = () => set(EMPTY);
-
-  const isEmpty = () => currentSelection.selected?.length === 0;
-
-  const isSelected = (annotationOrId: T | string) => {
-    if (currentSelection.selected.length === 0)
-      return false;
-
-    const id = typeof annotationOrId === 'string' ? annotationOrId : annotationOrId.id;
-    return currentSelection.selected.some(i => i.id === id);
-  }
-
-  // TODO enable CTRL select
-  const clickSelect = (id: string, pointerEvent: PointerEvent) => {
-    const annotation = store.getAnnotation(id);
-    if (annotation) {
-      const action = onPointerSelect(annotation, selectAction);
-      if (action === PointerSelectAction.EDIT)
-        set({ selected: [{ id, editable: true }], pointerEvent }); 
-      else if (action === PointerSelectAction.SELECT)
-        set({ selected: [{ id }], pointerEvent }); 
-      else
-        set({ selected: [], pointerEvent });
-    } else {
-      console.warn('Invalid selection: ' + id);
-    }
-  }
-
-  const setSelected = (idOrIds: string | string[], editable: boolean = true) => {
-    const ids = Array.isArray(idOrIds) ? idOrIds : [idOrIds];
-
-    // Remove invalid
-    const annotations = 
-      ids.map(id => store.getAnnotation(id)).filter(a => a); 
-
-    set({ selected: annotations.map(({ id }) => ({ id, editable })) });
-    
-    if (annotations.length !== ids.length)
-      console.warn('Invalid selection', idOrIds);
-  }
-
-  const removeFromSelection = (ids: string[]) => {
-    if (currentSelection.selected.length === 0)
-      return false;
-
-    const { selected } = currentSelection;
-
-    // Checks which of the given annotations are actually in the selection
-    const toRemove = selected.filter(({ id  }) => ids.includes(id))
-
-    if (toRemove.length > 0)
-      set({ selected: selected.filter(({ id }) => !ids.includes(id)) });
-  }
-
-  // Track store delete and update events
-  store.observe(({ changes }) =>
-    removeFromSelection(changes.deleted.map(a => a.id)));
-
-  return { 
-    clear, 
-    clickSelect, 
-    get selected() { return currentSelection ? [...currentSelection.selected ] : null},
-    get pointerEvent() { return currentSelection ? currentSelection.pointerEvent : null },
-    isEmpty, 
-    isSelected, 
-    setSelected, 
-    subscribe 
-  };
-
-}
-
-export const onPointerSelect = (
-  annotation: Annotation, 
-  action?: PointerSelectAction | ((a: Annotation) => PointerSelectAction)
-): PointerSelectAction => (typeof action === 'function') ?
-    (action(annotation) || PointerSelectAction.EDIT) : 
-    (action || PointerSelectAction.EDIT);