@svar-ui/calendar-store 2.6.0 → 2.7.0

package/dist/index.d.mts

@@ -6,6 +6,7 @@ interface EventChunk {
   event: CalendarEvent;
   start: Date;
   end: Date;
+  unitIndex?: number;
 }
 declare abstract class ViewModel {
   render?: string;
@@ -22,6 +23,7 @@ declare abstract class ViewModel {
   abstract getRangeLabel(): string;
   setRange(date: Date): [Date, Date];
   process(events: CalendarEvent[]): SectionResult[];
+  projectEvent(event: Partial<CalendarEvent>): ProjectedEvent[];
   toPositionStart(sectionName: string, x: number, y: number, ev?: Partial<CalendarEvent>, snap?: boolean): Partial<CalendarEvent>;
   toPositionEnd(sectionName: string, x: number, y: number, ev?: Partial<CalendarEvent>, snap?: boolean): Partial<CalendarEvent>;
   private resolvePosition;
@@ -29,7 +31,6 @@ declare abstract class ViewModel {
   protected buildCells(_xScale: Scale, _yScale: Scale): GridCell[];
   protected sortBeforeLayout(primitives: Primitive[], mode: string): void;
   private getPrimaryAxis;
-  private splitEvent;
   protected findUnitIndex(scale: Scale, event: CalendarEvent): number;
   private findUnitForPosition;
   protected mapToPrimitive(chunk: EventChunk, primaryUnit: {
@@ -42,12 +43,13 @@ declare abstract class ViewModel {
 declare class EventsStore implements IEventStore {
   protected events: CalendarEvent[];
   constructor(initialEvents?: CalendarEvent[]);
-  addEvent(event: Partial<CalendarEvent>): CalendarEvent;
+  addEvent(event: Partial<CalendarEvent>, overwrite?: boolean): CalendarEvent;
   updateEvent(id: EventID, updates: Partial<CalendarEvent>, _mode?: "single" | "following", _originalDate?: string): CalendarEvent | null;
   removeEvent(id: EventID): boolean;
   getEvent(id: EventID): CalendarEvent | undefined;
   getEvents(start?: Date, end?: Date): CalendarEvent[];
   clear(): void;
+  restore(events: CalendarEvent[]): void;
   getCount(): number;
 }
 //#endregion
@@ -68,9 +70,23 @@ type State = {
   events: EventsStore;
   viewData: any;
   filters: Map<string, (obj: any) => boolean>;
-  editorData: CalendarEvent | null;
+  editorData: EditorData | null;
+  history: HistoryState;
   _view: ViewModel;
 };
+type RecurringEditMode = "series" | "single" | "following";
+interface EditorData {
+  id: EventID;
+  values: CalendarEvent;
+  rawId: EventID;
+  recurring: boolean;
+  recurringMode: RecurringEditMode;
+  recurringOriginalDate: string | null;
+}
+type HistoryState = {
+  undo: number;
+  redo: number;
+};
 interface StoreActions {
   ["navigate-to"]: {
     date?: Date;
@@ -83,29 +99,49 @@ interface StoreActions {
     event: Partial<CalendarEvent>;
     edit?: boolean;
     id?: EventID;
+    rawId?: EventID;
   };
   ["update-event"]: {
     id: EventID;
+    rawId?: EventID;
     event: Partial<CalendarEvent>;
     mode?: "single" | "following";
-    originalDate?: string;
   };
   ["delete-event"]: {
     id: EventID;
+    rawId?: EventID;
+    cascade?: boolean;
   };
   ["select-event"]: {
     id: EventID | null;
+    rawId?: EventID | null;
+    mode?: RecurringEditMode | null;
   };
   ["move-event"]: {
     id: EventID;
-    x: number;
-    y: number;
+    rawId?: EventID;
+    event: Partial<CalendarEvent>;
+    mode?: "single" | "following";
   };
   ["filter-events"]: {
     filter?: ((obj: any) => boolean) | null;
     tag?: string;
   };
+  ["request-data"]: RequestDataAction;
+  ["provide-data"]: ProvideDataAction;
 }
+type RequestDataAction = {
+  startDate: Date;
+  endDate: Date;
+  date: Date;
+  view: string;
+};
+type ProvideDataAction = {
+  data: {
+    events: CalendarEvent[];
+  };
+  reset?: boolean;
+};
 type EventID = string | number;
 interface CalendarEvent {
   id: EventID;
@@ -114,6 +150,10 @@ interface CalendarEvent {
   allDay?: boolean;
   [key: string]: any;
 }
+type EventProjection = {
+  htmlEvent: any;
+  event: Partial<CalendarEvent>;
+};
 interface ScaleUnit {
   id: string | number;
   label: string;
@@ -122,6 +162,13 @@ interface ScaleUnit {
   weekend?: boolean;
   ui?: Record<string, any>;
 }
+type ScaleValue = Date | string | number | ScaleValue[];
+interface ScaleSegment {
+  start: Date;
+  end: Date;
+  unitIndex: number;
+  sourceUnitId?: EventID;
+}
 interface Scale {
   units: ScaleUnit[];
   eventToPosition(event: CalendarEvent): {
@@ -131,7 +178,10 @@ interface Scale {
   contains(date: Date): boolean;
   readonly count: number;
   getHeaders(): ScaleUnit[][];
-  positionToValue(position: number): Date | string | number;
+  positionToValue(position: number): ScaleValue;
+  segmentEvent(event: CalendarEvent): ScaleSegment[];
+  getUnitStart(unitIndex: number): Date | null;
+  applyPosition(position: number, target: "start" | "end", event?: Partial<CalendarEvent>, snap?: boolean): Partial<CalendarEvent>;
 }
 interface DateScaleConfig {
   type: "date";
@@ -167,8 +217,9 @@ interface UnitScaleConfig {
     id: string | number;
     label: string;
   }[];
+  multiple?: boolean;
   accessor: string | {
-    get: (event: CalendarEvent) => string | number;
+    get: (event: CalendarEvent) => string | number | (string | number)[];
     set: (event: Partial<CalendarEvent>, id: string | number) => Partial<CalendarEvent>;
   };
   visible?: boolean;
@@ -199,6 +250,11 @@ interface Primitive {
   slot?: number;
   maxConcurrency?: number;
 }
+interface ProjectedEvent {
+  section: string;
+  mode: SectionMode;
+  primitives: Primitive[];
+}
 interface GridCell {
   date: Date;
   day: number;
@@ -212,6 +268,19 @@ interface GridCell {
 }
 type SectionMode = "bars" | "boxes" | "grid" | "list" | "year";
 type BoxLayoutMode = "split" | "overlap";
+type EventOverflowMode = "more" | "expand";
+interface SectionUI {
+  [key: string]: any;
+  drag?: boolean;
+  dragCreate?: boolean;
+  clipDrag?: boolean;
+  boxLayout?: BoxLayoutMode;
+  eventOverflow?: EventOverflowMode;
+  columns?: number;
+  weekStartDay?: number;
+  months?: any[];
+  nowLine?: boolean;
+}
 interface Section {
   name: string;
   mode: SectionMode;
@@ -221,7 +290,7 @@ interface Section {
   boxLayout?: BoxLayoutMode;
   filter?: (event: CalendarEvent) => boolean;
   size?: number | "content" | "content-optional";
-  ui?: Record<string, any>;
+  ui?: SectionUI;
 }
 interface SectionResult {
   name: string;
@@ -233,7 +302,7 @@ interface SectionResult {
   xVisible?: boolean;
   yVisible?: boolean;
   cells?: GridCell[];
-  ui?: Record<string, any>;
+  ui?: SectionUI;
 }
 interface CellContext {
   view: string;
@@ -262,7 +331,7 @@ interface IEventStore {
   getCount(): number;
 }
 //#endregion
-//#region src/models/helpers/scales.d.ts
+//#region src/models/helpers/linear_scale.d.ts
 declare class LinearScale implements Scale {
   rangeStart: Date;
   rangeEnd: Date;
@@ -280,8 +349,13 @@ declare class LinearScale implements Scale {
   };
   contains(date: Date): boolean;
   positionToValue(position: number): Date;
+  segmentEvent(event: CalendarEvent): ScaleSegment[];
+  getUnitStart(unitIndex: number): Date | null;
+  applyPosition(position: number, target: "start" | "end", event?: Partial<CalendarEvent>, snap?: boolean): Partial<CalendarEvent>;
   getHeaders(): ScaleUnit[][];
 }
+//#endregion
+//#region src/models/helpers/discrete_scale.d.ts
 declare class DiscreteScale implements Scale {
   items: {
     id: string | number;
@@ -293,13 +367,15 @@ declare class DiscreteScale implements Scale {
   };
   boxSize: number;
   units: ScaleUnit[];
+  multiple: boolean;
+  private readValue;
   constructor(items: {
     id: string | number;
     label: string;
   }[], accessor: {
-    get: (event: CalendarEvent) => string | number;
+    get: (event: CalendarEvent) => string | number | (string | number)[];
     set: (event: Partial<CalendarEvent>, id: string | number) => Partial<CalendarEvent>;
-  }, ui?: Record<string, any>);
+  }, ui?: Record<string, any>, multiple?: boolean);
   get count(): number;
   eventToPosition(event: CalendarEvent): {
     start: number;
@@ -307,8 +383,34 @@ declare class DiscreteScale implements Scale {
   };
   contains(): boolean;
   positionToValue(position: number): string | number;
+  segmentEvent(event: CalendarEvent): ScaleSegment[];
+  getUnitStart(): Date | null;
+  applyPosition(position: number, _target: "start" | "end", event?: Partial<CalendarEvent>): Partial<CalendarEvent>;
+  getHeaders(): ScaleUnit[][];
+}
+//#endregion
+//#region src/models/helpers/combined_scale.d.ts
+declare class CombinedScale implements Scale {
+  outer: Scale;
+  inner: Scale;
+  units: ScaleUnit[];
+  private headers;
+  private leaves;
+  constructor(outer: Scale, inner: Scale);
+  get count(): number;
+  eventToPosition(event: CalendarEvent): {
+    start: number;
+    end: number;
+  };
+  contains(date: Date): boolean;
   getHeaders(): ScaleUnit[][];
+  positionToValue(position: number): ScaleValue[];
+  segmentEvent(event: CalendarEvent): ScaleSegment[];
+  getUnitStart(unitIndex: number): Date | null;
+  applyPosition(position: number, target: "start" | "end", event?: Partial<CalendarEvent>, snap?: boolean): Partial<CalendarEvent>;
 }
+//#endregion
+//#region src/models/helpers/scales.d.ts
 declare function createScale(config: ScaleConfig, startDate: Date, fmt?: FormatFactory): Scale;
 //#endregion
 //#region src/models/helpers/layout.d.ts
@@ -325,6 +427,21 @@ declare function layoutBoxes(primitives: Primitive[]): BoxLayoutResult;
 //#region src/models/helpers/filters.d.ts
 declare function isMultiDay(event: CalendarEvent): boolean;
 //#endregion
+//#region src/helpers/ids.d.ts
+interface DecodedEventId {
+  id: EventID;
+  index?: number;
+  unitId?: EventID;
+  eventDate?: string;
+}
+interface EventIdDetails {
+  index?: number | null;
+  unitId?: EventID | null;
+  eventDate?: string | null;
+}
+declare function decodeId(value: EventID): DecodedEventId;
+declare function encodeId(value: EventID, details: EventIdDetails): EventID;
+//#endregion
 //#region src/models/week_view.d.ts
 declare class WeekViewModel extends ViewModel {
   getSections(): Section[];
@@ -384,11 +501,14 @@ type ToolbarItem = {
   }[];
   [key: string]: any;
 };
-declare function getToolbarItems(): ToolbarItem[];
+declare function getToolbarItems(config?: {
+  history?: boolean;
+}): ToolbarItem[];
 //#endregion
 //#region src/calendar_store.d.ts
 declare class CalendarStore extends Store<State> {
   in: EventBus<StoreActions, keyof StoreActions>;
+  meta: Record<string, any>;
   private _router;
   private _views;
   private _weekStartDay;
@@ -400,6 +520,7 @@ declare class CalendarStore extends Store<State> {
   });
   configureViews(views?: ViewConfig[]): void;
   init(state: Partial<State>): void;
+  postInit(): void;
   private applyViewConfig;
   getView(name: string): any;
   getEvents(start?: Date, end?: Date): CalendarEvent[];
@@ -413,4 +534,4 @@ declare class CalendarStore extends Store<State> {
 //#region src/index.d.ts
 declare const version: string;
 //#endregion
-export { type Brandmark, type CalendarEvent, CalendarStore, type CellContext, type CellCss, type CombinedScaleConfig, type DateScaleConfig, DayViewModel, DiscreteScale, type EventContentMode, type EventContext, type EventCss, type EventID, EventsStore, type FormatFactory, type GridCell, type IEventStore, LinearScale, MonthViewModel, type Primitive, type Scale, type ScaleConfig, type ScaleUnit, type Section, type SectionMode, type SectionResult, type StackedScaleConfig, type State, type StoreActions, type TimeScaleConfig, type ToolbarItem, type UnitScaleConfig, type ViewConfig, ViewModel, WeekViewModel, createScale, getMenuOptions, getToolbarItems, isMultiDay, layoutBars, layoutBoxes, registerCalendarView, version };
+export { type Brandmark, type CalendarEvent, CalendarStore, type CellContext, type CellCss, CombinedScale, type CombinedScaleConfig, type DateScaleConfig, DayViewModel, type DecodedEventId, DiscreteScale, type EditorData, type EventContentMode, type EventContext, type EventCss, type EventID, type EventIdDetails, type EventOverflowMode, type EventProjection, EventsStore, type FormatFactory, type GridCell, type IEventStore, LinearScale, MonthViewModel, type Primitive, type ProjectedEvent, type ProvideDataAction, type RecurringEditMode, type RequestDataAction, type Scale, type ScaleConfig, type ScaleSegment, type ScaleUnit, type ScaleValue, type Section, type SectionMode, type SectionResult, type SectionUI, type StackedScaleConfig, type State, type StoreActions, type TimeScaleConfig, type ToolbarItem, type UnitScaleConfig, type ViewConfig, ViewModel, WeekViewModel, createScale, decodeId, encodeId, getMenuOptions, getToolbarItems, isMultiDay, layoutBars, layoutBoxes, registerCalendarView, version };

package/dist/index.mjs

@@ -1,7 +1,7 @@
 import { DataRouter, EventBus, Store, tempID } from "@svar-ui/lib-state";
 
 //#region package.json
-var version$1 = "2.6.0";
+var version$1 = "2.7.0";
 
 //#endregion
 //#region src/events_store.ts
@@ -10,12 +10,19 @@ var EventsStore = class {
 	constructor(initialEvents) {
 		if (initialEvents) for (const ev of initialEvents) this.addEvent(ev);
 	}
-	addEvent(event) {
-		const id = event.id ?? tempID();
-		const full = {
+	addEvent(event, overwrite) {
+		let full = event;
+		if (!event.id) full = {
 			...event,
-			id
+			id: tempID()
 		};
+		if (overwrite) {
+			const idx = this.events.findIndex((e) => e.id === full.id);
+			if (idx !== -1) {
+				this.events[idx] = full;
+				return full;
+			}
+		}
 		this.events.push(full);
 		return full;
 	}
@@ -51,19 +58,16 @@ var EventsStore = class {
 	clear() {
 		this.events = [];
 	}
+	restore(events) {
+		this.events = [...events];
+	}
 	getCount() {
 		return this.events.length;
 	}
 };
 
 //#endregion
-//#region src/models/helpers/scales.ts
-const DAY_MS$1 = 1440 * 60 * 1e3;
-function midnight(date) {
-	const d = new Date(date);
-	d.setHours(0, 0, 0, 0);
-	return d;
-}
+//#region src/models/helpers/linear_scale.ts
 var LinearScale = class {
 	rangeStart;
 	rangeEnd;
@@ -81,8 +85,8 @@ var LinearScale = class {
 		this.discrete = discrete ?? false;
 		const size = 100 / unitCount;
 		this.units = [];
-		const stepDays = stepMs >= DAY_MS$1 ? Math.round(stepMs / DAY_MS$1) : 0;
-		const markWeekend = stepMs === DAY_MS$1 && unitCount > 1;
+		const stepDays = stepMs >= 864e5 ? Math.round(stepMs / DAY_MS) : 0;
+		const markWeekend = stepMs === 864e5 && unitCount > 1;
 		for (let i = 0; i < unitCount; i++) {
 			let unitStart;
 			if (stepDays > 0) {
@@ -107,7 +111,7 @@ var LinearScale = class {
 		}
 	}
 	formatId(date) {
-		if (this.stepMs >= DAY_MS$1) return date.toISOString().slice(0, 10);
+		if (this.stepMs >= 864e5) return date.toISOString().slice(0, 10);
 		return `${String(date.getHours()).padStart(2, "0")}:${String(date.getMinutes()).padStart(2, "0")}`;
 	}
 	get count() {
@@ -132,18 +136,71 @@ var LinearScale = class {
 		const range = this.rangeEnd.getTime() - this.rangeStart.getTime();
 		return new Date(this.rangeStart.getTime() + position / 100 * range);
 	}
+	segmentEvent(event) {
+		const segments = [];
+		const units = this.units;
+		let i = 0;
+		while (i < units.length && units[i].ui.date <= event.start) i++;
+		if (i > 0) i--;
+		for (; i < units.length; i++) {
+			const start = units[i].ui.date;
+			if (start >= event.end) break;
+			const next = units[i + 1];
+			const end = next ? next.ui.date : this.rangeEnd;
+			const chunkStart = event.start > start ? event.start : start;
+			const chunkEnd = event.end < end ? event.end : end;
+			if (chunkEnd > chunkStart) segments.push({
+				start: new Date(chunkStart),
+				end: new Date(chunkEnd),
+				unitIndex: i
+			});
+		}
+		return segments;
+	}
+	getUnitStart(unitIndex) {
+		const unit = this.units[unitIndex];
+		return unit?.ui?.date instanceof Date ? new Date(unit.ui.date) : null;
+	}
+	applyPosition(position, target, event, snap) {
+		let value = this.positionToValue(position);
+		if (snap && this.snapStepMs !== false) {
+			const base = this.rangeStart.getTime();
+			value = new Date(base + Math.round((value.getTime() - base) / this.snapStepMs) * this.snapStepMs);
+		}
+		if (this.stepMs >= 864e5) {
+			const source = event?.[target];
+			if (source instanceof Date) value.setHours(source.getHours(), source.getMinutes(), source.getSeconds(), source.getMilliseconds());
+		}
+		return {
+			...event,
+			[target]: value
+		};
+	}
 	getHeaders() {
 		return [this.units];
 	}
 };
+
+//#endregion
+//#region src/models/helpers/discrete_scale.ts
 var DiscreteScale = class {
 	items;
 	accessor;
 	boxSize;
 	units;
-	constructor(items, accessor, ui) {
+	multiple;
+	readValue;
+	constructor(items, accessor, ui, multiple) {
 		this.items = items;
-		this.accessor = accessor;
+		this.multiple = multiple ?? false;
+		this.readValue = accessor.get;
+		this.accessor = {
+			...accessor,
+			get: (event) => {
+				const value = accessor.get(event);
+				return Array.isArray(value) ? value[0] : value;
+			}
+		};
 		this.boxSize = 100 / items.length;
 		this.units = items.map((item, i) => ({
 			id: item.id,
@@ -175,10 +232,150 @@ var DiscreteScale = class {
 		const idx = Math.max(0, Math.min(Math.floor(position / this.boxSize), this.items.length - 1));
 		return this.items[idx].id;
 	}
+	segmentEvent(event) {
+		if (!this.multiple && this.items.length === 1) return [{
+			start: event.start,
+			end: event.end,
+			unitIndex: 0
+		}];
+		const raw = this.readValue(event);
+		if (!raw) return [];
+		return (Array.isArray(raw) ? raw : [raw]).map((value) => this.items.findIndex((item) => item.id === value)).filter((index) => index !== -1).map((unitIndex) => ({
+			start: event.start,
+			end: event.end,
+			unitIndex,
+			...this.multiple ? { sourceUnitId: this.items[unitIndex].id } : {}
+		}));
+	}
+	getUnitStart() {
+		return null;
+	}
+	applyPosition(position, _target, event) {
+		return this.accessor.set(event ?? {}, this.positionToValue(position));
+	}
 	getHeaders() {
 		return [this.units];
 	}
 };
+
+//#endregion
+//#region src/models/helpers/combined_scale.ts
+function compositeId(outer, inner) {
+	return outer.id + "#" + inner.id;
+}
+function combineUnit(outer, inner, position, size) {
+	return {
+		id: compositeId(outer, inner),
+		label: inner.label,
+		position,
+		size,
+		weekend: inner.weekend ?? outer.weekend,
+		ui: {
+			...outer.ui,
+			...inner.ui,
+			combined: {
+				outer,
+				inner
+			}
+		}
+	};
+}
+function findUnitForPosition(units, position) {
+	for (let i = units.length - 1; i >= 0; i--) if (position >= units[i].position - .001) return i;
+	return 0;
+}
+var CombinedScale = class {
+	outer;
+	inner;
+	units;
+	headers;
+	leaves;
+	constructor(outer, inner) {
+		this.outer = outer;
+		this.inner = inner;
+		this.leaves = [];
+		const innerHeaders = inner.getHeaders();
+		this.headers = [...outer.getHeaders()];
+		for (const level of innerHeaders) {
+			const repeated = [];
+			for (let oi = 0; oi < outer.units.length; oi++) {
+				const outerUnit = outer.units[oi];
+				for (const innerUnit of level) repeated.push(combineUnit(outerUnit, innerUnit, outerUnit.position + innerUnit.position / 100 * outerUnit.size, innerUnit.size / 100 * outerUnit.size));
+			}
+			this.headers.push(repeated);
+		}
+		this.units = this.headers[this.headers.length - 1] ?? [];
+		for (let oi = 0; oi < outer.count; oi++) for (let ii = 0; ii < inner.count; ii++) this.leaves.push({
+			outerIndex: oi,
+			innerIndex: ii
+		});
+	}
+	get count() {
+		return this.outer.count * this.inner.count;
+	}
+	eventToPosition(event) {
+		const first = this.segmentEvent(event)[0];
+		if (!first) return {
+			start: -1,
+			end: -1
+		};
+		const unit = this.units[first.unitIndex];
+		return {
+			start: unit.position,
+			end: unit.position + unit.size
+		};
+	}
+	contains(date) {
+		return this.outer.contains(date) && this.inner.contains(date);
+	}
+	getHeaders() {
+		return this.headers;
+	}
+	positionToValue(position) {
+		const index = findUnitForPosition(this.units, position);
+		const leaf = this.leaves[index];
+		return [this.outer.positionToValue(this.outer.units[leaf.outerIndex].position), this.inner.positionToValue(this.inner.units[leaf.innerIndex].position)];
+	}
+	segmentEvent(event) {
+		const result = [];
+		for (const outerSegment of this.outer.segmentEvent(event)) {
+			const scoped = {
+				...event,
+				start: outerSegment.start,
+				end: outerSegment.end
+			};
+			for (const innerSegment of this.inner.segmentEvent(scoped)) result.push({
+				start: innerSegment.start,
+				end: innerSegment.end,
+				unitIndex: outerSegment.unitIndex * this.inner.count + innerSegment.unitIndex,
+				...innerSegment.sourceUnitId !== void 0 ? { sourceUnitId: innerSegment.sourceUnitId } : outerSegment.sourceUnitId !== void 0 ? { sourceUnitId: outerSegment.sourceUnitId } : {}
+			});
+		}
+		return result;
+	}
+	getUnitStart(unitIndex) {
+		const leaf = this.leaves[unitIndex];
+		if (!leaf) return null;
+		return this.inner.getUnitStart(leaf.innerIndex) ?? this.outer.getUnitStart(leaf.outerIndex);
+	}
+	applyPosition(position, target, event, snap) {
+		const index = findUnitForPosition(this.units, position);
+		const leaf = this.leaves[index];
+		let result = event ? { ...event } : {};
+		Object.assign(result, this.outer.applyPosition(this.outer.units[leaf.outerIndex].position, target, result, snap));
+		Object.assign(result, this.inner.applyPosition(this.inner.units[leaf.innerIndex].position, target, result, snap));
+		return result;
+	}
+};
+
+//#endregion
+//#region src/models/helpers/scales.ts
+const DAY_MS = 1440 * 60 * 1e3;
+function midnight(date) {
+	const d = new Date(date);
+	d.setHours(0, 0, 0, 0);
+	return d;
+}
 function resolveAccessor(accessor) {
 	if (typeof accessor === "string") return {
 		get: (event) => event[accessor],
@@ -189,15 +386,21 @@ function resolveAccessor(accessor) {
 	};
 	return accessor;
 }
+function countMultipleScales(config) {
+	if (config.type === "unit") return config.multiple ? 1 : 0;
+	if (config.type === "combined") return countMultipleScales(config.outer) + countMultipleScales(config.inner);
+	if (config.type === "stacked") return config.levels.reduce((count, level) => count + countMultipleScales(level), 0);
+	return 0;
+}
 function createScale(config, startDate, fmt) {
 	switch (config.type) {
 		case "date": {
 			const c = config;
 			const step = c.step ?? 1;
 			const rangeStart = midnight(startDate);
-			const rangeEnd = new Date(rangeStart.getTime() + c.length * step * DAY_MS$1);
-			const stepMs = step * DAY_MS$1;
-			const snapStepMs = c.snapStep === false ? false : (c.snapStep ?? step) * DAY_MS$1;
+			const rangeEnd = new Date(rangeStart.getTime() + c.length * step * DAY_MS);
+			const stepMs = step * DAY_MS;
+			const snapStepMs = c.snapStep === false ? false : (c.snapStep ?? step) * DAY_MS;
 			const format = c.format && fmt ? fmt(c.format) : (d) => d.toLocaleDateString("en-US", { weekday: "short" });
 			return new LinearScale(rangeStart, rangeEnd, c.length, stepMs, format, c.ui, c.discrete, snapStepMs);
 		}
@@ -220,9 +423,16 @@ function createScale(config, startDate, fmt) {
 		}
 		case "unit": {
 			const c = config;
-			return new DiscreteScale(c.items, resolveAccessor(c.accessor), c.ui);
+			return new DiscreteScale(c.items, resolveAccessor(c.accessor), c.ui, c.multiple);
+		}
+		case "combined": {
+			const c = config;
+			if (countMultipleScales(c) > 1) throw new Error("CombinedScale supports at most one unit scale with multiple: true");
+			const outer = createScale(c.outer, startDate, fmt);
+			const inner = createScale(c.inner, startDate, fmt);
+			if (outer.count === 0 || inner.count === 0) throw new Error("CombinedScale requires non-empty outer and inner scales");
+			return new CombinedScale(outer, inner);
 		}
-		case "combined":
 		case "stacked": throw new Error(`${config.type} scale not implemented`);
 		default: throw new Error(`Unknown scale type`);
 	}
@@ -308,10 +518,49 @@ function layoutBoxes(primitives) {
 function isMultiDay(event) {
 	if (event.allDay) return true;
 	const s = event.start;
-	const e = event.end;
+	let e = event.end;
+	if (e.getHours() === 0 && e.getMinutes() === 0 && e.getSeconds() === 0 && e.getMilliseconds() === 0) e = /* @__PURE__ */ new Date(e.getTime() - 1);
 	return s.getFullYear() !== e.getFullYear() || s.getMonth() !== e.getMonth() || s.getDate() !== e.getDate();
 }
 
+//#endregion
+//#region src/helpers/ids.ts
+const SEPARATOR = "#";
+function encodeValue(value) {
+	return typeof value === "string" ? `:${value}` : String(value);
+}
+function decodeValue(value) {
+	return value.startsWith(":") ? value.slice(1) : Number(value);
+}
+function setDetail(current, next) {
+	return next === void 0 ? current : next === null ? void 0 : next;
+}
+function decodeId(value) {
+	if (typeof value !== "string" || !value.includes(SEPARATOR)) return { id: value };
+	const [rawId, ...details] = value.split(SEPARATOR);
+	const id = decodeValue(rawId);
+	const [rawIndex, rawUnitId, eventDate] = details;
+	return {
+		id,
+		...rawIndex ? { index: Number(rawIndex) } : {},
+		...rawUnitId ? { unitId: decodeValue(rawUnitId) } : {},
+		...eventDate ? { eventDate } : {}
+	};
+}
+function encodeId(value, details) {
+	const decoded = decodeId(value);
+	const index = setDetail(decoded.index, details.index);
+	const unitId = setDetail(decoded.unitId, details.unitId);
+	const eventDate = setDetail(decoded.eventDate, details.eventDate);
+	if (index === void 0 && unitId === void 0 && eventDate === void 0) return decoded.id;
+	return [
+		encodeValue(decoded.id),
+		index ?? "",
+		unitId === void 0 ? "" : encodeValue(unitId),
+		eventDate ?? ""
+	].join(SEPARATOR);
+}
+
 //#endregion
 //#region src/models/model.ts
 var ViewModel = class {
@@ -344,6 +593,51 @@ var ViewModel = class {
 		}
 		return results;
 	}
+	projectEvent(event) {
+		if (!(event.start instanceof Date) || !(event.end instanceof Date) || event.end <= event.start) return [];
+		const full = {
+			...event,
+			id: event.id ?? "$event-placeholder"
+		};
+		const projections = [];
+		for (const cached of this.cachedSections) {
+			const { section, primaryScale, secondaryScales } = cached;
+			if (section.filter && !section.filter(full)) continue;
+			const primaryAxis = this.getPrimaryAxis(section);
+			const secondaryConfig = primaryAxis === "x" ? section.yScale : section.xScale;
+			const primitives = [];
+			const segments = primaryScale.segmentEvent(full);
+			for (let i = 0; i < segments.length; i++) {
+				const segment = segments[i];
+				const chunk = {
+					id: segments.length > 1 || segment.sourceUnitId !== void 0 ? encodeId(full.id, {
+						index: segments.length > 1 ? i : void 0,
+						unitId: segment.sourceUnitId
+					}) : full.id,
+					event: full,
+					start: segment.start,
+					end: segment.end,
+					unitIndex: segment.unitIndex
+				};
+				const unitIdx = chunk.unitIndex ?? this.findUnitIndex(primaryScale, full);
+				const unit = primaryScale.units[unitIdx];
+				if (!unit) continue;
+				let secondaryScale = secondaryScales.get(unitIdx);
+				if (!secondaryScale) {
+					secondaryScale = createScale(secondaryConfig, primaryScale.getUnitStart(unitIdx) ?? this.startDate, this.fmt);
+					secondaryScales.set(unitIdx, secondaryScale);
+				}
+				const primitive = this.mapToPrimitive(chunk, unit, secondaryScale, primaryAxis);
+				if (primitive) primitives.push(primitive);
+			}
+			if (primitives.length) projections.push({
+				section: section.name,
+				mode: section.mode,
+				primitives
+			});
+		}
+		return projections;
+	}
 	toPositionStart(sectionName, x, y, ev, snap) {
 		return this.resolvePosition(sectionName, x, y, "start", ev, snap);
 	}
@@ -357,56 +651,15 @@ var ViewModel = class {
 		const primaryAxis = this.getPrimaryAxis(section);
 		const primaryPos = primaryAxis === "x" ? x : y;
 		const secondaryPos = primaryAxis === "x" ? y : x;
-		const result = ev ? { ...ev } : {};
-		const primaryVal = cached.primaryScale.positionToValue(primaryPos);
 		const unitIdx = this.findUnitForPosition(cached.primaryScale, primaryPos);
-		const unit = cached.primaryScale.units[unitIdx];
 		let secScale = cached.secondaryScales.get(unitIdx);
 		if (!secScale) {
-			const secondaryConfig = primaryAxis === "x" ? section.yScale : section.xScale;
-			const groupStartVal = cached.primaryScale.positionToValue(unit.position);
-			secScale = createScale(secondaryConfig, groupStartVal instanceof Date ? groupStartVal : this.startDate);
+			secScale = createScale(primaryAxis === "x" ? section.yScale : section.xScale, cached.primaryScale.getUnitStart(unitIdx) ?? this.startDate, this.fmt);
 			cached.secondaryScales.set(unitIdx, secScale);
 		}
-		const secondaryVal = secScale.positionToValue(secondaryPos);
-		if (primaryVal instanceof Date && secondaryVal instanceof Date) {
-			const secStepMs = secScale.stepMs || 3600 * 1e3;
-			if (secStepMs >= DAY_MS) {
-				const combined = new Date(secondaryVal);
-				const src = ev?.[target];
-				if (src instanceof Date) combined.setHours(src.getHours(), src.getMinutes(), src.getSeconds(), src.getMilliseconds());
-				result[target] = combined;
-			} else {
-				const combined = new Date(primaryVal);
-				combined.setHours(secondaryVal.getHours(), secondaryVal.getMinutes(), secondaryVal.getSeconds(), secondaryVal.getMilliseconds());
-				const snapMs = secScale.snapStepMs ?? secStepMs;
-				if (snap && snapMs !== false) {
-					const ms = combined.getTime();
-					const base = secScale.rangeStart?.getTime() || 0;
-					const snapped = base + Math.round((ms - base) / snapMs) * snapMs;
-					result[target] = new Date(snapped);
-				} else result[target] = combined;
-			}
-		} else if (primaryVal instanceof Date) {
-			if (snap) {
-				const rawStep = cached.primaryScale.snapStepMs ?? cached.primaryScale.stepMs ?? DAY_MS;
-				const base = cached.primaryScale.rangeStart?.getTime();
-				if (rawStep !== false && base != null) {
-					const snapped = base + Math.round((primaryVal.getTime() - base) / rawStep) * rawStep;
-					result[target] = new Date(snapped);
-				} else result[target] = primaryVal;
-			} else result[target] = primaryVal;
-			const src = ev?.[target];
-			if (src instanceof Date) result[target].setHours(src.getHours(), src.getMinutes(), src.getSeconds(), src.getMilliseconds());
-			if (typeof secondaryVal !== "object") {
-				const acc = secScale.accessor;
-				if (acc?.set) Object.assign(result, acc.set(result, secondaryVal));
-			}
-		} else if (secondaryVal instanceof Date) {
-			result[target] = secondaryVal;
-			const acc = cached.primaryScale.accessor;
-			if (acc?.set) Object.assign(result, acc.set(result, primaryVal));
-		}
+		let result = ev ? { ...ev } : {};
+		Object.assign(result, cached.primaryScale.applyPosition(primaryPos, target, result, snap));
+		Object.assign(result, secScale.applyPosition(secondaryPos, target, result, snap));
 		return result;
 	}
 	processSection(section, events, doLayout) {
@@ -417,14 +670,27 @@ var ViewModel = class {
 		const filtered = section.filter ? events.filter(section.filter) : events;
 		const allChunks = [];
 		for (const event of filtered) {
-			const chunks = this.splitEvent(event, primaryScale, primaryConfig);
-			allChunks.push(...chunks);
+			const segments = primaryScale.segmentEvent(event);
+			for (let i = 0; i < segments.length; i++) {
+				const segment = segments[i];
+				const contextual = segments.length > 1 || segment.sourceUnitId !== void 0;
+				allChunks.push({
+					id: contextual ? encodeId(event.id, {
+						index: segments.length > 1 ? i : void 0,
+						unitId: segment.sourceUnitId
+					}) : event.id,
+					event,
+					start: segment.start,
+					end: segment.end,
+					unitIndex: segment.unitIndex
+				});
+			}
 		}
 		const secondaryScales = /* @__PURE__ */ new Map();
 		const allPrimitives = [];
 		const unitGroups = /* @__PURE__ */ new Map();
 		for (const chunk of allChunks) {
-			const unitIdx = this.findUnitIndex(primaryScale, {
+			const unitIdx = chunk.unitIndex ?? this.findUnitIndex(primaryScale, {
 				...chunk.event,
 				start: chunk.start,
 				end: chunk.end
@@ -439,8 +705,7 @@ var ViewModel = class {
 		}
 		for (const [unitIdx, chunks] of unitGroups) {
 			const unit = primaryScale.units[unitIdx];
-			const groupStartVal = primaryScale.positionToValue(unit.position);
-			const secScale = createScale(secondaryConfig, groupStartVal instanceof Date ? groupStartVal : this.startDate, this.fmt);
+			const secScale = createScale(secondaryConfig, primaryScale.getUnitStart(unitIdx) ?? this.startDate, this.fmt);
 			secondaryScales.set(unitIdx, secScale);
 			const primitives = [];
 			for (const chunk of chunks) {
@@ -459,8 +724,7 @@ var ViewModel = class {
 			} else allPrimitives.push(...primitives);
 		}
 		if (secondaryScales.size === 0) {
-			const fallbackStart = primaryScale.units.length > 0 ? primaryScale.positionToValue(primaryScale.units[0].position) : this.startDate;
-			const groupStart = fallbackStart instanceof Date ? fallbackStart : this.startDate;
+			const groupStart = primaryScale.getUnitStart(0) ?? this.startDate;
 			secondaryScales.set(0, createScale(secondaryConfig, groupStart, this.fmt));
 		}
 		const xScale = primaryAxis === "x" ? primaryScale : secondaryScales.values().next().value;
@@ -506,41 +770,6 @@ var ViewModel = class {
 		if (section.primaryScale) return section.primaryScale;
 		return section.mode === "boxes" ? "x" : "y";
 	}
-	splitEvent(event, primaryScale, _config) {
-		const units = primaryScale.units;
-		if (units.length <= 1) return [{
-			id: event.id,
-			event,
-			start: event.start,
-			end: event.end
-		}];
-		const chunks = [];
-		const boundaries = [];
-		for (let i = 1; i < units.length; i++) {
-			const d = primaryScale.positionToValue(units[i].position);
-			if (d instanceof Date) boundaries.push(d);
-		}
-		let currentStart = event.start;
-		for (const boundary of boundaries) {
-			if (boundary <= currentStart) continue;
-			if (boundary >= event.end) break;
-			chunks.push({
-				id: event.id,
-				event,
-				start: currentStart,
-				end: boundary
-			});
-			currentStart = boundary;
-		}
-		chunks.push({
-			id: event.id,
-			event,
-			start: currentStart,
-			end: event.end
-		});
-		if (chunks.length > 1) for (let i = 0; i < chunks.length; i++) chunks[i].id = (typeof event.id === "string" ? ":" : "") + `${event.id}#${i}`;
-		return chunks;
-	}
 	findUnitIndex(scale, event) {
 		const units = scale.units;
 		if (units.length === 0) return -1;
@@ -582,7 +811,6 @@ var ViewModel = class {
 		};
 	}
 };
-const DAY_MS = 1440 * 60 * 1e3;
 function deepMerge(target, source) {
 	const result = { ...target };
 	for (const key of Object.keys(source)) {
@@ -872,7 +1100,7 @@ function getMenuOptions() {
 		icon: "wxi-delete"
 	}];
 }
-function getToolbarItems() {
+function getToolbarItems(config) {
 	return [
 		{
 			id: "nav",
@@ -890,11 +1118,12 @@ function getToolbarItems() {
 		{ comp: "spacer" },
 		{
 			id: "modes",
-			comp: "richselect"
+			comp: "richselect-navigation"
 		},
 		{
 			id: "add-event",
-			comp: "addEventButton"
+			comp: "addEventButton",
+			pinned: true
 		}
 	];
 }
@@ -1005,13 +1234,88 @@ function normalizeAllDayUpdate(updates, existing) {
 	};
 }
 
+//#endregion
+//#region src/actions/delete-event.ts
+function cascadeDeleteExceptions(store, masterId) {
+	const orphans = store.getState().events.getEvents().filter((e) => e.masterEventId === masterId);
+	for (const orphan of orphans) store.in.exec("delete-event", {
+		id: orphan.id,
+		rawId: orphan.id,
+		cascade: true
+	});
+}
+function deleteEvent(store, params) {
+	const { events, editorData } = store.getState();
+	const existing = events.getEvent(params.id);
+	events.removeEvent(params.id);
+	const updates = { events };
+	if (editorData?.id === params.id) updates.editorData = null;
+	store.setState(updates);
+	if (existing?.rrule) cascadeDeleteExceptions(store, params.id);
+}
+
 //#endregion
 //#region src/actions/update-event.ts
 function updateEvent(store, action) {
 	const { events } = store.getState();
-	const event = normalizeAllDayUpdate(action.event, events.getEvent(action.id));
+	const existing = events.getEvent(action.id);
+	const event = normalizeAllDayUpdate(action.event, existing);
+	const originalDate = decodeId(action.rawId ?? action.id).eventDate;
+	const wasRecurring = !!existing?.rrule;
 	action.event = event;
-	if (events.updateEvent(action.id, event, action.mode, action.originalDate)) store.setState({ events });
+	const updated = events.updateEvent(action.id, event, action.mode, originalDate);
+	if (!updated) return;
+	const selected = store.getState().editorData;
+	store.setState({ events });
+	if (originalDate && selected?.id === action.id) store.in.exec("select-event", {
+		id: updated.id,
+		rawId: updated.id
+	});
+	if (!originalDate && wasRecurring && !updated.rrule) cascadeDeleteExceptions(store, action.id);
+}
+
+//#endregion
+//#region src/actions/move-event.ts
+function replaceAssignment(event, updates, sourceUnitId) {
+	const result = { ...updates };
+	for (const key of Object.keys(updates)) {
+		const current = event[key];
+		const destination = updates[key];
+		if (!Array.isArray(current) || Array.isArray(destination)) continue;
+		const index = current.findIndex((id) => id === sourceUnitId);
+		if (index === -1) continue;
+		const next = [...current];
+		next[index] = destination;
+		result[key] = [...new Set(next)];
+	}
+	return result;
+}
+function moveEvent(store, action) {
+	const original = store.getState().events.getEvent(action.id);
+	const sourceUnitId = decodeId(action.rawId ?? action.id).unitId;
+	if (original && sourceUnitId !== void 0) action.event = replaceAssignment(original, action.event, sourceUnitId);
+	updateEvent(store, action);
+}
+
+//#endregion
+//#region src/helpers/editor.ts
+function withoutStorageFields(event) {
+	const result = { ...event };
+	delete result.duration;
+	delete result.exdates;
+	return result;
+}
+function getEditorEvent(events, event, mode = "series", originalDate, rawId = event.id, recurring = false) {
+	let date = originalDate ?? null;
+	const createEditorData = (values) => ({
+		id: values.id,
+		values,
+		rawId,
+		recurring,
+		recurringMode: mode,
+		recurringOriginalDate: date
+	});
+	return createEditorData(withoutStorageFields(event));
 }
 
 //#endregion
@@ -1053,8 +1357,9 @@ function addEvent(store, action) {
 	const full = events.addEvent(filled);
 	action.event = { ...full };
 	action.id = full.id;
+	action.rawId = full.id;
 	const updates = { events };
-	if (action.edit) updates.editorData = { ...full };
+	if (action.edit) updates.editorData = getEditorEvent(events, full, "series", null, full.id, !!store.meta.recurring);
 	store.setState(updates);
 }
 
@@ -1066,18 +1371,21 @@ function selectEvent(store, params) {
 		return;
 	}
 	const { events } = store.getState();
+	const rawId = params.rawId ?? params.id;
 	const event = events.getEvent(params.id);
-	if (event) store.setState({ editorData: { ...event } });
+	if (event) {
+		const mode = params.mode ?? (event.masterEventId != null ? "single" : "series");
+		store.setState({ editorData: getEditorEvent(events, event, mode, decodeId(rawId).eventDate, rawId, !!store.meta.recurring) });
+	}
 }
 
 //#endregion
-//#region src/actions/delete-event.ts
-function deleteEvent(store, params) {
-	const { events, editorData } = store.getState();
-	events.removeEvent(params.id);
-	const updates = { events };
-	if (editorData?.id === params.id) updates.editorData = null;
-	store.setState(updates);
+//#region src/actions/provide-data.ts
+function provideData(store, action) {
+	const { events } = store.getState();
+	if (action.reset) events.clear();
+	for (const event of action.data.events) events.addEvent(event, !action.reset);
+	store.setState({ events });
 }
 
 //#endregion
@@ -1087,29 +1395,41 @@ function init(inBus, store) {
 	inBus.on("navigate-time", (params) => navigateTime(store, inBus, params));
 	inBus.on("filter-events", (params) => filterEvents(store, params));
 	inBus.on("update-event", (params) => updateEvent(store, params));
+	inBus.on("move-event", (params) => moveEvent(store, params));
 	inBus.on("add-event", (params) => addEvent(store, params));
 	inBus.on("select-event", (params) => selectEvent(store, params));
 	inBus.on("delete-event", (params) => deleteEvent(store, params));
+	inBus.on("provide-data", (params) => provideData(store, params));
 }
 
 //#endregion
 //#region src/calendar_reactive.ts
+function sameRange(left, right) {
+	return left.start.getTime() === right.start.getTime() && left.end.getTime() === right.end.getTime();
+}
 function reactive(store) {
 	return [
 		{
 			in: ["currentDate", "currentView"],
 			out: ["rangeLabel", "visibleDateRange"],
 			exec: (ctx) => {
-				const { currentView, currentDate } = store.getState();
+				const { currentView, currentDate, visibleDateRange } = store.getState();
 				const view = store.getView(currentView);
 				const [start, end] = view.setRange(currentDate);
-				store.setState({
-					rangeLabel: view.getRangeLabel(),
-					visibleDateRange: {
-						start,
-						end
-					}
-				}, ctx);
+				const nextRange = {
+					start,
+					end
+				};
+				const rangeChanged = !sameRange(visibleDateRange, nextRange);
+				const update = { rangeLabel: view.getRangeLabel() };
+				if (rangeChanged) update.visibleDateRange = nextRange;
+				store.setState(update, ctx);
+				if (rangeChanged) store.in.exec("request-data", {
+					startDate: start,
+					endDate: end,
+					date: currentDate,
+					view: currentView
+				});
 			}
 		},
 		{
@@ -1149,36 +1469,41 @@ registerCalendarView("day", DayViewModel);
 registerCalendarView("month", MonthViewModel);
 var CalendarStore = class extends Store {
 	in;
+	meta = {};
 	_router;
 	_views = {};
 	_weekStartDay;
 	_dateFormat;
 	constructor(w, options) {
-		options?.recurring;
+		const recurring = options?.recurring ?? false;
 		let EventsClass = EventsStore;
-		const defaultState = {
+		super({
+			writable: w,
+			async: false
+		});
+		this.meta.recurring = recurring;
+		this._router = new DataRouter(super.setState.bind(this), reactive(this), { events: (v) => {
+			const events = new EventsClass(v);
+			if (this._history) this._history.reset();
+			return events;
+		} });
+		this._weekStartDay = options?.weekStart ?? 1;
+		this._dateFormat = options?.dateFormat ?? (() => (d) => d.toLocaleDateString());
+		super.setState({
 			currentDate: /* @__PURE__ */ new Date(),
-			currentView: "",
+			currentView: "week",
 			rangeLabel: "",
 			visibleDateRange: {
 				start: /* @__PURE__ */ new Date(),
 				end: /* @__PURE__ */ new Date()
 			},
-			events: new EventsClass(),
+			events: new EventsClass([]),
 			viewData: {},
 			filters: /* @__PURE__ */ new Map(),
 			editorData: null,
 			_view: new WeekViewModel()
-		};
-		super({
-			writable: w,
-			async: false
 		});
-		this._weekStartDay = options?.weekStart ?? 1;
-		this._dateFormat = options?.dateFormat ?? (() => (d) => d.toLocaleDateString());
 		this.configureViews();
-		super.setState(defaultState);
-		this._router = new DataRouter(super.setState.bind(this), reactive(this), { events: (v) => new EventsClass(v) });
 		init(this.in = new EventBus(), this);
 	}
 	configureViews(views) {
@@ -1206,6 +1531,7 @@ var CalendarStore = class extends Store {
 	init(state) {
 		this._router.init({ ...state });
 	}
+	postInit() {}
 	applyViewConfig(instance) {
 		instance.weekStartDay = this._weekStartDay;
 		instance.fmt = this._dateFormat;
@@ -1217,17 +1543,7 @@ var CalendarStore = class extends Store {
 		return this.getState().events.getEvents(start, end);
 	}
 	getEvent(id) {
-		if (typeof id === "string") {
-			const isString = id.startsWith(":");
-			const start = isString ? 1 : 0;
-			let idx = id.indexOf("#", start);
-			if (idx === -1 && isString) idx = id.length;
-			if (idx !== -1) {
-				id = id.substring(start, idx);
-				if (!isString) id = parseInt(id);
-			}
-		}
-		return this.getState().events.getEvent(id);
+		return this.getState().events.getEvent(decodeId(id).id);
 	}
 	getBrandmark() {
 		return null;
@@ -1242,4 +1558,4 @@ var CalendarStore = class extends Store {
 const version = version$1;
 
 //#endregion
-export { CalendarStore, DayViewModel, DiscreteScale, EventsStore, LinearScale, MonthViewModel, ViewModel, WeekViewModel, createScale, getMenuOptions, getToolbarItems, isMultiDay, layoutBars, layoutBoxes, registerCalendarView, version };
+export { CalendarStore, CombinedScale, DayViewModel, DiscreteScale, EventsStore, LinearScale, MonthViewModel, ViewModel, WeekViewModel, createScale, decodeId, encodeId, getMenuOptions, getToolbarItems, isMultiDay, layoutBars, layoutBoxes, registerCalendarView, version };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@svar-ui/calendar-store",
-  "version": "2.6.0",
+  "version": "2.7.0",
   "description": "State and models for SVAR Calendar",
   "homepage": "https://svar.dev",
   "license": "MIT",
@@ -21,18 +21,18 @@
     "access": "public"
   },
   "dependencies": {
-    "@svar-ui/lib-dom": "0.12.1",
-    "@svar-ui/lib-state": "1.9.6"
+    "@svar-ui/lib-dom": "0.14.0",
+    "@svar-ui/lib-state": "1.9.7"
   },
   "devDependencies": {
-    "@svar-ui/lib-state": "1.9.6",
+    "@svar-ui/lib-state": "1.9.7",
     "@typescript/native-preview": "7.0.0-dev.20260316.1",
     "typescript": "^5.9.3",
     "vite-plus": "0.1.16"
   },
   "scripts": {
     "build": "vp pack",
-    "watch": "vp pack --watch",
+    "dev": "vp pack --watch",
     "test": "vp test",
     "check": "vp check"
   }