@gitlab/ui 138.1.0 → 138.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gitlab/ui",
-  "version": "138.1.0",
+  "version": "138.3.0",
   "description": "GitLab UI Components",
   "license": "MIT",
   "main": "dist/index.js",
@@ -151,7 +151,7 @@
     "pikaday": "^1.8.0",
     "playwright": "^1.63.0",
     "playwright-core": "^1.63.0",
-    "postcss": "8.5.28",
+    "postcss": "8.5.29",
     "postcss-loader": "8.2.1",
     "postcss-scss": "4.0.9",
     "react": "18.3.1",
@@ -168,7 +168,7 @@
     "start-server-and-test": "^2.1.5",
     "storybook": "^7.6.24",
     "storybook-dark-mode": "4.0.2",
-    "style-dictionary": "^5.5.5",
+    "style-dictionary": "^5.6.0",
     "style-loader": "^4",
     "tailwindcss": "3.4.19",
     "vue": "2.7.16",
@@ -178,6 +178,6 @@
     "vue-router": "^3.6.5",
     "vue-template-compiler": "2.7.16",
     "vue-test-utils-compat": "^0.0.15",
-    "webpack": "^5.100.1"
+    "webpack": "^5.111.1"
   }
 }

package/src/components/base/button/button.scss

@@ -431,12 +431,6 @@
       @apply gl-bg-transparent;
     }
 
-    &.disabled,
-    &[disabled] {
-      @apply gl-bg-transparent;
-      @apply gl-shadow-none;
-    }
-
     @media (forced-colors: active) {
       color: LinkText; // stylelint-disable-line scale-unlimited/declaration-strict-value
     }
@@ -472,10 +466,17 @@
     }
   }
 
+  // After the disabled rule above so it also wins on focus, active and selected
   &.disabled[class*="-tertiary"],
-  &[disabled][class*="-tertiary"] {
+  &[disabled][class*="-tertiary"],
+  &.btn-link.disabled,
+  &.btn-link[disabled] {
     @apply gl-bg-transparent;
-    @apply gl-shadow-none;
+
+    // Focusable disabled buttons (`accessibleDisabled`, loading) keep the focus ring
+    &:not(:focus-visible) {
+      @apply gl-shadow-none;
+    }
   }
 }
 

package/src/components/base/pagination/pagination.vue

@@ -155,7 +155,8 @@ export default {
   },
   data() {
     return {
-      breakpoint: GlBreakpointInstance.getBreakpointSize(),
+      // Set on mount to be safe for SSR
+      breakpoint: null,
       // If total pages count is below or equal to minTotalPagesToCollapse, collapsing is disabled
       minTotalPagesToCollapse: 4,
     };
@@ -272,7 +273,8 @@ export default {
       return '#';
     },
   },
