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

fix: files navigation (#1084)

Browse Source
This commit is contained in:
Aman Harwara
2022-06-13 22:10:05 +05:30
committed by GitHub
parent 77137ecc34
commit 5d090572fe
11 changed files with 144 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
packages/web/src/javascripts/Components/NoteView/NoteView.test.ts
View File

@@ -52,7 +52,7 @@ describe('NoteView', () => {
it("should hide the note if at the time of the session expiration the note wasn't edited for longer than the allowed idle time", async () => {
const secondsElapsedSinceLastEdit = ProposedSecondsToDeferUILevelSessionExpirationDuringActiveInteraction + 5
noteViewController.note = {
noteViewController.item = {
protected: true,
userModifiedDate: new Date(Date.now() - secondsElapsedSinceLastEdit * 1000),
} as jest.Mocked<SNNote>
@@ -65,7 +65,7 @@ describe('NoteView', () => {
it('should postpone the note hiding by correct time if the time passed after its last modification is less than the allowed idle time', async () => {
const secondsElapsedSinceLastEdit = ProposedSecondsToDeferUILevelSessionExpirationDuringActiveInteraction - 3
noteViewController.note = {
noteViewController.item = {
protected: true,
userModifiedDate: new Date(Date.now() - secondsElapsedSinceLastEdit * 1000),
} as jest.Mocked<SNNote>
@@ -87,7 +87,7 @@ describe('NoteView', () => {
it('should postpone the note hiding by correct time if the user continued editing it even after the protection session has expired', async () => {
const secondsElapsedSinceLastModification = 3
noteViewController.note = {
noteViewController.item = {
protected: true,
userModifiedDate: new Date(Date.now() - secondsElapsedSinceLastModification * 1000),
} as jest.Mocked<SNNote>
@@ -98,7 +98,7 @@ describe('NoteView', () => {
ProposedSecondsToDeferUILevelSessionExpirationDuringActiveInteraction - secondsElapsedSinceLastModification
jest.advanceTimersByTime((secondsAfterWhichTheNoteShouldHide - 1) * 1000)
noteViewController.note = {
noteViewController.item = {
protected: true,
userModifiedDate: new Date(),
} as jest.Mocked<SNNote>
@@ -114,7 +114,7 @@ describe('NoteView', () => {
describe('note is unprotected', () => {
it('should not call any hiding logic', async () => {
noteViewController.note = {
noteViewController.item = {
protected: false,
} as jest.Mocked<SNNote>
@@ -126,7 +126,7 @@ describe('NoteView', () => {
describe('dismissProtectedWarning', () => {
beforeEach(() => {
noteViewController.note = {
noteViewController.item = {
protected: false,
} as jest.Mocked<SNNote>
})

4
packages/web/src/javascripts/Components/NoteView/NoteView.tsx
View File

@@ -118,7 +118,7 @@ class NoteView extends PureComponent<NoteViewProps, State> {
isDesktop: isDesktopApplication(),
lockText: NOTE_EDITING_DISABLED_TEXT,
noteStatus: undefined,
noteLocked: this.controller.note.locked,
noteLocked: this.controller.item.locked,
showLockedIcon: true,
showProtectedWarning: false,
spellcheck: true,
@@ -180,7 +180,7 @@ class NoteView extends PureComponent<NoteViewProps, State> {
}
get note() {
return this.controller.note
return this.controller.item
}
override componentDidMount(): void {