Commit 55df8936 authored by Denys Mishunov's avatar Denys Mishunov

Merge branch 'gitlab-ui-integration-upgrade-bootstrap-vue-v2-19-0' into 'master'

GitLab UI integration branch for Upgrade BootstrapVue v2.19.0

See merge request gitlab-org/gitlab!71401
parents f450ecd5 b49650b7
......@@ -52,6 +52,8 @@ export default {
},
setSelectedItem(selectedId) {
this.selectedId = selectedId;
const label = this.labels.find(({ id }) => id === selectedId);
if (!selectedId || !label) {
this.selectedLabel = null;
......@@ -87,8 +89,8 @@ export default {
<template #items>
<gl-form-radio-group
v-if="labels.length > 0"
v-model="selectedId"
class="gl-overflow-y-auto gl-px-5 gl-pt-3"
:checked="selectedId"
@change="setSelectedItem"
>
<label
......
......@@ -212,6 +212,8 @@ export default {
},
setSelectedItem(selectedId) {
this.selectedId = selectedId;
const item = this.items.find(({ id }) => id === selectedId);
if (!selectedId || !item) {
this.selectedItem = null;
......@@ -286,8 +288,8 @@ export default {
<template v-if="hasItems" #items>
<gl-form-radio-group
v-model="selectedId"
class="gl-overflow-y-auto gl-px-5"
:checked="selectedId"
data-testid="selectItem"
@change="setSelectedItem"
>
......
......@@ -914,10 +914,10 @@
resolved "https://registry.yarnpkg.com/@gitlab/tributejs/-/tributejs-1.0.0.tgz#672befa222aeffc83e7d799b0500a7a4418e59b8"
integrity sha512-nmKw1+hB6MHvlmPz63yPwVs1qQkycHwsKgxpEbzmky16Y6mL4EJMk3w1b8QlOAF/AIAzjCERPhe/R4MJiohbZw==
"@gitlab/ui@32.13.0":
version "32.13.0"
resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-32.13.0.tgz#1d27ecd8ea79f28a5d28cd7e06155eb90b17ee70"
integrity sha512-2Ss/BoqdwevBZGZkP39bTJzqONGMbDNc9adA+WNesi07DOjdpw4MxMNX2kIrP5zod6ESLMNaosb/NUMZbWrMrQ==
"@gitlab/ui@32.14.0":
version "32.14.0"
resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-32.14.0.tgz#91b9346490077c1e6db808256bb0da7a092fd82a"
integrity sha512-GnxTqoyZdAMse8IBvLJ7l8HPDHiJhuUO0h7rnVjDdrU4uHGCmDLBRUXE9cjtI4e0AM2UTkvBv+BhswJ2kUCELw==
dependencies:
"@babel/standalone" "^7.0.0"
bootstrap-vue "2.18.1"
......
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