fix: restore interaction

meetalva · Sep 10, 2018 · 2969f1f · 2969f1f
1 parent bc2a509
commit 2969f1f
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/src/model/element-action.ts b/src/model/element-action.ts
@@ -92,7 +92,8 @@ export class ElementAction {
 		project: Project;
 		event: Event;
 	}): void {
-		const storeAction = this.userStore.getActionById(this.storeActionId);
+		const userStore = project.getUserStore();
+		const storeAction = userStore.getActionById(this.storeActionId);
 
 		if (!storeAction) {
 			return;
@@ -102,14 +103,14 @@ export class ElementAction {
 			case Types.UserStoreActionType.Noop:
 				return;
 			case Types.UserStoreActionType.Set: {
-				const storeProperty = this.userStore.getPropertyById(this.storePropertyId);
+				const storeProperty = userStore.getPropertyById(this.storePropertyId);
 				if (storeProperty) {
 					storeProperty.setValue(this.getResolvedPayload({ project, event }) || '');
 				}
 				break;
 			}
 			case Types.UserStoreActionType.SetPage: {
-				const pageProperty = this.userStore.getPageProperty();
+				const pageProperty = userStore.getPageProperty();
 				pageProperty.setValue(this.getPayload());
 				break;
 			}

diff --git a/src/model/user-store.ts b/src/model/user-store.ts
@@ -294,6 +294,8 @@ export class UserStore {
 		referenceChanges.changed.forEach(change => change.before.update(change.after));
 		referenceChanges.removed.forEach(change => this.removeReference(change.before));
 
+		this.currentPageProperty.update(userStore.currentPageProperty);
+
 		if (opts && !opts.withEnhancer) {
 			return;
 		}

diff --git a/src/preview/preview.ts b/src/preview/preview.ts
@@ -184,7 +184,7 @@ function main(): void {
 			}
 		);
 
-		/* Mobx.autorun(
+		Mobx.autorun(
 			() => {
 				const userStore = store.getProject().getUserStore();
 
@@ -197,7 +197,7 @@ function main(): void {
 			{
 				scheduler: window.requestIdleCallback
 			}
-		); */
+		);
 	}
 }
 

diff --git a/src/renderer/create-project-message-handler.ts b/src/renderer/create-project-message-handler.ts
@@ -109,7 +109,9 @@ export function createProjectMessageHandler({
 				break;
 			}
 			case Message.MessageType.ChangeUserStore: {
+				project.startBatch();
 				project.getUserStore().sync(message, { withEnhancer: false });
+				project.endBatch();
 				break;
 			}
 			case Message.MessageType.SelectElement: {