@itfin/components 1.0.102 → 1.0.103

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@itfin/components",
-  "version": "1.0.102",
+  "version": "1.0.103",
   "main": "dist/itfin-components.umd.js",
   "unpkg": "dist/itfin-components.common.js",
   "author": "Vitalii Savchuk <esvit666@gmail.com>",

package/src/components/button/Button.vue

@@ -161,10 +161,12 @@ class itfButton extends Vue {
   @Prop({ type: [String, Object] }) to;
   @Prop(String) href;
   @Prop(String) target;
+  @Prop() class;
 
   render (createElement, { data, slots, children, props }) {
     const {
-      to, href, target, disabled, color, block, loading, labeled, secondary, primary, small, large, icon, loadingText
+      to, href, target, disabled, color, block, loading, labeled, secondary, primary, small, large, icon, loadingText,
+      class: classNames
     } = props;
     const component = to ? 'nuxt-link' : (props.href ? 'a' : 'button');
     const staticClass = (data.staticClass || '') + ' itf-button btn';
@@ -175,7 +177,6 @@ class itfButton extends Vue {
         tabindex: 0
       },
       class: {
-        ...(data.class || {}),
         [`btn-${color}`]: color,
         'itf-button__block': block,
         'labeled': labeled,
@@ -194,6 +195,16 @@ class itfButton extends Vue {
       props,
       staticClass
     };
+    if (data.class) {
+      if (typeof data.class === 'string') {
+        comProps.class[data.class] = true;
+      } else {
+        comProps.class = {
+          ...data.class,
+          ...comProps.class
+        };
+      }
+    }
     if (component === 'button') {
       comProps.attrs.type = 'button';
     }

package/src/components/dropdown/Dropdown.vue

@@ -86,7 +86,7 @@ class itfDropdown extends Vue {
       return;
     }
     const { default: Dropdown } = await import('bootstrap/js/src/dropdown.js');
-    this.modalEl = new Dropdown(this.$refs.toggle.$el, {
+    this.modalEl = new Dropdown(this.$refs.toggle, {
       reference: 'toggle',
       autoClose: this.autoclose
     });