Next release (#916)
* placeholder for next release * Ensure portal root exists in the DOM (#950) * ensure that the portal root is always in the DOM When using NextJS, it happens that between page transitions the portal root gets removed form the DOM. We will check the DOM when the `target` updates, and if it doesn't exist anymore, then we will re-insert it in the DOM. * update changelog * Allow `Tabs` to be controllable (#970) * feat(react): Allow Tab Component to be controlled * fix falsy bug `selectedIndex || defaultIndex` would result in the `defaultIndex` if `selectedIndex` is set to 0. This means that if you have this code: ```js <Tab.Group selectedIndex={0} defaultIndex={2} /> ``` That you will never be able to see the very first tab, unless you provided a negative value like `-1`. `selectedIndex ?? defaultIndex` fixes this, since it purely checkes for `undefined` and `null`. * implemented controllable Tabs for Vue * add dedicated test to ensure changing the defaultIndex has no effect * update changelog Co-authored-by: ChiefORZ <seb.schaffernak@gmail.com> * Fix missing key binding in examples (#1036) Co-authored-by: superDragon <xkloveme@gmail.com> * Fix slice => splice typo in Vue Tabs component (#1037) Co-authored-by: Ryan Gossiaux <ryan.gossiaux@gmail.com> * update changelog * Ensure correct DOM node order when performing focus actions (#1038) * ensure that the order of DOM nodes is correct When we are performing actions like `focusIn(list, Focus.First)` then we have to ensrue that we are working with the correct list that is properly sorted. It can happen that the list of DOM nodes is out of sync. This can happen if you have 3 Tabs, hide the second (which triggers an unmount and an `unregister` of the Tab), then re-add the second item in the middle. This will re-add the item to the end of the list instead of in the middle. We can solve this by always sorting items when we are adding / removing items, but this is a bit more error prone because it is easy to forget. Instead we will sort it when performing the actual keyboard action. If we didn't provide a list but an element, then we use a getFocusableElements(element) function, but this already gives you a correctly sorted list so we don't need to do that for this list. * add tests to prove the correct order when performing actions * cleanup code just for tests It could still happen that this internal list is not ordered correctly but that's not really a problem we just have the list to keep track of things. For our tests we now use the position from the DOM directly. * update changelog Co-authored-by: ChiefORZ <seb.schaffernak@gmail.com> Co-authored-by: superDragon <xkloveme@gmail.com> Co-authored-by: Ryan Gossiaux <ryan.gossiaux@gmail.com>
This commit is contained in:
Robin Malfait
+17
-2
@@ -7,11 +7,26 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
||||
|
||||
## [Unreleased - React]
|
||||
|
||||
- Nothing yet!
|
||||
### Fixes
|
||||
|
||||
- Ensure portal root exists in the DOM ([#950](https://github.com/tailwindlabs/headlessui/pull/950))
|
||||
- Ensure correct DOM node order when performing focus actions ([#1038](https://github.com/tailwindlabs/headlessui/pull/1038))
|
||||
|
||||
### Added
|
||||
|
||||
- Allow for `Tab.Group` to be controllable ([#909](https://github.com/tailwindlabs/headlessui/pull/909), [#970](https://github.com/tailwindlabs/headlessui/pull/970))
|
||||
|
||||
## [Unreleased - Vue]
|
||||
|
||||
- Nothing yet!
|
||||
### Fixes
|
||||
|
||||
- Fix missing key binding in examples ([#1036](https://github.com/tailwindlabs/headlessui/pull/1036), [#1006](https://github.com/tailwindlabs/headlessui/pull/1006))
|
||||
- Fix slice => splice typo in `Tabs` component ([#1037](https://github.com/tailwindlabs/headlessui/pull/1037), [#986](https://github.com/tailwindlabs/headlessui/pull/986))
|
||||
- Ensure correct DOM node order when performing focus actions ([#1038](https://github.com/tailwindlabs/headlessui/pull/1038))
|
||||
|
||||
### Added
|
||||
|
||||
- Allow for `TabGroup` to be controllable ([#909](https://github.com/tailwindlabs/headlessui/pull/909), [#970](https://github.com/tailwindlabs/headlessui/pull/970))
|
||||
|
||||
## [@headlessui/react@v1.4.2] - 2021-11-08
|
||||
|
||||
|
||||
@@ -34,6 +34,15 @@ function usePortalTarget(): HTMLElement | null {
|
||||
return document.body.appendChild(root)
|
||||
})
|
||||
|
||||
// Ensure the portal root is always in the DOM
|
||||
useEffect(() => {
|
||||
if (target === null) return
|
||||
|
||||
if (!document.body.contains(target)) {
|
||||
document.body.appendChild(target)
|
||||
}
|
||||
}, [target])
|
||||
|
||||
useEffect(() => {
|
||||
if (forceInRoot) return
|
||||
if (groupTarget === null) return
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import React, { createElement } from 'react'
|
||||
import React, { createElement, useState } from 'react'
|
||||
import { render } from '@testing-library/react'
|
||||
|
||||
import { Tab } from './tabs'
|
||||
@@ -75,6 +75,45 @@ describe('Rendering', () => {
|
||||
assertTabs({ active: 0 })
|
||||
})
|
||||
|
||||
it('should guarantee the order of DOM nodes when performing actions', async () => {
|
||||
function Example() {
|
||||
let [hide, setHide] = useState(false)
|
||||
|
||||
return (
|
||||
<>
|
||||
<button onClick={() => setHide(v => !v)}>toggle</button>
|
||||
<Tab.Group>
|
||||
<Tab.List>
|
||||
<Tab>Tab 1</Tab>
|
||||
{!hide && <Tab>Tab 2</Tab>}
|
||||
<Tab>Tab 3</Tab>
|
||||
</Tab.List>
|
||||
|
||||
<Tab.Panels>
|
||||
<Tab.Panel>Content 1</Tab.Panel>
|
||||
{!hide && <Tab.Panel>Content 2</Tab.Panel>}
|
||||
<Tab.Panel>Content 3</Tab.Panel>
|
||||
</Tab.Panels>
|
||||
</Tab.Group>
|
||||
</>
|
||||
)
|
||||
}
|
||||
|
||||
render(<Example />)
|
||||
|
||||
await click(getByText('toggle')) // Remove Tab 2
|
||||
await click(getByText('toggle')) // Re-add Tab 2
|
||||
|
||||
await press(Keys.Tab)
|
||||
assertTabs({ active: 0 })
|
||||
|
||||
await press(Keys.ArrowRight)
|
||||
assertTabs({ active: 1 })
|
||||
|
||||
await press(Keys.ArrowRight)
|
||||
assertTabs({ active: 2 })
|
||||
})
|
||||
|
||||
describe('`renderProps`', () => {
|
||||
it('should expose the `selectedIndex` on the `Tab.Group` component', async () => {
|
||||
render(
|
||||
@@ -415,6 +454,249 @@ describe('Rendering', () => {
|
||||
assertTabs({ active: 0 })
|
||||
assertActiveElement(getByText('Tab 1'))
|
||||
})
|
||||
|
||||
it('should not change the Tab if the defaultIndex changes', async () => {
|
||||
function Example() {
|
||||
let [defaultIndex, setDefaultIndex] = useState(1)
|
||||
|
||||
return (
|
||||
<>
|
||||
<Tab.Group defaultIndex={defaultIndex}>
|
||||
<Tab.List>
|
||||
<Tab>Tab 1</Tab>
|
||||
<Tab>Tab 2</Tab>
|
||||
<Tab>Tab 3</Tab>
|
||||
</Tab.List>
|
||||
|
||||
<Tab.Panels>
|
||||
<Tab.Panel>Content 1</Tab.Panel>
|
||||
<Tab.Panel>Content 2</Tab.Panel>
|
||||
<Tab.Panel>Content 3</Tab.Panel>
|
||||
</Tab.Panels>
|
||||
</Tab.Group>
|
||||
|
||||
<button>after</button>
|
||||
<button onClick={() => setDefaultIndex(0)}>change</button>
|
||||
</>
|
||||
)
|
||||
}
|
||||
|
||||
render(<Example />)
|
||||
|
||||
assertActiveElement(document.body)
|
||||
|
||||
await press(Keys.Tab)
|
||||
|
||||
assertTabs({ active: 1 })
|
||||
assertActiveElement(getByText('Tab 2'))
|
||||
|
||||
await click(getByText('Tab 3'))
|
||||
|
||||
assertTabs({ active: 2 })
|
||||
assertActiveElement(getByText('Tab 3'))
|
||||
|
||||
// Change default index
|
||||
await click(getByText('change'))
|
||||
|
||||
// Nothing should change...
|
||||
assertTabs({ active: 2 })
|
||||
})
|
||||
})
|
||||
|
||||
describe('`selectedIndex`', () => {
|
||||
it('should be possible to change active tab controlled and uncontrolled', async () => {
|
||||
let handleChange = jest.fn()
|
||||
|
||||
function ControlledTabs() {
|
||||
let [selectedIndex, setSelectedIndex] = useState(0)
|
||||
|
||||
return (
|
||||
<>
|
||||
<Tab.Group
|
||||
selectedIndex={selectedIndex}
|
||||
onChange={value => {
|
||||
setSelectedIndex(value)
|
||||
handleChange(value)
|
||||
}}
|
||||
>
|
||||
<Tab.List>
|
||||
<Tab>Tab 1</Tab>
|
||||
<Tab>Tab 2</Tab>
|
||||
<Tab>Tab 3</Tab>
|
||||
</Tab.List>
|
||||
|
||||
<Tab.Panels>
|
||||
<Tab.Panel>Content 1</Tab.Panel>
|
||||
<Tab.Panel>Content 2</Tab.Panel>
|
||||
<Tab.Panel>Content 3</Tab.Panel>
|
||||
</Tab.Panels>
|
||||
</Tab.Group>
|
||||
|
||||
<button>after</button>
|
||||
<button onClick={() => setSelectedIndex(prev => prev + 1)}>setSelectedIndex</button>
|
||||
</>
|
||||
)
|
||||
}
|
||||
|
||||
render(<ControlledTabs />)
|
||||
|
||||
assertActiveElement(document.body)
|
||||
|
||||
// test uncontrolled behaviour
|
||||
await click(getByText('Tab 2'))
|
||||
expect(handleChange).toHaveBeenCalledTimes(1)
|
||||
expect(handleChange).toHaveBeenNthCalledWith(1, 1)
|
||||
assertTabs({ active: 1 })
|
||||
|
||||
// test controlled behaviour
|
||||
await click(getByText('setSelectedIndex'))
|
||||
assertTabs({ active: 2 })
|
||||
})
|
||||
|
||||
it('should jump to the nearest tab when the selectedIndex is out of bounds (-2)', async () => {
|
||||
render(
|
||||
<>
|
||||
<Tab.Group selectedIndex={-2}>
|
||||
<Tab.List>
|
||||
<Tab>Tab 1</Tab>
|
||||
<Tab>Tab 2</Tab>
|
||||
<Tab>Tab 3</Tab>
|
||||
</Tab.List>
|
||||
|
||||
<Tab.Panels>
|
||||
<Tab.Panel>Content 1</Tab.Panel>
|
||||
<Tab.Panel>Content 2</Tab.Panel>
|
||||
<Tab.Panel>Content 3</Tab.Panel>
|
||||
</Tab.Panels>
|
||||
</Tab.Group>
|
||||
|
||||
<button>after</button>
|
||||
</>
|
||||
)
|
||||
|
||||
assertActiveElement(document.body)
|
||||
|
||||
await press(Keys.Tab)
|
||||
|
||||
assertTabs({ active: 0 })
|
||||
assertActiveElement(getByText('Tab 1'))
|
||||
})
|
||||
|
||||
it('should jump to the nearest tab when the selectedIndex is out of bounds (+5)', async () => {
|
||||
render(
|
||||
<>
|
||||
<Tab.Group selectedIndex={5}>
|
||||
<Tab.List>
|
||||
<Tab>Tab 1</Tab>
|
||||
<Tab>Tab 2</Tab>
|
||||
<Tab>Tab 3</Tab>
|
||||
</Tab.List>
|
||||
|
||||
<Tab.Panels>
|
||||
<Tab.Panel>Content 1</Tab.Panel>
|
||||
<Tab.Panel>Content 2</Tab.Panel>
|
||||
<Tab.Panel>Content 3</Tab.Panel>
|
||||
</Tab.Panels>
|
||||
</Tab.Group>
|
||||
|
||||
<button>after</button>
|
||||
</>
|
||||
)
|
||||
|
||||
assertActiveElement(document.body)
|
||||
|
||||
await press(Keys.Tab)
|
||||
|
||||
assertTabs({ active: 2 })
|
||||
assertActiveElement(getByText('Tab 3'))
|
||||
})
|
||||
|
||||
it('should jump to the next available tab when the selectedIndex is a disabled tab', async () => {
|
||||
render(
|
||||
<>
|
||||
<Tab.Group selectedIndex={0}>
|
||||
<Tab.List>
|
||||
<Tab disabled>Tab 1</Tab>
|
||||
<Tab>Tab 2</Tab>
|
||||
<Tab>Tab 3</Tab>
|
||||
</Tab.List>
|
||||
|
||||
<Tab.Panels>
|
||||
<Tab.Panel>Content 1</Tab.Panel>
|
||||
<Tab.Panel>Content 2</Tab.Panel>
|
||||
<Tab.Panel>Content 3</Tab.Panel>
|
||||
</Tab.Panels>
|
||||
</Tab.Group>
|
||||
|
||||
<button>after</button>
|
||||
</>
|
||||
)
|
||||
|
||||
assertActiveElement(document.body)
|
||||
|
||||
await press(Keys.Tab)
|
||||
|
||||
assertTabs({ active: 1 })
|
||||
assertActiveElement(getByText('Tab 2'))
|
||||
})
|
||||
|
||||
it('should jump to the next available tab when the selectedIndex is a disabled tab and wrap around', async () => {
|
||||
render(
|
||||
<>
|
||||
<Tab.Group defaultIndex={2}>
|
||||
<Tab.List>
|
||||
<Tab>Tab 1</Tab>
|
||||
<Tab>Tab 2</Tab>
|
||||
<Tab disabled>Tab 3</Tab>
|
||||
</Tab.List>
|
||||
|
||||
<Tab.Panels>
|
||||
<Tab.Panel>Content 1</Tab.Panel>
|
||||
<Tab.Panel>Content 2</Tab.Panel>
|
||||
<Tab.Panel>Content 3</Tab.Panel>
|
||||
</Tab.Panels>
|
||||
</Tab.Group>
|
||||
|
||||
<button>after</button>
|
||||
</>
|
||||
)
|
||||
|
||||
assertActiveElement(document.body)
|
||||
|
||||
await press(Keys.Tab)
|
||||
|
||||
assertTabs({ active: 0 })
|
||||
assertActiveElement(getByText('Tab 1'))
|
||||
})
|
||||
|
||||
it('should prefer selectedIndex over defaultIndex', async () => {
|
||||
render(
|
||||
<>
|
||||
<Tab.Group selectedIndex={0} defaultIndex={2}>
|
||||
<Tab.List>
|
||||
<Tab>Tab 1</Tab>
|
||||
<Tab>Tab 2</Tab>
|
||||
<Tab>Tab 3</Tab>
|
||||
</Tab.List>
|
||||
|
||||
<Tab.Panels>
|
||||
<Tab.Panel>Content 1</Tab.Panel>
|
||||
<Tab.Panel>Content 2</Tab.Panel>
|
||||
<Tab.Panel>Content 3</Tab.Panel>
|
||||
</Tab.Panels>
|
||||
</Tab.Group>
|
||||
|
||||
<button>after</button>
|
||||
</>
|
||||
)
|
||||
|
||||
assertActiveElement(document.body)
|
||||
|
||||
await press(Keys.Tab)
|
||||
|
||||
assertTabs({ active: 0 })
|
||||
assertActiveElement(getByText('Tab 1'))
|
||||
})
|
||||
})
|
||||
|
||||
describe(`'Tab'`, () => {
|
||||
|
||||
@@ -127,11 +127,19 @@ function Tabs<TTag extends ElementType = typeof DEFAULT_TABS_TAG>(
|
||||
props: Props<TTag, TabsRenderPropArg> & {
|
||||
defaultIndex?: number
|
||||
onChange?: (index: number) => void
|
||||
selectedIndex?: number
|
||||
vertical?: boolean
|
||||
manual?: boolean
|
||||
}
|
||||
) {
|
||||
let { defaultIndex = 0, vertical = false, manual = false, onChange, ...passThroughProps } = props
|
||||
let {
|
||||
defaultIndex = 0,
|
||||
vertical = false,
|
||||
manual = false,
|
||||
onChange,
|
||||
selectedIndex = null,
|
||||
...passThroughProps
|
||||
} = props
|
||||
const orientation = vertical ? 'vertical' : 'horizontal'
|
||||
const activation = manual ? 'manual' : 'auto'
|
||||
|
||||
@@ -161,18 +169,20 @@ function Tabs<TTag extends ElementType = typeof DEFAULT_TABS_TAG>(
|
||||
|
||||
useEffect(() => {
|
||||
if (state.tabs.length <= 0) return
|
||||
if (state.selectedIndex !== null) return
|
||||
if (selectedIndex === null && state.selectedIndex !== null) return
|
||||
|
||||
let tabs = state.tabs.map(tab => tab.current).filter(Boolean) as HTMLElement[]
|
||||
let focusableTabs = tabs.filter(tab => !tab.hasAttribute('disabled'))
|
||||
|
||||
let indexToSet = selectedIndex ?? defaultIndex
|
||||
|
||||
// Underflow
|
||||
if (defaultIndex < 0) {
|
||||
if (indexToSet < 0) {
|
||||
dispatch({ type: ActionTypes.SetSelectedIndex, index: tabs.indexOf(focusableTabs[0]) })
|
||||
}
|
||||
|
||||
// Overflow
|
||||
else if (defaultIndex > state.tabs.length) {
|
||||
else if (indexToSet > state.tabs.length) {
|
||||
dispatch({
|
||||
type: ActionTypes.SetSelectedIndex,
|
||||
index: tabs.indexOf(focusableTabs[focusableTabs.length - 1]),
|
||||
@@ -181,15 +191,15 @@ function Tabs<TTag extends ElementType = typeof DEFAULT_TABS_TAG>(
|
||||
|
||||
// Middle
|
||||
else {
|
||||
let before = tabs.slice(0, defaultIndex)
|
||||
let after = tabs.slice(defaultIndex)
|
||||
let before = tabs.slice(0, indexToSet)
|
||||
let after = tabs.slice(indexToSet)
|
||||
|
||||
let next = [...after, ...before].find(tab => focusableTabs.includes(tab))
|
||||
if (!next) return
|
||||
|
||||
dispatch({ type: ActionTypes.SetSelectedIndex, index: tabs.indexOf(next) })
|
||||
}
|
||||
}, [defaultIndex, state.tabs, state.selectedIndex])
|
||||
}, [defaultIndex, selectedIndex, state.tabs, state.selectedIndex])
|
||||
|
||||
let lastChangedIndex = useRef(state.selectedIndex)
|
||||
let providerBag = useMemo<ContextType<typeof TabsContext>>(
|
||||
@@ -348,10 +358,6 @@ export function Tab<TTag extends ElementType = typeof DEFAULT_TAB_TAG>(
|
||||
}
|
||||
let passThroughProps = props
|
||||
|
||||
if (process.env.NODE_ENV === 'test') {
|
||||
Object.assign(propsWeControl, { ['data-headlessui-index']: myIndex })
|
||||
}
|
||||
|
||||
return render({
|
||||
props: { ...passThroughProps, ...propsWeControl },
|
||||
slot,
|
||||
@@ -423,10 +429,6 @@ function Panel<TTag extends ElementType = typeof DEFAULT_PANEL_TAG>(
|
||||
tabIndex: selected ? 0 : -1,
|
||||
}
|
||||
|
||||
if (process.env.NODE_ENV === 'test') {
|
||||
Object.assign(propsWeControl, { ['data-headlessui-index']: myIndex })
|
||||
}
|
||||
|
||||
let passThroughProps = props
|
||||
|
||||
return render({
|
||||
|
||||
@@ -1224,8 +1224,8 @@ export function assertTabs(
|
||||
expect(list).toHaveAttribute('role', 'tablist')
|
||||
expect(list).toHaveAttribute('aria-orientation', orientation)
|
||||
|
||||
let activeTab = tabs.find(tab => tab.dataset.headlessuiIndex === '' + active)
|
||||
let activePanel = panels.find(panel => panel.dataset.headlessuiIndex === '' + active)
|
||||
let activeTab = Array.from(list.querySelectorAll('[id^="headlessui-tabs-tab-"]'))[active]
|
||||
let activePanel = panels.find(panel => panel.id === activeTab.getAttribute('aria-controls'))
|
||||
|
||||
for (let tab of tabs) {
|
||||
expect(tab).toHaveAttribute('id')
|
||||
|
||||
@@ -103,7 +103,15 @@ export function focusElement(element: HTMLElement | null) {
|
||||
}
|
||||
|
||||
export function focusIn(container: HTMLElement | HTMLElement[], focus: Focus) {
|
||||
let elements = Array.isArray(container) ? container : getFocusableElements(container)
|
||||
let elements = Array.isArray(container)
|
||||
? container.slice().sort((a, b) => {
|
||||
let position = a.compareDocumentPosition(b)
|
||||
|
||||
if (position & Node.DOCUMENT_POSITION_FOLLOWING) return -1
|
||||
if (position & Node.DOCUMENT_POSITION_PRECEDING) return 1
|
||||
return 0
|
||||
})
|
||||
: getFocusableElements(container)
|
||||
let active = document.activeElement as HTMLElement
|
||||
|
||||
let direction = (() => {
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
<TabList class="relative z-0 rounded-lg shadow flex divide-x divide-gray-200">
|
||||
<Tab
|
||||
v-for="(tab, tabIdx) in tabs"
|
||||
key="tab.name"
|
||||
:key="tab.name"
|
||||
:disabled="tab.disabled"
|
||||
class="group relative min-w-0 flex-1 overflow-hidden bg-white py-4 px-4 text-sm font-medium text-center hover:bg-gray-50 focus:z-10"
|
||||
:class="{
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { defineComponent, nextTick } from 'vue'
|
||||
import { defineComponent, nextTick, ref } from 'vue'
|
||||
import { render } from '../../test-utils/vue-testing-library'
|
||||
import { TabGroup, TabList, Tab, TabPanels, TabPanel } from './tabs'
|
||||
import { suppressConsoleLogs } from '../../test-utils/suppress-console-logs'
|
||||
@@ -101,6 +101,51 @@ describe('Rendering', () => {
|
||||
assertTabs({ active: 0 })
|
||||
})
|
||||
|
||||
it('should guarantee the order of DOM nodes when performing actions', async () => {
|
||||
renderTemplate({
|
||||
template: html`
|
||||
<button @click="toggle()">toggle</button>
|
||||
<TabGroup>
|
||||
<TabList>
|
||||
<Tab>Tab 1</Tab>
|
||||
<Tab v-if="!hide">Tab 2</Tab>
|
||||
<Tab>Tab 3</Tab>
|
||||
</TabList>
|
||||
|
||||
<TabPanels>
|
||||
<TabPanel>Content 1</TabPanel>
|
||||
<TabPanel v-if="!hide">Content 2</TabPanel>
|
||||
<TabPanel>Content 3</TabPanel>
|
||||
</TabPanels>
|
||||
</TabGroup>
|
||||
`,
|
||||
setup() {
|
||||
let hide = ref(false)
|
||||
|
||||
return {
|
||||
hide,
|
||||
toggle() {
|
||||
hide.value = !hide.value
|
||||
},
|
||||
}
|
||||
},
|
||||
})
|
||||
|
||||
await new Promise<void>(nextTick)
|
||||
|
||||
await click(getByText('toggle')) // Remove Tab 2
|
||||
await click(getByText('toggle')) // Re-add Tab 2
|
||||
|
||||
await press(Keys.Tab)
|
||||
assertTabs({ active: 0 })
|
||||
|
||||
await press(Keys.ArrowRight)
|
||||
assertTabs({ active: 1 })
|
||||
|
||||
await press(Keys.ArrowRight)
|
||||
assertTabs({ active: 2 })
|
||||
})
|
||||
|
||||
describe('`renderProps`', () => {
|
||||
it('should expose the `selectedIndex` on the `Tabs` component', async () => {
|
||||
renderTemplate(
|
||||
@@ -433,6 +478,262 @@ describe('Rendering', () => {
|
||||
assertTabs({ active: 0 })
|
||||
assertActiveElement(getByText('Tab 1'))
|
||||
})
|
||||
|
||||
it('should not change the Tab if the defaultIndex changes', async () => {
|
||||
renderTemplate({
|
||||
template: html`
|
||||
<TabGroup :defaultIndex="defaultIndex">
|
||||
<TabList>
|
||||
<Tab>Tab 1</Tab>
|
||||
<Tab>Tab 2</Tab>
|
||||
<Tab>Tab 3</Tab>
|
||||
</TabList>
|
||||
|
||||
<TabPanels>
|
||||
<TabPanel>Content 1</TabPanel>
|
||||
<TabPanel>Content 2</TabPanel>
|
||||
<TabPanel>Content 3</TabPanel>
|
||||
</TabPanels>
|
||||
</TabGroup>
|
||||
|
||||
<button>after</button>
|
||||
<button @click="defaultIndex = 0">change</button>
|
||||
`,
|
||||
setup() {
|
||||
let defaultIndex = ref(1)
|
||||
return { defaultIndex }
|
||||
},
|
||||
})
|
||||
|
||||
await new Promise<void>(nextTick)
|
||||
|
||||
assertActiveElement(document.body)
|
||||
|
||||
await press(Keys.Tab)
|
||||
|
||||
assertTabs({ active: 1 })
|
||||
assertActiveElement(getByText('Tab 2'))
|
||||
|
||||
await click(getByText('Tab 3'))
|
||||
|
||||
assertTabs({ active: 2 })
|
||||
assertActiveElement(getByText('Tab 3'))
|
||||
|
||||
// Change default index
|
||||
await click(getByText('change'))
|
||||
|
||||
// Nothing should change...
|
||||
assertTabs({ active: 2 })
|
||||
})
|
||||
})
|
||||
})
|
||||
|
||||
describe('`selectedIndex`', () => {
|
||||
it('should be possible to change active tab controlled and uncontrolled', async () => {
|
||||
let handleChange = jest.fn()
|
||||
|
||||
renderTemplate({
|
||||
template: html`
|
||||
<TabGroup @change="handleChange" :selectedIndex="selectedIndex">
|
||||
<TabList>
|
||||
<Tab>Tab 1</Tab>
|
||||
<Tab>Tab 2</Tab>
|
||||
<Tab>Tab 3</Tab>
|
||||
</TabList>
|
||||
|
||||
<TabPanels>
|
||||
<TabPanel>Content 1</TabPanel>
|
||||
<TabPanel>Content 2</TabPanel>
|
||||
<TabPanel>Content 3</TabPanel>
|
||||
</TabPanels>
|
||||
</TabGroup>
|
||||
<button>after</button>
|
||||
<button @click="next">setSelectedIndex</button>
|
||||
`,
|
||||
setup() {
|
||||
let selectedIndex = ref(0)
|
||||
|
||||
return {
|
||||
selectedIndex,
|
||||
handleChange(value: number) {
|
||||
selectedIndex.value = value
|
||||
handleChange(value)
|
||||
},
|
||||
next() {
|
||||
selectedIndex.value += 1
|
||||
},
|
||||
}
|
||||
},
|
||||
})
|
||||
|
||||
await new Promise<void>(nextTick)
|
||||
|
||||
assertActiveElement(document.body)
|
||||
|
||||
// test uncontrolled behaviour
|
||||
await click(getByText('Tab 2'))
|
||||
expect(handleChange).toHaveBeenCalledTimes(1)
|
||||
expect(handleChange).toHaveBeenNthCalledWith(1, 1)
|
||||
assertTabs({ active: 1 })
|
||||
|
||||
// test controlled behaviour
|
||||
await click(getByText('setSelectedIndex'))
|
||||
assertTabs({ active: 2 })
|
||||
})
|
||||
|
||||
it('should jump to the nearest tab when the selectedIndex is out of bounds (-2)', async () => {
|
||||
renderTemplate(
|
||||
html`
|
||||
<TabGroup :selectedIndex="-2">
|
||||
<TabList>
|
||||
<Tab>Tab 1</Tab>
|
||||
<Tab>Tab 2</Tab>
|
||||
<Tab>Tab 3</Tab>
|
||||
</TabList>
|
||||
|
||||
<TabPanels>
|
||||
<TabPanel>Content 1</TabPanel>
|
||||
<TabPanel>Content 2</TabPanel>
|
||||
<TabPanel>Content 3</TabPanel>
|
||||
</TabPanels>
|
||||
</TabGroup>
|
||||
|
||||
<button>after</button>
|
||||
`
|
||||
)
|
||||
|
||||
await new Promise<void>(nextTick)
|
||||
|
||||
assertActiveElement(document.body)
|
||||
|
||||
await press(Keys.Tab)
|
||||
|
||||
assertTabs({ active: 0 })
|
||||
assertActiveElement(getByText('Tab 1'))
|
||||
})
|
||||
|
||||
it('should jump to the nearest tab when the selectedIndex is out of bounds (+5)', async () => {
|
||||
renderTemplate(
|
||||
html`
|
||||
<TabGroup :selectedIndex="5">
|
||||
<TabList>
|
||||
<Tab>Tab 1</Tab>
|
||||
<Tab>Tab 2</Tab>
|
||||
<Tab>Tab 3</Tab>
|
||||
</TabList>
|
||||
|
||||
<TabPanels>
|
||||
<TabPanel>Content 1</TabPanel>
|
||||
<TabPanel>Content 2</TabPanel>
|
||||
<TabPanel>Content 3</TabPanel>
|
||||
</TabPanels>
|
||||
</TabGroup>
|
||||
|
||||
<button>after</button>
|
||||
`
|
||||
)
|
||||
|
||||
await new Promise<void>(nextTick)
|
||||
|
||||
assertActiveElement(document.body)
|
||||
|
||||
await press(Keys.Tab)
|
||||
|
||||
assertTabs({ active: 2 })
|
||||
assertActiveElement(getByText('Tab 3'))
|
||||
})
|
||||
|
||||
it('should jump to the next available tab when the selectedIndex is a disabled tab', async () => {
|
||||
renderTemplate(
|
||||
html`
|
||||
<TabGroup :selectedIndex="0">
|
||||
<TabList>
|
||||
<Tab disabled>Tab 1</Tab>
|
||||
<Tab>Tab 2</Tab>
|
||||
<Tab>Tab 3</Tab>
|
||||
</TabList>
|
||||
|
||||
<TabPanels>
|
||||
<TabPanel>Content 1</TabPanel>
|
||||
<TabPanel>Content 2</TabPanel>
|
||||
<TabPanel>Content 3</TabPanel>
|
||||
</TabPanels>
|
||||
</TabGroup>
|
||||
|
||||
<button>after</button>
|
||||
`
|
||||
)
|
||||
|
||||
await new Promise<void>(nextTick)
|
||||
|
||||
assertActiveElement(document.body)
|
||||
|
||||
await press(Keys.Tab)
|
||||
|
||||
assertTabs({ active: 1 })
|
||||
assertActiveElement(getByText('Tab 2'))
|
||||
})
|
||||
|
||||
it('should jump to the next available tab when the selectedIndex is a disabled tab and wrap around', async () => {
|
||||
renderTemplate(
|
||||
html`
|
||||
<TabGroup :selectedIndex="2">
|
||||
<TabList>
|
||||
<Tab>Tab 1</Tab>
|
||||
<Tab>Tab 2</Tab>
|
||||
<Tab disabled>Tab 3</Tab>
|
||||
</TabList>
|
||||
|
||||
<TabPanels>
|
||||
<TabPanel>Content 1</TabPanel>
|
||||
<TabPanel>Content 2</TabPanel>
|
||||
<TabPanel>Content 3</TabPanel>
|
||||
</TabPanels>
|
||||
</TabGroup>
|
||||
|
||||
<button>after</button>
|
||||
`
|
||||
)
|
||||
|
||||
await new Promise<void>(nextTick)
|
||||
|
||||
assertActiveElement(document.body)
|
||||
|
||||
await press(Keys.Tab)
|
||||
|
||||
assertTabs({ active: 0 })
|
||||
assertActiveElement(getByText('Tab 1'))
|
||||
})
|
||||
|
||||
it('should prefer selectedIndex over defaultIndex', async () => {
|
||||
renderTemplate(
|
||||
html`
|
||||
<TabGroup :selectedIndex="0" :defaultIndex="2">
|
||||
<TabList>
|
||||
<Tab>Tab 1</Tab>
|
||||
<Tab>Tab 2</Tab>
|
||||
<Tab>Tab 3</Tab>
|
||||
</TabList>
|
||||
|
||||
<TabPanels>
|
||||
<TabPanel>Content 1</TabPanel>
|
||||
<TabPanel>Content 2</TabPanel>
|
||||
<TabPanel>Content 3</TabPanel>
|
||||
</TabPanels>
|
||||
</TabGroup>
|
||||
|
||||
<button>after</button>
|
||||
`
|
||||
)
|
||||
|
||||
await new Promise<void>(nextTick)
|
||||
|
||||
assertActiveElement(document.body)
|
||||
|
||||
await press(Keys.Tab)
|
||||
|
||||
assertTabs({ active: 0 })
|
||||
assertActiveElement(getByText('Tab 1'))
|
||||
})
|
||||
})
|
||||
|
||||
@@ -1880,7 +2181,7 @@ describe('Mouse interactions', () => {
|
||||
})
|
||||
})
|
||||
|
||||
it('should trigger the `onChange` when the tab changes', async () => {
|
||||
it('should trigger the `change` when the tab changes', async () => {
|
||||
let changes = jest.fn()
|
||||
|
||||
renderTemplate({
|
||||
|
||||
@@ -8,6 +8,7 @@ import {
|
||||
computed,
|
||||
InjectionKey,
|
||||
Ref,
|
||||
watchEffect,
|
||||
} from 'vue'
|
||||
|
||||
import { Features, render, omit } from '../../utils/render'
|
||||
@@ -58,6 +59,7 @@ export let TabGroup = defineComponent({
|
||||
},
|
||||
props: {
|
||||
as: { type: [Object, String], default: 'template' },
|
||||
selectedIndex: { type: [Number], default: null },
|
||||
defaultIndex: { type: [Number], default: 0 },
|
||||
vertical: { type: [Boolean], default: false },
|
||||
manual: { type: [Boolean], default: false },
|
||||
@@ -83,40 +85,42 @@ export let TabGroup = defineComponent({
|
||||
},
|
||||
unregisterTab(tab: typeof tabs['value'][number]) {
|
||||
let idx = tabs.value.indexOf(tab)
|
||||
if (idx !== -1) tabs.value.slice(idx, 1)
|
||||
if (idx !== -1) tabs.value.splice(idx, 1)
|
||||
},
|
||||
registerPanel(panel: typeof panels['value'][number]) {
|
||||
if (!panels.value.includes(panel)) panels.value.push(panel)
|
||||
},
|
||||
unregisterPanel(panel: typeof panels['value'][number]) {
|
||||
let idx = panels.value.indexOf(panel)
|
||||
if (idx !== -1) panels.value.slice(idx, 1)
|
||||
if (idx !== -1) panels.value.splice(idx, 1)
|
||||
},
|
||||
}
|
||||
|
||||
provide(TabsContext, api)
|
||||
|
||||
onMounted(() => {
|
||||
if (api.tabs.value.length <= 0) return console.log('bail')
|
||||
if (selectedIndex.value !== null) return console.log('bail 2')
|
||||
watchEffect(() => {
|
||||
if (api.tabs.value.length <= 0) return
|
||||
if (props.selectedIndex === null && selectedIndex.value !== null) return
|
||||
|
||||
let tabs = api.tabs.value.map(tab => dom(tab)).filter(Boolean) as HTMLElement[]
|
||||
let focusableTabs = tabs.filter(tab => !tab.hasAttribute('disabled'))
|
||||
|
||||
let indexToSet = props.selectedIndex ?? props.defaultIndex
|
||||
|
||||
// Underflow
|
||||
if (props.defaultIndex < 0) {
|
||||
if (indexToSet < 0) {
|
||||
selectedIndex.value = tabs.indexOf(focusableTabs[0])
|
||||
}
|
||||
|
||||
// Overflow
|
||||
else if (props.defaultIndex > api.tabs.value.length) {
|
||||
else if (indexToSet > api.tabs.value.length) {
|
||||
selectedIndex.value = tabs.indexOf(focusableTabs[focusableTabs.length - 1])
|
||||
}
|
||||
|
||||
// Middle
|
||||
else {
|
||||
let before = tabs.slice(0, props.defaultIndex)
|
||||
let after = tabs.slice(props.defaultIndex)
|
||||
let before = tabs.slice(0, indexToSet)
|
||||
let after = tabs.slice(indexToSet)
|
||||
|
||||
let next = [...after, ...before].find(tab => focusableTabs.includes(tab))
|
||||
if (!next) return
|
||||
@@ -129,7 +133,7 @@ export let TabGroup = defineComponent({
|
||||
let slot = { selectedIndex: selectedIndex.value }
|
||||
|
||||
return render({
|
||||
props: omit(props, ['defaultIndex', 'manual', 'vertical']),
|
||||
props: omit(props, ['selectedIndex', 'defaultIndex', 'manual', 'vertical', 'onChange']),
|
||||
slot,
|
||||
slots,
|
||||
attrs,
|
||||
@@ -195,10 +199,6 @@ export let Tab = defineComponent({
|
||||
disabled: this.$props.disabled ? true : undefined,
|
||||
}
|
||||
|
||||
if (process.env.NODE_ENV === 'test') {
|
||||
Object.assign(propsWeControl, { ['data-headlessui-index']: this.myIndex })
|
||||
}
|
||||
|
||||
return render({
|
||||
props: { ...this.$props, ...propsWeControl },
|
||||
slot,
|
||||
@@ -330,10 +330,6 @@ export let TabPanel = defineComponent({
|
||||
tabIndex: this.selected ? 0 : -1,
|
||||
}
|
||||
|
||||
if (process.env.NODE_ENV === 'test') {
|
||||
Object.assign(propsWeControl, { ['data-headlessui-index']: this.myIndex })
|
||||
}
|
||||
|
||||
return render({
|
||||
props: { ...this.$props, ...propsWeControl },
|
||||
slot,
|
||||
|
||||
@@ -1224,8 +1224,8 @@ export function assertTabs(
|
||||
expect(list).toHaveAttribute('role', 'tablist')
|
||||
expect(list).toHaveAttribute('aria-orientation', orientation)
|
||||
|
||||
let activeTab = tabs.find(tab => tab.dataset.headlessuiIndex === '' + active)
|
||||
let activePanel = panels.find(panel => panel.dataset.headlessuiIndex === '' + active)
|
||||
let activeTab = Array.from(list.querySelectorAll('[id^="headlessui-tabs-tab-"]'))[active]
|
||||
let activePanel = panels.find(panel => panel.id === activeTab.getAttribute('aria-controls'))
|
||||
|
||||
for (let tab of tabs) {
|
||||
expect(tab).toHaveAttribute('id')
|
||||
|
||||
@@ -96,7 +96,15 @@ export function focusElement(element: HTMLElement | null) {
|
||||
}
|
||||
|
||||
export function focusIn(container: HTMLElement | HTMLElement[], focus: Focus) {
|
||||
let elements = Array.isArray(container) ? container : getFocusableElements(container)
|
||||
let elements = Array.isArray(container)
|
||||
? container.slice().sort((a, b) => {
|
||||
let position = a.compareDocumentPosition(b)
|
||||
|
||||
if (position & Node.DOCUMENT_POSITION_FOLLOWING) return -1
|
||||
if (position & Node.DOCUMENT_POSITION_PRECEDING) return 1
|
||||
return 0
|
||||
})
|
||||
: getFocusableElements(container)
|
||||
let active = document.activeElement as HTMLElement
|
||||
|
||||
let direction = (() => {
|
||||
|
||||
Reference in New Issue
Block a user