@oslokommune/punkt-react 16.17.3 → 16.18.0

package/dist/shared-types/index.d.ts

@@ -9,7 +9,7 @@ export { DEFAULT_HEADER_FOOTER_URL } from './header-menu';
 export type { TLayout, TVerticalPosition, THorizontalPosition, TPosition, TPositionWithCenter, } from './layout';
 export type { THTMLButtonType, TSelectionMode } from './form';
 export type { TSize3, TSize5, TSize7 } from './size';
-export type { TAlertSkin, TMessageboxSkin, TAccordionSkin, TCardSkin } from './skin';
+export type { TAlertSkin, TMessageboxSkin, TAccordionSkin, TCardSkin, TTagSkin } from './skin';
 export type { IDateConstraints, ICalendarGridDimensions, IGridCellPosition, TDateRangeMap, ISelectionState, ISelectionOptions, } from './calendar';
 export type { IDatepickerStrings } from './datepicker';
 export { defaultSingleStrings, defaultRangeStrings } from './datepicker';

package/dist/shared-types/skin.d.ts

@@ -22,3 +22,7 @@ export type TAccordionSkin = 'borderless' | 'outlined' | 'beige' | 'blue' | 'plu
  * Card component skin variants
  */
 export type TCardSkin = 'outlined' | 'outlined-beige' | 'gray' | 'beige' | 'green' | 'blue';
+/**
+ * Tag component skin variants
+ */
+export type TTagSkin = 'blue' | 'blue-light' | 'blue-dark' | 'green' | 'red' | 'beige' | 'yellow' | 'grey' | 'gray';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oslokommune/punkt-react",
-  "version": "16.17.3",
+  "version": "16.18.0",
   "description": "React komponentbibliotek til Punkt, et designsystem laget av Oslo Origo",
   "homepage": "https://punkt.oslo.kommune.no",
   "author": "Team Designsystem, Oslo Origo",
@@ -39,7 +39,7 @@
   "dependencies": {
     "@lit-labs/ssr-dom-shim": "^1.2.1",
     "@lit/react": "^1.0.7",
-    "@oslokommune/punkt-elements": "^16.17.3",
+    "@oslokommune/punkt-elements": "^16.18.0",
     "classnames": "^2.5.1",
     "prettier": "^3.3.3",
     "react-hook-form": "^7.53.0"
@@ -50,7 +50,7 @@
     "@eslint/eslintrc": "^3.3.3",
     "@eslint/js": "^9.37.0",
     "@oslokommune/punkt-assets": "^16.16.1",
-    "@oslokommune/punkt-css": "^16.17.2",
+    "@oslokommune/punkt-css": "^16.18.0",
     "@testing-library/jest-dom": "^6.5.0",
     "@testing-library/react": "^16.0.1",
     "@testing-library/user-event": "^14.5.2",
@@ -109,5 +109,5 @@
     "url": "https://github.com/oslokommune/punkt/issues"
   },
   "license": "MIT",
-  "gitHead": "0e923719992be1851617872d5e529a4588126aed"
+  "gitHead": "693c10d8d7a30c6b5c8acb6a7cb072b0afe50554"
 }

package/src/components/accordion/Accordion.test.tsx

@@ -1,6 +1,6 @@
 import '@testing-library/jest-dom'
 
-import { fireEvent,render, screen } from '@testing-library/react'
+import { fireEvent, render, screen, waitFor } from '@testing-library/react'
 import { axe, toHaveNoViolations } from 'jest-axe'
 import { vi } from 'vitest'
 import { createRef } from 'react'
@@ -181,12 +181,13 @@ describe('PktAccordionItem', () => {
       </PktAccordionItem>,
     )
 
-    await window.customElements.whenDefined('pkt-icon')
-    const icon = container.querySelector('pkt-icon')
+    const icon = container.querySelector('.pkt-icon')
     expect(icon).toBeInTheDocument()
     expect(icon).toHaveAttribute('name', 'chevron-thin-down')
     expect(icon).toHaveClass('pkt-accordion-item__icon')
-    expect(icon).toHaveAttribute('aria-hidden', 'true')
+    await waitFor(() =>
+      expect(icon?.querySelector('svg')).toHaveAttribute('aria-hidden', 'true'),
+    )
   })
 })
 

