Skip to content

Commit

Permalink
Erstatt dropdownmenu med actionmenu
Browse files Browse the repository at this point in the history
  • Loading branch information
tu55eladd committed Jan 8, 2025
1 parent 90349b5 commit 23490db
Showing 1 changed file with 22 additions and 20 deletions.
42 changes: 22 additions & 20 deletions src/moduler/aktivitet/ny-aktivitet/LeggTilNyttAktivitetsKort.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { PlusIcon } from '@navikt/aksel-icons';
import { Button, Dropdown } from '@navikt/ds-react';
import { ActionMenu, Button, Dropdown } from '@navikt/ds-react';
import React from 'react';
import { useSelector } from 'react-redux';
import { Link } from 'react-router-dom';
Expand Down Expand Up @@ -53,30 +53,32 @@ const LeggTilNyttAktivitetsKort = () => {
: brukerAktivitetsValg(nyAktivitetBasePath);
return (
<div className="self-stretch sm:self-auto">
<Dropdown>
<Button
as={Dropdown.Toggle}
loading={[Status.RELOADING, Status.PENDING].includes(aktivitetStatus)}
className="relative w-full"
icon={<PlusIcon role="img" aria-hidden fontSize="1.5rem" />}
disabled={aktivitetStatus !== Status.OK || viserHistoriskPeriode}
>
Legg til aktivitet
</Button>
<Dropdown.Menu>
<ActionMenu>
<ActionMenu.Trigger>
<Button
// as={Dropdown.Toggle}
loading={[Status.RELOADING, Status.PENDING].includes(aktivitetStatus)}
className="relative w-full"
icon={<PlusIcon role="img" aria-hidden fontSize="1.5rem" />}
disabled={aktivitetStatus !== Status.OK || viserHistoriskPeriode}
>
Legg til aktivitet
</Button>
</ActionMenu.Trigger>
<ActionMenu.Content>
{menuItemsGroup.map((item, index) => (
<Dropdown.Menu.GroupedList key={item.groupTittel}>
<Dropdown.Menu.GroupedList.Heading>{item.groupTittel}</Dropdown.Menu.GroupedList.Heading>
<ActionMenu.Group key={item.groupTittel} label={item.groupTittel}>
{/*<Dropdown.Menu.GroupedList.Heading>{item.groupTittel}</Dropdown.Menu.GroupedList.Heading>*/}
{item.groupedItems.map((subItem) => (
<Dropdown.Menu.GroupedList.Item as={Link} to={subItem.link} key={subItem.tittle}>
<ActionMenu.Item as={Link} to={subItem.link} key={subItem.tittle}>
{subItem.tittle}
</Dropdown.Menu.GroupedList.Item>
</ActionMenu.Item>
))}
{index != menuItemsGroup.length - 1 ? <Dropdown.Menu.Divider /> : null}
</Dropdown.Menu.GroupedList>
{index != menuItemsGroup.length - 1 ? <ActionMenu.Divider /> : null}
</ActionMenu.Group>
))}
</Dropdown.Menu>
</Dropdown>
</ActionMenu.Content>
</ActionMenu>
</div>
);
};
Expand Down

0 comments on commit 23490db

Please sign in to comment.