@gitlab/ui 128.5.0 → 128.6.0

package/dist/utils/data_utils.js

@@ -1,5 +1,3 @@
-import curry from 'lodash/fp/curry';
-
 const getRepeatingValue = index => {
   const values = [100, 500, 400, 200, 100, 800, 400, 500, 600, 300, 800, 900, 110, 700, 400, 300, 500, 300, 400, 600, 700];
   return index < values.length ? values[index] : values[index % values.length];
@@ -8,14 +6,14 @@ const generateTimeSeries = () => new Array(100).fill(0).map((el, i) => [new Date
 
 // takes an element and a list and `intersperses' that element between the elements of the list.
 // (',' ['a', 'b', 'c']) -> ['a', ',', 'b', ',', 'c']
-const intersperse = curry((separator, items) => {
+const intersperse = (separator, items) => {
   const [head, ...rest] = items;
   const separatorFactory = typeof separator === 'function' ? separator : () => separator;
   return [head, ...rest.flatMap(item => [separatorFactory(), item], rest)];
-});
+};
 
 // inserts a value at a given index into an array
 // (1, 2, [1, 3, 4]) -> [1, 2, 3, 4]
-const insert = curry((index, newItem, items) => [...items.slice(0, index), newItem, ...items.slice(index)]);
+const insert = (index, newItem, items) => [...items.slice(0, index), newItem, ...items.slice(index)];
 
 export { generateTimeSeries, insert, intersperse };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gitlab/ui",
-  "version": "128.5.0",
+  "version": "128.6.0",
   "description": "GitLab UI Components",
   "license": "MIT",
   "main": "dist/index.js",
@@ -69,7 +69,7 @@
     "echarts": "^5.6.0",
     "gridstack": "^12.4.2",
     "iframe-resizer": "^4.4.5",
-    "lodash": "^4.17.21",
+    "lodash": "^4.17.23",
     "popper.js": "^1.16.1",
     "portal-vue": "2.1.7",
     "vue-functional-data-merge": "^3.1.0",

package/src/components/base/button/button.vue

@@ -237,9 +237,6 @@ export default {
     hasIconOnly() {
       return isSlotEmpty(this, 'default') && this.hasIcon && this.count == null;
     },
-    isButtonDisabled() {
-      return this.disabled;
-    },
     isButtonAriaDisabled() {
       return this.isButton && this.loading;
     },
@@ -300,7 +297,7 @@ export default {
         // Type only used for "real" buttons
         type: this.isButton ? this.type : null,
         // Disabled only set on "real" buttons
-        disabled: this.isButton ? this.isButtonDisabled : null,
+        disabled: this.isButton ? this.disabled : null,
         // We add a role of button when the tag is not a link or button or when link has `href` of `#`
         role: this.isNonStandardTag || this.isHashLink ? 'button' : this.$attrs?.role,
         // We set the `aria-disabled` state for non-standard tags

package/src/components/base/new_dropdowns/base_dropdown/base_dropdown.vue

@@ -196,6 +196,14 @@ export default {
       required: false,
       default: false,
     },
+    /**
+     * Allows the dropdown panel to match the width of the trigger element
+     */
+    panelMatchTriggerWidth: {
+      type: Boolean,
+      required: false,
+      default: false,
+    },
     /**
      * Strategy to be applied by computePosition. If this is set to fixed, the dropdown's position
      * needs to be set to fixed in CSS as well.
@@ -362,7 +370,8 @@ export default {
     panelClasses() {
       return {
         '!gl-block': this.visible,
-        [FIXED_WIDTH_CLASS]: !this.fluidWidth,
+        [FIXED_WIDTH_CLASS]: !this.fluidWidth && !this.panelMatchTriggerWidth,
+        'gl-new-dropdown-panel-fluid-width': this.fluidWidth && !this.panelMatchTriggerWidth,
         'gl-fixed': this.openedYet && this.isFixed,
         'gl-absolute': this.openedYet && !this.isFixed,
       };
@@ -397,6 +406,11 @@ export default {
                     maxWidth: `${Math.max(0, availableWidth)}px`,
                   }
                 : {};
+              const triggerWidth = this.panelMatchTriggerWidth
+                ? {
+                    minWidth: `${this.toggleElement.getBoundingClientRect().width}px`,
+                  }
+                : {};
 
               Object.assign(
                 contentsEl.style,
@@ -404,6 +418,7 @@ export default {
                   maxHeight: `${Math.max(contentsAvailableHeight, 0)}px`,
                 },
                 maxWidth,
+                triggerWidth,
               );
             },
           }),

package/src/components/base/new_dropdowns/dropdown.scss

@@ -112,9 +112,12 @@
     @apply gl-drop-shadow-md;
     top: 0;
     left: 0;
+    z-index: 1000;
+  }
+
+  .gl-new-dropdown-panel-fluid-width {
     min-width: $gl-new-dropdown-min-width;
     max-width: $gl-new-dropdown-max-width;
-    z-index: 1000;
   }
 
   .gl-new-dropdown-inner {

package/src/components/base/new_dropdowns/listbox/listbox.vue

@@ -346,6 +346,14 @@ export default {
       required: false,
       default: false,
     },
+    /**
+     * Allows the dropdown panel to match the width of the trigger element
+     */
+    panelMatchTriggerWidth: {
+      type: Boolean,
+      required: false,
+      default: false,
+    },
     /**
      * Strategy to be applied by computePosition. If the dropdown's container is too short for it to
      * fit in, setting this to fixed will let it position itself above its container.
@@ -980,6 +988,7 @@ export default {
     :placement="placement"
     :offset="dropdownOffset"
     :fluid-width="fluidWidth"
+    :panel-match-trigger-width="panelMatchTriggerWidth"
     :positioning-strategy="positioningStrategy"
     @[$options.events.GL_DROPDOWN_FOCUS_CONTENT]="onFocusContent"
     @[$options.events.GL_DROPDOWN_SHOWN]="onShow"

package/src/components/utilities/intersperse/intersperse.vue

@@ -1,14 +1,10 @@
 <script>
 import Vue from 'vue';
-import compose from 'lodash/fp/compose';
-import fill from 'lodash/fp/fill';
-import filter from 'lodash/fp/filter';
 import { intersperse, insert } from '../../../utils/data_utils';
 import { isVnodeEmpty } from '../../../utils/is_slot_empty';
 
-const filterEmptyNodesVue2 = filter(
-  (vNode) => typeof vNode.tag === 'string' || vNode.text.trim() !== '',
-);
+const filterEmptyNodesVue2 = (vNodes) =>
+  vNodes.filter((vNode) => typeof vNode.tag === 'string' || vNode.text.trim() !== '');
 
 const { Fragment } = Vue;
 const filterEmptyNodesVue3 = (vNode) => {
@@ -25,20 +21,23 @@ const filterEmptyNodesVue3 = (vNode) => {
 };
 
 const filterEmptyNodes = Vue.version.startsWith('3') ? filterEmptyNodesVue3 : filterEmptyNodesVue2;
-const insertAfterSecondLastItem = insert(-1);
-const replaceSecondLastItem = fill(-2, -1);
 
 // handles the addition of the lastSeparator in these two cases:
 // item1, item2, item3 => item1, item2, and item3
 // item1, item2 => item1 and item2
-const addLastSeparator = (lastSeparator) => (items) => {
+const addLastSeparator = (lastSeparator, items) => {
   if (!lastSeparator) {
     return items;
   }
 
-  return items.length > 3
-    ? insertAfterSecondLastItem(lastSeparator, items)
-    : replaceSecondLastItem(lastSeparator, items);
+  if (items.length > 3) {
+    return insert(-1, lastSeparator, items);
+  }
+
+  // Replace the second-to-last item with lastSeparator
+  const result = [...items];
+  result[result.length - 2] = lastSeparator;
+  return result;
 };
 
 export default {
@@ -63,13 +62,12 @@ export default {
       data,
     } = context;
 
-    const filterAndSeparate = compose(
-      addLastSeparator(lastSeparator),
-      intersperse(separator),
-      filterEmptyNodes,
-    );
+    const slotContent = slots().default || [];
+    const filtered = filterEmptyNodes(slotContent);
+    const separated = intersperse(separator, filtered);
+    const withLastSeparator = addLastSeparator(lastSeparator, separated);
 
-    return createElement('span', data, filterAndSeparate(slots().default));
+    return createElement('span', data, withLastSeparator);
   },
 };
 </script>

package/src/utils/data_utils.js

@@ -1,5 +1,3 @@
-import curry from 'lodash/fp/curry';
-
 const getRepeatingValue = (index) => {
   const values = [
     100, 500, 400, 200, 100, 800, 400, 500, 600, 300, 800, 900, 110, 700, 400, 300, 500, 300, 400,
@@ -13,16 +11,16 @@ export const generateTimeSeries = () =>
 
 // takes an element and a list and `intersperses' that element between the elements of the list.
 // (',' ['a', 'b', 'c']) -> ['a', ',', 'b', ',', 'c']
-export const intersperse = curry((separator, items) => {
+export const intersperse = (separator, items) => {
   const [head, ...rest] = items;
   const separatorFactory = typeof separator === 'function' ? separator : () => separator;
   return [head, ...rest.flatMap((item) => [separatorFactory(), item], rest)];
-});
+};
 
 // inserts a value at a given index into an array
 // (1, 2, [1, 3, 4]) -> [1, 2, 3, 4]
-export const insert = curry((index, newItem, items) => [
+export const insert = (index, newItem, items) => [
   ...items.slice(0, index),
   newItem,
   ...items.slice(index),
-]);
+];