fix(b-form-datepicker, b-form-timepicker): fix menu padding in button only mode (fixes #5251) (#5252)

tmorehouse · web-flow · commit d57a643f0c6b · 2020-04-26T17:41:03.000-03:00
diff --git a/src/_custom-controls.scss b/src/_custom-controls.scss
@@ -133,3 +133,10 @@
     }
   }
 }
+
+// Button only mode menu padding overrides
+.b-form-btn-label-control.btn-group {
+  > .dropdown-menu {
+    padding: 0.5rem;
+  }
+}
diff --git a/src/components/form-datepicker/form-datepicker.spec.js b/src/components/form-datepicker/form-datepicker.spec.js
@@ -84,7 +84,7 @@ describe('form-date', () => {
     await waitRAF()
 
     expect(wrapper.classes()).toContain('b-form-datepicker')
-    expect(wrapper.classes()).not.toContain('b-form-btn-label-control')
+    expect(wrapper.classes()).toContain('b-form-btn-label-control')
     expect(wrapper.classes()).not.toContain('form-control')
     expect(wrapper.classes()).toContain('dropdown')
     expect(wrapper.classes()).not.toContain('show')
diff --git a/src/components/form-timepicker/form-timepicker.spec.js b/src/components/form-timepicker/form-timepicker.spec.js
@@ -83,7 +83,7 @@ describe('form-timepicker', () => {
     await waitRAF()
 
     expect(wrapper.classes()).toContain('b-form-timepicker')
-    expect(wrapper.classes()).not.toContain('b-form-btn-label-control')
+    expect(wrapper.classes()).toContain('b-form-btn-label-control')
     expect(wrapper.classes()).not.toContain('form-control')
     expect(wrapper.classes()).toContain('dropdown')
     expect(wrapper.classes()).not.toContain('show')
diff --git a/src/utils/bv-form-btn-label-control.js b/src/utils/bv-form-btn-label-control.js
@@ -284,12 +284,11 @@ export const BVFormBtnLabelControl = /*#__PURE__*/ Vue.extend({
     return h(
       'div',
       {
-        staticClass: 'dropdown',
+        staticClass: 'b-form-btn-label-control dropdown',
         class: [
           this.directionClass,
           {
             'btn-group': buttonOnly,
-            'b-form-btn-label-control': !buttonOnly,
             'form-control': !buttonOnly,
             [`form-control-${size}`]: !!size && !buttonOnly,
             'd-flex': !buttonOnly,

Original file line number	Diff line number	Diff line change
`@@ -133,3 +133,10 @@`
`133`	`133`	`}`
`134`	`134`	`}`
`135`	`135`	`}`
	`136`	`+`
	`137`	`+// Button only mode menu padding overrides`
	`138`	`+.b-form-btn-label-control.btn-group {`
	`139`	`+ > .dropdown-menu {`
	`140`	`+ padding: 0.5rem;`
	`141`	`+ }`
	`142`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -284,12 +284,11 @@ export const BVFormBtnLabelControl = /#__PURE__/ Vue.extend({`
`284`	`284`	`return h(`
`285`	`285`	`'div',`
`286`	`286`	`{`
`287`		`- staticClass: 'dropdown',`
	`287`	`+ staticClass: 'b-form-btn-label-control dropdown',`
`288`	`288`	`class: [`
`289`	`289`	`this.directionClass,`
`290`	`290`	`{`
`291`	`291`	`'btn-group': buttonOnly,`
`292`		`- 'b-form-btn-label-control': !buttonOnly,`
`293`	`292`	`'form-control': !buttonOnly,`
`294`	`293`	[`form-control-${size}`]: !!size && !buttonOnly,
`295`	`294`	`'d-flex': !buttonOnly,`