From be829317aebd27f7d3d8ed50c0dfe4ce5b59a9d6 Mon Sep 17 00:00:00 2001
From: Vegard Haugstvedt <it.vegard@gmail.com>
Date: Wed, 3 Apr 2024 15:24:36 +0200
Subject: [PATCH 01/16] Prevent "Enter" key in Combobox to...

---
 @navikt/core/react/src/form/combobox/Input/Input.tsx | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/@navikt/core/react/src/form/combobox/Input/Input.tsx b/@navikt/core/react/src/form/combobox/Input/Input.tsx
index b85dcd6754..2050eaffde 100644
--- a/@navikt/core/react/src/form/combobox/Input/Input.tsx
+++ b/@navikt/core/react/src/form/combobox/Input/Input.tsx
@@ -128,6 +128,8 @@ const Input = forwardRef<HTMLInputElement, InputProps>(
               removeSelectedOption(lastSelectedOption);
             }
           }
+        } else if (e.key === "Enter" || e.key === "Accept") {
+          e.preventDefault();
         } else if (e.key === "ArrowDown") {
           // Check that cursor position is at the end of the input field,
           // so we don't interfere with text editing

From a28f0c9340807a850947729b5e21b37bc8ad9c3b Mon Sep 17 00:00:00 2001
From: Vegard Haugstvedt <it.vegard@gmail.com>
Date: Wed, 17 Apr 2024 09:20:49 +0200
Subject: [PATCH 02/16] Added test for Enter not submitting form

---
 .../src/form/combobox/combobox.stories.tsx    | 43 +++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/@navikt/core/react/src/form/combobox/combobox.stories.tsx b/@navikt/core/react/src/form/combobox/combobox.stories.tsx
index 3e74897466..1b6845f42d 100644
--- a/@navikt/core/react/src/form/combobox/combobox.stories.tsx
+++ b/@navikt/core/react/src/form/combobox/combobox.stories.tsx
@@ -624,3 +624,46 @@ export const TestHoverAndFocusSwitching: StoryObject = {
     );
   },
 };
+
+export const TestEnterNotSubmittingForm: StoryObj<{
+  onSubmit: ReturnType<typeof fn>;
+}> = {
+  args: {
+    onSubmit: fn(),
+  },
+  render: ({ onSubmit }) => {
+    return (
+      <form action="https://www.nav.no" method="get" onSubmit={onSubmit}>
+        <UNSAFE_Combobox
+          options={options}
+          label="Hva er dine favorittfrukter?"
+        />
+      </form>
+    );
+  },
+  play: async ({ canvasElement, args }) => {
+    args.onSubmit.mockClear();
+    const canvas = within(canvasElement);
+
+    await sleep(500);
+
+    const getInput = () =>
+      canvas.getByRole("combobox", {
+        name: "Hva er dine favorittfrukter?",
+      });
+
+    userEvent.click(getInput());
+    await sleep(250);
+
+    userEvent.keyboard("{ArrowDown}");
+    await sleep(250);
+    const bananaOption = canvas.getByRole("option", { name: "banana" });
+    expect(getInput().getAttribute("aria-activedescendant")).toBe(
+      bananaOption.getAttribute("id"),
+    );
+
+    userEvent.keyboard("{Enter}");
+    await sleep(250);
+    expect(args.onSubmit).not.toHaveBeenCalled();
+  },
+};

From c6de1dd4043bf1b44389e57a835990502019764d Mon Sep 17 00:00:00 2001
From: Vegard Haugstvedt <it.vegard@gmail.com>
Date: Wed, 17 Apr 2024 09:25:08 +0200
Subject: [PATCH 03/16] Added changeset

---
 .changeset/rotten-windows-cover.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/rotten-windows-cover.md

diff --git a/.changeset/rotten-windows-cover.md b/.changeset/rotten-windows-cover.md
new file mode 100644
index 0000000000..9b4b6d7d97
--- /dev/null
+++ b/.changeset/rotten-windows-cover.md
@@ -0,0 +1,5 @@
+---
+"@navikt/ds-react": patch
+---
+
+Preventing "enter" while Combobox is focused from submitting form