-  created() {
+  mounted() {
+    this.setBreakpoint();
     this.resizeDebounced = debounce(this.setBreakpoint, resizeDebounceTime);
     window.addEventListener('resize', this.resizeDebounced);
   },

package/src/components/base/sorting/sorting.vue

@@ -98,6 +98,15 @@ export default {
       required: false,
       default: true,
     },
+    /**
+     * Disables the entire sorting control (both the sort-by dropdown and the
+     * sort direction toggle) while keeping it visible.
+     */
+    disabled: {
+      type: Boolean,
+      required: false,
+      default: false,
+    },
   },
   data() {
     return {
@@ -106,7 +115,14 @@ export default {
     };
   },
   computed: {
+    unavailableLabel() {
+      return translate('GlSorting.sortingUnavailable', 'Sorting is unavailable');
+    },
     sortingListboxLabel() {
+      if (this.disabled) {
+        return this.unavailableLabel;
+      }
+
       return translate('GlSorting.sortByLabel', 'Sort by:');
     },
     localSortDirection() {
@@ -119,19 +135,19 @@ export default {
       return this.selectedSortOption?.text ?? '';
     },
     isDirectionToggleDisabled() {
-      return Boolean(this.selectedSortOption?.directionToggleDisabled);
+      return this.disabled || Boolean(this.selectedSortOption?.directionToggleDisabled);
     },
     sortDirectionText() {
-      if (this.sortDirectionToolTip) return this.sortDirectionToolTip;
+      if (this.sortDirectionToolTip && !this.disabled) return this.sortDirectionToolTip;
 
       if (this.isDirectionToggleDisabled) {
         return this.selectedSortText
           ? translate(
               'GlSorting.sortDirectionUnavailableFor',
-              'Sort direction unavailable for %{sortField}',
+              'Sorting is unavailable for %{sortField}',
               { sortField: this.selectedSortText },
             )
-          : translate('GlSorting.sortDirectionUnavailable', 'Sort direction unavailable');
+          : this.unavailableLabel;
       }
 
       return this.isAscending
@@ -139,6 +155,11 @@ export default {
         : translate('GlSorting.sortDescending', 'Sort direction: descending');
     },
   },
+  watch: {
+    disabled(isDisabled) {
+      if (isDisabled) this.$refs.listbox.close();
+    },
+  },
   methods: {
     toggleSortDirection() {
       if (this.isDirectionToggleDisabled) return;
@@ -156,6 +177,8 @@ export default {
       this.$emit('sort-direction-change', newDirection);
     },
     onSortByChanged(event) {
+      if (this.disabled) return;
+
       /**
        * Emitted when the sort field is changed.
        *
@@ -174,6 +197,7 @@ export default {
 <template>
   <gl-button-group class="gl-sorting gl-flex">
     <gl-collapsible-listbox
+      ref="listbox"
       :toggle-text="text"
       :items="sortOptions"
       :selected="sortBy"
@@ -182,6 +206,7 @@ export default {
       :class="dropdownClass"
       placement="bottom-end"
       :block="block"
+      :disabled="disabled"
       :toggle-id="toggleId"
       :toggle-aria-labelled-by="`${sortingListboxId} ${toggleId}`"
       @select="onSortByChanged"

package/src/components/base/toggle/toggle.vue

@@ -1,6 +1,7 @@
 <script>
 import { uniqueId } from 'lodash-es';
 
+import { glToggleConfig } from '../../../config';
 import { toggleLabelPosition } from '../../../utils/constants';
 import GlIcon from '../icon/icon.vue';
 import GlLoadingIcon from '../loading_icon/loading_icon.vue';
@@ -43,6 +44,22 @@ export default {
       required: false,
       default: false,
     },
+    /**
+     * Keep the toggle focusable while `disabled` is `true`. Uses `aria-disabled` so the toggle stays in the tab order and is announced by assistive technology.
+     */
+    accessibleDisabled: {
+      type: Boolean,
+      required: false,
+      default: () => glToggleConfig.accessibleDisabledToggle,
+    },
+    /**
+     * Space-separated ids of elements that describe the toggle, in addition to its help text.
+     */
+    ariaDescribedby: {
+      type: String,
+      required: false,
+      default: undefined,
+    },
     /**
      * Whether the toggle is in the loading state.
      */
@@ -111,6 +128,12 @@ export default {
     helpId() {
       return this.shouldRenderHelp ? `toggle-help-${this.uuid}` : undefined;
     },
+    describedBy() {
+      return [this.helpId, this.ariaDescribedby].filter(Boolean).join(' ') || undefined;
+    },
+    isNativeDisabled() {
+      return this.disabled && !this.accessibleDisabled;
+    },
     isChecked() {
       return this.value ? 'true' : 'false';
     },
@@ -172,7 +195,7 @@ export default {
       role="switch"
       :aria-checked="isChecked"
       :aria-labelledby="labelId"
-      :aria-describedby="helpId"
+      :aria-describedby="describedBy"
       :aria-disabled="disabled"
       :class="{
         'is-checked': value,
@@ -181,7 +204,7 @@ export default {
       }"
       class="gl-toggle gl-shrink-0"
       type="button"
-      :disabled="disabled"
+      :disabled="isNativeDisabled"
       @click.prevent="toggleFeature"
     >
       <gl-loading-icon v-if="isLoading" color="dark" class="toggle-loading" />

package/src/components/charts/chart/chart.vue

@@ -80,6 +80,15 @@ export default {
       required: false,
       default: true,
     },
+    /**
+     * A name for the chart that screen readers announce. It is added as a hidden title, which
+     * ECharts reads into the description it generates. Ignored when `options` sets a title.
+     */
+    accessibleTitle: {
+      type: String,
+      required: false,
+      default: '',
+    },
   },
   data() {
     return {
@@ -96,6 +105,10 @@ export default {
         options = merge({}, options, { aria: { enabled: true } });
       }
 
+      if (this.accessibleTitle && !options.title) {
+        options = merge({}, options, { title: { text: this.accessibleTitle, show: false } });
+      }
+
       // Add space at the top to fit the toolbox
       if (options.toolbox?.show === true) {
         const top = (options.grid?.top || 0) + toolboxHeight;
@@ -111,6 +124,11 @@ export default {
         this.draw();
       }
     },
+    accessibleTitle() {
+      if (this.chart) {
+        this.draw();
+      }
+    },
     width() {
       this.setChartSize();
     },

package/src/config.js

@@ -7,6 +7,7 @@ export const defaultConfig = {
 };
 
 export const glButtonConfig = {};
+export const glToggleConfig = {};
 
 let configured = false;
 
@@ -18,9 +19,15 @@ let configured = false;
  * @property {undefined | Object} translations Generic translations for component labels to fall back to.
  * @property {undefined | Number} firstDayOfWeek Configured first day of the week, from 0 (Sunday) to 6 (Saturday).
  * @property {boolean} [accessibleDisabledButton] Temporary flag to enable the accessible disabled button.
+ * @property {boolean} [accessibleDisabledToggle] Temporary flag to enable the accessible disabled toggle.
  *
  */
-const setConfigs = ({ translations, firstDayOfWeek, accessibleDisabledButton = false } = {}) => {
+const setConfigs = ({
+  translations,
+  firstDayOfWeek,
+  accessibleDisabledButton = false,
+  accessibleDisabledToggle = false,
+} = {}) => {
   if (configured) {
     if (process.env.NODE_ENV === 'development') {
       throw new Error('GitLab UI can only be configured once!');
@@ -71,6 +78,14 @@ const setConfigs = ({ translations, firstDayOfWeek, accessibleDisabledButton = f
       accessibleDisabledButton,
     });
   }
+
+  // Temporary flag for the accessible disabled toggle. Once validated, aria-disabled becomes
+  // the default for disabled toggles and this flag is removed.
+  if (typeof accessibleDisabledToggle === 'boolean') {
+    Object.assign(glToggleConfig, {
+      accessibleDisabledToggle,
+    });
+  }
 };
 
 export default setConfigs;

package/translations.js

@@ -43,8 +43,8 @@ export default {
   'GlSorting.sortAscending': 'Sort direction: ascending',
   'GlSorting.sortByLabel': 'Sort by:',
   'GlSorting.sortDescending': 'Sort direction: descending',
-  'GlSorting.sortDirectionUnavailable': 'Sort direction unavailable',
-  'GlSorting.sortDirectionUnavailableFor': 'Sort direction unavailable for %{sortField}',
+  'GlSorting.sortDirectionUnavailableFor': 'Sorting is unavailable for %{sortField}',
+  'GlSorting.sortingUnavailable': 'Sorting is unavailable',
   'GlTabs.GlScrollableTabs.scrollLeftLabel': 'Scroll left',
   'GlTabs.GlScrollableTabs.scrollRightLabel': 'Scroll right',
   'GlToken.closeButtonTitle': 'Remove',