Merge branch 'develop' into fix/lock-app-on-background

app/assets/javascripts/components/NotesOptionsPanel.tsx

@@ -72,6 +72,7 @@ export const NotesOptionsPanel = observer(({ appState }: Props) => {
           maxHeight,
         }}
         className="sn-dropdown sn-dropdown--animated min-w-80 max-h-120 max-w-xs flex flex-col py-2 overflow-y-auto fixed"
+        onBlur={closeOnBlur}
       >
         {open && (
           <NotesOptions

app/assets/javascripts/components/SearchOptions.tsx

@@ -64,6 +64,7 @@ const SearchOptions = observer(({ appState }: Props) => {
           top: optionsPanelTop,
         }}
         className="sn-dropdown sn-dropdown--anchor-right sn-dropdown--animated min-w-80 absolute grid gap-2 py-2"
+        onBlur={closeOnBlur}
       >
         <Switch
           className="h-10"

app/assets/javascripts/ui_models/app_state/note_tags_state.ts

@@ -198,9 +198,15 @@ export class NoteTagsState {
   async removeTagFromActiveNote(tag: SNTag): Promise<void> {
     const { activeNote } = this;
     if (activeNote) {
-      await this.application.changeItem(tag.uuid, (mutator) => {
-        mutator.removeItemAsRelationship(activeNote);
-      });
+      const descendantTags = this.application.getTagDescendants(tag);
+      const tagsToRemove = [...descendantTags, tag];
+      await Promise.all(
+        tagsToRemove.map(async (tag) => {
+          await this.application.changeItem(tag.uuid, (mutator) => {
+            mutator.removeItemAsRelationship(activeNote);
+          });
+        })
+      );
       this.application.sync();
       this.reloadTags();
     }

app/assets/javascripts/ui_models/app_state/notes_state.ts

@@ -346,13 +346,18 @@ export class NotesState {
 
   async removeTagFromSelectedNotes(tag: SNTag): Promise<void> {
     const selectedNotes = Object.values(this.selectedNotes);
-    await this.application.changeItem(tag.uuid, (mutator) => {
-      for (const note of selectedNotes) {
-        mutator.removeItemAsRelationship(note);
-      }
-    });
+    const descendantTags = this.application.getTagDescendants(tag);
+    const tagsToRemove = [...descendantTags, tag];
+    await Promise.all(
+      tagsToRemove.map(async (tag) => {
+        await this.application.changeItem(tag.uuid, (mutator) => {
+          for (const note of selectedNotes) {
+            mutator.removeItemAsRelationship(note);
+          }
+        });
+      })
+    );
     this.application.sync();
-
   }
 
   isTagInSelectedNotes(tag: SNTag): boolean {