Merge branch 'main' into next

.github/workflows/aksel-prod.yml

@@ -99,14 +99,6 @@ jobs:
           project_id: ${{ vars.NAIS_MANAGEMENT_PROJECT_ID }}
           identity_provider: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }}
 
-      - name: Wait for e2e-tests to succeed
-        uses: lewagon/[email protected]
-        with:
-          ref: ${{ github.ref }}
-          check-name: "Smoketest Aksel"
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-          wait-interval: 10
-
       - name: Deploy to prod-gcp
         uses: nais/deploy/actions/deploy@master
         env:

@navikt/aksel-icons/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @navikt/aksel-icons
 
+## 5.12.3
+
+## 5.12.2
+
+## 5.12.1
+
+## 5.12.0
+
+### Minor Changes
+
+- Ikoner: Oppdatert ikonpakke med diverse bugdfixes og oppdateringer av stroke ([#2538](https://github.com/navikt/aksel/pull/2538))
+
 ## 5.11.5
 
 ## 5.11.4

@navikt/aksel-icons/package.json

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

@navikt/aksel-stylelint/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @navikt/aksel-stylelint
 
+## 5.12.3
+
+## 5.12.2
+
+## 5.12.1
+
+## 5.12.0
+
 ## 5.11.5
 
 ## 5.11.4

@navikt/aksel-stylelint/package.json

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

@navikt/aksel/CHANGELOG.md

@@ -1,5 +1,33 @@
 # @navikt/aksel
 
+## 5.12.3
+
+### Patch Changes
+
+- Updated dependencies [[`1b71fe01c`](https://github.com/navikt/aksel/commit/1b71fe01cb152e3327972e96018e94a44d4128d6)]:
+  - @navikt/ds-css@5.12.3
+
+## 5.12.2
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @navikt/ds-css@5.12.2
+
+## 5.12.1
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @navikt/ds-css@5.12.1
+
+## 5.12.0
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @navikt/ds-css@5.12.0
+
 ## 5.11.5
 
 ### Patch Changes

@navikt/aksel/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@navikt/aksel",
-  "version": "5.11.5",
+  "version": "5.12.3",
   "description": "Aksel command line interface. Handles css-imports, codemods and more",
   "author": "Aksel | NAV designsystem team",
   "license": "MIT",
@@ -29,7 +29,7 @@
   },
   "homepage": "https://aksel.nav.no/grunnleggende/kode/kommandolinje",
   "dependencies": {
-    "@navikt/ds-css": "5.11.5",
+    "@navikt/ds-css": "5.12.3",
     "axios": "1.6.0",
     "chalk": "4.1.0",
     "clipboardy": "^2.3.0",

@navikt/core/css/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @navikt/ds-css
 
+## 5.12.3
+
+### Patch Changes
+
+- ExpansionCard: Divider mellom header og innhold ([#2566](https://github.com/navikt/aksel/pull/2566))
+
+## 5.12.2
+
+## 5.12.1
+
+## 5.12.0
+
 ## 5.11.5
 
 ### Patch Changes

@navikt/core/css/expansioncard.css

@@ -2,6 +2,8 @@
   --__ac-expansioncard-border-color: var(--ac-expansioncard-border-color, var(--a-border-default));
   --__ac-expansioncard-border-radius: var(--ac-expansioncard-border-radius, var(--a-border-radius-large));
   --__ac-expansioncard-border-width: 1px;
+  --__ac-expansioncard-padding-block: var(--a-spacing-4);
+  --__ac-expansioncard-padding-inline: var(--a-spacing-6);
 
   border-radius: var(--__ac-expansioncard-border-radius);
   background-color: var(--ac-expansioncard-bg, var(--a-surface-default));
@@ -30,16 +32,17 @@
   width: 100%;
   display: flex;
   gap: var(--a-spacing-4);
-  padding: var(--a-spacing-4) var(--a-spacing-6);
+  padding: var(--__ac-expansioncard-padding-block) var(--__ac-expansioncard-padding-inline);
   border-radius: var(--__ac-expansioncard-border-radius);
   background-color: var(--ac-expansioncard-header-bg, var(--a-surface-transparent));
   position: relative;
   border: var(--__ac-expansioncard-border-width) solid var(--__ac-expansioncard-border-color);
   justify-content: space-between;
 }
 
-.navds-expansioncard--small > :where(.navds-expansioncard__header) {
-  padding: var(--a-spacing-3) var(--a-spacing-4);
+.navds-expansioncard--small {
+  --__ac-expansioncard-padding-block: var(--a-spacing-3);
+  --__ac-expansioncard-padding-inline: var(--a-spacing-4);
 }
 
 .navds-expansioncard__header:hover {
@@ -61,6 +64,22 @@
     0 -1px 0 0 var(--__ac-expansioncard-border-color);
 }
 
+.navds-expansioncard--open > :where(.navds-expansioncard__header)::after {
+  content: "";
+  background-color: var(--a-border-divider);
+  bottom: 0;
+  left: var(--__ac-expansioncard-padding-inline);
+  height: 1px;
+  width: calc(100% - 2 * var(--__ac-expansioncard-padding-inline));
+  position: absolute;
+  opacity: 1;
+  transition: opacity 0.1s cubic-bezier(0.175, 0.885, 0.32, 1.275);
+}
+
+.navds-expansioncard--open > :where(.navds-expansioncard__header:hover)::after {
+  opacity: 0;
+}
+
 /*************************
  * Header/Typography *
  *************************/
@@ -156,17 +175,16 @@
  * Content *
  *************************/
 .navds-expansioncard__content {
+  --__ac-expansioncard-padding-block: var(--a-spacing-3);
+
   border-end-end-radius: var(--__ac-expansioncard-border-radius);
   border-end-start-radius: var(--__ac-expansioncard-border-radius);
-  padding: var(--a-spacing-3) var(--a-spacing-6) var(--a-spacing-6);
+  padding: var(--__ac-expansioncard-padding-block) var(--__ac-expansioncard-padding-inline)
+    var(--__ac-expansioncard-padding-inline);
   border: var(--__ac-expansioncard-border-width) solid var(--__ac-expansioncard-border-color);
   border-top: none;
 }
 
-.navds-expansioncard--small > :where(.navds-expansioncard__content) {
-  padding: var(--a-spacing-3) var(--a-spacing-4) var(--a-spacing-4);
-}
-
 .navds-expansioncard__content--closed {
   display: none;
 }

@navikt/core/css/package.json

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

@navikt/core/react/CHANGELOG.md

@@ -1,5 +1,43 @@
 # @navikt/ds-react
 
+## 5.12.3
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @navikt/ds-tokens@5.12.3
+  - @navikt/aksel-icons@5.12.3
+
+## 5.12.2
+
+### Patch Changes
+
+- :memo: Modal: Oppdatert JSDoc ([#2567](https://github.com/navikt/aksel/pull/2567))
+
+- Updated dependencies []:
+  - @navikt/ds-tokens@5.12.2
+  - @navikt/aksel-icons@5.12.2
+
+## 5.12.1
+
+### Patch Changes
+
+- Checkbox: Checkmark tilpasses bedre fontsize ([#2563](https://github.com/navikt/aksel/pull/2563))
+
+- Datepicker: Lukk-knapp i modal har nå type button for å unngå form-submition ([#2568](https://github.com/navikt/aksel/pull/2568))
+
+- Updated dependencies []:
+  - @navikt/ds-tokens@5.12.1
+  - @navikt/aksel-icons@5.12.1
+
+## 5.12.0
+
+### Patch Changes
+
+- Updated dependencies [[`7ff93e389`](https://github.com/navikt/aksel/commit/7ff93e389f7a399c5ceee463c1f463eb2971104b)]:
+  - @navikt/aksel-icons@5.12.0
+  - @navikt/ds-tokens@5.12.0
+
 ## 5.11.5
 
 ### Patch Changes

@navikt/core/react/package.json

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

@navikt/core/react/src/date/parts/DateWrapper.tsx

@@ -74,6 +74,7 @@ export const DateWrapper = ({
           variant="tertiary"
           onClick={() => modalRef?.current?.close()}
           size="small"
+          type="button"
         >
           {modalCloseButtonLabel(locale)}
         </Button>

@navikt/core/react/src/form/checkbox/Checkbox.tsx

@@ -54,8 +54,8 @@ export const Checkbox = forwardRef<HTMLInputElement, CheckboxProps>(
           <span className="navds-checkbox__icon">
             <svg
               xmlns="http://www.w3.org/2000/svg"
-              width="13"
-              height="10"
+              width="0.8125rem"
+              height="0.625rem"
               viewBox="0 0 13 10"
               fill="none"
               focusable={false}

@navikt/core/react/src/modal/types.ts

@@ -34,18 +34,21 @@ export interface ModalProps
    */
   onClose?: React.ReactEventHandler<HTMLDialogElement>;
   /**
-   * Called when the user wants to close the modal (clicked the close button or pressed Esc).
+   * Called when the user tries to close the modal by one of the built-in methods.
+   * Used if you want to ask the user for confirmation before closing.
+   * @warning Will not always be called when pressing Esc. See `onCancel` for more info.
    * @returns Whether to close the modal
    */
   onBeforeClose?: () => boolean | void;
   /**
-   * Called when the user presses the Esc key, unless `onBeforeClose()` returns `false`.
+   * *Sometimes** called when the user presses the Esc key, unless you return `false` in `onBeforeClose()`.
+   * @warning *Some browsers does not always trigger this event. Chrome only triggers it if you have
+   *  interacted with the modal, and will not trigger it a second time if you press Esc twice in a row.
    */
   onCancel?: React.ReactEventHandler<HTMLDialogElement>;
   /**
    * Whether to close when clicking on the backdrop.
-   *
-   * **WARNING:** Users may click outside by accident. Don't use if closing can cause data loss, or the modal contains important info.
+   * @warning Users may click outside by accident. Don't use if closing can cause data loss, or the modal contains important info.
    * @default false
    */
   closeOnBackdropClick?: boolean;