Skip to content

Commit

Permalink
update tabs component
Browse files Browse the repository at this point in the history
  • Loading branch information
ofrankowska committed Jul 1, 2021
1 parent e8fb7e2 commit 4ba4509
Show file tree
Hide file tree
Showing 6 changed files with 163 additions and 138 deletions.
33 changes: 33 additions & 0 deletions mocks/tabs.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
[
{
"name": "Tab 1",
"selected": true,
"paragraph": "Toe in voluptate velit esse cillum dolore eu fugiat nulla pariatur.",
"button": "Alpaca button"
},
{

"name": "Tab 2",
"selected": false,
"paragraph": "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.",
"button": ""
},
{
"name": "Tab 3",
"selected": false,
"paragraph": "Sed do eiusmod tempor incididunt ut labo. Ut enim ad minim veniam, re et dolore magna aliqua. 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.",
"button": ""
},
{
"name": "Tab 4",
"selected": false,
"paragraph": "Toe in voluptate velit esse cillum dolore eu fugiat nulla pariatur.",
"button": ""
},
{
"name": "Tab 5",
"selected": false,
"paragraph": "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.",
"button": ""
}
]
42 changes: 20 additions & 22 deletions src/atoms/tab/Tab.spec.js
Original file line number Diff line number Diff line change
@@ -1,43 +1,41 @@
import { mount } from '@vue/test-utils'
import { shallowMount } from '@vue/test-utils'
import ATab from './Tab.vue'

const factory = () => {
const defaultData = {
slots: {
default: '<span>Tab default text</span>'
},
propsData: {
name: 'Tab'
}
}

return shallowMount(ATab, defaultData)
}

describe('Tab', () => {
it('has default structure', () => {
const wrapper = mount(ATab, {
propsData: {
name: 'Tab'
}
})
const wrapper = factory()

expect(wrapper).toBe('DIV')
expect(wrapper.attributes().role).toBeDefined()
expect(wrapper.attributes().role).toEqual('tabpanel')
expect(wrapper.attributes().role).toEqual('tab')
expect(wrapper.attributes('data-tab')).toBeDefined()
})

it('renders slot text when passed', () => {
const wrapper = mount(ATab, {
slots: {
default: '<span>Tab default text</span>'
},
propsData: {
name: 'Tab'
}
})
const wrapper = factory()

expect(wrapper.find('div > span').exists()).toBe(true)
expect(wrapper.find('div > span').text()).toEqual('Tab default text')
})

it('has correct id attribute', () => {
const wrapper = mount(ATab, {
propsData: {
name: 'Sample'
}
})
const wrapper = factory()

expect(wrapper.props().name).toBe('Sample')
expect(wrapper.props().name).toBe('Tab')
expect(wrapper.attributes().id).toBeDefined()
expect(wrapper.attributes().id).toEqual('sample-tab')
expect(wrapper.attributes().id).toEqual('tab-tab')
})
})
64 changes: 32 additions & 32 deletions src/molecules/tabs/Tabs.html
Original file line number Diff line number Diff line change
@@ -1,40 +1,40 @@
<div
role="tablist"
:class="getClass('tabs')"
>
<button
v-for="(tab, i) in tabs"
:key="`${tab.id}-tab-trigger`"
:id="`${tab.id}-tab-trigger`"
:aria-controls="`${tab.id}-tab`"
:aria-selected="tab.isActive || 'false'"
:aria-expanded="tab.isActive || 'false'"
type="button"
role="tab"
:ref="`button_${i}`"
:class="getClass(tab.isActive ? 'tabs__nav-button--active' : 'tabs__nav-button')""
@click="selectTab(tab)"
@keydown="onKeydown"
<div :class="getClass('tabs')">
<div
role="tablist"
:class="getClass('tabs__tablist')"
>
<!-- @slot Custom tab button content (Scoped slot) -->
<slot
name="button"
:tab="tab"
<button
v-for="(tab, i) in tabs"
:key="`${tab.id}-tab-trigger`"
:id="`${tab.id}-tab-trigger`"
:aria-controls="`${tab.id}-tab`"
:aria-selected="`${tab.isActive}`"
:aria-expanded="`${tab.isActive}`"
type="button"
role="tab"
:ref="`button_${i}`"
:class="[
getClass('tabs__nav-button'),
tab.isActive ? getClass('tabs__nav-button--active') : getClass('tabs__nav-button--inactive')
]"
:tabindex="!tab.isActive && -1"
@click="selectTab(tab)"
@keydown="onKeydown"
>
{{ tab.name }}
</slot>
<!-- @slot Custom accordion tab icon (Named slot) -->
<slot name="icon">

</slot>
</button>
<!-- @slot Custom tab button content (Scoped slot) -->
<slot
name="button"
:tab="tab"
>
{{ tab.name }}
</slot>
</button>
</div>
<div
ref="content"
class="a-tabs__content"
:class="getClass('tabs__content')"
tabindex="-1"
tabindex="0"
>
<!-- @slot Tab components -->
<slot/>
<slot />
</div>
</div>
69 changes: 33 additions & 36 deletions src/molecules/tabs/Tabs.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import KeyCodes from '../../utils/key-codes'
import getClass from '../../../utils/helpers/get-class.js'

