@gitlab/ui 43.10.0 → 43.13.0

package/dist/utils/constants.js

@@ -43,11 +43,6 @@ const variantCssColorMap = {
   danger: 'gl-text-red-500'
 };
 const targetOptions = ['_self', '_blank', '_parent', '_top', null];
-const sizeOptions = {
-  default: null,
-  sm: 'sm',
-  lg: 'lg'
-};
 const labelSizeOptions = {
   default: null,
   sm: 'sm'
@@ -200,8 +195,7 @@ const tabsButtonDefaults = {
 };
 const tokenVariants = ['default', 'search-type', 'search-value'];
 const resizeDebounceTime = 200;
-const variantOptionsWithNoDefault = appendDefaultOption(variantOptions);
-const sizeOptionsWithNoDefault = appendDefaultOption(sizeOptions); // Datetime constants
+const variantOptionsWithNoDefault = appendDefaultOption(variantOptions); // Datetime constants
 
 const defaultDateFormat = 'YYYY-MM-DD';
 const bannerVariants = ['promotion', 'introduction'];
@@ -250,4 +244,4 @@ const loadingIconSizes = {
   'xl (64x64)': 'xl'
 };
 
-export { COMMA, alertVariantIconMap, alertVariantOptions, alignOptions, avatarShapeOptions, avatarSizeOptions, avatarsInlineSizeOptions, badgeForButtonOptions, badgeSizeOptions, badgeVariantOptions, bannerVariants, buttonCategoryOptions, buttonSizeOptions, buttonSizeOptionsMap, buttonVariantOptions, colorThemes, columnOptions, defaultDateFormat, drawerVariants, dropdownVariantOptions, focusableTags, formInputSizes, formStateOptions, glThemes, iconSizeOptions, keyboard, labelColorOptions, labelSizeOptions, loadingIconSizes, maxZIndex, modalButtonDefaults, modalSizeOptions, popoverPlacements, resizeDebounceTime, sizeOptions, sizeOptionsWithNoDefault, tabsButtonDefaults, targetOptions, toggleLabelPosition, tokenVariants, tooltipActionEvents, tooltipDelay, tooltipPlacements, triggerVariantOptions, truncateOptions, variantCssColorMap, variantOptions, variantOptionsWithNoDefault, viewModeOptions };
+export { COMMA, alertVariantIconMap, alertVariantOptions, alignOptions, avatarShapeOptions, avatarSizeOptions, avatarsInlineSizeOptions, badgeForButtonOptions, badgeSizeOptions, badgeVariantOptions, bannerVariants, buttonCategoryOptions, buttonSizeOptions, buttonSizeOptionsMap, buttonVariantOptions, colorThemes, columnOptions, defaultDateFormat, drawerVariants, dropdownVariantOptions, focusableTags, formInputSizes, formStateOptions, glThemes, iconSizeOptions, keyboard, labelColorOptions, labelSizeOptions, loadingIconSizes, maxZIndex, modalButtonDefaults, modalSizeOptions, popoverPlacements, resizeDebounceTime, tabsButtonDefaults, targetOptions, toggleLabelPosition, tokenVariants, tooltipActionEvents, tooltipDelay, tooltipPlacements, triggerVariantOptions, truncateOptions, variantCssColorMap, variantOptions, variantOptionsWithNoDefault, viewModeOptions };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gitlab/ui",
-  "version": "43.10.0",
+  "version": "43.13.0",
   "description": "GitLab UI Components",
   "license": "MIT",
   "main": "dist/index.js",
@@ -102,7 +102,7 @@
     "babel-plugin-require-context-hook": "^1.0.0",
     "babel-preset-vue": "^2.0.2",
     "bootstrap": "4.5.3",
-    "cypress": "^10.6.0",
+    "cypress": "^10.7.0",
     "emoji-regex": "^10.0.0",
     "eslint": "8.22.0",
     "eslint-import-resolver-jest": "3.0.2",
@@ -112,9 +112,9 @@
     "glob": "^7.2.0",
     "identity-obj-proxy": "^3.0.0",
     "inquirer-select-directory": "^1.2.0",
-    "jest": "^29.0.1",
-    "jest-circus": "29.0.1",
-    "jest-environment-jsdom": "29.0.1",
+    "jest": "^29.0.2",
+    "jest-circus": "29.0.2",
+    "jest-environment-jsdom": "29.0.2",
     "jest-serializer-vue": "^2.0.2",
     "markdownlint-cli": "^0.29.0",
     "mockdate": "^2.0.5",

package/scss_to_js/scss_variables.js

@@ -26,6 +26,7 @@ export const breakpointLg = '992px'
 export const breakpointXl = '1200px'
 export const breakpoints = '(xs: 0, sm: 576px, md: 768px, lg: 992px, xl: 1200px)'
 export const limitedLayoutWidth = '990px'
+export const containerXl = '1280px'
 export const black = '#000'
 export const blackNormal = '#333'
 export const white = '#fff'

package/scss_to_js/scss_variables.json

@@ -167,6 +167,11 @@
       "value": "990px",
       "compiledValue": "990px"
     },
