@gitlab/ui 42.13.0 → 42.15.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gitlab/ui",
-  "version": "42.13.0",
+  "version": "42.15.0",
   "description": "GitLab UI Components",
   "license": "MIT",
   "main": "dist/index.js",
@@ -81,9 +81,9 @@
     "@arkweid/lefthook": "0.7.7",
     "@babel/core": "^7.10.2",
     "@babel/preset-env": "^7.10.2",
-    "@gitlab/eslint-plugin": "12.3.0",
+    "@gitlab/eslint-plugin": "13.0.0",
     "@gitlab/stylelint-config": "4.1.0",
-    "@gitlab/svgs": "2.25.0",
+    "@gitlab/svgs": "2.26.0",
     "@rollup/plugin-commonjs": "^11.1.0",
     "@rollup/plugin-node-resolve": "^7.1.3",
     "@rollup/plugin-replace": "^2.3.2",

package/src/components/base/card/card.vue

@@ -32,7 +32,7 @@ export default {
 
 <template>
   <div class="gl-card">
-    <div v-if="$slots.header" class="gl-card-header" :class="headerClass">
+    <div v-if="$scopedSlots.header" class="gl-card-header" :class="headerClass">
       <!-- @slot The card's header content. -->
       <slot name="header"></slot>
     </div>
@@ -40,7 +40,7 @@ export default {
       <!-- @slot The card's main content. -->
       <slot></slot>
     </div>
-    <div v-if="$slots.footer" class="gl-card-footer" :class="footerClass">
+    <div v-if="$scopedSlots.footer" class="gl-card-footer" :class="footerClass">
       <!-- @slot The card's footer content. -->
       <slot name="footer"></slot>
     </div>

package/src/components/base/token_selector/token_container.spec.js

@@ -71,6 +71,29 @@ describe('GlTokenContainer', () => {
       });
     });
 
