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

fix: fix focus on previous tag after tag deletion

Browse Source
This commit is contained in:
Antonella Sgarlatta
2021-06-02 18:59:43 -03:00
parent f9c2b19eac
commit 54fbb606eb
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/assets/javascripts/components/NoteTag.tsx
View File

@@ -28,14 +28,8 @@ export const NoteTag: FunctionalComponent<Props> = ({ appState, tag }) => {
const [closeOnBlur] = useCloseOnBlur(contextMenuRef, setContextMenuOpen); const [closeOnBlur] = useCloseOnBlur(contextMenuRef, setContextMenuOpen);
useCloseOnClickOutside(contextMenuRef, setContextMenuOpen); useCloseOnClickOutside(contextMenuRef, setContextMenuOpen);
const deleteTag = async () => { const deleteTag = () => {
await appState.activeNote.removeTagFromActiveNote(tag); appState.activeNote.removeTagFromActiveNote(tag);
const previousTag = appState.activeNote.getPreviousTag(tag);
if (previousTag) {
const previousTagElement = appState.activeNote.getTagElement(previousTag);
previousTagElement?.focus();
}
}; };
const onTagClick = () => { const onTagClick = () => {

5
app/assets/javascripts/ui_models/app_state/active_note_state.ts
View File

@@ -203,10 +203,15 @@ export class ActiveNoteState {
async removeTagFromActiveNote(tag: SNTag): Promise<void> { async removeTagFromActiveNote(tag: SNTag): Promise<void> {
const { activeNote } = this; const { activeNote } = this;
if (activeNote) { if (activeNote) {
const previousTag = this.getPreviousTag(tag);
await this.application.changeItem(tag.uuid, (mutator) => { await this.application.changeItem(tag.uuid, (mutator) => {
mutator.removeItemAsRelationship(activeNote); mutator.removeItemAsRelationship(activeNote);
}); });
this.application.sync(); this.application.sync();
if (previousTag) {
const previousTagElement = this.getTagElement(previousTag);
previousTagElement?.focus();
}
this.reloadTags(); this.reloadTags();
} }
} }