@gitlab/ui 128.13.1 → 128.13.3

package/dist/components/base/toast/toast.js

@@ -11,31 +11,33 @@ const DEFAULT_OPTIONS = {
   appendToast: true
 };
 let toastsCount = 0;
-function renderTitle(h, toast, options) {
-  const nodes = [h(CloseButton, {
-    class: ['gl-toast-close-button'],
-    on: {
-      click: toast.hide
-    }
-  })];
-  if (options.action) {
-    const {
-      onClick,
-      text,
-      href
-    } = options.action;
-    nodes.unshift(h('a', {
-      attrs: {
-        role: href ? undefined : 'button',
-        href
-      },
-      class: ['gl-toast-action'],
+function renderTitle(toast, options) {
+  return h => {
+    const nodes = [h(CloseButton, {
+      class: ['gl-toast-close-button'],
       on: {
-        click: e => onClick(e, toast)
+        click: toast.hide
       }
-    }, text));
-  }
-  return nodes;
+    })];
+    if (options.action) {
+      const {
+        onClick,
+        text,
+        href
+      } = options.action;
+      nodes.unshift(h('a', {
+        attrs: {
+          role: href ? undefined : 'button',
+          href
+        },
+        class: ['gl-toast-action'],
+        on: {
+          click: e => onClick(e, toast)
+        }
+      }, text));
+    }
+    return nodes;
+  };
 }
 function showToast(message) {
   let options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
@@ -65,7 +67,7 @@ function showToast(message) {
     ...DEFAULT_OPTIONS,
     ...updatedAutoHideDelay,
     id,
-    title: renderTitle(this.$createElement, toast, options)
+    title: renderTitle(toast, options)
   });
   return toast;
 }

package/dist/components/base/toggle/toggle.js

@@ -93,7 +93,7 @@ var script = {
     },
     shouldRenderHelp() {
       // eslint-disable-next-line @gitlab/vue-prefer-dollar-scopedslots
-      return Boolean(this.$slots.help || this.help);
+      return Boolean(this.$slots.help || this.help) && this.isVerticalLayout;
     },
     toggleClasses() {
       return [{
@@ -136,13 +136,14 @@ var script = {
 const __vue_script__ = script;
 
 /* template */
-var __vue_render__ = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"gl-toggle-wrapper gl-flex gl-flex-col"},[_c('div',{staticClass:"gl-flex",class:{
-      'gl-flex-col': _vm.isVerticalLayout,
-      'gl-toggle-label-inline': !_vm.isVerticalLayout,
-    },attrs:{"data-testid":"toggle-wrapper"}},[_c('span',{staticClass:"gl-toggle-label gl-shrink-0",class:_vm.toggleClasses,attrs:{"id":_vm.labelId,"data-testid":"toggle-label"}},[_vm._t("label",function(){return [_vm._v(_vm._s(_vm.label))]})],2),_vm._v(" "),(_vm.shouldRenderDescription)?_c('span',{staticClass:"gl-description-label gl-mb-3",attrs:{"data-testid":"toggle-description"}},[_vm._t("description",function(){return [_vm._v(_vm._s(_vm.description))]})],2):_vm._e(),_vm._v(" "),(_vm.name)?_c('input',{attrs:{"name":_vm.name,"type":"hidden"},domProps:{"value":_vm.value}}):_vm._e(),_vm._v(" "),_c('button',{staticClass:"gl-toggle gl-shrink-0",class:{
-        'is-checked': _vm.value,
-        'is-disabled': _vm.disabled || _vm.isLoading,
-      },attrs:{"role":"switch","aria-checked":_vm.isChecked,"aria-labelledby":_vm.labelId,"aria-describedby":_vm.helpId,"aria-disabled":_vm.disabled,"type":"button","disabled":_vm.disabled},on:{"click":function($event){$event.preventDefault();return _vm.toggleFeature.apply(null, arguments)}}},[(_vm.isLoading)?_c('gl-loading-icon',{staticClass:"toggle-loading",attrs:{"color":"dark"}}):_c('span',{staticClass:"toggle-icon"},[_c('gl-icon',{attrs:{"name":_vm.icon,"size":12}})],1)],1)]),_vm._v(" "),(_vm.shouldRenderHelp)?_c('span',{staticClass:"gl-help-label",attrs:{"id":_vm.helpId,"data-testid":"toggle-help"}},[_vm._t("help",function(){return [_vm._v(_vm._s(_vm.help))]})],2):_vm._e()])};
+var __vue_render__ = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"gl-toggle-wrapper gl-mb-0 gl-flex",class:{
+    'gl-flex-col': _vm.isVerticalLayout,
+    'gl-toggle-label-inline': !_vm.isVerticalLayout,
+    'is-disabled': _vm.disabled,
+  },attrs:{"data-testid":"toggle-wrapper"}},[_c('span',{staticClass:"gl-toggle-label gl-shrink-0",class:_vm.toggleClasses,attrs:{"id":_vm.labelId,"data-testid":"toggle-label"}},[_vm._t("label",function(){return [_vm._v(_vm._s(_vm.label))]})],2),_vm._v(" "),(_vm.shouldRenderDescription)?_c('span',{staticClass:"gl-description-label gl-mb-3",attrs:{"data-testid":"toggle-description"}},[_vm._t("description",function(){return [_vm._v(_vm._s(_vm.description))]})],2):_vm._e(),_vm._v(" "),(_vm.name)?_c('input',{attrs:{"name":_vm.name,"type":"hidden"},domProps:{"value":_vm.value}}):_vm._e(),_vm._v(" "),_c('button',{staticClass:"gl-toggle gl-shrink-0",class:{
+      'is-checked': _vm.value,
+      'is-disabled': _vm.disabled || _vm.isLoading,
+    },attrs:{"role":"switch","aria-checked":_vm.isChecked,"aria-labelledby":_vm.labelId,"aria-describedby":_vm.helpId,"aria-disabled":_vm.disabled,"type":"button","disabled":_vm.disabled},on:{"click":function($event){$event.preventDefault();return _vm.toggleFeature.apply(null, arguments)}}},[(_vm.isLoading)?_c('gl-loading-icon',{staticClass:"toggle-loading",attrs:{"color":"dark"}}):_c('span',{staticClass:"toggle-icon"},[_c('gl-icon',{attrs:{"name":_vm.icon,"size":12}})],1)],1),_vm._v(" "),(_vm.shouldRenderHelp)?_c('span',{staticClass:"gl-help-label",attrs:{"id":_vm.helpId,"data-testid":"toggle-help"}},[_vm._t("help",function(){return [_vm._v(_vm._s(_vm.help))]})],2):_vm._e()])};
 var __vue_staticRenderFns__ = [];
 
   /* style */