fix: use register/deregister for editors instead of activate/deactivate

standardnotes · Aug 25, 2020 · 696f34b · 696f34b
1 parent b1cde83
commit 696f34b
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/app/assets/javascripts/views/editor/editor_view.ts b/app/assets/javascripts/views/editor/editor_view.ts
@@ -348,19 +348,19 @@ class EditorViewCtrl extends PureViewCtrl<{}, EditorState> {
         /** Unload current component view so that we create a new one */
         editorUnloading: true
       });
-      if (newEditor && !newEditor.active) {
-        /** Activate the new editor while the component view is unloading */
-        await this.application.componentManager!.activateComponent(newEditor.uuid);
+      if (newEditor) {
+        /** Register this new editor while the editor view is reloading */
+        this.application.componentManager!.registerComponent(newEditor.uuid);
       }
       await unloading;
       const reloading = this.setState({
         /** Reload component view */
         editorComponent: newEditor,
         editorUnloading: false,
       });
-      if (currentEditor?.active) {
-        /** Deactivate the current (previous) editor while the editor view is reloading */
-        await this.application.componentManager!.deactivateComponent(currentEditor.uuid);
+      if (currentEditor) {
+        /** Deregister the current (previous) editor while the editor view is reloading */
+        this.application.componentManager!.deregisterComponent(currentEditor.uuid);
       }
       await reloading;
       this.reloadFont();