From 850eafb74a4eabbd7d44c7510804f3cd8a150dee Mon Sep 17 00:00:00 2001 From: Ken Date: Tue, 20 Feb 2024 13:19:30 +0100 Subject: [PATCH 01/53] :truck: Oppdatert names-exports for expansioncard --- @navikt/core/react/package.json | 10 + .../core/react/src/expansion-card/index.ts | 7 + @navikt/core/react/src/index.ts | 2 +- examples/next-appdir/src/app/globals.css | 20 - examples/next-appdir/src/app/layout.tsx | 1 + examples/next-appdir/src/app/page.tsx | 1 + examples/next-appdir/yarn.lock | 913 ++++++++++++++++++ 7 files changed, 933 insertions(+), 21 deletions(-) diff --git a/@navikt/core/react/package.json b/@navikt/core/react/package.json index 3a4f19a040..5e84903e90 100644 --- a/@navikt/core/react/package.json +++ b/@navikt/core/react/package.json @@ -38,6 +38,16 @@ "default": "./cjs/index.js" } }, + "./ExpansionCard": { + "import": { + "types": "./esm/expansion-card/index.d.ts", + "default": "./esm/expansion-card/index.js" + }, + "require": { + "types": "./cjs/expansion-card/index.d.ts", + "default": "./cjs/expansion-card/index.js" + } + }, "./package.json": "./package.json" }, "scripts": { diff --git a/@navikt/core/react/src/expansion-card/index.ts b/@navikt/core/react/src/expansion-card/index.ts index 72c0a132a7..7e49a2b81a 100644 --- a/@navikt/core/react/src/expansion-card/index.ts +++ b/@navikt/core/react/src/expansion-card/index.ts @@ -1,4 +1,11 @@ +"use client"; + export { type ExpansionCardProps, default as ExpansionCard, } from "./ExpansionCard"; + +export { default as ExpansionCardContent } from "./ExpansionCardContent"; +export { default as ExpansionCardHeader } from "./ExpansionCardHeader"; +export { ExpansionCardTitle } from "./ExpansionCardTitle"; +export { ExpansionCardDescription } from "./ExpansionCardDescription"; diff --git a/@navikt/core/react/src/index.ts b/@navikt/core/react/src/index.ts index 3828eacbd3..3c024faf68 100644 --- a/@navikt/core/react/src/index.ts +++ b/@navikt/core/react/src/index.ts @@ -7,7 +7,7 @@ export * from "./chips"; export * from "./copybutton"; export * from "./date"; export * from "./dropdown"; -export * from "./expansion-card"; +export { ExpansionCard, type ExpansionCardProps } from "./expansion-card"; export * from "./form"; export * from "./guide-panel"; export * from "./overlays"; diff --git a/examples/next-appdir/src/app/globals.css b/examples/next-appdir/src/app/globals.css index 33f9c3270f..16387e9452 100644 --- a/examples/next-appdir/src/app/globals.css +++ b/examples/next-appdir/src/app/globals.css @@ -28,26 +28,6 @@ --card-border-rgb: 131, 134, 135; } -@media (prefers-color-scheme: dark) { - :root { - --foreground-rgb: 255, 255, 255; - --background-start-rgb: 0, 0, 0; - --background-end-rgb: 0, 0, 0; - - --primary-glow: radial-gradient(rgba(1, 65, 255, 0.4), rgba(1, 65, 255, 0)); - --secondary-glow: linear-gradient(to bottom right, rgba(1, 65, 255, 0), rgba(1, 65, 255, 0), rgba(1, 65, 255, 0.3)); - - --tile-start-rgb: 2, 13, 46; - --tile-end-rgb: 2, 5, 19; - --tile-border: conic-gradient(#ffffff80, #ffffff40, #ffffff30, #ffffff20, #ffffff10, #ffffff10, #ffffff80); - - --callout-rgb: 20, 20, 20; - --callout-border-rgb: 108, 108, 108; - --card-rgb: 100, 100, 100; - --card-border-rgb: 200, 200, 200; - } -} - * { box-sizing: border-box; padding: 0; diff --git a/examples/next-appdir/src/app/layout.tsx b/examples/next-appdir/src/app/layout.tsx index 3314e4780a..7025faff85 100644 --- a/examples/next-appdir/src/app/layout.tsx +++ b/examples/next-appdir/src/app/layout.tsx @@ -1,5 +1,6 @@ import type { Metadata } from "next"; import { Inter } from "next/font/google"; +import "@navikt/ds-css"; import "./globals.css"; const inter = Inter({ subsets: ["latin"] }); diff --git a/examples/next-appdir/src/app/page.tsx b/examples/next-appdir/src/app/page.tsx index 9e5a0a810d..135c86f85e 100644 --- a/examples/next-appdir/src/app/page.tsx +++ b/examples/next-appdir/src/app/page.tsx @@ -32,6 +32,7 @@ export default function Home() { +
=16.8.0" + react-dom: ">=16.8.0" + checksum: 5da7f13a69281e38859a3203a608fe9de1d850b332b355c10c0c2427c7b7209a0374c10f6295b6577c1a70237af8b678340bd4cc0a4b1c66436a94755d81e526 + languageName: node + linkType: hard + +"@floating-ui/react@npm:0.25.4": + version: 0.25.4 + resolution: "@floating-ui/react@npm:0.25.4" + dependencies: + "@floating-ui/react-dom": ^2.0.2 + "@floating-ui/utils": ^0.1.1 + tabbable: ^6.0.1 + peerDependencies: + react: ">=16.8.0" + react-dom: ">=16.8.0" + checksum: 816a0aa5bfc122c147e073563c0888333bdf58e79972757e37095c788323c8e87ace18d9196d95be8b8f4fe11d90cdeec36b23e5373a791a71a7873bf805590f + languageName: node + linkType: hard + +"@floating-ui/utils@npm:^0.1.1": + version: 0.1.6 + resolution: "@floating-ui/utils@npm:0.1.6" + checksum: b34d4b5470869727f52e312e08272edef985ba5a450a76de0917ba0a9c6f5df2bdbeb99448e2c60f39b177fb8981c772ff1831424e75123471a27ebd5b52c1eb + languageName: node + linkType: hard + +"@floating-ui/utils@npm:^0.2.0, @floating-ui/utils@npm:^0.2.1": + version: 0.2.1 + resolution: "@floating-ui/utils@npm:0.2.1" + checksum: 9ed4380653c7c217cd6f66ae51f20fdce433730dbc77f95b5abfb5a808f5fdb029c6ae249b4e0490a816f2453aa6e586d9a873cd157fdba4690f65628efc6e06 + languageName: node + linkType: hard + +"@navikt/aksel-icons@file:./../../@navikt/aksel-icons::locator=next-appdir%40workspace%3A.": + version: 6.0.0 + resolution: "@navikt/aksel-icons@file:./../../@navikt/aksel-icons#./../../@navikt/aksel-icons::hash=98e7bf&locator=next-appdir%40workspace%3A." + checksum: f2de91869dc1d01368d9aa32b0d4c518fc25c0624595a38d138768347bac33fbf36149bb60a27dfadd700c205270de325c22503c3c026feafd835a0c8f85d358 + languageName: node + linkType: hard + +"@navikt/aksel-icons@npm:^6.0.0": + version: 6.0.0 + resolution: "@navikt/aksel-icons@npm:6.0.0" + checksum: 75da616e916d9cb75fe788fd6a5b14a7f051a879983ed6f442d0d89150613a7f458c46f9aa39ec7a96883ef96a553f204178c2276535e88564e4f82b45ea9f24 + languageName: node + linkType: hard + +"@navikt/ds-css@file:./../../@navikt/core/css::locator=next-appdir%40workspace%3A.": + version: 6.0.0 + resolution: "@navikt/ds-css@file:./../../@navikt/core/css#./../../@navikt/core/css::hash=66c788&locator=next-appdir%40workspace%3A." + checksum: ede0545a2e384160286a9ecf9073b59f066ef7a78d44d0ad86260c755c341c99b4bf8d96ee6f5f00571ea07788e936113893f1a35c4a483af3b523f1057e994c + languageName: node + linkType: hard + +"@navikt/ds-react@file:./../../@navikt/core/react::locator=next-appdir%40workspace%3A.": + version: 6.0.0 + resolution: "@navikt/ds-react@file:./../../@navikt/core/react#./../../@navikt/core/react::hash=6765b3&locator=next-appdir%40workspace%3A." + dependencies: + "@floating-ui/react": 0.25.4 + "@navikt/aksel-icons": ^6.0.0 + "@navikt/ds-tokens": ^6.0.0 + "@radix-ui/react-tabs": 1.0.0 + "@radix-ui/react-toggle-group": 1.0.0 + clsx: ^2.1.0 + date-fns: ^3.0.0 + react-day-picker: 8.10.0 + peerDependencies: + "@types/react": ^17.0.30 || ^18.0.0 + react: ^17.0.0 || ^18.0.0 + peerDependenciesMeta: + "@types/react": + optional: true + checksum: 88cb493bf304e1f004e6a165e378ecc734dddcdf5dbc200b9462667290000b3a6a8882a239f6c68a9dbca87487f21d00d76f172a2e5162eca556c23017e5b380 + languageName: node + linkType: hard + +"@navikt/ds-tokens@npm:^6.0.0": + version: 6.0.0 + resolution: "@navikt/ds-tokens@npm:6.0.0" + checksum: 2e7f80219056a233a5f56eefb878314d765ab59e401f9da6ac9f5eda12479c7ebf6342cda0e15463424f948bde80e0ffcaeefcc4b46210a4f6c5dd303f944d83 + languageName: node + linkType: hard + +"@next/bundle-analyzer@npm:^14.1.0": + version: 14.1.0 + resolution: "@next/bundle-analyzer@npm:14.1.0" + dependencies: + webpack-bundle-analyzer: 4.10.1 + checksum: 535bae089bb6c05f27d36644e264e3b72cbc704843fe6773bf33fa812ac6b958a55bfebb2c83e39685b43bfc74ee973b540475a4ecb2560770d7df065af980f8 + languageName: node + linkType: hard + +"@next/env@npm:14.1.0": + version: 14.1.0 + resolution: "@next/env@npm:14.1.0" + checksum: ecec03a3e9745996ed1c7fc218fc9a1a4345a0cf368afb50f38a3b6fbf6f966a36dba174c90b5f90b568188dbd0eba48a2c5448b6742298417df4ff3351c6d40 + languageName: node + linkType: hard + +"@next/swc-darwin-arm64@npm:14.1.0": + version: 14.1.0 + resolution: "@next/swc-darwin-arm64@npm:14.1.0" + conditions: os=darwin & cpu=arm64 + languageName: node + linkType: hard + +"@next/swc-darwin-x64@npm:14.1.0": + version: 14.1.0 + resolution: "@next/swc-darwin-x64@npm:14.1.0" + conditions: os=darwin & cpu=x64 + languageName: node + linkType: hard + +"@next/swc-linux-arm64-gnu@npm:14.1.0": + version: 14.1.0 + resolution: "@next/swc-linux-arm64-gnu@npm:14.1.0" + conditions: os=linux & cpu=arm64 & libc=glibc + languageName: node + linkType: hard + +"@next/swc-linux-arm64-musl@npm:14.1.0": + version: 14.1.0 + resolution: "@next/swc-linux-arm64-musl@npm:14.1.0" + conditions: os=linux & cpu=arm64 & libc=musl + languageName: node + linkType: hard + +"@next/swc-linux-x64-gnu@npm:14.1.0": + version: 14.1.0 + resolution: "@next/swc-linux-x64-gnu@npm:14.1.0" + conditions: os=linux & cpu=x64 & libc=glibc + languageName: node + linkType: hard + +"@next/swc-linux-x64-musl@npm:14.1.0": + version: 14.1.0 + resolution: "@next/swc-linux-x64-musl@npm:14.1.0" + conditions: os=linux & cpu=x64 & libc=musl + languageName: node + linkType: hard + +"@next/swc-win32-arm64-msvc@npm:14.1.0": + version: 14.1.0 + resolution: "@next/swc-win32-arm64-msvc@npm:14.1.0" + conditions: os=win32 & cpu=arm64 + languageName: node + linkType: hard + +"@next/swc-win32-ia32-msvc@npm:14.1.0": + version: 14.1.0 + resolution: "@next/swc-win32-ia32-msvc@npm:14.1.0" + conditions: os=win32 & cpu=ia32 + languageName: node + linkType: hard + +"@next/swc-win32-x64-msvc@npm:14.1.0": + version: 14.1.0 + resolution: "@next/swc-win32-x64-msvc@npm:14.1.0" + conditions: os=win32 & cpu=x64 + languageName: node + linkType: hard + +"@polka/url@npm:^1.0.0-next.24": + version: 1.0.0-next.24 + resolution: "@polka/url@npm:1.0.0-next.24" + checksum: 00baec4458ac86ca27edf7ce807ccfad97cd1d4b67bdedaf3401a9e755757588f3331e891290d1deea52d88df2bf2387caf8d94a6835b614d5b37b638a688273 + languageName: node + linkType: hard + +"@radix-ui/primitive@npm:1.0.0": + version: 1.0.0 + resolution: "@radix-ui/primitive@npm:1.0.0" + dependencies: + "@babel/runtime": ^7.13.10 + checksum: 72996afaf346ec4f4c73422f14f6cb2d0de994801ba7cbb9a4a67b0050e0cd74625182c349ef8017ccae1406579d4b74a34a225ef2efe61e8e5337decf235deb + languageName: node + linkType: hard + +"@radix-ui/react-collection@npm:1.0.0": + version: 1.0.0 + resolution: "@radix-ui/react-collection@npm:1.0.0" + dependencies: + "@babel/runtime": ^7.13.10 + "@radix-ui/react-compose-refs": 1.0.0 + "@radix-ui/react-context": 1.0.0 + "@radix-ui/react-primitive": 1.0.0 + "@radix-ui/react-slot": 1.0.0 + peerDependencies: + react: ^16.8 || ^17.0 || ^18.0 + react-dom: ^16.8 || ^17.0 || ^18.0 + checksum: 271683a45c35808ffc0566c56546a8846c54f2d1f64dd7b681b83f622343d2f5a6173abe3f1dbd0002045a18bc8730838e90ac928618199e937b55a76150d254 + languageName: node + linkType: hard + +"@radix-ui/react-compose-refs@npm:1.0.0": + version: 1.0.0 + resolution: "@radix-ui/react-compose-refs@npm:1.0.0" + dependencies: + "@babel/runtime": ^7.13.10 + peerDependencies: + react: ^16.8 || ^17.0 || ^18.0 + checksum: fb98be2e275a1a758ccac647780ff5b04be8dcf25dcea1592db3b691fecf719c4c0700126da605b2f512dd89caa111352b9fad59528d736b4e0e9a0e134a74a1 + languageName: node + linkType: hard + +"@radix-ui/react-context@npm:1.0.0": + version: 1.0.0 + resolution: "@radix-ui/react-context@npm:1.0.0" + dependencies: + "@babel/runtime": ^7.13.10 + peerDependencies: + react: ^16.8 || ^17.0 || ^18.0 + checksum: 43c6b6f2183398161fe6b109e83fff240a6b7babbb27092b815932342a89d5ca42aa9806bfae5927970eed5ff90feed04c67aa29c6721f84ae826f17fcf34ce0 + languageName: node + linkType: hard + +"@radix-ui/react-direction@npm:1.0.0": + version: 1.0.0 + resolution: "@radix-ui/react-direction@npm:1.0.0" + dependencies: + "@babel/runtime": ^7.13.10 + peerDependencies: + react: ^16.8 || ^17.0 || ^18.0 + checksum: 92a40de4087b161a56957872daf204a7735bd21f2fccbd42deff322d759977d085ad3dcdae05af437b7e64e628e939e0d67e5bc468a3027e1b02e0a7dc90c485 + languageName: node + linkType: hard + +"@radix-ui/react-id@npm:1.0.0": + version: 1.0.0 + resolution: "@radix-ui/react-id@npm:1.0.0" + dependencies: + "@babel/runtime": ^7.13.10 + "@radix-ui/react-use-layout-effect": 1.0.0 + peerDependencies: + react: ^16.8 || ^17.0 || ^18.0 + checksum: ba323cedd6a6df6f6e51ed1f7f7747988ce432b47fd94d860f962b14b342dcf049eae33f8ad0b72fd7df6329a7375542921132271fba64ab0a271c93f09c48d1 + languageName: node + linkType: hard + +"@radix-ui/react-presence@npm:1.0.0": + version: 1.0.0 + resolution: "@radix-ui/react-presence@npm:1.0.0" + dependencies: + "@babel/runtime": ^7.13.10 + "@radix-ui/react-compose-refs": 1.0.0 + "@radix-ui/react-use-layout-effect": 1.0.0 + peerDependencies: + react: ^16.8 || ^17.0 || ^18.0 + react-dom: ^16.8 || ^17.0 || ^18.0 + checksum: a607d67795aa265e88f1765dcc7c18bebf6d88d116cb7f529ebe5a3fbbe751a42763aff0c1c89cdd8ce7f7664355936c4070fd3d4685774aff1a80fa95f4665b + languageName: node + linkType: hard + +"@radix-ui/react-primitive@npm:1.0.0": + version: 1.0.0 + resolution: "@radix-ui/react-primitive@npm:1.0.0" + dependencies: + "@babel/runtime": ^7.13.10 + "@radix-ui/react-slot": 1.0.0 + peerDependencies: + react: ^16.8 || ^17.0 || ^18.0 + react-dom: ^16.8 || ^17.0 || ^18.0 + checksum: fb3fe8c8c5a57995716cce4d7e9039e474c09ba5d714994419ad4940bc954da670f1188813cc931f189b23d9bd5a67adf7087bf44fe1d4272b4a334a3514d38b + languageName: node + linkType: hard + +"@radix-ui/react-roving-focus@npm:1.0.0": + version: 1.0.0 + resolution: "@radix-ui/react-roving-focus@npm:1.0.0" + dependencies: + "@babel/runtime": ^7.13.10 + "@radix-ui/primitive": 1.0.0 + "@radix-ui/react-collection": 1.0.0 + "@radix-ui/react-compose-refs": 1.0.0 + "@radix-ui/react-context": 1.0.0 + "@radix-ui/react-direction": 1.0.0 + "@radix-ui/react-id": 1.0.0 + "@radix-ui/react-primitive": 1.0.0 + "@radix-ui/react-use-callback-ref": 1.0.0 + "@radix-ui/react-use-controllable-state": 1.0.0 + peerDependencies: + react: ^16.8 || ^17.0 || ^18.0 + react-dom: ^16.8 || ^17.0 || ^18.0 + checksum: 163df73f858ce5888294d03a888d05e6fdec178936b21b5fabd661a3b797b4495e11b570ab365a2fb24494d08631ac094b1b7272b9a72bfd0cf743d6c121483d + languageName: node + linkType: hard + +"@radix-ui/react-slot@npm:1.0.0": + version: 1.0.0 + resolution: "@radix-ui/react-slot@npm:1.0.0" + dependencies: + "@babel/runtime": ^7.13.10 + "@radix-ui/react-compose-refs": 1.0.0 + peerDependencies: + react: ^16.8 || ^17.0 || ^18.0 + checksum: 60c0190ebdca21785b4f8b58a0c52717600c98953fc49da9580870519c60f52d5cf873dffa05446f4bb539066326ccec0827f4ca252b02ec4ff1a4ae203f59d7 + languageName: node + linkType: hard + +"@radix-ui/react-tabs@npm:1.0.0": + version: 1.0.0 + resolution: "@radix-ui/react-tabs@npm:1.0.0" + dependencies: + "@babel/runtime": ^7.13.10 + "@radix-ui/primitive": 1.0.0 + "@radix-ui/react-context": 1.0.0 + "@radix-ui/react-direction": 1.0.0 + "@radix-ui/react-id": 1.0.0 + "@radix-ui/react-presence": 1.0.0 + "@radix-ui/react-primitive": 1.0.0 + "@radix-ui/react-roving-focus": 1.0.0 + "@radix-ui/react-use-controllable-state": 1.0.0 + peerDependencies: + react: ^16.8 || ^17.0 || ^18.0 + react-dom: ^16.8 || ^17.0 || ^18.0 + checksum: 162413906c80a1fd2a3dddc9ac7f951b5e789cd69cc829f309735ac4ce6a21a9832c2abf71295a176a042fa6deb8a70dc597e219966d268d125e08d3a39f0596 + languageName: node + linkType: hard + +"@radix-ui/react-toggle-group@npm:1.0.0": + version: 1.0.0 + resolution: "@radix-ui/react-toggle-group@npm:1.0.0" + dependencies: + "@babel/runtime": ^7.13.10 + "@radix-ui/primitive": 1.0.0 + "@radix-ui/react-context": 1.0.0 + "@radix-ui/react-direction": 1.0.0 + "@radix-ui/react-primitive": 1.0.0 + "@radix-ui/react-roving-focus": 1.0.0 + "@radix-ui/react-toggle": 1.0.0 + "@radix-ui/react-use-controllable-state": 1.0.0 + peerDependencies: + react: ^16.8 || ^17.0 || ^18.0 + react-dom: ^16.8 || ^17.0 || ^18.0 + checksum: f0f91633ad45ff13ff49866118c15997a311fa31019c6eb1b60e6118e85a8973b6504a7eef739f37be74abdc2f465a0f7e02c57ce8e45856bd49e4471ca4cd55 + languageName: node + linkType: hard + +"@radix-ui/react-toggle@npm:1.0.0": + version: 1.0.0 + resolution: "@radix-ui/react-toggle@npm:1.0.0" + dependencies: + "@babel/runtime": ^7.13.10 + "@radix-ui/primitive": 1.0.0 + "@radix-ui/react-primitive": 1.0.0 + "@radix-ui/react-use-controllable-state": 1.0.0 + peerDependencies: + react: ^16.8 || ^17.0 || ^18.0 + react-dom: ^16.8 || ^17.0 || ^18.0 + checksum: 6e4de11b0446e18245b6aceabd9d0f84ec08320b6945f0111d00d322f9397eb8f8bf4626eee292f6640ca5c5a6c416842472f955d3eac69b5822cf268f05c08a + languageName: node + linkType: hard + +"@radix-ui/react-use-callback-ref@npm:1.0.0": + version: 1.0.0 + resolution: "@radix-ui/react-use-callback-ref@npm:1.0.0" + dependencies: + "@babel/runtime": ^7.13.10 + peerDependencies: + react: ^16.8 || ^17.0 || ^18.0 + checksum: a8dda76ba0a26e23dc6ab5003831ad7439f59ba9d696a517643b9ee6a7fb06b18ae7a8f5a3c00c530d5c8104745a466a077b7475b99b4c0f5c15f5fc29474471 + languageName: node + linkType: hard + +"@radix-ui/react-use-controllable-state@npm:1.0.0": + version: 1.0.0 + resolution: "@radix-ui/react-use-controllable-state@npm:1.0.0" + dependencies: + "@babel/runtime": ^7.13.10 + "@radix-ui/react-use-callback-ref": 1.0.0 + peerDependencies: + react: ^16.8 || ^17.0 || ^18.0 + checksum: 35f1e714bbe3fc9f5362a133339dd890fb96edb79b63168a99403c65dd5f2b63910e0c690255838029086719e31360fa92544a55bc902cfed4442bb3b55822e2 + languageName: node + linkType: hard + +"@radix-ui/react-use-layout-effect@npm:1.0.0": + version: 1.0.0 + resolution: "@radix-ui/react-use-layout-effect@npm:1.0.0" + dependencies: + "@babel/runtime": ^7.13.10 + peerDependencies: + react: ^16.8 || ^17.0 || ^18.0 + checksum: fcdc8cfa79bd45766ebe3de11039c58abe3fed968cb39c12b2efce5d88013c76fe096ea4cee464d42576d02fe7697779b682b4268459bca3c4e48644f5b4ac5e + languageName: node + linkType: hard + +"@swc/helpers@npm:0.5.2": + version: 0.5.2 + resolution: "@swc/helpers@npm:0.5.2" + dependencies: + tslib: ^2.4.0 + checksum: 51d7e3d8bd56818c49d6bfbd715f0dbeedc13cf723af41166e45c03e37f109336bbcb57a1f2020f4015957721aeb21e1a7fff281233d797ff7d3dd1f447fa258 + languageName: node + linkType: hard + +"@types/node@npm:^20": + version: 20.11.19 + resolution: "@types/node@npm:20.11.19" + dependencies: + undici-types: ~5.26.4 + checksum: 259d16643ba611ade617a8212e594a3ac014727457507389bbf7213971346ab052d870f1e6e2df0afd0876ecd7874f578bccb130be01e069263cfc7136ddc0c1 + languageName: node + linkType: hard + +"@types/prop-types@npm:*": + version: 15.7.11 + resolution: "@types/prop-types@npm:15.7.11" + checksum: 7519ff11d06fbf6b275029fe03fff9ec377b4cb6e864cac34d87d7146c7f5a7560fd164bdc1d2dbe00b60c43713631251af1fd3d34d46c69cd354602bc0c7c54 + languageName: node + linkType: hard + +"@types/react-dom@npm:^18": + version: 18.2.19 + resolution: "@types/react-dom@npm:18.2.19" + dependencies: + "@types/react": "*" + checksum: 087a19d8e4c1c0900ec4ac5ddb749a811a38274b25683d233c11755d2895cc6e475e8bf9bea3dee36519769298e078d4c2feab9ab4bd13b26bc2a6170716437e + languageName: node + linkType: hard + +"@types/react@npm:*, @types/react@npm:^18": + version: 18.2.57 + resolution: "@types/react@npm:18.2.57" + dependencies: + "@types/prop-types": "*" + "@types/scheduler": "*" + csstype: ^3.0.2 + checksum: 01e7a3424162468428f3b28acec5e5c6cd1e26775ff605d0f46c883dea2d835924873d36b9ea0b75e40c9593aa78ca56a8ccde66bd58dbf6ecb0dd95af28609d + languageName: node + linkType: hard + +"@types/scheduler@npm:*": + version: 0.16.8 + resolution: "@types/scheduler@npm:0.16.8" + checksum: 6c091b096daa490093bf30dd7947cd28e5b2cd612ec93448432b33f724b162587fed9309a0acc104d97b69b1d49a0f3fc755a62282054d62975d53d7fd13472d + languageName: node + linkType: hard + +"acorn-walk@npm:^8.0.0": + version: 8.3.2 + resolution: "acorn-walk@npm:8.3.2" + checksum: 3626b9d26a37b1b427796feaa5261faf712307a8920392c8dce9a5739fb31077667f4ad2ec71c7ac6aaf9f61f04a9d3d67ff56f459587206fc04aa31c27ef392 + languageName: node + linkType: hard + +"acorn@npm:^8.0.4": + version: 8.11.3 + resolution: "acorn@npm:8.11.3" + bin: + acorn: bin/acorn + checksum: 76d8e7d559512566b43ab4aadc374f11f563f0a9e21626dd59cb2888444e9445923ae9f3699972767f18af61df89cd89f5eaaf772d1327b055b45cb829b4a88c + languageName: node + linkType: hard + +"busboy@npm:1.6.0": + version: 1.6.0 + resolution: "busboy@npm:1.6.0" + dependencies: + streamsearch: ^1.1.0 + checksum: 32801e2c0164e12106bf236291a00795c3c4e4b709ae02132883fe8478ba2ae23743b11c5735a0aae8afe65ac4b6ca4568b91f0d9fed1fdbc32ede824a73746e + languageName: node + linkType: hard + +"caniuse-lite@npm:^1.0.30001579": + version: 1.0.30001588 + resolution: "caniuse-lite@npm:1.0.30001588" + checksum: 2ab5fcec8fd3ee5d817a44bf1fb69804a6924d190e476863fb519692cd3e85a3a775bf4a2b6ba793f8db592ca61255b7f77f3d773ff7d42b452216f180bcdd2f + languageName: node + linkType: hard + +"client-only@npm:0.0.1": + version: 0.0.1 + resolution: "client-only@npm:0.0.1" + checksum: 0c16bf660dadb90610553c1d8946a7fdfb81d624adea073b8440b7d795d5b5b08beb3c950c6a2cf16279365a3265158a236876d92bce16423c485c322d7dfaf8 + languageName: node + linkType: hard + +"clsx@npm:^2.1.0": + version: 2.1.0 + resolution: "clsx@npm:2.1.0" + checksum: 43fefc29b6b49c9476fbce4f8b1cc75c27b67747738e598e6651dd40d63692135dc60b18fa1c5b78a2a9ba8ae6fd2055a068924b94e20b42039bd53b78b98e1d + languageName: node + linkType: hard + +"commander@npm:^7.2.0": + version: 7.2.0 + resolution: "commander@npm:7.2.0" + checksum: 53501cbeee61d5157546c0bef0fedb6cdfc763a882136284bed9a07225f09a14b82d2a84e7637edfd1a679fb35ed9502fd58ef1d091e6287f60d790147f68ddc + languageName: node + linkType: hard + +"csstype@npm:^3.0.2": + version: 3.1.3 + resolution: "csstype@npm:3.1.3" + checksum: 8db785cc92d259102725b3c694ec0c823f5619a84741b5c7991b8ad135dfaa66093038a1cc63e03361a6cd28d122be48f2106ae72334e067dd619a51f49eddf7 + languageName: node + linkType: hard + +"date-fns@npm:^3.0.0": + version: 3.3.1 + resolution: "date-fns@npm:3.3.1" + checksum: 6245e93a47de28ac96dffd4d62877f86e6b64854860ae1e00a4f83174d80bc8e59bd1259cf265223fb2ddce5c8e586dc9cc210f0d052faba2f7660e265877283 + languageName: node + linkType: hard + +"debounce@npm:^1.2.1": + version: 1.2.1 + resolution: "debounce@npm:1.2.1" + checksum: 682a89506d9e54fb109526f4da255c5546102fbb8e3ae75eef3b04effaf5d4853756aee97475cd4650641869794e44f410eeb20ace2b18ea592287ab2038519e + languageName: node + linkType: hard + +"duplexer@npm:^0.1.2": + version: 0.1.2 + resolution: "duplexer@npm:0.1.2" + checksum: 62ba61a830c56801db28ff6305c7d289b6dc9f859054e8c982abd8ee0b0a14d2e9a8e7d086ffee12e868d43e2bbe8a964be55ddbd8c8957714c87373c7a4f9b0 + languageName: node + linkType: hard + +"escape-string-regexp@npm:^4.0.0": + version: 4.0.0 + resolution: "escape-string-regexp@npm:4.0.0" + checksum: 98b48897d93060f2322108bf29db0feba7dd774be96cd069458d1453347b25ce8682ecc39859d4bca2203cc0ab19c237bcc71755eff49a0f8d90beadeeba5cc5 + languageName: node + linkType: hard + +"graceful-fs@npm:^4.2.11": + version: 4.2.11 + resolution: "graceful-fs@npm:4.2.11" + checksum: ac85f94da92d8eb6b7f5a8b20ce65e43d66761c55ce85ac96df6865308390da45a8d3f0296dd3a663de65d30ba497bd46c696cc1e248c72b13d6d567138a4fc7 + languageName: node + linkType: hard + +"gzip-size@npm:^6.0.0": + version: 6.0.0 + resolution: "gzip-size@npm:6.0.0" + dependencies: + duplexer: ^0.1.2 + checksum: 2df97f359696ad154fc171dcb55bc883fe6e833bca7a65e457b9358f3cb6312405ed70a8da24a77c1baac0639906cd52358dc0ce2ec1a937eaa631b934c94194 + languageName: node + linkType: hard + +"html-escaper@npm:^2.0.2": + version: 2.0.2 + resolution: "html-escaper@npm:2.0.2" + checksum: d2df2da3ad40ca9ee3a39c5cc6475ef67c8f83c234475f24d8e9ce0dc80a2c82df8e1d6fa78ddd1e9022a586ea1bd247a615e80a5cd9273d90111ddda7d9e974 + languageName: node + linkType: hard + +"is-plain-object@npm:^5.0.0": + version: 5.0.0 + resolution: "is-plain-object@npm:5.0.0" + checksum: e32d27061eef62c0847d303125440a38660517e586f2f3db7c9d179ae5b6674ab0f469d519b2e25c147a1a3bc87156d0d5f4d8821e0ce4a9ee7fe1fcf11ce45c + languageName: node + linkType: hard + +"js-tokens@npm:^3.0.0 || ^4.0.0": + version: 4.0.0 + resolution: "js-tokens@npm:4.0.0" + checksum: 8a95213a5a77deb6cbe94d86340e8d9ace2b93bc367790b260101d2f36a2eaf4e4e22d9fa9cf459b38af3a32fb4190e638024cf82ec95ef708680e405ea7cc78 + languageName: node + linkType: hard + +"loose-envify@npm:^1.1.0": + version: 1.4.0 + resolution: "loose-envify@npm:1.4.0" + dependencies: + js-tokens: ^3.0.0 || ^4.0.0 + bin: + loose-envify: cli.js + checksum: 6517e24e0cad87ec9888f500c5b5947032cdfe6ef65e1c1936a0c48a524b81e65542c9c3edc91c97d5bddc806ee2a985dbc79be89215d613b1de5db6d1cfe6f4 + languageName: node + linkType: hard + +"mrmime@npm:^2.0.0": + version: 2.0.0 + resolution: "mrmime@npm:2.0.0" + checksum: f6fe11ec667c3d96f1ce5fd41184ed491d5f0a5f4045e82446a471ccda5f84c7f7610dff61d378b73d964f73a320bd7f89788f9e6b9403e32cc4be28ba99f569 + languageName: node + linkType: hard + +"nanoid@npm:^3.3.6": + version: 3.3.7 + resolution: "nanoid@npm:3.3.7" + bin: + nanoid: bin/nanoid.cjs + checksum: d36c427e530713e4ac6567d488b489a36582ef89da1d6d4e3b87eded11eb10d7042a877958c6f104929809b2ab0bafa17652b076cdf84324aa75b30b722204f2 + languageName: node + linkType: hard + +"next-appdir@workspace:.": + version: 0.0.0-use.local + resolution: "next-appdir@workspace:." + dependencies: + "@navikt/aksel-icons": "file:./../../@navikt/aksel-icons" + "@navikt/ds-css": "file:./../../@navikt/core/css" + "@navikt/ds-react": "file:./../../@navikt/core/react" + "@next/bundle-analyzer": ^14.1.0 + "@types/node": ^20 + "@types/react": ^18 + "@types/react-dom": ^18 + next: 14.1.0 + react: ^18 + react-dom: ^18 + typescript: ^5 + languageName: unknown + linkType: soft + +"next@npm:14.1.0": + version: 14.1.0 + resolution: "next@npm:14.1.0" + dependencies: + "@next/env": 14.1.0 + "@next/swc-darwin-arm64": 14.1.0 + "@next/swc-darwin-x64": 14.1.0 + "@next/swc-linux-arm64-gnu": 14.1.0 + "@next/swc-linux-arm64-musl": 14.1.0 + "@next/swc-linux-x64-gnu": 14.1.0 + "@next/swc-linux-x64-musl": 14.1.0 + "@next/swc-win32-arm64-msvc": 14.1.0 + "@next/swc-win32-ia32-msvc": 14.1.0 + "@next/swc-win32-x64-msvc": 14.1.0 + "@swc/helpers": 0.5.2 + busboy: 1.6.0 + caniuse-lite: ^1.0.30001579 + graceful-fs: ^4.2.11 + postcss: 8.4.31 + styled-jsx: 5.1.1 + peerDependencies: + "@opentelemetry/api": ^1.1.0 + react: ^18.2.0 + react-dom: ^18.2.0 + sass: ^1.3.0 + dependenciesMeta: + "@next/swc-darwin-arm64": + optional: true + "@next/swc-darwin-x64": + optional: true + "@next/swc-linux-arm64-gnu": + optional: true + "@next/swc-linux-arm64-musl": + optional: true + "@next/swc-linux-x64-gnu": + optional: true + "@next/swc-linux-x64-musl": + optional: true + "@next/swc-win32-arm64-msvc": + optional: true + "@next/swc-win32-ia32-msvc": + optional: true + "@next/swc-win32-x64-msvc": + optional: true + peerDependenciesMeta: + "@opentelemetry/api": + optional: true + sass: + optional: true + bin: + next: dist/bin/next + checksum: 077fd76a6fe7127a8be3d11035dcefb2c829f304aaa85144e0d1b531a1549b6c9bb99459af1ef0782c1f1110ca08f6f33efd293a2dc51672dd9dc45ede608ecf + languageName: node + linkType: hard + +"opener@npm:^1.5.2": + version: 1.5.2 + resolution: "opener@npm:1.5.2" + bin: + opener: bin/opener-bin.js + checksum: 33b620c0d53d5b883f2abc6687dd1c5fd394d270dbe33a6356f2d71e0a2ec85b100d5bac94694198ccf5c30d592da863b2292c5539009c715a9c80c697b4f6cc + languageName: node + linkType: hard + +"picocolors@npm:^1.0.0": + version: 1.0.0 + resolution: "picocolors@npm:1.0.0" + checksum: a2e8092dd86c8396bdba9f2b5481032848525b3dc295ce9b57896f931e63fc16f79805144321f72976383fc249584672a75cc18d6777c6b757603f372f745981 + languageName: node + linkType: hard + +"postcss@npm:8.4.31": + version: 8.4.31 + resolution: "postcss@npm:8.4.31" + dependencies: + nanoid: ^3.3.6 + picocolors: ^1.0.0 + source-map-js: ^1.0.2 + checksum: 1d8611341b073143ad90486fcdfeab49edd243377b1f51834dc4f6d028e82ce5190e4f11bb2633276864503654fb7cab28e67abdc0fbf9d1f88cad4a0ff0beea + languageName: node + linkType: hard + +"react-day-picker@npm:8.10.0": + version: 8.10.0 + resolution: "react-day-picker@npm:8.10.0" + peerDependencies: + date-fns: ^2.28.0 || ^3.0.0 + react: ^16.8.0 || ^17.0.0 || ^18.0.0 + checksum: a265e8c2f3f0e92e5a23e2edeca40fe67c67c00bae64aa9e1a99c6fe7f58b2f697b538937822b8f68d4b890d7903a06f074f1365deb465a0aeef1a14c701cc65 + languageName: node + linkType: hard + +"react-dom@npm:^18": + version: 18.2.0 + resolution: "react-dom@npm:18.2.0" + dependencies: + loose-envify: ^1.1.0 + scheduler: ^0.23.0 + peerDependencies: + react: ^18.2.0 + checksum: 7d323310bea3a91be2965f9468d552f201b1c27891e45ddc2d6b8f717680c95a75ae0bc1e3f5cf41472446a2589a75aed4483aee8169287909fcd59ad149e8cc + languageName: node + linkType: hard + +"react@npm:^18": + version: 18.2.0 + resolution: "react@npm:18.2.0" + dependencies: + loose-envify: ^1.1.0 + checksum: 88e38092da8839b830cda6feef2e8505dec8ace60579e46aa5490fc3dc9bba0bd50336507dc166f43e3afc1c42939c09fe33b25fae889d6f402721dcd78fca1b + languageName: node + linkType: hard + +"regenerator-runtime@npm:^0.14.0": + version: 0.14.1 + resolution: "regenerator-runtime@npm:0.14.1" + checksum: 9f57c93277b5585d3c83b0cf76be47b473ae8c6d9142a46ce8b0291a04bb2cf902059f0f8445dcabb3fb7378e5fe4bb4ea1e008876343d42e46d3b484534ce38 + languageName: node + linkType: hard + +"scheduler@npm:^0.23.0": + version: 0.23.0 + resolution: "scheduler@npm:0.23.0" + dependencies: + loose-envify: ^1.1.0 + checksum: d79192eeaa12abef860c195ea45d37cbf2bbf5f66e3c4dcd16f54a7da53b17788a70d109ee3d3dde1a0fd50e6a8fc171f4300356c5aee4fc0171de526bf35f8a + languageName: node + linkType: hard + +"sirv@npm:^2.0.3": + version: 2.0.4 + resolution: "sirv@npm:2.0.4" + dependencies: + "@polka/url": ^1.0.0-next.24 + mrmime: ^2.0.0 + totalist: ^3.0.0 + checksum: 6853384a51d6ee9377dd657e2b257e0e98b29abbfbfa6333e105197f0f100c8c56a4520b47028b04ab1833cf2312526206f38fcd4f891c6df453f40da1a15a57 + languageName: node + linkType: hard + +"source-map-js@npm:^1.0.2": + version: 1.0.2 + resolution: "source-map-js@npm:1.0.2" + checksum: c049a7fc4deb9a7e9b481ae3d424cc793cb4845daa690bc5a05d428bf41bf231ced49b4cf0c9e77f9d42fdb3d20d6187619fc586605f5eabe995a316da8d377c + languageName: node + linkType: hard + +"streamsearch@npm:^1.1.0": + version: 1.1.0 + resolution: "streamsearch@npm:1.1.0" + checksum: 1cce16cea8405d7a233d32ca5e00a00169cc0e19fbc02aa839959985f267335d435c07f96e5e0edd0eadc6d39c98d5435fb5bbbdefc62c41834eadc5622ad942 + languageName: node + linkType: hard + +"styled-jsx@npm:5.1.1": + version: 5.1.1 + resolution: "styled-jsx@npm:5.1.1" + dependencies: + client-only: 0.0.1 + peerDependencies: + react: ">= 16.8.0 || 17.x.x || ^18.0.0-0" + peerDependenciesMeta: + "@babel/core": + optional: true + babel-plugin-macros: + optional: true + checksum: 523a33b38603492547e861b98e29c873939b04e15fbe5ef16132c6f1e15958126647983c7d4675325038b428a5e91183d996e90141b18bdd1bbadf6e2c45b2fa + languageName: node + linkType: hard + +"tabbable@npm:^6.0.1": + version: 6.2.0 + resolution: "tabbable@npm:6.2.0" + checksum: f8440277d223949272c74bb627a3371be21735ca9ad34c2570f7e1752bd646ccfc23a9d8b1ee65d6561243f4134f5fbbf1ad6b39ac3c4b586554accaff4a1300 + languageName: node + linkType: hard + +"totalist@npm:^3.0.0": + version: 3.0.1 + resolution: "totalist@npm:3.0.1" + checksum: 5132d562cf88ff93fd710770a92f31dbe67cc19b5c6ccae2efc0da327f0954d211bbfd9456389655d726c624f284b4a23112f56d1da931ca7cfabbe1f45e778a + languageName: node + linkType: hard + +"tslib@npm:^2.4.0": + version: 2.6.2 + resolution: "tslib@npm:2.6.2" + checksum: 329ea56123005922f39642318e3d1f0f8265d1e7fcb92c633e0809521da75eeaca28d2cf96d7248229deb40e5c19adf408259f4b9640afd20d13aecc1430f3ad + languageName: node + linkType: hard + +"typescript@npm:^5": + version: 5.3.3 + resolution: "typescript@npm:5.3.3" + bin: + tsc: bin/tsc + tsserver: bin/tsserver + checksum: 2007ccb6e51bbbf6fde0a78099efe04dc1c3dfbdff04ca3b6a8bc717991862b39fd6126c0c3ebf2d2d98ac5e960bcaa873826bb2bb241f14277034148f41f6a2 + languageName: node + linkType: hard + +"typescript@patch:typescript@^5#~builtin": + version: 5.3.3 + resolution: "typescript@patch:typescript@npm%3A5.3.3#~builtin::version=5.3.3&hash=7ad353" + bin: + tsc: bin/tsc + tsserver: bin/tsserver + checksum: f61375590b3162599f0f0d5b8737877ac0a7bc52761dbb585d67e7b8753a3a4c42d9a554c4cc929f591ffcf3a2b0602f65ae3ce74714fd5652623a816862b610 + languageName: node + linkType: hard + +"undici-types@npm:~5.26.4": + version: 5.26.5 + resolution: "undici-types@npm:5.26.5" + checksum: 3192ef6f3fd5df652f2dc1cd782b49d6ff14dc98e5dced492aa8a8c65425227da5da6aafe22523c67f035a272c599bb89cfe803c1db6311e44bed3042fc25487 + languageName: node + linkType: hard + +"webpack-bundle-analyzer@npm:4.10.1": + version: 4.10.1 + resolution: "webpack-bundle-analyzer@npm:4.10.1" + dependencies: + "@discoveryjs/json-ext": 0.5.7 + acorn: ^8.0.4 + acorn-walk: ^8.0.0 + commander: ^7.2.0 + debounce: ^1.2.1 + escape-string-regexp: ^4.0.0 + gzip-size: ^6.0.0 + html-escaper: ^2.0.2 + is-plain-object: ^5.0.0 + opener: ^1.5.2 + picocolors: ^1.0.0 + sirv: ^2.0.3 + ws: ^7.3.1 + bin: + webpack-bundle-analyzer: lib/bin/analyzer.js + checksum: 77f48f10a493b1cc95674526472978a2de32412ddbf556bd3903738f14890611426f19477352993efe5a9fd6ca16711eb912d986f2221b17ba6eeca1b6f71fb6 + languageName: node + linkType: hard + +"ws@npm:^7.3.1": + version: 7.5.9 + resolution: "ws@npm:7.5.9" + peerDependencies: + bufferutil: ^4.0.1 + utf-8-validate: ^5.0.2 + peerDependenciesMeta: + bufferutil: + optional: true + utf-8-validate: + optional: true + checksum: c3c100a181b731f40b7f2fddf004aa023f79d64f489706a28bc23ff88e87f6a64b3c6651fbec3a84a53960b75159574d7a7385709847a62ddb7ad6af76f49138 + languageName: node + linkType: hard From 7cfdf8d126f595da8d3371872e9722f2abaaac32 Mon Sep 17 00:00:00 2001 From: Ken Date: Tue, 20 Feb 2024 13:31:11 +0100 Subject: [PATCH 02/53] :truck: Accordion --- @navikt/core/react/package.json | 10 ++++++++++ @navikt/core/react/src/accordion/index.ts | 13 +++++++++++++ @navikt/core/react/src/index.ts | 2 +- 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/@navikt/core/react/package.json b/@navikt/core/react/package.json index 5e84903e90..490e058129 100644 --- a/@navikt/core/react/package.json +++ b/@navikt/core/react/package.json @@ -38,6 +38,16 @@ "default": "./cjs/index.js" } }, + "./Accordion": { + "import": { + "types": "./esm/accordion/index.d.ts", + "default": "./esm/accordion/index.js" + }, + "require": { + "types": "./cjs/accordion/index.d.ts", + "default": "./cjs/accordion/index.js" + } + }, "./ExpansionCard": { "import": { "types": "./esm/expansion-card/index.d.ts", diff --git a/@navikt/core/react/src/accordion/index.ts b/@navikt/core/react/src/accordion/index.ts index 9c89ecfd19..52855a481e 100644 --- a/@navikt/core/react/src/accordion/index.ts +++ b/@navikt/core/react/src/accordion/index.ts @@ -1 +1,14 @@ +"use client"; export { type AccordionProps, default as Accordion } from "./Accordion"; +export { + default as AccordionHeader, + type AccordionHeaderProps, +} from "./AccordionHeader"; +export { + default as AccordionContent, + type AccordionContentProps, +} from "./AccordionContent"; +export { + default as AccordionItem, + type AccordionItemProps, +} from "./AccordionItem"; diff --git a/@navikt/core/react/src/index.ts b/@navikt/core/react/src/index.ts index 3c024faf68..20ad2335c6 100644 --- a/@navikt/core/react/src/index.ts +++ b/@navikt/core/react/src/index.ts @@ -1,5 +1,5 @@ "use client"; -export * from "./accordion"; +export { Accordion, type AccordionProps } from "./accordion"; export * from "./alert"; export * from "./button"; export * from "./chat"; From b612e71e343ed50917cd84b181164159644359d9 Mon Sep 17 00:00:00 2001 From: Ken Date: Tue, 20 Feb 2024 13:32:29 +0100 Subject: [PATCH 03/53] :truck: Alert --- @navikt/core/react/package.json | 10 ++++++++++ @navikt/core/react/src/alert/index.ts | 3 +-- @navikt/core/react/src/index.ts | 2 +- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/@navikt/core/react/package.json b/@navikt/core/react/package.json index 490e058129..ec0a5c2b62 100644 --- a/@navikt/core/react/package.json +++ b/@navikt/core/react/package.json @@ -48,6 +48,16 @@ "default": "./cjs/accordion/index.js" } }, + "./Alert": { + "import": { + "types": "./esm/alert/index.d.ts", + "default": "./esm/alert/index.js" + }, + "require": { + "types": "./cjs/alert/index.d.ts", + "default": "./cjs/alert/index.js" + } + }, "./ExpansionCard": { "import": { "types": "./esm/expansion-card/index.d.ts", diff --git a/@navikt/core/react/src/alert/index.ts b/@navikt/core/react/src/alert/index.ts index b4a05caaa8..ad29446948 100644 --- a/@navikt/core/react/src/alert/index.ts +++ b/@navikt/core/react/src/alert/index.ts @@ -1,2 +1 @@ -export { default as Alert } from "./Alert"; -export { type AlertProps } from "./Alert"; +export { default as Alert, type AlertProps } from "./Alert"; diff --git a/@navikt/core/react/src/index.ts b/@navikt/core/react/src/index.ts index 20ad2335c6..08ed76b5cc 100644 --- a/@navikt/core/react/src/index.ts +++ b/@navikt/core/react/src/index.ts @@ -1,6 +1,6 @@ "use client"; export { Accordion, type AccordionProps } from "./accordion"; -export * from "./alert"; +export { Alert, type AlertProps } from "./alert"; export * from "./button"; export * from "./chat"; export * from "./chips"; From 2f5bf79103a0ffeaf0275c30f29c2221301683d2 Mon Sep 17 00:00:00 2001 From: Ken Date: Tue, 20 Feb 2024 13:35:31 +0100 Subject: [PATCH 04/53] :truck: Button --- @navikt/core/react/package.json | 10 ++++++++++ @navikt/core/react/src/alert/index.ts | 1 + @navikt/core/react/src/button/index.ts | 4 ++-- @navikt/core/react/src/index.ts | 2 +- 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/@navikt/core/react/package.json b/@navikt/core/react/package.json index ec0a5c2b62..240ecc05bb 100644 --- a/@navikt/core/react/package.json +++ b/@navikt/core/react/package.json @@ -58,6 +58,16 @@ "default": "./cjs/alert/index.js" } }, + "./Button": { + "import": { + "types": "./esm/button/index.d.ts", + "default": "./esm/button/index.js" + }, + "require": { + "types": "./cjs/button/index.d.ts", + "default": "./cjs/button/index.js" + } + }, "./ExpansionCard": { "import": { "types": "./esm/expansion-card/index.d.ts", diff --git a/@navikt/core/react/src/alert/index.ts b/@navikt/core/react/src/alert/index.ts index ad29446948..a8d440a4fe 100644 --- a/@navikt/core/react/src/alert/index.ts +++ b/@navikt/core/react/src/alert/index.ts @@ -1 +1,2 @@ +"use client"; export { default as Alert, type AlertProps } from "./Alert"; diff --git a/@navikt/core/react/src/button/index.ts b/@navikt/core/react/src/button/index.ts index af31e1c8bf..bc9bdbba85 100644 --- a/@navikt/core/react/src/button/index.ts +++ b/@navikt/core/react/src/button/index.ts @@ -1,2 +1,2 @@ -export { default as Button } from "./Button"; -export { type ButtonProps } from "./Button"; +"use client"; +export { default as Button, type ButtonProps } from "./Button"; diff --git a/@navikt/core/react/src/index.ts b/@navikt/core/react/src/index.ts index 08ed76b5cc..e8a4173248 100644 --- a/@navikt/core/react/src/index.ts +++ b/@navikt/core/react/src/index.ts @@ -1,7 +1,7 @@ "use client"; export { Accordion, type AccordionProps } from "./accordion"; export { Alert, type AlertProps } from "./alert"; -export * from "./button"; +export { Button, type ButtonProps } from "./button"; export * from "./chat"; export * from "./chips"; export * from "./copybutton"; From f5b03790a8f3dbf084f60b7d60cad1c2b25ea930 Mon Sep 17 00:00:00 2001 From: Ken Date: Tue, 20 Feb 2024 13:37:16 +0100 Subject: [PATCH 05/53] :truck: Chat --- @navikt/core/react/src/chat/Bubble.tsx | 4 ++-- @navikt/core/react/src/chat/index.ts | 2 ++ @navikt/core/react/src/index.ts | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/@navikt/core/react/src/chat/Bubble.tsx b/@navikt/core/react/src/chat/Bubble.tsx index e0ffe286b8..aaf94687a8 100644 --- a/@navikt/core/react/src/chat/Bubble.tsx +++ b/@navikt/core/react/src/chat/Bubble.tsx @@ -2,7 +2,7 @@ import cl from "clsx"; import React, { HTMLAttributes, forwardRef } from "react"; import { Detail } from "../typography"; -export interface BubbleProps extends HTMLAttributes { +export interface ChatBubbleProps extends HTMLAttributes { /** * Bubble text */ @@ -21,7 +21,7 @@ export interface BubbleProps extends HTMLAttributes { toptextPosition?: "left" | "right"; } -const Bubble = forwardRef( +const Bubble = forwardRef( ({ children, className, name, timestamp, toptextPosition, ...rest }, ref) => { return (
diff --git a/@navikt/core/react/src/chat/index.ts b/@navikt/core/react/src/chat/index.ts index ac6b90f1b6..17737bc7c9 100644 --- a/@navikt/core/react/src/chat/index.ts +++ b/@navikt/core/react/src/chat/index.ts @@ -1 +1,3 @@ +"use client"; export { default as Chat, type ChatProps } from "./Chat"; +export { default as ChatBubble, type ChatBubbleProps } from "./Bubble"; diff --git a/@navikt/core/react/src/index.ts b/@navikt/core/react/src/index.ts index e8a4173248..dcd5092dd6 100644 --- a/@navikt/core/react/src/index.ts +++ b/@navikt/core/react/src/index.ts @@ -2,7 +2,7 @@ export { Accordion, type AccordionProps } from "./accordion"; export { Alert, type AlertProps } from "./alert"; export { Button, type ButtonProps } from "./button"; -export * from "./chat"; +export { Chat, type ChatProps } from "./chat"; export * from "./chips"; export * from "./copybutton"; export * from "./date"; From 3cb09b4584a9b38f014fc1c8ed9ce91c462f216b Mon Sep 17 00:00:00 2001 From: Ken Date: Tue, 20 Feb 2024 13:41:02 +0100 Subject: [PATCH 06/53] :truck: Chips --- @navikt/core/react/package.json | 20 ++++++++++++++++++++ @navikt/core/react/src/chips/Chips.tsx | 8 ++++---- @navikt/core/react/src/chips/Removable.tsx | 4 ++-- @navikt/core/react/src/chips/Toggle.tsx | 4 ++-- @navikt/core/react/src/chips/index.ts | 6 ++++++ @navikt/core/react/src/index.ts | 2 +- 6 files changed, 35 insertions(+), 9 deletions(-) diff --git a/@navikt/core/react/package.json b/@navikt/core/react/package.json index 240ecc05bb..8e427dde93 100644 --- a/@navikt/core/react/package.json +++ b/@navikt/core/react/package.json @@ -68,6 +68,26 @@ "default": "./cjs/button/index.js" } }, + "./Chat": { + "import": { + "types": "./esm/chat/index.d.ts", + "default": "./esm/chat/index.js" + }, + "require": { + "types": "./cjs/chat/index.d.ts", + "default": "./cjs/chat/index.js" + } + }, + "./Chips": { + "import": { + "types": "./esm/chips/index.d.ts", + "default": "./esm/chips/index.js" + }, + "require": { + "types": "./cjs/chips/index.d.ts", + "default": "./cjs/chips/index.js" + } + }, "./ExpansionCard": { "import": { "types": "./esm/expansion-card/index.d.ts", diff --git a/@navikt/core/react/src/chips/Chips.tsx b/@navikt/core/react/src/chips/Chips.tsx index a59412355f..41e8127e07 100644 --- a/@navikt/core/react/src/chips/Chips.tsx +++ b/@navikt/core/react/src/chips/Chips.tsx @@ -1,8 +1,8 @@ import cl from "clsx"; import React, { HTMLAttributes, forwardRef } from "react"; import { OverridableComponent } from "../util/types"; -import RemovableChips, { RemovableChipsProps } from "./Removable"; -import ToggleChips, { ToggleChipsProps } from "./Toggle"; +import RemovableChips, { ChipsRemovableProps } from "./Removable"; +import ToggleChips, { ChipsToggleProps } from "./Toggle"; export interface ChipsProps extends HTMLAttributes { children: React.ReactNode; @@ -22,13 +22,13 @@ interface ChipsComponent * @see 🏷️ {@link ToggleChipsProps} * @see [🤖 OverridableComponent](https://aksel.nav.no/grunnleggende/kode/overridablecomponent) support */ - Toggle: OverridableComponent; + Toggle: OverridableComponent; /** * Remove filter or the likes on click * @see 🏷️ {@link RemovableChipsProps} * @see [🤖 OverridableComponent](https://aksel.nav.no/grunnleggende/kode/overridablecomponent) support */ - Removable: OverridableComponent; + Removable: OverridableComponent; } /** diff --git a/@navikt/core/react/src/chips/Removable.tsx b/@navikt/core/react/src/chips/Removable.tsx index 19cbf99a15..e0bdca494e 100644 --- a/@navikt/core/react/src/chips/Removable.tsx +++ b/@navikt/core/react/src/chips/Removable.tsx @@ -3,7 +3,7 @@ import React, { forwardRef } from "react"; import { XMarkIcon } from "@navikt/aksel-icons"; import { composeEventHandlers } from "../util/composeEventHandlers"; -export interface RemovableChipsProps +export interface ChipsRemovableProps extends React.ButtonHTMLAttributes { children: string; /** @@ -24,7 +24,7 @@ export interface RemovableChipsProps export const RemovableChips = forwardRef< HTMLButtonElement, - RemovableChipsProps + ChipsRemovableProps >( ( { diff --git a/@navikt/core/react/src/chips/Toggle.tsx b/@navikt/core/react/src/chips/Toggle.tsx index b496cca658..de1b45e989 100644 --- a/@navikt/core/react/src/chips/Toggle.tsx +++ b/@navikt/core/react/src/chips/Toggle.tsx @@ -2,7 +2,7 @@ import cl from "clsx"; import React, { forwardRef } from "react"; import { OverridableComponent } from "../util/types"; -export interface ToggleChipsProps +export interface ChipsToggleProps extends React.ButtonHTMLAttributes { children: string; /** @@ -22,7 +22,7 @@ export interface ToggleChipsProps } export const ToggleChips: OverridableComponent< - ToggleChipsProps, + ChipsToggleProps, HTMLButtonElement > = forwardRef( ( diff --git a/@navikt/core/react/src/chips/index.ts b/@navikt/core/react/src/chips/index.ts index 15a0eabbaf..983dacf97b 100644 --- a/@navikt/core/react/src/chips/index.ts +++ b/@navikt/core/react/src/chips/index.ts @@ -1 +1,7 @@ +"use client"; export { default as Chips, type ChipsProps } from "./Chips"; +export { + RemovableChips as ChipsRemovable, + type ChipsRemovableProps, +} from "./Removable"; +export { ToggleChips as ChipsToggle, type ChipsToggleProps } from "./Toggle"; diff --git a/@navikt/core/react/src/index.ts b/@navikt/core/react/src/index.ts index dcd5092dd6..1b601fa6e3 100644 --- a/@navikt/core/react/src/index.ts +++ b/@navikt/core/react/src/index.ts @@ -3,7 +3,7 @@ export { Accordion, type AccordionProps } from "./accordion"; export { Alert, type AlertProps } from "./alert"; export { Button, type ButtonProps } from "./button"; export { Chat, type ChatProps } from "./chat"; -export * from "./chips"; +export { Chips, type ChipsProps } from "./chips"; export * from "./copybutton"; export * from "./date"; export * from "./dropdown"; From 2248c2c4f301da722689e282bc247309d3a78cf9 Mon Sep 17 00:00:00 2001 From: Ken Date: Tue, 20 Feb 2024 13:44:16 +0100 Subject: [PATCH 07/53] :truck: CopyButton --- @navikt/core/react/package.json | 10 ++++++++++ @navikt/core/react/src/copybutton/index.ts | 1 + @navikt/core/react/src/index.ts | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/@navikt/core/react/package.json b/@navikt/core/react/package.json index 8e427dde93..07b34e4f4d 100644 --- a/@navikt/core/react/package.json +++ b/@navikt/core/react/package.json @@ -88,6 +88,16 @@ "default": "./cjs/chips/index.js" } }, + "./CopyButton": { + "import": { + "types": "./esm/copybutton/index.d.ts", + "default": "./esm/copybutton/index.js" + }, + "require": { + "types": "./cjs/copybutton/index.d.ts", + "default": "./cjs/copybutton/index.js" + } + }, "./ExpansionCard": { "import": { "types": "./esm/expansion-card/index.d.ts", diff --git a/@navikt/core/react/src/copybutton/index.ts b/@navikt/core/react/src/copybutton/index.ts index 9babdc40c4..fc36379d37 100644 --- a/@navikt/core/react/src/copybutton/index.ts +++ b/@navikt/core/react/src/copybutton/index.ts @@ -1 +1,2 @@ +"use client"; export { default as CopyButton, type CopyButtonProps } from "./CopyButton"; diff --git a/@navikt/core/react/src/index.ts b/@navikt/core/react/src/index.ts index 1b601fa6e3..f980f9e6f0 100644 --- a/@navikt/core/react/src/index.ts +++ b/@navikt/core/react/src/index.ts @@ -4,7 +4,7 @@ export { Alert, type AlertProps } from "./alert"; export { Button, type ButtonProps } from "./button"; export { Chat, type ChatProps } from "./chat"; export { Chips, type ChipsProps } from "./chips"; -export * from "./copybutton"; +export { CopyButton, type CopyButtonProps } from "./copybutton"; export * from "./date"; export * from "./dropdown"; export { ExpansionCard, type ExpansionCardProps } from "./expansion-card"; From 47f7e709a82b8ad8841a846fc48648d920b2cfbb Mon Sep 17 00:00:00 2001 From: Ken Date: Tue, 20 Feb 2024 13:56:43 +0100 Subject: [PATCH 08/53] :truck: Date components --- @navikt/core/react/package.json | 20 +++++++++++++++++++ .../core/react/src/date/datepicker/index.ts | 12 +++++++++++ @navikt/core/react/src/date/index.ts | 17 ---------------- .../core/react/src/date/monthpicker/index.ts | 9 +++++++++ @navikt/core/react/src/index.ts | 18 ++++++++++++++++- 5 files changed, 58 insertions(+), 18 deletions(-) create mode 100644 @navikt/core/react/src/date/datepicker/index.ts delete mode 100644 @navikt/core/react/src/date/index.ts create mode 100644 @navikt/core/react/src/date/monthpicker/index.ts diff --git a/@navikt/core/react/package.json b/@navikt/core/react/package.json index 07b34e4f4d..47701e95e4 100644 --- a/@navikt/core/react/package.json +++ b/@navikt/core/react/package.json @@ -98,6 +98,26 @@ "default": "./cjs/copybutton/index.js" } }, + "./DatePicker": { + "import": { + "types": "./esm/date/datepicker/index.d.ts", + "default": "./esm/date/datepicker/index.js" + }, + "require": { + "types": "./cjs/date/datepicker/index.d.ts", + "default": "./cjs/date/datepicker/index.js" + } + }, + "./MonthPicker": { + "import": { + "types": "./esm/date/monthpicker/index.d.ts", + "default": "./esm/date/monthpicker/index.js" + }, + "require": { + "types": "./cjs/date/monthpicker/index.d.ts", + "default": "./cjs/date/monthpicker/index.js" + } + }, "./ExpansionCard": { "import": { "types": "./esm/expansion-card/index.d.ts", diff --git a/@navikt/core/react/src/date/datepicker/index.ts b/@navikt/core/react/src/date/datepicker/index.ts new file mode 100644 index 0000000000..ae4a915ca9 --- /dev/null +++ b/@navikt/core/react/src/date/datepicker/index.ts @@ -0,0 +1,12 @@ +export { default as DatePicker, type DatePickerProps } from "./DatePicker"; +export { + useDatepicker, + useRangeDatepicker, + type DateValidationT, + type RangeValidationT, +} from "../hooks"; +export { + DatePickerStandalone, + type DatePickerStandaloneProps, +} from "./DatePickerStandalone"; +export { DatePickerInput, type DateInputProps } from "../parts/DateInput"; diff --git a/@navikt/core/react/src/date/index.ts b/@navikt/core/react/src/date/index.ts deleted file mode 100644 index 0333881410..0000000000 --- a/@navikt/core/react/src/date/index.ts +++ /dev/null @@ -1,17 +0,0 @@ -export { - default as DatePicker, - type DatePickerProps, -} from "./datepicker/DatePicker"; -export { type DatePickerStandaloneProps } from "./datepicker/DatePickerStandalone"; -export { - useDatepicker, - useMonthpicker, - useRangeDatepicker, - type DateValidationT, - type MonthValidationT, - type RangeValidationT, -} from "./hooks"; -export { default as MonthPicker } from "./monthpicker/MonthPicker"; -export { type MonthPickerStandaloneProps } from "./monthpicker/MonthPickerStandalone"; -export { type MonthPickerProps } from "./monthpicker/types"; -export { type DateInputProps } from "./parts/DateInput"; diff --git a/@navikt/core/react/src/date/monthpicker/index.ts b/@navikt/core/react/src/date/monthpicker/index.ts new file mode 100644 index 0000000000..d6ad41e494 --- /dev/null +++ b/@navikt/core/react/src/date/monthpicker/index.ts @@ -0,0 +1,9 @@ +"use client"; +export { useMonthpicker, type MonthValidationT } from "../hooks"; +export { default as MonthPicker } from "./MonthPicker"; +export { type MonthPickerProps } from "./types"; +export { + MonthPickerStandalone, + type MonthPickerStandaloneProps, +} from "./MonthPickerStandalone"; +export { MonthPickerInput } from "../parts/DateInput"; diff --git a/@navikt/core/react/src/index.ts b/@navikt/core/react/src/index.ts index f980f9e6f0..1306b3b5ee 100644 --- a/@navikt/core/react/src/index.ts +++ b/@navikt/core/react/src/index.ts @@ -5,7 +5,23 @@ export { Button, type ButtonProps } from "./button"; export { Chat, type ChatProps } from "./chat"; export { Chips, type ChipsProps } from "./chips"; export { CopyButton, type CopyButtonProps } from "./copybutton"; -export * from "./date"; +export { + DatePicker, + useDatepicker, + useRangeDatepicker, + type DatePickerProps, + type DatePickerStandaloneProps, + type DateInputProps, + type DateValidationT, + type RangeValidationT, +} from "./date/datepicker"; +export { + MonthPicker, + useMonthpicker, + type MonthPickerProps, + type MonthPickerStandaloneProps, + type MonthValidationT, +} from "./date/monthpicker"; export * from "./dropdown"; export { ExpansionCard, type ExpansionCardProps } from "./expansion-card"; export * from "./form"; From 205fae83c18dfdab9086a21d8fefddd8040c6ea8 Mon Sep 17 00:00:00 2001 From: Ken Date: Tue, 20 Feb 2024 14:09:02 +0100 Subject: [PATCH 09/53] :truck: Dropdown --- @navikt/core/react/package.json | 10 +++ .../core/react/src/date/datepicker/index.ts | 1 + @navikt/core/react/src/dropdown/Dropdown.tsx | 6 +- .../core/react/src/dropdown/Menu/index.tsx | 6 +- @navikt/core/react/src/dropdown/Toggle.tsx | 79 +++++++++---------- @navikt/core/react/src/dropdown/index.ts | 9 +++ @navikt/core/react/src/index.ts | 2 +- 7 files changed, 65 insertions(+), 48 deletions(-) diff --git a/@navikt/core/react/package.json b/@navikt/core/react/package.json index 47701e95e4..015a2fc066 100644 --- a/@navikt/core/react/package.json +++ b/@navikt/core/react/package.json @@ -118,6 +118,16 @@ "default": "./cjs/date/monthpicker/index.js" } }, + "./Dropdown": { + "import": { + "types": "./esm/dropdown/index.d.ts", + "default": "./esm/dropdown/index.js" + }, + "require": { + "types": "./cjs/dropdown/index.d.ts", + "default": "./cjs/dropdown/index.js" + } + }, "./ExpansionCard": { "import": { "types": "./esm/expansion-card/index.d.ts", diff --git a/@navikt/core/react/src/date/datepicker/index.ts b/@navikt/core/react/src/date/datepicker/index.ts index ae4a915ca9..c44b99e110 100644 --- a/@navikt/core/react/src/date/datepicker/index.ts +++ b/@navikt/core/react/src/date/datepicker/index.ts @@ -1,3 +1,4 @@ +"use client"; export { default as DatePicker, type DatePickerProps } from "./DatePicker"; export { useDatepicker, diff --git a/@navikt/core/react/src/dropdown/Dropdown.tsx b/@navikt/core/react/src/dropdown/Dropdown.tsx index 5ed2e97507..04aecfc946 100644 --- a/@navikt/core/react/src/dropdown/Dropdown.tsx +++ b/@navikt/core/react/src/dropdown/Dropdown.tsx @@ -1,7 +1,7 @@ import React, { useState } from "react"; import { useControllableState } from "../util/hooks/useControllableState"; import Menu, { MenuType } from "./Menu"; -import Toggle, { ToggleProps } from "./Toggle"; +import Toggle from "./Toggle"; import { DropdownContext } from "./context"; export interface DropdownProps { @@ -33,9 +33,7 @@ export interface DropdownType extends React.FC { /** * @see 🏷️ {@link ToggleProps} */ - Toggle: React.ForwardRefExoticComponent< - ToggleProps & React.RefAttributes - >; + Toggle: typeof Toggle; /** * @see 🏷️ {@link MenuType} */ diff --git a/@navikt/core/react/src/dropdown/Menu/index.tsx b/@navikt/core/react/src/dropdown/Menu/index.tsx index 1a63bb0bf1..29b7cc0de8 100644 --- a/@navikt/core/react/src/dropdown/Menu/index.tsx +++ b/@navikt/core/react/src/dropdown/Menu/index.tsx @@ -6,7 +6,7 @@ import Divider from "./Divider"; import GroupedList, { GroupedListType } from "./GroupedList"; import List, { ListType } from "./List"; -interface MenuProps extends React.HTMLAttributes { +interface DropdownMenuProps extends React.HTMLAttributes { /** * Dropdown content */ @@ -39,7 +39,7 @@ interface MenuProps extends React.HTMLAttributes { | "left-end"; } -export interface MenuType +export interface MenuType extends React.ForwardRefExoticComponent< Props & React.RefAttributes > { @@ -59,7 +59,7 @@ export interface MenuType >; } -export const Menu = forwardRef( +export const Menu = forwardRef( ({ className, onClose, placement = "bottom-end", ...rest }, ref) => { const context = useContext(DropdownContext); diff --git a/@navikt/core/react/src/dropdown/Toggle.tsx b/@navikt/core/react/src/dropdown/Toggle.tsx index fcf73b0a3e..fbf76e84c5 100644 --- a/@navikt/core/react/src/dropdown/Toggle.tsx +++ b/@navikt/core/react/src/dropdown/Toggle.tsx @@ -3,7 +3,7 @@ import React, { forwardRef, useContext } from "react"; import { composeEventHandlers } from "../util/composeEventHandlers"; import { DropdownContext } from "./context"; -export interface ToggleProps +export interface DropdownToggleProps extends React.ButtonHTMLAttributes { /** * Button content @@ -11,42 +11,41 @@ export interface ToggleProps children: React.ReactNode; } -export const Toggle = forwardRef( - ({ className, onClick, ...rest }, ref) => { - const context = useContext(DropdownContext); - - if (!context) { - console.warn("Dropdown.Toggle has to be wrapped in "); - return null; - } - - const { setAnchorEl, handleToggle, isOpen } = context; - - const handleClick = ( - e: React.MouseEvent, - ) => { - setAnchorEl(e.currentTarget); - handleToggle(!isOpen); - }; - - return ( - - + + + Utbetaling av sykepenger + + abc + + + + + Til deg som er mellom 62 og 67 år + + + Hvis du er mellom 62 og 67 år når du søker, må du som hovedregel ha + hatt en pensjonsgivende inntekt som tilsvarer x G, året før du fikk + nedsatt arbeidsevnen. NAV kan gjøre unntak. + + + + + Til deg som har yrkesskade eller yrkessykdom + + + Med yrkesskade mener vi at du har fått en skade som følge av en + arbeidsulykke. Vi kan godkjenne en sykdom som yrkessykdom hvis den + kommer av skadelig påvirkning fra arbeidsmiljøet. + + + + + Til deg som er helt frisk + + + Da er det lite som trengs å gjøres. + + + + + + Bakerst + Midterst + Fremst +
Date: Wed, 21 Feb 2024 11:26:11 +0100 Subject: [PATCH 46/53] :art: Oppdatert eksempler for next appdir --- examples/next-appdir/src/app/client.tsx | 5 +++-- examples/next-appdir/src/app/page.tsx | 4 +--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/examples/next-appdir/src/app/client.tsx b/examples/next-appdir/src/app/client.tsx index 16adc1bbde..bc07349bce 100644 --- a/examples/next-appdir/src/app/client.tsx +++ b/examples/next-appdir/src/app/client.tsx @@ -3,9 +3,10 @@ import { omit, useClientLayoutEffect } from "@navikt/ds-react/Utils"; export const ClientComponent = () => { - console.log(omit({ test: "value" }, ["123"])); + console.log({ omit: omit({ test: "value" }, ["test"]) }); useClientLayoutEffect(() => { - console.log("mounted"); + console.log("mounted in client-component"); }, []); + return
client
; }; diff --git a/examples/next-appdir/src/app/page.tsx b/examples/next-appdir/src/app/page.tsx index 73d449b211..0aae6c9810 100644 --- a/examples/next-appdir/src/app/page.tsx +++ b/examples/next-appdir/src/app/page.tsx @@ -31,9 +31,7 @@ export default function Home() { "The Rise of Skywalker", ]; - /* console.log(UTILS); */ - console.log(omit({ test: "value" }, ["123"])); - /* const t = omit({ test: "value" }, ["123"]); */ + console.log({ omit: omit({ test: "value" }, ["test"]) }); return (
From b857bf900b0b24113f45958b88d80f168eaf8bc3 Mon Sep 17 00:00:00 2001 From: Ken Date: Wed, 21 Feb 2024 11:27:34 +0100 Subject: [PATCH 47/53] :art: Oppdatert astro-eksempel --- examples/astro/src/components/ReactTest.tsx | 2 + examples/astro/yarn.lock | 42 ++++++++++----------- 2 files changed, 23 insertions(+), 21 deletions(-) diff --git a/examples/astro/src/components/ReactTest.tsx b/examples/astro/src/components/ReactTest.tsx index db0e18f94d..24d3e2da37 100644 --- a/examples/astro/src/components/ReactTest.tsx +++ b/examples/astro/src/components/ReactTest.tsx @@ -1,9 +1,11 @@ import { Button, DatePicker } from "@navikt/ds-react"; +import { Alert } from "@navikt/ds-react/Alert"; export const ReactTest = () => { return (
ReactTest123 + abc Date: Wed, 21 Feb 2024 12:29:17 +0100 Subject: [PATCH 48/53] :memo: Client component test i use client scope --- examples/next-appdir/src/app/client.tsx | 13 ++++++++++++- examples/next-appdir/yarn.lock | 8 ++++---- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/examples/next-appdir/src/app/client.tsx b/examples/next-appdir/src/app/client.tsx index bc07349bce..752bd1d343 100644 --- a/examples/next-appdir/src/app/client.tsx +++ b/examples/next-appdir/src/app/client.tsx @@ -1,5 +1,6 @@ "use client"; +import { ExpansionCard } from "@navikt/ds-react"; import { omit, useClientLayoutEffect } from "@navikt/ds-react/Utils"; export const ClientComponent = () => { @@ -8,5 +9,15 @@ export const ClientComponent = () => { console.log("mounted in client-component"); }, []); - return
client
; + return ( +
+ client{" "} + + + Utbetaling av sykepenger + + innhold + +
+ ); }; diff --git a/examples/next-appdir/yarn.lock b/examples/next-appdir/yarn.lock index ad1bf2f818..6279b980c1 100644 --- a/examples/next-appdir/yarn.lock +++ b/examples/next-appdir/yarn.lock @@ -96,14 +96,14 @@ __metadata: "@navikt/ds-css@file:./../../@navikt/core/css::locator=next-appdir%40workspace%3A.": version: 6.0.0 - resolution: "@navikt/ds-css@file:./../../@navikt/core/css#./../../@navikt/core/css::hash=3eea40&locator=next-appdir%40workspace%3A." - checksum: 217d914bca0235a1220602f55d3c71b90150a5fd930f1a34fe8ebba454a6546ba597db8c90a7cdd8b2d39d378a777665a8cd5dc7fca2428963542ab7cc5b5c38 + resolution: "@navikt/ds-css@file:./../../@navikt/core/css#./../../@navikt/core/css::hash=9de3a5&locator=next-appdir%40workspace%3A." + checksum: 08e7accc607b1bac2133b22cf60aa02b4f83dd9fe106aec32322b45a69dbfb41d388e7ba34920de457693ee4e4e78bc9259fbfbfa2cd9f6c73b2e92bdd03bbcf languageName: node linkType: hard "@navikt/ds-react@file:./../../@navikt/core/react::locator=next-appdir%40workspace%3A.": version: 6.0.0 - resolution: "@navikt/ds-react@file:./../../@navikt/core/react#./../../@navikt/core/react::hash=8ea802&locator=next-appdir%40workspace%3A." + resolution: "@navikt/ds-react@file:./../../@navikt/core/react#./../../@navikt/core/react::hash=6d10c9&locator=next-appdir%40workspace%3A." dependencies: "@floating-ui/react": 0.25.4 "@navikt/aksel-icons": ^6.0.0 @@ -119,7 +119,7 @@ __metadata: peerDependenciesMeta: "@types/react": optional: true - checksum: ed9c23a6f3d2b5676305e3b64332ce829a6f1936e5efb0150ac375fa3a76e21a16ef7a518919598198825508a876a08bb4215e37c2ed1a0695cb819756044a49 + checksum: b20986f9faa001e926ac8b31dd18a7be31958dcb29b50a6c13922473553a766b91b6e5f8a735b833521656c1e60c6f8a8705f2540e8366bc14324cfc7f0d4723 languageName: node linkType: hard From abb5f18411e00a2717bc35f93275c8275e682bb1 Mon Sep 17 00:00:00 2001 From: Ken Date: Wed, 21 Feb 2024 12:29:58 +0100 Subject: [PATCH 49/53] :memo: Changelogs skrev use client feil --- @navikt/aksel-icons/CHANGELOG.md | 2 +- @navikt/core/react/CHANGELOG.md | 4 ++-- CHANGELOG.md | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/@navikt/aksel-icons/CHANGELOG.md b/@navikt/aksel-icons/CHANGELOG.md index d6a1f3add6..0413f07f5f 100644 --- a/@navikt/aksel-icons/CHANGELOG.md +++ b/@navikt/aksel-icons/CHANGELOG.md @@ -8,7 +8,7 @@ ### Minor Changes -- SSR: ds-react og aksel-icons støtter nå `use-client` og kan brukes i nextjs app-router uten lokal re-eksportering. ([#2623](https://github.com/navikt/aksel/pull/2623)) +- SSR: ds-react og aksel-icons støtter nå `use client` og kan brukes i nextjs app-router uten lokal re-eksportering. ([#2623](https://github.com/navikt/aksel/pull/2623)) ## 5.18.3 diff --git a/@navikt/core/react/CHANGELOG.md b/@navikt/core/react/CHANGELOG.md index 8485537690..e9b9f9b489 100644 --- a/@navikt/core/react/CHANGELOG.md +++ b/@navikt/core/react/CHANGELOG.md @@ -24,7 +24,7 @@ ### Minor Changes -- SSR: ds-react og aksel-icons støtter nå `use-client` og kan brukes i nextjs app-router uten lokal re-eksportering. ([#2623](https://github.com/navikt/aksel/pull/2623)) +- SSR: ds-react og aksel-icons støtter nå `use client` og kan brukes i nextjs app-router uten lokal re-eksportering. ([#2623](https://github.com/navikt/aksel/pull/2623)) ### Patch Changes @@ -1100,7 +1100,7 @@ ### Patch Changes -- CopyButton: Fjernet use-client directive fra komponent. (warning i vite/rollup) +- CopyButton: Fjernet use client directive fra komponent. (warning i vite/rollup) ## 3.2.0 diff --git a/CHANGELOG.md b/CHANGELOG.md index 1cbeb9d1ab..977bc10a82 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,7 @@ - ESM: ds-react og aksel-icons støtter nå native ESM 🎉 ([#2623](https://github.com/navikt/aksel/pull/2623)) -* SSR: ds-react og aksel-icons støtter nå `use-client` og kan brukes i nextjs app-router uten lokal re-eksportering. ([#2623](https://github.com/navikt/aksel/pull/2623)) +* SSR: ds-react og aksel-icons støtter nå `use client` og kan brukes i nextjs app-router uten lokal re-eksportering. ([#2623](https://github.com/navikt/aksel/pull/2623)) ### @navikt/aksel-stylelint @@ -58,7 +58,7 @@ - Modal: Strengere prop-typer ([#2623](https://github.com/navikt/aksel/pull/2623)) -* SSR: ds-react og aksel-icons støtter nå `use-client` og kan brukes i nextjs app-router uten lokal re-eksportering. ([#2623](https://github.com/navikt/aksel/pull/2623)) +* SSR: ds-react og aksel-icons støtter nå `use client` og kan brukes i nextjs app-router uten lokal re-eksportering. ([#2623](https://github.com/navikt/aksel/pull/2623)) ## 5.18 @@ -895,7 +895,7 @@ * CopyButton: `xsmall`-variant for bruk i tabeller ([PR](https://github.com/navikt/aksel/pull/1994)) -- CopyButton: Fjernet use-client directive fra komponent. (warning i vite/rollup) +- CopyButton: Fjernet use client directive fra komponent. (warning i vite/rollup) * Ny komponent CopyButton! Erstatter `CopyToClipboard` som nå er tagget som deprecated ([PR](https://github.com/navikt/aksel/pull/1982)) From 682568b2eaa4c8d8c1d176d390c7b10105b420ca Mon Sep 17 00:00:00 2001 From: Ken Date: Wed, 21 Feb 2024 12:44:46 +0100 Subject: [PATCH 50/53] :bug: rename fieldset --- @navikt/core/react/src/form/{Fieldset => asdasd}/Fieldset.tsx | 0 @navikt/core/react/src/form/{Fieldset => asdasd}/context.ts | 0 .../core/react/src/form/{Fieldset => asdasd}/fieldset.stories.tsx | 0 @navikt/core/react/src/form/{Fieldset => asdasd}/index.ts | 0 @navikt/core/react/src/form/{Fieldset => asdasd}/useFieldset.ts | 0 5 files changed, 0 insertions(+), 0 deletions(-) rename @navikt/core/react/src/form/{Fieldset => asdasd}/Fieldset.tsx (100%) rename @navikt/core/react/src/form/{Fieldset => asdasd}/context.ts (100%) rename @navikt/core/react/src/form/{Fieldset => asdasd}/fieldset.stories.tsx (100%) rename @navikt/core/react/src/form/{Fieldset => asdasd}/index.ts (100%) rename @navikt/core/react/src/form/{Fieldset => asdasd}/useFieldset.ts (100%) diff --git a/@navikt/core/react/src/form/Fieldset/Fieldset.tsx b/@navikt/core/react/src/form/asdasd/Fieldset.tsx similarity index 100% rename from @navikt/core/react/src/form/Fieldset/Fieldset.tsx rename to @navikt/core/react/src/form/asdasd/Fieldset.tsx diff --git a/@navikt/core/react/src/form/Fieldset/context.ts b/@navikt/core/react/src/form/asdasd/context.ts similarity index 100% rename from @navikt/core/react/src/form/Fieldset/context.ts rename to @navikt/core/react/src/form/asdasd/context.ts diff --git a/@navikt/core/react/src/form/Fieldset/fieldset.stories.tsx b/@navikt/core/react/src/form/asdasd/fieldset.stories.tsx similarity index 100% rename from @navikt/core/react/src/form/Fieldset/fieldset.stories.tsx rename to @navikt/core/react/src/form/asdasd/fieldset.stories.tsx diff --git a/@navikt/core/react/src/form/Fieldset/index.ts b/@navikt/core/react/src/form/asdasd/index.ts similarity index 100% rename from @navikt/core/react/src/form/Fieldset/index.ts rename to @navikt/core/react/src/form/asdasd/index.ts diff --git a/@navikt/core/react/src/form/Fieldset/useFieldset.ts b/@navikt/core/react/src/form/asdasd/useFieldset.ts similarity index 100% rename from @navikt/core/react/src/form/Fieldset/useFieldset.ts rename to @navikt/core/react/src/form/asdasd/useFieldset.ts From b96cd887373134be8f2fce4def7dfdf8a6cb4d79 Mon Sep 17 00:00:00 2001 From: Ken Date: Wed, 21 Feb 2024 12:45:03 +0100 Subject: [PATCH 51/53] :bug: rename Fieldset -> fieldset --- @navikt/core/react/src/form/{asdasd => fieldset}/Fieldset.tsx | 0 @navikt/core/react/src/form/{asdasd => fieldset}/context.ts | 0 .../core/react/src/form/{asdasd => fieldset}/fieldset.stories.tsx | 0 @navikt/core/react/src/form/{asdasd => fieldset}/index.ts | 0 @navikt/core/react/src/form/{asdasd => fieldset}/useFieldset.ts | 0 5 files changed, 0 insertions(+), 0 deletions(-) rename @navikt/core/react/src/form/{asdasd => fieldset}/Fieldset.tsx (100%) rename @navikt/core/react/src/form/{asdasd => fieldset}/context.ts (100%) rename @navikt/core/react/src/form/{asdasd => fieldset}/fieldset.stories.tsx (100%) rename @navikt/core/react/src/form/{asdasd => fieldset}/index.ts (100%) rename @navikt/core/react/src/form/{asdasd => fieldset}/useFieldset.ts (100%) diff --git a/@navikt/core/react/src/form/asdasd/Fieldset.tsx b/@navikt/core/react/src/form/fieldset/Fieldset.tsx similarity index 100% rename from @navikt/core/react/src/form/asdasd/Fieldset.tsx rename to @navikt/core/react/src/form/fieldset/Fieldset.tsx diff --git a/@navikt/core/react/src/form/asdasd/context.ts b/@navikt/core/react/src/form/fieldset/context.ts similarity index 100% rename from @navikt/core/react/src/form/asdasd/context.ts rename to @navikt/core/react/src/form/fieldset/context.ts diff --git a/@navikt/core/react/src/form/asdasd/fieldset.stories.tsx b/@navikt/core/react/src/form/fieldset/fieldset.stories.tsx similarity index 100% rename from @navikt/core/react/src/form/asdasd/fieldset.stories.tsx rename to @navikt/core/react/src/form/fieldset/fieldset.stories.tsx diff --git a/@navikt/core/react/src/form/asdasd/index.ts b/@navikt/core/react/src/form/fieldset/index.ts similarity index 100% rename from @navikt/core/react/src/form/asdasd/index.ts rename to @navikt/core/react/src/form/fieldset/index.ts diff --git a/@navikt/core/react/src/form/asdasd/useFieldset.ts b/@navikt/core/react/src/form/fieldset/useFieldset.ts similarity index 100% rename from @navikt/core/react/src/form/asdasd/useFieldset.ts rename to @navikt/core/react/src/form/fieldset/useFieldset.ts From 021b804d9d4bd5d72b4b6692f8ffd3f4c610509c Mon Sep 17 00:00:00 2001 From: Ken Date: Wed, 21 Feb 2024 12:59:57 +0100 Subject: [PATCH 52/53] :bug: Merge fra main brakk combobox tester og stories med feil import --- @navikt/core/react/src/form/combobox/combobox.stories.tsx | 2 +- @navikt/core/react/src/form/combobox/combobox.test.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/@navikt/core/react/src/form/combobox/combobox.stories.tsx b/@navikt/core/react/src/form/combobox/combobox.stories.tsx index ec55cfb74d..569a7cb581 100644 --- a/@navikt/core/react/src/form/combobox/combobox.stories.tsx +++ b/@navikt/core/react/src/form/combobox/combobox.stories.tsx @@ -3,7 +3,7 @@ import { expect, fn, userEvent, within } from "@storybook/test"; import React, { useId, useMemo, useRef, useState } from "react"; import { Chips } from "../../chips"; import { TextField } from "../textfield"; -import { ComboboxProps, Combobox as UNSAFE_Combobox } from "./index"; +import { ComboboxProps, UNSAFE_Combobox } from "./index"; export default { title: "ds-react/Combobox", diff --git a/@navikt/core/react/src/form/combobox/combobox.test.tsx b/@navikt/core/react/src/form/combobox/combobox.test.tsx index 9d23920964..8618029592 100644 --- a/@navikt/core/react/src/form/combobox/combobox.test.tsx +++ b/@navikt/core/react/src/form/combobox/combobox.test.tsx @@ -4,7 +4,7 @@ import userEvent from "@testing-library/user-event"; import React, { useId } from "react"; import { act } from "react-dom/test-utils"; import { describe, expect, test } from "vitest"; -import { Combobox as UNSAFE_Combobox } from "./index"; +import { UNSAFE_Combobox } from "./index"; const options = [ "banana", From d864a457848d9ca9ae7456b11c0c1299363d0d14 Mon Sep 17 00:00:00 2001 From: Halvor Haugan <83693529+HalvorHaugan@users.noreply.github.com> Date: Wed, 21 Feb 2024 14:27:09 +0100 Subject: [PATCH 53/53] Update .changeset/silent-meals-watch-copy.md --- .changeset/silent-meals-watch-copy.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changeset/silent-meals-watch-copy.md b/.changeset/silent-meals-watch-copy.md index 8152a78b53..ac59f06a62 100644 --- a/.changeset/silent-meals-watch-copy.md +++ b/.changeset/silent-meals-watch-copy.md @@ -2,4 +2,4 @@ "@navikt/ds-react": minor --- -Komponenter med dot-notasjon (f.eks `Accordion.Item`) kan oppdateres til ` import { AccordionItem } from "@navikt/ds-react/Accordion";` for bruk i nextjs app-router. +Komponenter med dot-notasjon (f.eks `Accordion.Item`) kan oppdateres til `import { AccordionItem } from "@navikt/ds-react/Accordion";` for bruk i nextjs app-router.