Skip to content

fix(b-form-spinbutton): prevent buttons from re-ordering when parent element is RTL #4802

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Feb 20, 2020
Merged

fix(b-form-spinbutton): prevent buttons from re-ordering when parent element is RTL #4802

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d4972ef
chore(spinbuttons): prevent buttons from re-ordering when parent element
tmorehouse Feb 20, 2020
0ed0f85
Update form-spinbutton.js
tmorehouse Feb 20, 2020
b886f61
Update form-spinbutton.spec.js
tmorehouse Feb 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions src/components/form-spinbutton/_spinbutton.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,14 @@
height: auto;
width: auto;
}

@at-root {
// Prevent the buttons from reversing order on in horizontal RTL mode
[dir="rtl"] &:not(.flex-column),
&[dir="rtl"]:not(.flex-column) {
flex-direction: row-reverse;
}
}

output {
font-size: inherit;
Expand Down
5 changes: 1 addition & 4 deletions src/components/form-spinbutton/form-spinbutton.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -546,10 +546,7 @@ export const BFormSpinbutton = /*#__PURE__*/ Vue.extend({
...this.$attrs,
role: 'group',
lang: this.computedLocale,
tabindex: isDisabled ? null : '-1',
// We want to keep the order of the buttons regardless
// of locale (flex will re-order based on rtl/ltr)
dir: 'ltr'
tabindex: isDisabled ? null : '-1'
},
on: {
keydown: this.onKeydown,
Expand Down
10 changes: 0 additions & 10 deletions src/components/form-spinbutton/form-spinbutton.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@ describe('form-spinbutton', () => {
expect(wrapper.classes()).toContain('align-items-stretch')
expect(wrapper.attributes('role')).toEqual('group')
expect(wrapper.attributes('tabindex')).toEqual('-1')
// We always have LTR to ensure the flex order stays ltr
expect(wrapper.attributes('dir')).toEqual('ltr')

// Should have 3 child elements (btn, output, btn)
expect(wrapper.findAll('.b-form-spinbutton > *').length).toBe(3)
Expand Down Expand Up @@ -77,8 +75,6 @@ describe('form-spinbutton', () => {
expect(wrapper.classes()).toContain('align-items-stretch')
expect(wrapper.attributes('role')).toEqual('group')
expect(wrapper.attributes('tabindex')).toEqual('-1')
// We always have LTR to ensure the flex order stays ltr
expect(wrapper.attributes('dir')).toEqual('ltr')

// Should have 3 child elements (btn, output, btn)
expect(wrapper.findAll('.b-form-spinbutton > *').length).toBe(3)
Expand Down Expand Up @@ -136,8 +132,6 @@ describe('form-spinbutton', () => {
expect(wrapper.classes()).toContain('align-items-stretch')
expect(wrapper.attributes('role')).toEqual('group')
expect(wrapper.attributes('tabindex')).toEqual('-1')
// We always have LTR to ensure the flex order stays ltr
expect(wrapper.attributes('dir')).toEqual('ltr')

// Should have 3 child elements (btn, output, btn)
expect(wrapper.findAll('.b-form-spinbutton > *').length).toBe(3)
Expand Down Expand Up @@ -187,8 +181,6 @@ describe('form-spinbutton', () => {
expect(wrapper.classes()).not.toContain('align-items-stretch')
expect(wrapper.attributes('role')).toEqual('group')
expect(wrapper.attributes('tabindex')).toEqual('-1')
// We always have LTR to ensure the flex order stays ltr
expect(wrapper.attributes('dir')).toEqual('ltr')

// Should have 3 child elements (btn, output, btn)
expect(wrapper.findAll('.b-form-spinbutton > *').length).toBe(3)
Expand Down Expand Up @@ -774,8 +766,6 @@ describe('form-spinbutton', () => {
expect(wrapper.classes()).not.toContain('focus')
expect(wrapper.attributes('role')).toEqual('group')
expect(wrapper.attributes('tabindex')).toEqual('-1')
// We always have LTR to ensure the flex order stays ltr
expect(wrapper.attributes('dir')).toEqual('ltr')

const $output = wrapper.find('output')
expect($output.exists()).toBe(true)
Expand Down