From d6c11baed7915fb5491e2c1f2eaa1e51ccf0bf41 Mon Sep 17 00:00:00 2001
From: Vegard Haugstvedt <it.vegard@gmail.com>
Date: Wed, 17 Apr 2024 09:53:28 +0200
Subject: [PATCH 04/16] Add test for un-selecting a selected option using
 "enter" on a Chip not submitting the form

---
 .../form/combobox/SelectedOptions/SelectedOptions.tsx  |  8 +++++++-
 .../core/react/src/form/combobox/combobox.stories.tsx  | 10 +++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/@navikt/core/react/src/form/combobox/SelectedOptions/SelectedOptions.tsx b/@navikt/core/react/src/form/combobox/SelectedOptions/SelectedOptions.tsx
index 7e3a7bcfcd..70ccba700e 100644
--- a/@navikt/core/react/src/form/combobox/SelectedOptions/SelectedOptions.tsx
+++ b/@navikt/core/react/src/form/combobox/SelectedOptions/SelectedOptions.tsx
@@ -1,5 +1,6 @@
 import React from "react";
 import { Chips } from "../../../chips";
+import { useFilteredOptionsContext } from "../FilteredOptions/filteredOptionsContext";
 import { useInputContext } from "../Input/inputContext";
 import { ComboboxOption } from "../types";
 import { useSelectedOptionsContext } from "./selectedOptionsContext";
