Skip to content

[button-toolbar] New component b-button-toolbar #367

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 12 commits into from
May 9, 2017
Merged

[button-toolbar] New component b-button-toolbar #367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
bf2afa7
Merge pull request #20 from bootstrap-vue/master
tmorehouse May 8, 2017
5baa351
Merge pull request #21 from bootstrap-vue/master
tmorehouse May 8, 2017
27c0a87
Merge pull request #22 from bootstrap-vue/master
tmorehouse May 8, 2017
223e734
Merge pull request #24 from bootstrap-vue/master
tmorehouse May 8, 2017
a43ea51
[button-toolbar] New component
tmorehouse May 9, 2017
9ff7137
[button-toolbar] sizing must be on children
tmorehouse May 9, 2017
79f2c20
[components] New button-toolbar
tmorehouse May 9, 2017
6a2bd79
[components] New button-toolbar
tmorehouse May 9, 2017
5378d15
[components] New button-toolbar
tmorehouse May 9, 2017
8480ede
[button-group] Removed toolbar option & key nav
tmorehouse May 9, 2017
e528b52
Update button-group.vue
tmorehouse May 9, 2017
671519d
Merge branch 'master' into toolbar
tmorehouse May 9, 2017
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
94 changes: 2 additions & 92 deletions lib/components/button-group.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,123 +1,33 @@
<template>
<div :class="classObject"
:role="toolbar ? 'toolbar' : 'group'"
:tabindex="isKeyNav ? '0' : null"
@focusin.self="focusFirst"
@keydown.left="focusNext($event,true)"
@keydown.up="focusNext($event,true)"
@keydown.right="focusNext($event,false)"
@keydown.down="focusNext($event,false)"
@keydown.shift.left="focusFirst($event)"
@keydown.shift.up="focusFirst($event)"
@keydown.shift.right="focusLast($event)"
@keydown.shift.down="focusLast($event)"
>
<div :class="classObject">
<slot></slot>
</div>
</template>

<script>
const ITEM_SELECTOR = [
'.btn:not(.disabled):not([disabled]):not([style*="display: none"]):not([style*="display:none"])',
'.form-control:not(.disabled):not([disabled]):not([style*="display: none"]):not([style*="display:none"])',
'select:not(.disabled):not([disabled]):not([style*="display: none"]):not([style*="display:none"])',
'input[type="checkbox"]:not(.disabled):not([disabled]):not([style*="display: none"]):not([style*="display:none"])',
'input[type="radio"]:not(.disabled):not([disabled]):not([style*="display: none"]):not([style*="display:none"])'
].join(',');

export default {
computed: {
classObject() {
return [
'btn-' + (this.toolbar ? 'toolbar' : 'group'),
'btn-group',
this.vertical ? 'btn-group-vertical' : '',
(this.justify && !this.vertical) ? 'justify-content-between' : '',
this.size ? ('btn-group-' + this.size) : ''
];
},
isKeyNav() {
return this.toolbar && this.toolbarKeyNav;
}
},
props: {
vertical: {
type: Boolean,
default: false
},
toolbar: {
type: Boolean,
default: false
},
justify: {
type: Boolean,
default: false
},
size: {
type: String,
default: null
},
toolbarKeyNav: {
type: Boolean,
default: false
}
},
methods: {
focusNext(e, prev) {
if (!this.isKeyNav) {
return;
}
e.preventDefault();
e.stopPropagation();
const items = this.getItems();
if (items.length < 1) {
return;
}
let index = items.indexOf(e.target);
if (prev && index > 0) {
index--;
} else if (!prev && index < items.length - 1) {
index++;
}
if (index < 0) {
index = 0;
}
items[index].focus();
},
focusFirst(e) {
if (!this.isKeyNav) {
return;
}
e.preventDefault();
e.stopPropagation();
const items = this.getItems();
if (items.length > 0) {
items[0].focus();
}
},
focusLast(e) {
if (!this.isKeyNav) {
return;
}
e.preventDefault();
e.stopPropagation();
const items = this.getItems();
if (items.length > 0) {
items[items.length - 1].focus();
}
},
getItems() {
const items = Array.prototype.slice.call(this.$el.querySelectorAll(ITEM_SELECTOR));
items.forEach(item => {
// Ensure tabfocus is -1 on any new elements
item.tabIndex = -1;
});
return items;
}
},
mounted() {
if (this.isKeyNav) {
// Pre-set the tabindexes if the markup does not include tabindex="-1" on the toolbar items
this.getItems();
}
}
};
Expand Down
107 changes: 107 additions & 0 deletions lib/components/button-toolbar.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,107 @@
<template>
<div :class="classObject"
role="toolbar"
:tabindex="keyNav ? '0' : null"
@focusin.self="focusFirst"
@keydown.left="focusNext($event,true)"
@keydown.up="focusNext($event,true)"
@keydown.right="focusNext($event,false)"
@keydown.down="focusNext($event,false)"
@keydown.shift.left="focusFirst($event)"
@keydown.shift.up="focusFirst($event)"
@keydown.shift.right="focusLast($event)"
@keydown.shift.down="focusLast($event)"
>
<slot></slot>
</div>
</template>

