Focus editor on new note

This commit is contained in:
Mo Bitar
2020-01-31 10:29:32 -06:00
parent 05e5f311ad
commit 53f6b82dd6
3 changed files with 11 additions and 24 deletions

View File

@@ -18,14 +18,14 @@ import {
STRING_DELETE_LOCKED_ATTEMPT, STRING_DELETE_LOCKED_ATTEMPT,
StringDeleteNote, StringDeleteNote,
StringEmptyTrash StringEmptyTrash
} from '@/strings' } from '@/strings';
import { import {
PREF_EDITOR_WIDTH, PREF_EDITOR_WIDTH,
PREF_EDITOR_LEFT, PREF_EDITOR_LEFT,
PREF_EDITOR_MONOSPACE_ENABLED, PREF_EDITOR_MONOSPACE_ENABLED,
PREF_EDITOR_SPELLCHECK, PREF_EDITOR_SPELLCHECK,
PREF_EDITOR_RESIZERS_ENABLED PREF_EDITOR_RESIZERS_ENABLED
} from '@/services/preferencesManager' } from '@/services/preferencesManager';
const NOTE_PREVIEW_CHAR_LIMIT = 80; const NOTE_PREVIEW_CHAR_LIMIT = 80;
const MINIMUM_STATUS_DURATION = 400; const MINIMUM_STATUS_DURATION = 400;
@@ -112,7 +112,7 @@ class EditorCtrl extends PureCtrl {
} else if (eventName === APP_STATE_EVENT_PREFERENCES_CHANGED) { } else if (eventName === APP_STATE_EVENT_PREFERENCES_CHANGED) {
this.loadPreferences(); this.loadPreferences();
} }
}) });
} }
async handleNoteSelectionChange(note, previousNote) { async handleNoteSelectionChange(note, previousNote) {
@@ -122,7 +122,7 @@ class EditorCtrl extends PureCtrl {
showOptionsMenu: false, showOptionsMenu: false,
altKeyDown: false, altKeyDown: false,
noteStatus: null noteStatus: null
}) });
if (!note) { if (!note) {
return; return;
} }
@@ -148,8 +148,8 @@ class EditorCtrl extends PureCtrl {
this.reloadTagsString(); this.reloadTagsString();
this.loadPreferences(); this.loadPreferences();
if (note.safeText().length === 0 && note.dummy) { if (note.dummy) {
this.focusTitle(100); this.focusEditor();
} }
if (previousNote && previousNote !== note) { if (previousNote && previousNote !== note) {
if (previousNote.dummy) { if (previousNote.dummy) {
@@ -365,13 +365,13 @@ class EditorCtrl extends PureCtrl {
if (element) { if (element) {
element.focus(); element.focus();
} }
}, delay) }, delay);
} }
focusTitle(delay) { focusTitle(delay) {
setTimeout(function () { setTimeout(function () {
document.getElementById(ELEMENT_ID_NOTE_TITLE_EDITOR).focus(); document.getElementById(ELEMENT_ID_NOTE_TITLE_EDITOR).focus();
}, delay) }, delay);
} }
clickedTextArea() { clickedTextArea() {
@@ -692,12 +692,6 @@ class EditorCtrl extends PureCtrl {
}); });
} }
clickedEditNote() {
this.focusEditor({
delay: 100
});
}
reloadTagsString() { reloadTagsString() {
this.setState({ this.setState({
tagsString: this.state.note.tagsString() tagsString: this.state.note.tagsString()

View File

@@ -527,8 +527,8 @@ function (_PureCtrl) {
this.reloadTagsString(); this.reloadTagsString();
this.loadPreferences(); this.loadPreferences();
if (note.safeText().length === 0 && note.dummy) { if (note.dummy) {
this.focusTitle(100); this.focusEditor();
} }
if (previousNote && previousNote !== note) { if (previousNote && previousNote !== note) {
@@ -1138,13 +1138,6 @@ function (_PureCtrl) {
dontUpdatePreviews: true dontUpdatePreviews: true
}); });
} }
}, {
key: "clickedEditNote",
value: function clickedEditNote() {
this.focusEditor({
delay: 100
});
}
}, { }, {
key: "reloadTagsString", key: "reloadTagsString",
value: function reloadTagsString() { value: function reloadTagsString() {

File diff suppressed because one or more lines are too long