Merge branch 'main' into aksel-v6

navikt · Jan 18, 2024 · 40f688f · 40f688f
2 parents 9512fc6 + 930c772
commit 40f688f
Show file tree

Hide file tree

Showing 28 changed files with 520 additions and 59 deletions.
diff --git a/@navikt/aksel-icons/CHANGELOG.md b/@navikt/aksel-icons/CHANGELOG.md
@@ -1,5 +1,7 @@
 # @navikt/aksel-icons
 
+## 5.15.1
+
 ## 5.15.0
 
 ### Minor Changes

diff --git a/@navikt/aksel-icons/package.json b/@navikt/aksel-icons/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@navikt/aksel-icons",
-  "version": "5.15.0",
+  "version": "5.15.1",
   "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,7 @@
 # @navikt/aksel-stylelint
 
+## 5.15.1
+
 ## 5.15.0
 
 ## 5.14.0

diff --git a/@navikt/aksel-stylelint/package.json b/@navikt/aksel-stylelint/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@navikt/aksel-stylelint",
-  "version": "5.15.0",
+  "version": "5.15.1",
   "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.15.0",
-    "@navikt/ds-tokens": "^5.15.0",
+    "@navikt/ds-css": "^5.15.1",
+    "@navikt/ds-tokens": "^5.15.1",
     "@types/jest": "^29.0.0",
     "concurrently": "7.2.1",
     "copyfiles": "2.4.1",

diff --git a/@navikt/aksel/CHANGELOG.md b/@navikt/aksel/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @navikt/aksel
 
+## 5.15.1
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @navikt/ds-css@5.15.1
+
 ## 5.15.0
 
 ### Patch Changes

diff --git a/@navikt/aksel/package.json b/@navikt/aksel/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@navikt/aksel",
-  "version": "5.15.0",
+  "version": "5.15.1",
   "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": "5.15.0",
+    "@navikt/ds-css": "5.15.1",
     "axios": "1.6.0",
     "chalk": "4.1.0",
     "clipboardy": "^2.3.0",

diff --git a/@navikt/core/css/CHANGELOG.md b/@navikt/core/css/CHANGELOG.md
@@ -1,5 +1,7 @@
 # @navikt/ds-css
 
+## 5.15.1
+
 ## 5.15.0
 
 ## 5.14.0

diff --git a/@navikt/core/css/package.json b/@navikt/core/css/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@navikt/ds-css",
-  "version": "5.15.0",
+  "version": "5.15.1",
   "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.15.0",
+    "@navikt/ds-tokens": "^5.15.1",
     "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,15 @@
 # @navikt/ds-react
 
