fix: deregister stream observers on editor deinit

This commit is contained in:
Mo Bitar
2020-04-21 12:17:01 -05:00
parent 84de39375c
commit f9733f8dac
7 changed files with 318 additions and 247 deletions

View File

@@ -112,7 +112,10 @@ class EditorViewCtrl extends PureViewCtrl implements EditorViewScope {
private removeTrashKeyObserver?: any
private removeDeleteKeyObserver?: any
private removeTabObserver?: any
private removeComponentObserver: any
private removeComponentGroupObserver: any
private removeTagsObserver!: () => void
private removeComponentsObserver!: () => void
prefKeyMonospace: string
prefKeySpellcheck: string
@@ -140,8 +143,12 @@ class EditorViewCtrl extends PureViewCtrl implements EditorViewScope {
}
deinit() {
this.removeComponentObserver();
this.removeComponentObserver = undefined;
this.removeTagsObserver();
this.removeComponentsObserver();
(this.removeTagsObserver as any) = undefined;
(this.removeComponentsObserver as any) = undefined;
this.removeComponentGroupObserver();
this.removeComponentGroupObserver = undefined;
this.removeAltKeyObserver();
this.removeAltKeyObserver = undefined;
this.removeTrashKeyObserver();
@@ -183,7 +190,7 @@ class EditorViewCtrl extends PureViewCtrl implements EditorViewScope {
this.reloadTagsString();
}
});
this.removeComponentObserver = this.componentGroup.addChangeObserver(() => {
this.removeComponentGroupObserver = this.componentGroup.addChangeObserver(() => {
this.setEditorState({
activeEditorComponent: this.componentGroup.activeComponentForArea(ComponentArea.Editor),
activeTagsComponent: this.componentGroup.activeComponentForArea(ComponentArea.NoteTags),
@@ -336,7 +343,7 @@ class EditorViewCtrl extends PureViewCtrl implements EditorViewScope {
}
streamItems() {
this.application.streamItems(
this.removeTagsObserver = this.application.streamItems(
ContentType.Tag,
(items) => {
if (!this.note) {
@@ -355,7 +362,7 @@ class EditorViewCtrl extends PureViewCtrl implements EditorViewScope {
}
);
this.application.streamItems(
this.removeComponentsObserver = this.application.streamItems(
ContentType.Component,
async (items) => {
const components = items as SNComponent[];
@@ -363,7 +370,7 @@ class EditorViewCtrl extends PureViewCtrl implements EditorViewScope {
return;
}
/** Reload componentStack in case new ones were added or removed */
this.reloadComponentStack();
await this.reloadComponentStack();
/** Observe editor changes to see if the current note should update its editor */
const editors = components.filter((component) => {
return component.isEditor();

View File

@@ -76,11 +76,8 @@ class NotesViewCtrl extends PureViewCtrl {
$onInit() {
super.$onInit();
angular.element(document).ready(() => {
this.reloadPreferences();
});
this.panelPuppet = {
onReady: () => this.reloadPreferences()
onReady: () => this.reloadPanelWidth()
};
this.unsubEditorChange = this.application.editorGroup.addChangeObserver(() => {
this.setNotesState({
@@ -407,9 +404,27 @@ class NotesViewCtrl extends PureViewCtrl {
WebPrefKey.NotesHideDate,
false
);
const state = this.getState();
const displayOptionsChanged = (
viewOptions.sortBy !== state.sortBy ||
viewOptions.sortReverse !== state.sortReverse ||
viewOptions.hidePinned !== state.hidePinned ||
viewOptions.showArchived !== state.showArchived
);
await this.setNotesState({
...viewOptions
});
this.reloadPanelWidth();
if (displayOptionsChanged) {
this.reloadNotesDisplayOptions();
}
await this.reloadNotes();
if (prevSortValue && prevSortValue !== sortBy) {
this.selectFirstNote();
}
}
reloadPanelWidth() {
const width = this.application!.getPrefsService().getValue(
WebPrefKey.NotesPanelWidth
);
@@ -422,11 +437,6 @@ class NotesViewCtrl extends PureViewCtrl {
);
}
}
this.reloadNotesDisplayOptions();
await this.reloadNotes();
if (prevSortValue && prevSortValue !== sortBy) {
this.selectFirstNote();
}
}
onPanelResize(

View File

@@ -45,6 +45,7 @@ class TagsViewCtrl extends PureViewCtrl {
private editingOriginalName?: string
formData: { tagTitle?: string } = {}
titles: Partial<Record<UuidString, string>> = {}
private removeTagsObserver!: () => void
/* @ngInject */
constructor(
@@ -57,6 +58,8 @@ class TagsViewCtrl extends PureViewCtrl {
}
deinit() {
this.removeTagsObserver();
(this.removeTagsObserver as any) = undefined;
this.unregisterComponent();
this.unregisterComponent = undefined;
super.deinit();
@@ -112,7 +115,7 @@ class TagsViewCtrl extends PureViewCtrl {
}
beginStreamingItems() {
this.application.streamItems(
this.removeTagsObserver = this.application.streamItems(
ContentType.Tag,
async (items) => {
await this.setTagState({