diff options
Diffstat (limited to 'app/assets/javascripts/vue_shared/components/timezone_dropdown.vue')
-rw-r--r-- | app/assets/javascripts/vue_shared/components/timezone_dropdown.vue | 35 |
1 files changed, 14 insertions, 21 deletions
diff --git a/app/assets/javascripts/vue_shared/components/timezone_dropdown.vue b/app/assets/javascripts/vue_shared/components/timezone_dropdown.vue index 135b9842cbf..f6721f5a27b 100644 --- a/app/assets/javascripts/vue_shared/components/timezone_dropdown.vue +++ b/app/assets/javascripts/vue_shared/components/timezone_dropdown.vue @@ -1,5 +1,5 @@ <script> -import { GlDropdown, GlDeprecatedDropdownItem, GlSearchBoxByType, GlIcon } from '@gitlab/ui'; +import { GlDropdown, GlDropdownItem, GlSearchBoxByType } from '@gitlab/ui'; import { __ } from '~/locale'; import autofocusonshow from '~/vue_shared/directives/autofocusonshow'; @@ -7,9 +7,8 @@ export default { name: 'TimezoneDropdown', components: { GlDropdown, - GlDeprecatedDropdownItem, + GlDropdownItem, GlSearchBoxByType, - GlIcon, }, directives: { autofocusonshow, @@ -74,29 +73,23 @@ export default { }; </script> <template> - <gl-dropdown :text="value" block lazy menu-class="gl-w-full!"> - <template #button-content> - <span class="gl-flex-grow-1" :class="{ 'gl-text-gray-300': !value }"> - {{ selectedTimezoneLabel }} - </span> - <gl-icon name="chevron-down" /> - </template> - - <gl-search-box-by-type v-model.trim="searchTerm" v-autofocusonshow autofocus class="gl-m-3" /> - <gl-deprecated-dropdown-item + <gl-dropdown :text="selectedTimezoneLabel" block lazy menu-class="gl-w-full!"> + <gl-search-box-by-type v-model.trim="searchTerm" v-autofocusonshow autofocus /> + <gl-dropdown-item v-for="timezone in filteredResults" :key="timezone.formattedTimezone" + :is-checked="isSelected(timezone)" + :is-check-item="true" @click="selectTimezone(timezone)" > - <gl-icon - :class="{ invisible: !isSelected(timezone) }" - name="mobile-issue-close" - class="gl-vertical-align-middle" - /> {{ timezone.formattedTimezone }} - </gl-deprecated-dropdown-item> - <gl-deprecated-dropdown-item v-if="!filteredResults.length" data-testid="noMatchingResults"> + </gl-dropdown-item> + <gl-dropdown-item + v-if="!filteredResults.length" + class="gl-pointer-events-none" + data-testid="noMatchingResults" + > {{ $options.tranlations.noResultsText }} - </gl-deprecated-dropdown-item> + </gl-dropdown-item> </gl-dropdown> </template> |