Merge branch 'main' into refactor-accordion-animation

navikt · Jan 17, 2025 · 49eeb4a · 49eeb4a
2 parents cddcba2 + 7e6d91e
commit 49eeb4a
Show file tree

Hide file tree

Showing 29 changed files with 239 additions and 238 deletions.
diff --git a/.husky/pre-commit b/.husky/pre-commit
@@ -1,4 +1,4 @@
 #!/bin/sh
 . "$(dirname $0)/_/husky.sh"
 
-yarn lint-staged
+yarn lint-staged && yarn tsx ./scripts/in-sync-versions.ts
diff --git a/@navikt/aksel-icons/CHANGELOG.md b/@navikt/aksel-icons/CHANGELOG.md
@@ -1,5 +1,7 @@
 # @navikt/aksel-icons
 
+## 7.9.2
+
 ## 7.9.1
 
 ## 7.9.0

diff --git a/@navikt/aksel-icons/figma-plugin/package.json b/@navikt/aksel-icons/figma-plugin/package.json
@@ -22,7 +22,7 @@
     "@svgr/core": "^8.1.0",
     "@types/node": "^18.15.11",
     "@types/postcss-url": "^10.0.4",
-    "@types/react": "^18.0.0",
+    "@types/react": "^18.3.11",
     "@types/react-dom": "^18.0.0",
     "@vitejs/plugin-react": "^4.2.1",
     "postcss": "^8.4.31",

diff --git a/@navikt/aksel-icons/package.json b/@navikt/aksel-icons/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@navikt/aksel-icons",
-  "version": "7.9.1",
+  "version": "7.9.2",
   "author": "Aksel | Nav",
   "homepage": "https://aksel.nav.no/ikoner",
   "repository": {
@@ -84,7 +84,7 @@
     "react": "^18.0.0",
     "rehype-parse": "8.0.4",
     "tsc-alias": "1.8.8",
-    "tsx": "^4.7.1",
+    "tsx": "^4.19.1",
     "typescript": "5.5.4",
     "unified": "10.1.2",
     "vitest": "^2.1.8"

diff --git a/@navikt/aksel-stylelint/CHANGELOG.md b/@navikt/aksel-stylelint/CHANGELOG.md
@@ -1,5 +1,7 @@
 # @navikt/aksel-stylelint
 
+## 7.9.2
+
 ## 7.9.1
 
 ## 7.9.0

diff --git a/@navikt/aksel-stylelint/package.json b/@navikt/aksel-stylelint/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@navikt/aksel-stylelint",
-  "version": "7.9.1",
+  "version": "7.9.2",
   "author": "Aksel | Nav",
   "homepage": "https://aksel.nav.no/grunnleggende/kode/stylelint",
   "repository": {
@@ -35,14 +35,14 @@
     "dev": "yarn watch:lint"
   },
   "devDependencies": {
-    "@navikt/ds-css": "^7.9.1",
-    "@navikt/ds-tokens": "^7.9.1",
+    "@navikt/ds-css": "^7.9.2",
+    "@navikt/ds-tokens": "^7.9.2",
     "concurrently": "9.0.1",
     "postcss-selector-parser": "^6.0.13",
     "postcss-value-parser": "^4.2.0",
-    "stylelint": "^14.8.5",
+    "stylelint": "^16.10.0",
     "stylelint-test-rule-node": "^0.2.1",
-    "tsx": "^4.7.1",
+    "tsx": "^4.19.1",
     "typescript": "5.5.4"
   }
 }
diff --git a/@navikt/aksel/CHANGELOG.md b/@navikt/aksel/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @navikt/aksel
 