+    describe('clearing all tokens', () => {
+      const findClearAllButton = () => wrapper.find('[data-testid="clear-all-button"]');
+
+      it('does not render `Clear all` button by default', () => {
+        createComponent();
+
+        expect(findClearAllButton().exists()).toBe(false);
+      });
+
+      it('renders `Clear all` button when `showClearAllButton` prop is true', () => {
+        createComponent({ propsData: { showClearAllButton: true } });
+
+        expect(findClearAllButton().exists()).toBe(true);
+      });
+
+      it('emits `clear-all` event when `Clear all` button is clicked', () => {
+        createComponent({ propsData: { showClearAllButton: true } });
+        findClearAllButton().vm.$emit('click', new MouseEvent('click'));
+
+        expect(wrapper.emitted('clear-all')).toEqual([[]]);
+      });
+    });
+
     describe('state', () => {
       describe('when `state` is `false`', () => {
         it('adds `aria-invalid="true"` attribute`', () => {

package/src/components/base/token_selector/token_container.vue

@@ -1,10 +1,11 @@
 <script>
 import GlToken from '../token/token.vue';
+import GlButton from '../button/button.vue';
 import { tokensValidator } from './helpers';
 
 export default {
   name: 'GlTokenContainer',
-  components: { GlToken },
+  components: { GlToken, GlButton },
   props: {
     tokens: {
       type: Array,
@@ -26,6 +27,11 @@ export default {
       required: false,
       default: false,
     },
+    showClearAllButton: {
+      type: Boolean,
+      required: false,
+      default: false,
+    },
   },
   data() {
     return {
@@ -124,7 +130,7 @@ export default {
 <template>
   <div
     ref="tokenContainer"
-    class="gl-display-flex gl-flex-wrap gl-align-items-center gl-my-n1 gl-mx-n1"
+    class="gl-display-flex gl-flex-wrap gl-align-items-center gl-my-n1 gl-mx-n1 gl-w-full"
     role="listbox"
     aria-multiselectable="false"
     aria-orientation="horizontal"
@@ -162,5 +168,14 @@ export default {
       </gl-token>
     </div>
     <slot name="text-input"></slot>
+    <gl-button
+      v-if="showClearAllButton"
+      size="small"
+      aria-label="Clear all"
+      icon="clear"
+      category="tertiary"
+      data-testid="clear-all-button"
+      @click.stop="$emit('clear-all')"
+    />
   </div>
 </template>

package/src/components/base/token_selector/token_selector.spec.js

@@ -86,6 +86,8 @@ describe('GlTokenSelector', () => {
 
   const findContainer = () => wrapper.findComponent({ ref: 'container' });
 
+  const findTokenContainer = () => wrapper.findComponent(GlTokenContainer);
+
   beforeAll(() => {
     if (!HTMLElement.prototype.scrollIntoView) {
       HTMLElement.prototype.scrollIntoView = jest.fn();
@@ -149,7 +151,7 @@ describe('GlTokenSelector', () => {
       });
 
       it('passes `viewOnly` prop to GlTokenContainer', () => {
-        expect(wrapper.findComponent(GlTokenContainer).props('viewOnly')).toBe(true);
+        expect(findTokenContainer().props('viewOnly')).toBe(true);
       });
 
       it('disables input field if viewOnly is true', () => {
@@ -159,6 +161,16 @@ describe('GlTokenSelector', () => {
       });
     });
 
+    describe('when there are tokens and `allowClearAll` is true', () => {
+      beforeEach(() => {
+        createComponent({ propsData: { allowClearAll: true, selectedTokens: tokens } });
+      });
+
+      it('passes `showClearAllButton` prop as `true` to token-container', () => {
+        expect(findTokenContainer().props('showClearAllButton')).toBe(true);
+      });
+    });
+
     describe('containerClass', () => {
       it('renders passed CSS classes', () => {
         createComponent({
@@ -290,7 +302,7 @@ describe('GlTokenSelector', () => {
         },
       });
 
-      expect(wrapper.findComponent(GlTokenContainer).props('state')).toBe(true);
+      expect(findTokenContainer().props('state')).toBe(true);
     });
   });
 
@@ -589,7 +601,7 @@ describe('GlTokenSelector', () => {
         propsData: { selectedTokens: [token] },
       });
 
-      wrapper.findComponent(GlTokenContainer).vm.$emit('token-remove', token);
+      findTokenContainer().vm.$emit('token-remove', token);
 
       await nextTick();
     });
@@ -631,7 +643,7 @@ describe('GlTokenSelector', () => {
         selectedTokens: tokens,
       });
 
-      wrapper.findComponent(GlTokenContainer).vm.$emit('cancel-focus');
+      findTokenContainer().vm.$emit('cancel-focus');
 
       await nextTick();
 

package/src/components/base/token_selector/token_selector.vue

@@ -1,6 +1,5 @@
 <script>
 import { uniqueId } from 'lodash';
-
 import { tokensValidator } from './helpers';
 import GlTokenContainer from './token_container.vue';
 import GlTokenSelectorDropdown from './token_selector_dropdown.vue';
@@ -8,7 +7,10 @@ import GlTokenSelectorDropdown from './token_selector_dropdown.vue';
 export default {
   name: 'GlTokenSelector',
   componentId: uniqueId('token-selector'),
-  components: { GlTokenContainer, GlTokenSelectorDropdown },
+  components: {
+    GlTokenContainer,
+    GlTokenSelectorDropdown,
+  },
   model: {
     prop: 'selectedTokens',
     event: 'input',
@@ -121,6 +123,14 @@ export default {
       required: false,
       default: false,
     },
+    /**
+     * Allows user to bulk delete tokens when enabled
+     */
+    allowClearAll: {
+      type: Boolean,
+      required: false,
+      default: false,
+    },
   },
   data() {
     return {
@@ -173,8 +183,14 @@ export default {
         ? 'is-valid gl-inset-border-1-gray-400!'
         : 'is-invalid gl-inset-border-1-red-500!';
     },
+    hasSelectedTokens() {
+      return this.selectedTokens.length > 0;
+    },
     showEmptyPlaceholder() {
-      return this.selectedTokens.length === 0 && !this.inputFocused;
+      return !this.hasSelectedTokens && !this.inputFocused;
+    },
+    showClearAllButton() {
+      return this.hasSelectedTokens && this.allowClearAll;
     },
   },
   watch: {
@@ -357,6 +373,10 @@ export default {
     registerFocusOnToken(focusOnToken) {
       this.focusOnToken = focusOnToken;
     },
+    clearAll() {
+      this.$emit('input', []);
+      this.focusTextInput();
+    },
   },
 };
 </script>
@@ -377,8 +397,10 @@ export default {
         :state="state"
         :register-focus-on-token="registerFocusOnToken"
         :view-only="viewOnly"
+        :show-clear-all-button="showClearAllButton"
         @token-remove="removeToken"
         @cancel-focus="cancelTokenFocus"
+        @clear-all="clearAll"
       >
         <template #token-content="{ token }">
           <!-- @slot Content to pass to the token component slot. Can be used

package/src/scss/utilities.scss

@@ -5704,6 +5704,12 @@
 .gl-mr-7\! {
   margin-right: $gl-spacing-scale-7 !important;
 }
+.gl-mb-auto {
+  margin-bottom: auto;
+}
+.gl-mb-auto\! {
+  margin-bottom: auto !important;
+}
 .gl-mb-0 {
   margin-bottom: 0;
 }

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

@@ -498,6 +498,10 @@
   margin-right: $gl-spacing-scale-7;
 }
 
+@mixin gl-mb-auto {
+  margin-bottom: auto;
+}
+
 @mixin gl-mb-0 {
   margin-bottom: 0;
 }