[BtnGroup] Fix not merging data.

uiv-lib · Nov 9, 2017 · 029caa5 · 029caa5
1 parent 5f0ea0a
commit 029caa5
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/docs/pages/components/BtnGroup.md b/docs/pages/components/BtnGroup.md
@@ -133,9 +133,9 @@ Make a group of buttons stretch at equal sizes to span the entire width of its p
 
 ```html
 <btn-group justified>
-  <btn justified>Left</btn>
-  <btn justified>Middle</btn>
-  <btn justified>Right</btn>
+  <btn href="javascript:;">Left</btn>
+  <btn href="javascript:;">Middle</btn>
+  <btn href="javascript:;">Right</btn>
 </btn-group>
 <br/>
 <btn-group justified>

diff --git a/src/components/button/BtnGroup.js b/src/components/button/BtnGroup.js
@@ -1,9 +1,11 @@
+import mergeData from 'vue-functional-data-merge'
+
 export default {
   functional: true,
-  render (h, {props, children}) {
+  render (h, {props, children, data}) {
     return h(
       'div',
-      {
+      mergeData(data, {
         class: {
           'btn-group': !props.vertical,
           'btn-group-vertical': props.vertical,
@@ -14,7 +16,7 @@ export default {
           role: 'group',
           'data-toggle': 'buttons'
         }
-      },
+      }),
       children
     )
   },

diff --git a/src/components/button/BtnToolbar.js b/src/components/button/BtnToolbar.js
@@ -1,16 +1,18 @@
+import mergeData from 'vue-functional-data-merge'
+
 export default {
   functional: true,
-  render (h, {children}) {
+  render (h, {children, data}) {
     return h(
       'div',
-      {
+      mergeData(data, {
         class: {
           'btn-toolbar': true
         },
         attrs: {
           role: 'toolbar'
         }
-      },
+      }),
       children
     )
   }