Merge branch 'main' into table-cell-unntak

navikt · Nov 10, 2023 · df28ea0 · df28ea0
2 parents 83407c0 + 1c022b1
commit df28ea0
Show file tree

Hide file tree

Showing 21 changed files with 70 additions and 28 deletions.
diff --git a/.changeset/fresh-kids-grow.md b/.changeset/fresh-kids-grow.md
diff --git a/@navikt/aksel-icons/CHANGELOG.md b/@navikt/aksel-icons/CHANGELOG.md
@@ -1,5 +1,7 @@
 # @navikt/aksel-icons
 
+## 5.10.0
+
 ## 5.9.2
 
 ## 5.9.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.9.2",
+  "version": "5.10.0",
   "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.10.0
+
 ## 5.9.2
 
 ## 5.9.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.9.2",
+  "version": "5.10.0",
   "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.9.2",
-    "@navikt/ds-tokens": "^5.9.2",
+    "@navikt/ds-css": "^5.10.0",
+    "@navikt/ds-tokens": "^5.10.0",
     "@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.10.0
+
+### Patch Changes
+
+- Updated dependencies [[`60d348130`](https://github.com/navikt/aksel/commit/60d34813009377a1a7d84bed6627c60524849957)]:
+  - @navikt/ds-css@5.10.0
+
 ## 5.9.2
 
 ### Patch Changes

diff --git a/@navikt/aksel/package.json b/@navikt/aksel/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@navikt/aksel",
-  "version": "5.9.2",
+  "version": "5.10.0",
   "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.9.2",
+    "@navikt/ds-css": "5.10.0",
     "axios": "1.3.6",
     "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,11 @@
 # @navikt/ds-css
 
+## 5.10.0
+
+### Minor Changes
+
+- Primitives: Ny komponent `Page` og `Page.Block` ([#2456](https://github.com/navikt/aksel/pull/2456))
+
 ## 5.9.2
 
 ## 5.9.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.9.2",
+  "version": "5.10.0",
   "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.9.2",
+    "@navikt/ds-tokens": "^5.10.0",
     "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,17 @@
 # @navikt/ds-react
 
+## 5.10.0
+
+### Minor Changes
+
+- Primitives: Ny komponent `Page` og `Page.Block` ([#2456](https://github.com/navikt/aksel/pull/2456))
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @navikt/ds-tokens@5.10.0
+  - @navikt/aksel-icons@5.10.0
+
 ## 5.9.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.9.2",
+  "version": "5.10.0",
   "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.9.2",
-    "@navikt/ds-tokens": "^5.9.2",
+    "@navikt/aksel-icons": "^5.10.0",
+    "@navikt/ds-tokens": "^5.10.0",
     "@radix-ui/react-tabs": "1.0.0",
     "@radix-ui/react-toggle-group": "1.0.0",
     "clsx": "^1.2.1",

diff --git a/@navikt/core/tailwind/CHANGELOG.md b/@navikt/core/tailwind/CHANGELOG.md
@@ -1,5 +1,7 @@
 # @navikt/ds-tailwind
 
+## 5.10.0
+
 ## 5.9.2
 
 ## 5.9.1

diff --git a/@navikt/core/tailwind/package.json b/@navikt/core/tailwind/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@navikt/ds-tailwind",
-  "version": "5.9.2",
+  "version": "5.10.0",
   "description": "Tailwind config based on @navikt/ds-tokens",
   "author": "Aksel | NAV designsystem team",
   "keywords": [
@@ -22,7 +22,7 @@
     "directory": "@navikt/core/tailwind"
   },
   "devDependencies": {
-    "@navikt/ds-tokens": "^5.9.2",
+    "@navikt/ds-tokens": "^5.10.0",
     "@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.10.0
+
 ## 5.9.2
 
 ## 5.9.1

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,15 @@
 # Changelog
 
+## 5.10.0
+
+### @navikt/ds-react
+
+- Primitives: Ny komponent `Page` og `Page.Block` ([#2456](https://github.com/navikt/aksel/pull/2456))
+
+### @navikt/ds-css
+
+- Primitives: Ny komponent `Page` og `Page.Block` ([#2456](https://github.com/navikt/aksel/pull/2456))
+
 ## 5.9.2
 
 ### @navikt/ds-react

diff --git a/aksel.nav.no/package.json b/aksel.nav.no/package.json
@@ -15,11 +15,11 @@
     "website"
   ],
   "dependencies": {
-    "@navikt/aksel-icons": "^5.9.2",
-    "@navikt/ds-css": "^5.9.2",
-    "@navikt/ds-react": "^5.9.2",
-    "@navikt/ds-tailwind": "^5.9.2",
-    "@navikt/ds-tokens": "^5.9.2"
+    "@navikt/aksel-icons": "^5.10.0",
+    "@navikt/ds-css": "^5.10.0",
+    "@navikt/ds-react": "^5.10.0",
+    "@navikt/ds-tailwind": "^5.10.0",
+    "@navikt/ds-tokens": "^5.10.0"
   },
   "devDependencies": {
     "prettier-plugin-tailwindcss": "^0.2.3"

diff --git a/aksel.nav.no/website/components/layout/header/Hamburger.tsx b/aksel.nav.no/website/components/layout/header/Hamburger.tsx
@@ -58,6 +58,7 @@ export const Hamburger = () => {
         onClose={() => setOpen(false)}
         header={{ heading: "Meny" }}
         width="small"
+        closeOnBackdropClick
       >
         <Modal.Body>
           <nav aria-label="hovedmeny">

diff --git a/aksel.nav.no/website/components/layout/header/search/Form.tsx b/aksel.nav.no/website/components/layout/header/search/Form.tsx
@@ -2,7 +2,7 @@ import { searchOptions } from "@/types";
 import { XMarkIcon } from "@navikt/aksel-icons";
 import { Button, Chips, Search } from "@navikt/ds-react";
 import KBD from "components/website-modules/KBD";
-import { useContext, useRef } from "react";
+import { useContext, useEffect, useRef } from "react";
 import { useShortcut } from "./hooks";
 import {
   SearchContext,
@@ -20,6 +20,10 @@ export const SearchForm = () => {
 
   useShortcut(open, setOpen, inputRef);
 
+  useEffect(() => {
+    setTimeout(() => open && inputRef.current.focus());
+  }, [open]);
+
   const handleSearchStart = (value: string) => {
     setQuery(value);
     value === "" ? reset() : update(value, tags);

diff --git a/aksel.nav.no/website/components/layout/header/search/Search.tsx b/aksel.nav.no/website/components/layout/header/search/Search.tsx
@@ -34,6 +34,7 @@ export const Search = () => {
         aria-label="Søk"
         className="h-[90%] max-h-[52rem] "
         width="medium"
+        closeOnBackdropClick
       >
         <Error />
         <SearchForm />

diff --git a/aksel.nav.no/website/components/sanity-modules/code-examples/CodeExamples.tsx b/aksel.nav.no/website/components/sanity-modules/code-examples/CodeExamples.tsx
@@ -46,7 +46,7 @@ const ComponentExamples = ({ node }: CodeExamplesProps) => {
       if (exampleWrapper && exampleWrapper.offsetHeight) {
         const newHeight = iframePadding + exampleWrapper.offsetHeight;
         clearInterval(waitForExampleContentToRender);
-        setFrameState(newHeight < 300 ? 300 : newHeight);
+        setFrameState(Math.min(Math.max(newHeight, 300), 900));
         setUnloaded(false);
       }
 
@@ -159,7 +159,6 @@ const ComponentExamples = ({ node }: CodeExamplesProps) => {
                       "min-w-80 block w-full max-w-full resize-x bg-white shadow-[20px_0_20px_-20px_rgba(0,0,0,0.22)]",
                       {
                         invisible: unloaded,
-                        "p-6": demoVariant === "templates",
                       }
                     )}
                     title="Kode-eksempler"