fix: show page props again

meetalva · Sep 10, 2018 · e0754ed · e0754ed
1 parent 4cfc89b
commit e0754ed
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/src/model/project.ts b/src/model/project.ts
@@ -56,6 +56,11 @@ export class Project {
 
 	@Mobx.observable private userStore: UserStore;
 
+	@Mobx.computed
+	private get activePage(): Page {
+		return this.pages.find(p => p.getActive()) || this.pages[0];
+	}
+
 	@Mobx.computed
 	private get patterns(): Pattern[] {
 		return this.getPatternLibraries().reduce((ps, lib) => [...ps, ...lib.getPatterns()], []);
@@ -498,6 +503,12 @@ export class Project {
 		return this.pages[previousIndex];
 	}
 
+	public getSelectedElement(): Element | undefined {
+		const selected = this.selectedElements[0];
+
+		return selected ? selected : this.activePage.getRoot();
+	}
+
 	public getUserStore(): UserStore {
 		return this.userStore;
 	}

diff --git a/src/store/view-store.ts b/src/store/view-store.ts
@@ -547,7 +547,7 @@ export class ViewStore {
 			return;
 		}
 
-		return this.project.getElements().find(element => element.getSelected());
+		return this.project.getSelectedElement();
 	}
 
 	public getSender(): Sender {