history moved to editor

src/core/editor.ts

@@ -1,10 +1,13 @@
+import { History } from './history';
 import { Actions } from './actions';
 
 class EditorClass {
 	public actions: Actions;
+	public history: History;
 
 	public init() {
 		this.actions = new Actions();
+		this.history = new History();
 	}
 }
 

src/data/history.ts → src/core/history.ts

@@ -1,4 +1,4 @@
-import { Data, DataOrigin } from './data';
+import { Data, DataOrigin } from '../data/data';
 
 export interface HistoryEntry {
 	obj: PIXI.DisplayObject;
@@ -7,7 +7,7 @@ export interface HistoryEntry {
 
 const HISTORY_LIMIT = 100;
 
-class HistoryClass {
+export class History {
 	private readonly entries: HistoryEntry[] = [];
 	private holdingEntry: HistoryEntry;
 
@@ -59,5 +59,3 @@ class HistoryClass {
 		this.onHistoryWalk.dispatch(entry);
 	}
 }
-
-export const History = new HistoryClass();

src/editor-view/properties/editors/property-editor.ts

@@ -1,5 +1,5 @@
 import { Data, DataOrigin } from 'data/data';
-import { History } from 'data/history';
+import { Editor } from 'core/editor';
 import { PropertyInspectionData } from 'editor-view/properties-editors';
 import { IdUtil } from 'util/id.util';
 import './property-editor.scss';
@@ -67,7 +67,7 @@ export abstract class PropertyEditor<T> extends HTMLElement {
 	public abstract updateInternalValue(e: Event): void;
 
 	public savePreviousValue() {
-		History.prepare(Data.selectedObject, {
+		Editor.history.prepare(Data.selectedObject, {
 			[this.prop.name]: this.getInternalValue()
 		}).commit();
 	}

src/plugin.ts

@@ -1,5 +1,4 @@
 import { Data } from 'data/data';
-import { History } from 'data/history';
 import { Preferences } from 'data/preferences';
 import Phaser from 'phaser-ce';
 import { Editor } from './core/editor';
@@ -37,7 +36,7 @@ export class Plugin extends Phaser.Plugin {
 				label: 'undo',
 				icon: 'fa-undo-alt',
 				shortcut: 'ctrl+z',
-				command: History.undo.bind(History)
+				command: Editor.history.undo.bind(Editor.history)
 			},
 			{
 				id: 'MOVE_UP_1',

src/scene-view/scene-view.ts

@@ -1,5 +1,5 @@
+import { Editor } from 'core/editor';
 import { Data, DataOrigin } from 'data/data';
-import { History } from 'data/history';
 import { DragUtil } from '../util/drag.util';
 import { SceneModel } from './scene-model';
 import { Selection } from './selection/selection';
@@ -80,18 +80,18 @@ export class SceneView extends Phaser.Group {
 		const obj = Data.selectedObject
 		if (!obj) return;
 
-		History.prepare(Data.selectedObject, { position: obj.position.clone() });
+		Editor.history.prepare(Data.selectedObject, { position: obj.position.clone() });
 	}
 
 	private onInputUp(_: any, pointer: Phaser.Pointer) {
 		this._isInputDown = false;
 		const wasDragging = this._isDragging;
 		this._isDragging = false;
 		if (wasDragging) {
-			History.commit();
+			Editor.history.commit();
 			return;
 		}
-		History.cancel();
+		Editor.history.cancel();
 		if (this._hasSelected) return;
 		this.trySelectOver(pointer);
 		this._hasSelected = false;
@@ -124,7 +124,7 @@ export class SceneView extends Phaser.Group {
 	public moveSelectedObject(deltaX: number, deltaY: number) {
 		const obj = Data.selectedObject;
 		if (!obj) return;
-		History.prepare(obj, { position: obj.position.clone() }).commit();
+		Editor.history.prepare(obj, { position: obj.position.clone() }).commit();
 		obj.position.set(obj.position.x + deltaX, obj.position.y + deltaY);
 		obj.updateTransform();
 		this.selection.redraw();

src/scene-view/selection/scale/scale.handler.ts

@@ -1,5 +1,5 @@
+import { Editor } from 'core/editor';
 import { Data, DataOrigin } from 'data/data';
-import { History } from 'data/history';
 import { ScaleGizmo } from './scale.gizmo';
 import { Scaler } from './scaler';
 
@@ -56,7 +56,7 @@ export class ScaleHandler extends Phaser.Group {
 
 	private startScaling(gizmos: ScaleGizmo) {
 		const obj = Data.selectedObject;
-		History.prepare(obj, {
+		Editor.history.prepare(obj, {
 			scale: obj.scale.clone(),
 			position: obj.position.clone(),
 		});
@@ -68,7 +68,7 @@ export class ScaleHandler extends Phaser.Group {
 	private stopScaling() {
 		this._scaling = false;
 		this.scaler.stopScaling();
-		History.commit();
+		Editor.history.commit();
 	}
 
 	public handle() {