@gitlab/ui 32.49.0 → 32.51.2

package/dist/utils/string_utils.js

@@ -1,3 +1,5 @@
+import emojiRegexFactory from 'emoji-regex';
+
 /**
  * Split the given string after each occurrence of each of the given symbols.
  *
@@ -16,6 +18,7 @@
  * @param {string} string The string to split.
  * @returns {string[]} The resulting strings.
  */
+
 const splitAfterSymbols = (symbols, string) => {
   const textParts = [];
   let textPartStartIndex = 0;
@@ -60,10 +63,11 @@ const splitAfterSymbols = (symbols, string) => {
 
   return textParts;
 };
+const startsWithEmojiRegex = `^(${emojiRegexFactory().source})`;
 const getAvatarChar = name => {
   if (name) {
-    // Check if first character is an emjoi
-    const match = name.match(/^\p{Emoji}/u);
+    // Check if string starts with an emoji (which could be multiple characters and zero-width joined)
+    const match = name.match(startsWithEmojiRegex);
 
     if (match) {
       // Return the first match

package/documentation/documented_stories.js

@@ -90,6 +90,7 @@ export const setupStorybookReadme = () =>
         'GlAccordion',
         'GlAccordionItem',
         'GlIntersperse',
+        'GlFormSelect',
         'GlDaterangePicker',
         'GlAvatarLabeled',
         'GlBarChart',
@@ -114,6 +115,7 @@ export const setupStorybookReadme = () =>
         'GlFormRadio',
         'GlModal',
         'GlKeysetPagination',
+        'GlForm',
       ],
       components: {
         GlComponentDocumentation,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gitlab/ui",
-  "version": "32.49.0",
+  "version": "32.51.2",
   "description": "GitLab UI Components",
   "license": "MIT",
   "main": "dist/index.js",
@@ -71,7 +71,8 @@
     "vue-runtime-helpers": "^1.1.2"
   },
   "peerDependencies": {
-    "@gitlab/svgs": "^1.116.0",
+    "@gitlab/svgs": "^1.116.0 || ^2.0.0",
+    "emoji-regex": ">=10.0.0",
     "bootstrap": "4.5.3",
     "pikaday": "^1.8.0",
     "vue": "^2.6.10"
@@ -85,7 +86,7 @@
     "@babel/preset-env": "^7.10.2",
     "@gitlab/eslint-plugin": "10.0.0",
     "@gitlab/stylelint-config": "2.6.0",
-    "@gitlab/svgs": "1.226.0",
+    "@gitlab/svgs": "2.0.0",
     "@rollup/plugin-commonjs": "^11.1.0",
     "@rollup/plugin-node-resolve": "^7.1.3",
     "@rollup/plugin-replace": "^2.3.2",
@@ -107,6 +108,7 @@
     "babel-preset-vue": "^2.0.2",
     "bootstrap": "4.5.3",
     "cypress": "^6.6.0",
+    "emoji-regex": "^10.0.0",
     "eslint": "7.32.0",
     "eslint-import-resolver-jest": "3.0.2",
     "eslint-plugin-cypress": "2.12.1",

package/scss_to_js/scss_variables.js

@@ -15,6 +15,8 @@ export const glSpacingScale12 = '5rem'
 export const glSpacingScale13 = '6rem'
 export const glSpacingScale15 = '7.5rem'
 export const glSpacingScale20 = '10rem'
+export const glSpacingScale26 = '13rem'
+export const glSpacingScale62 = '31rem'
 export const breakpointSm = '576px'
 export const breakpointMd = '768px'
 export const breakpointLg = '992px'

package/scss_to_js/scss_variables.json

@@ -85,6 +85,16 @@
       "value": "20 * $grid-size",
       "compiledValue": "10rem"
     },
+    {
+      "name": "$gl-spacing-scale-26",
+      "value": "26 * $grid-size",
+      "compiledValue": "13rem"
+    },
+    {
+      "name": "$gl-spacing-scale-62",
+      "value": "62 * $grid-size",
+      "compiledValue": "31rem"
+    },
     {
       "name": "$breakpoint-sm",
       "value": "576px",

package/src/components/base/breadcrumb/breadcrumb.md

@@ -15,15 +15,16 @@ to draw a `/`
 ```html
 <gl-breadcrumb :items="items">
   <template #avatar>
-    <img
+    <img 
+      alt=""
       class="gl-breadcrumb-avatar-tile"
-      src="https://assets.gitlab-static.net/uploads/-/system/group/avatar/9970/logo-extra-whitespace.png?width=15"
-      width="15"
-      height="15"
+      src="https://assets.gitlab-static.net/uploads/-/system/group/avatar/9970/logo-extra-whitespace.png?width=16"
+      width="16"
+      height="16"
     />
   </template>
   <template #separator>
-    <svg width="100" height="15">
+    <svg height="16">
       <line x1="100%" y1="0" x2="0" y2="100%" stroke="gray" />
     </svg>
   </template>

package/src/components/base/breadcrumb/breadcrumb.scss

@@ -38,7 +38,7 @@ $breadcrumb-max-width: $grid-size * 16;
   @include gl-border-1;
   @include gl-border-solid;
   @include gl-border-gray-200;
-  @include gl-rounded-full;
+  @include gl-rounded-base;
 }
 
 // bootstrap overrides

package/src/components/base/breadcrumb/breadcrumb.stories.js

@@ -6,7 +6,10 @@ const template = `
         :items="items"
     >
       <template #avatar>
-        <img class="gl-breadcrumb-avatar-tile" src="https://assets.gitlab-static.net/uploads/-/system/group/avatar/9970/logo-extra-whitespace.png?width=16" width="16" height="16" />
+        <img alt=""
+            class="gl-breadcrumb-avatar-tile" src="https://assets.gitlab-static.net/uploads/-/system/group/avatar/9970/logo-extra-whitespace.png?width=16"
+            width="16"
+            height="16" />
       </template>
     </gl-breadcrumb>
   `;

package/src/components/base/form/form.documentation.js

@@ -1,8 +1,5 @@
-import examples from './examples';
 import description from './form.md';
 
 export default {
   description,
-  examples,
-  bootstrapComponent: 'b-form',
 };

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

@@ -1,17 +1,102 @@
-import { withKnobs } from '@storybook/addon-knobs';
-import { documentedStoriesOf } from '../../../../documentation/documented_stories';
-import { GlForm } from '../../../../index';
+import {
+  GlForm,
+  GlFormGroup,
+  GlFormInput,
+  GlFormSelect,
+  GlFormCheckbox,
+  GlButton,
+} from '../../../../index';
+import { setStoryTimeout } from '../../../utils/test_utils';
 import readme from './form.md';
 
-const components = {
-  GlForm,
-};
+export const Default = (args) => ({
+  components: {
+    GlForm,
+    GlFormGroup,
+    GlFormInput,
+    GlFormSelect,
+    GlFormCheckbox,
+    GlButton,
+  },
+  props: Object.keys(args),
+  data() {
+    return {
+      form: {
+        submitDisabled: false,
+        email: '',
+        name: '',
+        mergeState: null,
+        checked: [],
+      },
+      states: [{ text: 'Select One', value: null }, 'Open', 'Resolved', 'Closed', 'Blocked'],
+      show: true,
+    };
+  },
+  methods: {
+    onReset() {
+      this.form.name = '';
+      this.form.submitDisabled = false;
+    },
+    onSubmit(evt) {
+      evt.preventDefault();
+      this.form.submitDisabled = true;
+      setStoryTimeout(() => {
+        this.form.submitDisabled = false;
+        // eslint-disable-next-line no-alert
+        alert(JSON.stringify(this.form));
+      }, 1000);
+    },
+  },
+  template: `
+    <gl-form @submit="onSubmit" @reset="onReset">
+      <gl-form-group
+        id="input-group-1"
+        label="Email address:"
+        label-for="input-1"
+        description="We'll never share your email with anyone else."
+      >
+        <gl-form-input
+          id="input-1"
+          v-model="form.email"
+          type="email"
+          required
+          placeholder="Enter email"
+        />
+      </gl-form-group>
+
+      <gl-form-group id="input-group-2" label="Your Name:" label-for="input-2">
+        <gl-form-input id="input-2" v-model="form.name" required placeholder="Enter name" />
+      </gl-form-group>
 
-documentedStoriesOf('base/form/form', readme)
-  .addDecorator(withKnobs)
-  .add('default', () => ({
-    components,
-    template: `
-      <gl-form />
-    `,
-  }));
+      <gl-form-group id="input-group-3" label="Merge State:" label-for="input-3">
+        <gl-form-select id="input-3" v-model="form.mergeState" :options="states" required />
+      </gl-form-group>
+
+      <gl-form-group id="input-group-4">
+        <gl-form-checkbox-group id="checkboxes-4" v-model="form.checked">
+          <gl-form-checkbox value="squash">Squash Commits</gl-form-checkbox>
+          <gl-form-checkbox value="new">Create New Issue</gl-form-checkbox>
+        </gl-form-checkbox-group>
+      </gl-form-group>
+
+      <div class="gl-display-flex gl-justify-content-end">
+        <gl-button type="reset" class="gl-mr-3">Cancel</gl-button>
+        <gl-button type="submit" variant="confirm">Submit</gl-button>
+      </div>
+    </gl-form>
+  `,
+});
+
+export default {
+  title: 'base/form/form',
+  component: GlForm,
+  parameters: {
+    bootstrapComponent: 'b-form',
+    knobs: { disable: true },
+    docs: {
+      description: {
+        component: readme,
+      },
+    },
+  },
+};

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

@@ -1,25 +1,6 @@
-import examples from './examples';
 import description from './form_select.md';
 
 export default {
   description,
-  examples,
   followDesignSystem: true,
-  bootstrapComponent: 'b-form-select',
-  events: [
-    {
-      event: 'change',
-      description: 'Emitted with the select value changes via user interaction.',
-    },
-    {
-      event: 'input',
-      description: 'Emitted with the select value changes.',
-    },
-  ],
-  slots: [
-    {
-      name: 'first',
-      description: 'Slot to place option tags above options provided via options prop',
-    },
-  ],
 };

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

@@ -1,3 +1 @@
-# Form Select
-
 Form select component used to select from group of options in a form.

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

@@ -1,19 +1,11 @@
-import { withKnobs, boolean, select, number, object } from '@storybook/addon-knobs';
-import { documentedStoriesOf } from '../../../../../documentation/documented_stories';
 import { GlFormSelect } from '../../../../../index';
 import { sizeOptions, formStateOptions } from '../../../../utils/constants';
 import { formSelectOptions } from './constants';
 import readme from './form_select.md';
 
-const components = {
-  GlFormSelect,
-};
-
-const data = () => {
-  return {
-    selected: 'Pizza',
-  };
-};
+const data = () => ({
+  selected: 'Pizza',
+});
 
 const template = `
 <gl-form-select 
@@ -27,86 +19,112 @@ const template = `
 </gl-form-select>
 `;
 
-function generateProps({
+const generateProps = ({
   size = null,
   state = null,
   disabled = false,
   multiple = false,
   selectSize = 1,
   options = formSelectOptions,
-} = {}) {
-  return {
-    size: {
-      type: String,
-      default: select('size', sizeOptions, size),
+} = {}) => ({
+  size,
+  disabled,
+  state,
+  multiple,
+  selectSize,
+  options,
+});
+
+const Template = (args) => ({
+  components: { GlFormSelect },
+  props: Object.keys(args),
+  data,
+  template,
+});
+
+export const Default = Template.bind({});
+Default.args = generateProps();
+
+export const Disabled = Template.bind({});
+Disabled.args = generateProps({ disabled: true });
+
+export const ValidState = Template.bind({});
+ValidState.args = generateProps({ state: true });
+
+export const InvalidState = Template.bind({});
+InvalidState.args = generateProps({ state: false });
+
+export const WithTruncation = (args, { argTypes }) => ({
+  components: { GlFormSelect },
+  props: Object.keys(argTypes),
+  data() {
+    return {
+      selected: 1,
+    };
+  },
+  template: `
+    <div style="max-width: 300px;">
+      ${template}
+    </div>
+    `,
+});
+WithTruncation.args = generateProps({
+  options: [
+    {
+      value: 1,
+      text: 'A form select option with a very looooooooong label',
+    },
+  ],
+});
+
+export default {
+  title: 'base/form/form-select',
+  component: GlFormSelect,
+  parameters: {
+    bootstrapComponent: 'b-form-select',
+    knobs: { disable: true },
+    docs: {
+      description: {
+        component: readme,
+      },
     },
-    disabled: {
-      type: Boolean,
-      default: boolean('disabled', disabled),
+  },
+  argTypes: {
+    size: {
+      control: {
+        type: 'select',
+        options: sizeOptions,
+      },
     },
     state: {
-      type: Boolean,
-      default: select('state', formStateOptions, state),
+      control: {
+        type: 'select',
+        options: formStateOptions,
+      },
     },
-    multiple: {
-      type: Boolean,
-      default: boolean('multiple', multiple),
+    input: {
+      description: 'Emitted with the select value changes.',
+      table: {
+        category: 'events',
+      },
     },
-    selectSize: {
-      type: Number,
-      default: number('select size', selectSize),
+    change: {
+      description: 'Emitted with the select value changes via user interaction.',
+      table: {
+        category: 'events',
+      },
     },
-    options: {
-      type: Array,
-      default: object('options', options),
+    first: {
+      description: 'Slot to place option tags above options provided via options prop.',
+      table: {
+        category: 'slots',
+      },
     },
-  };
-}
-
-documentedStoriesOf('base/form/form-select', readme)
-  .addDecorator(withKnobs)
-  .add('default', () => ({
-    components,
-    props: generateProps(),
-    data,
-    template,
-  }))
-  .add('disabled', () => ({
-    components,
-    props: generateProps({ disabled: true }),
-    data,
-    template,
-  }))
-  .add('valid state', () => ({
-    components,
-    props: generateProps({ state: true }),
-    data,
-    template,
-  }))
-  .add('invalid state', () => ({
-    components,
-    props: generateProps({ state: false }),
-    data,
-    template,
-  }))
-  .add('with truncation', () => ({
-    components,
-    props: generateProps({
-      options: [
-        {
-          value: 1,
-          text: 'A form select option with a very looooooooong label',
-        },
-      ],
-    }),
-    data() {
-      return {
-        selected: 1,
-      };
+    default: {
+      description: 'Slot to place explicit option tags.',
+      table: {
+        category: 'slots',
+      },
     },
-    template: `
-    <div style="max-width: 300px;">
-      ${template}
-    </div>
-    `,
-  }));
+  },
+};

package/src/components/base/modal/modal.vue

@@ -80,6 +80,22 @@ export default {
       default: false,
     },
   },
+  computed: {
+    shouldRenderModalOk() {
+      return Boolean(this.$slots['modal-ok']);
+    },
+    shouldRenderModalCancel() {
+      return Boolean(this.$slots['modal-cancel']);
+    },
+    shouldRenderModalFooter() {
+      return Boolean(
+        this.actionCancel ||
+          this.actionSecondary ||
+          this.actionPrimary ||
+          this.$slots['modal-footer']
+      );
+    },
+  },
   methods: {
     show() {
       this.$refs.modal.show();
@@ -158,7 +174,9 @@ export default {
     @cancel="canceled"
     @change="$emit('change', $event)"
   >
-    <slot></slot>
+    <template #default>
+      <slot name="default"></slot>
+    </template>
     <template #modal-header>
       <!-- @slot Entire modal header container contents (including the close button on the top right corner) -->
       <slot name="modal-header">
@@ -170,49 +188,52 @@ export default {
       <!-- @slot Content of Modal header close button. If modal-header slot is used, this slot will not be shown. -->
       <close-button ref="close-button" :label="dismissLabel" @click="close" />
     </template>
-    <!-- eslint-disable-next-line vue/no-deprecated-slot-attribute -->
-    <slot slot="modal-ok" name="modal-ok"></slot>
-    <!-- eslint-disable-next-line vue/no-deprecated-slot-attribute -->
-    <slot slot="modal-cancel" name="modal-cancel"></slot>
+    <template v-if="shouldRenderModalOk" #modal-ok>
+      <slot name="modal-ok"></slot>
+    </template>
+    <template v-if="shouldRenderModalCancel" #modal-cancel>
+      <slot name="modal-cancel"></slot>
+    </template>
     <!-- @slot Populated via props: modal-action-primary, modal-action-cancel and modal-action-secondary. -->
-    <!-- eslint-disable-next-line vue/no-deprecated-slot-attribute -->
-    <slot slot="modal-footer" name="modal-footer">
-      <!-- 
+    <template v-if="shouldRenderModalFooter" #modal-footer>
+      <slot name="modal-footer">
+        <!--
         Emitted when clicked on modal-action-cancel
         @event canceled
        -->
-      <gl-button
-        v-if="actionCancel"
-        class="js-modal-action-cancel"
-        v-bind="buttonBinding(actionCancel, 'actionCancel')"
-        @click="cancel"
-      >
-        {{ actionCancel.text }}
-      </gl-button>
-      <!-- 
+        <gl-button
+          v-if="actionCancel"
+          class="js-modal-action-cancel"
+          v-bind="buttonBinding(actionCancel, 'actionCancel')"
+          @click="cancel"
+        >
+          {{ actionCancel.text }}
+        </gl-button>
+        <!--
         Emitted when clicked on modal-action-secondary
         @event secondary
        -->
-      <gl-button
-        v-if="actionSecondary"
-        class="js-modal-action-secondary"
-        v-bind="buttonBinding(actionSecondary, 'actionSecondary')"
-        @click="secondary"
-      >
-        {{ actionSecondary.text }}
-      </gl-button>
-      <!-- 
+        <gl-button
+          v-if="actionSecondary"
+          class="js-modal-action-secondary"
+          v-bind="buttonBinding(actionSecondary, 'actionSecondary')"
+          @click="secondary"
+        >
+          {{ actionSecondary.text }}
+        </gl-button>
+        <!--
         Emitted when clicked on modal-action-primary
         @event primary
        -->
-      <gl-button
-        v-if="actionPrimary"
-        class="js-modal-action-primary"
-        v-bind="buttonBinding(actionPrimary, 'actionPrimary')"
-        @click="ok"
-      >
-        {{ actionPrimary.text }}
-      </gl-button>
-    </slot>
+        <gl-button
+          v-if="actionPrimary"
+          class="js-modal-action-primary"
+          v-bind="buttonBinding(actionPrimary, 'actionPrimary')"
+          @click="ok"
+        >
+          {{ actionPrimary.text }}
+        </gl-button>
+      </slot>
+    </template>
   </b-modal>
 </template>

package/src/scss/utilities.scss

@@ -4313,6 +4313,22 @@
   max-width: $gl-spacing-scale-15 !important;
 }
 
+.gl-max-w-26 {
+  max-width: $gl-spacing-scale-26;
+}
+
+.gl-max-w-26\! {
+  max-width: $gl-spacing-scale-26 !important;
+}
+
+.gl-max-w-62 {
+  max-width: $gl-spacing-scale-62;
+}
+
+.gl-max-w-62\! {
+  max-width: $gl-spacing-scale-62 !important;
+}
+
 .gl-max-w-none {
   max-width: none;
 }

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

@@ -271,6 +271,14 @@
   max-width: $gl-spacing-scale-15;
 }
 
+@mixin gl-max-w-26 {
+  max-width: $gl-spacing-scale-26;
+}
+
+@mixin gl-max-w-62 {
+  max-width: $gl-spacing-scale-62;
+}
+
 @mixin gl-max-w-none {
   max-width: none;
 }