@altinn/altinn-components 0.5.0 → 0.5.2

package/.storybook/StoryDecorator.tsx

@@ -19,7 +19,7 @@ export const StoryDecorator = ({
   return (
       <RootProvider>
           <div className={styles.preview} data-theme={theme}>
-              <div className={styles.component}>{children}</div>
+              <div id="story-in-story-decorator-root" className={styles.component}>{children}</div>
               <span className={styles.tag} data-tag={state}>
                   {state}
               </span>

package/.storybook/main.ts

@@ -8,14 +8,13 @@ const config: StorybookConfig = {
     "@storybook/addon-essentials",
     "@storybook/addon-themes",
     "@chromatic-com/storybook",
-    "@storybook/addon-interactions"
+    "@storybook/addon-interactions",
+    "@storybook/addon-a11y"
   ],
   framework: {
     name: "@storybook/react-vite",
     options: {},
   },
-  docs: {
-    autodocs: "tag",
-  },
+  docs: {},
 };
 export default config;

package/.storybook/preview.tsx

@@ -2,9 +2,35 @@ import { withThemeByDataAttribute } from "@storybook/addon-themes";
 import { Preview, StoryFn } from "@storybook/react";
 import { StoryDecorator } from "./StoryDecorator";
 import "../lib/css/global.css";
+import {A11yParameters} from "@storybook/addon-a11y";
+import { Rule, getRules } from "axe-core";
+
 /** @type { import('@storybook/react').Preview } */
+
+const enabledTags = [
+    "wcag2a",
+    "wcag2aa",
+    "wcag21a",
+    "wcag21aa",
+    "wcag22aa",
+    "best-practice",
+];
+
+const enabledRules: Rule[] = getRules(enabledTags).map((ruleMetadata) => ({
+    id: ruleMetadata.ruleId,
+    enabled: true
+}));
+
+const a11y: A11yParameters = {
+    config: {
+        rules: enabledRules,
+    },
+    element: '#story-in-story-decorator-root',
+};
+
 const preview: Preview = {
     parameters: {
+        a11y,
         controls: {
             matchers: {
                 color: /(background|color)$/i,
@@ -32,4 +58,6 @@ const preview: Preview = {
         }),
     ],
 };
+
+
 export default preview;

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## [0.5.2](https://github.com/Altinn/altinn-components/compare/v0.5.1...v0.5.2) (2024-11-18)
+
+
+### Bug Fixes
+
+* fixing selecting current account and simplify API for Header ([#58](https://github.com/Altinn/altinn-components/issues/58)) ([b39a14a](https://github.com/Altinn/altinn-components/commit/b39a14a14014ff78209d636f3edc93507b443fd2))
+
+## [0.5.1](https://github.com/Altinn/altinn-components/compare/v0.5.0...v0.5.1) (2024-11-16)
+
+
+### Bug Fixes
+
+* add log out button and refactoring of global menu ([#50](https://github.com/Altinn/altinn-components/issues/50)) ([0fc8bfa](https://github.com/Altinn/altinn-components/commit/0fc8bfaa0feb113624da9e740aed54d61de15d4c))
+
 ## [0.5.0](https://github.com/Altinn/altinn-components/compare/v0.4.1...v0.5.0) (2024-11-15)
 
 

package/lib/components/Button/ButtonLabel.tsx

@@ -1,15 +1,17 @@
+import cx from 'classnames';
 import type { ReactNode } from 'react';
 import type { ButtonSize } from './ButtonBase';
 import styles from './buttonLabel.module.css';
 
 export interface ButtonLabelProps {
   size: ButtonSize;
+  className?: string;
   children: ReactNode;
 }
 
-export const ButtonLabel = ({ size, children }: ButtonLabelProps) => {
+export const ButtonLabel = ({ className, size, children }: ButtonLabelProps) => {
   return (
-    <span className={styles.label} data-size={size}>
+    <span className={cx(styles.label, className)} data-size={size}>
       {children}
     </span>
   );

package/lib/components/Dialog/Dialog.stories.ts

@@ -8,11 +8,15 @@ const meta = {
   parameters: {},
   argTypes: { body: { control: 'text' } },
   args: {
-    menu: [
-      {
-        items: [{ label: 'Menu 1' }],
-      },
-    ],
+    menu: {
+      id: 'context-menu',
+      items: [
+        {
+          label: 'Fjern',
+          id: 'remove',
+        },
+      ],
+    },
     updatedAt: '1999-05-26',
     updatedAtLabel: '26. mai 1999',
     title: 'Title',
@@ -42,9 +46,11 @@ export const Attachments: Story = {
       items: [
         {
           label: 'Dokument 1.pdf',
+          href: '',
         },
         {
           label: 'Dokument 2.pdf',
+          href: '',
         },
       ],
     },
@@ -106,6 +112,7 @@ export const Example: Story = {
       items: [
         {
           label: 'Vedtak om innlevering av bedriftsdata.pdf',
+          href: '',
         },
       ],
     },

package/lib/components/Dropdown/DropdownBase.tsx

@@ -6,14 +6,26 @@ export type DropdownPlacement = 'left' | 'right';
 
 export interface DropdownBaseProps {
   placement?: DropdownPlacement;
+  padding?: boolean;
   expanded?: boolean;
   className?: string;
   children?: ReactNode;
 }
 
-export const DropdownBase = ({ placement = 'left', expanded = false, className, children }: DropdownBaseProps) => {
+export const DropdownBase = ({
+  placement = 'left',
+  padding = true,
+  expanded = false,
+  className,
+  children,
+}: DropdownBaseProps) => {
   return (
-    <div className={cx(styles.dropdown, className)} data-placement={placement} aria-expanded={expanded}>
+    <div
+      className={cx(styles.dropdown, className)}
+      data-placement={placement}
+      data-padding={padding}
+      aria-expanded={expanded}
+    >
       {children}
     </div>
   );

package/lib/components/Dropdown/dropdownBase.module.css

@@ -16,13 +16,17 @@
   right: 0;
 }
 
+.dropdown[data-padding="trur"] {
+  padding: 0 0.5rem;
+}
+
 .dropdown {
   min-width: 14rem;
   margin-top: 0.5rem;
-  padding: 0 0.5rem;
   background-color: var(--neutral-background-default);
   border-radius: 0.375rem;
   box-shadow: var(--ds-shadow-md);
+  overflow: hidden;
 }
 
 .drawer .button {

package/lib/components/GlobalMenu/AccountButton.tsx

@@ -0,0 +1,30 @@
+import { MenuItemBase, MenuItemLabel, MenuItemMedia } from '../Menu';
+
+export type Account = {
+  id: string;
+  type: 'person' | 'company';
+  name: string;
+  description?: string;
+};
+
+export type AccountButtonProps = {
+  account: Account;
+  description?: string;
+  linkText?: string;
+  onClick?: () => void;
+};
+
+export const AccountButton = ({ account, linkText, onClick }: AccountButtonProps) => {
+  return (
+    <MenuItemBase size="lg" onClick={onClick} linkText={linkText} linkIcon="arrow-right">
+      <MenuItemMedia
+        size="lg"
+        avatar={{
+          name: account.name,
+          type: account.type,
+        }}
+      />
+      <MenuItemLabel size="lg" title={account?.name} description={account?.description} />
+    </MenuItemBase>
+  );
+};

package/lib/components/GlobalMenu/AccountMenu.stories.tsx

@@ -0,0 +1,65 @@
+import type { Meta, StoryObj } from '@storybook/react';
+import { useState } from 'react';
+import { AccountMenu } from './AccountMenu';
+
+const meta = {
+  title: 'GlobalMenu/AccountMenu',
+  component: AccountMenu,
+  tags: ['autodocs'],
+  parameters: {},
+  args: {
+    accountGroups: {
+      primary: {
+        title: 'Deg selv og favoritter',
+      },
+      secondary: {
+        title: 'Andre kontoer',
+      },
+    },
+    accounts: [
+      {
+        groupId: 'primary',
+        type: 'person',
+        name: 'Aurora Mikalsen',
+        selected: true,
+      },
+      {
+        groupId: 'favourites',
+        type: 'company',
+        name: 'Bergen Bar',
+        selected: false,
+      },
+      {
+        groupId: 'secondary',
+        type: 'company',
+        name: 'Keeperhansker AS',
+        selected: false,
+      },
+      {
+        groupId: 'secondary',
+        type: 'company',
+        name: 'Stadion drift AS',
+        selected: false,
+      },
+      {
+        groupId: 'favourites',
+        type: 'company',
+        name: 'Sportsklubben Brann',
+        selected: false,
+      },
+      {
+        groupId: 'secondary',
+        type: 'company',
+        name: 'Landslaget',
+        selected: false,
+      },
+    ],
+  },
+} satisfies Meta<typeof AccountMenu>;
+
+export default meta;
+type Story = StoryObj<typeof meta>;
+
+export const Default: Story = {
+  args: {},
+};

package/lib/components/GlobalMenu/AccountMenu.tsx

@@ -0,0 +1,82 @@
+'use client';
+import { useState } from 'react';
+import { Menu, type MenuItemGroups, type MenuItemProps, type MenuSearchProps } from '../Menu';
+
+export interface AccountSearch extends MenuSearchProps {
+  getResultsLabel?: (hits: number) => string;
+  hidden?: boolean;
+}
+
+export interface AccountMenuItem {
+  type: 'person' | 'company';
+  name: string;
+  id: string;
+  groupId?: string;
+  selected?: boolean;
+}
+
+export interface AccountMenuProps {
+  accounts?: AccountMenuItem[];
+  accountGroups?: MenuItemGroups;
+  accountSearch?: AccountSearch;
+  currentAccount?: AccountMenuItem;
+  onSelectAccount?: (id: string) => void;
+}
+
+const defaultResultLabel = (hits: number) => `${hits} hits`;
+
+export const AccountMenu = ({
+  accounts = [],
+  accountGroups = {},
+  accountSearch,
+  onSelectAccount,
+  currentAccount,
+}: AccountMenuProps) => {
+  const accountMenu: MenuItemProps[] = accounts.map((account) => ({
+    id: account.id || account.name,
+    groupId: account.groupId || 'search',
+    selected: account.selected ?? currentAccount?.id === account.id,
+    title: account.name,
+    avatar: {
+      type: account.type,
+      name: account.name,
+    },
+    onClick: () => onSelectAccount?.(account.id || account.name),
+  }));
+
+  const [filterString, setFilterString] = useState<string>('');
+
+  const filteredAccountMenu = filterString
+    ? accountMenu
+        .filter((item) => item?.title?.toLowerCase().includes(filterString.toLowerCase()))
+        .map((item) => {
+          return {
+            ...item,
+            groupId: 'search',
+          };
+        })
+    : accountMenu;
+
+  const filterAccountGroups = filterString
+    ? {
+        search: {
+          title:
+            accountSearch?.getResultsLabel?.(filteredAccountMenu.length) ??
+            defaultResultLabel(filteredAccountMenu.length),
+        },
+      }
+    : accountGroups;
+
+  const accountSearchItem: MenuSearchProps = {
+    name: 'account-search',
+    value: filterString,
+    placeholder: accountSearch?.placeholder ?? 'Find account',
+    onChange: (event: React.ChangeEvent<HTMLInputElement>) => setFilterString(event.target.value),
+  };
+
+  const accountSwitcher: MenuItemProps[] = [
+    ...(filteredAccountMenu.length > 0 ? filteredAccountMenu : [{ id: 'search', groupId: 'search', hidden: true }]),
+  ];
+
+  return <Menu theme="global" search={accountSearchItem} groups={filterAccountGroups} items={accountSwitcher} />;
+};

package/lib/components/GlobalMenu/BackButton.tsx

@@ -0,0 +1,10 @@
+import { MenuItem } from '../Menu';
+
+export interface BackButtonProps {
+  label: string;
+  onClick?: () => void;
+}
+
+export const BackButton = ({ label, onClick }: BackButtonProps) => {
+  return <MenuItem id="back" icon="arrow-left" title={label} onClick={onClick} />;
+};

package/lib/components/GlobalMenu/GlobalMenu.stories.tsx

@@ -3,11 +3,62 @@ import { useState } from 'react';
 import { GlobalMenu } from './GlobalMenu';
 
 const meta = {
-  title: 'Header/GlobalMenu',
+  title: 'GlobalMenu/GlobalMenu',
   component: GlobalMenu,
   tags: ['autodocs'],
   parameters: {},
   args: {
+    accountGroups: {
+      primary: {
+        title: 'Deg selv og favoritter',
+      },
+      secondary: {
+        title: 'Andre kontoer',
+      },
+    },
+    currentAccount: {
+      type: 'person',
+      name: 'Mathias Dyngeland',
+      description: 'Fødselsnr. 07101995 XXXXXX',
+    },
+    accounts: [
+      {
+        id: 'party:mathias',
+        groupId: 'primary',
+        type: 'person',
+        name: 'Mathias Dyngeland',
+      },
+      {
+        id: 'party:bergerbar',
+        groupId: 'favourites',
+        type: 'company',
+        name: 'Bergen bar',
+      },
+      {
+        id: 'party:keeperhansker',
+        groupId: 'secondary',
+        type: 'company',
+        name: 'Keeperhansker AS',
+      },
+      {
+        id: 'party:stadiondrift',
+        groupId: 'secondary',
+        type: 'company',
+        name: 'Stadion drift AS',
+      },
+      {
+        id: 'party:brann',
+        groupId: 'favourites',
+        type: 'company',
+        name: 'Sportsklubben Brann',
+      },
+      {
+        id: 'party:landslaget',
+        groupId: 'secondary',
+        type: 'company',
+        name: 'Landslaget',
+      },
+    ],
     groups: {
       apps: {
         divider: true,
@@ -19,14 +70,45 @@ const meta = {
         groupId: 'apps',
         size: 'lg',
         icon: 'inbox',
-        label: 'Innboks',
+        title: 'Innboks',
+        badge: {
+          color: 'alert',
+          label: '4',
+        },
       },
       {
-        id: 'settings',
+        id: 'access',
         groupId: 'apps',
         size: 'lg',
-        icon: 'cog',
-        label: 'Settings',
+        icon: 'bookmark',
+        title: 'Tilganger',
+        badge: {
+          color: 'alert',
+          label: '2',
+        },
+      },
+      {
+        id: 'access',
+        groupId: 'apps',
+        size: 'lg',
+        icon: 'menu-grid',
+        title: 'Alle skjema',
+      },
+      {
+        id: 'startup',
+        groupId: 'help',
+        color: 'neutral',
+        size: 'sm',
+        icon: 'buildings2',
+        title: 'Starte og drive bedrift',
+      },
+      {
+        id: 'help',
+        groupId: 'help',
+        size: 'sm',
+        color: 'neutral',
+        icon: 'chat-exclamationmark',
+        title: 'Trenger du hjelp?',
       },
     ],
   },
@@ -39,43 +121,31 @@ export const Default: Story = {};
 
 export const Login: Story = {
   args: {
-    expanded: true,
+    currentAccount: undefined,
     items: [
       {
         id: 'login',
+        groupId: 'login',
         size: 'lg',
+        color: 'strong',
         icon: 'padlock-locked',
         title: 'Logg inn',
       },
       {
-        id: 'help',
-        size: 'lg',
-        icon: 'chat-exclamationmark',
-        title: 'Hjelp',
+        id: 'startup',
+        groupId: 'help',
+        color: 'neutral',
+        size: 'sm',
+        icon: 'buildings2',
+        title: 'Starte og drive bedrift',
       },
-    ],
-  },
-};
-
-export const ControlledStateLogin = () => {
-  const [expanded, setExpanded] = useState<boolean>(false);
-  return (
-    <GlobalMenu
-      {...Login.args}
-      expanded={expanded}
-      onToggle={() => setExpanded((prevState) => !prevState)}
-      items={Login.args.items ?? []}
-    />
-  );
-};
-
-export const Person: Story = {
-  args: {
-    accounts: [
       {
-        type: 'person',
-        name: 'Aurora Mikalsen',
-        selected: true,
+        id: 'help',
+        groupId: 'help',
+        color: 'neutral',
+        size: 'sm',
+        icon: 'chat-exclamationmark',
+        title: 'Trenger du hjelp?',
       },
     ],
   },
@@ -83,46 +153,20 @@ export const Person: Story = {
 
 export const Company: Story = {
   args: {
-    accounts: [
-      {
-        type: 'company',
-        name: 'Bergen bar',
-        selected: true,
-      },
-    ],
-  },
-};
-
-export const Expanded: Story = {
-  args: {
-    expanded: true,
-    accounts: [
-      {
-        type: 'company',
-        name: 'Bergen bar',
-        selected: true,
-      },
-    ],
-  },
-};
-
-export const CustomLabel: Story = {
-  args: {
-    menuLabel: 'Meny',
-    accounts: [
-      {
-        type: 'person',
-        name: 'Aurora Mikalsen',
-        selected: true,
-      },
-    ],
+    currentAccount: {
+      type: 'company',
+      name: 'Sportsklubben Brann',
+      description: 'Org. nr. 934908988',
+    },
   },
 };
 
-export const Accounts: Story = {
+export const CustomLabels: Story = {
   args: {
+    logoutLabel: 'Logg ut',
     menuLabel: 'Meny',
     backLabel: 'Tilbake',
+    changeLabel: 'Endre konto',
     accountSearch: {
       placeholder: 'Søk etter konto',
       getResultsLabel: (hits = 0) => {
@@ -133,58 +177,5 @@ export const Accounts: Story = {
       },
       hidden: false,
     },
-    expanded: true,
-    accountGroups: {
-      primary: {
-        title: 'Deg selv og favoritter',
-      },
-      secondary: {
-        title: 'Andre kontoer',
-      },
-    },
-    accounts: [
-      {
-        groupId: 'primary',
-        type: 'person',
-        name: 'Aurora Mikalsen',
-        selected: true,
-      },
-      {
-        groupId: 'favourites',
-        type: 'person',
-        name: 'Rakel Engelsvik',
-        selected: false,
-      },
-      {
-        groupId: 'favourites',
-        type: 'company',
-        name: 'Auroras keeperskole',
-        selected: false,
-      },
-      {
-        groupId: 'secondary',
-        type: 'company',
-        name: 'Keeperhansker AS',
-        selected: false,
-      },
-      {
-        groupId: 'secondary',
-        type: 'company',
-        name: 'Stadion drift AS',
-        selected: false,
-      },
-      {
-        groupId: 'secondary',
-        type: 'company',
-        name: 'Sportsklubben Brann',
-        selected: false,
-      },
-      {
-        groupId: 'secondary',
-        type: 'company',
-        name: 'Landslaget',
-        selected: false,
-      },
-    ],
   },
 };