+## 5.15.1
+
+### Patch Changes
+
+- HelpText: HelpText-state ble ikke riktig oppdatert ved klikk ([#2643](https://github.com/navikt/aksel/pull/2643))
+
+- Updated dependencies []:
+  - @navikt/ds-tokens@5.15.1
+  - @navikt/aksel-icons@5.15.1
+
 ## 5.15.0
 
 ### 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.15.0",
+  "version": "5.15.1",
   "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.15.0",
-    "@navikt/ds-tokens": "^5.15.0",
+    "@navikt/aksel-icons": "^5.15.1",
+    "@navikt/ds-tokens": "^5.15.1",
     "@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/help-text/HelpText.tsx b/@navikt/core/react/src/help-text/HelpText.tsx
@@ -57,7 +57,7 @@ export const HelpText = forwardRef<HTMLButtonElement, HelpTextProps>(
         <button
           {...rest}
           ref={mergedRef}
-          onClick={composeEventHandlers(onClick, () => setOpen((x) => x))}
+          onClick={composeEventHandlers(onClick, () => setOpen((x) => !x))}
           className={cl(className, "navds-help-text__button")}
           type="button"
           aria-expanded={open}

diff --git a/@navikt/core/tailwind/CHANGELOG.md b/@navikt/core/tailwind/CHANGELOG.md
@@ -1,5 +1,7 @@
 # @navikt/ds-tailwind
 
+## 5.15.1
+
 ## 5.15.0
 
 ## 5.14.0

diff --git a/@navikt/core/tailwind/package.json b/@navikt/core/tailwind/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@navikt/ds-tailwind",
-  "version": "5.15.0",
+  "version": "5.15.1",
   "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": "^5.15.0",
+    "@navikt/ds-tokens": "^5.15.1",
     "@types/jest": "^29.0.0",
     "color": "4.2.3",
     "jest": "^29.0.0",

diff --git a/@navikt/core/tokens/CHANGELOG.md b/@navikt/core/tokens/CHANGELOG.md
@@ -1,5 +1,7 @@
 # @navikt/ds-tokens
 
+## 5.15.1
+
 ## 5.15.0
 
 ## 5.14.0

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,10 @@
 
 - Ikoner: Synket ikoner med Figma. Lagt til nytt ikon `FigureChild` ([#2629](https://github.com/navikt/aksel/pull/2629))
 
+### @navikt/ds-react
+
+- HelpText: HelpText-state ble ikke riktig oppdatert ved klikk ([#2643](https://github.com/navikt/aksel/pull/2643))
+
 ## 5.14
 
 ### @navikt/ds-react

diff --git a/aksel.nav.no/package.json b/aksel.nav.no/package.json
@@ -16,10 +16,10 @@
     "playroom"
   ],
   "dependencies": {
-    "@navikt/aksel-icons": "^5.15.0",
-    "@navikt/ds-css": "^5.15.0",
-    "@navikt/ds-react": "^5.15.0",
-    "@navikt/ds-tailwind": "^5.15.0",
-    "@navikt/ds-tokens": "^5.15.0"
+    "@navikt/aksel-icons": "^5.15.1",
+    "@navikt/ds-css": "^5.15.1",
+    "@navikt/ds-react": "^5.15.1",
+    "@navikt/ds-tailwind": "^5.15.1",
+    "@navikt/ds-tokens": "^5.15.1"
   }
 }
diff --git a/aksel.nav.no/website/components/layout/god-praksis-page/articles/ArticleCard.tsx b/aksel.nav.no/website/components/layout/god-praksis-page/articles/ArticleCard.tsx
@@ -39,7 +39,9 @@ export const ArticleCard = ({
 
   return (
     <Link
-      href={`/${slug}`}
+      href={`/${
+        slug.replace("god-praksis/", "gp/") /* TODO: Remove replace */
+      }`}
       className={cl(
         "w-full flex-shrink overflow-hidden text-ellipsis rounded-large bg-surface-default p-5 shadow-small transition-shadow ease-out hover:shadow-large focus:outline-none focus-visible:shadow-focus",
         {

diff --git a/aksel.nav.no/website/components/sanity-modules/token-tabell/parts/ShowMore.tsx b/aksel.nav.no/website/components/sanity-modules/token-tabell/parts/ShowMore.tsx
@@ -1,7 +1,7 @@
 import { ChevronDownIcon, ChevronUpIcon } from "@navikt/aksel-icons";
 import { Button, useId, type HeadingProps } from "@navikt/ds-react";
 import cl from "clsx";
-import React, { forwardRef, useRef, useState } from "react";
+import React, { useRef, useState } from "react";
 
 export interface ShowMoreProps
   extends Omit<React.HTMLAttributes<HTMLElement>, "onClick"> {
@@ -62,7 +62,8 @@ export interface ShowMoreProps
  *   Toads have dry, leathery skin, short legs, and large bumps covering the parotoid glands.
  * </ShowMore>
  */
-export const ShowMore = forwardRef<HTMLElement, ShowMoreProps>(
+export const ShowMore =
+  /*forwardRef<HTMLElement, ShowMoreProps>(*/
   (
     {
       as: Component = "aside",
@@ -77,7 +78,7 @@ export const ShowMore = forwardRef<HTMLElement, ShowMoreProps>(
       className,
       "aria-labelledby": ariaLabelledby,
       ...rest
-    },
+    }: ShowMoreProps,
     /* ref, */
   ) => {
     const localRef = useRef<HTMLElement>(null);
@@ -136,8 +137,7 @@ export const ShowMore = forwardRef<HTMLElement, ShowMoreProps>(
         </div>
       </Component>
     );
-  },
-);
+  };
 
 export default ShowMore;