@gitlab/ui 111.6.0 → 111.7.1

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [111.7.1](https://gitlab.com/gitlab-org/gitlab-ui/compare/v111.7.0...v111.7.1) (2025-03-25)
+
+
+### Bug Fixes
+
+* **GlButtonGroup:** Isolate button divider so it doesn't overlap others ([7b0481c](https://gitlab.com/gitlab-org/gitlab-ui/commit/7b0481cb53851bee185baa4e4d139372064c9fb2))
+
+# [111.7.0](https://gitlab.com/gitlab-org/gitlab-ui/compare/v111.6.0...v111.7.0) (2025-03-25)
+
+
+### Features
+
+* **GlChart:** Allow charts to opt-out of aria ([14c0bfc](https://gitlab.com/gitlab-org/gitlab-ui/commit/14c0bfc4d8cf1eb57b865856e6ecf0a7461d0be4))
+
 # [111.6.0](https://gitlab.com/gitlab-org/gitlab-ui/compare/v111.5.0...v111.6.0) (2025-03-25)
 
 

package/dist/components/charts/chart/chart.js

@@ -1,5 +1,6 @@
 import * as echarts from 'echarts';
-import { validRenderers, defaultWidth, defaultHeight, toolboxHeight } from '../../../utils/charts/config';
+import merge from 'lodash/merge';
+import { validRenderers, toolboxHeight, defaultWidth, defaultHeight } from '../../../utils/charts/config';
 import { themeName, createTheme } from '../../../utils/charts/theme';
 import { GlResizeObserverDirective } from '../../../directives/resize_observer/resize_observer';
 import { debounceByAnimationFrame } from '../../../utils/utils';
@@ -12,20 +13,6 @@ import __vue_normalize__ from 'vue-runtime-helpers/dist/normalize-component.js';
  * https://echarts.apache.org/en/api.html#echartsInstance.resize
  */
 const sizeValidator = size => Number.isFinite(size) || size === 'auto' || size == null;
-const isChartWithToolbox = options => {
-  var _options$toolbox;
-  return Boolean(options === null || options === void 0 ? void 0 : (_options$toolbox = options.toolbox) === null || _options$toolbox === void 0 ? void 0 : _options$toolbox.show);
-};
-const increaseChartGridTop = (options, increaseBy) => {
-  var _options$grid;
-  return {
-    ...options,
-    grid: {
-      ...options.grid,
-      top: ((options === null || options === void 0 ? void 0 : (_options$grid = options.grid) === null || _options$grid === void 0 ? void 0 : _options$grid.top) || 0) + increaseBy
-    }
-  };
-};
 var script = {
   name: 'GlChart',
   directives: {
@@ -89,8 +76,32 @@ var script = {
     };
   },
   computed: {
-    normalizedOptions() {
-      return isChartWithToolbox(this.options) ? increaseChartGridTop(this.options, toolboxHeight) : this.options;
+    modifiedOptions() {
+      var _options$aria, _options$toolbox;
+      let options = {
+        ...this.options
+      };
+
+      // Enable aria by default
+      if (((_options$aria = options.aria) === null || _options$aria === void 0 ? void 0 : _options$aria.enabled) === undefined) {
+        options = merge({}, options, {
+          aria: {
+            enabled: true
+          }
+        });
+      }
+
+      // Add space at the top to fit the toolbox
+      if (((_options$toolbox = options.toolbox) === null || _options$toolbox === void 0 ? void 0 : _options$toolbox.show) === true) {
+        var _options$grid;
+        const top = (((_options$grid = options.grid) === null || _options$grid === void 0 ? void 0 : _options$grid.top) || 0) + toolboxHeight;
+        options = merge({}, options, {
+          grid: {
+            top
+          }
+        });
+      }
+      return options;
     }
   },
   watch: {
@@ -137,12 +148,7 @@ var script = {
   },
   methods: {
     draw() {
-      this.chart.setOption({
-        ...this.normalizedOptions,
-        aria: {
-          enabled: true
-        }
-      });
+      this.chart.setOption(this.modifiedOptions);
       /**
        * Emitted after calling `echarts.setOption`
        */