+## 7.9.2
+
+### Patch Changes
+
+- Updated dependencies [[`54495a4`](https://github.com/navikt/aksel/commit/54495a446065c73a06865885e65b3b07dedaa5ea)]:
+  - @navikt/ds-css@7.9.2
+
 ## 7.9.1
 
 ### Patch Changes

diff --git a/@navikt/aksel/package.json b/@navikt/aksel/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@navikt/aksel",
-  "version": "7.9.1",
+  "version": "7.9.2",
   "description": "Aksel command line interface. Handles css-imports, codemods and more",
   "author": "Aksel | Nav designsystem team",
   "license": "MIT",
@@ -29,7 +29,7 @@
   },
   "homepage": "https://aksel.nav.no/grunnleggende/kode/kommandolinje",
   "dependencies": {
-    "@navikt/ds-css": "7.9.1",
+    "@navikt/ds-css": "^7.9.2",
     "axios": "1.7.4",
     "chalk": "4.1.0",
     "clipboardy": "^2.3.0",
@@ -40,7 +40,7 @@
     "is-git-clean": "1.1.0",
     "jscodeshift": "^0.15.1",
     "jscodeshift-add-imports": "1.0.11",
-    "lodash": "4.17.21",
+    "lodash": "^4.17.21",
     "react-scanner": "^1.1.0"
   },
   "devDependencies": {

diff --git a/@navikt/core/css/CHANGELOG.md b/@navikt/core/css/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @navikt/ds-css
 
+## 7.9.2
+
+### Patch Changes
+
+- Table: Removed border-bottom for HeaderCell used in ExpandableRow. ([#3503](https://github.com/navikt/aksel/pull/3503))
+
 ## 7.9.1
 
 ### Patch Changes

diff --git a/@navikt/core/css/darkside/table.darkside.css b/@navikt/core/css/darkside/table.darkside.css
@@ -149,22 +149,18 @@
   flex-shrink: 0;
 }
 
-.navds-table__expandable-row:not(.navds-table__expandable-row--open) .navds-table__data-cell {
+.navds-table__expandable-row:not(.navds-table__expandable-row--open) :where(.navds-table__data-cell, .navds-table__header-cell) {
   transition: border-bottom-color 150ms cubic-bezier(0.95, 0.05, 0.8, 0.04);
 }
 
 .navds-table__expandable-row.navds-table__expandable-row--clickable:not(.navds-table__expandable-row--expansion-disabled):hover {
   cursor: pointer;
 }
 
-.navds-table__expandable-row--open .navds-table__data-cell {
+.navds-table__expandable-row--open :where(.navds-table__data-cell, .navds-table__header-cell) {
   border-bottom-color: transparent;
 }
 
-.navds-table__expandable-row--open .navds-table__header-cell {
-  border-color: var(--ax-border-default);
-}
-
 .navds-table__expandable-row--open .navds-table__toggle-expand-cell--open {
   border-color: transparent;
 }

diff --git a/@navikt/core/css/package.json b/@navikt/core/css/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@navikt/ds-css",
-  "version": "7.9.1",
+  "version": "7.9.2",
   "description": "CSS for Nav Designsystem",
   "author": "Aksel | Nav designsystem team",
   "keywords": [
@@ -28,7 +28,7 @@
     "test": "yarn build && vitest run"
   },
   "devDependencies": {
-    "@navikt/ds-tokens": "^7.9.1",
+    "@navikt/ds-tokens": "^7.9.2",
     "@types/clean-css": "4.2.11",
     "autoprefixer": "^10.4.20",
     "browserslist": "^4.24.2",
@@ -43,7 +43,7 @@
     "postcss-cli": "^9.0.0",
     "postcss-combine-duplicated-selectors": "10.0.3",
     "postcss-import": "^14.1.0",
-    "tsx": "^4.7.1",
+    "tsx": "^4.19.1",
     "vitest": "^2.1.8"
   },
   "browserslist": [

diff --git a/@navikt/core/css/table.css b/@navikt/core/css/table.css
@@ -156,22 +156,18 @@
   flex-shrink: 0;
 }
 
-.navds-table__expandable-row:not(.navds-table__expandable-row--open) .navds-table__data-cell {
+.navds-table__expandable-row:not(.navds-table__expandable-row--open) :where(.navds-table__data-cell, .navds-table__header-cell) {
   transition: border-bottom-color 190ms cubic-bezier(0.6, 0.04, 0.98, 0.335);
 }
 
 .navds-table__expandable-row.navds-table__expandable-row--clickable:not(.navds-table__expandable-row--expansion-disabled):hover {
   cursor: pointer;
 }
 
-.navds-table__expandable-row--open .navds-table__data-cell {
+.navds-table__expandable-row--open :where(.navds-table__data-cell, .navds-table__header-cell) {
   border-bottom-color: transparent;
 }
 
-.navds-table__expandable-row--open .navds-table__header-cell {
-  border-color: var(--ac-table-row-border, var(--a-border-default));
-}
-
 .navds-table__expandable-row--open .navds-table__toggle-expand-cell--open {
   border-color: transparent;
 }

diff --git a/@navikt/core/react/CHANGELOG.md b/@navikt/core/react/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @navikt/ds-react
 
+## 7.9.2
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @navikt/ds-tokens@7.9.2
+  - @navikt/aksel-icons@7.9.2
+
 ## 7.9.1
 
 ### Patch Changes

diff --git a/@navikt/core/react/package.json b/@navikt/core/react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@navikt/ds-react",
-  "version": "7.9.1",
+  "version": "7.9.2",
   "description": "React components from the Norwegian Labour and Welfare Administration.",
   "author": "Aksel, a team part of the Norwegian Labour and Welfare Administration.",
   "license": "MIT",
@@ -615,8 +615,8 @@
   "dependencies": {
     "@floating-ui/react": "0.25.4",
     "@floating-ui/react-dom": "^2.0.9",
-    "@navikt/aksel-icons": "^7.9.1",
-    "@navikt/ds-tokens": "^7.9.1",
+    "@navikt/aksel-icons": "^7.9.2",
+    "@navikt/ds-tokens": "^7.9.2",
     "clsx": "^2.1.0",
     "date-fns": "^3.0.0",
     "react-day-picker": "8.10.1"

diff --git a/@navikt/core/react/src/table/stories/table-2-expandable.stories.tsx b/@navikt/core/react/src/table/stories/table-2-expandable.stories.tsx
@@ -32,9 +32,13 @@ export const Expandable = () => {
             togglePlacement="right"
             defaultOpen
           >
-            {columns.map(({ key }) => (
-              <Table.DataCell key={key}>{row[key]}</Table.DataCell>
-            ))}
+            {columns.map(({ key }, index) =>
+              index === 0 ? (
+                <Table.HeaderCell key={key}>{row[key]}</Table.HeaderCell>
+              ) : (
+                <Table.DataCell key={key}>{row[key]}</Table.DataCell>
+              ),
+            )}
           </Table.ExpandableRow>
         ))}
       </Table.Body>

diff --git a/@navikt/core/tailwind/CHANGELOG.md b/@navikt/core/tailwind/CHANGELOG.md
@@ -1,5 +1,7 @@
 # @navikt/ds-tailwind
 
+## 7.9.2
+
 ## 7.9.1
 
 ## 7.9.0

diff --git a/@navikt/core/tailwind/package.json b/@navikt/core/tailwind/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@navikt/ds-tailwind",
-  "version": "7.9.1",
+  "version": "7.9.2",
   "description": "Tailwind config based on @navikt/ds-tokens",
   "author": "Aksel | Nav designsystem team",
   "keywords": [
@@ -24,7 +24,7 @@
     "directory": "@navikt/core/tailwind"
   },
   "devDependencies": {
-    "@navikt/ds-tokens": "^7.9.1",
+    "@navikt/ds-tokens": "^7.9.2",
     "color": "4.2.3",
     "lodash": "^4.17.21",
     "tailwindcss": "^3.3.3",

diff --git a/@navikt/core/tokens/CHANGELOG.md b/@navikt/core/tokens/CHANGELOG.md
@@ -1,5 +1,7 @@
 # @navikt/ds-tokens
 
+## 7.9.2
+
 ## 7.9.1
 
 ## 7.9.0

diff --git a/@navikt/core/tokens/package.json b/@navikt/core/tokens/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@navikt/ds-tokens",
-  "version": "7.9.1",
+  "version": "7.9.2",
   "description": "Design-tokens for Nav designsystem",
   "author": "Aksel | Nav designsystem team",
   "keywords": [

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,16 +4,18 @@
 
 ### @navikt/ds-css
 
-- Link: :bug: Use inside Alert got wrong text-color while focused or active. ([#3489](https://github.com/navikt/aksel/pull/3489))
+- Table: Removed border-bottom for HeaderCell used in ExpandableRow. ([#3503](https://github.com/navikt/aksel/pull/3503))
 
-* ErrorSummary: :sparkles: new prop to prefix error with a warning icon. ([#3445](https://github.com/navikt/aksel/pull/3445))
+* Link: :bug: Use inside Alert got wrong text-color while focused or active. ([#3489](https://github.com/navikt/aksel/pull/3489))
+
+- ErrorSummary: :sparkles: new prop to prefix error with a warning icon. ([#3445](https://github.com/navikt/aksel/pull/3445))
   All form components: replace dot with warning icon in error message.
 
-- Switch: Update switch to better reflect unchecked state. ([#3468](https://github.com/navikt/aksel/pull/3468))
+* Switch: Update switch to better reflect unchecked state. ([#3468](https://github.com/navikt/aksel/pull/3468))
 
-- Select: :bug: Focus-border no longer cancels out error-border. ([#3465](https://github.com/navikt/aksel/pull/3465))
+* Select: :bug: Focus-border no longer cancels out error-border. ([#3465](https://github.com/navikt/aksel/pull/3465))
 
-- Textarea: :bug: Focus-border no longer cancels out error-border. ([#3465](https://github.com/navikt/aksel/pull/3465))
+* Textarea: :bug: Focus-border no longer cancels out error-border. ([#3465](https://github.com/navikt/aksel/pull/3465))
 
 ### @navikt/ds-react
 

diff --git a/aksel.nav.no/package.json b/aksel.nav.no/package.json
@@ -15,10 +15,10 @@
     "playroom"
   ],
   "dependencies": {
-    "@navikt/aksel-icons": "^7.9.1",
-    "@navikt/ds-css": "^7.9.1",
-    "@navikt/ds-react": "^7.9.1",
-    "@navikt/ds-tailwind": "^7.9.1",
-    "@navikt/ds-tokens": "^7.9.1"
+    "@navikt/aksel-icons": "^7.9.2",
+    "@navikt/ds-css": "^7.9.2",
+    "@navikt/ds-react": "^7.9.2",
+    "@navikt/ds-tailwind": "^7.9.2",
+    "@navikt/ds-tokens": "^7.9.2"
   }
 }
diff --git a/aksel.nav.no/website/package.json b/aksel.nav.no/website/package.json
@@ -88,10 +88,10 @@
     "@sanity/block-tools": "3.59.0",
     "@sanity/schema": "3.59.0",
     "@types/jscodeshift": "^0.11.11",
-    "@types/react": "^18.0.0",
+    "@types/react": "^18.3.11",
     "@types/react-dom": "^18.0.0",
     "autoprefixer": "^10.4.20",
-    "babel-loader": "^8.2.0",
+    "babel-loader": "^9.1.3",
     "copyfiles": "^2.4.1",
     "cross-env": "^7.0.0",
     "jsdom": "25.0.1",

diff --git a/aksel.nav.no/website/pages/eksempler/table/expandable.tsx b/aksel.nav.no/website/pages/eksempler/table/expandable.tsx
@@ -19,7 +19,7 @@ const Example = () => {
               key={i + fnr}
               content="Innhold i ekspanderbar rad"
             >
-              <Table.DataCell scope="row">{name}</Table.DataCell>
+              <Table.HeaderCell scope="row">{name}</Table.HeaderCell>
               <Table.DataCell>{fnr}</Table.DataCell>
               <Table.DataCell>{format(new Date(start))}</Table.DataCell>
             </Table.ExpandableRow>

diff --git a/examples/astro/package.json b/examples/astro/package.json
@@ -16,7 +16,7 @@
     "@navikt/aksel-icons": "file:./../../@navikt/aksel-icons",
     "@navikt/ds-css": "file:./../../@navikt/core/css",
     "@navikt/ds-react": "file:./../../@navikt/core/react",
-    "@types/react": "^18.2.48",
+    "@types/react": "^18.3.11",
     "@types/react-dom": "^18.2.18",
     "astro": "^4.15.8",
     "react": "^18.2.0",

diff --git a/examples/referansesider/package.json b/examples/referansesider/package.json
@@ -24,7 +24,7 @@
     "@eslint/js": "^9.9.0",
     "@tanstack/router-devtools": "^1.57.17",
     "@tanstack/router-plugin": "^1.57.15",
-    "@types/react": "^18.3.3",
+    "@types/react": "^18.3.11",
     "@types/react-dom": "^18.3.0",
     "@vitejs/plugin-react-swc": "^3.5.0",
     "@vitest/eslint-plugin": "^1.1.4",

diff --git a/examples/shadow-dom/package.json b/examples/shadow-dom/package.json
@@ -16,7 +16,7 @@
     "react-dom": "^18.2.0"
   },
   "devDependencies": {
-    "@types/react": "^18.2.48",
+    "@types/react": "^18.3.11",
     "@types/react-dom": "^18.2.18",
     "@vitejs/plugin-react": "^4.2.1",
     "typescript": "5.5.4",

diff --git a/package.json b/package.json
@@ -191,6 +191,7 @@
     "stylelint-config-standard": "^36.0.0",
     "stylelint-declaration-block-no-ignored-properties": "^2.6.0",
     "stylelint-value-no-unknown-custom-properties": "^6.0.0",
+    "tsx": "^4.19.1",
     "typescript": "5.5.4",
     "vite": "^5.4.6",
     "vite-plugin-turbosnap": "^1.0.3",