chore: upgrade snjs (#985)

This commit is contained in:
Mo
2022-04-18 13:21:41 -05:00
committed by GitHub
parent a9bab0938b
commit b6eeaea516
8 changed files with 124 additions and 120 deletions

View File

@@ -119,7 +119,11 @@ export const ComponentView: FunctionalComponent<IProps> = observer(
const contentWindow = iframe.contentWindow as Window
excessiveLoadingTimeout.current && clearTimeout(excessiveLoadingTimeout.current)
componentViewer.setWindow(contentWindow).catch(console.error)
try {
componentViewer.setWindow(contentWindow)
} catch (error) {
console.error(error)
}
setTimeout(() => {
setIsLoading(false)

View File

@@ -10,12 +10,12 @@ import {
ComponentArea,
PrefKey,
ComponentMutator,
PayloadSource,
ComponentViewer,
TransactionalMutation,
ItemMutator,
ProposedSecondsToDeferUILevelSessionExpirationDuringActiveInteraction,
NoteViewController,
PayloadEmitSource,
} from '@standardnotes/snjs'
import { debounce, isDesktopApplication } from '@/Utils'
import { KeyboardModifier, KeyboardKey } from '@/Services/IOService'
@@ -245,7 +245,7 @@ export class NoteView extends PureComponent<Props, State> {
}
}
private onNoteInnerChange(note: SNNote, source: PayloadSource): void {
private onNoteInnerChange(note: SNNote, source: PayloadEmitSource): void {
if (note.uuid !== this.note.uuid) {
throw Error('Editor received changes for non-current note')
}
@@ -282,7 +282,7 @@ export class NoteView extends PureComponent<Props, State> {
this.reloadSpellcheck().catch(console.error)
const isTemplateNoteInsertedToBeInteractableWithEditor =
source === PayloadSource.Constructor && note.dirty
source === PayloadEmitSource.LocalInserted && note.dirty
if (isTemplateNoteInsertedToBeInteractableWithEditor) {
return
}
@@ -411,7 +411,7 @@ export class NoteView extends PureComponent<Props, State> {
async ({ source }) => {
if (
isPayloadSourceInternalChange(source) ||
source === PayloadSource.InitialObserverRegistrationPush
source === PayloadEmitSource.InitialObserverRegistrationPush
) {
return
}

View File

@@ -8,7 +8,7 @@ import {
ButtonType,
ContentType,
HistoryEntry,
PayloadSource,
PayloadEmitSource,
RevisionListEntry,
SNNote,
} from '@standardnotes/snjs'
@@ -124,10 +124,10 @@ export const RevisionHistoryModal: FunctionComponent<RevisionHistoryModalProps>
.changeAndSaveItem(
originalNote,
(mutator) => {
mutator.unsafe_setCustomContent(selectedRevision.payload.content)
mutator.setCustomContent(selectedRevision.payload.content)
},
true,
PayloadSource.RemoteActionRetrieved,
PayloadEmitSource.RemoteRetrieved,
)
.catch(console.error)
dismissModal()

View File

@@ -7,7 +7,6 @@ import {
ApplicationEvent,
removeFromArray,
DesktopManagerInterface,
PayloadSource,
InternalEventBus,
} from '@standardnotes/snjs'
import { WebAppEvent, WebApplication } from '@/UIModels/Application'
@@ -140,7 +139,6 @@ export class DesktopManager
}
},
undefined,
PayloadSource.DesktopInstalled,
)
for (const observer of this.updateObservers) {

View File

@@ -8,10 +8,11 @@ import {
ContentType,
UuidString,
FeatureStatus,
PayloadSource,
PrefKey,
CreateDecryptedLocalStorageContextPayload,
InternalEventBus,
PayloadEmitSource,
LocalStorageDecryptedContextualPayload,
} from '@standardnotes/snjs'
import { dismissToast, ToastType, addTimedToast } from '@standardnotes/stylekit'
@@ -233,7 +234,7 @@ export class ThemeManager extends ApplicationService {
this.deactivateTheme(theme.uuid)
}
}
if (source !== PayloadSource.LocalRetrieved) {
if (source !== PayloadEmitSource.LocalRetrieved) {
this.cacheThemeState().catch(console.error)
}
},
@@ -300,7 +301,8 @@ export class ThemeManager extends ApplicationService {
const cachedThemes = (await this.application.getValue(
CachedThemesKey,
StorageValueModes.Nonwrapped,
)) as SNTheme[]
)) as LocalStorageDecryptedContextualPayload[]
if (cachedThemes) {
const themes = []
for (const cachedTheme of cachedThemes) {

View File

@@ -14,8 +14,8 @@ import {
SNTag,
SystemViewId,
removeFromArray,
PayloadSource,
Uuid,
PayloadEmitSource,
} from '@standardnotes/snjs'
import { action, computed, IReactionDisposer, makeObservable, observable, reaction } from 'mobx'
import { ActionsMenuState } from './ActionsMenuState'
@@ -293,7 +293,7 @@ export class AppState {
this.application.streamItems<SNNote | SNTag>(
[ContentType.Note, ContentType.Tag],
async ({ changed, inserted, removed, source }) => {
if (![PayloadSource.PreSyncSave, PayloadSource.RemoteRetrieved].includes(source)) {
if (![PayloadEmitSource.PreSyncSave, PayloadEmitSource.RemoteRetrieved].includes(source)) {
return
}