@gitlab/ui 32.31.0 → 32.34.1

package/src/components/utilities/truncate/truncate.spec.js

@@ -1,6 +1,7 @@
 import { shallowMount } from '@vue/test-utils';
 import { POSITION } from './constants';
 import Truncate from './truncate.vue';
+import { createMockDirective, getBinding } from '~helpers/vue_mock_directive';
 
 const removeSpecialChar = (text) => {
   return text.replace(/‎|\u200E/gi, '');
@@ -18,6 +19,9 @@ describe('Truncate component', () => {
   const createComponent = (props) => {
     wrapper = shallowMount(Truncate, {
       propsData: { ...defaultProps, ...props },
+      directives: {
+        GlTooltip: createMockDirective(),
+      },
     });
   };
 
@@ -45,6 +49,10 @@ describe('Truncate component', () => {
     it('should have the default position', () => {
       expect(wrapper.props('position')).toBe('end');
     });
+
+    it('disables the tooltip by default', () => {
+      expect(getBinding(wrapper.element, 'gl-tooltip').value.disabled).toBe(true);
+    });
   });
 
   describe('start truncation', () => {

package/src/components/utilities/truncate/truncate.stories.js

@@ -1,4 +1,4 @@
-import { withKnobs, text, select } from '@storybook/addon-knobs';
+import { withKnobs, text, select, boolean } from '@storybook/addon-knobs';
 import { documentedStoriesOf } from '../../../../documentation/documented_stories';
 import { GlTruncate } from '../../../../index';
 import { POSITION } from './constants';
@@ -8,11 +8,12 @@ const components = {
   GlTruncate,
 };
 
-const template = '<gl-truncate :text="text" :position="position" />';
+const template = '<gl-truncate :text="text" :position="position" :with-tooltip="withTooltip" />';
 
 function generateProps({
   longText = 'src/thisIs/AVeryLongFilePath/that/needs/to/be/smartly/truncated/from/the/middle/so/we/dont/lose/important/information/here.vue',
   position = 'middle',
+  withTooltip = false,
 } = {}) {
   return {
     text: {
@@ -23,6 +24,9 @@ function generateProps({
       type: String,
       default: select('position', Object.values(POSITION), position),
     },
+    withTooltip: {
+      default: boolean('withTooltip', withTooltip),
+    },
   };
 }
 

package/src/components/utilities/truncate/truncate.vue

@@ -1,7 +1,14 @@
 <script>
+import { GlTooltipDirective } from '../../../directives/tooltip';
+import { GlResizeObserverDirective } from '../../../directives/resize_observer/resize_observer';
 import { POSITION } from './constants';
 
 export default {
+  POSITION,
+  directives: {
+    GlTooltip: GlTooltipDirective,
+    GlResizeObserver: GlResizeObserverDirective,
+  },
   props: {
     text: {
       type: String,
@@ -13,10 +20,15 @@ export default {
       default: POSITION.END,
       validator: (value) => Object.values(POSITION).includes(value),
     },
+    withTooltip: {
+      type: Boolean,
+      required: false,
+      default: false,
+    },
   },
   data() {
     return {
-      POSITION,
+      isTruncated: false,
     };
   },
   computed: {
@@ -30,24 +42,62 @@ export default {
     last() {
       return this.text.slice(this.middleIndex);
     },
+    isTooltipDisabled() {
+      return !this.withTooltip || !this.isTruncated;
+    },
+  },
+  watch: {
+    withTooltip(withTooltip) {
+      if (withTooltip) {
+        this.checkTruncationState();
+      }
+    },
+  },
+  methods: {
+    checkTruncationState() {
+      if (this.withTooltip) {
+        this.isTruncated = this.$refs.text.scrollWidth > this.$refs.text.offsetWidth;
+      }
+    },
   },
 };
 </script>
 
 <template>
   <!-- START  -->
-  <span v-if="position === POSITION.START" class="gl-truncate" :title="text">
-    <span class="gl-truncate-start gl-text-overflow-ellipsis!">&lrm;{{ text }}&lrm;</span>
+  <span
+    v-if="position === $options.POSITION.START"
+    v-gl-tooltip="{ disabled: isTooltipDisabled }"
+    v-gl-resize-observer:[withTooltip]="checkTruncationState"
+    class="gl-truncate"
+    :title="text"
+  >
+    <span ref="text" class="gl-truncate-start gl-text-overflow-ellipsis!"
+      >&lrm;{{ text }}&lrm;</span
+    >
   </span>
 
   <!-- MIDDLE  -->
-  <span v-else-if="position === POSITION.MIDDLE" class="gl-truncate" :title="text">
-    <span class="gl-truncate-end">{{ first }}</span
+  <span
+    v-else-if="position === $options.POSITION.MIDDLE"
+    v-gl-tooltip="{ disabled: isTooltipDisabled }"
+    v-gl-resize-observer:[withTooltip]="checkTruncationState"
+    class="gl-truncate"
+    :title="text"
+  >
+    <span ref="text" class="gl-truncate-end">{{ first }}</span
     ><span class="gl-truncate-start">&lrm;{{ last }}&lrm;</span>
   </span>
 
   <!-- END  -->
-  <span v-else class="gl-truncate" :title="text">
-    <span class="gl-truncate-end">{{ text }}</span>
+  <span
+    v-else
+    v-gl-tooltip="{ disabled: isTooltipDisabled }"
+    v-gl-resize-observer:[withTooltip]="checkTruncationState"
+    class="gl-truncate"
+    data-testid="truncate-end-container"
+    :title="text"
+  >
+    <span ref="text" class="gl-truncate-end">{{ text }}</span>
   </span>
 </template>

package/src/directives/resize_observer/resize_observer.js

@@ -2,29 +2,44 @@ import isFunction from 'lodash/isFunction';
 
 let observer = null;
 
-export const GlResizeObserverDirective = {
-  bind(el, { value: resizeHandler }) {
-    if (!isFunction(resizeHandler)) {
-      throw TypeError('directive value must be a function');
-    }
+const attachObserver = (el, resizeHandler) => {
+  if (!isFunction(resizeHandler)) {
+    throw TypeError('directive value must be a function');
+  }
 
-    if (!observer) {
-      // the observer instance is shared for performance reasons
-      // more information: https://github.com/WICG/ResizeObserver/issues/59
-      observer = new ResizeObserver((entries) => {
-        entries.forEach((event) => {
-          event.target.glResizeHandler(event);
-        });
+  if (!observer) {
+    // the observer instance is shared for performance reasons
+    // more information: https://github.com/WICG/ResizeObserver/issues/59
+    observer = new ResizeObserver((entries) => {
+      entries.forEach((event) => {
+        event.target.glResizeHandler(event);
       });
-    }
+    });
+  }
+
+  el.glResizeHandler = resizeHandler;
+  observer.observe(el);
+};
 
-    el.glResizeHandler = resizeHandler;
-    observer.observe(el);
+const detachObserver = (el) => {
+  if (el.glResizeHandler) {
+    delete el.glResizeHandler;
+    observer?.unobserve(el);
+  }
+};
+
+export const GlResizeObserverDirective = {
+  bind(el, { value: resizeHandler, arg: enabled = true }) {
+    if (enabled) {
+      attachObserver(el, resizeHandler);
+    }
   },
-  unbind(el) {
-    if (el.glResizeHandler) {
-      delete el.glResizeHandler;
-      observer?.unobserve(el);
+  update(el, { value: resizeHandler, arg: enabled = true }) {
+    if (enabled) {
+      attachObserver(el, resizeHandler);
+    } else {
+      detachObserver(el);
     }
   },
+  unbind: detachObserver,
 };

package/src/directives/resize_observer/resize_observer.md

@@ -38,3 +38,23 @@ export default {
   </div>
 </template>
 ```
+
+The observer can be toggled on or off by passing a boolean argument to the directive:
+
+```html
+<script>
+export default {
+  data() {
+    return {
+      shouldObserve: true,
+    };
+  },
+  methods: {
+    handleResize() {},
+  },
+};
+</script>
+<template>
+  <div v-gl-resize-observer-directive[shouldObserve]="handleResize"></div>
+</template>
+```

package/src/directives/resize_observer/resize_observer.spec.js

@@ -10,7 +10,7 @@ describe('resize observer directive', () => {
   const localVue = createLocalVue();
   let wrapper;
 
-  const createComponent = ({ template } = {}) => {
+  const createComponent = ({ template, data = {} } = {}) => {
     const defaultTemplate = `<div v-resize-observer="handleResize"></div>`;
 
     const component = {
@@ -21,6 +21,9 @@ describe('resize observer directive', () => {
         handleResize: mockHandleResize,
       },
       template: template || defaultTemplate,
+      data() {
+        return data;
+      },
     };
 
     wrapper = shallowMount(component, { localVue });
@@ -52,6 +55,13 @@ describe('resize observer directive', () => {
     expect(observesElement(wrapper.element)).toBe(true);
   });
 
+  it('does not subscribe if the argument is false', () => {
+    createComponent({ template: '<div v-resize-observer:[false]="handleResize"></div>' });
+
+    expect(observersCount()).toBe(0);
+    expect(observesElement(wrapper.element)).toBe(false);
+  });
+
   it('passes the first entries "contentRect" and "target" to the given handler', () => {
     createComponent();
 
@@ -61,6 +71,28 @@ describe('resize observer directive', () => {
     expect(mockHandleResize).toHaveBeenCalledWith({ contentRect: {}, target: wrapper.element });
   });
 
+  it("detaches then reattaches observer based on argument's value", async () => {
+    expect(observersCount()).toBe(0);
+
+    createComponent({
+      template: '<div v-resize-observer:[isEnabled]="handleResize"></div>',
+      data: {
+        isEnabled: true,
+      },
+    });
+
+    expect(observersCount()).toBe(1);
+    expect(wrapper.element.glResizeHandler).not.toBeFalsy();
+
+    await wrapper.setData({ isEnabled: false });
+
+    expect(wrapper.element.glResizeHandler).toBeFalsy();
+
+    await wrapper.setData({ isEnabled: true });
+
+    expect(wrapper.element.glResizeHandler).not.toBeFalsy();
+  });
+
   it('does a clean up when the component is destroyed', () => {
     createComponent();
 

package/src/scss/variables.scss

@@ -427,12 +427,7 @@ $gl-icon-chevron-down: 'data:image/svg+xml;utf8,<svg viewBox="0 0 16 16" xmlns="
 
 // Icons
 $default-icon-size: px-to-rem(16px);
-// $gl-deprecated-icon-sizes is used for css classes generation as there are still instances around codebase
-// where $gl-icon-sizes is a new list of supported icon sizes and will be used for icon size validation
-// $gl-deprecated-icon-sizes should be replaced with $gl-icon-sizes in scope
-// of this issue https://gitlab.com/gitlab-org/gitlab-ui/-/issues/1232
 $gl-icon-sizes: 8 12 14 16 24 32 48 72;
-$gl-deprecated-icon-sizes: join($gl-icon-sizes, 10 18);
 
 // Dropdowns
 $gl-dropdown-width: px-to-rem(240px);

package/src/utils/charts/config.js

@@ -12,6 +12,7 @@ import { ANNOTATIONS_SERIES_NAME, arrowSymbol, CHART_TYPE_BAR, CHART_TYPE_LINE }
 export const defaultAreaOpacity = 0.2;
 export const defaultFontSize = 12;
 export const defaultHeight = 400;
+export const defaultWidth = 300;
 export const validRenderers = ['canvas', 'svg'];
 
 export const axes = {
@@ -433,8 +434,8 @@ export const generateBarSeries = ({
   yAxisIndex,
   itemStyle: {
     color: hexToRgba(color, 0.2),
-    barBorderColor: color,
-    barBorderWidth: 1,
+    borderColor: color,
+    borderWidth: 1,
   },
   emphasis: {
     itemStyle: {

package/src/utils/charts/mock_data.js

@@ -43,6 +43,9 @@ export const mockDefaultChartOptions = {
     axisPointer: {
       show: true,
       label: {},
+      lineStyle: {
+        type: 'solid',
+      },
     },
   },
   yAxis: {
@@ -204,8 +207,8 @@ export const mockDefaultBarChartConfig = {
   yAxisIndex: 0,
   itemStyle: {
     color: hexToRgba(color, 0.2),
-    barBorderColor: color,
-    barBorderWidth: 1,
+    borderColor: color,
+    borderWidth: 1,
   },
   emphasis: {
     itemStyle: {

package/src/utils/charts/theme.js

@@ -105,15 +105,14 @@ const axes = {
     margin: 8,
     show: true,
     color: gray600,
-    textStyle: {
-      color: gray600,
-    },
+    hideOverlap: true,
   },
   axisLine: {
     show: false,
   },
   axisPointer: {
     lineStyle: {
+      type: 'solid',
       color: gray600,
     },
     label: {
@@ -175,6 +174,7 @@ const createTheme = (options = {}) => ({
   dataZoom: {
     borderColor: 'transparent',
     filterMode: 'none',
+    brushSelect: false,
     dataBackground: {
       lineStyle: {
         width: 2,
@@ -184,7 +184,7 @@ const createTheme = (options = {}) => ({
       // render unfilled zoom-graph if the series is a line chart without area styles
       // more details: https://gitlab.com/gitlab-org/gitlab-ui/-/merge_requests/2364#note_666637306
       areaStyle: isLineChartWithoutArea(options)
-        ? null
+        ? {} // Use empty object instead of null, see https://gitlab.com/gitlab-org/gitlab-ui/-/merge_requests/2185#note_707711029 for more context
         : {
             color: gray50,
             opacity: 1,
@@ -192,7 +192,10 @@ const createTheme = (options = {}) => ({
     },
     fillerColor: hexToRgba(gray200, 0.23),
     handleIcon: scrollHandleSvgPath,
-    handleColor: gray500,
+    handleStyle: {
+      borderColor: 'transparent',
+      color: gray500,
+    },
     handleSize: '50%',
     labelFormatter: () => null,
     textStyle: {
@@ -203,14 +206,16 @@ const createTheme = (options = {}) => ({
     top: '-5',
     left: 'center',
     itemSize: 14,
-    iconStyle: {
-      color: gray200,
-      borderWidth: 0,
-      emphasis: {
+    emphasis: {
+      iconStyle: {
         borderWidth: 0,
         color: gray700,
       },
     },
+    iconStyle: {
+      color: gray200,
+      borderWidth: 0,
+    },
     itemGap: 8,
     feature: {
       dataZoom: {