export default {
Expand All @@ -9,17 +8,27 @@ export default {
activeFocusedTab: 0,
config: {
base: {
tabs: [
'lg:flex', 'lg:flex-wrap', 'justify-center'
tabs: [],
tabs__tablist: [
'flex', 'w-full', 'no-wrap',
'overflow-x-scroll'
],
'tabs__nav-button': [
'text-gray-600', 'py-4', 'px-6', 'block', 'hover:text-blue-500'
'flex', 'items-center', 'justify-center', 'flex-grow',
'px-4', 'py-2',
'font-bold', 'leading-loose', 'uppercase', 'whitespace-nowrap'
],
'tabs__nav-button--inactive': [
'border-b', 'border-gray-200', 'hover:border-primary',
'text-gray-400'
],
'tabs__nav-button--active': [
'text-gray-600', 'py-4', 'px-6', 'block', 'hover:text-blue-500', 'text-blue-500', 'border-b-2', 'font-medium', 'border-blue-500'
'border-b', 'border-primary',
'text-primary'
],
tabs__content: [
'py-4'
'w-full',
'px-6', 'py-10'
]
}
}
Expand Down Expand Up @@ -53,38 +62,26 @@ export default {
this.$refs[el][0].focus()
},
onKeydown (e) {
const key = e.keyCode
const key = e.key
const tabsCount = this.tabs.length

if (key === KeyCodes.TAB) {
e.preventDefault()
e.stopPropagation()
this.$refs.content.focus()
} else if (
(key === KeyCodes.LEFT ||
key === KeyCodes.UP ||
key === KeyCodes.HOME) &&
this.activeFocusedTab > 0
) {
if (key === KeyCodes.HOME) {
this.focus('button_0')
} else {
this.activeFocusedTab = this.activeFocusedTab - 1
this.focus(`button_${this.activeFocusedTab}`)
}
} else if (
(key === KeyCodes.RIGHT ||
key === KeyCodes.DOWN ||
key === KeyCodes.END) &&
this.activeFocusedTab < this.tabs.length - 1
) {
if (key === KeyCodes.END) {
this.focus(`button_${this.tabs.length - 1}`)
} else {
this.activeFocusedTab = this.activeFocusedTab + 1
this.focus(`button_${this.activeFocusedTab}`)
}
if (key === 'ArrowRight' || key === 'ArrowDown') {
this.activeFocusedTab = (this.activeFocusedTab + 1) % tabsCount
this.selectTab(this.activeFocusedTab)
this.focus(`button_${this.activeFocusedTab}`)
} else if (key === 'ArrowLeft' || key === 'ArrowUp') {
this.activeFocusedTab = (this.activeFocusedTab - 1 + tabsCount) % tabsCount
this.selectTab(this.activeFocusedTab)
this.focus(`button_${this.activeFocusedTab}`)
} else if (key === 'Home') {
this.activeFocusedTab = 0
this.selectTab(this.activeFocusedTab)
this.focus(`button_${this.activeFocusedTab}`)
} else if (key === 'End') {
this.activeFocusedTab = tabsCount - 1
this.selectTab(this.activeFocusedTab)
this.focus(`button_${this.activeFocusedTab}`)
}
this.selectTab(this.activeFocusedTab)
}
}
}
84 changes: 39 additions & 45 deletions src/molecules/tabs/Tabs.stories.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ import AParagraph from '@atoms/paragraph/Paragraph.vue'
import AIcon from '@atoms/icon/Icon.vue'
import AIconStarBorder from '@atoms/icon/templates/IconStarBorder.vue'

import tabs from '@mocks/tabs.json'

export default {
title: 'Molecules/Tabs',
component: ATabs,
Expand All @@ -20,31 +22,26 @@ const Template = (args, { argTypes }) => ({
ATabs,
ATab,
AButton,
AParagraph,
AIcon,
AIconStarBorder
AParagraph
},
props: Object.keys(argTypes),
data () {
return {
tabs
}
},
template: `
<a-tabs @click="tabClick">
<a-tab
name="Services"
selected
>
<a-paragraph>
Toe in voluptate velit esse cillum dolore eu fugiat nulla pariatur.
</a-paragraph>
</a-tab>
<a-tab name="Pricing">
<a-paragraph>
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.
</a-paragraph>
</a-tab>
<a-tab name="Reviews">
<a-paragraph>
Sed do eiusmod tempor incididunt ut labo. Ut enim ad minim veniam, re et dolore magna aliqua. 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.
</a-paragraph>
</a-tab>
<template v-for="(tab, index) in tabs">
<a-tab
:name="tab.name"
:selected="tab.selected"
>
<a-paragraph>
{{ tab.paragraph }}
</a-paragraph>
</a-tab>
</template>
</a-tabs>
`
})
Expand All @@ -61,38 +58,35 @@ export const WithSlots = (args, { argTypes }) => ({
AIconStarBorder
},
props: Object.keys(argTypes),
data () {
return {
tabs
}
},
template: `
<a-tabs @click="tabClick">
<template #button="{ tab }">
<a-icon title="Star border icon">
<a-icon
title="Star border icon"
class="mr-2"
>
<a-icon-star-border />
</a-icon>
{{ tab.name }}
<span
v-if="tab.name === 'Reviews'"
style='margin-left: 4px;'
</template>
<template v-for="(tab, index) in tabs">
<a-tab
:name="tab.name"
:selected="tab.selected"
>
(3)
</span>
<a-paragraph>
{{ tab.paragraph }}
</a-paragraph>
<a-button v-if="tab.button">
{{ tab.button}}
</a-button>
</a-tab>
</template>
<a-tab name="Services">
<a-paragraph>
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.
</a-paragraph>
</a-tab>
<a-tab
name="Pricing"
selected
>
<a-button>
Alpaca Button
</a-button>
</a-tab>
<a-tab name="Reviews">
<a-paragraph>
Sed do eiusmod tempor incididunt ut labo. Ut enim ad minim veniam, re et dolore magna aliqua. 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.
</a-paragraph>
</a-tab>
</a-tabs>
`
})
Loading

0 comments on commit 4ba4509

Please sign in to comment.