package/src/components/alert/Alert.tsx

@@ -4,7 +4,8 @@ import classNames from 'classnames'
 import { FC, HTMLAttributes, ReactElement, ReactNode, useCallback, useState } from 'react'
 import type { TAlertRole, TAlertSkin,TAriaLive } from 'shared-types'
 
-import { PktButton, PktIcon } from '..'
+import { PktButton } from '../button/Button'
+import { PktIcon } from '../icon/Icon'
 
 export interface IPktAlert extends Omit<HTMLAttributes<HTMLDivElement>, 'title'> {
   skin?: TAlertSkin

package/src/components/button/Button.test.tsx

@@ -141,7 +141,7 @@ describe('PktButton icon paths', () => {
     )
 
     const icon = document.querySelector('.pkt-btn__icon:not(.pkt-btn__spinner)') as HTMLElement & { path?: string }
-    expect(icon?.path).toBe(customPath)
+    expect(icon?.dataset.path).toBe(customPath)
   })
 
   test('does not set path property when iconPath is not provided', () => {
@@ -153,7 +153,7 @@ describe('PktButton icon paths', () => {
 
     const icon = document.querySelector('.pkt-btn__icon:not(.pkt-btn__spinner)') as HTMLElement & { path?: string }
     // When not provided, path uses PktIcon's default
-    expect(icon?.path).toBe('https://punkt-cdn.oslo.kommune.no/latest/icons/')
+    expect(icon?.dataset.path).toBe('https://punkt-cdn.oslo.kommune.no/latest/icons/')
   })
 
   test('passes secondIconPath to second PktIcon when provided', () => {
@@ -168,7 +168,7 @@ describe('PktButton icon paths', () => {
       HTMLElement & { path?: string }
     >
     expect(icons).toHaveLength(2)
-    expect(icons[1]?.path).toBe(customPath)
+    expect(icons[1]?.dataset.path).toBe(customPath)
   })
 
   test('handles both iconPath and secondIconPath independently', () => {
@@ -190,7 +190,7 @@ describe('PktButton icon paths', () => {
       HTMLElement & { path?: string }
     >
     expect(icons).toHaveLength(2)
-    expect(icons[0]?.path).toBe(iconPath)
-    expect(icons[1]?.path).toBe(secondIconPath)
+    expect(icons[0]?.dataset.path).toBe(iconPath)
+    expect(icons[1]?.dataset.path).toBe(secondIconPath)
   })
 })

package/src/components/card/Card.tsx

@@ -2,7 +2,7 @@
 
 import classNames from 'classnames'
 import { forwardRef, HTMLAttributes, ReactNode, Ref } from 'react'
-import type { TCardSkin, TLayout } from 'shared-types'
+import type { TCardSkin, TLayout, TTagSkin } from 'shared-types'
 
 import { PktTag } from '../tag/Tag'
 
@@ -12,8 +12,6 @@ type TCardImageShape = 'square' | 'round'
 type TCardTagPosition = 'top' | 'bottom'
 type THeadingLevel = 1 | 2 | 3 | 4 | 5 | 6
 
-type TTagSkin = 'blue' | 'blue-light' | 'blue-dark' | 'green' | 'red' | 'beige' | 'yellow' | 'grey' | 'gray'
-
 interface ICardTag {
   skin?: TTagSkin
   iconName?: string

package/src/components/fileupload/DropZone.tsx

@@ -14,7 +14,7 @@ import {
 
 import { defaultFileUploadStrings } from 'shared-types'
 
-import { PktIcon } from '..'
+import { PktIcon } from '../icon/Icon'
 import { FileItem, TFileItemList, TUploadStrategy } from './types'
 
 /**

package/src/components/fileupload/QueueItemContent.tsx

@@ -6,7 +6,7 @@ import {
   type TProgressState,
 } from 'shared-utils/fileupload'
 
-import { PktIcon } from '..'
+import { PktIcon } from '../icon/Icon'
 import { OperationButton, TransferError, TransferInProgress } from './Subcomponents'
 import {
   TFileAndTransfer,

package/src/components/fileupload/Subcomponents.tsx

@@ -2,7 +2,9 @@ import { RefObject, useEffect, useState } from 'react'
 
 import { getDisplayFilename, trapTabInside } from 'shared-utils/fileupload'
 
-import { PktButton, PktIcon, PktProgressbar } from '..'
+import { PktButton } from '../button/Button'
+import { PktIcon } from '../icon/Icon'
+import { PktProgressbar } from '../progressbar/Progressbar'
 import { PktModal } from '../modal/Modal'
 import { Truncate } from './Truncate'
 import { TFileAndTransfer, TQueueItemOperation, TQueueOperationContext, TTransferItemInProgress } from './types'

package/src/components/header-menu/HeaderMenu.test.tsx

@@ -81,8 +81,7 @@ describe('PktHeaderMenu rendering', () => {
 
   test('maps ODS icon names on service links', async () => {
     const { container } = render(<PktHeaderMenu data={LOCAL_DATA} open />)
-    await window.customElements.whenDefined('pkt-icon')
-    const icons = container.querySelectorAll<HTMLElement>('.pkt-header-menu__service-icon')
+const icons = container.querySelectorAll<HTMLElement>('.pkt-header-menu__service-icon')
     await waitFor(() => expect(icons[0]).toHaveAttribute('name', '24h'))
     expect(icons[1]).toHaveAttribute('name', 'shield-fire')
     // Unmapped passes through
@@ -123,15 +122,14 @@ describe('PktHeaderMenu rendering', () => {
 
   test('renders social links with derived aria-labels and icons', async () => {
     const { container } = render(<PktHeaderMenu data={LOCAL_DATA} open />)
-    await window.customElements.whenDefined('pkt-icon')
-    const social = container.querySelectorAll<HTMLElement>('.pkt-header-menu__social-link')
+const social = container.querySelectorAll<HTMLElement>('.pkt-header-menu__social-link')
     expect(social).toHaveLength(2)
     expect(social[0]).toHaveAttribute('aria-label', 'Facebook')
     expect(social[1]).toHaveAttribute('aria-label', 'LinkedIn')
     await waitFor(() =>
-      expect(social[0].querySelector('pkt-icon')).toHaveAttribute('name', 'facebook'),
+      expect(social[0].querySelector('.pkt-icon')).toHaveAttribute('name', 'facebook'),
     )
-    expect(social[1].querySelector('pkt-icon')).toHaveAttribute('name', 'linkedin')
+    expect(social[1].querySelector('.pkt-icon')).toHaveAttribute('name', 'linkedin')
   })
 
   test('calls onDataLoaded with the supplied payload', async () => {

package/src/components/icon/Icon.test.tsx

@@ -21,11 +21,11 @@ describe('PktIcon', () => {
   describe('with default fetcher', () => {
     test('fetches SVG with default fetcher', async () => {
       await render(<PktIcon name="arrow" />)
-      await window.customElements.whenDefined('pkt-icon')
 
-      const icon = await screen.findByRole('img')
+      const icon = await screen.findByTestId('icon')
       expect(icon).toMatchInlineSnapshot(`
         <svg
+          aria-hidden="true"
           data-filename="stiarrow.svg"
           data-testid="icon"
           role="img"
@@ -43,7 +43,6 @@ describe('PktIcon', () => {
           <PktIcon name={'some-icon'} />
         </div>,
       )
-      await window.customElements.whenDefined('pkt-icon')
 
       await waitFor(async () => {
         const icons = await screen.findAllByTestId('icon')
@@ -51,4 +50,70 @@ describe('PktIcon', () => {
       })
     })
   })
+
+  describe('aria-hidden', () => {
+    test('defaults to true on the SVG', async () => {
+      await render(<PktIcon name="arrow" />)
+      const svg = await screen.findByTestId('icon')
+
+      expect(svg).toHaveAttribute('aria-hidden', 'true')
+      expect(svg).not.toHaveAttribute('aria-label')
+    })
+
+    test('ariaHidden={false} sets aria-hidden="false" and aria-label fallback to name', async () => {
+      await render(<PktIcon name="arrow" ariaHidden={false} />)
+      const svg = await screen.findByTestId('icon')
+
+      expect(svg).toHaveAttribute('aria-hidden', 'false')
+      expect(svg).toHaveAttribute('aria-label', 'arrow')
+    })
+
+    test('ariaHidden="false" string is treated as boolean false', async () => {
+      await render(<PktIcon name="arrow" ariaHidden="false" />)
+      const svg = await screen.findByTestId('icon')
+
+      expect(svg).toHaveAttribute('aria-hidden', 'false')
+    })
+
+    test('ariaHidden="true" string is treated as boolean true', async () => {
+      await render(<PktIcon name="arrow" ariaHidden="true" />)
+      const svg = await screen.findByTestId('icon')
+
+      expect(svg).toHaveAttribute('aria-hidden', 'true')
+    })
+
+    test('back-compat: aria-hidden kebab attribute still routes to the SVG', async () => {
+      const { container } = await render(<PktIcon name="arrow" aria-hidden={false} />)
+      const svg = await screen.findByTestId('icon')
+
+      expect(svg).toHaveAttribute('aria-hidden', 'false')
+      // Wrapper span itself should not carry aria-hidden
+      expect(container.querySelector('.pkt-icon')).not.toHaveAttribute('aria-hidden')
+    })
+  })
+
+  describe('aria-label', () => {
+    test('ariaLabel alone makes aria-hidden default to false', async () => {
+      await render(<PktIcon name="arrow" ariaLabel="Gå til forsiden" />)
+      const svg = await screen.findByTestId('icon')
+
+      expect(svg).toHaveAttribute('aria-hidden', 'false')
+      expect(svg).toHaveAttribute('aria-label', 'Gå til forsiden')
+    })
+
+    test('ariaLabel + ariaHidden={true} keeps aria-hidden="true" and omits aria-label', async () => {
+      await render(<PktIcon name="arrow" ariaLabel="Lukk" ariaHidden={true} />)
+      const svg = await screen.findByTestId('icon')
+
+      expect(svg).toHaveAttribute('aria-hidden', 'true')
+      expect(svg).not.toHaveAttribute('aria-label')
+    })
+
+    test('ariaHidden={false} without ariaLabel falls back to the icon name', async () => {
+      await render(<PktIcon name="chevron-right" ariaHidden={false} />)
+      const svg = await screen.findByTestId('icon')
+
+      expect(svg).toHaveAttribute('aria-label', 'chevron-right')
+    })
+  })
 })

package/src/components/icon/Icon.tsx

@@ -1,23 +1,182 @@
 'use client'
 
-import { createComponent } from '@lit/react'
-import { PktIcon as PktEl } from '@oslokommune/punkt-elements'
-// eslint-disable-next-line no-restricted-syntax -- React is required for createComponent
-import React, { FC } from 'react'
+import classNames from 'classnames'
+import {
+  forwardRef,
+  HTMLAttributes,
+  MutableRefObject,
+  useEffect,
+  useLayoutEffect,
+  useRef,
+} from 'react'
 import type { Booleanish } from 'shared-types'
 
-import { PktElConstructor, PktElType } from '@/interfaces/IPktElements'
+const defaultPath = 'https://punkt-cdn.oslo.kommune.no/latest/icons/'
 
-interface IPktIcon extends PktElType {
+if (typeof window !== 'undefined') {
+  window.pktFetch =
+    window.pktFetch === undefined ? (fetch as unknown as typeof window.pktFetch) : window.pktFetch
+  window.pktIconPath = window.pktIconPath || defaultPath
+}
+
+const errorSvg = '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32"></svg>'
+const dlCache: { [key: string]: Promise<string> } = {}
+const MAX_RETRIES = 2
+const RETRY_DELAY = 1500
+
+const isSessionStorageAvailable =
+  typeof Storage !== 'undefined' && typeof sessionStorage !== 'undefined'
+
+const useIsomorphicLayoutEffect = typeof window !== 'undefined' ? useLayoutEffect : useEffect
+
+const getCachedIconSync = (name: string, path: string | undefined): string => {
+  if (!name || !isSessionStorageAvailable) return ''
+  return sessionStorage.getItem(path + name + '.svg') ?? ''
+}
+
+const fetchIcon = (url: string): Promise<string> =>
+  (window.pktFetch as unknown as typeof fetch)(url).then((response) => {
+    if (!response.ok) {
+      throw new Error('Missing icon: ' + url)
+    }
+    return response.text()
+  })
+
+const fetchIconWithRetry = async (url: string, retries = MAX_RETRIES): Promise<string> => {
+  try {
+    return await fetchIcon(url)
+  } catch (error) {
+    if (retries > 0) {
+      await new Promise((resolve) => setTimeout(resolve, RETRY_DELAY))
+      return fetchIconWithRetry(url, retries - 1)
+    }
+    // eslint-disable-next-line no-console
+    console.error('Failed to fetch icon: ' + url)
+    return errorSvg
+  }
+}
+
+const downloadIconOrGetFromCache = async (
+  name: string,
+  path: string | undefined,
+): Promise<string | null> => {
+  const key = path + name + '.svg'
+
+  if (isSessionStorageAvailable && sessionStorage.getItem(key)) {
+    return sessionStorage.getItem(key)
+  }
+
+  if (key in dlCache) {
+    return dlCache[key]
+  }
+
+  if (typeof window !== 'undefined' && typeof window.pktFetch === 'function') {
+    dlCache[key] = fetchIconWithRetry(key).then((text) => {
+      if (text !== errorSvg && isSessionStorageAvailable) {
+        sessionStorage.setItem(key, text)
+      }
+      delete dlCache[key]
+      return text
+    })
+    return dlCache[key]
+  }
+  return errorSvg
+}
+
+interface IPktIcon extends HTMLAttributes<HTMLElement> {
   name?: string
   path?: string
-  'aria-hidden'?: Booleanish | undefined
+  ariaHidden?: Booleanish
+  ariaLabel?: string
+}
+
+const toBoolean = (v: Booleanish | undefined): boolean | undefined => {
+  if (v === undefined) return undefined
+  return v === true || v === 'true'
 }
 
-export const PktIcon: FC<IPktIcon> = createComponent({
-  tagName: 'pkt-icon',
-  elementClass: PktEl as PktElConstructor<HTMLElement>,
-  react: React,
-  displayName: 'PktIcon',
-  events: {},
+export const PktIcon = forwardRef<HTMLSpanElement, IPktIcon>(function PktIcon(
+  {
+    name = '',
+    path,
+    className,
+    ariaHidden,
+    ariaLabel,
+    'aria-hidden': ariaHiddenAttr,
+    'aria-label': ariaLabelAttr,
+    ...rest
+  },
+  forwardedRef,
+) {
+  const resolvedPath =
+    path ?? (typeof window !== 'undefined' ? window.pktIconPath : defaultPath)
+  const elementRef = useRef<HTMLSpanElement | null>(null)
+
+  const explicitAriaHidden = toBoolean(ariaHidden) ?? toBoolean(ariaHiddenAttr)
+  const explicitAriaLabel = ariaLabel ?? ariaLabelAttr
+  const effectiveAriaHidden =
+    explicitAriaHidden !== undefined ? explicitAriaHidden : !explicitAriaLabel
+  const effectiveAriaLabel = effectiveAriaHidden ? undefined : explicitAriaLabel || name
+
+  useIsomorphicLayoutEffect(() => {
+    const el = elementRef.current
+    if (!el) return
+
+    const applyAria = (root: HTMLElement) => {
+      const svg = root.querySelector('svg')
+      if (!svg) return
+      svg.setAttribute('aria-hidden', String(effectiveAriaHidden))
+      if (effectiveAriaLabel) {
+        svg.setAttribute('aria-label', effectiveAriaLabel)
+      } else {
+        svg.removeAttribute('aria-label')
+      }
+    }
+
+    if (!name) {
+      el.innerHTML = ''
+      return
+    }
+
+    const cached = getCachedIconSync(name, resolvedPath)
+    if (cached) {
+      el.innerHTML = cached
+      applyAria(el)
+      return
+    }
+
+    let cancelled = false
+    downloadIconOrGetFromCache(name, resolvedPath).then((text) => {
+      if (cancelled) return
+      const current = elementRef.current
+      if (current) {
+        current.innerHTML = text || errorSvg
+        applyAria(current)
+      }
+    })
+    return () => {
+      cancelled = true
+    }
+  }, [name, resolvedPath, effectiveAriaHidden, effectiveAriaLabel])
+
+  const setRef = (el: HTMLSpanElement | null) => {
+    elementRef.current = el
+    if (typeof forwardedRef === 'function') {
+      forwardedRef(el)
+    } else if (forwardedRef) {
+      ;(forwardedRef as MutableRefObject<HTMLSpanElement | null>).current = el
+    }
+  }
+
+  return (
+    <span
+      {...rest}
+      ref={setRef}
+      className={classNames('pkt-icon', className)}
+      {...(name ? { name } : {})}
+      data-path={resolvedPath}
+    />
+  )
 })
+
+PktIcon.displayName = 'PktIcon'

package/src/components/link/Link.tsx

@@ -3,7 +3,7 @@
 import classNames from 'classnames'
 import { FC, LinkHTMLAttributes } from 'react'
 
-import { PktIcon } from '..'
+import { PktIcon } from '../icon/Icon'
 
 interface IPktLink extends LinkHTMLAttributes<HTMLAnchorElement> {
   href?: string

package/src/components/linkcard/LinkCard.tsx

@@ -3,7 +3,7 @@
 import classNames from 'classnames'
 import { HTMLAttributes, ReactNode } from 'react'
 
-import { PktIcon } from '..'
+import { PktIcon } from '../icon/Icon'
 
 export interface IPktLinkCard extends Omit<HTMLAttributes<HTMLAnchorElement>, 'title'> {
   skin?: 'normal' | 'no-padding' | 'blue' | 'beige' | 'green' | 'gray' | 'beige-outline' | 'gray-outline'

package/src/components/messagebox/Messagebox.tsx

@@ -4,7 +4,7 @@ import classNames from 'classnames'
 import { createRef, FC, HTMLAttributes, ReactNode, useCallback, useState } from 'react'
 import type { TMessageboxSkin } from 'shared-types'
 
-import { PktIcon } from '..'
+import { PktIcon } from '../icon/Icon'
 
 export type { TMessageboxSkin }
 

package/src/components/tabs/TabItem.tsx

@@ -3,10 +3,10 @@
 import { forwardRef, type KeyboardEvent, type MouseEvent, type ReactNode } from 'react'
 
 import { PktIcon } from '../icon/Icon'
-import { type IPktTag, PktTag } from '../tag/Tag'
-import { useTabsContext } from './Tabs'
+import type { TTagSkin } from 'shared-types'
 
-export type TSkin = IPktTag['skin']
+import { PktTag } from '../tag/Tag'
+import { useTabsContext } from './Tabs'
 
 export interface IPktTabItem {
   children: ReactNode
@@ -17,7 +17,7 @@ export interface IPktTabItem {
   icon?: string
   controls?: string
   tag?: string
-  tagSkin?: TSkin
+  tagSkin?: TTagSkin
   index?: number
 }
 

package/src/components/tabs/Tabs.tsx

@@ -12,11 +12,11 @@ import {
   useRef,
 } from 'react'
 
+import type { TTagSkin } from 'shared-types'
+
 import { PktIcon } from '../icon/Icon'
 import { PktTabItem } from './TabItem'
 
-export type TSkin = 'blue' | 'green' | 'red' | 'beige' | 'yellow' | 'grey' | 'gray' | 'blue-light'
-
 // Context for passing tab navigation logic to children
 interface ITabsContext {
   arrowNav: boolean
@@ -48,7 +48,7 @@ export interface IPktTab {
   controls?: string
   tag?: {
     text: string
-    skin: TSkin | undefined
+    skin: TTagSkin | undefined
   }
   active?: boolean
 }

package/src/components/tag/Tag.tsx

@@ -14,10 +14,12 @@ import {
   useState,
 } from 'react'
 
-import { PktIcon } from '..'
+import type { TTagSkin } from 'shared-types'
+
+import { PktIcon } from '../icon/Icon'
 
 interface BasePktTagProps {
-  skin?: 'blue' | 'blue-light' | 'blue-dark' | 'green' | 'red' | 'beige' | 'yellow' | 'grey' | 'gray'
+  skin?: TTagSkin
   textStyle?: 'normal-text' | 'thin-text'
   size?: 'small' | 'medium' | 'large'
   closeTag?: boolean