@oslokommune/punkt-react 16.18.0 → 16.20.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oslokommune/punkt-react",
-  "version": "16.18.0",
+  "version": "16.20.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.18.0",
+    "@oslokommune/punkt-elements": "^16.19.0",
     "classnames": "^2.5.1",
     "prettier": "^3.3.3",
     "react-hook-form": "^7.53.0"
@@ -109,5 +109,5 @@
     "url": "https://github.com/oslokommune/punkt/issues"
   },
   "license": "MIT",
-  "gitHead": "693c10d8d7a30c6b5c8acb6a7cb072b0afe50554"
+  "gitHead": "dee5033c347f7c10530f57d5dc05c5411b75033f"
 }

package/src/components/heading/Heading.test.tsx

@@ -1,20 +1,19 @@
 import '@testing-library/jest-dom'
 
-import { render, screen, waitFor } from '@testing-library/react'
+import { render } from '@testing-library/react'
 import { axe, toHaveNoViolations } from 'jest-axe'
-import { createRef } from 'react'
 
 import { PktHeading } from './Heading'
 
 expect.extend(toHaveNoViolations)
 
 describe('PktHeading', () => {
-  test('renders without errors', async () => {
-    render(<PktHeading />)
-    await window.customElements.whenDefined('pkt-heading')
+  test('renders without errors', () => {
+    const { container } = render(<PktHeading />)
+    expect(container.querySelector('h2')).toBeInTheDocument()
   })
 
-  test('renders with different levels', async () => {
+  test('renders with different levels', () => {
     const { container } = render(
       <>
         <PktHeading level={1}>Heading 1</PktHeading>
@@ -22,39 +21,41 @@ describe('PktHeading', () => {
         <PktHeading level={3}>Heading 3</PktHeading>
       </>,
     )
-    await window.customElements.whenDefined('pkt-heading')
 
-    const headings = container.querySelectorAll('pkt-heading')
-    expect(headings[0]).toHaveAttribute('aria-level', '1')
-    expect(headings[1]).toHaveAttribute('aria-level', '2')
-    expect(headings[2]).toHaveAttribute('aria-level', '3')
+    expect(container.querySelector('h1')).toHaveTextContent('Heading 1')
+    expect(container.querySelector('h2')).toHaveTextContent('Heading 2')
+    expect(container.querySelector('h3')).toHaveTextContent('Heading 3')
   })
 
-  test('renders with different sizes', async () => {
-    const ref = createRef<any>()
+  test('applies default size class based on level', () => {
+    const { container } = render(<PktHeading level={1}>Heading</PktHeading>)
+    expect(container.querySelector('h1')).toHaveClass('pkt-heading--xlarge')
+  })
+
+  test('renders with explicit size', () => {
     const { container } = render(<PktHeading size="xlarge">Large Heading</PktHeading>)
-    await window.customElements.whenDefined('pkt-heading')
+    const heading = container.querySelector('h2')
+    expect(heading).toHaveClass('pkt-heading--xlarge')
+  })
 
-    const headingElement = container.querySelector('pkt-heading')
-    expect(headingElement).toHaveClass('pkt-heading--xlarge')
-    expect(headingElement).toHaveAttribute('size', 'xlarge')
+  test('renders with explicit weight', () => {
+    const { container } = render(<PktHeading weight="bold">Bold Heading</PktHeading>)
+    expect(container.querySelector('h2')).toHaveClass('pkt-heading--fw-bold')
   })
 
-  test('renders with visually hidden prop', async () => {
+  test('renders with visually hidden prop', () => {
     const { container } = render(<PktHeading visuallyHidden>Hidden Heading</PktHeading>)
-    await window.customElements.whenDefined('pkt-heading')
-
-    const headingElement = container.querySelector('pkt-heading')
-    expect(headingElement).toHaveClass('pkt-sr-only')
-    expect(headingElement).toHaveAttribute('visuallyHidden')
+    expect(container.querySelector('h2')).toHaveClass('pkt-sr-only')
   })
 
-  test('renders with align props', async () => {
+  test('renders with align prop', () => {
     const { container } = render(<PktHeading align="center">Center Heading</PktHeading>)
-    await window.customElements.whenDefined('pkt-heading')
+    expect(container.querySelector('h2')).toHaveClass('pkt-heading--center')
+  })
 
-    const headingElement = container.querySelector('pkt-heading')
-    expect(headingElement).toHaveAttribute('align', 'center')
+  test('always carries the pkt-heading base class', () => {
+    const { container } = render(<PktHeading>Heading</PktHeading>)
+    expect(container.querySelector('h2')).toHaveClass('pkt-heading')
   })
 
   describe('accessibility', () => {
@@ -64,7 +65,6 @@ describe('PktHeading', () => {
           Accessible Heading
         </PktHeading>,
       )
-      await window.customElements.whenDefined('pkt-heading')
       const results = await axe(container)
       expect(results).toHaveNoViolations()
     })

package/src/components/heading/Heading.tsx

@@ -1,29 +1,77 @@
 'use client'
 
-import { createComponent } from '@lit/react'
-import { IPktHeading as IPktElHeading, PktHeading as PktElHeading } from '@oslokommune/punkt-elements'
-// eslint-disable-next-line no-restricted-syntax -- React is required for createComponent
-import React, { FC, forwardRef, ForwardRefExoticComponent, type LegacyRef, type ReactNode } from 'react'
+import classNames from 'classnames'
+import { forwardRef, HTMLAttributes, ReactNode } from 'react'
+import type { THeadingLevel, THeadingSize, THeadingWeight } from 'shared-types'
 
-import { PktElConstructor } from '@/interfaces/IPktElements'
+export type TPktHeadingLevel = THeadingLevel
+export type TPktHeadingSize = THeadingSize
+export type TPktHeadingWeight = THeadingWeight
 
-export interface IPktHeading extends IPktElHeading {
-  children?: ReactNode | ReactNode[]
-  ref?: LegacyRef<HTMLElement>
+export interface IPktHeading extends HTMLAttributes<HTMLHeadingElement> {
+  size?: TPktHeadingSize
+  level?: TPktHeadingLevel
+  weight?: TPktHeadingWeight
+  visuallyHidden?: boolean
+  align?: 'start' | 'center' | 'end'
+  children?: ReactNode
 }
 
-const LitComponent: FC<IPktHeading> = createComponent({
-  tagName: 'pkt-heading',
-  elementClass: PktElHeading as PktElConstructor<HTMLElement>,
-  react: React,
-  displayName: 'PktHeading',
-}) as ForwardRefExoticComponent<IPktHeading>
+const defaultSizeForLevel = (level: TPktHeadingLevel): TPktHeadingSize => {
+  switch (level) {
+    case 1:
+      return 'xlarge'
+    case 2:
+      return 'large'
+    case 3:
+      return 'medium'
+    case 4:
+      return 'small'
+    case 5:
+    case 6:
+      return 'xsmall'
+    default:
+      return 'medium'
+  }
+}
+
+const defaultWeightForLevel = (level: TPktHeadingLevel): TPktHeadingWeight => {
+  switch (level) {
+    case 1:
+    case 2:
+      return 'regular'
+    case 3:
+    case 4:
+    case 5:
+    case 6:
+      return 'medium'
+    default:
+      return 'medium'
+  }
+}
+
+export const PktHeading = forwardRef<HTMLHeadingElement, IPktHeading>(function PktHeading(
+  { level = 2, size, weight, visuallyHidden, align, className, children, ...rest },
+  ref,
+) {
+  const effectiveSize = size ?? defaultSizeForLevel(level)
+  const effectiveWeight = weight ?? defaultWeightForLevel(level)
+
+  const classes = classNames(
+    'pkt-heading',
+    `pkt-heading--${effectiveSize}`,
+    `pkt-heading--fw-${effectiveWeight}`,
+    align && `pkt-heading--${align}`,
+    visuallyHidden && 'pkt-sr-only',
+    className,
+  )
+
+  const Tag = `h${level}` as 'h1' | 'h2' | 'h3' | 'h4' | 'h5' | 'h6'
 
-export const PktHeading: FC<IPktHeading> = forwardRef(({ children, ...props }: IPktHeading, ref) => {
   return (
-    <LitComponent data-testid="pkt-heading" {...props} ref={ref}>
+    <Tag {...rest} ref={ref} className={classes} data-testid="pkt-heading">
       {children}
-    </LitComponent>
+    </Tag>
   )
 })
 

package/src/components/helptext/Helptext.test.tsx

@@ -0,0 +1,98 @@
+import '@testing-library/jest-dom'
+
+import { fireEvent, render, screen } from '@testing-library/react'
+import { vi } from 'vitest'
+
+import { PktHelptext } from './Helptext'
+
+describe('PktHelptext', () => {
+  test('renders the container without the has-helptext modifier when empty', () => {
+    const { container } = render(<PktHelptext forId="field" />)
+
+    const root = container.querySelector('.pkt-inputwrapper__helptext-container')
+    expect(root).toBeInTheDocument()
+    expect(root).not.toHaveClass('pkt-inputwrapper__has-helptext')
+  })
+
+  test('renders helptext string as HTML inside the helptext div', () => {
+    const { container } = render(<PktHelptext forId="field" helptext="Hjelp <strong>her</strong>" />)
+
+    const helptext = container.querySelector(`#field-helptext`)
+    expect(helptext).toBeInTheDocument()
+    expect(helptext?.querySelector('strong')).toHaveTextContent('her')
+    expect(container.querySelector('.pkt-inputwrapper__helptext-container')).toHaveClass(
+      'pkt-inputwrapper__has-helptext',
+    )
+  })
+
+  test('renders helptext ReactNode directly', () => {
+    render(
+      <PktHelptext forId="field" helptext={<em data-testid="rn">Rich</em>} />,
+    )
+
+    expect(screen.getByTestId('rn')).toHaveTextContent('Rich')
+  })
+
+  test('renders children inside pkt-contents', () => {
+    const { container } = render(
+      <PktHelptext forId="field">
+        <span data-testid="slot">Slot content</span>
+      </PktHelptext>,
+    )
+
+    const contents = container.querySelector('.pkt-contents')
+    expect(contents).toBeInTheDocument()
+    expect(contents?.querySelector('[data-testid="slot"]')).toHaveTextContent('Slot content')
+  })
+
+  test('renders the dropdown toggle button with the default label when no button text is provided', () => {
+    render(<PktHelptext forId="field" helptextDropdown="Mer info" />)
+
+    const button = screen.getByRole('button')
+    expect(button.querySelector('.pkt-btn__text')).toHaveTextContent('Les mer')
+  })
+
+  test('renders a custom helptextDropdownButton as HTML', () => {
+    render(
+      <PktHelptext
+        forId="field"
+        helptextDropdown="Mer info"
+        helptextDropdownButton="Vis <em>detaljer</em>"
+      />,
+    )
+
+    const button = screen.getByRole('button')
+    expect(button.querySelector('em')).toHaveTextContent('detaljer')
+  })
+
+  test('toggles the dropdown open class and calls onToggleHelpText', () => {
+    const onToggle = vi.fn()
+    const { container } = render(
+      <PktHelptext
+        forId="field"
+        helptextDropdown="Mer info"
+        onToggleHelpText={onToggle}
+      />,
+    )
+
+    const expandable = container.querySelector('.pkt-inputwrapper__helptext-expandable')
+    const innerHelptext = expandable?.querySelector('.pkt-inputwrapper__helptext')
+    expect(innerHelptext).toHaveClass('pkt-inputwrapper__helptext-expandable-closed')
+
+    fireEvent.click(screen.getByRole('button'))
+    expect(innerHelptext).toHaveClass('pkt-inputwrapper__helptext-expandable-open')
+    expect(onToggle).toHaveBeenLastCalledWith(true)
+
+    fireEvent.click(screen.getByRole('button'))
+    expect(innerHelptext).toHaveClass('pkt-inputwrapper__helptext-expandable-closed')
+    expect(onToggle).toHaveBeenLastCalledWith(false)
+  })
+
+  test('does not render an id on the helptext div when forId is missing', () => {
+    const { container } = render(<PktHelptext helptext="No id here" />)
+
+    const helptext = container.querySelector('.pkt-inputwrapper__helptext')
+    expect(helptext).toBeInTheDocument()
+    expect(helptext).not.toHaveAttribute('id')
+  })
+})

package/src/components/helptext/Helptext.tsx

@@ -1,37 +1,95 @@
 'use client'
 
-import { createComponent, EventName } from '@lit/react'
-import { PktHelptext as PktElHelptext } from '@oslokommune/punkt-elements'
-// eslint-disable-next-line no-restricted-syntax -- React is required for createComponent
-import React, { FC, forwardRef, ForwardRefExoticComponent, HTMLAttributes, LegacyRef, type ReactNode } from 'react'
+import classNames from 'classnames'
+import { forwardRef, HTMLAttributes, ReactNode, useState } from 'react'
+
+import { PktIcon } from '../icon/Icon'
+
+const defaultDropdownButton = "Les mer <span class='pkt-sr-only'>om feltet</span>"
 
 export interface IPktHelptextProps extends HTMLAttributes<HTMLDivElement> {
-  helptext?: string | ReactNode | ReactNode[]
-  helptextDropdown?: string | ReactNode | ReactNode[]
+  helptext?: string | ReactNode
+  helptextDropdown?: string | ReactNode
   helptextDropdownButton?: string
   forId?: string
-  ref?: LegacyRef<HTMLDivElement>
-  onToggleHelpText?: (e: CustomEvent) => void
+  onToggleHelpText?: (isOpen: boolean) => void
 }
 
-export const LitComponent = createComponent({
-  tagName: 'pkt-helptext',
-  elementClass: PktElHelptext,
-  react: React,
-  displayName: 'PktHelptext',
-  events: {
-    onToggleHelpText: 'toggleHelpText' as EventName<CustomEvent>,
-  },
-}) as ForwardRefExoticComponent<IPktHelptextProps>
-
-export const PktHelptext: FC<IPktHelptextProps> = forwardRef(
-  ({ children, ...props }, ref: LegacyRef<HTMLDivElement>) => {
-    return (
-      <LitComponent {...props} ref={ref}>
-        <div className="pkt-contents">{children}</div>
-      </LitComponent>
-    )
+const renderContent = (content: string | ReactNode | undefined): ReactNode => {
+  if (content === undefined || content === null || content === '') return null
+  if (typeof content === 'string') {
+    return <span dangerouslySetInnerHTML={{ __html: content }} />
+  }
+  return content
+}
+
+export const PktHelptext = forwardRef<HTMLDivElement, IPktHelptextProps>(function PktHelptext(
+  {
+    helptext,
+    helptextDropdown,
+    helptextDropdownButton,
+    forId,
+    onToggleHelpText,
+    className,
+    children,
+    ...rest
   },
-)
+  ref,
+) {
+  const [isOpen, setIsOpen] = useState(false)
+
+  const toggle = () => {
+    const next = !isOpen
+    setIsOpen(next)
+    onToggleHelpText?.(next)
+  }
+
+  const hasContent = Boolean(helptext || helptextDropdown || children)
+
+  const containerClasses = classNames(
+    'pkt-inputwrapper__helptext-container',
+    hasContent && 'pkt-inputwrapper__has-helptext',
+    className,
+  )
+
+  return (
+    <div {...rest} ref={ref} className={containerClasses}>
+      <div className="pkt-inputwrapper__helptext" id={forId ? `${forId}-helptext` : undefined}>
+        {children && <div className="pkt-contents">{children}</div>}
+        {renderContent(helptext)}
+      </div>
+      {helptextDropdown && (
+        <div className="pkt-inputwrapper__helptext-expandable">
+          <button
+            type="button"
+            className="pkt-link pkt-link--icon-right pkt-btn pkt-btn--small pkt-btn--tertiary pkt-btn--icon-right"
+            onClick={toggle}
+          >
+            <PktIcon
+              className="pkt-btn__icon"
+              name={isOpen ? 'chevron-thin-up' : 'chevron-thin-down'}
+            />
+            <span
+              className="pkt-btn__text"
+              dangerouslySetInnerHTML={{
+                __html: helptextDropdownButton ?? defaultDropdownButton,
+              }}
+            />
+          </button>
+          <div
+            className={classNames(
+              'pkt-inputwrapper__helptext',
+              isOpen
+                ? 'pkt-inputwrapper__helptext-expandable-open'
+                : 'pkt-inputwrapper__helptext-expandable-closed',
+            )}
+          >
+            {renderContent(helptextDropdown)}
+          </div>
+        </div>
+      )}
+    </div>
+  )
+})
 
 PktHelptext.displayName = 'PktHelptext'

package/src/components/inputwrapper/InputWrapper.tsx

@@ -1,10 +1,10 @@
 'use client'
 
-import { ForwardedRef, forwardRef, type ReactNode, RefAttributes, useState } from 'react'
+import { ForwardedRef, forwardRef, type ReactNode, RefAttributes } from 'react'
 
 import { useFocusModality } from '../../hooks/useFocusModality'
 import { PktAlert } from '../alert/Alert'
-import { PktButton } from '../button/Button'
+import { PktHelptext } from '../helptext/Helptext'
 
 export interface IPktInputWrapper extends RefAttributes<HTMLElement> {
   forId: string
@@ -63,8 +63,6 @@ export const PktInputWrapper = forwardRef(
     }: IPktInputWrapper,
     ref: ForwardedRef<HTMLDivElement>,
   ) => {
-    const [isHelpTextOpen, setIsHelpTextOpen] = useState(false)
-
     const focusModality = useFocusModality<HTMLDivElement>(ref)
 
     const describedBy = ariaDescribedby || (helptext ? `${forId}-helptext` : undefined)
@@ -72,8 +70,6 @@ export const PktInputWrapper = forwardRef(
     const counterTop = showCounter && counterPosition === 'top'
     const counterBottom = showCounter && counterPosition === 'bottom'
 
-    const toggleHelpText = () => setIsHelpTextOpen((prev) => !prev)
-
     const wrapperClasses = [
       'pkt-inputwrapper',
       className,
@@ -134,43 +130,16 @@ export const PktInputWrapper = forwardRef(
     }
 
     const renderHelptext = () => {
-      if (!helptext && !helptextDropdown) return null
+      const visibleHelptext = useWrapper ? helptext : undefined
+      if (!visibleHelptext && !helptextDropdown) return null
 
       return (
-        <>
-          {helptext && useWrapper && (
-            <div className="pkt-inputwrapper__helptext" id={`${forId}-helptext`}>
-              {helptext}
-            </div>
-          )}
-          {helptextDropdown && (
-            <div className="pkt-inputwrapper__helptext-expandable">
-              <PktButton
-                skin="tertiary"
-                size="small"
-                variant="icon-right"
-                iconName={isHelpTextOpen ? 'chevron-thin-up' : 'chevron-thin-down'}
-                className="pkt-link pkt-link--icon-right"
-                onClick={toggleHelpText}
-              >
-                <span
-                  dangerouslySetInnerHTML={{
-                    __html: helptextDropdownButton ?? 'Les mer <span class="pkt-sr-only">om inputfeltet</span>',
-                  }}
-                />
-              </PktButton>
-              <div
-                className={`pkt-inputwrapper__helptext ${
-                  isHelpTextOpen
-                    ? 'pkt-inputwrapper__helptext-expandable-open'
-                    : 'pkt-inputwrapper__helptext-expandable-closed'
-                }`}
-              >
-                {helptextDropdown}
-              </div>
-            </div>
-          )}
-        </>
+        <PktHelptext
+          forId={forId}
+          helptext={visibleHelptext}
+          helptextDropdown={helptextDropdown}
+          helptextDropdownButton={helptextDropdownButton}
+        />
       )
     }