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

refactor: rename states to view controllers (#1060)

Browse Source
This commit is contained in:
Mo
2022-06-01 10:15:45 -05:00
committed by GitHub
parent 78f39ec85d
commit 54125cec21
177 changed files with 1518 additions and 1365 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/assets/javascripts/Components/NoteView/NoteView.test.ts
View File

@@ -2,9 +2,9 @@
* @jest-environment jsdom
*/
import { WebApplication } from '@/UIModels/Application'
import { AppState } from '@/UIModels/AppState'
import { NotesState } from '@/UIModels/AppState/NotesState'
import { WebApplication } from '@/Application/Application'
import { ViewControllerManager } from '@/Services/ViewControllerManager'
import { NotesController } from '@/Controllers/NotesController'
import {
ApplicationEvent,
ProposedSecondsToDeferUILevelSessionExpirationDuringActiveInteraction,
@@ -17,8 +17,8 @@ import NoteView from './NoteView'
describe('NoteView', () => {
let noteViewController: NoteViewController
let application: WebApplication
let appState: AppState
let notesState: NotesState
let viewControllerManager: ViewControllerManager
let notesState: NotesController
const createNoteView = () =>
new NoteView({
@@ -31,15 +31,15 @@ describe('NoteView', () => {
noteViewController = {} as jest.Mocked<NoteViewController>
notesState = {} as jest.Mocked<NotesState>
notesState = {} as jest.Mocked<NotesController>
notesState.setShowProtectedWarning = jest.fn()
appState = {
notes: notesState,
} as jest.Mocked<AppState>
viewControllerManager = {
notesController: notesState,
} as jest.Mocked<ViewControllerManager>
application = {} as jest.Mocked<WebApplication>
application.getAppState = jest.fn().mockReturnValue(appState)
application.getViewControllerManager = jest.fn().mockReturnValue(viewControllerManager)
application.hasProtectionSources = jest.fn().mockReturnValue(true)
application.authorizeNoteAccess = jest.fn()
})

32
app/assets/javascripts/Components/NoteView/NoteView.tsx
View File

@@ -14,7 +14,7 @@ import {
PayloadEmitSource,
} from '@standardnotes/snjs'
import { debounce, isDesktopApplication } from '@/Utils'
import { EventSource } from '../../UIModels/AppState/EventSource'
import { EditorEventSource } from '../../Typings/EditorEventSource'
import { KeyboardModifier, KeyboardKey } from '@/Services/IOService'
import { STRING_DELETE_PLACEHOLDER_ATTEMPT, STRING_DELETE_LOCKED_ATTEMPT, StringDeleteNote } from '@/Strings'
import { confirmDialog } from '@/Services/AlertService'
@@ -82,7 +82,7 @@ class NoteView extends PureComponent<NoteViewProps, State> {
readonly controller!: NoteViewController
private statusTimeout?: NodeJS.Timeout
private lastEditorFocusEventSource?: EventSource
private lastEditorFocusEventSource?: EditorEventSource
onEditorComponentLoad?: () => void
private scrollPosition = 0
@@ -193,7 +193,7 @@ class NoteView extends PureComponent<NoteViewProps, State> {
this.autorun(() => {
this.setState({
showProtectedWarning: this.appState.notes.showProtectedWarning,
showProtectedWarning: this.viewControllerManager.notesController.showProtectedWarning,
})
})
@@ -577,7 +577,7 @@ class NoteView extends PureComponent<NoteViewProps, State> {
focusEditor() {
const element = document.getElementById(ElementIds.NoteTextEditor)
if (element) {
this.lastEditorFocusEventSource = EventSource.Script
this.lastEditorFocusEventSource = EditorEventSource.Script
element.focus()
}
}
@@ -588,13 +588,13 @@ class NoteView extends PureComponent<NoteViewProps, State> {
onContentFocus = () => {
if (this.lastEditorFocusEventSource) {
this.application.getAppState().editorDidFocus(this.lastEditorFocusEventSource)
this.application.getViewControllerManager().editorDidFocus(this.lastEditorFocusEventSource)
}
this.lastEditorFocusEventSource = undefined
}
setShowProtectedOverlay(show: boolean) {
this.appState.notes.setShowProtectedWarning(show)
this.viewControllerManager.notesController.setShowProtectedWarning(show)
}
async deleteNote(permanently: boolean) {
@@ -653,7 +653,7 @@ class NoteView extends PureComponent<NoteViewProps, State> {
}
async reloadSpellcheck() {
const spellcheck = this.appState.notes.getSpellcheckStateForNote(this.note)
const spellcheck = this.viewControllerManager.notesController.getSpellcheckStateForNote(this.note)
if (spellcheck !== this.state.spellcheck) {
this.setState({ textareaUnloading: true })
@@ -871,7 +871,7 @@ class NoteView extends PureComponent<NoteViewProps, State> {
{this.state.showProtectedWarning && (
<div className="h-full flex justify-center items-center">
<ProtectedNoteOverlay
appState={this.appState}
viewControllerManager={this.viewControllerManager}
hasProtectionSources={this.application.hasProtectionSources()}
onViewNote={this.dismissProtectedWarning}
/>
@@ -898,7 +898,7 @@ class NoteView extends PureComponent<NoteViewProps, State> {
showLockedIcon: false,
})
}}
onClick={() => this.appState.notes.setLockSelectedNotes(!this.state.noteLocked)}
onClick={() => this.viewControllerManager.notesController.setLockSelectedNotes(!this.state.noteLocked)}
showLockedIcon={this.state.showLockedIcon}
lockText={this.state.lockText}
/>
@@ -942,31 +942,31 @@ class NoteView extends PureComponent<NoteViewProps, State> {
<div className="mr-3">
<AttachedFilesButton
application={this.application}
appState={this.appState}
viewControllerManager={this.viewControllerManager}
onClickPreprocessing={this.ensureNoteIsInsertedBeforeUIAction}
/>
</div>
<div className="mr-3">
<ChangeEditorButton
application={this.application}
appState={this.appState}
viewControllerManager={this.viewControllerManager}
onClickPreprocessing={this.ensureNoteIsInsertedBeforeUIAction}
/>
</div>
<div className="mr-3">
<PinNoteButton
appState={this.appState}
viewControllerManager={this.viewControllerManager}
onClickPreprocessing={this.ensureNoteIsInsertedBeforeUIAction}
/>
</div>
<NotesOptionsPanel
application={this.application}
appState={this.appState}
viewControllerManager={this.viewControllerManager}
onClickPreprocessing={this.ensureNoteIsInsertedBeforeUIAction}
/>
</div>
</div>
<NoteTagsContainer appState={this.appState} />
<NoteTagsContainer viewControllerManager={this.viewControllerManager} />
</div>
)}
@@ -993,7 +993,7 @@ class NoteView extends PureComponent<NoteViewProps, State> {
onLoad={this.onEditorComponentLoad}
requestReload={this.editorComponentViewerRequestsReload}
application={this.application}
appState={this.appState}
viewControllerManager={this.viewControllerManager}
/>
</div>
)}
@@ -1068,7 +1068,7 @@ class NoteView extends PureComponent<NoteViewProps, State> {
key={viewer.identifier}
componentViewer={viewer}
application={this.application}
appState={this.appState}
viewControllerManager={this.viewControllerManager}
/>
</div>
)

2
app/assets/javascripts/Components/NoteView/NoteViewProps.ts
View File

@@ -1,6 +1,6 @@
import { NoteViewController } from '@standardnotes/snjs'
import { WebApplication } from '@/UIModels/Application'
import { WebApplication } from '@/Application/Application'
export interface NoteViewProps {
application: WebApplication