+    {
+      "name": "$container-xl",
+      "value": "1280px",
+      "compiledValue": "1280px"
+    },
     {
       "name": "$black",
       "value": "#000",

package/src/components/base/form/form_select/form_select.scss

@@ -54,4 +54,21 @@ See: https://gitlab.com/gitlab-org/gitlab/issues/30055
     }
   }
 }
+
+@each $name, $size in $gl-form-input-sizes {
+  .gl-form-select-#{$name} {
+    max-width: $size;
+  }
+
+  @each $breakpointName, $breakpointSize in $gl-form-input-sizes {
+    @if $breakpointName != xs {
+      .gl-#{$breakpointName}-form-select-#{$name} {
+        @include gl-media-breakpoint-up($breakpointName) {
+          max-width: $size;
+        }
+      }
+    }
+  }
+}
+
 /* stylelint-enable property-no-vendor-prefix */

package/src/components/base/form/form_select/form_select.spec.js

@@ -1,5 +1,5 @@
 import { mount } from '@vue/test-utils';
-import { sizeOptions, formStateOptions } from '../../../../utils/constants';
+import { formStateOptions, formInputSizes } from '../../../../utils/constants';
 import { formSelectOptions } from './constants';
 import GlFormSelect from './form_select.vue';
 
@@ -33,13 +33,13 @@ describe('GlFormSelect', () => {
 
   describe('size prop', () => {
     // Exclude the default null value
-    const nonNullSizes = excludeDefaultNull(sizeOptions);
+    const nonNullSizes = excludeDefaultNull(formInputSizes);
 
     it.each(nonNullSizes)('adds correct class for size %s', (size) => {
       createComponent({ size });
 
       expect(wrapper.classes().sort()).toEqual(
-        [...DEFAULT_SELECT_CLASSES, `custom-select-${size}`].sort()
+        [...DEFAULT_SELECT_CLASSES, `gl-form-select-${size}`].sort()
       );
     });
 

package/src/components/base/form/form_select/form_select.stories.js

@@ -1,5 +1,5 @@
 import { GlFormSelect } from '../../../../index';
-import { sizeOptions, formStateOptions } from '../../../../utils/constants';
+import { formStateOptions, formInputSizes } from '../../../../utils/constants';
 import { formSelectOptions } from './constants';
 import readme from './form_select.md';
 
@@ -90,7 +90,7 @@ export default {
   },
   argTypes: {
     size: {
-      options: sizeOptions,
+      options: formInputSizes,
       control: 'select',
     },
     state: {

package/src/components/base/form/form_select/form_select.vue

@@ -1,15 +1,52 @@
 <script>
 import { BFormSelect } from 'bootstrap-vue';
+import { isObject } from 'lodash';
+import { formInputSizes } from '../../../../utils/constants';
 
 export default {
   components: {
     BFormSelect,
   },
   inheritAttrs: false,
+  props: {
+    /**
+     * Maximum width of the Select
+     */
+    size: {
+      type: [String, Object],
+      required: false,
+      default: null,
+      validator: (value) => {
+        const sizes = isObject(value) ? Object.values(value) : [value];
+
+        return sizes.every((size) => Object.values(formInputSizes).includes(size));
+      },
+    },
+  },
+  computed: {
+    cssClasses() {
+      if (this.size === null) {
+        return [];
+      }
+
+      if (isObject(this.size)) {
+        const { default: defaultSize, ...nonDefaultSizes } = this.size;
+
+        return [
+          ...(defaultSize ? [`gl-form-select-${defaultSize}`] : []),
+          ...Object.entries(nonDefaultSizes).map(
+            ([breakpoint, size]) => `gl-${breakpoint}-form-select-${size}`
+          ),
+        ];
+      }
+
+      return [`gl-form-select-${this.size}`];
+    },
+  },
 };
 </script>
 <template>
-  <b-form-select class="gl-form-select" v-bind="$attrs" v-on="$listeners">
+  <b-form-select class="gl-form-select" v-bind="$attrs" :class="cssClasses" v-on="$listeners">
     <!-- eslint-disable-next-line @gitlab/vue-prefer-dollar-scopedslots -->
     <template v-for="slot in Object.keys($slots)" #[slot]>
       <slot :name="slot"></slot>

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

@@ -79,6 +79,7 @@ const generateProps = ({
   textSrOnly = defaultValue('textSrOnly'),
   icon = '',
   multiple = defaultValue('multiple'),
+  isCheckCentered = defaultValue('isCheckCentered'),
   ariaLabelledby,
   startOpened = true,
 } = {}) => ({
@@ -94,6 +95,7 @@ const generateProps = ({
   textSrOnly,
   icon,
   multiple,
+  isCheckCentered,
   ariaLabelledby,
   startOpened,
 });
@@ -120,6 +122,7 @@ const template = (content, label = '') => `
       :text-sr-only="textSrOnly"
       :icon="icon"
       :multiple="multiple"
+      :is-check-centered="isCheckCentered"
       :aria-labelledby="ariaLabelledby"
     >
       ${content}
@@ -183,7 +186,10 @@ export const HeaderAndFooter = (args, { argTypes }) => ({
                                 </div>
                               </template>`),
 });
-HeaderAndFooter.args = generateProps({ toggleText: 'Header and Footer', multiple: true });
+HeaderAndFooter.args = generateProps({
+  toggleText: 'Header and Footer',
+  multiple: true,
+});
 HeaderAndFooter.decorators = [makeContainer({ height: '370px' })];
 
 export const CustomListItem = (args, { argTypes }) => ({
@@ -225,6 +231,7 @@ export const CustomListItem = (args, { argTypes }) => ({
         :text-sr-only="textSrOnly"
         :icon="icon"
         :multiple="multiple"
+        :is-check-centered="isCheckCentered"
         :aria-labelledby="ariaLabelledby"
       >
         <template #list-item="{ item }">
@@ -247,6 +254,7 @@ CustomListItem.args = generateProps({
     { value: 'markian', text: 'Mark Florian', secondaryText: '@markian', icon: 'bin' },
   ],
   multiple: true,
+  isCheckCentered: true,
 });
 CustomListItem.decorators = [makeContainer({ height: '200px' })];
 

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

@@ -152,6 +152,14 @@ export default {
       required: false,
       default: false,
     },
+    /**
+     * Center selected item checkmark
+     */
+    isCheckCentered: {
+      type: Boolean,
+      required: false,
+      default: false,
+    },
     /**
      * The `aria-labelledby` attribute value for the toggle button
      */
@@ -335,6 +343,7 @@ export default {
         :key="item.value"
         :is-selected="isSelected(item)"
         :is-focused="nextFocusedItemIndex === index"
+        :is-check-centered="isCheckCentered"
         @select="onSelect(item, $event)"
       >
         <!-- @slot Custom template of the listbox item -->

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

@@ -80,6 +80,31 @@ describe('GlListboxItem', () => {
     });
   });
 
+  describe('checkbox', () => {
+    describe('is NOT centered', () => {
+      beforeEach(() => {
+        buildWrapper({ isSelected: true });
+      });
+
+      it('should not center check icon by default', () => {
+        expect(findCheckIcon().classes()).toEqual(
+          expect.arrayContaining(['gl-mt-3', 'gl-align-self-start'])
+        );
+      });
+    });
+
+    describe('is centered', () => {
+      beforeEach(() => {
+        buildWrapper({ isSelected: true, isCheckCentered: true });
+      });
+      it('should center the check icon', () => {
+        expect(findCheckIcon().classes()).not.toEqual(
+          expect.arrayContaining(['gl-mt-3', 'gl-align-self-start'])
+        );
+      });
+    });
+  });
+
   describe('tabindex', () => {
     it('should set tabindex to `-1` when item is not focused', () => {
       buildWrapper({ isFocused: false });

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

@@ -18,6 +18,20 @@ export default {
       default: false,
       required: false,
     },
+    isCheckCentered: {
+      type: Boolean,
+      required: false,
+      default: false,
+    },
+  },
+  computed: {
+    checkedClasses() {
+      if (this.isCheckCentered) {
+        return '';
+      }
+
+      return 'gl-mt-3 gl-align-self-start';
+    },
   },
   methods: {
     toggleSelection() {
@@ -48,8 +62,11 @@ export default {
       <gl-icon
         name="mobile-issue-close"
         data-testid="dropdown-item-checkbox"
-        class="gl-mt-3 gl-align-self-start"
-        :class="['gl-new-dropdown-item-check-icon', { 'gl-visibility-hidden': !isSelected }]"
+        :class="[
+          'gl-new-dropdown-item-check-icon',
+          { 'gl-visibility-hidden': !isSelected },
+          checkedClasses,
+        ]"
       />
       <span class="gl-new-dropdown-item-text-wrapper">
         <slot></slot>

package/src/components/base/toggle/toggle.md

@@ -1,5 +1,3 @@
-# Toggle
-
 ## Usage
 
 The toggle component must have a `label` prop to give the toggle button an accessible name.

package/src/scss/utilities.scss

@@ -3112,6 +3112,18 @@
   }
 }
 
+.gl-sm-align-items-center {
+  @include gl-media-breakpoint-up(sm) {
+  align-items: center;
+  }
+}
+
+.gl-sm-align-items-center\! {
+  @include gl-media-breakpoint-up(sm) {
+  align-items: center !important;
+  }
+}
+
 .gl-md-align-items-center {
   @include gl-media-breakpoint-up(md) {
   align-items: center;
@@ -4559,6 +4571,14 @@
   max-width: $limited-layout-width !important;
 }
 
+.gl-max-w-container-xl {
+  max-width: $container-xl;
+}
+
+.gl-max-w-container-xl\! {
+  max-width: $container-xl !important;
+}
+
 .gl-h-auto {
   height: auto;
 }

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

@@ -36,6 +36,12 @@
   }
 }
 
+@mixin gl-sm-align-items-center {
+  @include gl-media-breakpoint-up(sm) {
+    @include gl-align-items-center;
+  }
+}
+
 @mixin gl-md-align-items-center {
   @include gl-media-breakpoint-up(md) {
     @include gl-align-items-center;

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

@@ -155,6 +155,10 @@
   max-width: $limited-layout-width;
 }
 
+@mixin gl-max-w-container-xl {
+  max-width: $container-xl;
+}
+
 @mixin gl-h-auto {
   height: auto;
 }

package/src/scss/variables.scss

@@ -41,6 +41,7 @@ $breakpoints: (
 
 // Max widths
 $limited-layout-width: 990px !default;
+$container-xl: 1280px !default;
 
 // Color schema
 $black: #000 !default;

package/src/utils/constants.js

@@ -48,12 +48,6 @@ export const variantCssColorMap = {
 
 export const targetOptions = ['_self', '_blank', '_parent', '_top', null];
 
-export const sizeOptions = {
-  default: null,
-  sm: 'sm',
-  lg: 'lg',
-};
-
 export const labelSizeOptions = {
   default: null,
   sm: 'sm',
@@ -234,7 +228,6 @@ export const tokenVariants = ['default', 'search-type', 'search-value'];
 export const resizeDebounceTime = 200;
 
 export const variantOptionsWithNoDefault = appendDefaultOption(variantOptions);
-export const sizeOptionsWithNoDefault = appendDefaultOption(sizeOptions);
 
 // Datetime constants
 export const defaultDateFormat = 'YYYY-MM-DD';