@gitlab/ui 61.1.2 → 61.1.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +7 -0
- package/dist/components/base/new_dropdowns/disclosure/disclosure_dropdown.js +4 -1
- package/dist/components/base/new_dropdowns/disclosure/disclosure_dropdown_group.js +4 -1
- package/package.json +1 -1
- package/src/components/base/new_dropdowns/disclosure/disclosure_dropdown.vue +8 -2
- package/src/components/base/new_dropdowns/disclosure/disclosure_dropdown_group.vue +5 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,10 @@
|
|
|
1
|
+
## [61.1.3](https://gitlab.com/gitlab-org/gitlab-ui/compare/v61.1.2...v61.1.3) (2023-04-18)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Bug Fixes
|
|
5
|
+
|
|
6
|
+
* **GlDisclosureDropdown:** Set unique key id for items ([e3f90f4](https://gitlab.com/gitlab-org/gitlab-ui/commit/e3f90f4fc05e2c3fdc4119177816307948700f74))
|
|
7
|
+
|
|
1
8
|
## [61.1.2](https://gitlab.com/gitlab-org/gitlab-ui/compare/v61.1.1...v61.1.2) (2023-04-18)
|
|
2
9
|
|
|
3
10
|
|
|
@@ -255,6 +255,9 @@ var script = {
|
|
|
255
255
|
*/
|
|
256
256
|
this.$emit('action', action);
|
|
257
257
|
},
|
|
258
|
+
uniqueItemId() {
|
|
259
|
+
return uniqueId(`disclosure-item-`);
|
|
260
|
+
},
|
|
258
261
|
isItem
|
|
259
262
|
}
|
|
260
263
|
};
|
|
@@ -263,7 +266,7 @@ var script = {
|
|
|
263
266
|
const __vue_script__ = script;
|
|
264
267
|
|
|
265
268
|
/* template */
|
|
266
|
-
var __vue_render__ = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('gl-base-dropdown',{ref:"baseDropdown",staticClass:"gl-disclosure-dropdown",attrs:{"aria-labelledby":_vm.toggleAriaLabelledBy,"toggle-id":_vm.toggleId,"toggle-text":_vm.toggleText,"toggle-class":_vm.toggleClass,"text-sr-only":_vm.textSrOnly,"category":_vm.category,"variant":_vm.variant,"size":_vm.size,"icon":_vm.icon,"disabled":_vm.disabled,"loading":_vm.loading,"no-caret":_vm.noCaret,"placement":_vm.placement,"popper-options":_vm.popperOptions},on:_vm._d({},[_vm.$options.events.GL_DROPDOWN_SHOWN,_vm.onShow,_vm.$options.events.GL_DROPDOWN_HIDDEN,_vm.onHide,_vm.$options.events.GL_DROPDOWN_FOCUS_CONTENT,_vm.onKeydown]),scopedSlots:_vm._u([(_vm.hasCustomToggle)?{key:"toggle",fn:function(){return [_vm._t("toggle")]},proxy:true}:null],null,true)},[_vm._v(" "),_vm._t("header"),_vm._v(" "),_c(_vm.disclosureTag,{ref:"content",tag:"component",staticClass:"gl-new-dropdown-contents",attrs:{"id":_vm.disclosureId,"aria-labelledby":_vm.listAriaLabelledBy || _vm.toggleId,"data-testid":"disclosure-content","tabindex":"-1"},on:{"keydown":_vm.onKeydown}},[_vm._t("default",function(){return [_vm._l((_vm.items),function(item,index){return [(_vm.isItem(item))?[_c('gl-disclosure-dropdown-item',{key:
|
|
269
|
+
var __vue_render__ = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('gl-base-dropdown',{ref:"baseDropdown",staticClass:"gl-disclosure-dropdown",attrs:{"aria-labelledby":_vm.toggleAriaLabelledBy,"toggle-id":_vm.toggleId,"toggle-text":_vm.toggleText,"toggle-class":_vm.toggleClass,"text-sr-only":_vm.textSrOnly,"category":_vm.category,"variant":_vm.variant,"size":_vm.size,"icon":_vm.icon,"disabled":_vm.disabled,"loading":_vm.loading,"no-caret":_vm.noCaret,"placement":_vm.placement,"popper-options":_vm.popperOptions},on:_vm._d({},[_vm.$options.events.GL_DROPDOWN_SHOWN,_vm.onShow,_vm.$options.events.GL_DROPDOWN_HIDDEN,_vm.onHide,_vm.$options.events.GL_DROPDOWN_FOCUS_CONTENT,_vm.onKeydown]),scopedSlots:_vm._u([(_vm.hasCustomToggle)?{key:"toggle",fn:function(){return [_vm._t("toggle")]},proxy:true}:null],null,true)},[_vm._v(" "),_vm._t("header"),_vm._v(" "),_c(_vm.disclosureTag,{ref:"content",tag:"component",staticClass:"gl-new-dropdown-contents",attrs:{"id":_vm.disclosureId,"aria-labelledby":_vm.listAriaLabelledBy || _vm.toggleId,"data-testid":"disclosure-content","tabindex":"-1"},on:{"keydown":_vm.onKeydown}},[_vm._t("default",function(){return [_vm._l((_vm.items),function(item,index){return [(_vm.isItem(item))?[_c('gl-disclosure-dropdown-item',{key:_vm.uniqueItemId(),attrs:{"item":item},on:{"action":_vm.handleAction},scopedSlots:_vm._u([{key:"list-item",fn:function(){return [_vm._t("list-item",null,{"item":item})]},proxy:true}],null,true)})]:[_c('gl-disclosure-dropdown-group',{key:item.name,attrs:{"bordered":index !== 0,"group":item},on:{"action":_vm.handleAction},scopedSlots:_vm._u([(_vm.$scopedSlots['group-label'])?{key:"group-label",fn:function(){return [_vm._t("group-label",null,{"group":item})]},proxy:true}:null],null,true)},[_vm._v(" "),(_vm.$scopedSlots['list-item'])?_vm._l((item.items),function(groupItem){return _c('gl-disclosure-dropdown-item',{key:_vm.uniqueItemId(),attrs:{"item":groupItem},on:{"action":_vm.handleAction},scopedSlots:_vm._u([{key:"list-item",fn:function(){return [_vm._t("list-item",null,{"item":groupItem})]},proxy:true}],null,true)})}):_vm._e()],2)]]})]})],2),_vm._v(" "),_vm._t("footer")],2)};
|
|
267
270
|
var __vue_staticRenderFns__ = [];
|
|
268
271
|
|
|
269
272
|
/* style */
|
|
@@ -48,6 +48,9 @@ var script = {
|
|
|
48
48
|
methods: {
|
|
49
49
|
handleAction(action) {
|
|
50
50
|
this.$emit('action', action);
|
|
51
|
+
},
|
|
52
|
+
uniqueItemId() {
|
|
53
|
+
return uniqueId(`disclosure-item-`);
|
|
51
54
|
}
|
|
52
55
|
}
|
|
53
56
|
};
|
|
@@ -56,7 +59,7 @@ var script = {
|
|
|
56
59
|
const __vue_script__ = script;
|
|
57
60
|
|
|
58
61
|
/* template */
|
|
59
|
-
var __vue_render__ = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('li',{class:_vm.borderClass},[(_vm.showHeader)?_c('div',{staticClass:"gl-pl-4 gl-py-2 gl-font-sm gl-font-weight-bold",attrs:{"id":_vm.nameId,"aria-hidden":"true"}},[_vm._t("group-label",function(){return [_vm._v(_vm._s(_vm.group.name))]})],2):_vm._e(),_vm._v(" "),_c('ul',{staticClass:"gl-mb-0 gl-pl-0 gl-list-style-none",attrs:{"role":"group","aria-labelledby":_vm.groupLabeledBy}},[_vm._t("default",function(){return _vm._l((_vm.group.items),function(item){return _c('gl-disclosure-dropdown-item',{key:
|
|
62
|
+
var __vue_render__ = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('li',{class:_vm.borderClass},[(_vm.showHeader)?_c('div',{staticClass:"gl-pl-4 gl-py-2 gl-font-sm gl-font-weight-bold",attrs:{"id":_vm.nameId,"aria-hidden":"true"}},[_vm._t("group-label",function(){return [_vm._v(_vm._s(_vm.group.name))]})],2):_vm._e(),_vm._v(" "),_c('ul',{staticClass:"gl-mb-0 gl-pl-0 gl-list-style-none",attrs:{"role":"group","aria-labelledby":_vm.groupLabeledBy}},[_vm._t("default",function(){return _vm._l((_vm.group.items),function(item){return _c('gl-disclosure-dropdown-item',{key:_vm.uniqueItemId(),attrs:{"item":item},on:{"action":_vm.handleAction},scopedSlots:_vm._u([{key:"list-item",fn:function(){return [_vm._t("list-item",null,{"item":item})]},proxy:true}],null,true)})})})],2)])};
|
|
60
63
|
var __vue_staticRenderFns__ = [];
|
|
61
64
|
|
|
62
65
|
/* style */
|
package/package.json
CHANGED
|
@@ -267,6 +267,9 @@ export default {
|
|
|
267
267
|
*/
|
|
268
268
|
this.$emit('action', action);
|
|
269
269
|
},
|
|
270
|
+
uniqueItemId() {
|
|
271
|
+
return uniqueId(`disclosure-item-`);
|
|
272
|
+
},
|
|
270
273
|
isItem,
|
|
271
274
|
},
|
|
272
275
|
};
|
|
@@ -315,7 +318,8 @@ export default {
|
|
|
315
318
|
<slot>
|
|
316
319
|
<template v-for="(item, index) in items">
|
|
317
320
|
<template v-if="isItem(item)">
|
|
318
|
-
|
|
321
|
+
<!-- eslint-disable-next-line vue/valid-v-for -->
|
|
322
|
+
<gl-disclosure-dropdown-item :key="uniqueItemId()" :item="item" @action="handleAction">
|
|
319
323
|
<template #list-item>
|
|
320
324
|
<!-- @slot Custom template of the disclosure dropdown item -->
|
|
321
325
|
<slot name="list-item" :item="item"></slot>
|
|
@@ -336,9 +340,10 @@ export default {
|
|
|
336
340
|
</template>
|
|
337
341
|
|
|
338
342
|
<template v-if="$scopedSlots['list-item']">
|
|
343
|
+
<!-- eslint-disable vue/valid-v-for -->
|
|
339
344
|
<gl-disclosure-dropdown-item
|
|
340
345
|
v-for="groupItem in item.items"
|
|
341
|
-
:key="
|
|
346
|
+
:key="uniqueItemId()"
|
|
342
347
|
:item="groupItem"
|
|
343
348
|
@action="handleAction"
|
|
344
349
|
>
|
|
@@ -347,6 +352,7 @@ export default {
|
|
|
347
352
|
<slot name="list-item" :item="groupItem"></slot>
|
|
348
353
|
</template>
|
|
349
354
|
</gl-disclosure-dropdown-item>
|
|
355
|
+
<!-- eslint-enable vue/valid-v-for -->
|
|
350
356
|
</template>
|
|
351
357
|
</gl-disclosure-dropdown-group>
|
|
352
358
|
</template>
|
|
@@ -49,6 +49,9 @@ export default {
|
|
|
49
49
|
handleAction(action) {
|
|
50
50
|
this.$emit('action', action);
|
|
51
51
|
},
|
|
52
|
+
uniqueItemId() {
|
|
53
|
+
return uniqueId(`disclosure-item-`);
|
|
54
|
+
},
|
|
52
55
|
},
|
|
53
56
|
};
|
|
54
57
|
</script>
|
|
@@ -65,9 +68,10 @@ export default {
|
|
|
65
68
|
</div>
|
|
66
69
|
<ul role="group" :aria-labelledby="groupLabeledBy" class="gl-mb-0 gl-pl-0 gl-list-style-none">
|
|
67
70
|
<slot>
|
|
71
|
+
<!-- eslint-disable vue/valid-v-for -->
|
|
68
72
|
<gl-disclosure-dropdown-item
|
|
69
73
|
v-for="item in group.items"
|
|
70
|
-
:key="
|
|
74
|
+
:key="uniqueItemId()"
|
|
71
75
|
:item="item"
|
|
72
76
|
@action="handleAction"
|
|
73
77
|
>
|