@@ -36,8 +37,13 @@ const SelectedOptions: React.FC<SelectedOptionsProps> = ({
   size,
   children,
 }) => {
+  const { toggleIsListOpen } = useFilteredOptionsContext();
   return (
-    <Chips className="navds-combobox__selected-options" size={size}>
+    <Chips
+      className="navds-combobox__selected-options"
+      onFocus={() => toggleIsListOpen(false)}
+      size={size}
+    >
       {selectedOptions.length
         ? selectedOptions.map((option, i) => (
             <Option key={option.label + i} option={option} />
diff --git a/@navikt/core/react/src/form/combobox/combobox.stories.tsx b/@navikt/core/react/src/form/combobox/combobox.stories.tsx
index 1b6845f42d..434e02376b 100644
--- a/@navikt/core/react/src/form/combobox/combobox.stories.tsx
+++ b/@navikt/core/react/src/form/combobox/combobox.stories.tsx
@@ -633,10 +633,11 @@ export const TestEnterNotSubmittingForm: StoryObj<{
   },
   render: ({ onSubmit }) => {
     return (
-      <form action="https://www.nav.no" method="get" onSubmit={onSubmit}>
+      <form action="https://www.aksel.nav.no" method="get" onSubmit={onSubmit}>
         <UNSAFE_Combobox
           options={options}
           label="Hva er dine favorittfrukter?"
+          isMultiSelect
         />
       </form>
     );
@@ -665,5 +666,12 @@ export const TestEnterNotSubmittingForm: StoryObj<{
     userEvent.keyboard("{Enter}");
     await sleep(250);
     expect(args.onSubmit).not.toHaveBeenCalled();
+
+    userEvent.keyboard("{Shift>}{Tab}");
+    await sleep(250);
+
+    userEvent.keyboard("{Enter}");
+    await sleep(250);
+    expect(args.onSubmit).not.toHaveBeenCalled();
   },
 };

From 9db454dcd5ccc6a6cc733f216d02bb04358f22e2 Mon Sep 17 00:00:00 2001
From: Vegard Haugstvedt <it.vegard@gmail.com>
Date: Wed, 17 Apr 2024 10:02:55 +0200
Subject: [PATCH 05/16] Do not prevent enter from submitting form if it should
 not perform another action (like selecting an option)

---
 @navikt/core/react/src/form/combobox/Input/Input.tsx      | 4 +++-
 @navikt/core/react/src/form/combobox/combobox.stories.tsx | 4 ++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/@navikt/core/react/src/form/combobox/Input/Input.tsx b/@navikt/core/react/src/form/combobox/Input/Input.tsx
index 2050eaffde..d87826d90f 100644
--- a/@navikt/core/react/src/form/combobox/Input/Input.tsx
+++ b/@navikt/core/react/src/form/combobox/Input/Input.tsx
@@ -129,7 +129,9 @@ const Input = forwardRef<HTMLInputElement, InputProps>(
             }
           }
         } else if (e.key === "Enter" || e.key === "Accept") {
-          e.preventDefault();
+          if (activeDecendantId) {
+            e.preventDefault();
+          }
         } else if (e.key === "ArrowDown") {
           // Check that cursor position is at the end of the input field,
           // so we don't interfere with text editing
diff --git a/@navikt/core/react/src/form/combobox/combobox.stories.tsx b/@navikt/core/react/src/form/combobox/combobox.stories.tsx
index 434e02376b..0d282af251 100644
--- a/@navikt/core/react/src/form/combobox/combobox.stories.tsx
+++ b/@navikt/core/react/src/form/combobox/combobox.stories.tsx
@@ -673,5 +673,9 @@ export const TestEnterNotSubmittingForm: StoryObj<{
     userEvent.keyboard("{Enter}");
     await sleep(250);
     expect(args.onSubmit).not.toHaveBeenCalled();
+
+    userEvent.keyboard("{Enter}"); // Enter on empty Input with closed list
+    await sleep(250);
+    expect(args.onSubmit).toHaveBeenCalledOnce();
   },
 };

From 98fbd97228e5dc2274a8643286ab93ddea8ddda3 Mon Sep 17 00:00:00 2001
From: Vegard Haugstvedt <it.vegard@gmail.com>
Date: Wed, 17 Apr 2024 10:13:09 +0200
Subject: [PATCH 06/16] Do not submit when the input field has a value

---
 @navikt/core/react/src/form/combobox/Input/Input.tsx      | 2 +-
 @navikt/core/react/src/form/combobox/combobox.stories.tsx | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/@navikt/core/react/src/form/combobox/Input/Input.tsx b/@navikt/core/react/src/form/combobox/Input/Input.tsx
index d87826d90f..6fd8e8ef86 100644
--- a/@navikt/core/react/src/form/combobox/Input/Input.tsx
+++ b/@navikt/core/react/src/form/combobox/Input/Input.tsx
@@ -129,7 +129,7 @@ const Input = forwardRef<HTMLInputElement, InputProps>(
             }
           }
         } else if (e.key === "Enter" || e.key === "Accept") {
-          if (activeDecendantId) {
+          if (activeDecendantId || value) {
             e.preventDefault();
           }
         } else if (e.key === "ArrowDown") {
diff --git a/@navikt/core/react/src/form/combobox/combobox.stories.tsx b/@navikt/core/react/src/form/combobox/combobox.stories.tsx
index 0d282af251..75ca63283c 100644
--- a/@navikt/core/react/src/form/combobox/combobox.stories.tsx
+++ b/@navikt/core/react/src/form/combobox/combobox.stories.tsx
@@ -674,6 +674,12 @@ export const TestEnterNotSubmittingForm: StoryObj<{
     await sleep(250);
     expect(args.onSubmit).not.toHaveBeenCalled();
 
+    userEvent.keyboard("test"); // Type option that does not exist
+    await sleep(250);
+    userEvent.keyboard("{Enter}");
+    await sleep(250);
+    expect(args.onSubmit).not.toHaveBeenCalled();
+
     userEvent.keyboard("{Enter}"); // Enter on empty Input with closed list
     await sleep(250);
     expect(args.onSubmit).toHaveBeenCalledOnce();

From dfeade2cadf3c761e21f4cd13fbc639e33063f5a Mon Sep 17 00:00:00 2001
From: Vegard Haugstvedt <it.vegard@gmail.com>
Date: Wed, 17 Apr 2024 14:00:54 +0200
Subject: [PATCH 07/16] Replace lots of sleep-calls with awaiting userEvents

---
 .../src/form/combobox/combobox.stories.tsx    | 28 +++++++------------
 1 file changed, 10 insertions(+), 18 deletions(-)

diff --git a/@navikt/core/react/src/form/combobox/combobox.stories.tsx b/@navikt/core/react/src/form/combobox/combobox.stories.tsx
index 75ca63283c..b0e6450d68 100644
--- a/@navikt/core/react/src/form/combobox/combobox.stories.tsx
+++ b/@navikt/core/react/src/form/combobox/combobox.stories.tsx
@@ -646,42 +646,34 @@ export const TestEnterNotSubmittingForm: StoryObj<{
     args.onSubmit.mockClear();
     const canvas = within(canvasElement);
 
-    await sleep(500);
+    await sleep(250);
 
     const getInput = () =>
       canvas.getByRole("combobox", {
         name: "Hva er dine favorittfrukter?",
       });
 
-    userEvent.click(getInput());
-    await sleep(250);
-
-    userEvent.keyboard("{ArrowDown}");
-    await sleep(250);
     const bananaOption = canvas.getByRole("option", { name: "banana" });
+    await userEvent.click(getInput());
+
+    await userEvent.keyboard("{ArrowDown}");
     expect(getInput().getAttribute("aria-activedescendant")).toBe(
       bananaOption.getAttribute("id"),
     );
 
-    userEvent.keyboard("{Enter}");
-    await sleep(250);
+    await userEvent.keyboard("{Enter}");
     expect(args.onSubmit).not.toHaveBeenCalled();
 
-    userEvent.keyboard("{Shift>}{Tab}");
-    await sleep(250);
+    await userEvent.keyboard("{Shift>}{Tab}");
 
-    userEvent.keyboard("{Enter}");
-    await sleep(250);
+    await userEvent.keyboard("{Enter}");
     expect(args.onSubmit).not.toHaveBeenCalled();
 
-    userEvent.keyboard("test"); // Type option that does not exist
-    await sleep(250);
-    userEvent.keyboard("{Enter}");
-    await sleep(250);
+    await userEvent.keyboard("test"); // Type option that does not exist
+    await userEvent.keyboard("{Enter}");
     expect(args.onSubmit).not.toHaveBeenCalled();
 
-    userEvent.keyboard("{Enter}"); // Enter on empty Input with closed list
-    await sleep(250);
+    await userEvent.keyboard("{Enter}"); // Enter on empty Input with closed list
     expect(args.onSubmit).toHaveBeenCalledOnce();
   },
 };

From b0ab7b611ab63b0c491deec12db7cb260afa440b Mon Sep 17 00:00:00 2001
From: Vegard Haugstvedt <it.vegard@gmail.com>
Date: Wed, 17 Apr 2024 14:01:39 +0200
Subject: [PATCH 08/16] Create util function for looking up an option

---
 @navikt/core/react/src/form/combobox/combobox.stories.tsx | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/@navikt/core/react/src/form/combobox/combobox.stories.tsx b/@navikt/core/react/src/form/combobox/combobox.stories.tsx
index b0e6450d68..719923ec7c 100644
--- a/@navikt/core/react/src/form/combobox/combobox.stories.tsx
+++ b/@navikt/core/react/src/form/combobox/combobox.stories.tsx
@@ -653,16 +653,18 @@ export const TestEnterNotSubmittingForm: StoryObj<{
         name: "Hva er dine favorittfrukter?",
       });
 
-    const bananaOption = canvas.getByRole("option", { name: "banana" });
+    const getOption = (name: string, selected: boolean) =>
+      canvas.getByRole("option", { name, selected });
     await userEvent.click(getInput());
 
     await userEvent.keyboard("{ArrowDown}");
     expect(getInput().getAttribute("aria-activedescendant")).toBe(
-      bananaOption.getAttribute("id"),
+      getOption("banana", false).getAttribute("id"),
     );
 
     await userEvent.keyboard("{Enter}");
     expect(args.onSubmit).not.toHaveBeenCalled();
+    expect(getOption("banana", true)).toBeVisible();
 
     await userEvent.keyboard("{Shift>}{Tab}");
 

From 2c837e04ae61158b1f021b834c5d1bb71cda99bd Mon Sep 17 00:00:00 2001
From: Vegard Haugstvedt <it.vegard@gmail.com>
Date: Wed, 17 Apr 2024 14:03:36 +0200
Subject: [PATCH 09/16] Fix bug where we couldn't un-select a custom option
 using "enter"

---
 .../FilteredOptions/filteredOptionsContext.tsx       | 10 +++++++++-
 .../react/src/form/combobox/combobox.stories.tsx     | 12 ++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/@navikt/core/react/src/form/combobox/FilteredOptions/filteredOptionsContext.tsx b/@navikt/core/react/src/form/combobox/FilteredOptions/filteredOptionsContext.tsx
index d4098eb349..5d38cbafd4 100644
--- a/@navikt/core/react/src/form/combobox/FilteredOptions/filteredOptionsContext.tsx
+++ b/@navikt/core/react/src/form/combobox/FilteredOptions/filteredOptionsContext.tsx
@@ -97,9 +97,17 @@ export const FilteredOptionsProvider = ({
           [filteredOptionsUtils.getAddNewOptionId(id)]: allowNewValues
             ? toComboboxOption(value)
             : undefined,
+          ...customOptions.reduce(
+            (acc, customOption) => ({
+              ...acc,
+              [filteredOptionsUtils.getOptionId(id, customOption.label)]:
+                customOption,
+            }),
+            {},
+          ),
         },
       ),
-    [allowNewValues, id, options, value],
+    [allowNewValues, customOptions, id, options, value],
   );
 
   useClientLayoutEffect(() => {
diff --git a/@navikt/core/react/src/form/combobox/combobox.stories.tsx b/@navikt/core/react/src/form/combobox/combobox.stories.tsx
index 719923ec7c..e63d005f25 100644
--- a/@navikt/core/react/src/form/combobox/combobox.stories.tsx
+++ b/@navikt/core/react/src/form/combobox/combobox.stories.tsx
@@ -638,6 +638,7 @@ export const TestEnterNotSubmittingForm: StoryObj<{
           options={options}
           label="Hva er dine favorittfrukter?"
           isMultiSelect
+          allowNewValues
         />
       </form>
     );
@@ -676,6 +677,17 @@ export const TestEnterNotSubmittingForm: StoryObj<{
     expect(args.onSubmit).not.toHaveBeenCalled();
 
     await userEvent.keyboard("{Enter}"); // Enter on empty Input with closed list
+    await userEvent.keyboard("{ArrowDown}"); // Select "test" custom option
+    expect(
+      canvas.getByRole("option", { name: "test", selected: true }),
+    ).toBeVisible();
+    await userEvent.keyboard("{Enter}"); // De-select "test"
+    expect(
+      canvas.queryByRole("option", { name: "test", selected: false }),
+    ).toBeNull();
+    expect(args.onSubmit).not.toHaveBeenCalled();
+
+    await userEvent.keyboard("{Escape}"); // Clear input field
     expect(args.onSubmit).toHaveBeenCalledOnce();
   },
 };

From 56e12405ebd64ecd4e288dbbf68f7748ac3e0e86 Mon Sep 17 00:00:00 2001
From: Vegard Haugstvedt <it.vegard@gmail.com>
Date: Wed, 17 Apr 2024 14:47:54 +0200
Subject: [PATCH 10/16] Update test to account for the dropdown list closing
 when focus moves to the chips in the previous step

---
 @navikt/core/react/src/form/combobox/combobox.stories.tsx | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/@navikt/core/react/src/form/combobox/combobox.stories.tsx b/@navikt/core/react/src/form/combobox/combobox.stories.tsx
index e63d005f25..36be7c2b4a 100644
--- a/@navikt/core/react/src/form/combobox/combobox.stories.tsx
+++ b/@navikt/core/react/src/form/combobox/combobox.stories.tsx
@@ -448,6 +448,8 @@ export const RemoveSelectedMultiSelectTest: StoryObject = {
     await sleep(250);
     userEvent.click(appleSlett);
     await sleep(250);
+    userEvent.click(canvas.getByRole("button", { name: "Alternativer" }));
+    await sleep(250);
     const appleOption = canvas.getByRole("option", {
       name: "apple",
       selected: false,

From 570a2648cc7e8c09b9cac460ab0f0fb8630017e2 Mon Sep 17 00:00:00 2001
From: Vegard Haugstvedt <it.vegard@gmail.com>
Date: Wed, 17 Apr 2024 14:52:00 +0200
Subject: [PATCH 11/16] Add possibility to slow down tests for debugging

---
 .../src/form/combobox/combobox.stories.tsx    | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/@navikt/core/react/src/form/combobox/combobox.stories.tsx b/@navikt/core/react/src/form/combobox/combobox.stories.tsx
index 36be7c2b4a..05c884c6d7 100644
--- a/@navikt/core/react/src/form/combobox/combobox.stories.tsx
+++ b/@navikt/core/react/src/form/combobox/combobox.stories.tsx
@@ -648,8 +648,9 @@ export const TestEnterNotSubmittingForm: StoryObj<{
   play: async ({ canvasElement, args }) => {
     args.onSubmit.mockClear();
     const canvas = within(canvasElement);
+    const waitTime = 0; // Change for debugging
 
-    await sleep(250);
+    await sleep(waitTime);
 
     const getInput = () =>
       canvas.getByRole("combobox", {
@@ -658,38 +659,38 @@ export const TestEnterNotSubmittingForm: StoryObj<{
 
     const getOption = (name: string, selected: boolean) =>
       canvas.getByRole("option", { name, selected });
-    await userEvent.click(getInput());
+    await userEvent.click(getInput(), { delay: waitTime });
 
-    await userEvent.keyboard("{ArrowDown}");
+    await userEvent.keyboard("{ArrowDown}", { delay: waitTime });
     expect(getInput().getAttribute("aria-activedescendant")).toBe(
       getOption("banana", false).getAttribute("id"),
     );
 
-    await userEvent.keyboard("{Enter}");
+    await userEvent.keyboard("{Enter}", { delay: waitTime });
     expect(args.onSubmit).not.toHaveBeenCalled();
     expect(getOption("banana", true)).toBeVisible();
 
-    await userEvent.keyboard("{Shift>}{Tab}");
+    await userEvent.keyboard("{Shift>}{Tab}", { delay: waitTime });
 
-    await userEvent.keyboard("{Enter}");
+    await userEvent.keyboard("{Enter}", { delay: waitTime });
     expect(args.onSubmit).not.toHaveBeenCalled();
 
     await userEvent.keyboard("test"); // Type option that does not exist
-    await userEvent.keyboard("{Enter}");
+    await userEvent.keyboard("{Enter}", { delay: waitTime });
     expect(args.onSubmit).not.toHaveBeenCalled();
 
-    await userEvent.keyboard("{Enter}"); // Enter on empty Input with closed list
-    await userEvent.keyboard("{ArrowDown}"); // Select "test" custom option
+    await userEvent.keyboard("{Enter}", { delay: waitTime }); // Enter on empty Input with closed list
+    await userEvent.keyboard("{ArrowDown}", { delay: waitTime }); // Select "test" custom option
     expect(
       canvas.getByRole("option", { name: "test", selected: true }),
     ).toBeVisible();
-    await userEvent.keyboard("{Enter}"); // De-select "test"
+    await userEvent.keyboard("{Enter}", { delay: waitTime }); // De-select "test"
     expect(
       canvas.queryByRole("option", { name: "test", selected: false }),
     ).toBeNull();
     expect(args.onSubmit).not.toHaveBeenCalled();
 
-    await userEvent.keyboard("{Escape}"); // Clear input field
+    await userEvent.keyboard("{Escape}", { delay: waitTime }); // Clear input field
     expect(args.onSubmit).toHaveBeenCalledOnce();
   },
 };

From d8df132fa084fb0587b04932f11595af7a19eb6b Mon Sep 17 00:00:00 2001
From: Vegard Haugstvedt <it.vegard@gmail.com>
Date: Wed, 17 Apr 2024 14:53:03 +0200
Subject: [PATCH 12/16] Fix issue with onFocus -> onToggleSelected(false),
 where clicking the open/close button didn't work

---
 .../SelectedOptions/SelectedOptions.tsx       | 20 ++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/@navikt/core/react/src/form/combobox/SelectedOptions/SelectedOptions.tsx b/@navikt/core/react/src/form/combobox/SelectedOptions/SelectedOptions.tsx
index 70ccba700e..54e615436a 100644
--- a/@navikt/core/react/src/form/combobox/SelectedOptions/SelectedOptions.tsx
+++ b/@navikt/core/react/src/form/combobox/SelectedOptions/SelectedOptions.tsx
@@ -14,6 +14,7 @@ interface SelectedOptionsProps {
 const Option = ({ option }: { option: ComboboxOption }) => {
   const { isMultiSelect, removeSelectedOption } = useSelectedOptionsContext();
   const { focusInput } = useInputContext();
+  const { isListOpen, toggleIsListOpen } = useFilteredOptionsContext();
 
   const onClick = (e) => {
     e.stopPropagation();
@@ -21,6 +22,12 @@ const Option = ({ option }: { option: ComboboxOption }) => {
     focusInput();
   };
 
+  const onFocus = () => {
+    if (isListOpen) {
+      toggleIsListOpen(false);
+    }
+  };
+
   if (!isMultiSelect) {
     return (
       <div className="navds-combobox__selected-options--no-bg">
@@ -29,7 +36,11 @@ const Option = ({ option }: { option: ComboboxOption }) => {
     );
   }
 
-  return <Chips.Removable onClick={onClick}>{option.label}</Chips.Removable>;
+  return (
+    <Chips.Removable onClick={onClick} onFocus={onFocus}>
+      {option.label}
+    </Chips.Removable>
+  );
 };
 
 const SelectedOptions: React.FC<SelectedOptionsProps> = ({
@@ -37,13 +48,8 @@ const SelectedOptions: React.FC<SelectedOptionsProps> = ({
   size,
   children,
 }) => {
-  const { toggleIsListOpen } = useFilteredOptionsContext();
   return (
-    <Chips
-      className="navds-combobox__selected-options"
-      onFocus={() => toggleIsListOpen(false)}
-      size={size}
-    >
+    <Chips className="navds-combobox__selected-options" size={size}>
       {selectedOptions.length
         ? selectedOptions.map((option, i) => (
             <Option key={option.label + i} option={option} />

From 7d5ec60e6620838970b3510183ad653018f57e35 Mon Sep 17 00:00:00 2001
From: Vegard Haugstvedt <it.vegard@gmail.com>
Date: Wed, 17 Apr 2024 14:53:34 +0200
Subject: [PATCH 13/16] Fix test

---
 @navikt/core/react/src/form/combobox/combobox.stories.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/@navikt/core/react/src/form/combobox/combobox.stories.tsx b/@navikt/core/react/src/form/combobox/combobox.stories.tsx
index 05c884c6d7..7a32c5497b 100644
--- a/@navikt/core/react/src/form/combobox/combobox.stories.tsx
+++ b/@navikt/core/react/src/form/combobox/combobox.stories.tsx
@@ -679,7 +679,6 @@ export const TestEnterNotSubmittingForm: StoryObj<{
     await userEvent.keyboard("{Enter}", { delay: waitTime });
     expect(args.onSubmit).not.toHaveBeenCalled();
 
-    await userEvent.keyboard("{Enter}", { delay: waitTime }); // Enter on empty Input with closed list
     await userEvent.keyboard("{ArrowDown}", { delay: waitTime }); // Select "test" custom option
     expect(
       canvas.getByRole("option", { name: "test", selected: true }),
@@ -691,6 +690,7 @@ export const TestEnterNotSubmittingForm: StoryObj<{
     expect(args.onSubmit).not.toHaveBeenCalled();
 
     await userEvent.keyboard("{Escape}", { delay: waitTime }); // Clear input field
+    await userEvent.keyboard("{Enter}", { delay: waitTime }); // Enter on empty Input with closed list
     expect(args.onSubmit).toHaveBeenCalledOnce();
   },
 };

From 94014920d06083efac9407ed3cea7d7559f6f300 Mon Sep 17 00:00:00 2001
From: Vegard Haugstvedt <it.vegard@gmail.com>
Date: Thu, 18 Apr 2024 05:23:41 +0200
Subject: [PATCH 14/16] Closing the FilteredOptionsList when focusing a Chip
 caused too many side effects, but we need to remove virtual focus at least.
 That way we won't double-click on enter.

---
 .../core/react/src/form/combobox/Input/Input.tsx   |  1 +
 .../combobox/SelectedOptions/SelectedOptions.tsx   | 14 +-------------
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/@navikt/core/react/src/form/combobox/Input/Input.tsx b/@navikt/core/react/src/form/combobox/Input/Input.tsx
index 6fd8e8ef86..0d54c64829 100644
--- a/@navikt/core/react/src/form/combobox/Input/Input.tsx
+++ b/@navikt/core/react/src/form/combobox/Input/Input.tsx
@@ -186,6 +186,7 @@ const Input = forwardRef<HTMLInputElement, InputProps>(
         {...omit(inputProps, ["aria-invalid"])}
         ref={ref}
         value={value}
+        onBlur={() => virtualFocus.moveFocusToTop()}
         onChange={onChangeHandler}
         type="text"
         role="combobox"
diff --git a/@navikt/core/react/src/form/combobox/SelectedOptions/SelectedOptions.tsx b/@navikt/core/react/src/form/combobox/SelectedOptions/SelectedOptions.tsx
index 54e615436a..7e3a7bcfcd 100644
--- a/@navikt/core/react/src/form/combobox/SelectedOptions/SelectedOptions.tsx
+++ b/@navikt/core/react/src/form/combobox/SelectedOptions/SelectedOptions.tsx
@@ -1,6 +1,5 @@
 import React from "react";
 import { Chips } from "../../../chips";
-import { useFilteredOptionsContext } from "../FilteredOptions/filteredOptionsContext";
 import { useInputContext } from "../Input/inputContext";
 import { ComboboxOption } from "../types";
 import { useSelectedOptionsContext } from "./selectedOptionsContext";
@@ -14,7 +13,6 @@ interface SelectedOptionsProps {
 const Option = ({ option }: { option: ComboboxOption }) => {
   const { isMultiSelect, removeSelectedOption } = useSelectedOptionsContext();
   const { focusInput } = useInputContext();
-  const { isListOpen, toggleIsListOpen } = useFilteredOptionsContext();
 
   const onClick = (e) => {
     e.stopPropagation();
@@ -22,12 +20,6 @@ const Option = ({ option }: { option: ComboboxOption }) => {
     focusInput();
   };
 
-  const onFocus = () => {
-    if (isListOpen) {
-      toggleIsListOpen(false);
-    }
-  };
-
   if (!isMultiSelect) {
     return (
       <div className="navds-combobox__selected-options--no-bg">
@@ -36,11 +28,7 @@ const Option = ({ option }: { option: ComboboxOption }) => {
     );
   }
 
-  return (
-    <Chips.Removable onClick={onClick} onFocus={onFocus}>
-      {option.label}
-    </Chips.Removable>
-  );
+  return <Chips.Removable onClick={onClick}>{option.label}</Chips.Removable>;
 };
 
 const SelectedOptions: React.FC<SelectedOptionsProps> = ({

From 1b1477eccc949a6d04c835f68876a2b7acff976e Mon Sep 17 00:00:00 2001
From: Vegard Haugstvedt <it.vegard@gmail.com>
Date: Thu, 18 Apr 2024 05:44:09 +0200
Subject: [PATCH 15/16] When no longer closing FilteredOptions on focusing a
 chip, we don't need to click the toggleIsOpen button to check that the option
 is un-selected

---
 @navikt/core/react/src/form/combobox/combobox.stories.tsx | 2 --
 1 file changed, 2 deletions(-)

diff --git a/@navikt/core/react/src/form/combobox/combobox.stories.tsx b/@navikt/core/react/src/form/combobox/combobox.stories.tsx
index 7a32c5497b..bde9858abe 100644
--- a/@navikt/core/react/src/form/combobox/combobox.stories.tsx
+++ b/@navikt/core/react/src/form/combobox/combobox.stories.tsx
@@ -448,8 +448,6 @@ export const RemoveSelectedMultiSelectTest: StoryObject = {
     await sleep(250);
     userEvent.click(appleSlett);
     await sleep(250);
-    userEvent.click(canvas.getByRole("button", { name: "Alternativer" }));
-    await sleep(250);
     const appleOption = canvas.getByRole("option", {
       name: "apple",
       selected: false,

From 447bab0d26fd59b6d5413d7298e58fed08580900 Mon Sep 17 00:00:00 2001
From: Vegard Haugstvedt <it.vegard@gmail.com>
Date: Thu, 18 Apr 2024 09:36:48 +0200
Subject: [PATCH 16/16] Update .changeset/rotten-windows-cover.md

Co-authored-by: Ken <26967723+KenAJoh@users.noreply.github.com>
---
 .changeset/rotten-windows-cover.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.changeset/rotten-windows-cover.md b/.changeset/rotten-windows-cover.md
index 9b4b6d7d97..c2cfa45c09 100644
--- a/.changeset/rotten-windows-cover.md
+++ b/.changeset/rotten-windows-cover.md
@@ -2,4 +2,4 @@
 "@navikt/ds-react": patch
 ---
 
-Preventing "enter" while Combobox is focused from submitting form
+Combobox: Prevents "Enter" while Combobox is focused from submitting form.