diff --git a/packages/@headlessui-react/src/components/combobox/combobox.tsx b/packages/@headlessui-react/src/components/combobox/combobox.tsx index 2fadc64..294319b 100644 --- a/packages/@headlessui-react/src/components/combobox/combobox.tsx +++ b/packages/@headlessui-react/src/components/combobox/combobox.tsx @@ -34,7 +34,7 @@ import { forwardRefWithAs, render, compact, PropsForFeatures, Features } from '. import { isDisabledReactIssue7711 } from '../../utils/bugs' import { match } from '../../utils/match' import { objectToFormEntries } from '../../utils/form' -import { FocusableMode, isFocusableElement, sortByDomNode } from '../../utils/focus-management' +import { sortByDomNode } from '../../utils/focus-management' import { Hidden, Features as HiddenFeatures } from '../../internal/hidden' import { useOpenClosed, State, OpenClosedProvider } from '../../internal/open-closed' diff --git a/packages/@headlessui-vue/src/components/combobox/combobox.test.ts b/packages/@headlessui-vue/src/components/combobox/combobox.test.ts index e2da3e3..a21a230 100644 --- a/packages/@headlessui-vue/src/components/combobox/combobox.test.ts +++ b/packages/@headlessui-vue/src/components/combobox/combobox.test.ts @@ -1,14 +1,4 @@ -import { - DefineComponent, - defineComponent, - nextTick, - ref, - watch, - h, - reactive, - computed, - PropType, -} from 'vue' +import { defineComponent, nextTick, ref, watch, h, reactive, computed, PropType } from 'vue' import { createRenderTemplate, render } from '../../test-utils/vue-testing-library' import { Combobox, diff --git a/packages/@headlessui-vue/src/components/disclosure/disclosure.test.ts b/packages/@headlessui-vue/src/components/disclosure/disclosure.test.ts index b2420fa..39ce075 100644 --- a/packages/@headlessui-vue/src/components/disclosure/disclosure.test.ts +++ b/packages/@headlessui-vue/src/components/disclosure/disclosure.test.ts @@ -1,4 +1,4 @@ -import { defineComponent, nextTick, ref, watch, h, ComponentOptionsWithoutProps } from 'vue' +import { defineComponent, nextTick, ref, watch, h } from 'vue' import { createRenderTemplate, render } from '../../test-utils/vue-testing-library' import { Disclosure, DisclosureButton, DisclosurePanel } from './disclosure' import { suppressConsoleLogs } from '../../test-utils/suppress-console-logs' diff --git a/packages/@headlessui-vue/src/components/focus-trap/focus-trap.test.ts b/packages/@headlessui-vue/src/components/focus-trap/focus-trap.test.ts index 8f67694..fe3e4ba 100644 --- a/packages/@headlessui-vue/src/components/focus-trap/focus-trap.test.ts +++ b/packages/@headlessui-vue/src/components/focus-trap/focus-trap.test.ts @@ -1,9 +1,9 @@ -import { defineComponent, ref, nextTick, onMounted, ComponentOptionsWithoutProps } from 'vue' +import { ref, nextTick, onMounted } from 'vue' import { FocusTrap } from './focus-trap' import { assertActiveElement, getByText } from '../../test-utils/accessibility-assertions' import { suppressConsoleLogs } from '../../test-utils/suppress-console-logs' -import { createRenderTemplate, render } from '../../test-utils/vue-testing-library' +import { createRenderTemplate } from '../../test-utils/vue-testing-library' import { click, press, shift, Keys } from '../../test-utils/interactions' import { html } from '../../test-utils/html' diff --git a/packages/@headlessui-vue/src/components/listbox/listbox.test.tsx b/packages/@headlessui-vue/src/components/listbox/listbox.test.tsx index 4877b8a..628ea28 100644 --- a/packages/@headlessui-vue/src/components/listbox/listbox.test.tsx +++ b/packages/@headlessui-vue/src/components/listbox/listbox.test.tsx @@ -1,12 +1,4 @@ -import { - defineComponent, - nextTick, - ref, - watch, - h, - reactive, - ComponentOptionsWithoutProps, -} from 'vue' +import { defineComponent, nextTick, ref, watch, h, reactive } from 'vue' import { createRenderTemplate, render } from '../../test-utils/vue-testing-library' import { Listbox, ListboxLabel, ListboxButton, ListboxOptions, ListboxOption } from './listbox' import { suppressConsoleLogs } from '../../test-utils/suppress-console-logs' diff --git a/packages/@headlessui-vue/src/components/menu/menu.test.tsx b/packages/@headlessui-vue/src/components/menu/menu.test.tsx index a263b73..4ef874c 100644 --- a/packages/@headlessui-vue/src/components/menu/menu.test.tsx +++ b/packages/@headlessui-vue/src/components/menu/menu.test.tsx @@ -1,12 +1,4 @@ -import { - ComponentOptionsWithoutProps, - defineComponent, - h, - nextTick, - reactive, - ref, - watch, -} from 'vue' +import { defineComponent, h, nextTick, reactive, ref, watch } from 'vue' import { createRenderTemplate, render } from '../../test-utils/vue-testing-library' import { Menu, MenuButton, MenuItems, MenuItem } from './menu' import { TransitionChild } from '../transitions/transition' diff --git a/packages/@headlessui-vue/src/components/popover/popover.test.ts b/packages/@headlessui-vue/src/components/popover/popover.test.ts index 54a730f..0f3a7a7 100644 --- a/packages/@headlessui-vue/src/components/popover/popover.test.ts +++ b/packages/@headlessui-vue/src/components/popover/popover.test.ts @@ -1,4 +1,4 @@ -import { defineComponent, nextTick, ref, watch, h, ComponentOptionsWithoutProps } from 'vue' +import { defineComponent, nextTick, ref, watch, h } from 'vue' import { createRenderTemplate, render } from '../../test-utils/vue-testing-library' import { Popover, PopoverGroup, PopoverButton, PopoverPanel, PopoverOverlay } from './popover' diff --git a/packages/@headlessui-vue/src/components/portal/portal.test.ts b/packages/@headlessui-vue/src/components/portal/portal.test.ts index 0425e45..620cf38 100644 --- a/packages/@headlessui-vue/src/components/portal/portal.test.ts +++ b/packages/@headlessui-vue/src/components/portal/portal.test.ts @@ -1,6 +1,6 @@ import { h, defineComponent, ref, nextTick, ComponentOptionsWithoutProps, createSSRApp } from 'vue' -import { createRenderTemplate, render } from '../../test-utils/vue-testing-library' +import { createRenderTemplate } from '../../test-utils/vue-testing-library' import { renderToString } from 'vue/server-renderer' import { Portal, PortalGroup } from './portal' import { click } from '../../test-utils/interactions' diff --git a/packages/@headlessui-vue/src/components/radio-group/radio-group.test.ts b/packages/@headlessui-vue/src/components/radio-group/radio-group.test.ts index 148c872..2b5ca7d 100644 --- a/packages/@headlessui-vue/src/components/radio-group/radio-group.test.ts +++ b/packages/@headlessui-vue/src/components/radio-group/radio-group.test.ts @@ -1,4 +1,4 @@ -import { defineComponent, nextTick, ref, watch, reactive, ComponentOptionsWithoutProps } from 'vue' +import { nextTick, ref, watch, reactive } from 'vue' import { createRenderTemplate, render } from '../../test-utils/vue-testing-library' import { RadioGroup, RadioGroupOption, RadioGroupLabel, RadioGroupDescription } from './radio-group' diff --git a/packages/@headlessui-vue/src/components/radio-group/radio-group.ts b/packages/@headlessui-vue/src/components/radio-group/radio-group.ts index 8b4204c..d80917e 100644 --- a/packages/@headlessui-vue/src/components/radio-group/radio-group.ts +++ b/packages/@headlessui-vue/src/components/radio-group/radio-group.ts @@ -90,7 +90,8 @@ export let RadioGroup = defineComponent({ let value = computed(() => props.modelValue) - let api = { + // TODO: Fix type + let api: any = { options, value, disabled: computed(() => props.disabled), @@ -133,7 +134,6 @@ export let RadioGroup = defineComponent({ }, } - // @ts-expect-error ... provide(RadioGroupContext, api) useTreeWalker({ diff --git a/packages/@headlessui-vue/src/components/switch/switch.test.tsx b/packages/@headlessui-vue/src/components/switch/switch.test.tsx index bf65a3e..7cb9049 100644 --- a/packages/@headlessui-vue/src/components/switch/switch.test.tsx +++ b/packages/@headlessui-vue/src/components/switch/switch.test.tsx @@ -1,5 +1,5 @@ -import { defineComponent, ref, watch, h, ComponentOptionsWithoutProps } from 'vue' -import { createRenderTemplate, render } from '../../test-utils/vue-testing-library' +import { defineComponent, ref, watch, h } from 'vue' +import { createRenderTemplate } from '../../test-utils/vue-testing-library' import { Switch, SwitchLabel, SwitchDescription, SwitchGroup } from './switch' import { diff --git a/packages/@headlessui-vue/src/components/tabs/tabs.test.ts b/packages/@headlessui-vue/src/components/tabs/tabs.test.ts index 7570904..b9cef77 100644 --- a/packages/@headlessui-vue/src/components/tabs/tabs.test.ts +++ b/packages/@headlessui-vue/src/components/tabs/tabs.test.ts @@ -1,4 +1,4 @@ -import { ComponentOptionsWithoutProps, defineComponent, nextTick, ref } from 'vue' +import { nextTick, ref } from 'vue' import { createRenderTemplate, render } from '../../test-utils/vue-testing-library' import { TabGroup, TabList, Tab, TabPanels, TabPanel } from './tabs' import { suppressConsoleLogs } from '../../test-utils/suppress-console-logs' diff --git a/packages/@headlessui-vue/src/components/transitions/transition.test.ts b/packages/@headlessui-vue/src/components/transitions/transition.test.ts index 01eae6f..e07a58f 100644 --- a/packages/@headlessui-vue/src/components/transitions/transition.test.ts +++ b/packages/@headlessui-vue/src/components/transitions/transition.test.ts @@ -1,5 +1,5 @@ -import { defineComponent, ref, onMounted, ComponentOptionsWithoutProps } from 'vue' -import { render, fireEvent, createRenderTemplate } from '../../test-utils/vue-testing-library' +import { defineComponent, ref, onMounted } from 'vue' +import { fireEvent, createRenderTemplate } from '../../test-utils/vue-testing-library' import { suppressConsoleLogs } from '../../test-utils/suppress-console-logs' import { TransitionRoot, TransitionChild } from './transition' diff --git a/packages/@headlessui-vue/src/components/transitions/transition.ts b/packages/@headlessui-vue/src/components/transitions/transition.ts index 3171885..b2f1c06 100644 --- a/packages/@headlessui-vue/src/components/transitions/transition.ts +++ b/packages/@headlessui-vue/src/components/transitions/transition.ts @@ -416,7 +416,15 @@ export let TransitionRoot = defineComponent({ provide(TransitionContext, transitionBag) return () => { - let incomingProps = omit(props, ['show', 'appear', 'unmount']) + let incomingProps = omit(props, [ + 'show', + 'appear', + 'unmount', + 'onBeforeEnter', + 'onBeforeLeave', + 'onAfterEnter', + 'onAfterLeave', + ]) let sharedProps = { unmount: props.unmount } return render({ diff --git a/packages/@headlessui-vue/src/utils/render.test.ts b/packages/@headlessui-vue/src/utils/render.test.ts index 4740831..55dfb93 100644 --- a/packages/@headlessui-vue/src/utils/render.test.ts +++ b/packages/@headlessui-vue/src/utils/render.test.ts @@ -1,5 +1,5 @@ -import { defineComponent, ComponentOptionsWithoutProps } from 'vue' -import { createRenderTemplate, render as testRender } from '../test-utils/vue-testing-library' +import { defineComponent } from 'vue' +import { createRenderTemplate } from '../test-utils/vue-testing-library' import { render } from './render' import { html } from '../test-utils/html'