@oslokommune/punkt-react 20.1.6 → 20.1.7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +5 -0
- package/dist/components/accordion/Accordion.d.ts +2 -1
- package/dist/components/accordion/Accordion.js +10 -9
- package/dist/components/accordion/AccordionItem.js +16 -16
- package/dist/punkt-react.cjs +1 -1
- package/dist/shared-types/accordion.d.ts +7 -2
- package/dist/shared-types/index.d.ts +2 -2
- package/package.json +3 -3
- package/src/components/accordion/Accordion.test.tsx +42 -0
- package/src/components/accordion/Accordion.tsx +9 -5
- package/src/components/accordion/AccordionItem.tsx +4 -2
|
@@ -11,12 +11,17 @@
|
|
|
11
11
|
/** Accordion skin varianter — delt runtime source for types, specs, og Preview. */
|
|
12
12
|
export declare const ACCORDION_SKINS: readonly ['borderless', 'outlined', 'gray', 'beige', 'blue', 'plus-minus'];
|
|
13
13
|
export type TAccordionSkin = (typeof ACCORDION_SKINS)[number];
|
|
14
|
+
/** Ikonet som viser om et accordion-item er åpent eller lukket. */
|
|
15
|
+
export declare const ACCORDION_INDICATORS: readonly ['chevron', 'plus-minus'];
|
|
16
|
+
export type TAccordionIndicator = (typeof ACCORDION_INDICATORS)[number];
|
|
14
17
|
/** Skins uten mørk variant. Radene får `data-mode="light"` og beholder lys modus. */
|
|
15
18
|
export declare const ACCORDION_LIGHT_ONLY_SKINS: readonly TAccordionSkin[];
|
|
16
19
|
/** Visual props delt med pkt-accordion og pkt-accordion-item. */
|
|
17
20
|
export type IAccordionVisualProps = {
|
|
18
21
|
skin?: TAccordionSkin;
|
|
19
22
|
compact?: boolean;
|
|
23
|
+
/** Open/closed indicator. `plus-minus` skin always shows plus/minus. */
|
|
24
|
+
indicator?: TAccordionIndicator;
|
|
20
25
|
};
|
|
21
26
|
/**
|
|
22
27
|
* Accordion props delt med React, Elements, og typed specs.
|
|
@@ -44,9 +49,9 @@ export type IPktAccordionItemBase = IAccordionVisualProps & {
|
|
|
44
49
|
name?: string;
|
|
45
50
|
};
|
|
46
51
|
/** Pkt-accordion props for typed component specs. */
|
|
47
|
-
export type IAccordionSpecProps = Pick<IPktAccordionBase, 'skin' | 'compact' | 'ariaLabelledBy' | 'name'>;
|
|
52
|
+
export type IAccordionSpecProps = Pick<IPktAccordionBase, 'skin' | 'compact' | 'indicator' | 'ariaLabelledBy' | 'name'>;
|
|
48
53
|
/** Pkt-accordion-item props for typed component specs. */
|
|
49
|
-
export type IAccordionItemSpecProps = Pick<IPktAccordionItemBase, 'id' | 'title' | 'defaultOpen' | 'isOpen' | 'name' | 'skin' | 'compact'> & {
|
|
54
|
+
export type IAccordionItemSpecProps = Pick<IPktAccordionItemBase, 'id' | 'title' | 'defaultOpen' | 'isOpen' | 'name' | 'skin' | 'compact' | 'indicator'> & {
|
|
50
55
|
/**
|
|
51
56
|
* React-only click handler on the `<details>` element.
|
|
52
57
|
* @remarks Elements has no equivalent — use native DOM events if needed.
|
|
@@ -28,8 +28,8 @@ export type { TPktLoaderVariant, IPktLoaderBase, ILoaderSpecProps } from './load
|
|
|
28
28
|
export { LAYOUT_DIRECTIONS } from './layout';
|
|
29
29
|
export type { TLayout, TVerticalPosition, THorizontalPosition, TPosition, TPositionWithCenter, } from './layout';
|
|
30
30
|
export type { THTMLButtonType, TSelectionMode } from './form';
|
|
31
|
-
export { ACCORDION_LIGHT_ONLY_SKINS, ACCORDION_SKINS } from './accordion';
|
|
32
|
-
export type { TAccordionSkin, IPktAccordionBase, IPktAccordionItemBase, IAccordionSpecProps, IAccordionItemSpecProps, IAccordionVisualProps, } from './accordion';
|
|
31
|
+
export { ACCORDION_INDICATORS, ACCORDION_LIGHT_ONLY_SKINS, ACCORDION_SKINS } from './accordion';
|
|
32
|
+
export type { TAccordionIndicator, TAccordionSkin, IPktAccordionBase, IPktAccordionItemBase, IAccordionSpecProps, IAccordionItemSpecProps, IAccordionVisualProps, } from './accordion';
|
|
33
33
|
export { BUTTON_SIZES, BUTTON_SKINS, BUTTON_COLORS, BUTTON_VARIANTS, BUTTON_STATES, BUTTON_DEFAULTS, } from './button';
|
|
34
34
|
export type { TPktButtonSize, TPktButtonSkin, TPktButtonColor, TPktButtonVariant, TPktButtonState, IPktButtonBase, IButtonSpecProps, } from './button';
|
|
35
35
|
export type { IPktBackLinkBase, IBacklinkSpecProps } from './backlink';
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@oslokommune/punkt-react",
|
|
3
|
-
"version": "20.1.
|
|
3
|
+
"version": "20.1.7",
|
|
4
4
|
"description": "React komponentbibliotek til Punkt, designsystem for Oslo kommune",
|
|
5
5
|
"homepage": "https://punkt.oslo.kommune.no",
|
|
6
6
|
"author": "Team Designsystem, Oslo kommune",
|
|
@@ -42,7 +42,7 @@
|
|
|
42
42
|
"@eslint/eslintrc": "^3.3.5",
|
|
43
43
|
"@eslint/js": "^10.0.1",
|
|
44
44
|
"@oslokommune/punkt-assets": "^20.0.5",
|
|
45
|
-
"@oslokommune/punkt-css": "^20.1.
|
|
45
|
+
"@oslokommune/punkt-css": "^20.1.7",
|
|
46
46
|
"@testing-library/jest-dom": "^7.0.1",
|
|
47
47
|
"@testing-library/react": "^16.3.3",
|
|
48
48
|
"@testing-library/user-event": "^14.6.8",
|
|
@@ -102,5 +102,5 @@
|
|
|
102
102
|
"url": "https://github.com/oslokommune/punkt/issues"
|
|
103
103
|
},
|
|
104
104
|
"license": "MIT",
|
|
105
|
-
"gitHead": "
|
|
105
|
+
"gitHead": "2cda971b4a2832f62d45d829dfe8d8904da3326a"
|
|
106
106
|
}
|
|
@@ -128,6 +128,48 @@ describe('PktAccordion', () => {
|
|
|
128
128
|
expect(container.querySelector('.pkt-accordion-item__icon--plus')).not.toBeInTheDocument()
|
|
129
129
|
})
|
|
130
130
|
|
|
131
|
+
test('propagates plus-minus indicator to items without changing skin', () => {
|
|
132
|
+
const { container } = render(
|
|
133
|
+
<PktAccordion skin="outlined" indicator="plus-minus">
|
|
134
|
+
<PktAccordionItem title="Title" id="item1">
|
|
135
|
+
Content
|
|
136
|
+
</PktAccordionItem>
|
|
137
|
+
</PktAccordion>,
|
|
138
|
+
)
|
|
139
|
+
|
|
140
|
+
expect(container.querySelector('.pkt-accordion-item__icon--plus')).toBeInTheDocument()
|
|
141
|
+
expect(container.querySelector('.pkt-accordion-item__icon--minus')).toBeInTheDocument()
|
|
142
|
+
expect(container.querySelector('[name="chevron-thin-down"]')).not.toBeInTheDocument()
|
|
143
|
+
expect(container.querySelector('.pkt-accordion')).toHaveClass('pkt-accordion--outlined')
|
|
144
|
+
expect(container.querySelector('.pkt-accordion-item--plus-minus')).not.toBeInTheDocument()
|
|
145
|
+
})
|
|
146
|
+
|
|
147
|
+
test('item indicator prop overrides accordion indicator', () => {
|
|
148
|
+
const { container } = render(
|
|
149
|
+
<PktAccordion indicator="plus-minus">
|
|
150
|
+
<PktAccordionItem title="Title" id="item1" indicator="chevron">
|
|
151
|
+
Content
|
|
152
|
+
</PktAccordionItem>
|
|
153
|
+
</PktAccordion>,
|
|
154
|
+
)
|
|
155
|
+
|
|
156
|
+
expect(container.querySelector('[name="chevron-thin-down"]')).toBeInTheDocument()
|
|
157
|
+
expect(container.querySelector('.pkt-accordion-item__icon--plus')).not.toBeInTheDocument()
|
|
158
|
+
})
|
|
159
|
+
|
|
160
|
+
test('plus-minus skin shows plus and minus regardless of indicator', () => {
|
|
161
|
+
const { container } = render(
|
|
162
|
+
<PktAccordion skin="plus-minus" indicator="chevron">
|
|
163
|
+
<PktAccordionItem title="Title" id="item1">
|
|
164
|
+
Content
|
|
165
|
+
</PktAccordionItem>
|
|
166
|
+
</PktAccordion>,
|
|
167
|
+
)
|
|
168
|
+
|
|
169
|
+
expect(container.querySelector('.pkt-accordion-item__icon--plus')).toBeInTheDocument()
|
|
170
|
+
expect(container.querySelector('[name="chevron-thin-down"]')).not.toBeInTheDocument()
|
|
171
|
+
})
|
|
172
|
+
|
|
131
173
|
test.each(['beige', 'blue'] as const)('sets data-mode="light" on %s rows', (skin) => {
|
|
132
174
|
const { container } = render(
|
|
133
175
|
<PktAccordion skin={skin}>
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
'use client'
|
|
2
2
|
|
|
3
3
|
import { createContext, forwardRef, ReactNode, useContext } from 'react'
|
|
4
|
-
import type { IPktAccordionBase, TAccordionSkin } from 'shared-types'
|
|
4
|
+
import type { IPktAccordionBase, TAccordionIndicator, TAccordionSkin } from 'shared-types'
|
|
5
5
|
|
|
6
6
|
export type TPktAccordionSkin = TAccordionSkin
|
|
7
7
|
|
|
@@ -10,13 +10,17 @@ export interface IPktAccordion extends IPktAccordionBase {
|
|
|
10
10
|
className?: string
|
|
11
11
|
}
|
|
12
12
|
|
|
13
|
-
// Send name og
|
|
14
|
-
const AccordionContext = createContext<{
|
|
13
|
+
// Send name, skin og indicator som context til AccordionItem-children
|
|
14
|
+
const AccordionContext = createContext<{
|
|
15
|
+
name?: string
|
|
16
|
+
skin?: TPktAccordionSkin
|
|
17
|
+
indicator?: TAccordionIndicator
|
|
18
|
+
}>({})
|
|
15
19
|
|
|
16
20
|
export const useAccordionContext = () => useContext(AccordionContext)
|
|
17
21
|
|
|
18
22
|
export const PktAccordion = forwardRef<HTMLDivElement, IPktAccordion>(
|
|
19
|
-
({ compact = false, skin = 'borderless', ariaLabelledBy, children, name, className }, ref) => {
|
|
23
|
+
({ compact = false, skin = 'borderless', indicator, ariaLabelledBy, children, name, className }, ref) => {
|
|
20
24
|
const accordionClasses = [
|
|
21
25
|
'pkt-accordion',
|
|
22
26
|
compact && 'pkt-accordion--compact',
|
|
@@ -27,7 +31,7 @@ export const PktAccordion = forwardRef<HTMLDivElement, IPktAccordion>(
|
|
|
27
31
|
.join(' ')
|
|
28
32
|
|
|
29
33
|
return (
|
|
30
|
-
<AccordionContext.Provider value={{ name, skin }}>
|
|
34
|
+
<AccordionContext.Provider value={{ name, skin, indicator }}>
|
|
31
35
|
<div
|
|
32
36
|
ref={ref}
|
|
33
37
|
className={accordionClasses}
|
|
@@ -24,6 +24,7 @@ export const PktAccordionItem = forwardRef<HTMLDetailsElement, IPktAccordionItem
|
|
|
24
24
|
title,
|
|
25
25
|
skin,
|
|
26
26
|
compact = false,
|
|
27
|
+
indicator,
|
|
27
28
|
isOpen: controlledIsOpen,
|
|
28
29
|
children,
|
|
29
30
|
name,
|
|
@@ -34,13 +35,14 @@ export const PktAccordionItem = forwardRef<HTMLDetailsElement, IPktAccordionItem
|
|
|
34
35
|
ref,
|
|
35
36
|
) => {
|
|
36
37
|
const [internalIsOpen, setInternalIsOpen] = useState(defaultOpen)
|
|
37
|
-
const { name: contextName, skin: contextSkin } = useAccordionContext()
|
|
38
|
+
const { name: contextName, skin: contextSkin, indicator: contextIndicator } = useAccordionContext()
|
|
38
39
|
|
|
39
40
|
// Bruk name fra props eller fra context
|
|
40
41
|
const actualName = name || contextName
|
|
41
42
|
|
|
42
43
|
// Bruk skin fra props eller fra context
|
|
43
44
|
const actualSkin = skin || contextSkin
|
|
45
|
+
const isPlusMinus = actualSkin === 'plus-minus' || (indicator || contextIndicator) === 'plus-minus'
|
|
44
46
|
|
|
45
47
|
// Bruk controlled isOpen om prop, ellers bruk intern state
|
|
46
48
|
const isOpen = controlledIsOpen !== undefined ? controlledIsOpen : internalIsOpen
|
|
@@ -88,7 +90,7 @@ export const PktAccordionItem = forwardRef<HTMLDetailsElement, IPktAccordionItem
|
|
|
88
90
|
>
|
|
89
91
|
<summary className="pkt-accordion-item__title" id={`pkt-accordion-item-summary-${id}`}>
|
|
90
92
|
{title}
|
|
91
|
-
{
|
|
93
|
+
{isPlusMinus ? (
|
|
92
94
|
<>
|
|
93
95
|
<PktIcon
|
|
94
96
|
name="plus-sign"
|