@oslokommune/punkt-react 20.2.0 → 20.2.1
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 +16 -0
- package/dist/components/interfaces.d.ts +2 -1
- package/dist/components/tabs/TabItem.d.ts +2 -10
- package/dist/components/tabs/TabItem.js +62 -60
- package/dist/components/tabs/Tabs.d.ts +4 -23
- package/dist/components/tabs/Tabs.js +38 -43
- package/dist/punkt-react.cjs +1 -1
- package/dist/shared-types/index.d.ts +2 -0
- package/dist/shared-types/index.js +7 -6
- package/dist/shared-types/tabs.d.ts +66 -0
- package/dist/shared-types/tabs.js +12 -0
- package/package.json +2 -2
- package/src/components/interfaces.ts +2 -1
- package/src/components/tabs/TabItem.tsx +18 -12
- package/src/components/tabs/Tabs.test.tsx +22 -0
- package/src/components/tabs/Tabs.tsx +10 -43
package/CHANGELOG.md
CHANGED
|
@@ -5,6 +5,22 @@ og skriver commits ca etter [Conventional Commits](https://conventionalcommits.o
|
|
|
5
5
|
|
|
6
6
|
---
|
|
7
7
|
|
|
8
|
+
## [20.2.1](https://github.com/oslokommune/punkt/compare/20.2.0...20.2.1) (2026-11-17)
|
|
9
|
+
|
|
10
|
+
### Bug Fixes
|
|
11
|
+
* Typesikre tabs-spec + piltastene finner alle faner (#3831). - Tabs og TabItem har spesifikasjon i TypeScript, med felles typer og
|
|
12
|
+
defaultverdier
|
|
13
|
+
- Piltastene kødder seg ikke lenger til når en fane fjernes eller
|
|
14
|
+
skjules
|
|
15
|
+
- arrow-nav, disable-arrow-nav og toggle-panels bruker booleanish
|
|
16
|
+
|
|
17
|
+
Har nå brukt `useDefault` sammen med `reflect` i Elements slik at
|
|
18
|
+
attributtene blir reflektert på elementet _kun_ når verdien ikke er
|
|
19
|
+
default.
|
|
20
|
+
|
|
21
|
+
---
|
|
22
|
+
|
|
23
|
+
|
|
8
24
|
## [20.2.0](https://github.com/oslokommune/punkt/compare/20.1.7...20.2.0) (2026-11-17)
|
|
9
25
|
|
|
10
26
|
### Features
|
|
@@ -25,7 +25,8 @@ export type { IPktRadioButton } from './radio/RadioButton';
|
|
|
25
25
|
export type { IPktRadioGroup } from './radiogroup/RadioGroup';
|
|
26
26
|
export type { IPktStep } from './stepper/Step';
|
|
27
27
|
export type { IPktStepper } from './stepper/Stepper';
|
|
28
|
-
export type { IPktTab } from './tabs/Tabs';
|
|
28
|
+
export type { IPktTab, IPktTabs } from './tabs/Tabs';
|
|
29
|
+
export type { IPktTabItem } from './tabs/TabItem';
|
|
29
30
|
export type { IPktTag } from './tag/Tag';
|
|
30
31
|
export type { IPktTextarea } from './textarea/Textarea';
|
|
31
32
|
export type { IPktTextinput } from './textinput/Textinput';
|
|
@@ -1,15 +1,7 @@
|
|
|
1
1
|
import { MouseEvent, ReactNode } from 'react';
|
|
2
|
-
import {
|
|
3
|
-
export interface IPktTabItem {
|
|
2
|
+
import { IPktTabItemBase } from '../../shared-types';
|
|
3
|
+
export interface IPktTabItem extends IPktTabItemBase {
|
|
4
4
|
children: ReactNode;
|
|
5
|
-
active?: boolean;
|
|
6
|
-
disabled?: boolean;
|
|
7
|
-
href?: string;
|
|
8
5
|
onClick?: (event: MouseEvent) => void;
|
|
9
|
-
icon?: string;
|
|
10
|
-
controls?: string;
|
|
11
|
-
tag?: string;
|
|
12
|
-
tagSkin?: TTagSkin;
|
|
13
|
-
index?: number;
|
|
14
6
|
}
|
|
15
7
|
export declare const PktTabItem: import('react').ForwardRefExoticComponent<IPktTabItem & import('react').RefAttributes<HTMLButtonElement | HTMLAnchorElement>>;
|
|
@@ -1,79 +1,81 @@
|
|
|
1
1
|
"use client";
|
|
2
|
-
import {
|
|
3
|
-
import {
|
|
4
|
-
import
|
|
5
|
-
import {
|
|
6
|
-
import {
|
|
7
|
-
import {
|
|
2
|
+
import { TAB_ITEM_DEFAULTS as e } from "../../shared-types/tabs.js";
|
|
3
|
+
import { PktIcon as t } from "../icon/Icon.js";
|
|
4
|
+
import "../../shared-types/index.js";
|
|
5
|
+
import { syncTabPanel as n, tabIdFor as r } from "../../shared-utils/tabs/panels.js";
|
|
6
|
+
import { PktTag as i } from "../tag/Tag.js";
|
|
7
|
+
import { useTabsContext as a } from "./Tabs.js";
|
|
8
|
+
import { forwardRef as o, useEffect as s, useRef as c } from "react";
|
|
9
|
+
import { Fragment as l, jsx as u, jsxs as d } from "react/jsx-runtime";
|
|
8
10
|
// src/components/tabs/TabItem.tsx
|
|
9
|
-
var
|
|
10
|
-
let { arrowNav:
|
|
11
|
-
|
|
12
|
-
|
|
11
|
+
var f = o(({ children: o, active: f = e.active, disabled: p = e.disabled, href: m, onClick: h, icon: g, controls: _, tag: v, tagSkin: y = e.tagSkin, index: b = e.index }, x) => {
|
|
12
|
+
let { arrowNav: S, togglePanels: C, selectedIndex: w, setSelectedIndex: T, fallbackFocusIndex: E, reportTab: D, registerTabRef: O, handleKeyPress: k, selectTab: A } = a(), j = !p && (C && w !== null ? w === b : !!f), M = j || E === b, N = C && _ ? r(_) : void 0, P = !S && j ? m ? "page" : "true" : void 0, F = c(null);
|
|
13
|
+
s(() => {
|
|
14
|
+
C && f && !p && T(b);
|
|
13
15
|
}, [
|
|
14
|
-
|
|
15
|
-
d,
|
|
16
|
+
C,
|
|
16
17
|
f,
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
18
|
+
p,
|
|
19
|
+
b,
|
|
20
|
+
T
|
|
21
|
+
]), s(() => (D(b, {
|
|
22
|
+
active: j,
|
|
23
|
+
disabled: p
|
|
24
|
+
}), () => D(b, null)), [
|
|
25
|
+
b,
|
|
26
|
+
j,
|
|
27
|
+
p,
|
|
28
|
+
D
|
|
29
|
+
]), s(() => {
|
|
30
|
+
C && _ && F.current && n(F.current, _, j, S);
|
|
29
31
|
}, [
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
32
|
+
C,
|
|
33
|
+
_,
|
|
34
|
+
j,
|
|
35
|
+
S
|
|
34
36
|
]);
|
|
35
|
-
let
|
|
36
|
-
id:
|
|
37
|
-
"aria-selected":
|
|
38
|
-
"aria-current":
|
|
39
|
-
"aria-controls":
|
|
40
|
-
role:
|
|
37
|
+
let I = {
|
|
38
|
+
id: N,
|
|
39
|
+
"aria-selected": S ? j : void 0,
|
|
40
|
+
"aria-current": P,
|
|
41
|
+
"aria-controls": _,
|
|
42
|
+
role: S ? "tab" : void 0,
|
|
41
43
|
onKeyDown: (e) => {
|
|
42
|
-
|
|
44
|
+
p && (e.key === "Enter" || e.key === " " || e.key === "Spacebar") ? (e.preventDefault(), e.stopPropagation()) : k(b, e);
|
|
43
45
|
},
|
|
44
46
|
onClick: (e) => {
|
|
45
|
-
|
|
47
|
+
p ? (e.preventDefault(), e.stopPropagation()) : (A(b), h?.(e));
|
|
46
48
|
},
|
|
47
|
-
tabIndex:
|
|
49
|
+
tabIndex: p ? -1 : M || !S ? void 0 : -1,
|
|
48
50
|
ref: (e) => {
|
|
49
|
-
|
|
51
|
+
F.current = e, O(b, e), typeof x == "function" ? x(e) : x && (x.current = e);
|
|
50
52
|
}
|
|
51
|
-
},
|
|
52
|
-
|
|
53
|
-
name:
|
|
54
|
-
className: `pkt-icon--small ${
|
|
53
|
+
}, L = /* @__PURE__ */ d(l, { children: [
|
|
54
|
+
g && /* @__PURE__ */ u(t, {
|
|
55
|
+
name: g,
|
|
56
|
+
className: `pkt-icon--small ${g === "check" ? "pkt-tabs__status-icon" : ""}`
|
|
55
57
|
}),
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
skin:
|
|
58
|
+
o,
|
|
59
|
+
v && /* @__PURE__ */ u(i, {
|
|
60
|
+
skin: y,
|
|
59
61
|
size: "small",
|
|
60
|
-
children:
|
|
62
|
+
children: v
|
|
61
63
|
})
|
|
62
64
|
] });
|
|
63
|
-
return
|
|
64
|
-
...
|
|
65
|
-
href:
|
|
66
|
-
"aria-disabled":
|
|
67
|
-
className: `pkt-tabs__link ${
|
|
68
|
-
children:
|
|
69
|
-
}) : /* @__PURE__ */
|
|
70
|
-
...
|
|
65
|
+
return m ? /* @__PURE__ */ u("a", {
|
|
66
|
+
...I,
|
|
67
|
+
href: p ? void 0 : m,
|
|
68
|
+
"aria-disabled": p || void 0,
|
|
69
|
+
className: `pkt-tabs__link ${j ? "active" : ""} ${p ? "pkt-tabs__item--disabled" : ""}`,
|
|
70
|
+
children: L
|
|
71
|
+
}) : /* @__PURE__ */ u("button", {
|
|
72
|
+
...I,
|
|
71
73
|
type: "button",
|
|
72
|
-
disabled:
|
|
73
|
-
"aria-disabled":
|
|
74
|
-
className: `pkt-tabs__button pkt-link-button ${
|
|
75
|
-
children:
|
|
74
|
+
disabled: p,
|
|
75
|
+
"aria-disabled": p || void 0,
|
|
76
|
+
className: `pkt-tabs__button pkt-link-button ${j ? "active" : ""} ${p ? "pkt-tabs__item--disabled" : ""}`,
|
|
77
|
+
children: L
|
|
76
78
|
});
|
|
77
79
|
});
|
|
78
|
-
|
|
79
|
-
export {
|
|
80
|
+
f.displayName = "PktTabItem";
|
|
81
|
+
export { f as PktTabItem };
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { KeyboardEvent, ReactNode } from 'react';
|
|
2
|
-
import {
|
|
2
|
+
import { IPktTab, IPktTabsBase } from '../../shared-types';
|
|
3
3
|
type TTabState = {
|
|
4
4
|
active: boolean;
|
|
5
5
|
disabled: boolean;
|
|
@@ -11,32 +11,13 @@ interface ITabsContext {
|
|
|
11
11
|
setSelectedIndex: (index: number) => void;
|
|
12
12
|
fallbackFocusIndex: number | null;
|
|
13
13
|
reportTab: (index: number, state: TTabState | null) => void;
|
|
14
|
-
registerTabRef: (index: number, el: HTMLAnchorElement | HTMLButtonElement | null
|
|
14
|
+
registerTabRef: (index: number, el: HTMLAnchorElement | HTMLButtonElement | null) => void;
|
|
15
15
|
handleKeyPress: (index: number, event: KeyboardEvent<HTMLAnchorElement | HTMLButtonElement>) => void;
|
|
16
16
|
selectTab: (index: number) => void;
|
|
17
17
|
}
|
|
18
18
|
export declare const useTabsContext: () => ITabsContext;
|
|
19
|
-
export
|
|
20
|
-
|
|
21
|
-
href?: string;
|
|
22
|
-
action?: (index: number) => void;
|
|
23
|
-
disabled?: boolean;
|
|
24
|
-
icon?: string;
|
|
25
|
-
controls?: string;
|
|
26
|
-
tag?: {
|
|
27
|
-
text: string;
|
|
28
|
-
skin: TTagSkin | undefined;
|
|
29
|
-
};
|
|
30
|
-
active?: boolean;
|
|
31
|
-
}
|
|
32
|
-
export interface IPktTabs {
|
|
33
|
-
arrowNav?: boolean;
|
|
34
|
-
disableArrowNav?: boolean;
|
|
35
|
-
separatorIconName?: string;
|
|
36
|
-
separatorIconPath?: string;
|
|
37
|
-
togglePanels?: boolean;
|
|
38
|
-
ariaLabel?: string;
|
|
39
|
-
ariaLabelledBy?: string;
|
|
19
|
+
export type { IPktTab };
|
|
20
|
+
export interface IPktTabs extends IPktTabsBase {
|
|
40
21
|
tabs?: IPktTab[];
|
|
41
22
|
onTabSelected?: (index: number) => void;
|
|
42
23
|
children?: ReactNode;
|
|
@@ -1,41 +1,36 @@
|
|
|
1
1
|
"use client";
|
|
2
|
-
import {
|
|
3
|
-
import
|
|
4
|
-
import {
|
|
5
|
-
import {
|
|
6
|
-
import {
|
|
2
|
+
import { TABS_DEFAULTS as e } from "../../shared-types/tabs.js";
|
|
3
|
+
import "../../shared-types/index.js";
|
|
4
|
+
import { tabIndexForKey as t } from "../../shared-utils/tabs/keyboard.js";
|
|
5
|
+
import { PktIcon as n } from "../icon/Icon.js";
|
|
6
|
+
import { PktTabItem as r } from "./TabItem.js";
|
|
7
|
+
import { withStableKeys as i } from "../../utils/stableKeys.js";
|
|
8
|
+
import { Children as a, createContext as o, forwardRef as s, useCallback as c, useContext as l, useRef as u, useState as d } from "react";
|
|
7
9
|
import { jsx as f } from "react/jsx-runtime";
|
|
8
10
|
// src/components/tabs/Tabs.tsx
|
|
9
|
-
var p =
|
|
10
|
-
let e =
|
|
11
|
+
var p = o(null), m = () => {
|
|
12
|
+
let e = l(p);
|
|
11
13
|
if (!e) throw Error("TabItem must be used within a Tabs component");
|
|
12
14
|
return e;
|
|
13
|
-
}, h =
|
|
14
|
-
let S = u([]), C
|
|
15
|
-
|
|
15
|
+
}, h = s(({ arrowNav: o = e.arrowNav, disableArrowNav: s = e.disableArrowNav, separatorIconName: l, separatorIconPath: m, togglePanels: h = e.togglePanels, ariaLabel: g, ariaLabelledBy: _, tabs: v, onTabSelected: y, children: b }, x) => {
|
|
16
|
+
let S = u([]), [C, w] = d(null), [T, E] = d(null), D = c((e, t) => {
|
|
17
|
+
E((n) => {
|
|
16
18
|
let r = n?.[e];
|
|
17
19
|
if (t ? r?.active === t.active && r?.disabled === t.disabled : !r) return n;
|
|
18
20
|
let i = { ...n };
|
|
19
21
|
return t ? i[e] = t : delete i[e], i;
|
|
20
22
|
});
|
|
21
|
-
}, []),
|
|
22
|
-
|
|
23
|
-
S.current = S.current.slice(0, N), Object.keys(C.current).forEach((e) => {
|
|
24
|
-
let t = Number(e);
|
|
25
|
-
t >= N && delete C.current[t];
|
|
26
|
-
});
|
|
27
|
-
}, [N]);
|
|
28
|
-
let F = (e) => v ? !!v[e]?.disabled : !!C.current[e], I = (e) => {
|
|
29
|
-
if (F(e)) return;
|
|
23
|
+
}, []), O = T && !Object.values(T).some((e) => e.active) ? Object.keys(T).map(Number).filter((e) => !T[e].disabled).sort((e, t) => e - t)[0] ?? null : null, k = o && !s, A = a.toArray(b), j = A.length > 0, M = T ? Math.max(0, ...Object.keys(T).map((e) => Number(e) + 1)) : 0, N = !!(l || m), P = (e) => !T?.[e] || T[e].disabled, F = (e) => {
|
|
24
|
+
if (P(e)) return;
|
|
30
25
|
let t = v?.[e];
|
|
31
|
-
t?.action && t.action(e), y && y(e), h &&
|
|
32
|
-
},
|
|
33
|
-
if (!
|
|
34
|
-
let r =
|
|
35
|
-
r === null ? (n.key === "Enter" || n.key === " " || n.key === "Spacebar" || n.key === "ArrowDown") && (n.preventDefault(),
|
|
36
|
-
},
|
|
37
|
-
S.current[e] = t
|
|
38
|
-
},
|
|
26
|
+
t?.action && t.action(e), y && y(e), h && w(e);
|
|
27
|
+
}, I = (e, n) => {
|
|
28
|
+
if (!k) return;
|
|
29
|
+
let r = t(n.key, e, M, P);
|
|
30
|
+
r === null ? (n.key === "Enter" || n.key === " " || n.key === "Spacebar" || n.key === "ArrowDown") && (n.preventDefault(), P(e) || F(e)) : (n.preventDefault(), S.current[r]?.focus(), h && r !== e && F(r));
|
|
31
|
+
}, L = (e, t) => {
|
|
32
|
+
S.current[e] = t;
|
|
33
|
+
}, R = (e) => /* @__PURE__ */ f("span", {
|
|
39
34
|
className: "pkt-tabs__separator",
|
|
40
35
|
"aria-hidden": "true",
|
|
41
36
|
role: "presentation",
|
|
@@ -43,11 +38,11 @@ var p = a(null), m = () => {
|
|
|
43
38
|
src: m,
|
|
44
39
|
alt: "",
|
|
45
40
|
"aria-hidden": "true"
|
|
46
|
-
}) :
|
|
47
|
-
name:
|
|
41
|
+
}) : l ? /* @__PURE__ */ f(n, {
|
|
42
|
+
name: l,
|
|
48
43
|
className: "pkt-tabs__separator-icon"
|
|
49
44
|
}) : null
|
|
50
|
-
}, e),
|
|
45
|
+
}, e), z = (e) => !N || e.length <= 1 ? e : e.flatMap((t, n) => n < e.length - 1 ? [t, R(`separator-${n}`)] : [t]), B = i(v ?? [], (e) => `${e.href ?? ""}|${e.text}`).map(({ item: e, key: t }, n) => /* @__PURE__ */ f(r, {
|
|
51
46
|
active: !e.disabled && e.active,
|
|
52
47
|
disabled: e.disabled,
|
|
53
48
|
href: e.href,
|
|
@@ -55,30 +50,30 @@ var p = a(null), m = () => {
|
|
|
55
50
|
controls: e.controls,
|
|
56
51
|
tag: e.tag?.text,
|
|
57
52
|
tagSkin: e.tag?.skin,
|
|
58
|
-
index:
|
|
53
|
+
index: n,
|
|
59
54
|
children: e.text
|
|
60
|
-
}, t)),
|
|
55
|
+
}, t)), V = ["pkt-tabs", N && "pkt-tabs--with-separator"].filter(Boolean).join(" "), H = z(j ? A : B || []);
|
|
61
56
|
return /* @__PURE__ */ f(p.Provider, {
|
|
62
57
|
value: {
|
|
63
|
-
arrowNav:
|
|
58
|
+
arrowNav: k,
|
|
64
59
|
togglePanels: h,
|
|
65
|
-
selectedIndex:
|
|
66
|
-
setSelectedIndex:
|
|
67
|
-
fallbackFocusIndex:
|
|
68
|
-
reportTab:
|
|
69
|
-
registerTabRef:
|
|
70
|
-
handleKeyPress:
|
|
71
|
-
selectTab:
|
|
60
|
+
selectedIndex: C,
|
|
61
|
+
setSelectedIndex: w,
|
|
62
|
+
fallbackFocusIndex: O,
|
|
63
|
+
reportTab: D,
|
|
64
|
+
registerTabRef: L,
|
|
65
|
+
handleKeyPress: I,
|
|
66
|
+
selectTab: F
|
|
72
67
|
},
|
|
73
68
|
children: /* @__PURE__ */ f("div", {
|
|
74
|
-
className:
|
|
69
|
+
className: V,
|
|
75
70
|
ref: x,
|
|
76
71
|
children: /* @__PURE__ */ f("div", {
|
|
77
72
|
className: "pkt-tabs__list",
|
|
78
|
-
role:
|
|
73
|
+
role: k ? "tablist" : "navigation",
|
|
79
74
|
"aria-label": g || void 0,
|
|
80
75
|
"aria-labelledby": _ || void 0,
|
|
81
|
-
children:
|
|
76
|
+
children: H
|
|
82
77
|
})
|
|
83
78
|
})
|
|
84
79
|
});
|