Commit 8470c131 authored by Himanshu Kapoor's avatar Himanshu Kapoor

Focus on the input when clicked outside the input

Fixed in MR list and branch list components.

Earlier clicking right outside the input box closed
the dropdown, which was unexpected behaviour. To
make it consistent with the behaviour of select2
jquery plugin, I have made clicking outside the
input focus on the input by using a label.
parent f6a201a8
...@@ -58,19 +58,17 @@ export default { ...@@ -58,19 +58,17 @@ export default {
<template> <template>
<div> <div>
<div class="dropdown-input mt-3 pb-3 mb-0 border-bottom"> <label class="dropdown-input pt-3 pb-3 mb-0 border-bottom block position-relative" @click.stop>
<div class="position-relative"> <input
<input ref="searchInput"
ref="searchInput" v-model="search"
v-model="search" :placeholder="__('Search branches')"
:placeholder="__('Search branches')" type="search"
type="search" class="form-control dropdown-input-field"
class="form-control dropdown-input-field" @input="searchBranches"
@input="searchBranches" />
/> <icon :size="18" name="search" class="input-icon" />
<icon :size="18" name="search" class="input-icon" /> </label>
</div>
</div>
<div class="dropdown-content ide-merge-requests-dropdown-content d-flex"> <div class="dropdown-content ide-merge-requests-dropdown-content d-flex">
<gl-loading-icon <gl-loading-icon
v-if="isLoading" v-if="isLoading"
......
...@@ -76,19 +76,17 @@ export default { ...@@ -76,19 +76,17 @@ export default {
<template> <template>
<div> <div>
<div class="dropdown-input mt-3 pb-3 mb-0 border-bottom"> <label class="dropdown-input pt-3 pb-3 mb-0 border-bottom block" @click.stop>
<div class="position-relative"> <tokened-input
<tokened-input v-model="search"
v-model="search" :tokens="searchTokens"
:tokens="searchTokens" :placeholder="__('Search merge requests')"
:placeholder="__('Search merge requests')" @focus="onSearchFocus"
@focus="onSearchFocus" @input="searchMergeRequests"
@input="searchMergeRequests" @removeToken="setSearchType(null)"
@removeToken="setSearchType(null)" />
/> <icon :size="18" name="search" class="input-icon" />
<icon :size="18" name="search" class="input-icon" /> </label>
</div>
</div>
<div class="dropdown-content ide-merge-requests-dropdown-content d-flex"> <div class="dropdown-content ide-merge-requests-dropdown-content d-flex">
<gl-loading-icon <gl-loading-icon
v-if="isLoading" v-if="isLoading"
...@@ -107,7 +105,7 @@ export default { ...@@ -107,7 +105,7 @@ export default {
<span class="d-flex append-right-default ide-search-list-current-icon"> <span class="d-flex append-right-default ide-search-list-current-icon">
<icon :size="18" name="search" /> <icon :size="18" name="search" />
</span> </span>
<span> {{ searchType.label }} </span> <span>{{ searchType.label }}</span>
</button> </button>
</li> </li>
</template> </template>
......
...@@ -1188,7 +1188,7 @@ $ide-commit-header-height: 48px; ...@@ -1188,7 +1188,7 @@ $ide-commit-header-height: 48px;
.input-icon { .input-icon {
right: auto; right: auto;
left: 10px; left: 26px;
top: 50%; top: 50%;
transform: translateY(-50%); transform: translateY(-50%);
} }
......
---
title: Fix an issue where clicking outside the MR/branch search box in WebIDE closed the dropdown.
merge_request: 31523
author:
type: fixed
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment