rmorawski/standardnotes-app-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: persist selected tag & note locally (#1851)

Browse Source
This commit is contained in:
Aman Harwara
2022-10-20 18:56:59 +05:30
committed by GitHub
parent 6c47f95748
commit 4432f1cb4c
20 changed files with 421 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
packages/web/src/javascripts/Controllers/Navigation/NavigationController.ts
View File

@@ -15,19 +15,28 @@ import {
InternalEventBus,
InternalEventPublishStrategy,
} from '@standardnotes/snjs'
import { action, computed, makeAutoObservable, makeObservable, observable, runInAction } from 'mobx'
import { action, computed, makeAutoObservable, makeObservable, observable, reaction, runInAction } from 'mobx'
import { WebApplication } from '../../Application/Application'
import { FeaturesController } from '../FeaturesController'
import { AbstractViewController } from '../Abstract/AbstractViewController'
import { destroyAllObjectProperties } from '@/Utils'
import { isValidFutureSiblings, rootTags, tagSiblings } from './Utils'
import { AnyTag } from './AnyTagType'
import { CrossControllerEvent } from '../CrossControllerEvent'
import { AbstractViewController } from '../Abstract/AbstractViewController'
import { Persistable } from '../Abstract/Persistable'
export class NavigationController extends AbstractViewController {
export type NavigationControllerPersistableValue = {
selectedTagUuid: AnyTag['uuid']
}
export class NavigationController
extends AbstractViewController
implements Persistable<NavigationControllerPersistableValue>
{
tags: SNTag[] = []
smartViews: SmartView[] = []
allNotesCount_ = 0
selectedUuid: AnyTag['uuid'] | undefined = undefined
selected_: AnyTag | undefined
previouslySelected_: AnyTag | undefined
editing_: SNTag | SmartView | undefined
@@ -63,12 +72,12 @@ export class NavigationController extends AbstractViewController {
allNotesCount: computed,
setAllNotesCount: action,
selected_: observable.ref,
selected_: observable,
previouslySelected_: observable.ref,
previouslySelected: computed,
editing_: observable.ref,
selected: computed,
selectedUuid: computed,
selectedUuid: observable,
editingTag: computed,
addingSubtagTo: observable,
@@ -94,6 +103,8 @@ export class NavigationController extends AbstractViewController {
setContextMenuMaxHeight: action,
isInFilesView: computed,
hydrateFromPersistedValue: action,
})
this.disposers.push(
@@ -103,25 +114,23 @@ export class NavigationController extends AbstractViewController {
this.smartViews = this.application.items.getSmartViews()
const currrentSelectedTag = this.selected_
if (!currrentSelectedTag) {
this.setSelectedTagInstance(this.smartViews[0])
const currentSelectedTag = this.selected_
if (!currentSelectedTag) {
return
}
const updatedReference =
FindItem(changed, currrentSelectedTag.uuid) || FindItem(this.smartViews, currrentSelectedTag.uuid)
FindItem(changed, currentSelectedTag.uuid) || FindItem(this.smartViews, currentSelectedTag.uuid)
if (updatedReference) {
this.setSelectedTagInstance(updatedReference as AnyTag)
}
if (isSystemView(currrentSelectedTag as SmartView)) {
if (isSystemView(currentSelectedTag as SmartView)) {
return
}
if (FindItem(removed, currrentSelectedTag.uuid)) {
if (FindItem(removed, currentSelectedTag.uuid)) {
this.setSelectedTagInstance(this.smartViews[0])
}
})
@@ -140,6 +149,52 @@ export class NavigationController extends AbstractViewController {
}
}),
)
this.disposers.push(
reaction(
() => this.selectedUuid,
() => {
eventBus.publish({
type: CrossControllerEvent.RequestValuePersistence,
payload: undefined,
})
},
),
)
}
findAndSetTag = (uuid: UuidString) => {
const tagToSelect = [...this.tags, ...this.smartViews].find((tag) => tag.uuid === uuid)
if (tagToSelect) {
void this.setSelectedTag(tagToSelect)
}
}
selectHydratedTagOrDefault = () => {
if (this.selectedUuid && !this.selected_) {
this.findAndSetTag(this.selectedUuid)
}
if (!this.selectedUuid) {
void this.selectHomeNavigationView()
}
}
getPersistableValue = (): NavigationControllerPersistableValue => {
return {
selectedTagUuid: this.selectedUuid ? this.selectedUuid : SystemViewId.AllNotes,
}
}
hydrateFromPersistedValue = (state: NavigationControllerPersistableValue | undefined) => {
if (!state) {
void this.selectHomeNavigationView()
return
}
if (state.selectedTagUuid) {
this.selectedUuid = state.selectedTagUuid
this.selectHydratedTagOrDefault()
}
}
override deinit() {
@@ -358,7 +413,7 @@ export class NavigationController extends AbstractViewController {
return this.selected_
}
public async setSelectedTag(tag: AnyTag | undefined) {
public async setSelectedTag(tag: AnyTag | undefined, { userTriggered } = { userTriggered: false }) {
if (tag && tag.conflictOf) {
this.application.mutator
.changeAndSaveItem(tag, (mutator) => {
@@ -384,7 +439,7 @@ export class NavigationController extends AbstractViewController {
await this.eventBus.publishSync(
{
type: CrossControllerEvent.TagChanged,
payload: { tag, previousTag: this.previouslySelected_ },
payload: { tag, previousTag: this.previouslySelected_, userTriggered: userTriggered },
},
InternalEventPublishStrategy.SEQUENCE,
)
@@ -407,7 +462,10 @@ export class NavigationController extends AbstractViewController {
}
private setSelectedTagInstance(tag: AnyTag | undefined): void {
runInAction(() => (this.selected_ = tag))
runInAction(() => {
this.selected_ = tag
this.selectedUuid = tag ? tag.uuid : undefined
})
}
public setExpanded(tag: SNTag, expanded: boolean) {
@@ -418,10 +476,6 @@ export class NavigationController extends AbstractViewController {
.catch(console.error)
}
public get selectedUuid(): UuidString | undefined {
return this.selected_?.uuid
}
public get editingTag(): SNTag | SmartView | undefined {
return this.editing_
}