Merge e80e933 into f895555

navikt · Dec 18, 2024 · a466199 · a466199
2 parents f895555 + e80e933
commit a466199
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/.changeset/forty-rules-ring.md b/.changeset/forty-rules-ring.md
@@ -0,0 +1,5 @@
+---
+"@navikt/ds-react": patch
+---
+
+Combobox: Only open dropdown-list onClick, not onFocus.
diff --git a/@navikt/core/react/src/form/combobox/ComboboxWrapper.tsx b/@navikt/core/react/src/form/combobox/ComboboxWrapper.tsx
@@ -32,7 +32,6 @@ const ComboboxWrapper = ({
       !wrapperRef.current?.contains(event.relatedTarget) &&
       toggleOpenButtonRef?.current !== event.target
     ) {
-      toggleIsListOpen(true);
       setHasFocusWithin(true);
     }
   }

diff --git a/@navikt/core/react/src/form/combobox/Input/InputController.tsx b/@navikt/core/react/src/form/combobox/Input/InputController.tsx
@@ -33,6 +33,7 @@ export const InputController = forwardRef<
     toggleListButton = true,
     inputClassName,
     shouldShowSelectedOptions = true,
+
     ...rest
   } = props;
 
@@ -45,7 +46,7 @@ export const InputController = forwardRef<
     readOnly,
   } = useInputContext();
 
-  const { activeDecendantId } = useFilteredOptionsContext();
+  const { activeDecendantId, toggleIsListOpen } = useFilteredOptionsContext();
   const { selectedOptions } = useSelectedOptionsContext();
 
   const mergedInputRef = useMergeRefs(inputRef, ref);
@@ -57,7 +58,14 @@ export const InputController = forwardRef<
         "navds-combobox__wrapper-inner--virtually-unfocused":
           activeDecendantId !== undefined,
       })}
-      onClick={focusInput}
+      onClick={() => {
+        if (inputProps.disabled || readOnly) {
+          return;
+        }
+
+        toggleIsListOpen(true);
+        focusInput();
+      }}
     >
       {!shouldShowSelectedOptions ? (
         <Input