Merge branch 'main' into page-update-token

navikt · Jan 11, 2024 · 4a2c44d · 4a2c44d
2 parents c210c70 + 76eefdf
commit 4a2c44d
Show file tree

Hide file tree

Showing 86 changed files with 2,650 additions and 310 deletions.
diff --git a/.changeset/friendly-months-relate-2.md b/.changeset/friendly-months-relate-2.md
@@ -0,0 +1,5 @@
+---
+"@navikt/ds-react": minor
+---
+
+Accordion.Item, Dropdown, ReadMore og Tooltip: Har en ny prop `onOpenChange?: (open: boolean) => void;` som forteller nå-state når `open`-state endrer seg. Dette vil være nyttig hvis man ikke bruker controlled-state, men fortsatt ønsker å vite om komponenten er `open` eller ikke (f.eks logging).
diff --git a/.changeset/friendly-months-relate.md b/.changeset/friendly-months-relate.md
@@ -0,0 +1,5 @@
+---
+"@navikt/ds-react": minor
+---
+
+Controlled-state: Accordion.Item, Dropdown, ReadMore, Table.ExpandableRow og Tooltip har oppdatert intern håndtering av controlled state. Endringen skal ikke påvirke dagens API.
diff --git a/.changeset/nice-tools-pay.md b/.changeset/nice-tools-pay.md
diff --git a/.husky/pre-commit b/.husky/pre-commit
@@ -1,4 +1,4 @@
 #!/bin/sh
 . "$(dirname $0)/_/husky.sh"
 
-yarn pretty-quick --staged && yarn lint-staged
+yarn lint-staged
diff --git a/@navikt/aksel-icons/CHANGELOG.md b/@navikt/aksel-icons/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @navikt/aksel-icons
 
+## 5.12.5
+
+## 5.12.4
+
+## 5.12.3
+
 ## 5.12.2
 
 ## 5.12.1

