Fix: Add selected tag to new notes by default (#2556)

If you are on a selected tag and choose to add a new note, the new note will now automatically get that tag added to it.
Automattic · Apr 8, 2021 · 21bd75e · 21bd75e
1 parent 39ee292
commit 21bd75e
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/lib/search/index.ts b/lib/search/index.ts
@@ -368,7 +368,14 @@ export const middleware: S.Middleware = (store) => {
       }
 
       case 'CREATE_NOTE_WITH_ID':
-        searchState.collection = { type: 'all' };
+        if (action.note?.tags && action.note?.tags.length > 0) {
+          searchState.collection = {
+            type: 'tag',
+            tagName: action.note.tags[0],
+          };
+        } else {
+          searchState.collection = { type: 'all' };
+        }
         searchState.notes.set(action.noteId, toSearchNote(action.note ?? {}));
         indexNote(action.noteId);
         queueSearch();

diff --git a/lib/state/data/middleware.ts b/lib/state/data/middleware.ts
@@ -2,11 +2,12 @@ import { v4 as uuid } from 'uuid';
 
 import { tagHashOf } from '../../utils/tag-hash';
 import exportZipArchive from '../../utils/export';
+import { withTag } from '../../utils/tag-hash';
 
 import type * as A from '../action-types';
 import type * as S from '../';
 import type * as T from '../../types';
-import { numberOfNonEmailTags } from '../selectors';
+import { numberOfNonEmailTags, openedTag } from '../selectors';
 
 export const middleware: S.Middleware = (store) => (
   next: (action: A.ActionType) => A.ActionType
@@ -30,10 +31,15 @@ export const middleware: S.Middleware = (store) => (
         systemTags.splice(markdownInNote, 1);
       }
 
+      // apply selected tag by default
+      const selectedTag = openedTag(state);
+      const givenTags = action.note?.tags ?? [];
+      const tags = selectedTag ? withTag(givenTags, selectedTag) : givenTags;
+
       return next({
         type: 'CREATE_NOTE_WITH_ID',
         noteId,
-        note: { ...action.note, systemTags },
+        note: { ...action.note, systemTags, tags },
         meta: {
           nextNoteToOpen: noteId,
         },

diff --git a/lib/state/ui/reducer.ts b/lib/state/ui/reducer.ts
@@ -108,6 +108,8 @@ const collection: A.Reducer<T.Collection> = (
     case 'CREATE_NOTE_WITH_ID': {
       if (state.type === 'trash') {
         return { type: 'all' };
+      } else if (state.type === 'tag') {
+        return { type: 'tag', tagName: state.tagName };
       }
       return state;
     }