Version Packages (#2145)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

.storybook/indexer.ts

@@ -10,6 +10,11 @@ module.exports = (indexers) => {
   const exampleIndexer = async (fileName: string, opts) => {
     let code = readFileSync(fileName, "utf-8").toString();
 
+    code = code
+      .split("\n")
+      .filter((line) => !line.includes("withDsExample"))
+      .join("\n");
+
     code = code.replace("export const args =", "const args =");
 
     code += `\nexport default { title: "Eksempler/${fileName

.storybook/main.cjs

@@ -1,5 +1,4 @@
 const storyIndexers = require("./indexer");
-
 const path = require("path");
 const { mergeConfig } = require("vite");
 
@@ -59,15 +58,11 @@ module.exports = {
   },
   async viteFinal(config) {
     return mergeConfig(config, {
-      define: { "process.env": {} },
+      define: {
+        "process.env": {},
+      },
       resolve: {
         alias: [
-          /*
-          // Example
-          {
-            find: "@components",
-            replacement: path.resolve(__dirname, "./src/components"),
-          }, */
           {
             find: "components",
             replacement: path.resolve(

@navikt/aksel-icons/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @navikt/aksel-icons
 
+## 4.9.1
+
+## 4.9.0
+
+## 4.8.0
+
+## 4.7.4
+
+## 4.7.3
+
+## 4.7.2
+
+## 4.7.1
+
+## 4.7.0
+
 ## 4.6.1
 
 ## 4.6.0

@navikt/aksel-icons/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@navikt/aksel-icons",
-  "version": "4.6.1",
+  "version": "4.9.1",
   "author": "Aksel | NAV",
   "homepage": "https://aksel.nav.no/ikoner",
   "repository": {

@navikt/aksel-stylelint/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @navikt/aksel-stylelint
 
+## 4.9.1
+
+## 4.9.0
+
+## 4.8.0
+
+## 4.7.4
+
+## 4.7.3
+
+## 4.7.2
+
+## 4.7.1
+
+## 4.7.0
+
 ## 4.6.1
 
 ## 4.6.0

@navikt/aksel-stylelint/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@navikt/aksel-stylelint",
-  "version": "4.6.1",
+  "version": "4.9.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": "^4.6.1",
-    "@navikt/ds-tokens": "^4.6.1",
+    "@navikt/ds-css": "^4.9.1",
+    "@navikt/ds-tokens": "^4.9.1",
     "@types/jest": "^29.0.0",
     "concurrently": "7.2.1",
     "copyfiles": "2.4.1",

@navikt/aksel/CHANGELOG.md

@@ -1,5 +1,61 @@
 # @navikt/aksel
 
+## 4.9.1
+
+### Patch Changes
+
+- Updated dependencies [[`eff8a902c`](https://github.com/navikt/aksel/commit/eff8a902c50fd5ebc56616e866aa0a61b9eb5efc)]:
+  - @navikt/ds-css@4.9.1
+
+## 4.9.0
+
+### Patch Changes
+
+- Updated dependencies [[`e033b34c3`](https://github.com/navikt/aksel/commit/e033b34c3b85fb98dd11dd0300bb20075e1b06e8)]:
+  - @navikt/ds-css@4.9.0
+
+## 4.8.0
+
+### Patch Changes
+
+- Updated dependencies [[`8a82e1c1f`](https://github.com/navikt/aksel/commit/8a82e1c1f66ea38fca77b25d74b14926bd817dd9)]:
+  - @navikt/ds-css@4.8.0
+
+## 4.7.4
+
+### Patch Changes
+
+- Updated dependencies [[`492cfc180`](https://github.com/navikt/aksel/commit/492cfc1801df4ab16306185345d5089e24a0d659)]:
+  - @navikt/ds-css@4.7.4
+
+## 4.7.3
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @navikt/ds-css@4.7.3
+
+## 4.7.2
+
+### Patch Changes
+
+- Updated dependencies [[`e6fdfdc9b`](https://github.com/navikt/aksel/commit/e6fdfdc9b44156b6eb8ebc0eda3a9259dce800ff)]:
+  - @navikt/ds-css@4.7.2
+
+## 4.7.1
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @navikt/ds-css@4.7.1
+
+## 4.7.0
+
+### Patch Changes
+
+- Updated dependencies [[`e3027cc19`](https://github.com/navikt/aksel/commit/e3027cc1966623433cfc2d28915273486c7bf611)]:
+  - @navikt/ds-css@4.7.0
+
 ## 4.6.1
 
 ### Patch Changes

@navikt/aksel/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@navikt/aksel",
-  "version": "4.6.1",
+  "version": "4.9.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": "4.6.1",
+    "@navikt/ds-css": "4.9.1",
     "axios": "1.3.6",
     "chalk": "4.1.0",
     "clipboardy": "^2.3.0",

@navikt/core/css/CHANGELOG.md

@@ -1,5 +1,45 @@
 # @navikt/ds-css
 
+## 4.9.1
+
+### Patch Changes
+
+- Tweaks to combobox - updated example, small bugfixes, better affordance for selected options and added flag for "isAddedByUser" to onToggleSelected ([#2144](https://github.com/navikt/aksel/pull/2144))
+
+## 4.9.0
+
+### Minor Changes
+
+- Table: ExpandableRow kan nå åpnes med 'expandOnRowClick'-prop ([#2127](https://github.com/navikt/aksel/pull/2127))
+
+## 4.8.0
+
+### Minor Changes
+
+- Nye komponenter `VStack`, `HStack` og `Spacer` for å enklere kunne lage layout med flexbox og spacing-variabler. ([#2040](https://github.com/navikt/aksel/pull/2040))
+
+## 4.7.4
+
+### Patch Changes
+
+- Oppdatert bruk av REM i komponenter for forbedret utrykk ved font-scaling i browser ([#2126](https://github.com/navikt/aksel/pull/2126))
+
+## 4.7.3
+
+## 4.7.2
+
+### Patch Changes
+
+- Stepper: Fikset `hotizontal`-bug når step var `completed` ([#2116](https://github.com/navikt/aksel/pull/2116))
+
+## 4.7.1
+
+## 4.7.0
+
+### Minor Changes
+
+- Ny komponent Combobox! ([#1868](https://github.com/navikt/aksel/pull/1868))
+
 ## 4.6.1
 
 ### Patch Changes

@navikt/core/css/chips.css

@@ -25,11 +25,11 @@
   padding: 0 var(--a-spacing-3);
   text-decoration: none;
   border-radius: var(--a-border-radius-full);
-  min-height: 32px;
+  min-height: 2rem;
 }
 
 .navds-chips--small .navds-chips__chip {
-  min-height: 24px;
+  min-height: 1.5rem;
   padding: 0 var(--a-spacing-2);
 }
 

@navikt/core/css/config/_mappings.js

@@ -54,6 +54,11 @@ const StyleMappings = {
     { component: "Checkbox", main: formCss, dependencies: [typoCss] },
     { component: "CheckboxGroup", main: formCss, dependencies: [typoCss] },
     { component: "Chips", main: "chips.css", dependencies: [typoCss] },
+    {
+      component: "UNSAFE_Combobox",
+      main: "combobox.css",
+      dependencies: [typoCss, "chips.css"],
+    },
     {
       component: "ConfirmationPanel",
       main: formCss,
@@ -129,6 +134,18 @@ const StyleMappings = {
     { component: "Select", main: formCss, dependencies: [typoCss] },
     { component: "Skeleton", main: "skeleton.css", dependencies: [] },
     { component: "Stepper", main: "stepper.css", dependencies: [typoCss] },
+    {
+      component: "HStack",
+      main: "stack.css",
+    },
+    {
+      component: "VStack",
+      main: "stack.css",
+    },
+    {
+      component: "Spacer",
+      main: "stack.css",
+    },
     { component: "Switch", main: formCss, dependencies: [typoCss] },
     { component: "Table", main: "table.css", dependencies: [typoCss] },
     { component: "Tabs", main: "tabs.css", dependencies: [typoCss] },

@navikt/core/css/copybutton.css

@@ -52,7 +52,7 @@
 .navds-copybutton__icon {
   font-size: 1.5rem;
   display: flex;
-  margin-left: -4px;
+  margin-left: -0.25rem;
 }
 
 .navds-copybutton__icon:only-child {
@@ -60,7 +60,7 @@
 }
 
 :where(.navds-copybutton--small, .navds-copybutton--xsmall):where(:not(:only-child)) {
-  margin: -2px;
+  margin: -0.125rem;
 }
 
 .navds-copybutton:focus-visible {

@navikt/core/css/date.css

@@ -223,7 +223,7 @@
 
 .navds-date__field-button {
   position: absolute;
-  right: 1px;
+  right: 0.0625rem;
   top: 50%;
   transform: translateY(-50%);
   color: var(--ac-date-input-button-text, var(--a-text-default));
@@ -238,7 +238,7 @@
   align-items: center;
   justify-content: center;
   font-size: 1.5rem;
-  height: calc(100% - 2px);
+  height: calc(100% - 0.125rem);
   border-start-start-radius: 0;
   border-end-start-radius: 0;
 }
@@ -284,7 +284,6 @@
 }
 
 /* Readonly */
-
 .navds-date__field--readonly .navds-date__field-button {
   cursor: default;
 }

@navikt/core/css/expansioncard.css

@@ -66,7 +66,7 @@
  *************************/
 
 .navds-expansioncard__title--small {
-  margin-top: 10px;
+  margin-top: 0.625rem;
 }
 
 .navds-expansioncard__title--medium {

@navikt/core/css/form/combobox.css

@@ -0,0 +1,305 @@
+.navds-combobox__wrapper {
+  display: flex;
+  flex-direction: column;
+  width: 100%;
+  position: relative;
+}
+
+.navds-combobox__wrapper-inner {
+  position: relative;
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: space-between;
+  width: 100%;
+  padding: calc(var(--a-spacing-2) - 2px) var(--a-spacing-2);
+}
+
+.navds-combobox__wrapper-inner > :first-child {
+  flex: 2;
+}
+
+.navds-combobox__wrapper-inner > :last-child {
+  display: flex;
+  flex-flow: row nowrap;
+}
+
+.navds-form-field--small .navds-combobox__wrapper-inner {
+  padding: var(--a-spacing-1) calc(var(--a-spacing-3) / 2);
+}
+
+.navds-combobox__wrapper-inner:hover {
+  cursor: text;
+}
+
+.navds-combobox__selected-options {
+  gap: var(--a-spacing-2);
+  align-items: center;
+}
+
+.navds-combobox__selected-options > li {
+  margin: auto 0;
+  border-radius: var(--a-border-radius-full);
+}
+
+.navds-combobox__selected-options > li:last-of-type {
+  display: flex;
+  flex: 1;
+}
+
+.navds-combobox__selected-options--no-bg {
+  font-family: inherit;
+  font-size: var(--a-font-size-large);
+  font-weight: var(--a-font-weight-regular);
+  letter-spacing: 0;
+  line-height: var(--a-font-line-height-large);
+  margin: 0;
+  padding-left: 0.25rem;
+}
+
+.navds-combobox__input-wrapper {
+  width: 100%;
+}
+
+.navds-combobox__input {
+  z-index: 1;
+  flex: 1;
+  border: none;
+  padding: 0;
+  margin: 0;
+  min-width: 10ch;
+  width: 100%;
+  height: 2rem;
+}
+
+.navds-combobox__input:focus-visible {
+  outline: none;
+  border: none;
+  box-shadow: none;
+}
+
+.navds-combobox__wrapper-inner:has(.navds-combobox__input:focus-visible) {
+  box-shadow: 0 0 0 1px var(--a-surface-default) inset, var(--a-shadow-focus);
+  box-shadow: var(--a-shadow-focus);
+}
+
+.navds-combobox__wrapper-inner:has(.navds-combobox__input:focus-visible).navds-combobox__wrapper-inner--virtually-unfocused {
+  box-shadow: none;
+}
+
+@supports not selector(:focus-visible) {
+  .navds-combobox__input:focus {
+    outline: none;
+    border: none;
+    box-shadow: none;
+  }
+
+  .navds-combobox__wrapper-inner:has(.navds-combobox__input:focus) {
+    box-shadow: 0 0 0 1px var(--a-surface-default) inset, var(--a-shadow-focus);
+    box-shadow: var(--a-shadow-focus);
+  }
+
+  .navds-combobox__wrapper-inner:has(.navds-combobox__input:focus).navds-combobox__wrapper-inner--virtually-unfocused {
+    box-shadow: none;
+  }
+}
+
+@supports not selector(:has) {
+  .navds-combobox--focused .navds-combobox__wrapper-inner {
+    box-shadow: 0 0 0 1px var(--a-surface-default) inset, var(--a-shadow-focus);
+    box-shadow: var(--a-shadow-focus);
+  }
+
+  .navds-combobox--focused .navds-combobox__wrapper-inner.navds-combobox__wrapper-inner--virtually-unfocused {
+    box-shadow: none;
+  }
+}
+
+.navds-combobox__button-clear {
+  border-radius: var(--a-border-radius-medium);
+  color: var(--ac-combobox-clear-icon, var(--a-text-subtle));
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  cursor: pointer;
+  background: none;
+  border: none;
+  font-size: 1rem;
+  padding: 0;
+}
+
+.navds-combobox__button-clear svg {
+  width: 1.5rem;
+  height: 1.5rem;
+}
+
+.navds-combobox__input::-webkit-search-cancel-button {
+  display: none;
+}
+
+.navds-combobox__button-toggle-list {
+  border-radius: var(--a-border-radius-medium);
+  color: var(--a-text-default);
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  cursor: pointer;
+  background: none;
+  border: none;
+  font-size: 1rem;
+  padding: 0;
+}
+
+.navds-combobox__button-clear:active:hover,
+.navds-combobox__button-toggle-list:active:hover {
+  color: var(--ac-combobox-clear-icon-active, var(--a-text-action));
+}
+
+.navds-combobox__button-clear:hover,
+.navds-combobox__button-toggle-list:hover {
+  color: var(--ac-combobox-clear-icon-hover, var(--a-text-action-selected));
+}
+
+.navds-combobox__button-toggle-list:focus-visible {
+  box-shadow: 0 0 0 1px var(--a-surface-default) inset, var(--a-shadow-focus);
+  box-shadow: var(--a-shadow-focus);
+  outline: none;
+}
+
+@supports not selector(:focus-visible) {
+  .navds-combobox__button-toggle-list:focus {
+    box-shadow: 0 0 0 1px var(--a-surface-default) inset, var(--a-shadow-focus);
+    box-shadow: var(--a-shadow-focus);
+    outline: none;
+  }
+}
+
+.navds-combobox__button-toggle-list svg {
+  width: 1.5rem;
+  height: 1.5rem;
+  pointer-events: none;
+}
+
+.navds-form-field--small .navds-combobox__button-toggle-list svg,
+.navds-form-field--small .navds-combobox__button-clear svg {
+  width: 1.25rem;
+  height: 1.25rem;
+}
+
+/* dropdown list */
+
+.navds-combobox__list {
+  max-height: 290px;
+  overflow-y: auto;
+  position: absolute;
+  left: 0;
+  right: 0;
+  z-index: 9999;
+  top: calc(100% + var(--a-spacing-2));
+  list-style: none;
+  margin: 0;
+  border: 1px solid var(--ac-combobox-list-border-color, var(--a-border-divider));
+  display: flex;
+  flex-direction: column;
+  align-items: flex-start;
+  padding: 0;
+  box-shadow: var(--a-shadow-small);
+  border-radius: var(--a-border-radius-medium);
+  gap: var(--a-spacing-1) 0;
+  background-color: var(--ac-combobox-list-bg, var(--a-surface-default));
+  color: var(--ac-combobox-list-text, var(--a-text-default));
+}
+
+.navds-combobox__list--closed {
+  display: none;
+}
+
+.navds-combobox__list svg {
+  height: 1.5rem;
+  width: 1.5rem;
+}
+
+.navds-combobox__list-item,
+.navds-combobox__list-item__no-options,
+.navds-combobox__list-item__new-option {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  align-items: center;
+  padding: var(--a-spacing-3);
+  width: 100%;
+  background-color: var(--ac-combobox-list-item-bg, var(--a-surface-default));
+}
+
+.navds-form-field--small .navds-combobox__list-item,
+.navds-form-field--small .navds-combobox__list-item__no-options,
+.navds-form-field--small .navds-combobox__list-item__new-option {
+  padding: calc(var(--a-spacing-3) / 2) var(--a-spacing-2);
+}
+
+.navds-combobox__list-item--loading {
+  display: flex;
+  justify-content: center;
+  padding: var(--a-spacing-3);
+  background-color: var(--ac-combobox-list-item-loading-bg, var(--a-surface-default));
+  width: 100%;
+}
+
+.navds-combobox__list-item--focus,
+.navds-combobox__list-item:hover {
+  background-color: var(--ac-combobox-list-item-hover-bg, var(--a-surface-hover));
+  cursor: pointer;
+  border-left: 4px solid var(--ac-combobox-list-item-hover-border-left, var(--a-border-strong));
+  padding-left: calc(var(--a-spacing-3) - 4px);
+}
+
+.navds-combobox__list-item--selected {
+  background-color: var(--ac-combobox-list-item-selected-bg, var(--a-surface-selected));
+}
+
+.navds-combobox__list-item--selected p {
+  font-weight: var(--a-font-weight-bold);
+}
+
+.navds-combobox__list-item--selected.navds-combobox__list-item--focus,
+.navds-combobox__list-item--selected:hover {
+  background-color: var(--ac-combobox-list-item-selected-hover-bg, var(--a-surface-action-subtle-hover));
+  border-left: 4px solid var(--ac-combobox-list-item-selected-hover-border-left, var(--a-border-focus));
+  padding-left: calc(var(--a-spacing-3) - 4px);
+}
+
+.navds-combobox__list-item__new-option {
+  border-bottom: 1px solid var(--a-border-divider);
+  background: var(--a-surface-neutral-subtle);
+  cursor: pointer;
+  justify-content: flex-start;
+  gap: 0.25rem;
+}
+
+.navds-combobox__list-item__new-option:hover {
+  border-bottom: 1px solid var(--a-border-divider);
+  background: var(--a-surface-neutral-subtle-hover);
+}
+
+.navds-combobox__list-item__new-option--focus {
+  box-shadow: var(--a-shadow-focus) inset, var(--a-border-action) 0 0 0 5px inset;
+  border-radius: 3px;
+}
+
+/* Mobile */
+
+@media (max-width: 479px) {
+  .navds-combobox__button-toggle-list {
+    right: 0.5rem;
+  }
+
+  /* add bigger click area for input */
+  .navds-combobox__input {
+    min-width: min-content;
+    padding: 0.75rem 0;
+  }
+
+  .navds-combobox__selected-options {
+    gap: var(--a-spacing-1);
+  }
+}

@navikt/core/css/form/form.css

@@ -9,7 +9,7 @@
 }
 
 .navds-form-field__description {
-  margin-top: -6px;
+  margin-top: -0.375rem;
   color: var(--ac-form-description, var(--a-text-subtle));
 }
 

@navikt/core/css/form/index.css

@@ -11,3 +11,4 @@
 @import "text-field.css";
 @import "textarea.css";
 @import "search.css";
+@import "combobox.css";

@navikt/core/css/form/radio-checkbox.css

@@ -7,10 +7,10 @@
 .navds-checkbox__input,
 .navds-radio__input {
   position: absolute;
-  width: 48px;
-  height: 48px;
+  width: 3rem;
+  height: 3rem;
   top: 0;
-  left: -12px;
+  left: -0.75rem;
   z-index: 1;
   opacity: 0;
   cursor: pointer;
@@ -51,15 +51,15 @@
 
 .navds-checkbox--small > .navds-checkbox__input,
 .navds-radio--small > .navds-radio__input {
-  width: 32px;
-  height: 32px;
+  width: 2rem;
+  height: 2rem;
   top: 0;
-  left: -6px;
+  left: -0.375rem;
 }
 
 .navds-checkbox--small > .navds-checkbox__label,
 .navds-radio--small > .navds-radio__label {
-  padding: 6px 0;
+  padding: 0.375rem 0;
 }
 
 .navds-checkbox--small > .navds-checkbox__label::before,
@@ -115,15 +115,15 @@
 
 .navds-checkbox__input:checked + .navds-checkbox__label::before {
   background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAxMyAxMCI+ICAgIDxnPiAgICA8cGF0aCBmaWxsPSIjRkZGRkZGIiBkPSJNNCwxMGMtMC40LDAtMC44LTAuMS0xLjEtMC40TDAuNCw3LjFDMC4xLDYuOCwwLDYuNCwwLDZzMC4yLTAuOCwwLjUtMS4xQzEsNC40LDIsNC40LDIuNSw0LjlMNCw2LjRsNi40LTYgICAgQzEwLjgsMC4xLDExLjEsMCwxMS41LDBjMC40LDAsMC44LDAuMiwxLDAuNWMwLjYsMC42LDAuNSwxLjYtMC4xLDIuMXYwTDUsOS42QzQuNyw5LjksNC40LDEwLDQsMTB6IE0xMS44LDEuOUwxMS44LDEuOSAgICBDMTEuOCwxLjksMTEuOCwxLjksMTEuOCwxLjl6IE0xMS4yLDEuMUMxMS4yLDEuMSwxMS4yLDEuMSwxMS4yLDEuMUwxMS4yLDEuMXoiLz4gICAgPC9nPjwvc3ZnPg==);
-  background-position: 6px center;
+  background-position: 0.375rem center;
   background-repeat: no-repeat;
-  background-size: 13px;
+  background-size: 0.8125rem;
   box-shadow: none;
   background-color: var(--ac-radio-checkbox-action, var(--a-surface-action));
 }
 
 .navds-checkbox--small > .navds-checkbox__input:checked + .navds-checkbox__label::before {
-  background-position: 4px center;
+  background-position: 0.25rem center;
 }
 
 .navds-checkbox__input:indeterminate:focus-visible + .navds-checkbox__label::before,

@navikt/core/css/form/search.css

@@ -104,8 +104,8 @@
 
 .navds-search__button-search {
   flex-shrink: 0;
-  min-width: 64px;
-  min-height: 32px;
+  min-width: 4rem;
+  min-height: 2rem;
   border-radius: 0;
   border-top-right-radius: var(--a-border-radius-medium);
   border-bottom-right-radius: var(--a-border-radius-medium);
@@ -116,7 +116,7 @@
 }
 
 .navds-form-field--small .navds-search__button-search {
-  min-width: 40px;
+  min-width: 2.5rem;
 }
 
 .navds-search__button-search.navds-button--secondary {

@navikt/core/css/form/select.css

@@ -6,7 +6,7 @@
   color: var(--ac-select-text, var(--a-text-default));
   width: 100%;
   box-sizing: border-box;
-  min-height: 48px;
+  min-height: 3rem;
   display: inline-block;
   position: relative;
   padding: 0.5rem;
@@ -45,7 +45,7 @@
 }
 
 .navds-form-field--small .navds-select__input {
-  min-height: 32px;
+  min-height: 2rem;
   padding: 0 2rem 0 0.25rem;
 }
 

@navikt/core/css/form/switch.css

@@ -1,6 +1,6 @@
 .navds-switch {
   position: relative;
-  min-height: 48px;
+  min-height: 3rem;
   width: fit-content;
 }
 
@@ -10,7 +10,7 @@
 
 .navds-switch--small {
   position: relative;
-  min-height: 32px;
+  min-height: 2rem;
 }
 
 /* Input */
@@ -18,14 +18,14 @@
   cursor: pointer;
   position: absolute;
   z-index: 1;
-  width: 48px;
-  height: 48px;
+  width: 3rem;
+  height: 3rem;
   opacity: 0;
   top: 0;
 }
 
 .navds-switch--small > .navds-switch__input {
-  height: 32px;
+  height: 2rem;
   top: 0;
 }
 
@@ -47,11 +47,11 @@
 }
 
 .navds-switch--small > .navds-switch__label-wrapper > .navds-switch__content {
-  padding: calc(var(--a-spacing-2) - 2px) 0 calc(var(--a-spacing-2) - 2px) 3.25rem;
+  padding: calc(var(--a-spacing-2) - var(--a-spacing-05)) 0 calc(var(--a-spacing-2) - var(--a-spacing-05)) 3.25rem;
 }
 
 .navds-switch--right.navds-switch--small > .navds-switch__label-wrapper > .navds-switch__content {
-  padding: calc(var(--a-spacing-2) - 2px) 3.25rem calc(var(--a-spacing-2) - 2px) 0;
+  padding: calc(var(--a-spacing-2) - var(--a-spacing-05)) 3.25rem calc(var(--a-spacing-2) - var(--a-spacing-05)) 0;
 }
 
 .navds-switch--with-description,
@@ -70,8 +70,8 @@
 
 /* Track */
 .navds-switch__track {
-  width: 44px;
-  height: 24px;
+  width: 2.75rem;
+  height: 1.5rem;
   background-color: var(--ac-switch-bg, var(--a-surface-neutral));
   position: absolute;
   top: var(--a-spacing-3);
@@ -125,12 +125,12 @@
   background-color: var(--ac-switch-thumb-bg, var(--a-surface-default));
   color: var(--ac-switch-thumb-icon, var(--a-icon-subtle));
   border-radius: var(--a-border-radius-full);
-  width: 20px;
-  height: 20px;
+  width: 1.25rem;
+  height: 1.25rem;
   position: absolute;
   transform: translateX(0);
-  left: 2px;
-  top: 2px;
+  left: var(--a-spacing-05);
+  top: var(--a-spacing-05);
   transition: transform 250ms cubic-bezier(0.4, 0, 0.2, 1);
   display: flex;
   align-items: center;
@@ -138,17 +138,17 @@
 }
 
 .navds-switch__input:checked ~ .navds-switch__track > .navds-switch__thumb {
-  transform: translateX(20px);
+  transform: translateX(1.25rem);
   color: var(--ac-switch-thumb-icon-checked, var(--a-icon-success));
 }
 
 @media (hover: hover) and (pointer: fine) {
   .navds-switch__input:hover ~ .navds-switch__track > .navds-switch__thumb {
-    transform: translateX(2px);
+    transform: translateX(0.125rem);
   }
 
   .navds-switch__input:checked:hover ~ .navds-switch__track > .navds-switch__thumb {
-    transform: translateX(18px);
+    transform: translateX(1.125rem);
   }
 }
 
@@ -157,7 +157,7 @@
 }
 
 .navds-switch__input:checked:disabled:hover ~ .navds-switch__track > .navds-switch__thumb {
-  transform: translateX(20px);
+  transform: translateX(1.25rem);
 }
 
 /* Loader */
@@ -216,6 +216,6 @@
   }
 
   .navds-switch--readonly > .navds-switch__input:checked:hover ~ .navds-switch__track > .navds-switch__thumb {
-    transform: translateX(20px);
+    transform: translateX(1.25rem);
   }
 }

@navikt/core/css/form/text-field.css

@@ -13,7 +13,7 @@
   background-color: var(--ac-textfield-bg, var(--a-surface-default));
   border-radius: var(--a-border-radius-medium);
   border: 1px solid var(--ac-textfield-border, var(--a-border-default));
-  min-height: 48px;
+  min-height: 3rem;
   width: 100%;
   color: var(--ac-textfield-text, var(--a-text-default));
 }
@@ -27,8 +27,8 @@
 }
 
 .navds-form-field--small .navds-text-field__input {
-  padding: 0 0.5rem;
-  min-height: 32px;
+  padding: 0 var(--a-spacing-2);
+  min-height: 2rem;
 }
 
 .navds-text-field__input:hover {

@navikt/core/css/form/textarea.css

@@ -51,7 +51,7 @@
 }
 
 .navds-form-field--small .navds-textarea__input {
-  padding: 6px;
+  padding: 0.375rem;
 }
 
 .navds-form-field--small .navds-textarea--counter.navds-textarea__input {
@@ -64,8 +64,8 @@
   font-style: italic;
   position: absolute;
   text-align: left;
-  left: 1px;
-  bottom: 1px;
+  left: 0.0625rem;
+  bottom: 0.0625rem;
   padding: var(--a-spacing-1) var(--a-spacing-2);
 }
 

@navikt/core/css/index.css

@@ -29,6 +29,7 @@
 @import "link-panel.css";
 @import "read-more.css";
 @import "skeleton.css";
+@import "stack.css";
 @import "stepper.css";
 @import "table.css";
 @import "tabs.css";

@navikt/core/css/internalheader.css

@@ -2,7 +2,7 @@
   display: flex;
   align-self: stretch;
   background: var(--ac-internalheader-bg, var(--a-surface-inverted));
-  min-height: var(--a-spacing-12);
+  min-height: 3rem;
 
   --navds-internalheader-focus: inset 0 0 0 2px var(--a-border-focus-on-inverted);
 }

@navikt/core/css/list.css

@@ -34,7 +34,7 @@
 
 .navds-list .navds-list__item-marker--bullet {
   display: flex;
-  margin-top: 6px;
+  margin-top: 0.375rem;
   grid-column: 1 / 2;
   /* stylelint-disable-next-line csstools/value-no-unknown-custom-properties */
   color: var(--ac-list-marker-ul-color, var(--ac-list-marker-color, var(--a-icon-default)));

@navikt/core/css/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@navikt/ds-css",
-  "version": "4.6.1",
+  "version": "4.9.1",
   "description": "CSS for NAV Designsystem",
   "author": "Aksel | NAV designsystem team",
   "keywords": [
@@ -27,11 +27,11 @@
     "css:get-version": "node config/get-version.js"
   },
   "devDependencies": {
-    "@navikt/ds-tokens": "^4.6.1",
+    "@navikt/ds-tokens": "^4.9.1",
     "cssnano": "6.0.0",
     "fast-glob": "3.2.11",
     "lodash": "4.17.21",
-    "nodemon": "^2.0.12",
+    "nodemon": "^3.0.1",
     "normalize.css": "^8.0.1",
     "postcss": "^8.4.0",
     "postcss-cli": "^9.0.0",

@navikt/core/css/read-more.css

@@ -8,12 +8,12 @@
   gap: var(--a-spacing-05);
   color: var(--ac-read-more-text, var(--a-text-action));
   border-radius: var(--a-border-radius-small);
-  padding: var(--a-spacing-1) var(--a-spacing-1) var(--a-spacing-1) 2px;
+  padding: var(--a-spacing-1) var(--a-spacing-1) var(--a-spacing-1) var(--a-spacing-05);
   text-align: start;
 }
 
 .navds-read-more--small .navds-read-more__button {
-  padding: 2px var(--a-spacing-1) 2px 2px;
+  padding: var(--a-spacing-05) var(--a-spacing-1) var(--a-spacing-05) var(--a-spacing-05);
 }
 
 .navds-read-more__button:hover {
@@ -39,14 +39,14 @@
 .navds-read-more__content {
   margin-top: var(--a-spacing-1);
   border-left: 2px solid var(--ac-read-more-line, var(--a-border-divider));
-  margin-left: 13px;
-  padding-left: 13px;
+  margin-left: 0.8125rem;
+  padding-left: 0.8125rem;
   color: var(--a-text-default);
 }
 
 .navds-read-more--small .navds-read-more__content {
-  margin-left: 11px;
-  padding-left: 11px;
+  margin-left: 0.6875rem;
+  padding-left: 0.6875rem;
 }
 
 .navds-read-more__content--closed {

@navikt/core/css/stack.css

@@ -0,0 +1,61 @@
+/* stylelint-disable csstools/value-no-unknown-custom-properties */
+/* stylelint-disable aksel/design-token-exists */
+.navds-stack {
+  --ac-stack-align: initial;
+  --ac-stack-justify: initial;
+  --ac-stack-direction: initial;
+  --ac-stack-wrap: initial;
+  --ac-stack-gap-xs: initial;
+  --ac-stack-gap-sm: initial;
+  --ac-stack-gap-md: initial;
+  --ac-stack-gap-lg: initial;
+  --ac-stack-gap-xl: initial;
+  --__ac-stack-gap: var(--ac-stack-gap-xs);
+
+  gap: var(--__ac-stack-gap);
+  display: flex;
+  align-items: var(--ac-stack-align);
+  justify-content: var(--ac-stack-justify);
+  flex-flow: var(--ac-stack-direction) var(--ac-stack-wrap);
+}
+
+.navds-stack__spacer {
+  flex: 1;
+  justify-self: stretch;
+  align-self: stretch;
+}
+
+.navds-stack > .navds-stack__spacer {
+  margin-block-start: calc(var(--__ac-stack-gap) * -1);
+}
+
+.navds-hstack > .navds-stack__spacer {
+  margin-inline-start: calc(var(--__ac-stack-gap) * -1);
+}
+
+@media (min-width: 480px) {
+  .navds-stack {
+    --__ac-stack-gap: var(--ac-stack-gap-sm, var(--ac-stack-gap-xs));
+  }
+}
+
+@media (min-width: 768px) {
+  .navds-stack {
+    --__ac-stack-gap: var(--ac-stack-gap-md, var(--ac-stack-gap-sm, var(--ac-stack-gap-xs)));
+  }
+}
+
+@media (min-width: 1024px) {
+  .navds-stack {
+    --__ac-stack-gap: var(--ac-stack-gap-lg, var(--ac-stack-gap-md, var(--ac-stack-gap-sm, var(--ac-stack-gap-xs))));
+  }
+}
+
+@media (min-width: 1280px) {
+  .navds-stack {
+    --__ac-stack-gap: var(
+      --ac-stack-gap-xl,
+      var(--ac-stack-gap-lg, var(--ac-stack-gap-md, var(--ac-stack-gap-sm, var(--ac-stack-gap-xs))))
+    );
+  }
+}

@navikt/core/css/stepper.css

@@ -40,6 +40,10 @@
   background-color: var(--ac-stepper-line-completed, var(--a-border-selected));
 }
 
+.navds-stepper__item--behind.navds-stepper__item--completed + .navds-stepper__item > .navds-stepper__line--1 {
+  background-color: var(--ac-stepper-line-completed, var(--a-border-selected));
+}
+
 .navds-stepper__line--1 {
   grid-row: line-1;
   display: none;
@@ -109,7 +113,7 @@ button.navds-stepper__step {
 .navds-stepper__circle--success {
   border: none;
   background: none;
-  font-size: 28px;
+  font-size: 1.75rem;
   color: var(--a-text-on-action);
   background-color: var(--ac-stepper-text, var(--a-surface-action));
 }
@@ -213,6 +217,12 @@ button.navds-stepper__step {
   background-color: var(--ac-stepper-non-interactive-line-completed, var(--a-border-strong));
 }
 
+.navds-stepper__item--non-interactive.navds-stepper__item--behind.navds-stepper__item--completed
+  + .navds-stepper__item
+  > .navds-stepper__line--1 {
+  background-color: var(--ac-stepper-non-interactive-line-completed, var(--a-border-strong));
+}
+
 :where(.navds-stepper__step--non-interactive.navds-stepper__step--active) .navds-stepper__circle {
   background-color: var(--ac-stepper-non-interactive-active-bg, var(--a-surface-inverted));
   border-color: var(--ac-stepper-non-interactive-active-border, var(--a-surface-inverted));

@navikt/core/css/table.css

@@ -16,7 +16,7 @@
   display: table-row;
 }
 
-.navds-table__body .navds-table__row--shade-on-hover:hover {
+.navds-table__body .navds-table__row--shade-on-hover:not(.navds-table__expandable-row--expansion-disabled):hover {
   background-color: var(--ac-table-row-hover, var(--a-bg-subtle));
 }
 
@@ -80,11 +80,11 @@
 }
 
 .navds-table .navds-checkbox .navds-checkbox__input {
-  top: -12px;
+  top: -0.75rem;
 }
 
 .navds-table .navds-checkbox--small .navds-checkbox__input {
-  top: -6px;
+  top: -0.375rem;
 }
 
 .navds-table .navds-checkbox .navds-checkbox__label {
@@ -154,6 +154,10 @@
   transition: border-bottom-color 190ms cubic-bezier(0.6, 0.04, 0.98, 0.335);
 }
 
+.navds-table__expandable-row:not(.navds-table__expandable-row--expansion-disabled):hover {
+  cursor: pointer;
+}
+
 .navds-table__expandable-row--open .navds-table__data-cell {
   border-bottom-color: transparent;
 }
@@ -168,12 +172,12 @@
 
 .navds-table__toggle-expand-cell {
   padding: 0;
-  width: 56px;
+  width: 3.5rem;
 }
 
 .navds-table--small .navds-table__toggle-expand-cell {
   padding: 0;
-  width: 36px;
+  width: 2.25rem;
 }
 
 .navds-table__toggle-expand-button {

@navikt/core/css/tabs.css

@@ -20,7 +20,7 @@
 
 .navds-tabs__scroll-button {
   padding: var(--a-spacing-3) var(--a-spacing-4);
-  width: 44px;
+  width: 2.75rem;
   display: flex;
   justify-content: center;
   align-items: center;
@@ -38,11 +38,11 @@
 
 .navds-tabs--small .navds-tabs__scroll-button {
   padding: 0.375rem var(--a-spacing-4);
-  width: 32px;
+  width: 2rem;
 }
 
 .navds-tabs__tab {
-  min-height: 48px;
+  min-height: 3rem;
   padding: var(--a-spacing-3) var(--a-spacing-4);
   display: inline-flex;
   justify-content: center;
@@ -92,7 +92,7 @@
 }
 
 .navds-tabs__tab--small {
-  min-height: 32px;
+  min-height: 2rem;
   padding: 0.375rem var(--a-spacing-4);
 }
 

@navikt/core/css/tag.css

@@ -5,17 +5,17 @@
   align-items: center;
   justify-content: center;
   padding: var(--a-spacing-05) var(--a-spacing-2);
-  min-height: 32px;
+  min-height: 2rem;
   line-height: 1;
 }
 
 .navds-tag--small {
-  min-height: 24px;
+  min-height: 1.5rem;
   padding: 0 0.375rem;
 }
 
 .navds-tag--xsmall {
-  min-height: 20px;
+  min-height: 1.25rem;
   padding: 0 var(--a-spacing-1);
 }
 

@navikt/core/css/timeline.css

@@ -12,6 +12,7 @@
   height: 1rem;
   box-sizing: content-box;
   grid-column: 2;
+  margin-bottom: var(--a-spacing-1);
 }
 
 .navds-timeline__row-label {
@@ -181,7 +182,7 @@
     0 0 0 4px var(--ac-timeline-pin-bg, var(--a-surface-danger)), 0 0 0 5px var(--a-surface-default);
   z-index: 2;
   border-radius: var(--a-border-radius-full);
-  padding: 3.5px;
+  padding: var(--a-spacing-1);
   position: relative;
 }
 
@@ -232,7 +233,7 @@
 .navds-timeline__pin-wrapper::before {
   content: "";
   top: var(--navdsc-timeline-pin-size);
-  height: calc(94% - var(--navdsc-timeline-pin-size));
+  height: calc(88% - var(--navdsc-timeline-pin-size));
   width: 1px;
   margin: 0 auto;
   background: var(--a-surface-inverted);

@navikt/core/css/toggle-group.css

@@ -8,7 +8,7 @@
   border-radius: var(--a-border-radius-medium);
   background-color: var(--ac-toggle-group-bg, var(--a-surface-transparent));
   box-shadow: inset 0 0 0 1px var(--ac-toggle-group-border, var(--a-border-default));
-  padding: calc(var(--a-spacing-1) + 1px);
+  padding: calc(var(--a-spacing-1) + 0.0625rem);
   gap: var(--a-spacing-1);
   display: inline-grid;
   grid-auto-flow: column;
@@ -16,7 +16,7 @@
 }
 
 .navds-toggle-group--small {
-  padding: calc(var(--a-spacing-05) + 1px);
+  padding: calc(var(--a-spacing-05) + 0.0625rem);
 }
 
 .navds-toggle-group--neutral {
@@ -29,7 +29,7 @@
   align-items: center;
   justify-content: center;
   padding: var(--a-spacing-1) var(--a-spacing-3);
-  min-height: 38px;
+  min-height: 2.375rem;
   border: none;
   cursor: pointer;
   background-color: var(--ac-toggle-group-button-bg, var(--a-surface-transparent));
@@ -124,7 +124,7 @@
 
 .navds-toggle-group--small > .navds-toggle-group__button {
   padding: var(--a-spacing-05) var(--a-spacing-3);
-  min-height: 26px;
+  min-height: 1.625rem;
   min-width: fit-content;
 }
 

@navikt/core/css/tokens.json

@@ -372,6 +372,21 @@
     "--ac-search-button-focus-active-border": "--a-surface-default",
     "--ac-search-error-border": "--a-border-danger"
   },
+  "combobox": {
+    "--ac-combobox-clear-icon": "--a-text-subtle",
+    "--ac-combobox-clear-icon-hover": "--a-text-action-selected",
+    "--ac-combobox-clear-icon-active": "--a-text-action",
+    "--ac-combobox-list-bg": "--a-surface-default",
+    "--ac-combobox-list-text": "--a-text-default",
+    "--ac-combobox-list-border-color": "--a-border-divider",
+    "--ac-combobox-list-item-bg": "--a-surface-default",
+    "--ac-combobox-list-item-hover-bg": "--a-surface-hover",
+    "--ac-combobox-list-item-selected-bg": "--a-surface-default",
+    "--ac-combobox-list-item-selected-hover-bg": "--a-surface-action-subtle-hover",
+    "--ac-combobox-list-item-loading-bg": "--a-surface-default",
+    "--ac-combobox-list-item-hover-border-left": "--a-border-strong",
+    "--ac-combobox-list-item-selected-hover-border-left": "--a-border-focus"
+  },
   "select": {
     "--ac-select-bg": "--a-surface-default",
     "--ac-select-text": "--a-text-default",

@navikt/core/css/tooltip.css

@@ -25,8 +25,8 @@
 }
 
 .navds-tooltip__arrow {
-  height: 7px;
-  width: 7px;
+  height: 0.4375rem;
+  width: 0.4375rem;
   transform: rotate(45deg);
   z-index: -1;
   background-color: var(--ac-tooltip-bg, var(--a-surface-inverted));
@@ -45,8 +45,8 @@
   color: var(--ac-tooltip-key-text, var(--a-text-on-inverted));
   border-radius: var(--a-border-radius-small);
   padding: 0 var(--a-spacing-1);
-  min-width: 18px;
-  height: 18px;
+  min-width: 1.125rem;
+  height: 1.125rem;
   display: inline-flex;
   align-items: center;
   justify-content: center;

@navikt/core/react/CHANGELOG.md

@@ -1,5 +1,89 @@
 # @navikt/ds-react
 
+## 4.9.1
+
+### Patch Changes
+
+- Button: Fikset aria-live bug der knapp alltid ble lest opp av skjermleser ved render ([#2143](https://github.com/navikt/aksel/pull/2143))
+
+- Tweaks to combobox - updated example, small bugfixes, better affordance for selected options and added flag for "isAddedByUser" to onToggleSelected ([#2144](https://github.com/navikt/aksel/pull/2144))
+
+- Updated dependencies []:
+  - @navikt/aksel-icons@4.9.1
+
+## 4.9.0
+
+### Minor Changes
+
+- Table: ExpandableRow kan nå åpnes med 'expandOnRowClick'-prop ([#2127](https://github.com/navikt/aksel/pull/2127))
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @navikt/aksel-icons@4.9.0
+
+## 4.8.0
+
+### Minor Changes
+
+- Nye komponenter `VStack`, `HStack` og `Spacer` for å enklere kunne lage layout med flexbox og spacing-variabler. ([#2040](https://github.com/navikt/aksel/pull/2040))
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @navikt/aksel-icons@4.8.0
+
+## 4.7.4
+
+### Patch Changes
+
+- Textfield: La til type 'time' som tilgjengelig option ([#2137](https://github.com/navikt/aksel/pull/2137))
+
+- Updated dependencies []:
+  - @navikt/aksel-icons@4.7.4
+
+## 4.7.3
+
+### Patch Changes
+
+- Chips: Removable Chips submitter ikke forms ved klikk lengre ([#2124](https://github.com/navikt/aksel/pull/2124))
+
+- Updated dependencies []:
+  - @navikt/aksel-icons@4.7.3
+
+## 4.7.2
+
+### Patch Changes
+
+- Stepper: Fikset `hotizontal`-bug når step var `completed` ([#2116](https://github.com/navikt/aksel/pull/2116))
+
+- Updated dependencies []:
+  - @navikt/aksel-icons@4.7.2
+
+## 4.7.1
+
+### Patch Changes
+
+- Datepicker: Fikset bug ved bruk dynamisk oppdatering av minDate. Vist `month` vil nå alltid være oppdatert når datepicker åpnes ([#2117](https://github.com/navikt/aksel/pull/2117))
+
+- Updated dependencies []:
+  - @navikt/aksel-icons@4.7.1
+
+## 4.7.0
+
+### Minor Changes
+
+- Ny komponent Combobox! ([#1868](https://github.com/navikt/aksel/pull/1868))
+
+### Patch Changes
+
+- Timeline: Har nå egen `axisLabelTemplates`-prop for axixlabel formatering ([#2109](https://github.com/navikt/aksel/pull/2109))
+
+- Combobox post-release tweaks ([#2112](https://github.com/navikt/aksel/pull/2112))
+
+- Updated dependencies []:
+  - @navikt/aksel-icons@4.7.0
+
 ## 4.6.1
 
 ### Patch Changes

@navikt/core/react/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@navikt/ds-react",
-  "version": "4.6.1",
+  "version": "4.9.1",
   "description": "Aksel react-components for NAV designsystem",
   "author": "Aksel | NAV designsystem team",
   "license": "MIT",
@@ -38,7 +38,7 @@
   },
   "dependencies": {
     "@floating-ui/react": "0.24.1",
-    "@navikt/aksel-icons": "^4.6.1",
+    "@navikt/aksel-icons": "^4.9.1",
     "@radix-ui/react-tabs": "1.0.0",
     "@radix-ui/react-toggle-group": "1.0.0",
     "clsx": "^1.2.1",

@navikt/core/react/src/button/Button.tsx

@@ -126,11 +126,7 @@ export const Button: OverridableComponent<ButtonProps, HTMLButtonElement> =
                 <span className="navds-button__icon">{icon}</span>
               )}
               {children && (
-                <Label
-                  as="span"
-                  size={size === "medium" ? "medium" : "small"}
-                  aria-live="polite"
-                >
+                <Label as="span" size={size === "medium" ? "medium" : "small"}>
                   {children}
                 </Label>
               )}

@navikt/core/react/src/button/button.stories.tsx

@@ -148,8 +148,9 @@ export const Loading = {
     </div>
   ),
 
-  args: { chromatic: { disableSnapshot: true } },
-  chromatic: { disableSnapshot: true },
+  parameters: {
+    chromatic: { disableSnapshot: true },
+  },
 };
 
 export const Icon = () => (
@@ -275,6 +276,7 @@ export const LoadingWithAs = {
     </div>
   ),
 
-  args: { chromatic: { disableSnapshot: true } },
-  chromatic: { disableSnapshot: true },
+  parameters: {
+    chromatic: { disableSnapshot: true },
+  },
 };

@navikt/core/react/src/chips/Chips.tsx

@@ -70,7 +70,7 @@ export const Chips: ChipsComponent = forwardRef<HTMLUListElement, ChipsProps>(
         })}
       >
         {React.Children.map(children, (chip, index) => {
-          return <li key={index + (chip?.toString() ?? "")}>{chip}</li>;
+          return <li key={chip?.toString() || index}>{chip}</li>;
         })}
       </ul>
     );

@navikt/core/react/src/chips/Removable.tsx

@@ -1,7 +1,6 @@
 import { XMarkIcon } from "@navikt/aksel-icons";
 import cl from "clsx";
 import React, { forwardRef } from "react";
-import { OverridableComponent } from "../util/OverridableComponent";
 
 export interface RemovableChipsProps
   extends React.ButtonHTMLAttributes<HTMLButtonElement> {
@@ -22,26 +21,27 @@ export interface RemovableChipsProps
   onDelete?: () => void;
 }
 
-export const RemovableChips: OverridableComponent<
-  RemovableChipsProps,
-  HTMLButtonElement
-> = forwardRef(
+export const RemovableChips = forwardRef<
+  HTMLButtonElement,
+  RemovableChipsProps
+>(
   (
     {
       className,
       children,
       variant = "action",
-      as: Component = "button",
       removeLabel = "slett",
       onDelete,
+      type = "button",
       ...rest
     },
     ref
   ) => {
     return (
-      <Component
+      <button
         {...rest}
         ref={ref}
+        type={type}
         className={cl(
           "navds-chips__chip navds-chips__removable navds-chips--icon-right",
           className,
@@ -57,7 +57,7 @@ export const RemovableChips: OverridableComponent<
         <span className="navds-chips__removable-icon">
           <XMarkIcon aria-hidden />
         </span>
-      </Component>
+      </button>
     );
   }
 );

@navikt/core/react/src/date/hooks/useDatepicker.tsx

@@ -166,8 +166,7 @@ export const useDatepicker = (
   const handleOpen = useCallback(
     (open: boolean) => {
       setOpen(open);
-      !open &&
-        setMonth(selectedDay ?? defaultSelected ?? defaultMonth ?? today);
+      open && setMonth(selectedDay ?? defaultSelected ?? defaultMonth ?? today);
     },
     [defaultMonth, defaultSelected, selectedDay, today]
   );

@navikt/core/react/src/date/hooks/useMonthPicker.tsx

@@ -163,8 +163,7 @@ export const useMonthpicker = (
   const handleOpen = useCallback(
     (open: boolean) => {
       setOpen(open);
-      !open &&
-        setYear(selectedMonth ?? defaultSelected ?? defaultYear ?? today);
+      open && setYear(selectedMonth ?? defaultSelected ?? defaultYear ?? today);
     },
     [defaultSelected, defaultYear, selectedMonth, today]
   );

@navikt/core/react/src/dropdown/Menu/GroupedList/index.tsx

@@ -1,8 +1,8 @@
 import cl from "clsx";
 import React, { forwardRef } from "react";
 import { OverridableComponent } from "../../../util/OverridableComponent";
-import GroupedHeading, { GroupedHeadingProps } from "./Heading";
-import GroupedItem, { GroupedItemProps } from "./Item";
+import GroupedHeading, { GroupedHeadingProps } from "./GroupedHeading";
+import GroupedItem, { GroupedItemProps } from "./GroupedItem";
 
 export interface GroupedListProps
   extends React.HTMLAttributes<HTMLDListElement> {

@navikt/core/react/src/form/TextField.tsx

@@ -31,7 +31,7 @@ export interface TextFieldProps
    * Type of form control. Picking the correct type helps user fill inn their required information
    * @default "text"
    */
-  type?: "email" | "number" | "password" | "tel" | "text" | "url";
+  type?: "email" | "number" | "password" | "tel" | "text" | "url" | "time";
 }
 
 /**

@navikt/core/react/src/form/combobox/ClearButton.tsx

@@ -0,0 +1,29 @@
+import React from "react";
+import { XMarkIcon } from "@navikt/aksel-icons";
+
+interface ClearButtonProps extends React.HTMLAttributes<HTMLButtonElement> {
+  handleClear: (event: any) => void;
+  clearButtonLabel?: string;
+}
+
+export const ClearButton: React.FC<ClearButtonProps> = ({
+  handleClear,
+  clearButtonLabel,
+  ...rest
+}) => {
+  return (
+    <button
+      type="button"
+      onClick={handleClear}
+      className="navds-combobox__button-clear"
+      {...rest}
+    >
+      <span className="navds-sr-only">
+        {clearButtonLabel ? clearButtonLabel : "Tøm"}
+      </span>
+      <XMarkIcon aria-hidden />
+    </button>
+  );
+};
+
+export default ClearButton;

@navikt/core/react/src/form/combobox/Combobox.tsx

@@ -0,0 +1,136 @@
+import cl from "clsx";
+import React, { forwardRef, useMemo, useRef } from "react";
+import { BodyShort, Label, mergeRefs } from "../..";
+import ClearButton from "./ClearButton";
+import FilteredOptions from "./FilteredOptions/FilteredOptions";
+import { useFilteredOptionsContext } from "./FilteredOptions/filteredOptionsContext";
+import SelectedOptions from "./SelectedOptions/SelectedOptions";
+import ToggleListButton from "./ToggleListButton";
+import { ComboboxProps } from "./types";
+import { useSelectedOptionsContext } from "./SelectedOptions/selectedOptionsContext";
+import ComboboxWrapper from "./ComboboxWrapper";
+import { useInputContext } from "./Input/inputContext";
+import Input from "./Input/Input";
+
+export const Combobox = forwardRef<
+  HTMLInputElement,
+  Omit<ComboboxProps, "onChange" | "options" | "size">
+>((props, ref) => {
+  const {
+    value: externalValue,
+    onClear,
+    className,
+    hideLabel = false,
+    description,
+    label,
+    clearButton = true,
+    clearButtonLabel,
+    toggleListButton = true,
+    toggleListButtonLabel,
+    inputClassName,
+    shouldShowSelectedOptions = true,
+    ...rest
+  } = props;
+
+  const toggleListButtonRef = useRef<HTMLButtonElement>(null);
+
+  const { currentOption, toggleIsListOpen } = useFilteredOptionsContext();
+  const { selectedOptions } = useSelectedOptionsContext();
+
+  const {
+    clearInput,
+    focusInput,
+    hasError,
+    inputDescriptionId,
+    inputProps,
+    inputRef,
+    value,
+    size = "medium",
+  } = useInputContext();
+
+  const mergedInputRef = useMemo(
+    () => mergeRefs([inputRef, ref]),
+    [inputRef, ref]
+  );
+
+  return (
+    <ComboboxWrapper
+      className={className}
+      hasError={hasError}
+      inputProps={inputProps}
+      inputSize={size}
+      toggleIsListOpen={toggleIsListOpen}
+      toggleListButtonRef={toggleListButtonRef}
+    >
+      <Label
+        htmlFor={inputProps.id}
+        size={size}
+        className={cl("navds-form-field__label", {
+          "navds-sr-only": hideLabel,
+        })}
+      >
+        {label}
+      </Label>
+      {!!description && (
+        <BodyShort
+          as="div"
+          className={cl("navds-form-field__description", {
+            "navds-sr-only": hideLabel,
+          })}
+          id={inputDescriptionId}
+          size={size}
+        >
+          {description}
+        </BodyShort>
+      )}
+      <div className="navds-combobox__wrapper">
+        <div
+          className={cl(
+            "navds-combobox__wrapper-inner navds-text-field__input",
+            {
+              "navds-combobox__wrapper-inner--virtually-unfocused":
+                currentOption !== null,
+            }
+          )}
+          onClick={focusInput}
+        >
+          {!shouldShowSelectedOptions ? (
+            <Input
+              id={inputProps.id}
+              ref={mergedInputRef}
+              inputClassName={inputClassName}
+              {...rest}
+            />
+          ) : (
+            <SelectedOptions selectedOptions={selectedOptions} size={size}>
+              <Input
+                id={inputProps.id}
+                ref={mergedInputRef}
+                inputClassName={inputClassName}
+                {...rest}
+              />
+            </SelectedOptions>
+          )}
+          <div>
+            {value && clearButton && (
+              <ClearButton
+                handleClear={clearInput}
+                clearButtonLabel={clearButtonLabel}
+                tabIndex={-1}
+              />
+            )}
+            {toggleListButton && (
+              <ToggleListButton
+                toggleListButtonLabel={toggleListButtonLabel}
+                ref={toggleListButtonRef}
+              />
+            )}
+          </div>
+        </div>
+        <FilteredOptions />
+      </div>
+    </ComboboxWrapper>
+  );
+});
+
+export default Combobox;

@navikt/core/react/src/form/combobox/ComboboxProvider.tsx

@@ -0,0 +1,99 @@
+import React, { forwardRef } from "react";
+import Combobox from "./Combobox";
+import { FilteredOptionsProvider } from "./FilteredOptions/filteredOptionsContext";
+import { CustomOptionsProvider } from "./customOptionsContext";
+import { SelectedOptionsProvider } from "./SelectedOptions/selectedOptionsContext";
+import { InputContextProvider } from "./Input/inputContext";
+import { ComboboxProps } from "./types";
+
+/**
+ * A component that allows the user to search in a list of options
+ *
+ * Has options for allowing only one or multiple options to be selected,
+ * or adding new, user-submitted values.
+ *
+ * @see [📝 Documentation](https://aksel.nav.no/komponenter/core/combobox)
+ *
+ * @example
+ * ```jsx
+ * const options = ["apple", "banana", "orange"];
+ *
+ * return (
+ *    <Combobox
+ *      label="Velg en verdi"
+ *      options={options}
+ *      id="my-combobox"
+ *      shouldAutoComplete
+ *    />
+ * )
+ * ```
+ */
+const ComboboxProvider = forwardRef<HTMLInputElement, ComboboxProps>(
+  (props, ref) => {
+    const {
+      allowNewValues = false,
+      children,
+      defaultValue,
+      error,
+      errorId,
+      filteredOptions,
+      id,
+      isListOpen,
+      isLoading = false,
+      isMultiSelect,
+      onToggleSelected,
+      selectedOptions,
+      options,
+      value,
+      onChange,
+      onClear,
+      shouldAutocomplete,
+      size,
+      ...rest
+    } = props;
+    return (
+      <InputContextProvider
+        value={{
+          defaultValue,
+          error,
+          errorId,
+          id,
+          value,
+          onChange,
+          onClear,
+          shouldAutocomplete,
+          size,
+        }}
+      >
+        <CustomOptionsProvider>
+          <SelectedOptionsProvider
+            value={{
+              allowNewValues,
+              isMultiSelect,
+              selectedOptions,
+              onToggleSelected,
+              options,
+            }}
+          >
+            <FilteredOptionsProvider
+              value={{
+                allowNewValues,
+                filteredOptions,
+                isListOpen,
+                isLoading,
+                isMultiSelect,
+                options,
+              }}
+            >
+              <Combobox ref={ref} {...rest}>
+                {children}
+              </Combobox>
+            </FilteredOptionsProvider>
+          </SelectedOptionsProvider>
+        </CustomOptionsProvider>
+      </InputContextProvider>
+    );
+  }
+);
+
+export default ComboboxProvider;

@navikt/core/react/src/form/combobox/ComboboxWrapper.tsx

@@ -0,0 +1,68 @@
+import cl from "clsx";
+import React, { useRef, useState } from "react";
+
+type ComboboxWrapperProps = {
+  children: any;
+  className?: string;
+  hasError: boolean;
+  inputProps: {
+    disabled?: boolean;
+  };
+  inputSize: string;
+  toggleIsListOpen: (isListOpen: boolean) => void;
+  toggleListButtonRef: React.RefObject<HTMLButtonElement>;
+};
+
+const ComboboxWrapper = ({
+  children,
+  className,
+  hasError,
+  inputProps,
+  inputSize,
+  toggleIsListOpen,
+  toggleListButtonRef,
+}: ComboboxWrapperProps) => {
+  const wrapperRef = useRef<HTMLDivElement | null>(null);
+  const [hasFocusWithin, setHasFocusWithin] = useState(false);
+
+  function onFocusInsideWrapper(e) {
+    if (
+      !wrapperRef.current?.contains(e.relatedTarget) &&
+      toggleListButtonRef?.current !== e.target
+    ) {
+      toggleIsListOpen(true);
+      setHasFocusWithin(true);
+    }
+  }
+
+  function onBlurWrapper(e) {
+    if (!wrapperRef.current?.contains(e.relatedTarget)) {
+      toggleIsListOpen(false);
+      setHasFocusWithin(false);
+    }
+  }
+
+  return (
+    <div
+      ref={wrapperRef}
+      className={cl(
+        className,
+        "navds-form-field",
+        `navds-form-field--${inputSize}`,
+        "navds-search",
+        {
+          "navds-search--error": hasError,
+          "navds-search--disabled": !!inputProps.disabled,
+          "navds-combobox--focused": hasFocusWithin,
+        }
+      )}
+      onFocus={onFocusInsideWrapper}
+      onBlur={onBlurWrapper}
+      tabIndex={-1}
+    >
+      {children}
+    </div>
+  );
+};
+
+export default ComboboxWrapper;

@navikt/core/react/src/form/combobox/FilteredOptions/CheckIcon.tsx

@@ -0,0 +1,23 @@
+import React from "react";
+
+const CheckIcon = () => {
+  return (
+    <svg
+      width="16"
+      height="13"
+      viewBox="0 0 16 13"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+      aria-hidden="true"
+    >
+      <path
+        fillRule="evenodd"
+        clipRule="evenodd"
+        fill="#005B82"
+        d="M14.2014 0L16 1.89047L4.77943 13L0 8.39552L1.79361 6.5L4.77418 9.3019L14.2014 0Z"
+      />
+    </svg>
+  );
+};
+
+export default CheckIcon;

@navikt/core/react/src/form/combobox/FilteredOptions/FilteredOptions.tsx

@@ -0,0 +1,111 @@
+import React from "react";
+import cl from "clsx";
+import { BodyShort, Label, Loader } from "../../..";
+import { CheckmarkIcon, PlusIcon } from "@navikt/aksel-icons";
+import { useFilteredOptionsContext } from "./filteredOptionsContext";
+import { useSelectedOptionsContext } from "../SelectedOptions/selectedOptionsContext";
+import { useInputContext } from "../Input/inputContext";
+
+const FilteredOptions = () => {
+  const {
+    clearInput,
+    inputProps: { id },
+    size,
+    value,
+  } = useInputContext();
+  const {
+    allowNewValues,
+    isLoading,
+    isListOpen,
+    filteredOptions,
+    filteredOptionsIndex,
+    filteredOptionsRef,
+    isValueNew,
+    toggleIsListOpen,
+  } = useFilteredOptionsContext();
+  const { isMultiSelect, selectedOptions, toggleOption } =
+    useSelectedOptionsContext();
+
+  return (
+    <ul
+      ref={filteredOptionsRef}
+      className={cl("navds-combobox__list", {
+        "navds-combobox__list--closed": !isListOpen,
+      })}
+      id={`${id}-filtered-options`}
+      role="listbox"
+      tabIndex={-1}
+    >
+      {isLoading && (
+        <li
+          className="navds-combobox__list-item--loading"
+          role="option"
+          aria-selected={false}
+          id={`${id}-is-loading`}
+        >
+          <Loader aria-label="Søker..." />
+        </li>
+      )}
+      {isValueNew && allowNewValues && (
+        <li
+          tabIndex={-1}
+          onPointerUp={(event) => {
+            toggleOption(value, event);
+            clearInput(event);
+          }}
+          id={`${id}-combobox-new-option`}
+          className={cl("navds-combobox__list-item__new-option", {
+            "navds-combobox__list-item__new-option--focus":
+              filteredOptionsIndex === -1,
+          })}
+          role="option"
+          aria-selected={false}
+        >
+          <PlusIcon aria-hidden />
+          <BodyShort size={size}>
+            Legg til{" "}
+            <Label as="span" size={size}>
+              &#8220;{value}&#8221;
+            </Label>
+          </BodyShort>
+        </li>
+      )}
+      {!isLoading && filteredOptions.length === 0 && (
+        <li
+          className="navds-combobox__list-item__no-options"
+          role="option"
+          aria-selected={false}
+          id={`${id}-no-hits`}
+        >
+          Ingen søketreff
+        </li>
+      )}
+      {filteredOptions.map((option, index) => (
+        <li
+          className={cl("navds-combobox__list-item", {
+            "navds-combobox__list-item--focus": index === filteredOptionsIndex,
+            "navds-combobox__list-item--selected":
+              selectedOptions.includes(option),
+          })}
+          id={`${id}-option-${option.replace(" ", "-")}`}
+          key={option}
+          tabIndex={-1}
+          onPointerUp={(event) => {
+            toggleOption(option, event);
+            clearInput(event);
+            if (!isMultiSelect) {
+              toggleIsListOpen(false);
+            }
+          }}
+          role="option"
+          aria-selected={selectedOptions.includes(option)}
+        >
+          <BodyShort size={size}>{option}</BodyShort>
+          {selectedOptions.includes(option) && <CheckmarkIcon />}
+        </li>
+      ))}
+    </ul>
+  );
+};
+
+export default FilteredOptions;

@navikt/core/react/src/form/combobox/FilteredOptions/filteredOptionsContext.tsx

@@ -0,0 +1,266 @@
+import React, {
+  useState,
+  useEffect,
+  useMemo,
+  createContext,
+  useContext,
+  useCallback,
+  useRef,
+  useLayoutEffect,
+} from "react";
+import { useCustomOptionsContext } from "../customOptionsContext";
+import { useInputContext } from "../Input/inputContext";
+import usePrevious from "../../../util/usePrevious";
+
+const normalizeText = (text: string): string =>
+  typeof text === "string" ? `${text}`.toLowerCase().trim() : "";
+
+const isPartOfText = (value, text) =>
+  normalizeText(text).startsWith(normalizeText(value ?? ""));
+
+const isValueInList = (value, list) =>
+  list?.find((listItem) => normalizeText(value) === normalizeText(listItem));
+
+const getMatchingValuesFromList = (value, list) =>
+  list?.filter((listItem) => isPartOfText(value, listItem));
+
+type FilteredOptionsContextType = {
+  activeDecendantId?: string;
+  allowNewValues?: boolean;
+  ariaDescribedBy?: string;
+  filteredOptionsRef: React.RefObject<HTMLUListElement>;
+  filteredOptionsIndex: number | null;
+  setFilteredOptionsIndex: (index: number) => void;
+  isListOpen: boolean;
+  isLoading?: boolean;
+  filteredOptions: string[];
+  isValueNew: boolean;
+  toggleIsListOpen: (newState?: boolean) => void;
+  currentOption: string | null;
+  resetFilteredOptionsIndex: () => void;
+  moveFocusUp: () => void;
+  moveFocusDown: () => void;
+  moveFocusToInput: () => void;
+  moveFocusToEnd: () => void;
+  shouldAutocomplete?: boolean;
+};
+const FilteredOptionsContext = createContext<FilteredOptionsContextType>(
+  {} as FilteredOptionsContextType
+);
+
+export const FilteredOptionsProvider = ({ children, value: props }) => {
+  const {
+    allowNewValues,
+    filteredOptions: externalFilteredOptions,
+    isListOpen: isExternalListOpen,
+    isLoading,
+    options,
+  } = props;
+  const filteredOptionsRef = useRef<HTMLUListElement | null>(null);
+  const {
+    inputProps: { id },
+    value,
+    searchTerm,
+    setValue,
+    setSearchTerm,
+    shouldAutocomplete,
+  } = useInputContext();
+
+  const [filteredOptionsIndex, setFilteredOptionsIndex] = useState<
+    number | null
+  >(null);
+  const [isInternalListOpen, setInternalListOpen] = useState(false);
+  const { customOptions } = useCustomOptionsContext();
+
+  const filteredOptions = useMemo(() => {
+    if (externalFilteredOptions) {
+      return externalFilteredOptions;
+    }
+    const opts = [...customOptions, ...options];
+    setFilteredOptionsIndex(null);
+    return getMatchingValuesFromList(searchTerm, opts);
+  }, [customOptions, externalFilteredOptions, options, searchTerm]);
+
+  const previousSearchTerm = usePrevious(searchTerm);
+
+  useLayoutEffect(() => {
+    if (
+      shouldAutocomplete &&
+      normalizeText(searchTerm) !== "" &&
+      (previousSearchTerm?.length || 0) < searchTerm.length &&
+      filteredOptions.length > 0 &&
+      !isValueInList(searchTerm, filteredOptions)
+    ) {
+      setValue(
+        `${searchTerm}${filteredOptions[0].substring(searchTerm.length)}`
+      );
+      setSearchTerm(searchTerm);
+    }
+  }, [
+    filteredOptions,
+    previousSearchTerm,
+    searchTerm,
+    setSearchTerm,
+    setValue,
+    shouldAutocomplete,
+  ]);
+
+  const isListOpen = useMemo(() => {
+    return isExternalListOpen ?? isInternalListOpen;
+  }, [isExternalListOpen, isInternalListOpen]);
+
+  const toggleIsListOpen = useCallback((newState?: boolean) => {
+    setFilteredOptionsIndex(null);
+    setInternalListOpen((oldState) => newState ?? !oldState);
+  }, []);
+
+  const isValueNew = useMemo(
+    () => Boolean(value) && !isValueInList(value, filteredOptions),
+    [value, filteredOptions]
+  );
+
+  const getMinimumIndex = useCallback(() => {
+    return isValueNew && allowNewValues ? -1 : 0;
+  }, [allowNewValues, isValueNew]);
+
+  const ariaDescribedBy = useMemo(() => {
+    if (!isLoading && filteredOptions.length === 0) {
+      return `${id}-no-hits`;
+    } else if ((value && value !== "") || isLoading) {
+      if (shouldAutocomplete && filteredOptions[0]) {
+        return `${id}-option-${filteredOptions[0].replace(" ", "-")}`;
+      } else if (isLoading) {
+        return `${id}-is-loading`;
+      }
+    } else {
+      return undefined;
+    }
+  }, [isLoading, value, shouldAutocomplete, filteredOptions, id]);
+
+  const currentOption = useMemo(() => {
+    if (filteredOptionsIndex == null) {
+      return null;
+    }
+    if (filteredOptionsIndex === -1) {
+      return value;
+    }
+    return filteredOptions[filteredOptionsIndex];
+  }, [filteredOptionsIndex, filteredOptions, value]);
+
+  const resetFilteredOptionsIndex = () => {
+    setFilteredOptionsIndex(getMinimumIndex());
+  };
+
+  const scrollToOption = useCallback((newIndex: number) => {
+    if (
+      filteredOptionsRef.current &&
+      filteredOptionsRef.current.children[newIndex]
+    ) {
+      const child = filteredOptionsRef.current.children[newIndex];
+      const { top, bottom } = child.getBoundingClientRect();
+      const parentRect = filteredOptionsRef.current.getBoundingClientRect();
+      if (top < parentRect.top || bottom > parentRect.bottom) {
+        child.scrollIntoView({ block: "nearest" });
+      }
+    }
+  }, []);
+
+  useEffect(() => {
+    if (filteredOptionsIndex !== null && isListOpen) {
+      scrollToOption(filteredOptionsIndex);
+    }
+  }, [filteredOptionsIndex, isListOpen, scrollToOption]);
+
+  const moveFocusToInput = useCallback(() => {
+    setFilteredOptionsIndex(null);
+    toggleIsListOpen(false);
+  }, [toggleIsListOpen]);
+
+  const moveFocusToEnd = useCallback(() => {
+    const lastIndex = filteredOptions.length - 1;
+    toggleIsListOpen(true);
+    setFilteredOptionsIndex(lastIndex);
+  }, [filteredOptions.length, toggleIsListOpen]);
+
+  const moveFocusUp = useCallback(() => {
+    if (filteredOptionsIndex === null) {
+      return;
+    }
+    if (filteredOptionsIndex === getMinimumIndex()) {
+      toggleIsListOpen(false);
+      setFilteredOptionsIndex(null);
+    } else {
+      const newIndex = Math.max(getMinimumIndex(), filteredOptionsIndex - 1);
+      setFilteredOptionsIndex(newIndex);
+    }
+  }, [filteredOptionsIndex, getMinimumIndex, toggleIsListOpen]);
+
+  const moveFocusDown = useCallback(() => {
+    if (filteredOptionsIndex === null || !isListOpen) {
+      toggleIsListOpen(true);
+      if (allowNewValues || filteredOptions.length >= 1) {
+        setFilteredOptionsIndex(getMinimumIndex());
+      }
+      return;
+    }
+    const newIndex = Math.min(
+      filteredOptionsIndex + 1,
+      Math.max(getMinimumIndex(), filteredOptions.length - 1)
+    );
+    setFilteredOptionsIndex(newIndex);
+  }, [
+    allowNewValues,
+    filteredOptions.length,
+    filteredOptionsIndex,
+    getMinimumIndex,
+    isListOpen,
+    toggleIsListOpen,
+  ]);
+
+  const activeDecendantId = useMemo(() => {
+    if (filteredOptionsIndex === null) {
+      return undefined;
+    } else if (filteredOptionsIndex === -1) {
+      return `${id}-combobox-new-option`;
+    } else {
+      return `${id}-option-${currentOption?.replace(" ", "-")}`;
+    }
+  }, [filteredOptionsIndex, currentOption, id]);
+
+  const filteredOptionsState = {
+    activeDecendantId,
+    allowNewValues,
+    filteredOptionsRef,
+    filteredOptionsIndex,
+    setFilteredOptionsIndex,
+    shouldAutocomplete,
+    isListOpen,
+    isLoading,
+    filteredOptions,
+    isValueNew,
+    toggleIsListOpen,
+    currentOption,
+    resetFilteredOptionsIndex,
+    moveFocusUp,
+    moveFocusDown,
+    moveFocusToInput,
+    moveFocusToEnd,
+    ariaDescribedBy,
+  };
+
+  return (
+    <FilteredOptionsContext.Provider value={filteredOptionsState}>
+      {children}
+    </FilteredOptionsContext.Provider>
+  );
+};
+
+export const useFilteredOptionsContext = () => {
+  const context = useContext(FilteredOptionsContext);
+  if (!context) {
+    throw new Error(
+      "useFilteredOptionsContext must be used within a FilteredOptionsProvider"
+    );
+  }
+  return context;
+};

@navikt/core/react/src/form/combobox/Input/Input.tsx

@@ -0,0 +1,170 @@
+import { omit } from "../../..";
+import React, {
+  useCallback,
+  forwardRef,
+  InputHTMLAttributes,
+  ChangeEvent,
+} from "react";
+import cl from "clsx";
+import { useSelectedOptionsContext } from "../SelectedOptions/selectedOptionsContext";
+import { useFilteredOptionsContext } from "../FilteredOptions/filteredOptionsContext";
+import { useInputContext } from "./inputContext";
+
+interface InputProps
+  extends Omit<InputHTMLAttributes<HTMLInputElement>, "value"> {
+  ref: React.Ref<HTMLInputElement>;
+  inputClassName?: string;
+  errorId?: string;
+  value?: string;
+  error?: React.ReactNode;
+}
+
+const Input = forwardRef<HTMLInputElement, InputProps>(
+  ({ inputClassName, error, errorId, ...rest }, ref) => {
+    const { clearInput, inputProps, onChange, size, value } = useInputContext();
+    const { selectedOptions, removeSelectedOption, toggleOption } =
+      useSelectedOptionsContext();
+    const {
+      activeDecendantId,
+      allowNewValues,
+      currentOption,
+      filteredOptions,
+      toggleIsListOpen,
+      isListOpen,
+      filteredOptionsIndex,
+      moveFocusUp,
+      moveFocusDown,
+      ariaDescribedBy,
+      moveFocusToInput,
+      moveFocusToEnd,
+      shouldAutocomplete,
+    } = useFilteredOptionsContext();
+
+    const onEnter = useCallback(
+      (event: React.KeyboardEvent) => {
+        if (currentOption) {
+          event.preventDefault();
+          // Selecting a value from the dropdown / FilteredOptions
+          toggleOption(currentOption, event);
+          clearInput(event);
+        } else if (shouldAutocomplete && selectedOptions.includes(value)) {
+          event.preventDefault();
+          // Trying to set the same value that is already set, so just clearing the input
+          clearInput(event);
+        } else if ((allowNewValues || shouldAutocomplete) && value !== "") {
+          event.preventDefault();
+          // Autocompleting or adding a new value
+          toggleOption(value, event);
+          clearInput(event);
+        }
+      },
+      [
+        allowNewValues,
+        clearInput,
+        currentOption,
+        selectedOptions,
+        shouldAutocomplete,
+        toggleOption,
+        value,
+      ]
+    );
+
+    const handleKeyUp = (e: React.KeyboardEvent<HTMLInputElement>) => {
+      e.preventDefault();
+      switch (e.key) {
+        case "Escape":
+          clearInput(e);
+          toggleIsListOpen(false);
+          break;
+        case "Enter":
+        case "Accept":
+          onEnter(e);
+          break;
+        case "Home":
+          moveFocusToInput();
+          break;
+        case "End":
+          moveFocusToEnd();
+          break;
+        default:
+          break;
+      }
+    };
+
+    const handleKeyDown = useCallback(
+      (e) => {
+        if (e.key === "Backspace") {
+          if (value === "") {
+            const lastSelectedOption =
+              selectedOptions[selectedOptions.length - 1];
+            removeSelectedOption(lastSelectedOption);
+          }
+        } else if (e.key === "ArrowDown") {
+          // Check that cursor position is at the end of the input field,
+          // so we don't interfere with text editing
+          if (e.target.selectionStart === value?.length) {
+            e.preventDefault();
+            moveFocusDown();
+          }
+        } else if (e.key === "ArrowUp") {
+          // Check that the FilteredOptions list is open and has virtual focus.
+          // Otherwise ignore keystrokes, so it doesn't interfere with text editing
+          if (isListOpen && filteredOptionsIndex !== null) {
+            e.preventDefault();
+            moveFocusUp();
+          }
+        }
+      },
+      [
+        value,
+        selectedOptions,
+        removeSelectedOption,
+        moveFocusDown,
+        isListOpen,
+        filteredOptionsIndex,
+        moveFocusUp,
+      ]
+    );
+
+    const onChangeHandler = useCallback(
+      (event: ChangeEvent<HTMLInputElement>) => {
+        const newValue = event.target.value;
+        if (newValue && newValue !== "") {
+          toggleIsListOpen(true);
+        } else if (filteredOptions.length === 0) {
+          toggleIsListOpen(false);
+        }
+        onChange(event);
+      },
+      [filteredOptions.length, onChange, toggleIsListOpen]
+    );
+
+    return (
+      <input
+        {...rest}
+        {...omit(inputProps, ["aria-invalid"])}
+        ref={ref}
+        value={value}
+        onChange={onChangeHandler}
+        type="text"
+        role="combobox"
+        onKeyUp={handleKeyUp}
+        onKeyDown={handleKeyDown}
+        aria-controls={`${inputProps.id}-filtered-options`}
+        aria-expanded={!!isListOpen}
+        autoComplete="off"
+        aria-autocomplete={shouldAutocomplete ? "both" : "list"}
+        aria-activedescendant={activeDecendantId}
+        aria-describedby={ariaDescribedBy}
+        className={cl(
+          inputClassName,
+          "navds-combobox__input",
+          "navds-body-short",
+          `navds-body-${size}`
+        )}
+      />
+    );
+  }
+);
+
+export default Input;

@navikt/core/react/src/form/combobox/Input/inputContext.tsx

@@ -0,0 +1,127 @@
+import React, {
+  ChangeEvent,
+  ChangeEventHandler,
+  createContext,
+  useCallback,
+  useContext,
+  useLayoutEffect,
+  useMemo,
+  useRef,
+  useState,
+} from "react";
+import { useFormField, FormFieldType } from "../../useFormField";
+
+interface InputContextType extends FormFieldType {
+  clearInput: (event: React.PointerEvent | React.KeyboardEvent) => void;
+  focusInput: () => void;
+  inputRef: React.RefObject<HTMLInputElement>;
+  value: string;
+  setValue: (text: string) => void;
+  onChange: ChangeEventHandler<HTMLInputElement>;
+  searchTerm: string;
+  setSearchTerm: React.Dispatch<React.SetStateAction<string>>;
+  shouldAutocomplete?: boolean;
+}
+
+const InputContext = createContext<InputContextType>({} as InputContextType);
+
+export const InputContextProvider = ({ children, value: props }) => {
+  const {
+    defaultValue = "",
+    description,
+    disabled,
+    error,
+    errorId,
+    id: externalId,
+    value: externalValue,
+    onChange: externalOnChange,
+    onClear,
+    shouldAutocomplete,
+    size,
+  } = props;
+  const formFieldProps = useFormField(
+    {
+      description,
+      disabled,
+      error,
+      errorId,
+      id: externalId,
+      size,
+    },
+    "comboboxfield"
+  );
+  const inputRef = useRef<HTMLInputElement | null>(null);
+  const [internalValue, setInternalValue] = useState<string>(defaultValue);
+
+  const value = useMemo(
+    () => String(externalValue ?? internalValue),
+    [externalValue, internalValue]
+  );
+
+  const [searchTerm, setSearchTerm] = useState(value);
+
+  const onChange = useCallback(
+    (event: ChangeEvent<HTMLInputElement>) => {
+      const value = event.currentTarget.value;
+      externalValue ?? setInternalValue(value);
+      externalOnChange?.(event);
+      setSearchTerm(value);
+    },
+    [externalValue, externalOnChange]
+  );
+
+  const setValue = useCallback(
+    (text) => {
+      setInternalValue(text);
+    },
+    [setInternalValue]
+  );
+
+  const clearInput = useCallback(
+    (event: React.PointerEvent | React.KeyboardEvent) => {
+      onClear?.(event);
+      setValue("");
+      setSearchTerm("");
+    },
+    [onClear, setSearchTerm, setValue]
+  );
+
+  const focusInput = useCallback(() => {
+    inputRef.current?.focus?.();
+  }, []);
+
+  useLayoutEffect(() => {
+    if (shouldAutocomplete && inputRef && value !== searchTerm) {
+      inputRef.current?.setSelectionRange?.(searchTerm.length, value.length);
+    }
+  }, [value, searchTerm, shouldAutocomplete]);
+
+  return (
+    <InputContext.Provider
+      value={{
+        ...formFieldProps,
+        clearInput,
+        focusInput,
+        inputRef,
+        value,
+        setValue,
+        onChange,
+        searchTerm,
+        setSearchTerm,
+        shouldAutocomplete,
+      }}
+    >
+      {children}
+    </InputContext.Provider>
+  );
+};
+
+export const useInputContext = () => {
+  const context = useContext(InputContext);
+  if (!context) {
+    throw new Error(
+      "useInputContext must be used within an InputContextProvider"
+    );
+  }
+  return context;
+};

@navikt/core/react/src/form/combobox/SelectedOptions/SelectedOptions.tsx

@@ -0,0 +1,45 @@
+import React from "react";
+import { Chips } from "../../..";
+import { useSelectedOptionsContext } from "./selectedOptionsContext";
+
+interface SelectedOptionsProps {
+  selectedOptions?: string[];
+  size?: "medium" | "small";
+  children: React.ReactNode;
+}
+
+const Option = ({ option }: { option: string }) => {
+  const { isMultiSelect, removeSelectedOption } = useSelectedOptionsContext();
+
+  const onClick = (e) => {
+    e.stopPropagation();
+    removeSelectedOption(option);
+  };
+
+  if (!isMultiSelect) {
+    return (
+      <div className="navds-combobox__selected-options--no-bg">{option}</div>
+    );
+  }
+
+  return <Chips.Removable onClick={onClick}>{option}</Chips.Removable>;
+};
+
+const SelectedOptions: React.FC<SelectedOptionsProps> = ({
+  selectedOptions = [],
+  size,
+  children,
+}) => {
+  return (
+    <Chips className="navds-combobox__selected-options" size={size}>
+      {selectedOptions.length
+        ? selectedOptions.map((option, i) => (
+            <Option key={option + i} option={option} />
+          ))
+        : []}
+      {children}
+    </Chips>
+  );
+};
+
+export default SelectedOptions;

@navikt/core/react/src/form/combobox/SelectedOptions/selectedOptionsContext.tsx

@@ -0,0 +1,147 @@
+import React, {
+  createContext,
+  useCallback,
+  useContext,
+  useMemo,
+  useState,
+} from "react";
+import usePrevious from "../../../util/usePrevious";
+import { useInputContext } from "../Input/inputContext";
+import { ComboboxProps } from "../types";
+import { useCustomOptionsContext } from "../customOptionsContext";
+
+type SelectedOptionsContextType = {
+  addSelectedOption: (option: string) => void;
+  isMultiSelect?: boolean;
+  removeSelectedOption: (option: string) => void;
+  prevSelectedOptions?: string[];
+  selectedOptions: string[];
+  setSelectedOptions: (any) => void;
+  toggleOption: (
+    option: string,
+    event: React.KeyboardEvent | React.PointerEvent
+  ) => void;
+};
+
+const SelectedOptionsContext = createContext<SelectedOptionsContextType>(
+  {} as SelectedOptionsContextType
+);
+
+export const SelectedOptionsProvider = ({
+  children,
+  value,
+}: {
+  children: any;
+  value: Pick<
+    ComboboxProps,
+    | "allowNewValues"
+    | "isMultiSelect"
+    | "options"
+    | "selectedOptions"
+    | "onToggleSelected"
+  >;
+}) => {
+  const { clearInput, focusInput } = useInputContext();
+  const { customOptions, removeCustomOption, addCustomOption } =
+    useCustomOptionsContext();
+  const {
+    allowNewValues,
+    isMultiSelect,
+    selectedOptions: externalSelectedOptions,
+    onToggleSelected,
+    options,
+  } = value;
+  const [internalSelectedOptions, setSelectedOptions] = useState<string[]>([]);
+  const selectedOptions = useMemo(
+    () =>
+      externalSelectedOptions ?? [...customOptions, ...internalSelectedOptions],
+    [customOptions, externalSelectedOptions, internalSelectedOptions]
+  );
+
+  const addSelectedOption = useCallback(
+    (option: string) => {
+      const isAddedByUser = !options
+        .map((opt) => opt.toLowerCase())
+        .includes(option?.toLowerCase?.());
+      if (isAddedByUser) {
+        allowNewValues && addCustomOption(option);
+      } else if (isMultiSelect) {
+        setSelectedOptions((prevSelectedOptions) => [
+          ...prevSelectedOptions,
+          option,
+        ]);
+      } else {
+        setSelectedOptions([option]);
+      }
+      onToggleSelected?.(option, true, isAddedByUser);
+    },
+    [addCustomOption, allowNewValues, isMultiSelect, onToggleSelected, options]
+  );
+
+  const removeSelectedOption = useCallback(
+    (option: string) => {
+      const isAddedByUser = customOptions.includes(option);
+      if (isAddedByUser) {
+        removeCustomOption(option);
+      } else {
+        setSelectedOptions((prevSelectedOptions) =>
+          prevSelectedOptions.filter(
+            (selectedOption) => selectedOption !== option
+          )
+        );
+      }
+      onToggleSelected?.(option, false, isAddedByUser);
+    },
+    [customOptions, onToggleSelected, removeCustomOption]
+  );
+
+  const toggleOption = useCallback(
+    (option: string, event: React.KeyboardEvent | React.PointerEvent) => {
+      if (selectedOptions.includes(option)) {
+        removeSelectedOption(option);
+      } else {
+        addSelectedOption(option);
+      }
+      if (!isMultiSelect) {
+        clearInput(event);
+      }
+      focusInput();
+    },
+    [
+      addSelectedOption,
+      clearInput,
+      focusInput,
+      isMultiSelect,
+      removeSelectedOption,
+      selectedOptions,
+    ]
+  );
+
+  const prevSelectedOptions = usePrevious<string[]>(selectedOptions);
+
+  const selectedOptionsState = {
+    addSelectedOption,
+    isMultiSelect,
+    removeSelectedOption,
+    prevSelectedOptions,
+    selectedOptions,
+    setSelectedOptions,
+    toggleOption,
+  };
+
+  return (
+    <SelectedOptionsContext.Provider value={selectedOptionsState}>
+      {children}
+    </SelectedOptionsContext.Provider>
+  );
+};
+
+export const useSelectedOptionsContext = () => {
+  const context = useContext(SelectedOptionsContext);
+  if (!context) {
+    throw new Error(
+      "useSelectedOptionsContext must be used within a SelectedOptionsProvider"
+    );
+  }
+  return context;
+};

@navikt/core/react/src/form/combobox/ToggleListButton.tsx

@@ -0,0 +1,37 @@
+import React, { forwardRef } from "react";
+import { ChevronUpIcon, ChevronDownIcon } from "@navikt/aksel-icons";
+
+import { useFilteredOptionsContext } from "./FilteredOptions/filteredOptionsContext";
+
+interface ToggleListButtonProps {
+  toggleListButtonLabel?: string;
+}
+
+export const ToggleListButton = forwardRef<
+  HTMLButtonElement,
+  ToggleListButtonProps
+>(({ toggleListButtonLabel }, ref) => {
+  const { isListOpen, toggleIsListOpen } = useFilteredOptionsContext();
+  return (
+    <button
+      type="button"
+      onPointerUp={() => toggleIsListOpen()}
+      onKeyDown={({ key }) => key === "Enter" && toggleIsListOpen()}
+      className="navds-combobox__button-toggle-list"
+      aria-expanded={isListOpen}
+      tabIndex={-1}
+      ref={ref}
+    >
+      <span className="navds-sr-only">
+        {toggleListButtonLabel ?? "Alternativer"}
+      </span>
+      {isListOpen ? (
+        <ChevronUpIcon aria-hidden />
+      ) : (
+        <ChevronDownIcon aria-hidden />
+      )}
+    </button>
+  );
+});
+
+export default ToggleListButton;

@navikt/core/react/src/form/combobox/combobox.stories.tsx

@@ -0,0 +1,415 @@
+/* eslint-disable react-hooks/rules-of-hooks */
+import { Meta } from "@storybook/react";
+import React, { useState, useId, useMemo } from "react";
+import { userEvent, within } from "@storybook/testing-library";
+import { Chips, UNSAFE_Combobox, TextField } from "../../index";
+import { expect } from "@storybook/jest";
+
+export default {
+  title: "ds-react/Combobox",
+  component: UNSAFE_Combobox,
+  argTypes: {
+    isListOpen: {
+      control: {
+        type: "boolean",
+      },
+    },
+    isLoading: {
+      control: {
+        type: "boolean",
+      },
+    },
+  },
+} as Meta;
+
+const options = [
+  "banana",
+  "apple",
+  "apple pie",
+  "tangerine",
+  "pear",
+  "grape",
+  "kiwi",
+  "mango",
+  "passion fruit",
+  "pineapple",
+  "strawberry",
+  "watermelon",
+  "grape fruit",
+];
+
+const initialSelectedOptions = ["passion fruit", "grape fruit"];
+
+const DemoContainer = ({
+  dataTheme,
+  children,
+}: {
+  children: any;
+  dataTheme: "dark" | "light";
+}) => (
+  <div data-theme={dataTheme} style={{ width: "300px" }}>
+    {children}
+  </div>
+);
+
+export const Default = (props) => {
+  const id = useId();
+  return (
+    <DemoContainer dataTheme={props.darkMode}>
+      <UNSAFE_Combobox
+        options={props.options}
+        label="Hva er dine favorittfrukter?"
+        /* everything under here is optional? */
+        shouldAutocomplete={props.shouldAutoComplete}
+        size="medium"
+        id={id}
+      />
+    </DemoContainer>
+  );
+};
+
+Default.args = {
+  options,
+  shouldAutoComplete: true,
+};
+
+export function MultiSelect(props) {
+  const id = useId();
+  return (
+    <DemoContainer dataTheme={props.darkMode}>
+      <UNSAFE_Combobox
+        id={id}
+        label="Komboboks - velg flere"
+        options={props.options}
+        isMultiSelect={props.isMultiSelect}
+        size={props.size}
+      />
+    </DemoContainer>
+  );
+}
+
+MultiSelect.args = {
+  options,
+  isMultiSelect: true,
+  size: "medium",
+};
+
+export function MultiSelectWithAddNewOptions(props) {
+  const id = useId();
+  return (
+    <DemoContainer dataTheme={props.darkMode}>
+      <UNSAFE_Combobox
+        id={id}
+        isMultiSelect={props.isMultiSelect}
+        label="Komboboks (med mulighet for å legge til nye verdier)"
+        options={props.options}
+        allowNewValues={props.allowNewValues}
+      />
+    </DemoContainer>
+  );
+}
+
+MultiSelectWithAddNewOptions.args = {
+  allowNewValues: true,
+  isMultiSelect: true,
+  options,
+  shouldAutocomplete: false,
+};
+
+export const MultiSelectWithExternalChips = (props) => {
+  const [selectedOptions, setSelectedOptions] = useState<string[]>(
+    props.selectedOptions
+  );
+  const [value, setValue] = useState("");
+  const id = useId();
+
+  const toggleSelected = (option) =>
+    selectedOptions.includes(option)
+      ? setSelectedOptions(selectedOptions.filter((opt) => opt !== option))
+      : setSelectedOptions([...selectedOptions, option]);
+  return (
+    <DemoContainer dataTheme={props.darkMode}>
+      {selectedOptions && (
+        <Chips>
+          {selectedOptions.map((option) => (
+            <Chips.Removable
+              key={option}
+              onPointerUp={() => toggleSelected(option)}
+              onKeyUp={(e) => e.key === "Enter" && toggleSelected(option)}
+            >
+              {option}
+            </Chips.Removable>
+          ))}
+        </Chips>
+      )}
+      <UNSAFE_Combobox
+        options={options}
+        selectedOptions={selectedOptions}
+        onToggleSelected={(option: string) => toggleSelected(option)}
+        isListOpen={props.isListOpen}
+        isMultiSelect
+        value={props.controlled ? value : undefined}
+        onChange={(event) =>
+          props.controlled ? setValue(event.currentTarget.value) : undefined
+        }
+        label="Komboboks"
+        size="medium"
+        error={props.error && "error here"}
+        id={id}
+        shouldShowSelectedOptions={false}
+      />
+    </DemoContainer>
+  );
+};
+
+MultiSelectWithExternalChips.args = {
+  controlled: false,
+  options,
+  selectedOptions: [],
+};
+
+export function Loading(props) {
+  const id = useId();
+  return (
+    <DemoContainer dataTheme={props.darkMode}>
+      <UNSAFE_Combobox
+        id={id}
+        label="Komboboks (laster)"
+        options={[]}
+        selectedOptions={[]}
+        isListOpen={props.isListOpen}
+        isLoading={props.isLoading}
+      />
+    </DemoContainer>
+  );
+}
+
+Loading.args = {
+  isLoading: true,
+  isListOpen: true,
+};
+
+export function ComboboxWithNoHits(props) {
+  const id = useId();
+  const [value, setValue] = useState(props.value);
+  return (
+    <DemoContainer dataTheme={props.darkMode}>
+      <UNSAFE_Combobox
+        id={id}
+        label="Komboboks (uten søketreff)"
+        options={props.options}
+        value={value}
+        onChange={(event) => setValue(event.currentTarget.value)}
+        isListOpen={true}
+      />
+    </DemoContainer>
+  );
+}
+
+ComboboxWithNoHits.args = {
+  options,
+  value: "Orange",
+};
+
+export const Controlled = (props) => {
+  const id = useId();
+  const [value, setValue] = useState(props.value);
+  const [selectedOptions, setSelectedOptions] = useState(props.selectedOptions);
+  const filteredOptions = useMemo(
+    () => props.options.filter((option) => option.includes(value)),
+    [props.options, value]
+  );
+
+  const onToggleSelected = (option, isSelected) => {
+    if (isSelected) {
+      setSelectedOptions([...selectedOptions, option]);
+    } else {
+      setSelectedOptions(selectedOptions.filter((o) => o !== option));
+    }
+  };
+
+  return (
+    <DemoContainer dataTheme={props.darkMode}>
+      <TextField
+        label="Overstyr value"
+        onChange={(event) => setValue(event.target.value)}
+        value={value}
+      />
+      <br />
+      <UNSAFE_Combobox
+        label="Hva er dine favorittfrukter?"
+        id={id}
+        filteredOptions={filteredOptions}
+        isMultiSelect
+        options={props.options}
+        onChange={(event) => setValue(event.target.value)}
+        onToggleSelected={onToggleSelected}
+        selectedOptions={selectedOptions}
+        value={value}
+      />
+    </DemoContainer>
+  );
+};
+
+Controlled.args = {
+  value: "apple",
+  options,
+  selectedOptions: initialSelectedOptions,
+};
+
+export const ComboboxSizes = (props) => (
+  <DemoContainer dataTheme={props.darkMode}>
+    <UNSAFE_Combobox
+      label="Hva er dine favorittfrukter?"
+      description="Medium single-select"
+      options={options}
+    />
+    <br />
+    <UNSAFE_Combobox
+      label="Hva er dine favorittfrukter?"
+      description="Small single-select"
+      options={options}
+      size="small"
+    />
+    <br />
+    <UNSAFE_Combobox
+      label="Hva er dine favorittfrukter?"
+      description="Medium multiselect"
+      options={options}
+      isMultiSelect
+      allowNewValues
+    />
+    <br />
+    <UNSAFE_Combobox
+      label="Hva er dine favorittfrukter?"
+      description="Small multiselect"
+      options={options}
+      isMultiSelect
+      size="small"
+      allowNewValues
+    />
+  </DemoContainer>
+);
+
+ComboboxSizes.args = {
+  options,
+};
+
+function sleep(ms: number) {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
+
+export const CancelInputTest = {
+  render: (props) => {
+    return (
+      <DemoContainer dataTheme={props.darkMode}>
+        <UNSAFE_Combobox
+          options={options}
+          label="Hva er dine favorittfrukter?"
+        />
+      </DemoContainer>
+    );
+  },
+  play: async ({ canvasElement }) => {
+    const canvas = within(canvasElement);
+
+    const input = canvas.getByLabelText("Hva er dine favorittfrukter?");
+
+    userEvent.click(input);
+    await userEvent.type(input, "apple", { delay: 200 });
+    await sleep(1000);
+
+    userEvent.keyboard("{ArrowDown}");
+    await sleep(1000);
+    userEvent.keyboard("{Escape}");
+    await sleep(1000);
+    userEvent.keyboard("{ArrowDown}");
+    const banana = canvas.getByText("banana");
+    userEvent.click(banana);
+  },
+};
+
+export const RemoveSelectedMultiSelectTest = {
+  render: (props) => {
+    return (
+      <DemoContainer dataTheme={props.darkMode}>
+        <UNSAFE_Combobox
+          options={options}
+          label="Hva er dine favorittfrukter?"
+          isMultiSelect
+        />
+      </DemoContainer>
+    );
+  },
+  play: async ({ canvasElement }) => {
+    const canvas = within(canvasElement);
+
+    const input = canvas.getByLabelText("Hva er dine favorittfrukter?");
+
+    userEvent.click(input);
+    await userEvent.type(input, "apple", { delay: 200 });
+    await sleep(250);
+
+    userEvent.keyboard("{ArrowDown}");
+    await sleep(250);
+    userEvent.keyboard("{Enter}");
+    await sleep(250);
+    userEvent.keyboard("{Escape}");
+    await sleep(250);
+
+    userEvent.click(input);
+    await userEvent.type(input, "banana", { delay: 200 });
+    await sleep(250);
+
+    userEvent.keyboard("{ArrowDown}");
+    await sleep(250);
+    userEvent.keyboard("{Enter}");
+    await sleep(250);
+    userEvent.keyboard("{Escape}");
+    await sleep(250);
+
+    const appleSlett = canvas.getByLabelText("apple slett");
+    userEvent.click(appleSlett);
+    await sleep(250);
+
+    const bananaSlett = canvas.getByLabelText("banana slett");
+    expect(bananaSlett).toBeInTheDocument();
+    const appleSlettAgain = canvas.queryByLabelText("apple slett");
+    expect(appleSlettAgain).not.toBeInTheDocument();
+  },
+};
+
+export const AddWhenAddNewDisabledTest = {
+  render: (props) => {
+    return (
+      <DemoContainer dataTheme={props.darkMode}>
+        <UNSAFE_Combobox
+          options={options}
+          label="Hva er dine favorittfrukter?"
+          isMultiSelect
+        />
+      </DemoContainer>
+    );
+  },
+  play: async ({ canvasElement }) => {
+    const canvas = within(canvasElement);
+
+    const input = canvas.getByLabelText("Hva er dine favorittfrukter?");
+
+    userEvent.click(input);
+    await userEvent.type(input, "aaa", { delay: 200 });
+    await sleep(250);
+
+    userEvent.keyboard("{ArrowDown}");
+    await sleep(250);
+    userEvent.keyboard("{ArrowDown}");
+    await sleep(250);
+    userEvent.keyboard("{Enter}");
+    await sleep(250);
+    userEvent.keyboard("{Escape}");
+    await sleep(250);
+
+    const invalidSelect = canvas.queryByLabelText("aaa slett");
+    expect(invalidSelect).not.toBeInTheDocument();
+  },
+};

@navikt/core/react/src/form/combobox/combobox.test.tsx

@@ -0,0 +1,123 @@
+/* eslint-disable react/jsx-pascal-case */
+import { render } from "@testing-library/react";
+import userEvent from "@testing-library/user-event";
+import React, { useId } from "react";
+import { UNSAFE_Combobox } from "..";
+import { act } from "react-dom/test-utils";
+
+const options = [
+  "banana",
+  "apple",
+  "tangerine",
+  "pear",
+  "grape",
+  "kiwi",
+  "mango",
+  "passion fruit",
+  "pineapple",
+  "strawberry",
+  "watermelon",
+  "grape fruit",
+];
+
+const App = (props) => {
+  const id = useId();
+  return (
+    <div data-theme="light">
+      <UNSAFE_Combobox
+        label="Hva er dine favorittfrukter?"
+        size="medium"
+        variant="simple"
+        id={id}
+        {...props}
+      />
+    </div>
+  );
+};
+
+describe("Render combobox", () => {
+  describe("with multi select", () => {
+    it("Should be able to search, select and remove selections", async () => {
+      const utils = render(<App isMultiSelect options={options} />);
+
+      await act(async () => {
+        await userEvent.click(
+          utils.getByRole("combobox", { name: "Hva er dine favorittfrukter?" })
+        );
+      });
+      await act(async () => {
+        await userEvent.type(
+          utils.getByRole("combobox", { name: "Hva er dine favorittfrukter?" }),
+          "apple"
+        );
+      });
+      await act(async () => {
+        await userEvent.click(
+          await utils.findByRole("option", { name: "apple" })
+        );
+      });
+      expect(
+        await utils.findByRole("option", { name: "apple", selected: true })
+      ).toBeInTheDocument();
+      await act(async () => {
+        await userEvent.click(
+          await utils.findByRole("button", { name: "apple slett" })
+        );
+      });
+    });
+  });
+
+  it("Should show loading icon when loading (used for async search)", async () => {
+    const utils = render(<App options={[]} isListOpen isLoading />);
+
+    expect(await utils.findByRole("option", { name: "venter..." }));
+  });
+});
+
+describe("Combobox state-handling", () => {
+  it("Should not select previous focused element when closes", async () => {
+    const utils = render(<App options={options} />);
+
+    await act(async () => {
+      await userEvent.click(
+        utils.getByRole("combobox", { name: "Hva er dine favorittfrukter?" })
+      );
+    });
+    await act(async () => {
+      await userEvent.type(
+        utils.getByRole("combobox", { name: "Hva er dine favorittfrukter?" }),
+        "ban"
+      );
+      await userEvent.keyboard("{ArrowDown}");
+      await userEvent.keyboard("{ArrowUp}");
+      await userEvent.keyboard("{Enter}");
+    });
+
+    expect(
+      await utils.queryByRole("button", { name: "banana slett" })
+    ).toBeNull();
+  });
+
+  it("Should reset list when resetting input (ESC)", async () => {
+    const utils = render(<App options={options} />);
+
+    await act(async () => {
+      await userEvent.click(
+        utils.getByRole("combobox", { name: "Hva er dine favorittfrukter?" })
+      );
+    });
+    await act(async () => {
+      await userEvent.type(
+        utils.getByRole("combobox", { name: "Hva er dine favorittfrukter?" }),
+        "apple"
+      );
+      await userEvent.keyboard("{ArrowDown}");
+      await userEvent.keyboard("{Escape}");
+      await userEvent.keyboard("{ArrowDown}");
+    });
+
+    expect(
+      await utils.findByRole("option", { name: "banana" })
+    ).toBeInTheDocument();
+  });
+});

@navikt/core/react/src/form/combobox/customOptionsContext.tsx

@@ -0,0 +1,57 @@
+import React, { useState, useCallback, createContext, useContext } from "react";
+import { useInputContext } from "./Input/inputContext";
+
+type CustomOptionsContextType = {
+  customOptions: string[];
+  removeCustomOption: (option: string) => void;
+  addCustomOption: (option: string) => void;
+};
+
+const CustomOptionsContext = createContext<CustomOptionsContextType>(
+  {} as CustomOptionsContextType
+);
+
+export const CustomOptionsProvider = ({ children }) => {
+  const [customOptions, setCustomOptions] = useState<string[]>([]);
+  const { focusInput } = useInputContext();
+
+  const removeCustomOption = useCallback(
+    (option) => {
+      setCustomOptions((prevCustomOptions) =>
+        prevCustomOptions.filter((o) => o !== option)
+      );
+      focusInput();
+    },
+    [focusInput, setCustomOptions]
+  );
+
+  const addCustomOption = useCallback(
+    (option) => {
+      setCustomOptions((prevOptions) => [...prevOptions, option]);
+      focusInput();
+    },
+    [focusInput, setCustomOptions]
+  );
+
+  const customOptionsState = {
+    customOptions,
+    removeCustomOption,
+    addCustomOption,
+  };
+
+  return (
+    <CustomOptionsContext.Provider value={customOptionsState}>
+      {children}
+    </CustomOptionsContext.Provider>
+  );
+};
+
+export const useCustomOptionsContext = () => {
+  const context = useContext(CustomOptionsContext);
+  if (!context) {
+    throw new Error(
+      "useCustomOptionsContext must be used within a CustomOptionsProvider"
+    );
+  }
+  return context;
+};

@navikt/core/react/src/form/combobox/index.ts

@@ -0,0 +1,2 @@
+export { default as Combobox } from "./ComboboxProvider";
+export { type ComboboxProps } from "./types";

@navikt/core/react/src/form/combobox/types.ts

@@ -0,0 +1,127 @@
+import React, { ChangeEvent, InputHTMLAttributes } from "react";
+import { FormFieldProps } from "../useFormField";
+
+export interface ComboboxProps
+  extends FormFieldProps,
+    Omit<InputHTMLAttributes<HTMLInputElement>, "size" | "onChange" | "value"> {
+  /**
+   * Combobox label
+   */
+  label: React.ReactNode;
+  /**
+   * List of options to use for autocompletion
+   */
+  options: string[];
+  /**
+   * If enabled, adds an option to add the value of the input as an option whenever there are no options matching the value.
+   */
+  allowNewValues?: boolean;
+  /**
+   * If "true" adds a button to clear the value in the input field
+   */
+  clearButton?: boolean;
+  /**
+   * Custom name for the clear button. Requires "clearButton" to be "true".
+   *
+   * @default "Tøm"
+   */
+  clearButtonLabel?: string;
+  /**
+   * A list of options to display in the dropdown list.
+   * If provided, this overrides the internal search logic in the component.
+   * Useful for e.g. searching on a server or when overriding the search algorithm to search for synonyms or similar.
+   */
+  filteredOptions?: string[];
+  /**
+   * Optionally hide the label visually.
+   * Not recommended, but can be considered for e.g. search fields in the top menu.
+   */
+  hideLabel?: boolean;
+  /**
+   * Custom class name for the input field.
+   *
+   * If used for styling, please consider using tokens instead.
+   */
+  inputClassName?: string | undefined;
+  /**
+   * Controlled open/closed state for the dropdown list
+   */
+  isListOpen?: boolean;
+  /**
+   * Set to "true" when doing an async search and waiting for new filteredOptions.
+   *
+   * Will show a spinner in the dropdown and announce to screen readers that it is loading.
+   */
+  isLoading?: boolean;
+  /**
+   * Set to "true" to allow multiple selections
+   *
+   * This will display selected values as a list of Chips in front of the input field, instead of a selection replacing the value of the input.
+   *
+   */
+  isMultiSelect?: boolean;
+  /**
+   * Callback function triggered whenever the value of the input field is triggered.
+   *
+   * @param event
+   * @returns
+   */
+  onChange?: (event: ChangeEvent<HTMLInputElement>) => void;
+  /**
+   * Callback function triggered whenever the input field is cleared
+   *
+   * @param event
+   * @returns
+   */
+  onClear?: (event: React.PointerEvent | React.KeyboardEvent) => void;
+  /**
+   * Callback function triggered whenever an option is selected or de-selected
+   *
+   * @param option
+   * @param isSelected - Whether the option has been selected or unselected
+   * @param isAddedByUser - Whether the option comes from user input, instead of from the list
+   * @returns
+   */
+  onToggleSelected?: (
+    option: string,
+    isSelected: boolean,
+    isAddedByUser: boolean
+  ) => void;
+  /**
+   * List of selected options.
+   *
+   * Use this prop when controlling the selected state outside for the component,
+   * e.g. for a filter, where options can be toggled elsewhere/programmatically.
+   */
+  selectedOptions?: string[];
+  /**
+   * Set to "true" to enable inline autocomplete.
+   *
+   * @default false
+   */
+  shouldAutocomplete?: boolean;
+  /**
+   * When set to "true" displays selected options as Chips before the input field
+   *
+   * @default true
+   */
+  shouldShowSelectedOptions?: boolean;
+  /**
+   * When set to "true" displays the toggle button for opening/closing the dropdown list
+   *
+   * @default true
+   */
+  toggleListButton?: boolean;
+  /**
+   * Custom name for the toggle list-button. Requires "toggleListButton" to be "true".
+   *
+   * @default "Alternativer"
+   */
+  toggleListButtonLabel?: string;
+  /**
+   * Set this to override the value of the input field.
+   *
+   * This converts the input to a controlled input, so you have to use onChange to update the value.
+   */
+  value?: string;
+}

@navikt/core/react/src/form/index.ts

@@ -17,6 +17,7 @@ export {
   type RadioProps,
 } from "./radio";
 export { Search, type SearchClearEvent, type SearchProps } from "./search";
+export { Combobox as UNSAFE_Combobox, type ComboboxProps } from "./combobox";
 export { default as Select, type SelectProps } from "./Select";
 export { default as Switch, type SwitchProps } from "./Switch";
 export { Counter, default as Textarea, type TextareaProps } from "./Textarea";

@navikt/core/react/src/form/useFormField.ts

@@ -35,10 +35,28 @@ export interface FormFieldProps {
   readOnly?: boolean;
 }
 
+export interface FormFieldType {
+  showErrorMsg: boolean;
+  hasError: boolean;
+  errorId: string;
+  inputDescriptionId: string;
+  size: "small" | "medium";
+  inputProps: {
+    id: string;
+    "aria-invalid"?: boolean;
+    "aria-describedby"?: string;
+    disabled?: boolean;
+  };
+  readOnly?: boolean;
+}
+
 /**
  * Handles props and their state for various form-fields in context with Fieldset
  */
-export const useFormField = (props: FormFieldProps, prefix: string) => {
+export const useFormField = (
+  props: FormFieldProps,
+  prefix: string
+): FormFieldType => {
   const { size, error, errorId: propErrorId } = props;
 
   const fieldset = useContext(FieldsetContext);

@navikt/core/react/src/index.ts

@@ -32,3 +32,4 @@ export * from "./toggle-group";
 export * from "./tooltip";
 export * from "./typography";
 export * from "./util";
+export * from "./layout/stack";

@navikt/core/react/src/layout/stack/HStack.tsx

@@ -0,0 +1,30 @@
+import React, { forwardRef } from "react";
+import { OverridableComponent } from "../../util/OverridableComponent";
+import { StackProps, Stack } from "./Stack";
+
+export type HStackProps = Omit<StackProps, "direction">;
+
+/**
+ * Layout-primitive for horizontal flexbox
+ *
+ * @see [📝 Documentation](https://aksel.nav.no/komponenter/core/Stack)
+ * @see 🏷️ {@link HStackProps}
+ * @see [🤖 OverridableComponent](https://aksel.nav.no/grunnleggende/kode/overridablecomponent) support
+ *
+ * @example
+ * <HStack gap="8">
+ *  <MyComponent />
+ *  <MyComponent />
+ * </HStack>
+ *
+ * @example
+ * // Responsive gap
+ * <HStack gap={{xs: "2", md: "6"}}>
+ *  <MyComponent />
+ *  <MyComponent />
+ * </HStack>
+ */
+export const HStack: OverridableComponent<HStackProps, HTMLDivElement> =
+  forwardRef((props, ref) => {
+    return <Stack {...props} ref={ref} direction="row" />;
+  });

@navikt/core/react/src/layout/stack/Spacer.tsx

@@ -0,0 +1,15 @@
+import React from "react";
+
+/**
+ * Layout-primitive for auto-spacing between elements
+ *
+ * @see [📝 Documentation](https://aksel.nav.no/komponenter/core/Stack)
+ *
+ * @example
+ * <HStack gap="8">
+ *  <MyComponent />
+ *  <Spacer />
+ *  <MyComponent />
+ * </HStack>
+ */
+export const Spacer = () => <div className="navds-stack__spacer" />;

@navikt/core/react/src/layout/stack/Stack.tsx

@@ -0,0 +1,76 @@
+import cl from "clsx";
+import React, { forwardRef, HTMLAttributes } from "react";
+import { OverridableComponent } from "../../util/OverridableComponent";
+import {
+  getResponsiveProps,
+  ResponsiveProp,
+  SpacingScale,
+} from "../utilities/css";
+
+export interface StackProps extends HTMLAttributes<HTMLDivElement> {
+  children: React.ReactNode;
+  /**
+   * Justify-content
+   */
+  justify?:
+    | "start"
+    | "center"
+    | "end"
+    | "space-around"
+    | "space-between"
+    | "space-evenly";
+  /**
+   * Align-items
+   */
+  align?: "start" | "center" | "end" | "baseline" | "stretch";
+  /**
+   * flex-wrap
+   */
+  wrap?: boolean;
+  /**
+   * @example
+   * gap='4'
+   * gap={{xs: '2', sm: '3', md: '4', lg: '5', xl: '6'}}
+   */
+  gap?: ResponsiveProp<SpacingScale>;
+  direction: "row" | "column";
+}
+
+export const Stack: OverridableComponent<StackProps, HTMLDivElement> =
+  forwardRef(
+    (
+      {
+        as: Component = "div",
+        className,
+        align,
+        justify,
+        wrap = true,
+        gap,
+        style: _style,
+        direction,
+        ...rest
+      },
+      ref
+    ) => {
+      const style = {
+        "--ac-stack-direction": direction,
+        "--ac-stack-align": align,
+        "--ac-stack-justify": justify,
+        "--ac-stack-wrap": wrap ? "wrap" : "nowrap",
+        ...getResponsiveProps(`stack`, "gap", "spacing", gap),
+        ..._style,
+      } as React.CSSProperties;
+
+      return (
+        <Component
+          {...rest}
+          ref={ref}
+          style={style}
+          className={cl("navds-stack", className, {
+            "navds-vstack": direction === "column",
+            "navds-hstack": direction === "row",
+          })}
+        />
+      );
+    }
+  );

@navikt/core/react/src/layout/stack/VStack.tsx

@@ -0,0 +1,30 @@
+import React, { forwardRef } from "react";
+import { OverridableComponent } from "../../util/OverridableComponent";
+import { StackProps, Stack } from "./Stack";
+
+export type VStackProps = Omit<StackProps, "direction" | "wrap">;
+
+/**
+ * Layout-primitive for vetical flexbox
+ *
+ * @see [📝 Documentation](https://aksel.nav.no/komponenter/core/Stack)
+ * @see 🏷️ {@link VStackProps}
+ * @see [🤖 OverridableComponent](https://aksel.nav.no/grunnleggende/kode/overridablecomponent) support
+ *
+ * @example
+ * <VStack gap="8">
+ *  <MyComponent />
+ *  <MyComponent />
+ * </VStack>
+ *
+ * @example
+ * // Responsive gap
+ * <VStack gap={{xs: "2", md: "6"}}>
+ *  <MyComponent />
+ *  <MyComponent />
+ * </VStack>
+ */
+export const VStack: OverridableComponent<VStackProps, HTMLDivElement> =
+  forwardRef((props, ref) => {
+    return <Stack {...props} ref={ref} direction="column" wrap={false} />;
+  });

@navikt/core/react/src/layout/stack/index.ts

@@ -0,0 +1,3 @@
+export { HStack, type HStackProps } from "./HStack";
+export { VStack, type VStackProps } from "./VStack";
+export { Spacer } from "./Spacer";

@navikt/core/react/src/layout/stack/stack.stories.tsx

@@ -0,0 +1,161 @@
+import React from "react";
+import type { Meta } from "@storybook/react";
+import { HStack, VStack, Spacer } from ".";
+
+export default {
+  title: "ds-react/Stack",
+  component: HStack,
+} satisfies Meta<typeof HStack>;
+
+export const Horizontal = {
+  render: () => (
+    <HStack gap="4">
+      <Placeholders count={4} />
+    </HStack>
+  ),
+};
+
+export const Spacing = {
+  render: () => (
+    <div style={{ height: "80vh", display: "flex" }}>
+      <VStack gap="8">
+        <Spacer />
+        <HStack gap="4">
+          <Placeholders count={1} />
+          <Spacer />
+          <Placeholders count={1} />
+        </HStack>
+        <HStack gap="4">
+          <Placeholders count={1} />
+          <Placeholders count={1} />
+        </HStack>
+        <HStack gap="4">
+          <Placeholders count={2} />
+        </HStack>
+      </VStack>
+    </div>
+  ),
+  parameters: {
+    layout: "fullscreen",
+  },
+};
+
+export const Vertical = {
+  render: () => (
+    <VStack gap="4">
+      <Placeholders count={4} />
+    </VStack>
+  ),
+};
+
+export const VerticalDemo = {
+  render: () => (
+    <VStack gap="2">
+      <VStack>
+        <Placeholders count={4} />
+      </VStack>
+      <Placeholders count={4} />
+      <VStack>
+        <Placeholders count={4} />
+      </VStack>
+    </VStack>
+  ),
+};
+
+export const VerticalAlign = {
+  render: () => (
+    <VStack gap="4">
+      <VStack align="start">
+        <Placeholders count={2} />
+      </VStack>
+      <VStack align="center">
+        <Placeholders count={2} />
+      </VStack>
+      <VStack align="end">
+        <Placeholders count={2} />
+      </VStack>
+    </VStack>
+  ),
+  parameters: {
+    layout: "fullscreen",
+  },
+};
+
+export const OverrideComponent = {
+  render: () => (
+    <VStack gap="4" as="form" onSubmit={(e) => e.preventDefault()}>
+      <Placeholders count={4} />
+    </VStack>
+  ),
+};
+
+export const Responsive = {
+  render: () => (
+    <VStack gap={{ xs: "1", sm: "3", md: "6", lg: "10", xl: "16" }}>
+      <Placeholders count={4} />
+    </VStack>
+  ),
+};
+
+export const Nested = {
+  render: () => (
+    <VStack gap="16">
+      <Placeholders count={2}>
+        <VStack gap="4">
+          <Placeholders count={2} color="gray" />
+        </VStack>
+      </Placeholders>
+    </VStack>
+  ),
+};
+
+export const DividerDemo = {
+  render: () => (
+    <div style={{ height: "80vh", width: "40rem" }}>
+      <VStack gap={{ xs: "2", md: "6", lg: "12" }}>
+        <HStack gap={{ xs: "2", md: "6", lg: "12" }}>
+          <Placeholders count={1} />
+          <Spacer />
+          <Placeholders count={1} />
+        </HStack>
+        <hr
+          style={{
+            border: "none",
+            borderBottom: "1px solid var(--a-border-divider)",
+            margin: 0,
+          }}
+        />
+        <HStack gap={{ xs: "2", md: "6", lg: "12" }}>
+          <Placeholders count={2} />
+        </HStack>
+      </VStack>
+    </div>
+  ),
+};
+
+function Placeholders({
+  count,
+  children,
+  color,
+}: {
+  count: number;
+  children?: React.ReactNode;
+  color?: string;
+}) {
+  return (
+    <>
+      {Array.from({ length: count }, (_, i) => (
+        <div
+          key={i}
+          style={{
+            backgroundColor: color ?? "var(--a-purple-200)",
+            height: children ? "" : "3rem",
+            width: children ? "" : "3rem",
+          }}
+        >
+          {children}
+        </div>
+      ))}
+    </>
+  );
+}

@navikt/core/react/src/layout/utilities/css.ts

@@ -0,0 +1,56 @@
+export type BreakpointsAlias = "xs" | "sm" | "md" | "lg" | "xl";
+export type SpacingScale =
+  | "0"
+  | "05"
+  | "1"
+  | "2"
+  | "3"
+  | "4"
+  | "5"
+  | "6"
+  | "7"
+  | "8"
+  | "9"
+  | "10"
+  | "11"
+  | "12"
+  | "14"
+  | "16"
+  | "18"
+  | "20"
+  | "24"
+  | "32";
+
+export type ResponsiveProp<T> =
+  | T
+  | {
+      // eslint-disable-next-line no-unused-vars
+      [Breakpoint in BreakpointsAlias]?: T;
+    };
+
+export function getResponsiveProps(
+  componentName: string,
+  componentProp: string,
+  tokenSubgroup: string,
+  responsiveProp?:
+    | string
+    | {
+        // eslint-disable-next-line no-unused-vars
+        [Breakpoint in BreakpointsAlias]?: string;
+      }
+) {
+  if (!responsiveProp) return {};
+
+  if (typeof responsiveProp === "string") {
+    return {
+      [`--ac-${componentName}-${componentProp}-xs`]: `var(--a-${tokenSubgroup}-${responsiveProp})`,
+    };
+  }
+
+  return Object.fromEntries(
+    Object.entries(responsiveProp).map(([breakpointAlias, aliasOrScale]) => [
+      `--ac-${componentName}-${componentProp}-${breakpointAlias}`,
+      `var(--a-${tokenSubgroup}-${aliasOrScale})`,
+    ])
+  );
+}

@navikt/core/react/src/loader/Loader.tsx

@@ -5,7 +5,7 @@ import { useId } from "..";
 export interface LoaderProps extends SVGProps<SVGSVGElement> {
   /**
    * Changes Loader width/height
-   * 64px | 40px | 32px | 24px | 20px | 16px
+   * 88px | 64px | 40px | 32px | 24px | 20px | 16px
    * @default "medium"
    */
   size?:

@navikt/core/react/src/stepper/Stepper.tsx

@@ -114,7 +114,15 @@ export const Stepper: StepperComponent = forwardRef<
           {React.Children.map(children, (step, index) => {
             return (
               <li
-                className={cl("navds-stepper__item")}
+                className={cl("navds-stepper__item", {
+                  "navds-stepper__item--behind": activeStep > index,
+                  "navds-stepper__item--completed":
+                    React.isValidElement<StepperStepProps>(step) &&
+                    step?.props?.completed,
+                  "navds-stepper__item--non-interactive":
+                    React.isValidElement<StepperStepProps>(step) &&
+                    !(step?.props?.interactive ?? interactive),
+                })}
                 key={index + (children?.toString?.() ?? "")}
               >
                 <span className="navds-stepper__line navds-stepper__line--1" />

@navikt/core/react/src/stepper/stepper.stories.tsx

@@ -11,8 +11,8 @@ export default {
     orientation: {
       control: {
         type: "radio",
-        options: ["horizontal", "vertical"],
       },
+      options: ["horizontal", "vertical"],
     },
     activeStep: {
       control: {

@navikt/core/react/src/table/ExpandableRow.tsx

@@ -31,10 +31,15 @@ export interface ExpandableRowProps extends Omit<RowProps, "content"> {
    */
   onOpenChange?: (open: boolean) => void;
   /**
-   * Disable expansio
+   * Disable expansion. shadeOnHover will not be visible.
    * @default false
    */
   expansionDisabled?: boolean;
+  /**
+   * Makes the whole row clickable
+   * @default false
+   */
+  expandOnRowClick?: boolean;
   /**
    * The width of the expanded row's internal cell
    * @default 999
@@ -58,6 +63,7 @@ export const ExpandableRow: ExpandableRowType = forwardRef(
       open,
       onOpenChange,
       expansionDisabled = false,
+      expandOnRowClick = false,
       colSpan = 999,
       ...rest
     },
@@ -65,9 +71,22 @@ export const ExpandableRow: ExpandableRowType = forwardRef(
   ) => {
     const [internalOpen, setInternalOpen] = useState<boolean>(defaultOpen);
     const id = useId();
-
     const isOpen = open ?? internalOpen;
 
+    const expansionHandler = (e) => {
+      onOpenChange?.(!isOpen);
+      if (open === undefined) {
+        setInternalOpen((open) => !open);
+      }
+      e.stopPropagation();
+    };
+
+    const onRowClick = (e) => {
+      if (e.target.nodeName === "TD" || e.target.nodeName === "TH") {
+        expansionHandler(e);
+      }
+    };
+
     return (
       <>
         <Row
@@ -75,7 +94,13 @@ export const ExpandableRow: ExpandableRowType = forwardRef(
           ref={ref}
           className={cl("navds-table__expandable-row", className, {
             "navds-table__expandable-row--open": isOpen,
+            "navds-table__expandable-row--expansion-disabled":
+              expansionDisabled,
           })}
+          onClick={(e) => {
+            !expansionDisabled && expandOnRowClick && onRowClick(e);
+            rest?.onClick?.(e);
+          }}
         >
           {togglePlacement === "right" && children}
           <DataCell
@@ -89,12 +114,7 @@ export const ExpandableRow: ExpandableRowType = forwardRef(
                 className="navds-table__toggle-expand-button"
                 aria-controls={id}
                 aria-expanded={isOpen}
-                onClick={() => {
-                  onOpenChange?.(!isOpen);
-                  if (open === undefined) {
-                    setInternalOpen((open) => !open);
-                  }
-                }}
+                onClick={expansionHandler}
               >
                 <ChevronDownIcon
                   className="navds-table__expandable-icon"

@navikt/core/react/src/table/stories/table-expandable.stories.tsx

@@ -1,6 +1,6 @@
 import React, { useState } from "react";
 import { Table } from "..";
-import { Link } from "../..";
+import { Button, Checkbox, Link } from "../..";
 
 export default {
   title: "ds-react/Table",
@@ -37,6 +37,7 @@ export const Expandable = () => {
 };
 
 export const ExpandableSmall = () => {
+  // eslint-disable-next-line react-hooks/rules-of-hooks
   const [open, setOpen] = useState(false);
   return (
     <Table size="small">
@@ -227,3 +228,63 @@ export const ExpandableOpen = () => {
     </Table>
   );
 };
+
+export const ClickableRow = {
+  render: () => {
+    // eslint-disable-next-line react-hooks/rules-of-hooks
+    const [isRowOpen1, setIsRowOpen1] = useState(false);
+    // eslint-disable-next-line react-hooks/rules-of-hooks
+    const [isRowOpen2, setIsRowOpen2] = useState(false);
+
+    return (
+      <>
+        <Table zebraStripes>
+          <Table.Header>
+            <Table.Row>
+              <Table.HeaderCell>Navn</Table.HeaderCell>
+              <Table.HeaderCell>Info</Table.HeaderCell>
+              <Table.HeaderCell aria-hidden />
+            </Table.Row>
+          </Table.Header>
+          <Table.Body>
+            <Table.ExpandableRow
+              content={<div>placeholder row 1</div>}
+              togglePlacement="right"
+              onOpenChange={setIsRowOpen1}
+              data-testid="row1"
+              open={isRowOpen1}
+              expandOnRowClick
+            >
+              <Table.DataCell>Ola</Table.DataCell>
+              <Table.DataCell>
+                <Button
+                  size="xsmall"
+                  onClick={(e) => {
+                    alert("Mer info");
+                  }}
+                >
+                  Mer info
+                </Button>
+              </Table.DataCell>
+            </Table.ExpandableRow>
+            <Table.ExpandableRow
+              content={<div>placeholder row 2</div>}
+              togglePlacement="right"
+              onOpenChange={setIsRowOpen2}
+              data-testid="row2"
+              open={isRowOpen2}
+              expandOnRowClick
+            >
+              <Table.DataCell>Hans</Table.DataCell>
+              <Table.DataCell>
+                <Checkbox hideLabel size="small">
+                  Sett
+                </Checkbox>
+              </Table.DataCell>
+            </Table.ExpandableRow>
+          </Table.Body>
+        </Table>
+      </>
+    );
+  },
+};

@navikt/core/react/src/timeline/AxisLabels.tsx

@@ -19,13 +19,14 @@ import React from "react";
 import { useTimelineContext } from "./hooks/useTimelineContext";
 import { isVisible } from "./utils";
 import { horizontalPositionAndWidth } from "./utils/calc";
-import { AxisLabel } from "./utils/types.external";
+import { AxisLabel, AxisLabelTemplates } from "./utils/types.external";
 
 export const dayLabels = (
   start: Date,
   end: Date,
   totalDays: number,
-  direction: "left" | "right"
+  direction: "left" | "right",
+  template: string = "dd.MM"
 ): AxisLabel[] => {
   const increment = Math.ceil(totalDays / 10);
   const lastDay = startOfDay(end);
@@ -43,7 +44,7 @@ export const dayLabels = (
       return {
         direction: direction,
         horizontalPosition: horizontalPosition,
-        label: format(day, "dd.MM", { locale: nbLocale }),
+        label: format(day, template, { locale: nbLocale }),
         date: day,
         width: width,
       };
@@ -54,7 +55,8 @@ export const dayLabels = (
 export const monthLabels = (
   start: Date,
   end: Date,
-  direction: "left" | "right"
+  direction: "left" | "right",
+  template: string = "MMM yy"
 ): AxisLabel[] => {
   const startMonth = startOfMonth(start);
   const endMonth = endOfMonth(end);
@@ -70,7 +72,7 @@ export const monthLabels = (
     return {
       direction: direction,
       horizontalPosition: horizontalPosition,
-      label: format(month, "MMM yy", { locale: nbLocale }),
+      label: format(month, template, { locale: nbLocale }),
       date: month,
       width: width,
     };
@@ -80,7 +82,8 @@ export const monthLabels = (
 export const yearLabels = (
   start: Date,
   end: Date,
-  direction: "left" | "right"
+  direction: "left" | "right",
+  template: string = "yyyy"
 ): AxisLabel[] => {
   const firstYear = startOfYear(start);
   const lastYear = endOfYear(end);
@@ -96,7 +99,7 @@ export const yearLabels = (
     return {
       direction: direction,
       horizontalPosition: horizontalPosition,
-      label: year.getFullYear().toString(),
+      label: format(year, template, { locale: nbLocale }),
       date: year,
       width: width,
     };
@@ -106,21 +109,28 @@ export const yearLabels = (
 const axisLabels = (
   start: Date,
   end: Date,
-  direction: "left" | "right"
+  direction: "left" | "right",
+  templates?: AxisLabelTemplates
 ): AxisLabel[] => {
   const totalDays = differenceInDays(end, start);
   if (totalDays < 40) {
-    return dayLabels(start, end, totalDays, direction);
+    return dayLabels(start, end, totalDays, direction, templates?.day);
   } else if (totalDays < 370) {
-    return monthLabels(start, end, direction);
+    return monthLabels(start, end, direction, templates?.month);
   } else {
-    return yearLabels(start, end, direction);
+    return yearLabels(start, end, direction, templates?.year);
   }
 };
 
-export const AxisLabels = () => {
+export const AxisLabels = ({
+  templates,
+}: {
+  templates?: AxisLabelTemplates;
+}) => {
   const { endDate, startDate, direction } = useTimelineContext();
-  const labels = axisLabels(startDate, endDate, direction).filter(isVisible);
+  const labels = axisLabels(startDate, endDate, direction, templates).filter(
+    isVisible
+  );
 
   return (
     <div className="navds-timeline__axislabels" aria-hidden="true">

@navikt/core/react/src/timeline/Timeline.tsx

@@ -13,6 +13,7 @@ import Pin, { PinType } from "./Pin";
 import TimelineRow, { TimelineRowType } from "./TimelineRow";
 import { parseRows } from "./utils/timeline";
 import Zoom, { ZoomType } from "./zoom";
+import { AxisLabelTemplates } from "./utils/types.external";
 
 export interface TimelineProps extends React.HTMLAttributes<HTMLDivElement> {
   children: React.ReactNode;
@@ -33,6 +34,11 @@ export interface TimelineProps extends React.HTMLAttributes<HTMLDivElement> {
    * @default "left"
    */
   direction?: "left" | "right";
+  /**
+   * Templates for label texts. The templates are passed to the date-fns `format` function.
+   * Defaults to { day: "dd.MM", month: "MMM yy", year: "yyyy" }.
+   */
+  axisLabelTemplates?: AxisLabelTemplates;
 }
 
 interface TimelineComponent
@@ -74,7 +80,17 @@ interface TimelineComponent
  * ```
  */
 export const Timeline = forwardRef<HTMLDivElement, TimelineProps>(
-  ({ children, startDate, endDate, direction = "left", ...rest }, ref) => {
+  (
+    {
+      children,
+      startDate,
+      endDate,
+      direction = "left",
+      axisLabelTemplates,
+      ...rest
+    },
+    ref
+  ) => {
     const isMultipleRows = Array.isArray(children);
 
     const firstFocusabled = useRef<
@@ -194,7 +210,7 @@ export const Timeline = forwardRef<HTMLDivElement, TimelineProps>(
       >
         <div {...rest} ref={ref}>
           <div className="navds-timeline">
-            <AxisLabels />
+            <AxisLabels templates={axisLabelTemplates} />
 
             {pins.map((pin) => {
               return pin;

@navikt/core/react/src/timeline/utils/types.external.ts

@@ -65,3 +65,9 @@ export interface SimplePeriod {
    */
   end: Date;
 }
+
+export type AxisLabelTemplates = {
+  day?: string;
+  month?: string;
+  year?: string;
+};

@navikt/core/react/src/util/usePrevious.ts

@@ -0,0 +1,19 @@
+import { useEffect, useRef } from "react";
+
+/*
+ * usePrevious hook
+ * The ref object's "current" property is mutable and when changed wont re-render the component
+ * meaning it can be used to stay "one render behind" the current state
+ * https://usehooks.com/usePrevious/
+ * https://blog.logrocket.com/accessing-previous-props-state-react-hooks/
+ */
+
+const usePrevious = <T>(value: T): T | undefined => {
+  const ref = useRef<T>(value);
+  useEffect(() => {
+    ref.current = value;
+  }, [value]);
+  return ref.current;
+};
+
+export default usePrevious;

@navikt/core/tailwind/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @navikt/ds-tailwind
 
+## 4.9.1
+
+## 4.9.0
+
+## 4.8.0
+
+## 4.7.4
+
+## 4.7.3
+
+## 4.7.2
+
+## 4.7.1
+
+## 4.7.0
+
 ## 4.6.1
 
 ## 4.6.0

@navikt/core/tailwind/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@navikt/ds-tailwind",
-  "version": "4.6.1",
+  "version": "4.9.1",
   "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": "^4.6.1",
+    "@navikt/ds-tokens": "^4.9.1",
     "@types/jest": "^29.0.0",
     "color": "4.2.3",
     "jest": "^29.0.0",

@navikt/core/tokens/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @navikt/ds-tokens
 
+## 4.9.1
+
+## 4.9.0
+
+## 4.8.0
+
+## 4.7.4
+
+## 4.7.3
+
+## 4.7.2
+
+## 4.7.1
+
+## 4.7.0
+
 ## 4.6.1
 
 ## 4.6.0

@navikt/core/tokens/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@navikt/ds-tokens",
-  "version": "4.6.1",
+  "version": "4.9.1",
   "description": "Design-tokens for NAV designsystem",
   "author": "Aksel | NAV designsystem team",
   "keywords": [
@@ -33,7 +33,7 @@
     "color": "4.2.3",
     "jest": "^29.0.0",
     "lodash": "^4.17.21",
-    "nodemon": "^2.0.12",
+    "nodemon": "^3.0.1",
     "style-dictionary": "^3.0.2",
     "ts-jest": "^29.0.0",
     "ts-node": "10.9.0",

CHANGELOG.md

@@ -1,30 +1,106 @@
 # Changelog
 
-## 4.6.1
+## 4.9.1
+
+### @navikt/ds-css
+
+- Tweaks to combobox - updated example, small bugfixes, better affordance for selected options and added flag for "isAddedByUser" to onToggleSelected ([#2144](https://github.com/navikt/aksel/pull/2144))
 
 ### @navikt/ds-react
 
-- Skjema: Labels og Legends bruker nå inline-flex når readOnly er satt ([#2089](https://github.com/navikt/aksel/pull/2089))
+- Button: Fikset aria-live bug der knapp alltid ble lest opp av skjermleser ved render ([#2143](https://github.com/navikt/aksel/pull/2143))
+
+- Tweaks to combobox - updated example, small bugfixes, better affordance for selected options and added flag for "isAddedByUser" to onToggleSelected ([#2144](https://github.com/navikt/aksel/pull/2144))
+
+## 4.9.0
 
 ### @navikt/ds-css
 
+- Table: ExpandableRow kan nå åpnes med 'expandOnRowClick'-prop ([#2127](https://github.com/navikt/aksel/pull/2127))
+
+### @navikt/ds-react
+
+- Table: ExpandableRow kan nå åpnes med 'expandOnRowClick'-prop ([#2127](https://github.com/navikt/aksel/pull/2127))
+
+## 4.8.0
+
+### @navikt/ds-css
+
+- Nye komponenter `VStack`, `HStack` og `Spacer` for å enklere kunne lage layout med flexbox og spacing-variabler. ([#2040](https://github.com/navikt/aksel/pull/2040))
+
+### @navikt/ds-react
+
+- Nye komponenter `VStack`, `HStack` og `Spacer` for å enklere kunne lage layout med flexbox og spacing-variabler. ([#2040](https://github.com/navikt/aksel/pull/2040))
+
+## 4.7.4
+
+### @navikt/ds-css
+
+- Oppdatert bruk av REM i komponenter for forbedret utrykk ved font-scaling i browser ([#2126](https://github.com/navikt/aksel/pull/2126))
+
+### @navikt/ds-react
+
+- Textfield: La til type 'time' som tilgjengelig option ([#2137](https://github.com/navikt/aksel/pull/2137))
+
+## 4.7.3
+
+### @navikt/ds-react
+
+- Chips: Removable Chips submitter ikke forms ved klikk lengre ([#2124](https://github.com/navikt/aksel/pull/2124))
+
+## 4.7.2
+
+### @navikt/ds-css
+
+- Stepper: Fikset `hotizontal`-bug når step var `completed` ([#2116](https://github.com/navikt/aksel/pull/2116))
+
+### @navikt/ds-react
+
+- Stepper: Fikset `hotizontal`-bug når step var `completed` ([#2116](https://github.com/navikt/aksel/pull/2116))
+
+## 4.7.1
+
+### @navikt/ds-react
+
+- Datepicker: Fikset bug ved bruk dynamisk oppdatering av minDate. Vist `month` vil nå alltid være oppdatert når datepicker åpnes ([#2117](https://github.com/navikt/aksel/pull/2117))
+
+## 4.7.0
+
+### @navikt/ds-css
+
+- Ny komponent Combobox! ([#1868](https://github.com/navikt/aksel/pull/1868))
+
+### @navikt/ds-react
+
+- Ny komponent Combobox! ([#1868](https://github.com/navikt/aksel/pull/1868))
+
+<!---->
+
+- Timeline: Har nå egen `axisLabelTemplates`-prop for axixlabel formatering ([#2109](https://github.com/navikt/aksel/pull/2109))
+
+- Combobox post-release tweaks ([#2112](https://github.com/navikt/aksel/pull/2112))
+
+## 4.6.1
+
+### @navikt/ds-css
+
+- Skjema: Labels og Legends bruker nå inline-flex når readOnly er satt ([#2089](https://github.com/navikt/aksel/pull/2089))
+
+### @navikt/ds-react
+
 - Skjema: Labels og Legends bruker nå inline-flex når readOnly er satt ([#2089](https://github.com/navikt/aksel/pull/2089))
 
 ## 4.6.0
 
-### @navikt/ds-react
-
-- Skjema: De fleste skjemakomponenter støtter nå `readOnly`-state ([#2080](https://github.com/navikt/aksel/pull/2080))
-
 ### @navikt/ds-css
 
 - Skjema: De fleste skjemakomponenter har nå styling for `readOnly`-state ([#2080](https://github.com/navikt/aksel/pull/2080))
 
-## 4.5.0
-
 ### @navikt/ds-react
 
-- - Alert: La til `closeButton`-prop ([#2079](https://github.com/navikt/aksel/pull/2079))
+- Skjema: De fleste skjemakomponenter støtter nå `readOnly`-state ([#2080](https://github.com/navikt/aksel/pull/2080))
+
+## 4.5.0
 
 ### @navikt/ds-css
 
@@ -34,6 +110,10 @@
 
 - - Button: Fikset outline-bug i tertiary-variant ved `:active`-state ([#2079](https://github.com/navikt/aksel/pull/2079))
 
+### @navikt/ds-react
+
+- - Alert: La til `closeButton`-prop ([#2079](https://github.com/navikt/aksel/pull/2079))
+
 ## 4.4.2
 
 ### @navikt/ds-react
@@ -48,29 +128,25 @@
 
 ## 4.4.0
 
+### @navikt/ds-tokens
+
+- Shadow-tokens er oppdatert til mer tydeligere varianter ([PR](https://github.com/navikt/aksel/pull/2041))
+
 ### @navikt/ds-tailwind
 
 - Shadow-tokens er oppdatert ([PR](https://github.com/navikt/aksel/pull/2041))
 
 - Oppdatert text-subtle og icon-subtle tokens til 700-skala (tidligere 600). ([PR](https://github.com/navikt/aksel/pull/2036))
 
-### @navikt/ds-react
-
-- Fikset klassenavn brukt for popover i Datepicker og Monthpicker ([PR](https://github.com/navikt/aksel/pull/2041))
-
-### @navikt/ds-tokens
-
-- Shadow-tokens er oppdatert til mer tydeligere varianter ([PR](https://github.com/navikt/aksel/pull/2041))
-
 ### @navikt/ds-css
 
 - Shadow-tokens er oppdatert: Datepicker har nå ikke border, Modal bruker shadow-xlarge, LinkCard bruker shadow-xsmall ([PR](https://github.com/navikt/aksel/pull/2041))
 
-## 4.3.0
-
 ### @navikt/ds-react
 
-- Popover og Helptext har nå luft mot siden av skjerm på mindre flater ([PR](https://github.com/navikt/aksel/pull/2069))
+- Fikset klassenavn brukt for popover i Datepicker og Monthpicker ([PR](https://github.com/navikt/aksel/pull/2041))
+
+## 4.3.0
 
 ### @navikt/ds-css
 
@@ -80,16 +156,20 @@
 
 - ExpansionCard: Ved nesting av komponetene fikk man styling fra parent ([PR](https://github.com/navikt/aksel/pull/2067))
 
-## 4.2.0
-
 ### @navikt/ds-react
 
-- Oppdatert Chat: `size` og `variant`-prop, optional `avatar`, uu og ui-forbedringer ([PR](https://github.com/navikt/aksel/pull/2048))
+- Popover og Helptext har nå luft mot siden av skjerm på mindre flater ([PR](https://github.com/navikt/aksel/pull/2069))
+
+## 4.2.0
 
 ### @navikt/ds-css
 
 - Chat: `small`-size, innebygde varianter for farge og oppdatert utseende. ([PR](https://github.com/navikt/aksel/pull/2048))
 
+### @navikt/ds-react
+
+- Oppdatert Chat: `size` og `variant`-prop, optional `avatar`, uu og ui-forbedringer ([PR](https://github.com/navikt/aksel/pull/2048))
+
 ## 4.1.7
 
 ### @navikt/ds-react
@@ -142,10 +222,26 @@
 
 ## 4.1.0
 
+### @navikt/aksel-stylelint
+
+- Deprecated klassenavn `navds-chips--icon-left` ([PR](https://github.com/navikt/aksel/pull/2035))
+
+### @navikt/ds-tokens
+
+- :tada: Fargetokens for datavisualisering. ([PR](https://github.com/navikt/aksel/pull/2032))
+
+- Oppdatert text-subtle og icon-subtle tokens til 700-skala (tidligere 600). ([PR](https://github.com/navikt/aksel/pull/2036))
+
 ### @navikt/ds-tailwind
 
 - :tada: Fargetokens for datavisualisering. ([PR](https://github.com/navikt/aksel/pull/2032))
 
+### @navikt/ds-css
+
+- Chips: `neutral` og `action`-varianter av Chips.Toggle. Opt-out mulighet for Checkmark. Oppdatert checkmark-ikon ([PR](https://github.com/navikt/aksel/pull/2035))
+
+- Alle description-felter på fieldsets har nå `text-subtle` som farge. ([PR](https://github.com/navikt/aksel/pull/2036))
+
 ### @navikt/ds-react
 
 - Chips: `neutral` og `action`-varianter for Chips.Toggle. `checkmark`-prop for Chips.Toggle ([PR](https://github.com/navikt/aksel/pull/2035))
@@ -158,29 +254,13 @@
 
 - Accordion: La til `indent`-prop ([PR](https://github.com/navikt/aksel/pull/2027))
 
-### @navikt/ds-tokens
-
-- :tada: Fargetokens for datavisualisering. ([PR](https://github.com/navikt/aksel/pull/2032))
-
-- Oppdatert text-subtle og icon-subtle tokens til 700-skala (tidligere 600). ([PR](https://github.com/navikt/aksel/pull/2036))
-
-### @navikt/ds-css
-
-- Chips: `neutral` og `action`-varianter av Chips.Toggle. Opt-out mulighet for Checkmark. Oppdatert checkmark-ikon ([PR](https://github.com/navikt/aksel/pull/2035))
-
-- Alle description-felter på fieldsets har nå `text-subtle` som farge. ([PR](https://github.com/navikt/aksel/pull/2036))
-
-### @navikt/aksel-stylelint
-
-- Deprecated klassenavn `navds-chips--icon-left` ([PR](https://github.com/navikt/aksel/pull/2035))
-
 ## 4.0.0
 
-### @navikt/ds-react
+### @navikt/aksel
 
-- Datepicker og Monthpicker er ute av beta. [Guide](https://aksel.nav.no/grunnleggende/kode/migrering#h4ef68ae743b0) ([PR](https://github.com/navikt/aksel/pull/2026))
+- Codemod for migrering av Datepicker/Monthpicker ut av Beta. `npx @navikt/aksel codemod v4-date` ([PR](https://github.com/navikt/aksel/pull/2026))
 
-- Komponenter i `@navikt/ds-react-internal` er flyttet over til `@navikt/ds-react`. [Guide](https://aksel.nav.no/grunnleggende/kode/migrering#h3b8538e1981d) ([PR](https://github.com/navikt/aksel/pull/2026))
+- Codemods for migrering fra `@navikt/ds-react-internal` til `@navikt/ds-react` [Guide](https://aksel.nav.no/grunnleggende/kode/migrering#h3b8538e1981d) ([PR](https://github.com/navikt/aksel/pull/2026))
 
 ### @navikt/ds-css
 
@@ -192,11 +272,11 @@
 
 - Styling for flyttede komponenter finnes nå på CDN [Guide](https://aksel.nav.no/grunnleggende/kode/css-import)
 
-### @navikt/aksel
+### @navikt/ds-react
 
-- Codemod for migrering av Datepicker/Monthpicker ut av Beta. `npx @navikt/aksel codemod v4-date` ([PR](https://github.com/navikt/aksel/pull/2026))
+- Datepicker og Monthpicker er ute av beta. [Guide](https://aksel.nav.no/grunnleggende/kode/migrering#h4ef68ae743b0) ([PR](https://github.com/navikt/aksel/pull/2026))
 
-- Codemods for migrering fra `@navikt/ds-react-internal` til `@navikt/ds-react` [Guide](https://aksel.nav.no/grunnleggende/kode/migrering#h3b8538e1981d) ([PR](https://github.com/navikt/aksel/pull/2026))
+- Komponenter i `@navikt/ds-react-internal` er flyttet over til `@navikt/ds-react`. [Guide](https://aksel.nav.no/grunnleggende/kode/migrering#h3b8538e1981d) ([PR](https://github.com/navikt/aksel/pull/2026))
 
 ## 3.4.2
 
@@ -212,17 +292,17 @@
 
 ## 3.4.0
 
-### @navikt/ds-react
+### @navikt/aksel-stylelint
 
-- Tag: `moderate`-variant ([PR](https://github.com/navikt/aksel/pull/2010))
+- Stylelint-pakke for Aksel ([PR](https://github.com/navikt/aksel/pull/1973))
 
 ### @navikt/ds-css
 
 - Tag: `moderate`-variant ([PR](https://github.com/navikt/aksel/pull/2010))
 
-### @navikt/aksel-stylelint
+### @navikt/ds-react
 
-- Stylelint-pakke for Aksel ([PR](https://github.com/navikt/aksel/pull/1973))
+- Tag: `moderate`-variant ([PR](https://github.com/navikt/aksel/pull/2010))
 
 ## 3.3.1
 
@@ -244,18 +324,18 @@
 
 ## 3.2.3
 
-### @navikt/ds-react
-
-- Datepicker: Oppdatert small-variant av Datepicker.Input. UI-oppdatert samtidig. ([PR](https://github.com/navikt/aksel/pull/1993))
-
-- CopyButton: `xsmall`-variant for bruk i tabeller ([PR](https://github.com/navikt/aksel/pull/1994))
-
 ### @navikt/ds-css
 
 - Datepicker: Fikset small-variant av datepicker-input. ([PR](https://github.com/navikt/aksel/pull/1993))
 
 - CopyButton: `xsmall`-size for bruk i tabeller ([PR](https://github.com/navikt/aksel/pull/1994))
 
+### @navikt/ds-react
+
+- Datepicker: Oppdatert small-variant av Datepicker.Input. UI-oppdatert samtidig. ([PR](https://github.com/navikt/aksel/pull/1993))
+
+- CopyButton: `xsmall`-variant for bruk i tabeller ([PR](https://github.com/navikt/aksel/pull/1994))
+
 ### @navikt/aksel-icons
 
 - Nye ikoner `FileParagraph` og `FilePlus` ([PR](https://github.com/navikt/aksel/pull/1998))
@@ -280,10 +360,6 @@
 
 ## 3.1.0
 
-### @navikt/ds-react
-
-- Oppdatert Label og Description spacing for alle skjemakomponenter ([PR](https://github.com/navikt/aksel/pull/1967))
-
 ### @navikt/ds-css
 
 - Alle komponenter bruker nå default `:focus-visible` for fokusmarkering. Medfølger også fallback for `:focus` ([PR](https://github.com/navikt/aksel/pull/1966))
@@ -292,6 +368,10 @@
 
 - Oppdatert Label og Description spacing for skjemakomponenter ([PR](https://github.com/navikt/aksel/pull/1967))
 
+### @navikt/ds-react
+
+- Oppdatert Label og Description spacing for alle skjemakomponenter ([PR](https://github.com/navikt/aksel/pull/1967))
+
 ## 3.0.1
 
 ### @navikt/ds-react
@@ -302,16 +382,16 @@
 
 ## 3.0.0
 
+### @navikt/ds-css
+
+- Accordion: Chevron er left-aligned, deler av styling er refaktorert, `size`-props og `neutral`-variant ([PR](https://github.com/navikt/aksel/pull/1964))
+
 ### @navikt/ds-react
 
 - Accordion: left-aligner chevron, `neutral`-variant, `size`-prop ([PR](https://github.com/navikt/aksel/pull/1964))
 
 - Bruker nå nå `@navikt/aksel-icons` for interne ikoner ([PR](https://github.com/navikt/aksel/pull/1964))
 
-### @navikt/ds-css
-
-- Accordion: Chevron er left-aligned, deler av styling er refaktorert, `size`-props og `neutral`-variant ([PR](https://github.com/navikt/aksel/pull/1964))
-
 ## 2.9.8
 
 ### @navikt/aksel-icons
@@ -406,14 +486,14 @@
 
 ## 2.8.7
 
-### @navikt/ds-react
-
-- Fikset typografi-bruk for `Radio` og `Checkbox`.
-
 ### @navikt/ds-css
 
 - Button: token for tertiary
 
+### @navikt/ds-react
+
+- Fikset typografi-bruk for `Radio` og `Checkbox`.
+
 ## 2.8.6
 
 ### @navikt/ds-css
@@ -442,14 +522,14 @@
 
 ## 2.8.2
 
-### @navikt/ds-react
-
-- ExpansioCard: Oppdatert typografibruk ([PR](https://github.com/navikt/aksel/pull/1870))
-
 ### @navikt/ds-css
 
 - ExpansioCard: Oppdatert typografi ([PR](https://github.com/navikt/aksel/pull/1870))
 
+### @navikt/ds-react
+
+- ExpansioCard: Oppdatert typografibruk ([PR](https://github.com/navikt/aksel/pull/1870))
+
 ## 2.8.1
 
 ### @navikt/ds-react
@@ -512,14 +592,14 @@
 
 ## 2.5.0
 
-### @navikt/ds-tailwind
-
-- Breakpoint-tokens er lagt til. Overskriver native tailwind-breakpoints ([PR](https://github.com/navikt/aksel/pull/1832))
-
 ### @navikt/ds-tokens
 
 - Breakpoint-tokens lagt til ([PR](https://github.com/navikt/aksel/pull/1832))
 
+### @navikt/ds-tailwind
+
+- Breakpoint-tokens er lagt til. Overskriver native tailwind-breakpoints ([PR](https://github.com/navikt/aksel/pull/1832))
+
 ## 2.4.3
 
 ### @navikt/ds-css
@@ -528,14 +608,14 @@
 
 ## 2.4.2
 
-### @navikt/ds-react
-
-- List: la til støtte for nestede lister ([PR](https://github.com/navikt/aksel/pull/1823))
-
 ### @navikt/ds-css
 
 - List: La til støtte for nesting ([PR](https://github.com/navikt/aksel/pull/1823))
 
+### @navikt/ds-react
+
+- List: la til støtte for nestede lister ([PR](https://github.com/navikt/aksel/pull/1823))
+
 ## 2.4.1
 
 ### @navikt/ds-react
@@ -566,12 +646,6 @@
 
 ## 2.2.0
 
-### @navikt/ds-react
-
-- ToggleGroup: `neutral`-variant ([PR](https://github.com/navikt/aksel/pull/1789))
-
-- Button: `neutral`-variant ([PR](https://github.com/navikt/aksel/pull/1789))
-
 ### @navikt/ds-tokens
 
 - Justeringer av semantiske fargetokens, statusfarger nå mer tydelig ([PR](https://github.com/navikt/aksel/pull/1787))
@@ -584,6 +658,12 @@
 
 - Button: `Neutral`-variant.
 
+### @navikt/ds-react
+
+- ToggleGroup: `neutral`-variant ([PR](https://github.com/navikt/aksel/pull/1789))
+
+- Button: `neutral`-variant ([PR](https://github.com/navikt/aksel/pull/1789))
+
 ## 2.1.7
 
 ### @navikt/ds-react
@@ -628,14 +708,14 @@
 
 ## 2.1.0
 
-### @navikt/ds-react
-
-- Datepicker/Monthpicker: år med 2 siffer i input fungerer nå
-
 ### @navikt/ds-tokens
 
 - Fikset feil danger-hover token ([PR](https://github.com/navikt/aksel/pull/1665))
 
+### @navikt/ds-react
+
+- Datepicker/Monthpicker: år med 2 siffer i input fungerer nå
+
 ## 2.0.18
 
 ### @navikt/ds-react
@@ -698,15 +778,11 @@
 
 ## 2.0.0
 
-### @navikt/ds-tailwind
+### @navikt/ds-tokens
 
 - Alle token er oppdatert til nytt format. ([Guide](https://aksel.nav.no/grunnleggende/kode/migrering#h76f47744d112))
 
-### @navikt/ds-react
-
-- Fonter blir bruk i all typografi blir nå lastet fra CDN
-
-### @navikt/ds-tokens
+### @navikt/ds-tailwind
 
 - Alle token er oppdatert til nytt format. ([Guide](https://aksel.nav.no/grunnleggende/kode/migrering#h76f47744d112))
 
@@ -716,6 +792,10 @@
 
 - Tokens: Alle komponenter bruker nå semantiske tokens for som standard, med innebygd støtte for komponent-spesifikke tokens.
 
+### @navikt/ds-react
+
+- Fonter blir bruk i all typografi blir nå lastet fra CDN
+
 ## 1.5.10
 
 ### @navikt/ds-react
@@ -760,16 +840,16 @@
 
 ## 1.5.0
 
+### @navikt/ds-css
+
+- Tag: `filled`-varianter ([PR](https://github.com/navikt/aksel/pull/1684))
+
 ### @navikt/ds-react
 
 - Tag: `filles`-varianter ([PR](https://github.com/navikt/aksel/pull/1684))
 
 - Ny komponent Chips! ([PR](https://github.com/navikt/aksel/pull/1668))
 
-### @navikt/ds-css
-
-- Tag: `filled`-varianter ([PR](https://github.com/navikt/aksel/pull/1684))
-
 ## 1.4.4
 
 ### @navikt/ds-react
@@ -796,6 +876,10 @@
 
 ## 1.3.39
 
+### @navikt/ds-css
+
+- Fikset bruk av `:watch` for diverse parsere (less, parcel)
+
 ### @navikt/ds-react
 
 - useId-bug fikset ved bruk i både react 17 og 18
@@ -818,10 +902,6 @@
 
 - Stepper: `interactive` og `completed`-props for wizard-løsninger
 
-### @navikt/ds-css
-
-- Fikset bruk av `:watch` for diverse parsere (less, parcel)
-
 ## 1.3.24
 
 ### @navikt/ds-css

aksel.nav.no/package.json

@@ -15,11 +15,11 @@
     "website"
   ],
   "dependencies": {
-    "@navikt/aksel-icons": "^4.6.1",
-    "@navikt/ds-css": "^4.6.1",
-    "@navikt/ds-react": "^4.6.1",
-    "@navikt/ds-tailwind": "^4.6.1",
-    "@navikt/ds-tokens": "^4.6.1"
+    "@navikt/aksel-icons": "^4.9.1",
+    "@navikt/ds-css": "^4.9.1",
+    "@navikt/ds-react": "^4.9.1",
+    "@navikt/ds-tailwind": "^4.9.1",
+    "@navikt/ds-tokens": "^4.9.1"
   },
   "devDependencies": {
     "prettier-plugin-tailwindcss": "^0.2.3"

aksel.nav.no/website/components/SanityBlockContent.tsx

@@ -1,4 +1,3 @@
-import { ExternalLinkIcon } from "@navikt/aksel-icons";
 import { BodyLong, Detail, Heading, Ingress, Link } from "@navikt/ds-react";
 import BlockContent from "@sanity/block-content-to-react";
 import cl from "clsx";
@@ -178,25 +177,11 @@ const serializers = {
       if (!href) {
         return children;
       }
-      if (href && href.startsWith("mailto:")) {
-        return (
-          <NextLink href={href} passHref legacyBehavior>
-            <Link
-              onClick={(e) =>
-                logNav(
-                  "link",
-                  window.location.pathname,
-                  e.currentTarget.getAttribute("href")
-                )
-              }
-              className="inline"
-            >
-              {children}
-            </Link>
-          </NextLink>
-        );
-      }
-      return blank ? (
+
+      const externalLink =
+        href.startsWith("http") && !href.startsWith("https://aksel.nav.no/");
+
+      return blank || externalLink ? (
         <Link
           href={href}
           target="_blank"
@@ -209,44 +194,46 @@ const serializers = {
             )
           }
         >
-          {children} <ExternalLinkIcon title="åpner lenken i ny fane" />
+          {children}
         </Link>
       ) : (
-        <NextLink href={href} passHref legacyBehavior>
-          <Link
-            onClick={(e) =>
-              logNav(
-                "link",
-                window.location.pathname,
-                e.currentTarget.getAttribute("href")
-              )
-            }
-            className="inline"
-          >
-            {children}
-          </Link>
-        </NextLink>
+        <Link
+          as={NextLink}
+          href={href}
+          onClick={(e) =>
+            logNav(
+              "link",
+              window.location.pathname,
+              e.currentTarget.getAttribute("href")
+            )
+          }
+          className="inline"
+        >
+          {children}
+        </Link>
       );
     },
     internalLink: ({ mark, children }: { mark: any; children: any }) => {
       const { slug = {} } = mark;
-      if (!slug || !slug.current) return children;
+      if (!slug || !slug.current) {
+        return children;
+      }
 
       const href = `/${slug?.current}`;
       return (
-        <NextLink href={href} passHref legacyBehavior>
-          <Link
-            onClick={(e) =>
-              logNav(
-                "link",
-                window.location.pathname,
-                e.currentTarget.getAttribute("href")
-              )
-            }
-          >
-            {children}
-          </Link>
-        </NextLink>
+        <Link
+          as={NextLink}
+          href={href}
+          onClick={(e) =>
+            logNav(
+              "link",
+              window.location.pathname,
+              e.currentTarget.getAttribute("href")
+            )
+          }
+        >
+          {children}
+        </Link>
       );
     },
   },

aksel.nav.no/website/components/WithPreview.tsx

@@ -1,25 +1,76 @@
-import { definePreview } from "next-sanity/preview";
+import { useLiveQuery } from "next-sanity/preview";
 import { ComponentType } from "react";
-import { clientConfig } from "@/sanity/config";
 
-const usePreview = definePreview({
-  ...clientConfig,
-  subscriptionThrottleMs: 200,
-});
+import { getClient } from "@/sanity/client.server";
+import { LiveQueryProvider } from "next-sanity/preview";
+import { useMemo } from "react";
+import dynamic from "next/dynamic";
+import { useCheckAuth } from "components/website-modules/utils/useCheckAuth";
 
-const WithPreview = ({
+export const PreviewBanner = dynamic(
+  () => import("components/website-modules/PreviewBanner"),
+  {
+    ssr: false,
+  }
+);
+
+function PreviewProvider({ children }: { children: React.ReactNode }) {
+  const client = useMemo(() => {
+    return getClient().withConfig({
+      useCdn: false,
+      ignoreBrowserTokenWarning: true,
+      perspective: "previewDrafts",
+    });
+  }, []);
+  return <LiveQueryProvider client={client}>{children}</LiveQueryProvider>;
+}
+
+function LiveQuery({
   comp: Comp,
   query,
   params,
   props,
+  validUser,
 }: {
   comp: ComponentType;
   query: string;
   props: any;
   params?: any;
+  validUser: boolean;
+}) {
+  const [data, loading] = useLiveQuery(props, query, params);
+
+  return (
+    <>
+      <PreviewBanner loading={loading} validUser={validUser} />
+      <Comp {...props} {...data} />
+    </>
+  );
+}
+
+const WithPreview = ({
+  comp,
+  query,
+  params,
+  props,
+}: {
+  comp;
+  query: string;
+  props: any;
+  params?: any;
 }) => {
-  const data = usePreview(null, query, params);
-  return <Comp {...props} {...data} />;
+  const validUser = useCheckAuth();
+  return (
+    <PreviewProvider>
+      <LiveQuery
+        props={props}
+        query={query}
+        params={params}
+        comp={comp}
+        validUser={validUser}
+      />
+    </PreviewProvider>
+  );
 };
 
 export default WithPreview;

aksel.nav.no/website/components/index.ts

@@ -20,6 +20,5 @@ export { default as Video } from "./sanity-modules/VideoEmbed";
 export * from "./website-modules/BreadCrumbs";
 export { default as Feedback } from "./website-modules/feedback";
 export * from "./website-modules/H2";
-export { default as PreviewBanner } from "./website-modules/PreviewBanner";
 export * from "./website-modules/TOC";
 export * from "./website-modules/utils";

aksel.nav.no/website/components/layout/WithSidebar.tsx

@@ -75,7 +75,7 @@ export const WithSidebar = ({
     <>
       <Header />
       <div className="bg-bg-default">
-        <div className="mx-auto mb-24 mt-6 flex w-full max-w-screen-2xl gap-6">
+        <div className="mx-auto mb-24 flex w-full max-w-screen-2xl gap-6 pt-6">
           <Sidebar kategori={pageType.type} links={sidebar} />
           <div className="relative w-full">
             <main

aksel.nav.no/website/components/layout/footer/Footer.tsx

@@ -2,8 +2,8 @@ import { BodyShort, Heading, Link } from "@navikt/ds-react";
 import { FigmaIcon, GithubIcon, SlackIcon } from "components/assets";
 import Logo from "components/assets/Logo";
 import { logNav } from "components/website-modules/utils/amplitude";
-import FooterForm from "./FooterForm";
 import dynamic from "next/dynamic";
+/* import FooterForm from "./FooterForm"; */
 
 export const EditButton = dynamic(
   () => import("components/website-modules/EditButton"),
@@ -12,6 +12,7 @@ export const EditButton = dynamic(
   }
 );
 
+/* FooterForm is disabled to better comply with policy */
 const Footer = () => {
   return (
     <footer
@@ -20,14 +21,13 @@ const Footer = () => {
       data-theme="dark"
       className="toc-ignore text-text-on-inverted bg-deepblue-800 relative flex w-full justify-center"
     >
-      <div className="relative z-10 mx-auto grid w-full max-w-screen-2xl gap-12 px-4 pb-16 pt-12 md:grid-cols-2 md:px-6 lg:grid-cols-4 xl:grid-cols-5 xl:gap-6">
+      <div className="relative z-10 mx-auto grid w-full max-w-screen-2xl gap-12 px-4 pb-16 pt-12 md:grid-cols-2 md:px-6 lg:grid-cols-4 xl:grid-cols-4 xl:gap-6">
         <LogoBlock />
         <Snarveier />
         <SideLenker />
         <Kontakt />
-        <FooterForm />
+        {/* <FooterForm /> */}
       </div>
-
       <EditButton />
     </footer>
   );

aksel.nav.no/website/components/website-modules/PreviewBanner.tsx

@@ -1,15 +1,13 @@
-/**
- * https://github.com/navikt/detsombetyrnoe/blob/main/src/components/PreviewBanner.tsx#L17
- */
 import { BodyShort, Button } from "@navikt/ds-react";
-import { useCheckAuth } from "components/website-modules/utils/useCheckAuth";
 import Link from "next/link";
-import { useRouter } from "next/router";
-
-function PreviewBanner() {
-  const { asPath } = useRouter();
-  const validUser = useCheckAuth();
 
+function PreviewBanner({
+  loading = true,
+  validUser,
+}: {
+  loading: boolean;
+  validUser: boolean;
+}) {
   if (!validUser) {
     return (
       <>
@@ -32,7 +30,7 @@ function PreviewBanner() {
             <Button
               variant="secondary"
               as="a"
-              href={`/api/exit-preview?slug=${asPath}`}
+              href={`/api/exit-preview?slug=${window.location.pathname}`}
             >
               Exit preview
             </Button>
@@ -52,10 +50,10 @@ function PreviewBanner() {
 
   return (
     <a
-      href={`/api/exit-preview?slug=${asPath}`}
+      href={`/api/exit-preview?slug=${window.location.pathname}`}
       className="text-text-on-inverted focus-visible:shadow-focus-inverted fixed left-0 top-2 z-[9999] w-80 -translate-x-24 translate-y-6 -rotate-45 bg-gray-900 p-4 text-center font-semibold no-underline hover:bg-gray-700 focus:outline-none"
     >
-      <div>EXIT PREVIEW</div>
+      {loading ? <span>LASTER PREVIEW...</span> : <span>EXIT PREVIEW</span>}
     </a>
   );
 }

aksel.nav.no/website/components/website-modules/feedback/index.tsx

@@ -64,15 +64,6 @@ const Feedback = ({
     [asPath, activeState, hasLoggedFeedback]
   );
 
-  useEffect(() => {
-    const callLogFeedback = () => logFeedback(false);
-
-    window.addEventListener("beforeunload", callLogFeedback);
-    return () => {
-      window.removeEventListener("beforeunload", callLogFeedback);
-    };
-  }, [logFeedback]);
-
   const handleSend = (e) => {
     e.preventDefault();
 
@@ -155,6 +146,9 @@ const Feedback = ({
         "mx-auto": center,
       });
 
+  /* Hidden to better comply with policy */
+  return null;
+
   return (
     <div className={classes} id="feedback-block" data-hj-suppress>
       <div

aksel.nav.no/website/components/website-modules/icon-page/Page.tsx

@@ -192,7 +192,6 @@ export const IconPage = ({ name }: { name: string }) => {
                                   {sub.icons.map((i) => {
                                     const T = Icons[`${i.id}Icon`];
                                     if (T === undefined) {
-                                      console.log(i);
                                       return null;
                                     }
                                     return (

aksel.nav.no/website/components/website-modules/utils/amplitude.tsx

@@ -1,7 +1,7 @@
 import { SearchLogT } from "@/types";
 import getConfig from "next/config";
 import { Router } from "next/router";
-import { useCallback, useEffect, useMemo } from "react";
+import { useCallback, useEffect } from "react";
 import { track, init } from "@amplitude/analytics-browser";
 const { publicRuntimeConfig } = getConfig();
 
@@ -74,15 +74,6 @@ export function logAmplitudeEvent(eventName: string, data?: any): Promise<any> {
 }
 
 export const usePageView = (router: Router, pageProps: any) => {
-  const pageId = useMemo(
-    () => pageProps?.id || pageProps?.page?._id,
-    [pageProps]
-  );
-  const isForside = useMemo(
-    () => pageProps?.page?._type === "aksel_forside",
-    [pageProps]
-  );
-
   const logView = useCallback(
     (e, first = false) => {
       const data = {};
@@ -107,62 +98,30 @@ export const usePageView = (router: Router, pageProps: any) => {
         },
         first === true
       );
-      try {
-        if (isForside && isProduction() && !!pageId) {
-          fetch(`/api/log-page-view?id=${pageId}`);
-        }
-      } catch (error) {
-        isDevelopment && console.error(error);
-      }
     },
-    [pageProps, pageId, isForside]
+    [pageProps]
   );
 
-  const logScroll = useCallback(
-    (highestPercent: number) => {
-      highestPercent > 100 && (highestPercent = 100);
-      if (
-        document === undefined ||
-        window?.location?.pathname?.startsWith?.("/eksempler")
-      ) {
-        return;
-      }
+  const logScroll = useCallback((highestPercent: number) => {
+    highestPercent > 100 && (highestPercent = 100);
+    if (
+      document === undefined ||
+      window?.location?.pathname?.startsWith?.("/eksempler")
+    ) {
+      return;
+    }
 
-      if (isNaN(highestPercent)) {
-        return;
-      }
+    if (isNaN(highestPercent)) {
+      return;
+    }
 
-      logAmplitudeEvent(AmplitudeEvents.scroll, {
-        side: window.location.pathname,
-        prosent: highestPercent,
-      });
-      try {
-        if (isForside && isProduction() && !!pageId) {
-          fetch(`/api/log-scroll?id=${pageId}&length=${highestPercent}`);
-        }
-      } catch (error) {
-        isDevelopment && console.error(error);
-      }
-    },
-    [pageId, isForside]
-  );
-
-  const logTimeSpent = useCallback(
-    (timeSpent: number) => {
-      try {
-        if (isForside && timeSpent <= 420 && isProduction() && !!pageId) {
-          fetch(`/api/log-time?id=${pageId}&time=${timeSpent}`);
-        }
-      } catch (error) {
-        isDevelopment && console.error(error);
-      }
-    },
-    [pageId, isForside]
-  );
+    logAmplitudeEvent(AmplitudeEvents.scroll, {
+      side: window.location.pathname,
+      prosent: highestPercent,
+    });
+  }, []);
 
   useEffect(() => {
-    const startTime = new Date().getTime();
-
     let highestPercent = 0;
     let timeoutId = null;
     const footer = document.querySelector("#aksel-footer") as HTMLElement;
@@ -171,7 +130,7 @@ export const usePageView = (router: Router, pageProps: any) => {
     function scrollListener() {
       timeoutId = setTimeout(() => {
         const currentPercent = Math.round(
-          (window.pageYOffset /
+          (window.scrollY /
             (document.body.scrollHeight -
               window.innerHeight -
               (footer ? footer.offsetHeight : 0))) *
@@ -194,11 +153,6 @@ export const usePageView = (router: Router, pageProps: any) => {
       router.events.off("routeChangeComplete", logView);
       router.events.off("routeChangeStart", logScroll);
       window.removeEventListener("scroll", scrollListener);
-
-      if (isForside) {
-        logTimeSpent(Math.round((new Date().getTime() - startTime) / 1000));
-        logScroll(highestPercent);
-      }
     };
-  }, [router.events, logView, logScroll, logTimeSpent, isForside]);
+  }, [router.events, logView, logScroll]);
 };