diff --git a/@navikt/aksel-icons/package.json b/@navikt/aksel-icons/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@navikt/aksel-icons",
-  "version": "5.12.2",
+  "version": "5.12.5",
   "author": "Aksel | NAV",
   "homepage": "https://aksel.nav.no/ikoner",
   "repository": {

diff --git a/@navikt/aksel-stylelint/CHANGELOG.md b/@navikt/aksel-stylelint/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @navikt/aksel-stylelint
 
+## 5.12.5
+
+## 5.12.4
+
+### Patch Changes
+
+- Stylelint: Støtter nå stylelint v16 ([#2591](https://github.com/navikt/aksel/pull/2591))
+
+## 5.12.3
+
 ## 5.12.2
 
 ## 5.12.1

diff --git a/@navikt/aksel-stylelint/package.json b/@navikt/aksel-stylelint/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@navikt/aksel-stylelint",
-  "version": "5.12.2",
+  "version": "5.12.5",
   "author": "Aksel | NAV",
   "homepage": "https://aksel.nav.no/grunnleggende/kode/stylelint",
   "repository": {
@@ -35,8 +35,8 @@
     "dev": "yarn watch:lint"
   },
   "devDependencies": {
-    "@navikt/ds-css": "^5.12.2",
-    "@navikt/ds-tokens": "^5.12.2",
+    "@navikt/ds-css": "^5.12.5",
+    "@navikt/ds-tokens": "^5.12.5",
     "@types/jest": "^29.0.0",
     "concurrently": "7.2.1",
     "copyfiles": "2.4.1",

diff --git a/@navikt/aksel-stylelint/src/index.ts b/@navikt/aksel-stylelint/src/index.ts
@@ -5,4 +5,4 @@ const rulesPlugins = Object.keys(rules).map((ruleName) => {
   return createPlugin(`${ruleName}`, rules[ruleName]);
 });
 
-export default rulesPlugins;
+module.exports = rulesPlugins;
diff --git a/@navikt/aksel/CHANGELOG.md b/@navikt/aksel/CHANGELOG.md
@@ -1,5 +1,26 @@
 # @navikt/aksel
 
+## 5.12.5
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @navikt/ds-css@5.12.5
+
+## 5.12.4
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @navikt/ds-css@5.12.4
+
+## 5.12.3
+
+### Patch Changes
+
+- Updated dependencies [[`1b71fe01c`](https://github.com/navikt/aksel/commit/1b71fe01cb152e3327972e96018e94a44d4128d6)]:
+  - @navikt/ds-css@5.12.3
+
 ## 5.12.2
 
 ### Patch Changes

diff --git a/@navikt/aksel/package.json b/@navikt/aksel/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@navikt/aksel",
-  "version": "5.12.2",
+  "version": "5.12.5",
   "description": "Aksel command line interface. Handles css-imports, codemods and more",
   "author": "Aksel | NAV designsystem team",
   "license": "MIT",
@@ -18,8 +18,8 @@
     "clean": "rimraf dist",
     "build": "yarn clean && tsc -p tsconfig.json",
     "dev": "tsc --watch -p tsconfig.json",
-    "test": "yarn build && jest",
-    "test:watch": "jest --watch"
+    "test": "yarn build && NODE_OPTIONS=--experimental-vm-modules yarn jest",
+    "test:watch": "NODE_OPTIONS=--experimental-vm-modules yarn jest --watch"
   },
   "bin": "./dist/index.js",
   "repository": {
@@ -29,7 +29,7 @@
   },
   "homepage": "https://aksel.nav.no/grunnleggende/kode/kommandolinje",
   "dependencies": {
-    "@navikt/ds-css": "5.12.2",
+    "@navikt/ds-css": "5.12.5",
     "axios": "1.6.0",
     "chalk": "4.1.0",
     "clipboardy": "^2.3.0",

diff --git a/@navikt/aksel/src/codemod/tokens-map.mjs → @navikt/aksel/src/codemod/tokens-map.js b/@navikt/aksel/src/codemod/tokens-map.mjs → @navikt/aksel/src/codemod/tokens-map.js
diff --git a/@navikt/aksel/src/codemod/transforms/v2.0.0/update-css-tokens/update-css-tokens.ts b/@navikt/aksel/src/codemod/transforms/v2.0.0/update-css-tokens/update-css-tokens.ts
@@ -1,4 +1,4 @@
-import { tokens } from "../../../tokens-map.mjs";
+import { tokens } from "../../../tokens-map.js";
 
 /**
  * @param {import('jscodeshift').FileInfo} file

diff --git a/@navikt/aksel/src/codemod/transforms/v2.0.0/update-js-tokens/update-js-tokens.ts b/@navikt/aksel/src/codemod/transforms/v2.0.0/update-js-tokens/update-js-tokens.ts
@@ -1,5 +1,5 @@
 import type { JSCodeshift } from "jscodeshift";
-import { tokens } from "../../../tokens-map.mjs";
+import { tokens } from "../../../tokens-map.js";
 import {
   getImportSpecifier,
   getImportSpecifierName,

diff --git a/@navikt/aksel/src/codemod/transforms/v2.0.0/update-less-tokens/update-less-tokens.ts b/@navikt/aksel/src/codemod/transforms/v2.0.0/update-less-tokens/update-less-tokens.ts
@@ -1,5 +1,5 @@
+import { tokens } from "../../../tokens-map.js";
 import { translateToken } from "../../../utils/translate-token";
-import { tokens } from "../../../tokens-map.mjs";
 
 /**
  * @param {import('jscodeshift').FileInfo} file

diff --git a/@navikt/aksel/src/codemod/transforms/v2.0.0/update-sass-tokens/update-sass-tokens.ts b/@navikt/aksel/src/codemod/transforms/v2.0.0/update-sass-tokens/update-sass-tokens.ts
@@ -1,5 +1,5 @@
+import { tokens } from "../../../tokens-map.js";
 import { translateToken } from "../../../utils/translate-token";
-import { tokens } from "../../../tokens-map.mjs";
 
 /**
  * @param {import('jscodeshift').FileInfo} file

diff --git a/@navikt/aksel/src/codemod/utils/check.ts b/@navikt/aksel/src/codemod/utils/check.ts
@@ -1,10 +1,8 @@
+import { applyTransform } from "jscodeshift/dist/testUtils";
 import fs from "node:fs";
 import path from "node:path";
-
 import prettier from "prettier";
 
-import { applyTransform } from "jscodeshift/dist/testUtils";
-
 interface TestT {
   fixture: string;
   migration: string;
@@ -34,11 +32,11 @@ export function check(
 
       // Format output and expected with prettier for white spaces and line breaks consistency
       expect(
-        prettier.format(output, {
+        await prettier.format(output, {
           parser: parser === "js" ? "typescript" : parser,
         })
       ).toBe(
-        prettier.format(expected, {
+        await prettier.format(expected, {
           parser: parser === "js" ? "typescript" : parser,
         })
       );

diff --git a/@navikt/core/css/CHANGELOG.md b/@navikt/core/css/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @navikt/ds-css
 
+## 5.12.5
+
+## 5.12.4
+
+## 5.12.3
+
+### Patch Changes
+
+- ExpansionCard: Divider mellom header og innhold ([#2566](https://github.com/navikt/aksel/pull/2566))
+
 ## 5.12.2
 
 ## 5.12.1

diff --git a/@navikt/core/css/package.json b/@navikt/core/css/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@navikt/ds-css",
-  "version": "5.12.2",
+  "version": "5.12.5",
   "description": "CSS for NAV Designsystem",
   "author": "Aksel | NAV designsystem team",
   "keywords": [
@@ -27,7 +27,7 @@
     "css:get-version": "node config/get-version.js"
   },
   "devDependencies": {
-    "@navikt/ds-tokens": "^5.12.2",
+    "@navikt/ds-tokens": "^5.12.5",
     "cssnano": "6.0.0",
     "fast-glob": "3.2.11",
     "lodash": "4.17.21",

diff --git a/@navikt/core/react/CHANGELOG.md b/@navikt/core/react/CHANGELOG.md
@@ -1,5 +1,33 @@
 # @navikt/ds-react
 
+## 5.12.5
+
+### Patch Changes
+
+- MonthPicker: MonthCaption satt forrige/neste-knapper til `disabled` når de skulle være `enabled`. ([#2601](https://github.com/navikt/aksel/pull/2601))
+
+- Updated dependencies []:
+  - @navikt/ds-tokens@5.12.5
+  - @navikt/aksel-icons@5.12.5
+
+## 5.12.4
+
+### Patch Changes
+
+- Accessibility improvements to Radio and Checkbox component, so each label is only announced once with screen readers ([#2562](https://github.com/navikt/aksel/pull/2562))
+
+- Updated dependencies []:
+  - @navikt/ds-tokens@5.12.4
+  - @navikt/aksel-icons@5.12.4
+
+## 5.12.3
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @navikt/ds-tokens@5.12.3
+  - @navikt/aksel-icons@5.12.3
+
 ## 5.12.2
 
 ### 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": "5.12.2",
+  "version": "5.12.5",
   "description": "Aksel react-components for NAV designsystem",
   "author": "Aksel | NAV designsystem team",
   "license": "MIT",
@@ -38,8 +38,8 @@
   },
   "dependencies": {
     "@floating-ui/react": "0.25.4",
-    "@navikt/aksel-icons": "^5.12.2",
-    "@navikt/ds-tokens": "^5.12.2",
+    "@navikt/aksel-icons": "^5.12.5",
+    "@navikt/ds-tokens": "^5.12.5",
     "@radix-ui/react-tabs": "1.0.0",
     "@radix-ui/react-toggle-group": "1.0.0",
     "clsx": "^1.2.1",

diff --git a/@navikt/core/react/src/accordion/AccordionItem.tsx b/@navikt/core/react/src/accordion/AccordionItem.tsx
@@ -1,13 +1,8 @@
 import cl from "clsx";
-import React, {
-  createContext,
-  forwardRef,
-  useContext,
-  useRef,
-  useState,
-} from "react";
-import { AccordionContext } from "./AccordionContext";
+import React, { createContext, forwardRef, useContext, useRef } from "react";
 import { omit } from "../util";
+import { useControllableState } from "../util/hooks/useControllableState";
+import { AccordionContext } from "./AccordionContext";
 
 export interface AccordionItemProps
   extends React.HTMLAttributes<HTMLDivElement> {
@@ -26,6 +21,10 @@ export interface AccordionItemProps
    * @default false
    */
   defaultOpen?: boolean;
+  /**
+   * Callback for current open-state
+   */
+  onOpenChange?: (open: boolean) => void;
 }
 
 export interface AccordionItemContextProps {
@@ -37,20 +36,21 @@ export const AccordionItemContext =
   createContext<AccordionItemContextProps | null>(null);
 
 const AccordionItem = forwardRef<HTMLDivElement, AccordionItemProps>(
-  ({ children, className, open, defaultOpen = false, ...rest }, ref) => {
-    const [internalOpen, setInternalOpen] = useState<boolean>(defaultOpen);
-    const context = useContext(AccordionContext);
+  (
+    { children, className, open, defaultOpen = false, onOpenChange, ...rest },
+    ref
+  ) => {
+    const [_open, _setOpen] = useControllableState({
+      defaultValue: defaultOpen,
+      value: open,
+      onChange: onOpenChange,
+    });
 
-    const [_open, _setOpen] = useState(defaultOpen);
+    const context = useContext(AccordionContext);
     const shouldAnimate = useRef<boolean>(!(Boolean(open) || defaultOpen));
+
     const handleOpen = () => {
-      if (open === undefined) {
-        const newOpen = !_open;
-        _setOpen(newOpen);
-        setInternalOpen(newOpen);
-      } else {
-        setInternalOpen(!open);
-      }
+      _setOpen((x) => !x);
       shouldAnimate.current = true;
     };
 
@@ -61,7 +61,7 @@ const AccordionItem = forwardRef<HTMLDivElement, AccordionItemProps>(
     return (
       <div
         className={cl("navds-accordion__item", className, {
-          "navds-accordion__item--open": open ?? internalOpen,
+          "navds-accordion__item--open": _open,
           "navds-accordion__item--neutral": context?.variant === "neutral",
           "navds-accordion__item--no-animation": !shouldAnimate.current,
         })}
@@ -70,7 +70,7 @@ const AccordionItem = forwardRef<HTMLDivElement, AccordionItemProps>(
       >
         <AccordionItemContext.Provider
           value={{
-            open: open ?? internalOpen,
+            open: _open,
             toggleOpen: handleOpen,
           }}
         >