removed circular dependency

kleber-swf · Sep 3, 2021 · 0b65e3e · 0b65e3e
1 parent 5c20468
commit 0b65e3e
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 29 deletions.
diff --git a/src/data/inspector-data.ts b/src/data/inspector-data.ts
@@ -1,8 +1,3 @@
-import { BooleanPropertyEditor } from '../editor-view/properties/editors/boolean/boolean-property-editor';
-import { NumberPropertyEditor } from '../editor-view/properties/editors/number/number-property-editor';
-import { PointPropertyEditor } from '../editor-view/properties/editors/point/point-property-editor';
-import { StringPropertyEditor } from '../editor-view/properties/editors/string/string-property-editor';
-
 export type InspectableTypes = 'string' | 'number' | 'boolean' | 'point' | 'default';
 
 export interface InspectorPropertyModel {
@@ -13,30 +8,22 @@ export interface InspectorPropertyModel {
 }
 
 export class InspectorData {
-	private readonly editors: Record<InspectableTypes, string> = {
-		// basic types
-		string: StringPropertyEditor.tagName,
-		number: NumberPropertyEditor.tagName,
-		boolean: BooleanPropertyEditor.tagName,
-
-		// PIXI/Phaser types
-		point: PointPropertyEditor.tagName,
-
-		// default
-		default: StringPropertyEditor.tagName,
-	};
-
-	public readonly inspectableProperties: InspectorPropertyModel[] = [
-		{ name: '__type', label: 'type', typeHint: 'string', data: { readonly: true } },
-		{ name: 'name', typeHint: 'string' },
-		{ name: 'position', typeHint: 'point' },
-		{ name: 'scale', typeHint: 'point', data: { step: 0.1 } },
-		{ name: 'pivot', typeHint: 'point' },
-		{ name: 'anchor', typeHint: 'point', data: { step: 0.1 } },
-		{ name: 'alpha', typeHint: 'number', data: { min: 0, max: 1, step: 0.1 } },
-		{ name: 'visible', typeHint: 'boolean' },
-		{ name: 'angle', typeHint: 'number', data: { readonly: true } },
-	];
+	private readonly editors: Partial<Record<InspectableTypes, string>> = {};
+
+	public addEditors(editors: Partial<Record<InspectableTypes, string>>) {
+		Object.keys(editors).forEach(e => this.editors[e] = editors[e]);
+	}
+
+	public readonly inspectableProperties: InspectorPropertyModel[] = [];
+
+	public addInspectableProperties(properties: InspectorPropertyModel[]) {
+		const iproperties = this.inspectableProperties;
+		properties.forEach(prop => {
+			const i = iproperties.findIndex(e => e.name === prop.name);
+			if (i < 0) iproperties.push(prop);
+			else iproperties.splice(i, 1, prop);
+		});
+	}
 
 	public findEditorFor(value: any, data: InspectorPropertyModel) {
 		// TODO what abount null / undefined values?

diff --git a/src/plugin.ts b/src/plugin.ts
@@ -1,3 +1,7 @@
+import { BooleanPropertyEditor } from 'editor-view/properties/editors/boolean/boolean-property-editor';
+import { NumberPropertyEditor } from 'editor-view/properties/editors/number/number-property-editor';
+import { PointPropertyEditor } from 'editor-view/properties/editors/point/point-property-editor';
+import { StringPropertyEditor } from 'editor-view/properties/editors/string/string-property-editor';
 import Phaser from 'phaser-ce';
 import { Editor } from './core/editor';
 import { EditorView } from './editor-view/editor-view';
@@ -13,6 +17,7 @@ export class Plugin extends Phaser.Plugin {
 
 		const scene = new SceneView(game, group, game.stage);
 		this.setupActions(scene);
+		this.setupInspectorData();
 
 		const editorView = document.createElement(EditorView.tagName) as EditorView;
 		document.body.appendChild(editorView);
@@ -27,6 +32,33 @@ export class Plugin extends Phaser.Plugin {
 		Editor.actions.setContainer('#phred-game-container');
 	}
 
+	private setupInspectorData() {
+		Editor.inspectorData.addEditors({
+			// basic types
+			string: StringPropertyEditor.tagName,
+			number: NumberPropertyEditor.tagName,
+			boolean: BooleanPropertyEditor.tagName,
+
+			// PIXI/Phaser types
+			point: PointPropertyEditor.tagName,
+
+			// default
+			default: StringPropertyEditor.tagName,
+		});
+
+		Editor.inspectorData.addInspectableProperties([
+			{ name: '__type', label: 'type', typeHint: 'string', data: { readonly: true } },
+			{ name: 'name', typeHint: 'string' },
+			{ name: 'position', typeHint: 'point' },
+			{ name: 'scale', typeHint: 'point', data: { step: 0.1 } },
+			{ name: 'pivot', typeHint: 'point' },
+			{ name: 'anchor', typeHint: 'point', data: { step: 0.1 } },
+			{ name: 'alpha', typeHint: 'number', data: { min: 0, max: 1, step: 0.1 } },
+			{ name: 'visible', typeHint: 'boolean' },
+			{ name: 'angle', typeHint: 'number', data: { readonly: true } },
+		]);
+	}
+
 	private setupActions(scene: SceneView) {
 		const { history, prefs } = Editor;
 		Editor.actions.add(