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

fix: enable, disable, sync editor stack per note

Browse Source
This commit is contained in:
Baptiste Grob
2020-07-07 12:01:11 +02:00
parent e45d28b07a
commit e280309be6
2 changed files with 181 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/views/editor/editor-view.pug
View File

@@ -249,9 +249,9 @@
.sk-label {{component.name}} .sk-label {{component.name}}
.sn-component .sn-component
component-view.component-view.component-stack-item( component-view.component-view.component-stack-item(
ng-repeat='component in self.state.activeStackComponents track by component.uuid', ng-repeat='component in self.state.allStackComponents track by component.uuid',
component-uuid='component.uuid', component-uuid='component.uuid',
manual-dealloc='true', manual-dealloc='true',
ng-show='!self.stackComponentHidden(component)', ng-show='!self.stackComponentHidden(component)',
application='self.application' application='self.application'
) )

131
app/assets/javascripts/views/editor/editor_view.ts
View File

@@ -15,7 +15,7 @@ import {
ComponentArea, ComponentArea,
ComponentAction, ComponentAction,
WebPrefKey, WebPrefKey,
ComponentMutator ComponentMutator,
} from 'snjs'; } from 'snjs';
import find from 'lodash/find'; import find from 'lodash/find';
import { isDesktopApplication } from '@/utils'; import { isDesktopApplication } from '@/utils';
@@ -90,12 +90,11 @@ type EditorValues = {
tagsInputValue?: string tagsInputValue?: string
} }
interface EditorViewScope { function sortAlphabetically(array: SNComponent[]): SNComponent[] {
application: WebApplication return array.sort((a, b) => a.name.toLowerCase() < b.name.toLowerCase() ? -1 : 1);
editor: Editor
} }
class EditorViewCtrl extends PureViewCtrl implements EditorViewScope { class EditorViewCtrl extends PureViewCtrl<{}, EditorState> {
/** Passed through template */ /** Passed through template */
readonly application!: WebApplication readonly application!: WebApplication
readonly editor!: Editor readonly editor!: Editor
@@ -212,17 +211,14 @@ class EditorViewCtrl extends PureViewCtrl implements EditorViewScope {
if (currentEditor && newEditor && currentEditor.uuid !== newEditor.uuid) { if (currentEditor && newEditor && currentEditor.uuid !== newEditor.uuid) {
/** Unload current component view so that we create a new one, /** Unload current component view so that we create a new one,
* then change the active editor */ * then change the active editor */
await this.setEditorState({ await this.setState({
editorComponentUnloading: true editorComponentUnloading: true
}); });
} }
await this.setEditorState({ this.setState({
activeEditorComponent: newEditor, activeEditorComponent: newEditor,
activeTagsComponent: this.componentGroup.activeComponentForArea(ComponentArea.NoteTags), activeTagsComponent: this.componentGroup.activeComponentForArea(ComponentArea.NoteTags),
activeStackComponents: this.componentGroup.activeComponentsForArea(ComponentArea.EditorStack) /** Stop unloading, if we were already unloading */
})
/** Stop unloading, if we were already unloading */
await this.setEditorState({
editorComponentUnloading: false editorComponentUnloading: false
}); });
} }
@@ -237,14 +233,19 @@ class EditorViewCtrl extends PureViewCtrl implements EditorViewScope {
editorDebounce: EDITOR_DEBOUNCE, editorDebounce: EDITOR_DEBOUNCE,
isDesktop: isDesktopApplication(), isDesktop: isDesktopApplication(),
spellcheck: true, spellcheck: true,
syncTakingTooLong: false,
showExtensions: false,
showOptionsMenu: false,
showEditorMenu: false,
showSessionHistory: false,
altKeyDown: false,
noteStatus: undefined,
editorComponentUnloading: false,
textareaUnloading: false,
mutable: { mutable: {
tagsString: '' tagsString: ''
} }
} as Partial<EditorState>; } as EditorState;
}
async setEditorState(state: Partial<EditorState>) {
return this.setState(state);
} }
async onAppLaunch() { async onAppLaunch() {
@@ -263,10 +264,10 @@ class EditorViewCtrl extends PureViewCtrl implements EditorViewScope {
/** @override */ /** @override */
onAppEvent(eventName: ApplicationEvent) { onAppEvent(eventName: ApplicationEvent) {
if (eventName === ApplicationEvent.HighLatencySync) { if (eventName === ApplicationEvent.HighLatencySync) {
this.setEditorState({ syncTakingTooLong: true }); this.setState({ syncTakingTooLong: true });
} else if (eventName === ApplicationEvent.CompletedFullSync) { } else if (eventName === ApplicationEvent.CompletedFullSync) {
this.setEditorState({ syncTakingTooLong: false }); this.setState({ syncTakingTooLong: false });
const isInErrorState = this.getState().saveError; const isInErrorState = this.state.saveError;
/** if we're still dirty, don't change status, a sync is likely upcoming. */ /** if we're still dirty, don't change status, a sync is likely upcoming. */
if (!this.note.dirty && isInErrorState) { if (!this.note.dirty && isInErrorState) {
this.showAllChangesSavedStatus(); this.showAllChangesSavedStatus();
@@ -289,11 +290,11 @@ class EditorViewCtrl extends PureViewCtrl implements EditorViewScope {
} }
get activeEditorComponent() { get activeEditorComponent() {
return this.getState().activeEditorComponent; return this.state.activeEditorComponent;
} }
get activeTagsComponent() { get activeTagsComponent() {
return this.getState().activeTagsComponent; return this.state.activeTagsComponent;
} }
get componentGroup() { get componentGroup() {
@@ -302,7 +303,7 @@ class EditorViewCtrl extends PureViewCtrl implements EditorViewScope {
async handleEditorNoteChange() { async handleEditorNoteChange() {
this.cancelPendingSetStatus(); this.cancelPendingSetStatus();
await this.setEditorState({ await this.setState({
showExtensions: false, showExtensions: false,
showOptionsMenu: false, showOptionsMenu: false,
showEditorMenu: false, showEditorMenu: false,
@@ -322,25 +323,26 @@ class EditorViewCtrl extends PureViewCtrl implements EditorViewScope {
} }
} }
async reloadComponentEditorState() { async reloadComponentEditorState(): Promise<{ editor?: SNComponent, changed: boolean }> {
const associatedEditor = this.application.componentManager!.editorForNote(this.note); const editor = this.application.componentManager!.editorForNote(this.note);
if (!associatedEditor) { if (!editor) {
/** No editor */ let changed: boolean;
let changed = false;
if (this.activeEditorComponent) { if (this.activeEditorComponent) {
await this.componentGroup.deactivateComponentForArea(ComponentArea.Editor); await this.componentGroup.deactivateComponentForArea(ComponentArea.Editor);
changed = true; changed = true;
} else {
changed = false;
} }
return { editor: undefined, changed }; return { editor, changed };
} }
if (associatedEditor.uuid === this.activeEditorComponent?.uuid) { if (editor.uuid === this.activeEditorComponent?.uuid) {
/** Same editor, no change */ /** Same editor, no change */
return { editor: associatedEditor, changed: false }; return { editor, changed: false };
} }
await this.componentGroup.activateComponent(associatedEditor); await this.componentGroup.activateComponent(editor);
return { editor: associatedEditor, changed: true }; return { editor, changed: true };
} }
/** /**
@@ -381,38 +383,39 @@ class EditorViewCtrl extends PureViewCtrl implements EditorViewScope {
this.removeComponentsObserver = this.application.streamItems( this.removeComponentsObserver = this.application.streamItems(
ContentType.Component, ContentType.Component,
async (items) => { async (items) => {
const components = items as SNComponent[]; if (!this.note) return;
if (!this.note) { this.setState({
return; allStackComponents: sortAlphabetically(
} this.application.componentManager!.componentsForArea(ComponentArea.EditorStack)
/** Reload componentStack in case new ones were added or removed */ .filter(component => component.active)
await this.reloadComponentStack(); )
});
this.reloadComponentContext();
this.reloadNoteTagsComponent(); this.reloadNoteTagsComponent();
/** Observe editor changes to see if the current note should update its editor */ /** Observe editor changes to see if the current note should update its editor */
const components = items as SNComponent[];
const editors = components.filter((component) => { const editors = components.filter((component) => {
return component.isEditor(); return component.isEditor();
}); });
if (editors.length === 0) { if (editors.length) {
return; /** Find the most recent editor for note */
} const { editor, changed } = await this.reloadComponentEditorState();
/** Find the most recent editor for note */
this.reloadComponentEditorState().then(({ editor, changed }) => {
if (!editor && changed) { if (!editor && changed) {
this.reloadFont(); this.reloadFont();
} }
}); }
} }
); );
} }
setMenuState(menu: string, state: boolean) { setMenuState(menu: string, state: boolean) {
this.setEditorState({ this.setState({
[menu]: state [menu]: state
}); });
this.closeAllMenus(menu); this.closeAllMenus(menu);
} }
toggleMenu(menu: string) { toggleMenu(menu: keyof EditorState) {
this.setMenuState(menu, !this.state[menu]); this.setMenuState(menu, !this.state[menu]);
} }
@@ -429,7 +432,7 @@ class EditorViewCtrl extends PureViewCtrl implements EditorViewScope {
menuState[candidate] = false; menuState[candidate] = false;
} }
} }
this.setEditorState(menuState); this.setState(menuState);
} }
async editorMenuOnSelect(component?: SNComponent) { async editorMenuOnSelect(component?: SNComponent) {
@@ -569,7 +572,7 @@ class EditorViewCtrl extends PureViewCtrl implements EditorViewScope {
} }
showAllChangesSavedStatus() { showAllChangesSavedStatus() {
this.setEditorState({ this.setState({
saveError: false, saveError: false,
syncTakingTooLong: false syncTakingTooLong: false
}); });
@@ -585,7 +588,7 @@ class EditorViewCtrl extends PureViewCtrl implements EditorViewScope {
desc: "Changes saved offline" desc: "Changes saved offline"
}; };
} }
this.setEditorState({ this.setState({
saveError: true, saveError: true,
syncTakingTooLong: false syncTakingTooLong: false
}); });
@@ -609,7 +612,7 @@ class EditorViewCtrl extends PureViewCtrl implements EditorViewScope {
} }
this.statusTimeout = this.$timeout(() => { this.statusTimeout = this.$timeout(() => {
status.date = new Date(); status.date = new Date();
this.setEditorState({ this.setState({
noteStatus: status noteStatus: status
}); });
}, waitForMs); }, waitForMs);
@@ -876,7 +879,7 @@ class EditorViewCtrl extends PureViewCtrl implements EditorViewScope {
public async saveTagsFromStrings(strings?: string[]) { public async saveTagsFromStrings(strings?: string[]) {
if ( if (
!strings !strings
&& this.editorValues.tagsInputValue === this.getState().tagsAsStrings && this.editorValues.tagsInputValue === this.state.tagsAsStrings
) { ) {
return; return;
} }
@@ -965,7 +968,7 @@ class EditorViewCtrl extends PureViewCtrl implements EditorViewScope {
WebPrefKey.EditorResizersEnabled, WebPrefKey.EditorResizersEnabled,
true true
); );
await this.setEditorState({ await this.setState({
monospaceFont, monospaceFont,
spellcheck, spellcheck,
marginResizersEnabled marginResizersEnabled
@@ -979,7 +982,7 @@ class EditorViewCtrl extends PureViewCtrl implements EditorViewScope {
this.reloadFont(); this.reloadFont();
if ( if (
this.getState().marginResizersEnabled && this.state.marginResizersEnabled &&
this.leftPanelPuppet!.ready && this.leftPanelPuppet!.ready &&
this.rightPanelPuppet!.ready this.rightPanelPuppet!.ready
) { ) {
@@ -1009,8 +1012,8 @@ class EditorViewCtrl extends PureViewCtrl implements EditorViewScope {
if (!editor) { if (!editor) {
return; return;
} }
if (this.getState().monospaceFont) { if (this.state.monospaceFont) {
if (this.getState().isDesktop) { if (this.state.isDesktop) {
editor.style.fontFamily = Fonts.DesktopMonospaceFamily; editor.style.fontFamily = Fonts.DesktopMonospaceFamily;
} else { } else {
editor.style.fontFamily = Fonts.WebMonospaceFamily; editor.style.fontFamily = Fonts.WebMonospaceFamily;
@@ -1021,21 +1024,21 @@ class EditorViewCtrl extends PureViewCtrl implements EditorViewScope {
} }
async toggleWebPrefKey(key: WebPrefKey) { async toggleWebPrefKey(key: WebPrefKey) {
const currentValue = this.state[key]; const currentValue = (this.state as any)[key];
await this.application.getPrefsService().setUserPrefValue( await this.application.getPrefsService().setUserPrefValue(
key, key,
!currentValue, !currentValue,
true true
); );
await this.setEditorState({ await this.setState({
[key]: !currentValue [key]: !currentValue
}) })
this.reloadFont(); this.reloadFont();
if (key === WebPrefKey.EditorSpellcheck) { if (key === WebPrefKey.EditorSpellcheck) {
/** Allows textarea to reload */ /** Allows textarea to reload */
await this.setEditorState({ textareaUnloading: true }); await this.setState({ textareaUnloading: true });
await this.setEditorState({ textareaUnloading: false }); await this.setState({ textareaUnloading: false });
this.reloadFont(); this.reloadFont();
} else if (key === WebPrefKey.EditorResizersEnabled && this.state[key] === true) { } else if (key === WebPrefKey.EditorResizersEnabled && this.state[key] === true) {
this.$timeout(() => { this.$timeout(() => {
@@ -1060,7 +1063,7 @@ class EditorViewCtrl extends PureViewCtrl implements EditorViewScope {
if ( if (
componentUuid === currentEditor?.uuid || componentUuid === currentEditor?.uuid ||
componentUuid === this.activeTagsComponent?.uuid || componentUuid === this.activeTagsComponent?.uuid ||
Uuids(this.getState().activeStackComponents).includes(componentUuid) Uuids(this.state.allStackComponents).includes(componentUuid)
) { ) {
return this.note; return this.note;
} }
@@ -1128,7 +1131,7 @@ class EditorViewCtrl extends PureViewCtrl implements EditorViewScope {
.sort((a, b) => { .sort((a, b) => {
return a.name.toLowerCase() < b.name.toLowerCase() ? -1 : 1; return a.name.toLowerCase() < b.name.toLowerCase() ? -1 : 1;
}); });
await this.setEditorState({ await this.setState({
allStackComponents: components allStackComponents: components
}); });
this.reloadComponentContext(); this.reloadComponentContext();
@@ -1144,7 +1147,7 @@ class EditorViewCtrl extends PureViewCtrl implements EditorViewScope {
reloadComponentContext() { reloadComponentContext() {
if (this.note) { if (this.note) {
for (const component of this.getState().allStackComponents!) { for (const component of this.state.allStackComponents!) {
if (component.active) { if (component.active) {
this.application.componentManager!.setComponentHidden( this.application.componentManager!.setComponentHidden(
component, component,
@@ -1203,12 +1206,12 @@ class EditorViewCtrl extends PureViewCtrl implements EditorViewScope {
KeyboardModifier.Alt KeyboardModifier.Alt
], ],
onKeyDown: () => { onKeyDown: () => {
this.setEditorState({ this.setState({
altKeyDown: true altKeyDown: true
}); });
}, },
onKeyUp: () => { onKeyUp: () => {
this.setEditorState({ this.setState({
altKeyDown: false altKeyDown: false
}); });
} }