Merge branch 'master' of https://github.com/primefaces/primevue
commit
bbc9f284dd
|
@ -10,6 +10,12 @@ const TabViewProps = [
|
||||||
type: "boolean",
|
type: "boolean",
|
||||||
default: "false",
|
default: "false",
|
||||||
description: "When enabled, hidden tabs are not rendered at all. Defaults to false that hides tabs with css."
|
description: "When enabled, hidden tabs are not rendered at all. Defaults to false that hides tabs with css."
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "scrollable",
|
||||||
|
type: "boolean",
|
||||||
|
default: "false",
|
||||||
|
description: "When specified, enables horizontal scrolling."
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
|
@ -3,6 +3,7 @@ import { VNode } from 'vue';
|
||||||
interface TabViewProps {
|
interface TabViewProps {
|
||||||
activeIndex?: number;
|
activeIndex?: number;
|
||||||
lazy?: boolean;
|
lazy?: boolean;
|
||||||
|
scrollable?: boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
declare class TabView {
|
declare class TabView {
|
||||||
|
|
|
@ -1,14 +1,24 @@
|
||||||
<template>
|
<template>
|
||||||
<div class="p-tabview p-component">
|
<div :class="contentClasses">
|
||||||
<ul ref="nav" class="p-tabview-nav" role="tablist">
|
<div class="p-tabview-nav-container">
|
||||||
<li role="presentation" v-for="(tab, i) of tabs" :key="getKey(tab,i)" :class="[{'p-highlight': (d_activeIndex === i), 'p-disabled': isTabDisabled(tab)}]">
|
<button v-if="scrollable" :class="prevButtonClasses" :disabled="backwardIsDisabled" @click="navBackward" type="button" v-ripple>
|
||||||
<a role="tab" class="p-tabview-nav-link" @click="onTabClick($event, i)" @keydown="onTabKeydown($event, i)" :tabindex="isTabDisabled(tab) ? null : '0'" :aria-selected="d_activeIndex === i" v-ripple>
|
<span class="pi pi-chevron-left"></span>
|
||||||
<span class="p-tabview-title" v-if="tab.props && tab.props.header">{{tab.props.header}}</span>
|
</button>
|
||||||
<component :is="tab.children.header" v-if="tab.children && tab.children.header"></component>
|
<div ref="content" class="p-tabview-nav-content" @scroll="onScroll">
|
||||||
</a>
|
<ul ref="nav" class="p-tabview-nav" role="tablist">
|
||||||
</li>
|
<li role="presentation" v-for="(tab, i) of tabs" :key="getKey(tab,i)" :class="[{'p-highlight': (d_activeIndex === i), 'p-disabled': isTabDisabled(tab)}]">
|
||||||
<li ref="inkbar" class="p-tabview-ink-bar"></li>
|
<a role="tab" class="p-tabview-nav-link" @click="onTabClick($event, i)" @keydown="onTabKeydown($event, i)" :tabindex="isTabDisabled(tab) ? null : '0'" :aria-selected="d_activeIndex === i" v-ripple>
|
||||||
</ul>
|
<span class="p-tabview-title" v-if="tab.props && tab.props.header">{{tab.props.header}}</span>
|
||||||
|
<component :is="tab.children.header" v-if="tab.children && tab.children.header"></component>
|
||||||
|
</a>
|
||||||
|
</li>
|
||||||
|
<li ref="inkbar" class="p-tabview-ink-bar"></li>
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
<button v-if="scrollable" :class="nextButtonClasses" :disabled="forwardIsDisabled" @click="navForward" type="button" v-ripple>
|
||||||
|
<span class="pi pi-chevron-right"></span>
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
<div class="p-tabview-panels">
|
<div class="p-tabview-panels">
|
||||||
<template v-for="(tab, i) of tabs" :key="getKey(tab,i)">
|
<template v-for="(tab, i) of tabs" :key="getKey(tab,i)">
|
||||||
<div class="p-tabview-panel" role="tabpanel" v-if="lazy ? (d_activeIndex === i) : true" v-show="lazy ? true: (d_activeIndex === i)">
|
<div class="p-tabview-panel" role="tabpanel" v-if="lazy ? (d_activeIndex === i) : true" v-show="lazy ? true: (d_activeIndex === i)">
|
||||||
|
@ -34,16 +44,24 @@ export default {
|
||||||
lazy: {
|
lazy: {
|
||||||
type: Boolean,
|
type: Boolean,
|
||||||
default: false
|
default: false
|
||||||
|
},
|
||||||
|
scrollable: {
|
||||||
|
type: Boolean,
|
||||||
|
default: false
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
d_activeIndex: this.activeIndex
|
d_activeIndex: this.activeIndex,
|
||||||
|
backwardIsDisabled: true,
|
||||||
|
forwardIsDisabled: false
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
watch: {
|
watch: {
|
||||||
activeIndex(newValue) {
|
activeIndex(newValue) {
|
||||||
this.d_activeIndex = newValue;
|
this.d_activeIndex = newValue;
|
||||||
|
|
||||||
|
this.updateScrollBar(newValue);
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
updated() {
|
updated() {
|
||||||
|
@ -62,6 +80,8 @@ export default {
|
||||||
originalEvent: event,
|
originalEvent: event,
|
||||||
index: i
|
index: i
|
||||||
});
|
});
|
||||||
|
|
||||||
|
this.updateScrollBar(i);
|
||||||
}
|
}
|
||||||
|
|
||||||
this.$emit('tab-click', {
|
this.$emit('tab-click', {
|
||||||
|
@ -79,6 +99,18 @@ export default {
|
||||||
this.$refs.inkbar.style.width = DomHandler.getWidth(tabHeader) + 'px';
|
this.$refs.inkbar.style.width = DomHandler.getWidth(tabHeader) + 'px';
|
||||||
this.$refs.inkbar.style.left = DomHandler.getOffset(tabHeader).left - DomHandler.getOffset(this.$refs.nav).left + 'px';
|
this.$refs.inkbar.style.left = DomHandler.getOffset(tabHeader).left - DomHandler.getOffset(this.$refs.nav).left + 'px';
|
||||||
},
|
},
|
||||||
|
updateScrollBar(index) {
|
||||||
|
let tabHeader = this.$refs.nav.children[index];
|
||||||
|
tabHeader.scrollIntoView(false);
|
||||||
|
},
|
||||||
|
updateButtonState() {
|
||||||
|
const content = this.$refs.content;
|
||||||
|
const { scrollLeft, scrollWidth } = content;
|
||||||
|
const width = DomHandler.getWidth(content);
|
||||||
|
|
||||||
|
this.backwardIsDisabled = scrollLeft === 0;
|
||||||
|
this.forwardIsDisabled = scrollLeft === scrollWidth - width;
|
||||||
|
},
|
||||||
getKey(tab, i) {
|
getKey(tab, i) {
|
||||||
return (tab.props && tab.props.header) ? tab.props.header : i;
|
return (tab.props && tab.props.header) ? tab.props.header : i;
|
||||||
},
|
},
|
||||||
|
@ -87,9 +119,37 @@ export default {
|
||||||
},
|
},
|
||||||
isTabPanel(child) {
|
isTabPanel(child) {
|
||||||
return child.type.name === 'TabPanel'
|
return child.type.name === 'TabPanel'
|
||||||
|
},
|
||||||
|
onScroll(event) {
|
||||||
|
this.scrollable && this.updateButtonState();
|
||||||
|
|
||||||
|
event.preventDefault();
|
||||||
|
},
|
||||||
|
navBackward() {
|
||||||
|
const content = this.$refs.content;
|
||||||
|
const width = DomHandler.getWidth(content);
|
||||||
|
const pos = content.scrollLeft - width;
|
||||||
|
content.scrollLeft = pos <= 0 ? 0 : pos;
|
||||||
|
},
|
||||||
|
navForward() {
|
||||||
|
const content = this.$refs.content;
|
||||||
|
const width = DomHandler.getWidth(content);
|
||||||
|
const pos = content.scrollLeft + width;
|
||||||
|
const lastPos = content.scrollWidth - width;
|
||||||
|
|
||||||
|
content.scrollLeft = pos >= lastPos ? lastPos : pos;
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
|
contentClasses() {
|
||||||
|
return ['p-tabview p-component', {'p-tabview-scrollable': this.scrollable}];
|
||||||
|
},
|
||||||
|
prevButtonClasses() {
|
||||||
|
return ['p-tabview-nav-prev p-tabview-nav-btn p-link', {'p-disabled': this.backwardIsDisabled}]
|
||||||
|
},
|
||||||
|
nextButtonClasses() {
|
||||||
|
return ['p-tabview-nav-next p-tabview-nav-btn p-link', {'p-disabled': this.forwardIsDisabled}]
|
||||||
|
},
|
||||||
tabs() {
|
tabs() {
|
||||||
const tabs = []
|
const tabs = []
|
||||||
this.$slots.default().forEach(child => {
|
this.$slots.default().forEach(child => {
|
||||||
|
@ -106,7 +166,7 @@ export default {
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
return tabs;
|
return tabs;
|
||||||
},
|
}
|
||||||
},
|
},
|
||||||
directives: {
|
directives: {
|
||||||
'ripple': Ripple
|
'ripple': Ripple
|
||||||
|
@ -115,12 +175,23 @@ export default {
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style>
|
<style>
|
||||||
|
.p-tabview-nav-container {
|
||||||
|
position: relative;
|
||||||
|
}
|
||||||
|
|
||||||
|
.p-tabview-nav-content {
|
||||||
|
overflow-x: auto;
|
||||||
|
overflow-y: hidden;
|
||||||
|
scroll-behavior: smooth;
|
||||||
|
scrollbar-width: none;
|
||||||
|
}
|
||||||
|
|
||||||
.p-tabview-nav {
|
.p-tabview-nav {
|
||||||
display: flex;
|
display: flex;
|
||||||
margin: 0;
|
margin: 0;
|
||||||
padding: 0;
|
padding: 0;
|
||||||
list-style-type: none;
|
list-style-type: none;
|
||||||
flex-wrap: wrap;
|
flex: 1 1 auto;
|
||||||
}
|
}
|
||||||
|
|
||||||
.p-tabview-nav-link {
|
.p-tabview-nav-link {
|
||||||
|
@ -144,5 +215,25 @@ export default {
|
||||||
|
|
||||||
.p-tabview-title {
|
.p-tabview-title {
|
||||||
line-height: 1;
|
line-height: 1;
|
||||||
|
white-space: nowrap;
|
||||||
|
}
|
||||||
|
|
||||||
|
.p-tabview-nav-btn {
|
||||||
|
position: absolute;
|
||||||
|
top: 0;
|
||||||
|
z-index: 2;
|
||||||
|
height: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.p-tabview-nav-prev {
|
||||||
|
left: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.p-tabview-nav-next {
|
||||||
|
right: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.p-tabview-nav-content::-webkit-scrollbar {
|
||||||
|
display: none;
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|
|
@ -225,6 +225,12 @@ export default {
|
||||||
<td>boolean</td>
|
<td>boolean</td>
|
||||||
<td>false</td>
|
<td>false</td>
|
||||||
<td>When enabled, hidden tabs are not rendered at all. Defaults to false that hides tabs with css.</td>
|
<td>When enabled, hidden tabs are not rendered at all. Defaults to false that hides tabs with css.</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td>scrollable</td>
|
||||||
|
<td>boolean</td>
|
||||||
|
<td>false</td>
|
||||||
|
<td>When specified, enables horizontal scrolling.</td>
|
||||||
</tr>
|
</tr>
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
|
@ -413,15 +419,15 @@ export default {
|
||||||
active: 0,
|
active: 0,
|
||||||
tabs: [
|
tabs: [
|
||||||
{
|
{
|
||||||
title: 'Header I',
|
title: 'Header I',
|
||||||
content: "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
|
content: "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: 'Header II',
|
title: 'Header II',
|
||||||
content: "Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo. Nemo enim ipsam voluptatem quia voluptas sit aspernatur aut odit aut fugit, sed quia consequuntur magni dolores eos qui ratione voluptatem sequi nesciunt. Consectetur, adipisci velit, sed quia non numquam eius modi."
|
content: "Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo. Nemo enim ipsam voluptatem quia voluptas sit aspernatur aut odit aut fugit, sed quia consequuntur magni dolores eos qui ratione voluptatem sequi nesciunt. Consectetur, adipisci velit, sed quia non numquam eius modi."
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: 'Header III',
|
title: 'Header III',
|
||||||
content: "At vero eos et accusamus et iusto odio dignissimos ducimus qui blanditiis praesentium voluptatum deleniti atque corrupti quos dolores et quas molestias excepturi sint occaecati cupiditate non provident, similique sunt in culpa qui officia deserunt mollitia animi, id est laborum et dolorum fuga. Et harum quidem rerum facilis est et expedita distinctio. Nam libero tempore, cum soluta nobis est eligendi optio cumque nihil impedit quo minus."
|
content: "At vero eos et accusamus et iusto odio dignissimos ducimus qui blanditiis praesentium voluptatum deleniti atque corrupti quos dolores et quas molestias excepturi sint occaecati cupiditate non provident, similique sunt in culpa qui officia deserunt mollitia animi, id est laborum et dolorum fuga. Et harum quidem rerum facilis est et expedita distinctio. Nam libero tempore, cum soluta nobis est eligendi optio cumque nihil impedit quo minus."
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
@ -557,15 +563,15 @@ export default {
|
||||||
const active = ref(0);
|
const active = ref(0);
|
||||||
const tabs = ref([
|
const tabs = ref([
|
||||||
{
|
{
|
||||||
title: 'Header I',
|
title: 'Header I',
|
||||||
content: "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
|
content: "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: 'Header II',
|
title: 'Header II',
|
||||||
content: "Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo. Nemo enim ipsam voluptatem quia voluptas sit aspernatur aut odit aut fugit, sed quia consequuntur magni dolores eos qui ratione voluptatem sequi nesciunt. Consectetur, adipisci velit, sed quia non numquam eius modi."
|
content: "Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo. Nemo enim ipsam voluptatem quia voluptas sit aspernatur aut odit aut fugit, sed quia consequuntur magni dolores eos qui ratione voluptatem sequi nesciunt. Consectetur, adipisci velit, sed quia non numquam eius modi."
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: 'Header III',
|
title: 'Header III',
|
||||||
content: "At vero eos et accusamus et iusto odio dignissimos ducimus qui blanditiis praesentium voluptatum deleniti atque corrupti quos dolores et quas molestias excepturi sint occaecati cupiditate non provident, similique sunt in culpa qui officia deserunt mollitia animi, id est laborum et dolorum fuga. Et harum quidem rerum facilis est et expedita distinctio. Nam libero tempore, cum soluta nobis est eligendi optio cumque nihil impedit quo minus."
|
content: "At vero eos et accusamus et iusto odio dignissimos ducimus qui blanditiis praesentium voluptatum deleniti atque corrupti quos dolores et quas molestias excepturi sint occaecati cupiditate non provident, similique sunt in culpa qui officia deserunt mollitia animi, id est laborum et dolorum fuga. Et harum quidem rerum facilis est et expedita distinctio. Nam libero tempore, cum soluta nobis est eligendi optio cumque nihil impedit quo minus."
|
||||||
}
|
}
|
||||||
]);
|
]);
|
||||||
|
@ -596,4 +602,4 @@ export default {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
Loading…
Reference in New Issue