@gitlab/ui 80.0.0 → 80.1.0

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+# [80.1.0](https://gitlab.com/gitlab-org/gitlab-ui/compare/v80.0.1...v80.1.0) (2024-05-03)
+
+
+### Features
+
+* **GlDrawer:** Fix alignment of close button ([8bd418a](https://gitlab.com/gitlab-org/gitlab-ui/commit/8bd418ad69b7ca9588d8eeb0fe21ca290a730a7f))
+
+## [80.0.1](https://gitlab.com/gitlab-org/gitlab-ui/compare/v80.0.0...v80.0.1) (2024-05-02)
+
+
+### Bug Fixes
+
+* **Dropdown:** Fix disclosure dropdown a11y issues ([34d2c4d](https://gitlab.com/gitlab-org/gitlab-ui/commit/34d2c4d496f66c2c9e9129793e6a0c4189d77ec9))
+
 # [80.0.0](https://gitlab.com/gitlab-org/gitlab-ui/compare/v79.4.1...v80.0.0) (2024-05-01)
 
 

package/dist/components/base/new_dropdowns/disclosure/disclosure_dropdown.js

@@ -218,7 +218,9 @@ var script = {
   computed: {
     disclosureTag() {
       var _this$items;
-      if ((_this$items = this.items) !== null && _this$items !== void 0 && _this$items.length || hasOnlyListItems(this.$scopedSlots)) {
+      if ((_this$items = this.items) !== null && _this$items !== void 0 && _this$items.length ||
+      // eslint-disable-next-line @gitlab/vue-prefer-dollar-scopedslots
+      hasOnlyListItems(this.$scopedSlots.default || this.$slots.default)) {
         return 'ul';
       }
       return 'div';

package/dist/components/base/new_dropdowns/disclosure/utils.js

@@ -1,4 +1,6 @@
+import Vue from 'vue';
 import isFunction from 'lodash/isFunction';
+import isString from 'lodash/isString';
 import { DISCLOSURE_DROPDOWN_ITEM_NAME, DISCLOSURE_DROPDOWN_GROUP_NAME } from './constants';
 
 const itemValidator = item => {
@@ -17,23 +19,34 @@ const isValidSlotTagVue2 = vNode => {
   var _vNode$componentOptio;
   return Boolean(vNode) && isListItem(((_vNode$componentOptio = vNode.componentOptions) === null || _vNode$componentOptio === void 0 ? void 0 : _vNode$componentOptio.tag) || vNode.tag);
 };
-const isValidSlotTag = vNode => {
+const isValidSlotTagVue3 = vNode => {
   var _vNode$type;
   return [DISCLOSURE_DROPDOWN_ITEM_NAME, DISCLOSURE_DROPDOWN_GROUP_NAME].includes((_vNode$type = vNode.type) === null || _vNode$type === void 0 ? void 0 : _vNode$type.name) || vNode.type === 'li';
 };
-const hasOnlyListItems = _ref => {
-  let {
-    default: defaultSlot
-  } = _ref;
-  if (!isFunction(defaultSlot)) {
-    return false;
-  }
+const hasOnlyListItemsVue2 = defaultSlot => {
   const nodes = defaultSlot();
   if (!Array.isArray(nodes)) {
     return false;
   }
   const tags = nodes.filter(vNode => vNode.tag);
-  return tags.length && tags.every(tag => isValidSlotTag(tag) || isValidSlotTagVue2(tag));
+  return tags.length && tags.every(tag => isValidSlotTagVue2(tag));
+};
+const hasOnlyListItemsVue3 = defaultSlot => {
+  const nodes = defaultSlot();
+  const fragment = nodes.find(node => Array.isArray(node.children) && node.children.length);
+  const targetNodes = fragment ? fragment.children : nodes;
+  return targetNodes
+  // Remove empty text vNodes
+  .filter(vNode => !isString(vNode.text) || vNode.text.trim().length > 0).every(vNode => isValidSlotTagVue3(vNode));
+};
+const hasOnlyListItems = defaultSlot => {
+  if (!isFunction(defaultSlot)) {
+    return false;
+  }
+  if (Vue.version.startsWith('3')) {
+    return hasOnlyListItemsVue3(defaultSlot);
+  }
+  return hasOnlyListItemsVue2(defaultSlot);
 };
 
 export { hasOnlyListItems, isGroup, isItem, itemsValidator };