Merge pull request #5672 from matuzalemsteles/LPS-194107

fix(@clayui/autocomplete): fix error when navigating via keyboard with the mouse over the item
liferay · Sep 15, 2023 · b64ac0a · b64ac0a
2 parents 40b4301 + f3927d5
commit b64ac0a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/jest.config.js b/jest.config.js
@@ -14,7 +14,7 @@ module.exports = {
 			statements: 100,
 		},
 		'./packages/clay-autocomplete/src/': {
-			branches: 68,
+			branches: 67,
 			functions: 82,
 			lines: 85,
 			statements: 85,

diff --git a/packages/clay-autocomplete/src/Item.tsx b/packages/clay-autocomplete/src/Item.tsx
@@ -63,13 +63,16 @@ const NewItem = React.forwardRef<HTMLLIElement, IProps>(function NewItem(
 	const {activeDescendant, onActiveDescendant} = useAutocompleteState();
 	const {isFocusVisible} = useInteractionFocus();
 
+	const isFocus = isFocusVisible();
+
 	const hoverProps = useHover({
 		disabled,
-		onHover: useCallback(() => onActiveDescendant(keyValue!), [keyValue]),
+		onHover: useCallback(
+			() => !isFocus && onActiveDescendant(keyValue!),
+			[keyValue, isFocus]
+		),
 	});
 
-	const isFocus = isFocusVisible();
-
 	const currentValue = textValue ?? value ?? String(children);
 	const fuzzyMatch = fuzzy.match(match, currentValue, optionsFuzzy);