@gitlab/ui 58.2.1 → 58.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gitlab/ui",
-  "version": "58.2.1",
+  "version": "58.3.0",
   "description": "GitLab UI Components",
   "license": "MIT",
   "main": "dist/index.js",

package/src/components/base/new_dropdowns/listbox/listbox.spec.js

@@ -63,6 +63,36 @@ describe('GlCollapsibleListbox', () => {
     });
   });
 
+  describe('toggle classes', () => {
+    describe.each`
+      toggleClass              | multiple | selected                  | expectedToggleClasses
+      ${'customClass'}         | ${false} | ${mockOptions[0].value}   | ${['customClass']}
+      ${{ customClass: true }} | ${false} | ${mockOptions[0].value}   | ${[{ customClass: true }]}
+      ${['customClass']}       | ${false} | ${mockOptions[0].value}   | ${[['customClass']]}
+      ${'customClass'}         | ${false} | ${null}                   | ${['customClass', 'gl-text-gray-500!']}
+      ${{ customClass: true }} | ${false} | ${undefined}              | ${[{ customClass: true }, 'gl-text-gray-500!']}
+      ${['customClass']}       | ${false} | ${null}                   | ${[['customClass'], 'gl-text-gray-500!']}
+      ${'customClass'}         | ${true}  | ${[mockOptions[0].value]} | ${['customClass']}
+      ${{ customClass: true }} | ${true}  | ${[mockOptions[0].value]} | ${[{ customClass: true }]}
+      ${['customClass']}       | ${true}  | ${[mockOptions[0].value]} | ${[['customClass']]}
+      ${'customClass'}         | ${true}  | ${null}                   | ${['customClass', 'gl-text-gray-500!']}
+      ${{ customClass: true }} | ${true}  | ${undefined}              | ${[{ customClass: true }, 'gl-text-gray-500!']}
+      ${['customClass']}       | ${true}  | ${null}                   | ${[['customClass'], 'gl-text-gray-500!']}
+    `('when listbox', ({ toggleClass, multiple, selected, expectedToggleClasses }) => {
+      beforeEach(() => {
+        buildWrapper({ items: mockOptions, toggleClass, multiple, selected });
+      });
+
+      it(`is ${multiple ? 'multi' : 'single'}-select and ${
+        selected
+          ? 'has selected - does not set non-selected styles'
+          : 'does not have selected - sets the non-selected styles'
+      }`, () => {
+        expect(findBaseDropdown().props('toggleClass')).toEqual(expectedToggleClasses);
+      });
+    });
+  });
+
   describe('ARIA attributes', () => {
     it('should provide `toggleId` to the base dropdown and reference it in`aria-labelledby` attribute of the list container`', async () => {
       await buildWrapper({ items: mockOptions });

package/src/components/base/new_dropdowns/listbox/listbox.stories.js

@@ -45,6 +45,7 @@ const generateProps = ({
   searchPlaceholder = defaultValue('searchPlaceholder'),
   noCaret = defaultValue('noCaret'),
   placement = defaultValue('placement'),
+  toggleClass,
   toggleText,
   textSrOnly = defaultValue('textSrOnly'),
   headerText = defaultValue('headerText'),
@@ -71,6 +72,7 @@ const generateProps = ({
   searchPlaceholder,
   noCaret,
   placement,
+  toggleClass,
   toggleText,
   textSrOnly,
   headerText,
@@ -100,6 +102,7 @@ const makeBindings = (overrides = {}) =>
     ':search-placeholder': 'searchPlaceholder',
     ':no-caret': 'noCaret',
     ':placement': 'placement',
+    ':toggle-class': 'toggleClass',
     ':toggle-text': 'toggleText',
     ':text-sr-only': 'textSrOnly',
     ':header-text': 'headerText',
@@ -231,9 +234,10 @@ export const CustomListItem = (args, { argTypes }) => ({
   },
   computed: {
     customToggleText() {
-      return this.selected.length !== 1
-        ? `${this.selected.length} assignees`
-        : this.items.find(({ value }) => value === this.selected[0]).text;
+      if (this.selected.length === 0) return 'Select assignee(s)';
+      if (this.selected.length === 1)
+        return this.items.find(({ value }) => value === this.selected[0]).text;
+      return `${this.selected.length} assignees`;
     },
   },
   methods: {

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

@@ -349,6 +349,17 @@ export default {
     hasCustomToggle() {
       return Boolean(this.$scopedSlots.toggle);
     },
+    hasSelection() {
+      return Boolean(this.selectedValues.length);
+    },
+    toggleButtonClasses() {
+      const toggleClasses = [this.toggleClass];
+
+      if (!this.hasSelection) {
+        toggleClasses.push('gl-text-gray-500!');
+      }
+      return toggleClasses;
+    },
   },
   watch: {
     selected: {
@@ -561,7 +572,7 @@ export default {
     :block="block"
     :toggle-id="toggleId"
     :toggle-text="listboxToggleText"
-    :toggle-class="toggleClass"
+    :toggle-class="toggleButtonClasses"
     :text-sr-only="textSrOnly"
     :category="category"
     :variant="variant"

package/src/scss/utilities.scss

@@ -1743,6 +1743,16 @@
   border-bottom-right-radius: 0 !important;
 }
 
+.gl-rounded-bottom-base {
+  border-bottom-left-radius: $gl-border-radius-base;
+  border-bottom-right-radius: $gl-border-radius-base;
+}
+
+.gl-rounded-bottom-base\! {
+  border-bottom-left-radius: $gl-border-radius-base !important;
+  border-bottom-right-radius: $gl-border-radius-base !important;
+}
+
 .gl-rounded-top-left-small {
   border-top-left-radius: $gl-border-radius-small;
 }

package/src/scss/utility-mixins/border.scss

@@ -421,6 +421,11 @@
   border-bottom-right-radius: 0;
 }
 
+@mixin gl-rounded-bottom-base {
+  border-bottom-left-radius: $gl-border-radius-base;
+  border-bottom-right-radius: $gl-border-radius-base;
+}
+
 @mixin gl-rounded-top-left-small {
   border-top-left-radius: $gl-border-radius-small;
 }