From fcfe7cad7b82d572460aac98dbf993592c46a494 Mon Sep 17 00:00:00 2001
From: Ken <ken.aleksander@gmail.com>
Date: Mon, 29 Aug 2022 15:16:07 +0200
Subject: [PATCH] fikset onClick for dropdown

---
 .../react/src/dropdown/Menu/GroupedList/Item.tsx     |  7 ++++---
 .../internal/react/src/dropdown/Menu/List/Item.tsx   | 12 ++++++------
 .../internal/react/src/dropdown/dropdown.stories.tsx | 10 ++++++++--
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/@navikt/internal/react/src/dropdown/Menu/GroupedList/Item.tsx b/@navikt/internal/react/src/dropdown/Menu/GroupedList/Item.tsx
index a2179381a7..19818e4376 100644
--- a/@navikt/internal/react/src/dropdown/Menu/GroupedList/Item.tsx
+++ b/@navikt/internal/react/src/dropdown/Menu/GroupedList/Item.tsx
@@ -24,9 +24,10 @@ export const GroupedItem: GroupedItemType = forwardRef(
         <Component
           {...rest}
           value={rest.children}
-          onClick={(event: React.MouseEvent<HTMLElement, MouseEvent>) =>
-            context?.onSelect?.(event)
-          }
+          onClick={(event: React.MouseEvent<HTMLElement, MouseEvent>) => {
+            context?.onSelect?.(event);
+            rest?.onClick?.(event);
+          }}
           ref={ref}
           className={cl(
             "navdsi-dropdown__item",
diff --git a/@navikt/internal/react/src/dropdown/Menu/List/Item.tsx b/@navikt/internal/react/src/dropdown/Menu/List/Item.tsx
index 4fc8f35fef..fb1fe49c5e 100644
--- a/@navikt/internal/react/src/dropdown/Menu/List/Item.tsx
+++ b/@navikt/internal/react/src/dropdown/Menu/List/Item.tsx
@@ -3,8 +3,7 @@ import cl from "clsx";
 import { OverridableComponent } from "@navikt/ds-react";
 import { DropdownContext } from "../../Dropdown";
 
-export interface ListItemProps
-  extends React.ButtonHTMLAttributes<HTMLButtonElement> {
+export interface ListItemProps extends React.ButtonHTMLAttributes<HTMLElement> {
   /**
    * Menu item content
    */
@@ -17,16 +16,17 @@ export type ListItemType = OverridableComponent<
 >;
 
 export const ListItem: ListItemType = forwardRef(
-  ({ as: Component = "button", className, onClick, ...rest }, ref) => {
+  ({ as: Component = "button", className, ...rest }, ref) => {
     const context = useContext(DropdownContext);
     return (
       <li className="navdsi-dropdown__list-item">
         <Component
           {...rest}
           value={rest.children}
-          onClick={(event: React.MouseEvent<HTMLElement, MouseEvent>) =>
-            context?.onSelect?.(event)
-          }
+          onClick={(event: React.MouseEvent<HTMLElement, MouseEvent>) => {
+            context?.onSelect?.(event);
+            rest?.onClick?.(event);
+          }}
           ref={ref}
           className={cl(
             "navdsi-dropdown__item",
diff --git a/@navikt/internal/react/src/dropdown/dropdown.stories.tsx b/@navikt/internal/react/src/dropdown/dropdown.stories.tsx
index 15a1410757..59d00327ef 100644
--- a/@navikt/internal/react/src/dropdown/dropdown.stories.tsx
+++ b/@navikt/internal/react/src/dropdown/dropdown.stories.tsx
@@ -16,11 +16,17 @@ export const Default = () => {
           <Dropdown.Menu.GroupedList.Heading>
             Systemer og oppslagsverk
           </Dropdown.Menu.GroupedList.Heading>
-          <Dropdown.Menu.GroupedList.Item>Gosys</Dropdown.Menu.GroupedList.Item>
+          <Dropdown.Menu.GroupedList.Item
+            onClick={() => console.log("GroupedList.Item-click")}
+          >
+            Gosys
+          </Dropdown.Menu.GroupedList.Item>
         </Dropdown.Menu.GroupedList>
         <Dropdown.Menu.Divider />
         <Dropdown.Menu.List>
-          <Dropdown.Menu.List.Item>Gosys</Dropdown.Menu.List.Item>
+          <Dropdown.Menu.List.Item onClick={() => console.log("Item-click")}>
+            Gosys
+          </Dropdown.Menu.List.Item>
           <Dropdown.Menu.List.Item>Psys</Dropdown.Menu.List.Item>
           <Dropdown.Menu.List.Item disabled>Infotrygd</Dropdown.Menu.List.Item>
         </Dropdown.Menu.List>