saving locked objects path

src/core/actions-setup.ts

@@ -6,8 +6,8 @@ import { History } from './history';
 import { Preferences } from './preferences/preferences';
 
 export class ActionsSetup {
-	public setup(actions: ActionHandler, data: EditorData, history: History, prefs: Preferences) {
-		this.setupDataActions(data, actions, prefs);
+	public setup(actions: ActionHandler, data: EditorData, history: History, prefs: Preferences, root: Container) {
+		this.setupDataActions(data, actions, root, prefs);
 		this.setuphistoryActions(history, actions);
 		this.setupPreferencesActions(prefs, actions);
 	}
@@ -77,7 +77,7 @@ export class ActionsSetup {
 		);
 	}
 
-	public setupDataActions(data: EditorData, actions: ActionHandler, prefs: Preferences) {
+	public setupDataActions(data: EditorData, actions: ActionHandler, root: Container, prefs: Preferences) {
 		actions.setActionCommand(Actions.CLEAR_SELECTION, () => data.selectObject(null, DataOrigin.ACTION));
 		actions.setActionCommand(Actions.PRINT_OBJECT, () => {
 			if (data.selectedObject) console.info(data.selectedObject);
@@ -89,33 +89,8 @@ export class ActionsSetup {
 
 		actions.setActionCommand(
 			Actions.LOCK_SELECTION,
-			() => this.toggleLockSelection(data, prefs),
+			() => data.toggleLockSelection(root, prefs),
 			() => data.selectedObject?.__locked
 		);
 	}
-
-	private toggleLockSelection(data: EditorData, prefs: Preferences) {
-		if (!data.selectedObject) return;
-		const obj = data.selectedObject;
-		obj.__locked = !obj.__locked;
-
-		const path: number[] = [];
-		let o = obj;
-		while (o.parent) {
-			path.unshift(o.parent.getChildIndex(o));
-			o = o.parent;
-		}
-
-		const pathId = path.join(',');
-		const locked = prefs.get('lockedObjects') as string[];
-		const i = locked.indexOf(pathId);
-
-		if (obj.__locked) {
-			if (i < 0) locked.push(pathId);
-		} else if (i >= 0) locked.splice(i, 1);
-
-		prefs.set('lockedObjects', locked);
-
-		data.onObjectLocked.dispatch(obj);
-	}
 }

src/core/editor.ts

@@ -381,13 +381,14 @@ class EditorClass {
 		return actions;
 	}
 
-	public setupInitialActions() {
-		new ActionsSetup().setup(this.actions, this.data, this.history, this.prefs);
+	public setupInitialActions(root: Container) {
+		new ActionsSetup().setup(this.actions, this.data, this.history, this.prefs, root);
 	}
 
 	public enable(config: PluginConfig) {
 		this.actions.enable();
 		this.referenceImageController.enable(config);
+		this.data.enable(config.root, this.prefs);
 	}
 
 	public disable() {

src/data/editor-data.ts

@@ -1,10 +1,13 @@
+import { Preferences } from 'core/preferences/preferences';
+
 export enum DataOrigin {
 	ACTION = 0,
 	SCENE = 1,
 	INSPECTOR = 2,
 }
 
 export class EditorData {
+	public root: Container;
 	private _selectedObject: PIXI.DisplayObject;
 
 	public get selectedObject() { return this._selectedObject; }
@@ -50,4 +53,51 @@ export class EditorData {
 			this.onPropertyChanged.dispatch(e.from, k, e.value, this._selectedObject);
 		});
 	}
+
+	public enable(root: Container, prefs: Preferences) {
+		this.root = root;
+		const lockedObjects = prefs.get('lockedObjects') as string[];
+		for (let i = lockedObjects.length - 1; i >= 0; i--) {
+			let o: PIXI.DisplayObject = root;
+			const path = lockedObjects[i].split(',').map(e => parseInt(e, 10));
+
+			for (let p = 0; p < path.length; p++) {
+				const index = path[p];
+				if (index >= 0 && index < o.children.length) {
+					o = o.children[index];
+					continue;
+				}
+				o = null;
+				break;
+			}
+
+			if (o) o.__locked = true;
+			else lockedObjects.splice(i, 1);
+		}
+	}
+
+	public toggleLockSelection(root: Container, prefs: Preferences) {
+		if (!this._selectedObject) return;
+		const obj = this._selectedObject;
+		obj.__locked = !obj.__locked;
+
+		const path: number[] = [];
+		let o = obj;
+		while (o.parent && o !== root) {
+			path.unshift(o.parent.getChildIndex(o));
+			o = o.parent;
+		}
+
+		const pathId = path.join(',');
+		const locked = prefs.get('lockedObjects') as string[];
+		const i = locked.indexOf(pathId);
+
+		if (obj.__locked) {
+			if (i < 0) locked.push(pathId);
+		} else if (i >= 0) locked.splice(i, 1);
+
+		prefs.set('lockedObjects', locked);
+
+		this.onObjectLocked.dispatch(obj);
+	}
 }

src/editor.state-handler.ts

@@ -41,7 +41,7 @@ export class EditorStateHandler {
 	}
 
 	private setupInitialActions() {
-		Editor.setupInitialActions();
+		Editor.setupInitialActions(this.config.root);
 
 		const actions = Editor.actions;
 		actions.setActionCommand(
@@ -61,8 +61,8 @@ export class EditorStateHandler {
 		this.disabledUI.disable();
 		if (!this._initialized) this.init(this.config);
 
-		this.editorView.enable(this.config);
 		Editor.enable(this.config);
+		this.editorView.enable(this.config);
 		if (this.onshow) this.onshow();
 	}