[input-group-addon] Fix SSR Bugs

For an unknown reason SSR fails during rehydration of <b-input-groups> with addons enabled. Inlining seems fixing problem.
bootstrap-vue · May 3, 2017 · f6e5cb7 · mosinve · May 4, 2017 · f6e5cb7
1 parent 832193d
commit f6e5cb7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 11 deletions.
diff --git a/lib/components/input-group-addon.vue b/lib/components/input-group-addon.vue
@@ -1,14 +1,11 @@
 <template>
-    <span class="input-group-addon" :id="_id">
+    <div class="input-group-addon" :id="id">
         <slot></slot>
-    </span>
+    </div>
 </template>
 
 <script>
-    import generateId from '../mixins/generate-id';
-
     export default {
-        mixins: [generateId],
         props: {
             id: {
                 type: String,

diff --git a/lib/components/input-group.vue b/lib/components/input-group.vue
@@ -1,20 +1,19 @@
 <template>
     <div :class="classObject">
         <slot name="left">
-            <b-input-group-addon v-if="left" v-html="left"></b-input-group-addon>
+            <div v-if="left" class="input-group-addon" v-html="left"></div>
         </slot>
+
         <slot></slot>
-        <slot name="right">
-            <b-input-group-addon v-if="right" v-html="right"></b-input-group-addon>
+
+        <slot name="left">
+            <div v-if="right" class="input-group-addon" v-html="right"></div>
         </slot>
     </div>
 </template>
 
 <script>
-    import bInputGroupAddon from './input-group-addon.vue';
-
     export default {
-        components: {bInputGroupAddon},
         computed: {
             classObject() {
                 return [