Merge branch 'master' into popover-refactor

GregPeden · GregPeden · commit 74b39ed1d165 · 2017-04-12T23:45:40.000-06:00
diff --git a/lib/components/card.vue b/lib/components/card.vue
@@ -56,13 +56,13 @@
                 }
             },
             cardAlign() {
-                return `text-${this.align}`;
+                return this.align ? `text-${this.align}` : null;
             }
         },
         props: {
             align: {
                 type: String,
-                default: 'left'
+                default: null
             },
             inverse: {
                 type: Boolean,
diff --git a/lib/components/collapse.vue b/lib/components/collapse.vue
@@ -1,5 +1,5 @@
 <template>
-    <transition name="collapse">
+    <transition @enter="enter" @leave="leave" name="collapse">
         <div :class="classObject" v-show="show">
             <slot></slot>
         </div>
@@ -10,11 +10,10 @@
     .collapse-enter-active, .collapse-leave-active {
         transition: all .35s ease;
         overflow: hidden;
-        max-height: 100vh;
     }
 
     .collapse-enter, .collapse-leave-to {
-        max-height: 0;
+        height: 0;
     }
 </style>
 
@@ -50,6 +49,16 @@
         methods: {
             toggle() {
                 this.show = !this.show;
+            },
+            enter(el) {
+                let height = 0;
+                Array.prototype.forEach.call(el.children, c => {
+                    height += parseInt(getComputedStyle(c).height, 10);
+                });
+                el.style.height = `${height}px`;
+            },
+            leave(el) {
+                el.style.height = null;
             }
         },
 
diff --git a/lib/components/nav-item.vue b/lib/components/nav-item.vue
@@ -1,6 +1,6 @@
 <template>
     <li class="nav-item" @click="onclick">
-        <b-link :class="classObject" :to="to" :href="href" :exact="exact">
+        <b-link :is="itemType" :class="classObject" :to="to" :href="href" :exact="exact">
             <slot></slot>
         </b-link>
     </li>
@@ -12,6 +12,9 @@
     export default {
         components: {bLink},
         computed: {
+            itemType() {
+                return (this.href || this.to) ? 'b-link' : 'button';
+            },
             classObject() {
                 return [
                     'nav-link',
diff --git a/lib/components/tabs.vue b/lib/components/tabs.vue
@@ -15,7 +15,7 @@
                 <slot name="tabs"></slot>
             </ul>
         </div>
-        <div :class="['tab-content',{'card-block': card}]">
+        <div :class="['tab-content',{'card-block': card}]" ref="tabsContainer">
             <slot></slot>
             <slot name="empty" v-if="!tabs || !tabs.length"></slot>
         </div>
@@ -144,7 +144,7 @@
             /**
              * Dynamically update tabs
              */
-            _updateTabs() {
+            updateTabs() {
                 // Probe tabs
                 if (this.$slots.default) {
                     this.tabs = this.$slots.default.filter(tab => tab.componentInstance || false)
@@ -169,23 +169,19 @@
                     });
                 }
 
-                this.setTab(tabIndex, true);
-            },
+                // Workaround to fix problem when currentTab is removed
+                if (tabIndex > this.tabs.length - 1) {
+                    tabIndex = this.tabs.length - 1;
+                }
 
-            /**
-             * Wait for next tick so we can ensure DOM is updated before we inspect it
-             */
-            updateTabs() {
-                this.$nextTick(() => {
-                    this._updateTabs();
-                });
+                this.setTab(tabIndex || 0, true);
             }
         },
         mounted() {
             this.updateTabs();
 
             // Observe Child changes so we can notify tabs change
-            observeDom(this.$el, this.updateTabs.bind(this), {subtree: false});
+            observeDom(this.$refs.tabsContainer, this.updateTabs.bind(this), {subtree: false});
         }
     };
 
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "bootstrap-vue",
-  "version": "0.12.2",
+  "version": "0.12.3",
   "description": "Bootstrap 4 Components for Vue.js 2",
   "main": "dist/bootstrap-vue.common.js",
   "web": "dist/bootstrap-vue.js",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "bootstrap-vue",`
`3`		`- "version": "0.12.2",`
	`3`	`+ "version": "0.12.3",`
`4`	`4`	`"description": "Bootstrap 4 Components for Vue.js 2",`
`5`	`5`	`"main": "dist/bootstrap-vue.common.js",`
`6`	`6`	`"web": "dist/bootstrap-vue.js",`