Merge branch 'redmine-issues/13328' into 'develop'

REDMINE_ISSUE-13328

See merge request !324

src/components/Dropdown.vue

@@ -125,11 +125,10 @@ export default {
 
   methods: {
     toggleDropdown(val) {
-      if (this.isOpen) {
-        this.input = ''; // * clear input field when closing dropdown
-      } else if (this.search) {
-        //* focus on input if is a search dropdown
-        this.$refs.input.focus({
+      if (this.isOpen) { //* if dropdown is open :
+        this.input = ''; // * -> clear input field when closing dropdown
+      } else if (this.search) { //* if dropdown is closed is a search dropdown:
+        this.$refs.input.focus({ //*  -> focus on input field
           preventScroll: true,
         });
       } else if (this.clearable && val.target && this.selected) {
@@ -172,8 +171,9 @@ export default {
     },
 
     clickOutsideDropdown(e) {
-      if (!e.target.closest(`#custom-dropdown${this.identifier}`))
+      if (!e.target.closest(`#custom-dropdown${this.identifier}`) && this.isOpen) {
         this.toggleDropdown(false);
+      }
     },
   },
 };