<script>
const ITEM_SELECTOR = [
'.btn:not(.disabled):not([disabled]):not([style*="display: none"]):not([style*="display:none"])',
'.form-control:not(.disabled):not([disabled]):not([style*="display: none"]):not([style*="display:none"])',
'select:not(.disabled):not([disabled]):not([style*="display: none"]):not([style*="display:none"])',
'input[type="checkbox"]:not(.disabled):not([disabled]):not([style*="display: none"]):not([style*="display:none"])',
'input[type="radio"]:not(.disabled):not([disabled]):not([style*="display: none"]):not([style*="display:none"])'
].join(',');

export default {
computed: {
classObject() {
return [
'btn-toolbar',
(this.justify && !this.vertical) ? 'justify-content-between' : ''
];
}
},
props: {
justify: {
type: Boolean,
default: false
},
KeyNav: {
type: Boolean,
default: false
}
},
methods: {
focusNext(e, prev) {
if (!this.keyNav) {
return;
}
e.preventDefault();
e.stopPropagation();
const items = this.getItems();
if (items.length < 1) {
return;
}
let index = items.indexOf(e.target);
if (prev && index > 0) {
index--;
} else if (!prev && index < items.length - 1) {
index++;
}
if (index < 0) {
index = 0;
}
items[index].focus();
},
focusFirst(e) {
if (!this.keyNav) {
return;
}
e.preventDefault();
e.stopPropagation();
const items = this.getItems();
if (items.length > 0) {
items[0].focus();
}
},
focusLast(e) {
if (!this.keyNav) {
return;
}
e.preventDefault();
e.stopPropagation();
const items = this.getItems();
if (items.length > 0) {
items[items.length - 1].focus();
}
},
getItems() {
const items = Array.prototype.slice.call(this.$el.querySelectorAll(ITEM_SELECTOR));
items.forEach(item => {
// Ensure tabfocus is -1 on any new elements
item.tabIndex = -1;
});
return items;
}
},
mounted() {
if (this.keyNav) {
// Pre-set the tabindexes if the markup does not include tabindex="-1" on the toolbar items
this.getItems();
}
}
};
</script>
2 changes: 2 additions & 0 deletions lib/components/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import bAlert from './alert.vue';
import bBreadcrumb from './breadcrumb.vue';
import bButton from './button.vue';
import bButtonToolbar from './button-toolbar.vue';
import bButtonGroup from './button-group.vue';
import bButtonGroupDropdown from './button-group-dropdown.vue';
import bInputGroup from './input-group.vue';
Expand Down Expand Up @@ -49,6 +50,7 @@ export {
bBreadcrumb,
bButton,
bButton as bBtn,
bButtonToolbar,
bButtonGroup,
bButtonGroupDropdown,
bInputGroup,
Expand Down