diff --git a/.changeset/lucky-chefs-remain.md b/.changeset/lucky-chefs-remain.md new file mode 100644 index 000000000..a090f34f2 --- /dev/null +++ b/.changeset/lucky-chefs-remain.md @@ -0,0 +1,5 @@ +--- +"@nextui-org/autocomplete": patch +--- + +Autocomplete Reference aims to input instead of aiming to the wrapper element diff --git a/.changeset/silent-lemons-mate.md b/.changeset/silent-lemons-mate.md new file mode 100644 index 000000000..78af5bad6 --- /dev/null +++ b/.changeset/silent-lemons-mate.md @@ -0,0 +1,5 @@ +--- +"@nextui-org/tabs": patch +--- + +Fix #1938 selectedKey duplicated declaration diff --git a/packages/components/autocomplete/src/use-autocomplete.ts b/packages/components/autocomplete/src/use-autocomplete.ts index e90f7ae23..1928c37d6 100644 --- a/packages/components/autocomplete/src/use-autocomplete.ts +++ b/packages/components/autocomplete/src/use-autocomplete.ts @@ -177,10 +177,10 @@ export function useAutocomplete(originalProps: UseAutocomplete // Setup refs and get props for child elements. const buttonRef = useRef(null); - const inputRef = useRef(null); const inputWrapperRef = useRef(null); const listBoxRef = useRef(null); const popoverRef = useRef(null); + const inputRef = useDOMRef(ref); const scrollShadowRef = useDOMRef(scrollRefProp); const slotsProps: { @@ -293,8 +293,6 @@ export function useAutocomplete(originalProps: UseAutocomplete const Component = as || "div"; - const domRef = useDOMRef(ref); - const slots = useMemo( () => autocomplete({ @@ -320,7 +318,6 @@ export function useAutocomplete(originalProps: UseAutocomplete ); const getBaseProps: PropGetter = () => ({ - ref: domRef, "data-invalid": dataAttr(originalProps?.isInvalid), "data-open": dataAttr(state.isOpen), className: slots.base({class: baseStyles}), @@ -419,7 +416,7 @@ export function useAutocomplete(originalProps: UseAutocomplete return { Component, - domRef, + inputRef, label, state, slots, diff --git a/packages/components/tabs/src/use-tabs.ts b/packages/components/tabs/src/use-tabs.ts index 20bb37ced..558d8a22d 100644 --- a/packages/components/tabs/src/use-tabs.ts +++ b/packages/components/tabs/src/use-tabs.ts @@ -51,7 +51,7 @@ export interface Props extends Omit { export type UseTabsProps = Props & TabsVariantProps & - Omit, "children"> & + Omit, "children" | keyof AriaTabListProps> & Omit, "children" | "orientation"> & CollectionProps;