diff --git a/apps/ekstra-omsorgsdager-andre-forelder-ikke-tilsyn/CHANGELOG.md b/apps/ekstra-omsorgsdager-andre-forelder-ikke-tilsyn/CHANGELOG.md index 0780a53272..581b2af52e 100644 --- a/apps/ekstra-omsorgsdager-andre-forelder-ikke-tilsyn/CHANGELOG.md +++ b/apps/ekstra-omsorgsdager-andre-forelder-ikke-tilsyn/CHANGELOG.md @@ -1,5 +1,19 @@ # @navikt/ekstra-omsorgsdager-andre-forelder-ikke-tilsyn +## 1.14.0 + +### Minor Changes + +- 026fc373: Oppdatere til versjon 5 av designsystemet aksel + +### Patch Changes + +- Updated dependencies [41d0a03c] +- Updated dependencies [026fc373] + - @navikt/sif-common-formik-ds@0.3.0 + - @navikt/sif-common-soknad-ds@10.3.0 + - @navikt/sif-common-core-ds@9.3.0 + ## 1.13.0 ### Minor Changes @@ -12,8 +26,8 @@ - Updated dependencies - @navikt/sif-common-amplitude@2.19.0 - @navikt/sif-common-formik-ds@0.24.0 - - @navikt/sif-common-soknad-ds@11.0.0 - - @navikt/sif-common-core-ds@10.0.0 + - @navikt/sif-common-soknad-ds@10.3.0 + - @navikt/sif-common-core-ds@9.3.0 - @navikt/sif-common-sentry@0.20.0 - @navikt/sif-common-utils@3.38.0 @@ -60,8 +74,8 @@ - Updated dependencies [ea79f31c] - @navikt/sif-common-formik-ds@0.23.0 - - @navikt/sif-common-soknad-ds@11.0.0 - - @navikt/sif-common-core-ds@10.0.0 + - @navikt/sif-common-soknad-ds@10.3.0 + - @navikt/sif-common-core-ds@9.3.0 - @navikt/sif-common-sentry@0.19.0 ## 1.11.0 diff --git a/apps/ekstra-omsorgsdager-andre-forelder-ikke-tilsyn/package.json b/apps/ekstra-omsorgsdager-andre-forelder-ikke-tilsyn/package.json index 519c6cf724..fe2b7245c0 100644 --- a/apps/ekstra-omsorgsdager-andre-forelder-ikke-tilsyn/package.json +++ b/apps/ekstra-omsorgsdager-andre-forelder-ikke-tilsyn/package.json @@ -3,7 +3,7 @@ "description": "Søknad om ekstra omsorgsdager når den andre forelderen ikke kan ha tilsyn med barn", "license": "MIT", "name": "@navikt/ekstra-omsorgsdager-andre-forelder-ikke-tilsyn", - "version": "1.13.0", + "version": "1.14.0", "repository": "https://github.com/navikt/sif-brukerdialog", "private": true, "scripts": { @@ -27,9 +27,9 @@ "start-e2e-server": "node ./server-e2e.js" }, "dependencies": { - "@navikt/ds-css": "4.11.2", - "@navikt/ds-react": "4.11.2", - "@navikt/ds-tailwind": "4.11.2", + "@navikt/ds-css": "5.0.3", + "@navikt/ds-react": "5.0.3", + "@navikt/ds-tailwind": "5.0.3", "@navikt/sif-common-amplitude": "*", "@navikt/sif-common-core-ds": "*", "@navikt/sif-common-formik-ds": "*", diff --git a/apps/endringsmelding-pleiepenger/CHANGELOG.md b/apps/endringsmelding-pleiepenger/CHANGELOG.md index a7b599be40..41b1f9d543 100644 --- a/apps/endringsmelding-pleiepenger/CHANGELOG.md +++ b/apps/endringsmelding-pleiepenger/CHANGELOG.md @@ -1,5 +1,20 @@ # @navikt/endringsmelding-pleiepenger +## 2.17.0 + +### Minor Changes + +- 026fc373: Oppdatere til versjon 5 av designsystemet aksel + +### Patch Changes + +- Updated dependencies [41d0a03c] +- Updated dependencies [026fc373] + - @navikt/sif-common-formik-ds@0.3.0 + - @navikt/sif-common-soknad-ds@10.3.0 + - @navikt/sif-common-forms-ds@8.5.0 + - @navikt/sif-common-core-ds@9.3.0 + ## 2.16.0 ### Minor Changes @@ -12,9 +27,9 @@ - Updated dependencies - @navikt/sif-common-amplitude@2.19.0 - @navikt/sif-common-formik-ds@0.24.0 - - @navikt/sif-common-soknad-ds@11.0.0 - - @navikt/sif-common-forms-ds@9.0.0 - - @navikt/sif-common-core-ds@10.0.0 + - @navikt/sif-common-soknad-ds@10.3.0 + - @navikt/sif-common-forms-ds@8.5.0 + - @navikt/sif-common-core-ds@9.3.0 - @navikt/sif-common-sentry@0.20.0 - @navikt/sif-common-utils@3.38.0 @@ -70,9 +85,9 @@ - Updated dependencies [ea79f31c] - @navikt/sif-common-formik-ds@0.23.0 - - @navikt/sif-common-soknad-ds@11.0.0 - - @navikt/sif-common-forms-ds@9.0.0 - - @navikt/sif-common-core-ds@10.0.0 + - @navikt/sif-common-soknad-ds@10.3.0 + - @navikt/sif-common-forms-ds@8.5.0 + - @navikt/sif-common-core-ds@9.3.0 - @navikt/sif-common-sentry@0.19.0 ## 2.14.0 diff --git a/apps/endringsmelding-pleiepenger/e2e/cypress/e2e/tester/1-utfylling-av-dialog/cyHelpers.ts b/apps/endringsmelding-pleiepenger/e2e/cypress/e2e/tester/1-utfylling-av-dialog/cyHelpers.ts index 2d2b04eafa..80ef273c36 100644 --- a/apps/endringsmelding-pleiepenger/e2e/cypress/e2e/tester/1-utfylling-av-dialog/cyHelpers.ts +++ b/apps/endringsmelding-pleiepenger/e2e/cypress/e2e/tester/1-utfylling-av-dialog/cyHelpers.ts @@ -99,6 +99,7 @@ const endreOgFjernFerie = () => { getTestElement('dateRangeAccordion_0').within(() => { cy.get('.lovbestemtFerieListe li:nth-child(2) .lovbestemtFerieListe__ferie__endreKnapp').click(); }); + cy.wait(250); cy.checkA11y(); fyllUtFerieDialog('28.11.2022', '29.11.2022'); getTestElement('dateRangeAccordion_0').within(() => { @@ -142,9 +143,9 @@ const endreOgFjernFerie = () => { }); }; -const endreEnkeltuke = (ukenummer = enkeltuke) => { +const endreArbeidEnkeltuke = (ukenummer = enkeltuke) => { it('åpne periode', () => { - cy.wait(1000); + cy.wait(250); cy.injectAxe(); getAktivitet().within(() => { cy.get('[data-testid=dateRangeAccordion_0]').click(); @@ -152,13 +153,14 @@ const endreEnkeltuke = (ukenummer = enkeltuke) => { expect(cy.get('[data-testid=ukenummer]').contains(ukenummer)); expect(cy.get('[data-testid=arbeidstid-faktisk]').contains('4 t. 0 m.')); }); - cy.wait(500); + cy.wait(250); cy.checkA11y(); captureScreenshot(); }); }); it('kontrollerer verdi før endring', () => { - cy.wait(1000); + cy.wait(250); + cy.injectAxe(); getAktivitet().within(() => { getUkeRow(ukenummer).within(() => { expect(cy.get('[data-testid=ukenummer]').contains(ukenummer)); @@ -169,11 +171,13 @@ const endreEnkeltuke = (ukenummer = enkeltuke) => { }); }); it('åpner dialog for uke', () => { - cy.wait(1000); + cy.wait(250); + cy.injectAxe(); getAktivitet().within(() => { getUkeRow(ukenummer).within(() => { cy.get('[data-testid=endre-button]').click(); }); + cy.wait(250); cy.checkA11y(); captureScreenshot(); }); @@ -199,11 +203,12 @@ const endreEnkeltuke = (ukenummer = enkeltuke) => { }); }; -const endreFlereUker = (uker: number[] = flereUker) => { +const endreArbeidFlereUker = (uker: number[] = flereUker) => { it('velger uker for endring', () => { getAktivitet().within(() => { getPeriode().within(() => { getTestElement('endre-flere-uker-cb').click(); + cy.wait(300); const rows = uker.map((uke) => getUkeRow(uke)); rows.forEach((row) => { row.within(() => { @@ -221,6 +226,7 @@ const endreFlereUker = (uker: number[] = flereUker) => { cy.get('[data-testid=endre-flere-uker-button]').click(); }); }); + cy.wait(300); cy.checkA11y(); getArbeidstimerModal().within(() => { getTestElement('timer-verdi').type('5'); @@ -254,6 +260,7 @@ const fyllUtArbeidstidUkjentArbeidsforhold = ( cy.get('[data-testid=endre-button]').click(); }); }); + cy.wait(250); getArbeidstimerModal().within(() => { getTestElement('toggle-timer').click(); getTestElement('timer-verdi').type(uke.tid); @@ -348,8 +355,8 @@ export const cyHelpers = { leggTilOgFjernFerie, leggTilFerie, endreOgFjernFerie, - endreEnkeltuke, - endreFlereUker, + endreEnkeltuke: endreArbeidEnkeltuke, + endreFlereUker: endreArbeidFlereUker, fyllUtArbeidstidUkjentArbeidsforhold, fortsettTilOppsummering, kontrollerOppsummering, diff --git a/apps/endringsmelding-pleiepenger/package.json b/apps/endringsmelding-pleiepenger/package.json index b8b00b2712..40e079b10e 100644 --- a/apps/endringsmelding-pleiepenger/package.json +++ b/apps/endringsmelding-pleiepenger/package.json @@ -4,15 +4,15 @@ "license": "MIT", "name": "@navikt/endringsmelding-pleiepenger", "repository": "https://github.com/navikt/sif-brukerdialog", - "version": "2.16.0", + "version": "2.17.0", "private": true, "dependencies": { "@devexperts/remote-data-ts": "2.1.1", "@formatjs/intl-pluralrules": "5.2.4", - "@navikt/ds-css": "4.11.2", + "@navikt/ds-css": "5.0.3", "@navikt/ds-icons": "3.4.3", - "@navikt/ds-react": "4.11.2", - "@navikt/ds-tailwind": "4.11.2", + "@navikt/ds-react": "5.0.3", + "@navikt/ds-tailwind": "5.0.3", "@navikt/fnrvalidator": "1.3.0", "@navikt/sif-common-amplitude": "*", "@navikt/sif-common-core-ds": "*", @@ -72,7 +72,7 @@ "@babel/preset-react": "7.22.5", "@babel/preset-typescript": "7.22.5", "@mswjs/data": "0.13.0", - "@navikt/ds-tailwind": "4.11.2", + "@navikt/ds-tailwind": "5.0.3", "@storybook/addon-actions": "7.3.1", "@storybook/addon-essentials": "7.3.1", "@storybook/addon-interactions": "7.3.1", diff --git a/apps/endringsmelding-pleiepenger/src/app/dev/DevFooter.tsx b/apps/endringsmelding-pleiepenger/src/app/dev/DevFooter.tsx index 0de4979408..d253a757ce 100644 --- a/apps/endringsmelding-pleiepenger/src/app/dev/DevFooter.tsx +++ b/apps/endringsmelding-pleiepenger/src/app/dev/DevFooter.tsx @@ -1,5 +1,4 @@ -import { Button, Heading, Modal, Radio, RadioGroup } from '@navikt/ds-react'; -import ModalContent from '@navikt/ds-react/esm/modal/ModalContent'; +import { Button, Modal, Radio, RadioGroup } from '@navikt/ds-react'; import React, { useState } from 'react'; import { useSøknadContext } from '@hooks'; import { Settings } from '@navikt/ds-icons'; @@ -42,11 +41,13 @@ const DevFooter: React.FunctionComponent = () => { {scenario.name} - setShowModal(false)}> - - - Velg scenario som skal brukes - + setShowModal(false)} + header={{ + heading: 'Velg scenario som skal brukes', + }}> + { Velg - + ); diff --git a/apps/endringsmelding-pleiepenger/src/app/modules/endre-arbeidstid-modal/EndreArbeidstidModal.tsx b/apps/endringsmelding-pleiepenger/src/app/modules/endre-arbeidstid-modal/EndreArbeidstidModal.tsx index eeb119b8a6..252fe3bf73 100644 --- a/apps/endringsmelding-pleiepenger/src/app/modules/endre-arbeidstid-modal/EndreArbeidstidModal.tsx +++ b/apps/endringsmelding-pleiepenger/src/app/modules/endre-arbeidstid-modal/EndreArbeidstidModal.tsx @@ -1,8 +1,7 @@ -import { Button, Heading, Modal } from '@navikt/ds-react'; -import React, { FunctionComponent, useEffect } from 'react'; -import { Close } from '@navikt/ds-icons'; -import Block from '@navikt/sif-common-core-ds/lib/atoms/block/Block'; +import { Modal } from '@navikt/ds-react'; +import React, { FunctionComponent } from 'react'; import './endreArbeidstidModal.css'; +import { createPortal } from 'react-dom'; interface Props { title: string; @@ -12,39 +11,25 @@ interface Props { } const EndreArbeidstidModal: FunctionComponent = ({ children, title, isVisible = false, onClose }) => { - useEffect(() => { - Modal.setAppElement('#app'); - }); - return ( - - - - - - )} - - ); + + + + + + )} + , + document.body + ) + : null; }; export default ConfirmationDialog; diff --git a/packages/sif-common-core-ds/src/components/dialogs/info-dialog/InfoDialog.tsx b/packages/sif-common-core-ds/src/components/dialogs/info-dialog/InfoDialog.tsx index c4443558ca..faf3d9a442 100644 --- a/packages/sif-common-core-ds/src/components/dialogs/info-dialog/InfoDialog.tsx +++ b/packages/sif-common-core-ds/src/components/dialogs/info-dialog/InfoDialog.tsx @@ -1,47 +1,45 @@ -import { BodyLong, Button, Heading, Modal, ModalProps } from '@navikt/ds-react'; -import ModalContent from '@navikt/ds-react/esm/modal/ModalContent'; +import { BodyLong, Button, Modal, ModalProps } from '@navikt/ds-react'; import React from 'react'; import ButtonRow from '../../../atoms/button-row/ButtonRow'; import '../dialogs.scss'; import './infoDialog.scss'; +import { createPortal } from 'react-dom'; interface OwnProps { children: React.ReactNode; okButton?: { label: string; }; - title?: string; + title: string; } type Props = OwnProps & ModalProps; -const InfoDialog = ({ children, okButton, title, ...props }: Props) => ( - - - {title && ( -
- - {title} - -
- )} +const InfoDialog = ({ children, okButton, title, ...props }: Props) => + props.open + ? createPortal( + + + + {children} + - - {children} - - - {okButton && ( - - - - )} - - -); + {okButton && ( + + + + )} + + , + document.body + ) + : null; export default InfoDialog; diff --git a/packages/sif-common-core-ds/src/components/sif-app-wrapper/SifAppWrapper.tsx b/packages/sif-common-core-ds/src/components/sif-app-wrapper/SifAppWrapper.tsx index 3954cb884b..5e89141259 100644 --- a/packages/sif-common-core-ds/src/components/sif-app-wrapper/SifAppWrapper.tsx +++ b/packages/sif-common-core-ds/src/components/sif-app-wrapper/SifAppWrapper.tsx @@ -1,4 +1,3 @@ -import { Modal } from '@navikt/ds-react'; import React from 'react'; interface Props { @@ -7,9 +6,6 @@ interface Props { const SifAppWrapper: React.FunctionComponent = ({ children }) => { React.useEffect(() => { - if (Modal.setAppElement) { - Modal.setAppElement('#app'); - } window.document.body.className = window.document.body.className + ' sif-ds-theme'; }); diff --git a/packages/sif-common-core-ds/storybook/decorators/StoryWrapper.tsx b/packages/sif-common-core-ds/storybook/decorators/StoryWrapper.tsx index fe3ea05982..32b2e59555 100644 --- a/packages/sif-common-core-ds/storybook/decorators/StoryWrapper.tsx +++ b/packages/sif-common-core-ds/storybook/decorators/StoryWrapper.tsx @@ -1,4 +1,3 @@ -import { Modal } from '@navikt/ds-react'; import * as React from 'react'; import { IntlProvider } from 'react-intl'; import { allCommonMessages } from '../../src/i18n/allCommonMessages'; @@ -13,9 +12,6 @@ export interface IntlProviderProps { const StoryWrapper = ({ children }: IntlProviderProps) => { React.useEffect(() => { - if (Modal.setAppElement) { - Modal.setAppElement('#story-wrapper'); - } window.document.body.className = window.document.body.className + ' sif-ds-theme'; }); diff --git a/packages/sif-common-formik-ds/CHANGELOG.md b/packages/sif-common-formik-ds/CHANGELOG.md index fca743d22e..965b31ef94 100644 --- a/packages/sif-common-formik-ds/CHANGELOG.md +++ b/packages/sif-common-formik-ds/CHANGELOG.md @@ -1,5 +1,17 @@ # @navikt/sif-common-formik-ds +## 0.3.0 + +### Minor Changes + +- 41d0a03c: Oppdatere til versjon 5 av designsystemet aksel. Breaking change på grunn av props som er endret på komponenter som bruker modal dialog. + + # Props som er fjernet + + - shouldCloseOnOverlayClick. Denne finnes ikke lenger i Aksel Modal. Dette gjelder: + -- packages/sif-common-formik-ds/src/components/formik-modal-form/FormikModalFormAndInfo.tsx + -- packages/sif-common-formik-ds/src/components/formik-modal-form/FormikModalFormAndList.tsx + ## 0.25.0 ### Minor Changes diff --git a/packages/sif-common-formik-ds/package.json b/packages/sif-common-formik-ds/package.json index d1be1cacd6..a10b1af556 100644 --- a/packages/sif-common-formik-ds/package.json +++ b/packages/sif-common-formik-ds/package.json @@ -5,7 +5,7 @@ "main": "lib/index.js", "name": "@navikt/sif-common-formik-ds", "types": "lib/index.d.js", - "version": "0.25.0", + "version": "0.3.0", "bugs": { "url": "https://github.com/navikt/sif-common-formik-ds/issues" }, @@ -24,9 +24,9 @@ "@babel/preset-react": "7.22.5", "@babel/preset-typescript": "7.22.5", "@formatjs/intl-pluralrules": "5.2.4", - "@navikt/ds-css": "4.11.2", + "@navikt/ds-css": "5.0.3", "@navikt/ds-datepicker": "4.2.0", - "@navikt/ds-react": "4.11.2", + "@navikt/ds-react": "5.0.3", "@navikt/fnrvalidator": "1.3.0", "@storybook/addon-a11y": "7.3.1", "@storybook/addon-actions": "7.3.1", @@ -73,9 +73,9 @@ "react-refresh": "0.11.0" }, "peerDependencies": { - "@navikt/ds-css": "3", + "@navikt/ds-css": "5", "@navikt/ds-datepicker": ">=4.1.7", - "@navikt/ds-react": "3", + "@navikt/ds-react": "5", "formik": "2.x", "react-intl": "6.x" }, diff --git a/packages/sif-common-formik-ds/src/components/formik-modal-form/FormikModalFormAndInfo.tsx b/packages/sif-common-formik-ds/src/components/formik-modal-form/FormikModalFormAndInfo.tsx index b35c77ab18..df9dd18e1a 100644 --- a/packages/sif-common-formik-ds/src/components/formik-modal-form/FormikModalFormAndInfo.tsx +++ b/packages/sif-common-formik-ds/src/components/formik-modal-form/FormikModalFormAndInfo.tsx @@ -21,7 +21,6 @@ function FormikModalFormAndInfo({ infoRenderer, formRenderer, onAfterChange, - shouldCloseOnOverlayClick, renderEditButtons, renderDeleteButton, dialogWidth, @@ -47,7 +46,6 @@ function FormikModalFormAndInfo({ renderDeleteButton={renderDeleteButton} wrapInfoInPanel={wrapInfoInPanel} wrapInfoInFieldset={wrapInfoInFieldset} - shouldCloseOnOverlayClick={shouldCloseOnOverlayClick} error={error || (context ? context.getAndRenderFieldErrorMessage(field, form) : undefined)} onDelete={() => form.setFieldValue(field.name, undefined)} onChange={(value) => { diff --git a/packages/sif-common-formik-ds/src/components/formik-modal-form/FormikModalFormAndList.tsx b/packages/sif-common-formik-ds/src/components/formik-modal-form/FormikModalFormAndList.tsx index 684a601367..8a2bd6017a 100644 --- a/packages/sif-common-formik-ds/src/components/formik-modal-form/FormikModalFormAndList.tsx +++ b/packages/sif-common-formik-ds/src/components/formik-modal-form/FormikModalFormAndList.tsx @@ -24,7 +24,6 @@ function FormikModalFormAndList({ sortFunc, onAfterChange, dialogWidth, - shouldCloseOnOverlayClick, error, maxItems, useFastField, @@ -43,7 +42,6 @@ function FormikModalFormAndList({ error={error || (context ? context.getAndRenderFieldErrorMessage(field, form) : undefined)} maxItems={maxItems} dialogWidth={dialogWidth} - shouldCloseOnOverlayClick={shouldCloseOnOverlayClick} confirmDelete={confirmDelete} onChange={(values) => { const updatedValues = sortFunc ? values.sort(sortFunc) : values; diff --git a/packages/sif-common-formik-ds/src/components/formik-modal-form/modal-form-and-info/ModalFormAndInfo.tsx b/packages/sif-common-formik-ds/src/components/formik-modal-form/modal-form-and-info/ModalFormAndInfo.tsx index a718655e0c..0e4693f89d 100644 --- a/packages/sif-common-formik-ds/src/components/formik-modal-form/modal-form-and-info/ModalFormAndInfo.tsx +++ b/packages/sif-common-formik-ds/src/components/formik-modal-form/modal-form-and-info/ModalFormAndInfo.tsx @@ -1,5 +1,6 @@ -import { Button, Heading, Modal, ModalProps, Panel } from '@navikt/ds-react'; +import { Button, Modal, Panel } from '@navikt/ds-react'; import React from 'react'; +import { createPortal } from 'react-dom'; import bemUtils from '../../../utils/bemUtils'; import SkjemagruppeQuestion from '../../helpers/skjemagruppe-question/SkjemagruppeQuestion'; import { FormikModalFormWidths, ModalFormAndInfoLabels } from '../types'; @@ -17,7 +18,7 @@ type InfoRenderer = (props: { onDelete: (data: DataType) => void; }) => React.ReactNode; -export interface ModalFormAndInfoProps extends Pick { +export interface ModalFormAndInfoProps { labels: ModalFormAndInfoLabels; infoRenderer: InfoRenderer; formRenderer: ModalFormRenderer; @@ -35,9 +36,7 @@ interface PrivateProps { error?: React.ReactNode | boolean; } -type Props = ModalFormAndInfoProps & - PrivateProps & - Pick; +type Props = ModalFormAndInfoProps & PrivateProps; const bem = bemUtils('formikModalForm').child('modal'); @@ -50,7 +49,6 @@ function ModalFormAndInfo({ renderDeleteButton = true, dialogClassName, wrapInfoInPanel = true, - shouldCloseOnOverlayClick = false, wrapInfoInFieldset = true, infoRenderer, formRenderer, @@ -119,26 +117,27 @@ function ModalFormAndInfo({ return ( <> - - -
- - {labels.modalTitle} - -
- - {formRenderer({ - onSubmit: handleOnSubmit, - onCancel: resetModal, - data: modalState.data, - })} - - + {modalState.isVisible + ? createPortal( + + + {formRenderer({ + onSubmit: handleOnSubmit, + onCancel: resetModal, + data: modalState.data, + })} + + , + document.body + ) + : null} {wrapInfoInFieldset === true ? ( {content} diff --git a/packages/sif-common-formik-ds/src/components/formik-modal-form/modal-form-and-list/ModalFormAndList.tsx b/packages/sif-common-formik-ds/src/components/formik-modal-form/modal-form-and-list/ModalFormAndList.tsx index 0c43e04ebb..3f455ad19f 100644 --- a/packages/sif-common-formik-ds/src/components/formik-modal-form/modal-form-and-list/ModalFormAndList.tsx +++ b/packages/sif-common-formik-ds/src/components/formik-modal-form/modal-form-and-list/ModalFormAndList.tsx @@ -1,13 +1,13 @@ /* eslint-disable @typescript-eslint/ban-types */ -import { Alert, Button, Heading, Modal, ModalProps } from '@navikt/ds-react'; +import { Alert, Button, Modal } from '@navikt/ds-react'; import React, { useState } from 'react'; - import { v4 as uuid } from 'uuid'; import bemUtils from '../../../utils/bemUtils'; import ConfirmationDialog from '../../helpers/confirmation-dialog/ConfirmationDialog'; import SkjemagruppeQuestion from '../../helpers/skjemagruppe-question/SkjemagruppeQuestion'; import { FormikModalFormWidths, ModalFormAndListLabels, ModalFormAndListListItemBase } from '../types'; import './modalFormAndList.scss'; +import { createPortal } from 'react-dom'; type ModalFormRenderer = (props: { item?: ItemType; @@ -29,8 +29,7 @@ export type ModalFormAndListConfirmDeleteProps = { contentRenderer: (item: ItemType) => React.ReactNode; }; -export interface ModalFormAndListProps - extends Pick { +export interface ModalFormAndListProps { labels: ModalFormAndListLabels; maxItems?: number; listRenderer: ListRenderer; @@ -57,7 +56,6 @@ function ModalFormAndList({ dialogWidth = 'narrow', maxItems, confirmDelete, - shouldCloseOnOverlayClick = false, onChange, }: Props) { const [modalState, setModalState] = React.useState<{ isVisible: boolean; selectedItem?: ItemType }>({ @@ -99,26 +97,28 @@ function ModalFormAndList({ return ( <> - - -
- - {labels.modalTitle} - -
- {formRenderer({ - onSubmit: handleOnSubmit, - onCancel: resetModal, - item: modalState.selectedItem, - allItems: items, - })} - - + {modalState.isVisible + ? createPortal( + + + {formRenderer({ + onSubmit: handleOnSubmit, + onCancel: resetModal, + item: modalState.selectedItem, + allItems: items, + })} + + , + document.body + ) + : null} {items.length > 0 && (
diff --git a/packages/sif-common-formik-ds/src/components/helpers/confirmation-dialog/ConfirmationDialog.tsx b/packages/sif-common-formik-ds/src/components/helpers/confirmation-dialog/ConfirmationDialog.tsx index fb31237e1c..7fe5ab71d5 100644 --- a/packages/sif-common-formik-ds/src/components/helpers/confirmation-dialog/ConfirmationDialog.tsx +++ b/packages/sif-common-formik-ds/src/components/helpers/confirmation-dialog/ConfirmationDialog.tsx @@ -1,4 +1,5 @@ -import { BodyLong, Button, Heading, Modal, ModalProps } from '@navikt/ds-react'; +import { BodyLong, Button, Modal, ModalProps } from '@navikt/ds-react'; +import { createPortal } from 'react-dom'; import ButtonRow from '../button-row/ButtonRow'; import './confirmationDialog.scss'; @@ -12,37 +13,35 @@ export interface Props extends Omit { const ConfirmationDialog = (props: Props) => { const { title, onCancel, onConfirm: onOk, cancelLabel, okLabel, children, ...modalProps } = props; - return ( - - {props.open && ( - -
- - {title} - -
+ return props.open + ? createPortal( + + + + {children} + - - {children} - - - - - {onCancel && ( - - )} - - - )} - - ); + + + {onCancel && ( + + )} + + + , + document.body + ) + : null; }; export default ConfirmationDialog; diff --git a/packages/sif-common-formik-ds/src/components/typed-formik-wrapper/TypedFormikWrapper.tsx b/packages/sif-common-formik-ds/src/components/typed-formik-wrapper/TypedFormikWrapper.tsx index d4b365298f..c0ca18add5 100644 --- a/packages/sif-common-formik-ds/src/components/typed-formik-wrapper/TypedFormikWrapper.tsx +++ b/packages/sif-common-formik-ds/src/components/typed-formik-wrapper/TypedFormikWrapper.tsx @@ -2,9 +2,9 @@ import React from 'react'; import { Formik, FormikConfig, FormikProps } from 'formik'; export interface TypedFormikWrapperProps extends Omit>, 'initialValues'> { + innerRef?: any; initialValues: Partial; renderForm: (formik: FormikProps>) => React.ReactNode; - innerRef?: any; onSubmit: (values: Partial) => void; } diff --git a/packages/sif-common-formik-ds/storybook/stories/forms/ExampleListAndDialog.tsx b/packages/sif-common-formik-ds/storybook/stories/forms/ExampleListAndDialog.tsx index 8a7d79f9f2..2934c63dae 100644 --- a/packages/sif-common-formik-ds/storybook/stories/forms/ExampleListAndDialog.tsx +++ b/packages/sif-common-formik-ds/storybook/stories/forms/ExampleListAndDialog.tsx @@ -15,7 +15,6 @@ function ExampleListAndDialog({ name, labels, validate }: Props validate(value, name) : undefined} - shouldCloseOnOverlayClick={false} maxItems={3} formRenderer={() => <>This is the form} listRenderer={() =>
This is the list
} diff --git a/packages/sif-common-forms-ds/CHANGELOG.md b/packages/sif-common-forms-ds/CHANGELOG.md index 70ddb88691..e5b5a709d6 100644 --- a/packages/sif-common-forms-ds/CHANGELOG.md +++ b/packages/sif-common-forms-ds/CHANGELOG.md @@ -1,5 +1,16 @@ # @navikt/sif-common-forms-ds +## 8.5.0 + +### Minor Changes + +- 026fc373: Oppdatere til versjon 5 av designsystemet aksel + +### Patch Changes + +- Updated dependencies [026fc373] + - @navikt/sif-common-core-ds@9.3.0 + ## 8.4.0 ### Minor Changes diff --git a/packages/sif-common-forms-ds/package.json b/packages/sif-common-forms-ds/package.json index 08e51f24a2..aad82d3820 100644 --- a/packages/sif-common-forms-ds/package.json +++ b/packages/sif-common-forms-ds/package.json @@ -6,7 +6,7 @@ "main": "lib/index.js", "name": "@navikt/sif-common-forms-ds", "types": "lib/index.d.js", - "version": "8.4.0", + "version": "8.5.0", "bugs": { "url": "https://github.com/navikt/sif-brukerdialog/issues" }, @@ -19,8 +19,8 @@ "@babel/preset-react": "7.22.5", "@babel/preset-typescript": "7.22.5", "@formatjs/intl-pluralrules": "5.2.4", - "@navikt/ds-css": "4.11.2", - "@navikt/ds-react": "4.11.2", + "@navikt/ds-css": "5.0.3", + "@navikt/ds-react": "5.0.3", "@navikt/sif-common-core-ds": "*", "@navikt/sif-common-formik-ds": "*", "@navikt/sif-common-utils": "*", @@ -76,8 +76,8 @@ ] }, "peerDependencies": { - "@navikt/ds-css": "3", - "@navikt/ds-react": "3", + "@navikt/ds-css": "5", + "@navikt/ds-react": "5", "@navikt/sif-common-core-ds": "*" }, "repository": { diff --git a/packages/sif-common-forms-ds/storybook/decorators/AppIntlProvider.tsx b/packages/sif-common-forms-ds/storybook/decorators/AppIntlProvider.tsx index 45a27a10fc..f991035e36 100644 --- a/packages/sif-common-forms-ds/storybook/decorators/AppIntlProvider.tsx +++ b/packages/sif-common-forms-ds/storybook/decorators/AppIntlProvider.tsx @@ -1,4 +1,3 @@ -import { Modal } from '@navikt/ds-react'; import * as React from 'react'; import { IntlProvider } from 'react-intl'; import '@formatjs/intl-pluralrules//locale-data/en'; @@ -23,9 +22,6 @@ const AppIntlProvider = ({ locale, onError, children }: IntlProviderProps) => { const messages = locale === 'nb' ? appMessages.nb : appMessages.nn; dayjs.locale(locale === 'nb' ? 'nb' : 'nn'); React.useEffect(() => { - if (Modal.setAppElement) { - Modal.setAppElement('#dialog-wrapper'); - } window.document.body.className = window.document.body.className + ' sif-ds-theme'; }); diff --git a/packages/sif-common-soknad-ds/CHANGELOG.md b/packages/sif-common-soknad-ds/CHANGELOG.md index 5d8302886f..1ea6ecdeca 100644 --- a/packages/sif-common-soknad-ds/CHANGELOG.md +++ b/packages/sif-common-soknad-ds/CHANGELOG.md @@ -1,5 +1,18 @@ # @navikt/sif-common-soknad-ds +## 10.3.0 + +### Minor Changes + +- 026fc373: Oppdatere til versjon 5 av designsystemet aksel + +### Patch Changes + +- Updated dependencies [41d0a03c] +- Updated dependencies [026fc373] + - @navikt/sif-common-formik-ds@0.3.0 + - @navikt/appstatus-react-ds@2.12.0 + ## 10.2.1 ### Patch Changes diff --git a/packages/sif-common-soknad-ds/package.json b/packages/sif-common-soknad-ds/package.json index 4196fe2189..f5cd71b388 100644 --- a/packages/sif-common-soknad-ds/package.json +++ b/packages/sif-common-soknad-ds/package.json @@ -5,7 +5,7 @@ "license": "MIT", "name": "@navikt/sif-common-soknad-ds", "main": "lib/index.js", - "version": "10.2.1", + "version": "10.3.0", "bugs": { "url": "https://github.com/navikt/sif-brukerdialog/issues" }, @@ -23,8 +23,8 @@ "@devexperts/remote-data-ts": "2.1.1", "@formatjs/intl-pluralrules": "5.2.4", "@navikt/appstatus-react-ds": "*", - "@navikt/ds-css": "4.11.2", - "@navikt/ds-react": "4.11.2", + "@navikt/ds-css": "5.0.3", + "@navikt/ds-react": "5.0.3", "@navikt/sif-common-core-ds": "*", "@navikt/sif-common-formik-ds": "*", "@navikt/sif-common-sentry": "*", @@ -79,8 +79,8 @@ "@devexperts/remote-data-ts": "2.x", "@formatjs/intl-pluralrules": "5.x", "@navikt/appstatus-react-ds": "*", - "@navikt/ds-css": "3", - "@navikt/ds-react": "3", + "@navikt/ds-css": "5", + "@navikt/ds-react": "5", "@navikt/sif-common-formik-ds": "*", "@navikt/sif-common-sentry": "*", "@navikt/sif-common-utils": "*", diff --git "a/packages/sif-common-soknad-ds/src/components/avbrytS\303\270knadDialog/AvbrytS\303\270knadDialog.tsx" "b/packages/sif-common-soknad-ds/src/components/avbrytS\303\270knadDialog/AvbrytS\303\270knadDialog.tsx" index 3780bfeb82..586354af0d 100644 --- "a/packages/sif-common-soknad-ds/src/components/avbrytS\303\270knadDialog/AvbrytS\303\270knadDialog.tsx" +++ "b/packages/sif-common-soknad-ds/src/components/avbrytS\303\270knadDialog/AvbrytS\303\270knadDialog.tsx" @@ -16,7 +16,6 @@ const AvbrytSøknadDialog = (props: Props) => { open={synlig} okLabel={intlHelper(intl, 'avbrytSøknadDialog.avbrytSøknadLabel')} cancelLabel={intlHelper(intl, 'avbrytSøknadDialog.fortsettSøknadLabel')} - closeButton={false} onConfirm={onAvbrytSøknad} onCancel={onFortsettSøknad} title={intlHelper(intl, 'avbrytSøknadDialog.tittel')}> diff --git "a/packages/sif-common-soknad-ds/src/components/fortsettS\303\270knadSenereDialog/FortsettS\303\270knadSenereDialog.tsx" "b/packages/sif-common-soknad-ds/src/components/fortsettS\303\270knadSenereDialog/FortsettS\303\270knadSenereDialog.tsx" index 04930fd86c..913fd57519 100644 --- "a/packages/sif-common-soknad-ds/src/components/fortsettS\303\270knadSenereDialog/FortsettS\303\270knadSenereDialog.tsx" +++ "b/packages/sif-common-soknad-ds/src/components/fortsettS\303\270knadSenereDialog/FortsettS\303\270knadSenereDialog.tsx" @@ -16,7 +16,6 @@ const FortsettSøknadSenereDialog = (props: Props) => { open={synlig} okLabel={intlHelper(intl, 'fortsettSøknadSenereDialog.avbrytSøknadLabel')} cancelLabel={intlHelper(intl, 'fortsettSøknadSenereDialog.fortsettSøknadLabel')} - closeButton={false} title={intlHelper(intl, 'fortsettSøknadSenereDialog.tittel')} onConfirm={onFortsettSøknadSenere} onCancel={onFortsettSøknad}> diff --git a/yarn.lock b/yarn.lock index c9df76ab02..eec862dc47 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3388,10 +3388,10 @@ __metadata: languageName: node linkType: hard -"@navikt/aksel-icons@npm:^4.11.2": - version: 4.11.2 - resolution: "@navikt/aksel-icons@npm:4.11.2" - checksum: 64612ff63a1a62468547fad4d06a3361ef37b02ae60692e74d005f93532307cd9c414dd00839d3427fcb4aa8d30c44d323250b52b8a7d7367ae0327c4200e1dd +"@navikt/aksel-icons@npm:^5.0.3": + version: 5.0.3 + resolution: "@navikt/aksel-icons@npm:5.0.3" + checksum: 855a025365fc2d2caf7f90acc29158b5b2e0ac58f6574af9ff0078568020766a1affa8317a4c1a092c2651e5757450d3880aa8639d4b041cc20017af39a8bd41 languageName: node linkType: hard @@ -3399,8 +3399,8 @@ __metadata: version: 0.0.0-use.local resolution: "@navikt/appstatus-react-ds@workspace:packages/appstatus-react-ds" dependencies: - "@navikt/ds-css": 4.11.2 - "@navikt/ds-react": 4.11.2 + "@navikt/ds-css": 5.0.3 + "@navikt/ds-react": 5.0.3 "@portabletext/react": 3.0.4 "@sanity/client": 6.4.6 "@types/node": 20.5.0 @@ -3415,8 +3415,8 @@ __metadata: rimraf: 5.0.1 sass: 1.65.1 peerDependencies: - "@navikt/ds-css": 3 - "@navikt/ds-react": 3 + "@navikt/ds-css": 5 + "@navikt/ds-react": 5 sass: 1.x sass-loader: 13.x languageName: unknown @@ -3429,10 +3429,10 @@ __metadata: languageName: node linkType: hard -"@navikt/ds-css@npm:4.11.2": - version: 4.11.2 - resolution: "@navikt/ds-css@npm:4.11.2" - checksum: 30bc28fc60055906241248186ee961245e7589c13b53487497b232c170fa8770998e405b8a3aa8b96cf078eb566d5abd795a0d722c08251b80fe2519346cd8cd +"@navikt/ds-css@npm:5.0.3": + version: 5.0.3 + resolution: "@navikt/ds-css@npm:5.0.3" + checksum: 21aeeff0224bcf9394ae5b997bef5209406adbf60c65b232ca91bcaffc41fe88f67e908c690d192c0ba57aad78a151b68a2bfeb0284d399314cea8915d36c498 languageName: node linkType: hard @@ -3492,32 +3492,31 @@ __metadata: languageName: node linkType: hard -"@navikt/ds-react@npm:4.11.2": - version: 4.11.2 - resolution: "@navikt/ds-react@npm:4.11.2" +"@navikt/ds-react@npm:5.0.3": + version: 5.0.3 + resolution: "@navikt/ds-react@npm:5.0.3" dependencies: "@floating-ui/react": 0.24.1 - "@navikt/aksel-icons": ^4.11.2 + "@navikt/aksel-icons": ^5.0.3 "@radix-ui/react-tabs": 1.0.0 "@radix-ui/react-toggle-group": 1.0.0 clsx: ^1.2.1 date-fns: 2.29.3 react-day-picker: 8.3.4 - react-modal: 3.15.1 peerDependencies: "@types/react": ^17.0.30 || ^18.0.0 react: ^17.0.0 || ^18.0.0 peerDependenciesMeta: "@types/react": optional: true - checksum: c9229108f880718cace445d2ead7102658b44972cb30695880dd9c4fd8dc5ad189a61fcbeffe63de0442dd7324135bd036a67d2d454a8409fa1c0a379e4e377c + checksum: 118e70d567e7f4eccd7a59e5755ff56f05a98cfd583f354abaea8a5829da2e946e51892e552e13bdfaf32333a477b97a58b5278bde88df76ec8638f7418dfd42 languageName: node linkType: hard -"@navikt/ds-tailwind@npm:4.11.2": - version: 4.11.2 - resolution: "@navikt/ds-tailwind@npm:4.11.2" - checksum: 66d4b636a837f1c00635aa02ccf998890d15ee0e36cc9c3febb74ef1a0e1aebd195773b410e5e89aedbc44571e7b0b6e37d7dbbea1ea495b55e4e3b4dfecfdf2 +"@navikt/ds-tailwind@npm:5.0.3": + version: 5.0.3 + resolution: "@navikt/ds-tailwind@npm:5.0.3" + checksum: 5e44d8bf97144552e5f3a17283de905fcc2c486ced43c2e788c63c4bcbf52eb50551e15370809bce34edc607801ea01b4167d036cc87f146ebd8696aa2d2b2a8 languageName: node linkType: hard @@ -3530,9 +3529,9 @@ __metadata: "@babel/plugin-transform-modules-commonjs": 7.22.5 "@babel/preset-env": 7.22.10 "@babel/preset-react": 7.22.5 - "@navikt/ds-css": 4.11.2 - "@navikt/ds-react": 4.11.2 - "@navikt/ds-tailwind": 4.11.2 + "@navikt/ds-css": 5.0.3 + "@navikt/ds-react": 5.0.3 + "@navikt/ds-tailwind": 5.0.3 "@navikt/sif-common-amplitude": "*" "@navikt/sif-common-core-ds": "*" "@navikt/sif-common-formik-ds": "*" @@ -3605,10 +3604,10 @@ __metadata: "@devexperts/remote-data-ts": 2.1.1 "@formatjs/intl-pluralrules": 5.2.4 "@mswjs/data": 0.13.0 - "@navikt/ds-css": 4.11.2 + "@navikt/ds-css": 5.0.3 "@navikt/ds-icons": 3.4.3 - "@navikt/ds-react": 4.11.2 - "@navikt/ds-tailwind": 4.11.2 + "@navikt/ds-react": 5.0.3 + "@navikt/ds-tailwind": 5.0.3 "@navikt/fnrvalidator": 1.3.0 "@navikt/sif-common-amplitude": "*" "@navikt/sif-common-core-ds": "*" @@ -3744,9 +3743,9 @@ __metadata: "@babel/plugin-transform-modules-commonjs": 7.22.5 "@babel/preset-env": 7.22.10 "@babel/preset-react": 7.22.5 - "@navikt/ds-css": 4.11.2 - "@navikt/ds-react": 4.11.2 - "@navikt/ds-tailwind": 4.11.2 + "@navikt/ds-css": 5.0.3 + "@navikt/ds-react": 5.0.3 + "@navikt/ds-tailwind": 5.0.3 "@navikt/sif-common-amplitude": "*" "@navikt/sif-common-core-ds": "*" "@navikt/sif-common-formik-ds": "*" @@ -3810,10 +3809,10 @@ __metadata: "@babel/preset-env": 7.22.10 "@babel/preset-react": 7.22.5 "@babel/preset-typescript": 7.22.5 - "@navikt/ds-css": 4.11.2 + "@navikt/ds-css": 5.0.3 "@navikt/ds-icons": 3.4.3 - "@navikt/ds-react": 4.11.2 - "@navikt/ds-tailwind": 4.11.2 + "@navikt/ds-react": 5.0.3 + "@navikt/ds-tailwind": 5.0.3 "@navikt/sif-common-amplitude": "*" "@navikt/sif-common-core-ds": "*" "@navikt/sif-common-formik-ds": "*" @@ -3885,10 +3884,10 @@ __metadata: "@babel/preset-env": 7.22.10 "@babel/preset-react": 7.22.5 "@babel/preset-typescript": 7.22.5 - "@navikt/ds-css": 4.11.2 + "@navikt/ds-css": 5.0.3 "@navikt/ds-icons": 3.4.3 - "@navikt/ds-react": 4.11.2 - "@navikt/ds-tailwind": 4.11.2 + "@navikt/ds-react": 5.0.3 + "@navikt/ds-tailwind": 5.0.3 "@navikt/sif-common-amplitude": "*" "@navikt/sif-common-core-ds": "*" "@navikt/sif-common-formik-ds": "*" @@ -3966,7 +3965,7 @@ __metadata: resolution: "@navikt/sif-brukerdialog@workspace:." dependencies: "@changesets/cli": 2.26.2 - "@navikt/ds-tailwind": 4.11.2 + "@navikt/ds-tailwind": 5.0.3 "@storybook/builder-webpack5": 7.3.1 "@storybook/manager-webpack5": 6.5.16 "@testing-library/dom": 9.3.1 @@ -4033,11 +4032,11 @@ __metadata: "@babel/preset-typescript": 7.22.5 "@formatjs/intl-pluralrules": 5.2.4 "@navikt/appstatus-react-ds": "*" - "@navikt/ds-css": 4.11.2 + "@navikt/ds-css": 5.0.3 "@navikt/ds-datepicker": 4.2.0 "@navikt/ds-icons": 3.4.3 - "@navikt/ds-react": 4.11.2 - "@navikt/ds-tailwind": 4.11.2 + "@navikt/ds-react": 5.0.3 + "@navikt/ds-tailwind": 5.0.3 "@navikt/fnrvalidator": 1.3.0 "@navikt/sif-common-formik-ds": "*" "@navikt/sif-common-utils": "*" @@ -4088,9 +4087,9 @@ __metadata: webpack: 5.88.2 peerDependencies: "@navikt/appstatus-react-ds": "*" - "@navikt/ds-css": 3 - "@navikt/ds-icons": 3 - "@navikt/ds-react": 3 + "@navikt/ds-css": 5 + "@navikt/ds-icons": 5 + "@navikt/ds-react": 5 "@navikt/sif-common-formik-ds": "*" axios: 1 formik: 2.4.3 @@ -4107,10 +4106,10 @@ __metadata: "@babel/preset-react": 7.22.5 "@babel/preset-typescript": 7.22.5 "@formatjs/intl-pluralrules": 5.2.4 - "@navikt/ds-css": 4.11.2 + "@navikt/ds-css": 5.0.3 "@navikt/ds-datepicker": 4.2.0 "@navikt/ds-icons": 3.4.3 - "@navikt/ds-react": 4.11.2 + "@navikt/ds-react": 5.0.3 "@navikt/fnrvalidator": 1.3.0 "@storybook/addon-a11y": 7.3.1 "@storybook/addon-actions": 7.3.1 @@ -4151,9 +4150,9 @@ __metadata: uuid: 9.0.0 webpack: 5.88.2 peerDependencies: - "@navikt/ds-css": 3 + "@navikt/ds-css": 5 "@navikt/ds-datepicker": ">=4.1.7" - "@navikt/ds-react": 3 + "@navikt/ds-react": 5 formik: 2.x react-intl: 6.x languageName: unknown @@ -4168,8 +4167,8 @@ __metadata: "@babel/preset-react": 7.22.5 "@babel/preset-typescript": 7.22.5 "@formatjs/intl-pluralrules": 5.2.4 - "@navikt/ds-css": 4.11.2 - "@navikt/ds-react": 4.11.2 + "@navikt/ds-css": 5.0.3 + "@navikt/ds-react": 5.0.3 "@navikt/sif-common-core-ds": "*" "@navikt/sif-common-formik-ds": "*" "@navikt/sif-common-utils": "*" @@ -4213,8 +4212,8 @@ __metadata: storybook: 7.3.1 webpack: 5.88.2 peerDependencies: - "@navikt/ds-css": 3 - "@navikt/ds-react": 3 + "@navikt/ds-css": 5 + "@navikt/ds-react": 5 "@navikt/sif-common-core-ds": "*" languageName: unknown linkType: soft @@ -4251,8 +4250,8 @@ __metadata: "@devexperts/remote-data-ts": 2.1.1 "@formatjs/intl-pluralrules": 5.2.4 "@navikt/appstatus-react-ds": "*" - "@navikt/ds-css": 4.11.2 - "@navikt/ds-react": 4.11.2 + "@navikt/ds-css": 5.0.3 + "@navikt/ds-react": 5.0.3 "@navikt/nav-dekoratoren-moduler": 1.6.9 "@navikt/sif-common-core-ds": "*" "@navikt/sif-common-formik-ds": "*" @@ -4303,8 +4302,8 @@ __metadata: "@devexperts/remote-data-ts": 2.x "@formatjs/intl-pluralrules": 5.x "@navikt/appstatus-react-ds": "*" - "@navikt/ds-css": 3 - "@navikt/ds-react": 3 + "@navikt/ds-css": 5 + "@navikt/ds-react": 5 "@navikt/sif-common-formik-ds": "*" "@navikt/sif-common-sentry": "*" "@navikt/sif-common-utils": "*" @@ -4348,11 +4347,11 @@ __metadata: "@babel/preset-react": 7.22.5 "@devexperts/remote-data-ts": 2.1.1 "@formatjs/intl-pluralrules": 5.2.4 - "@navikt/ds-css": 4.11.2 + "@navikt/ds-css": 5.0.3 "@navikt/ds-datepicker": 4.2.0 "@navikt/ds-icons": 3.4.3 - "@navikt/ds-react": 4.11.2 - "@navikt/ds-tailwind": 4.11.2 + "@navikt/ds-react": 5.0.3 + "@navikt/ds-tailwind": 5.0.3 "@navikt/nav-dekoratoren-moduler": 1.6.9 "@navikt/sif-common-amplitude": "*" "@navikt/sif-common-core-ds": "*"