Skip to content

Commit 473dd86

Browse files
authored
React 19 (#3602)
1 parent 5d25997 commit 473dd86

File tree

3 files changed

+333
-300
lines changed

3 files changed

+333
-300
lines changed

package.json

+12-12
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@
2020
"@navikt/ds-react": "7.9.1",
2121
"@navikt/ds-tailwind": "7.9.1",
2222
"@navikt/ds-tokens": "7.9.1",
23-
"@navikt/familie-endringslogg": "13.1.5",
23+
"@navikt/familie-endringslogg": "14.0.0",
2424
"@navikt/fnrvalidator": "2.1.5",
25-
"@navikt/ft-form-hooks": "5.2.9",
26-
"@navikt/ft-form-validators": "2.5.7",
27-
"@navikt/ft-plattform-komponenter": "5.3.0",
25+
"@navikt/ft-form-hooks": "^6.0.3-react19beta.0",
26+
"@navikt/ft-form-validators": "^3.0.3-react19beta.0",
27+
"@navikt/ft-plattform-komponenter": "^7.0.3-react19beta.0",
2828
"@popperjs/core": "2.11.8",
2929
"@reach/combobox": "0.18.0",
3030
"@sentry/browser": "8.48.0",
@@ -74,20 +74,20 @@
7474
"nav-frontend-typografi": "4.0.2",
7575
"nav-frontend-typografi-style": "2.0.2",
7676
"query-string": "7.1.3",
77-
"react": "18.3.1",
77+
"react": "19.0.0",
7878
"react-collapse": "5.1.1",
7979
"react-day-picker": "7.4.10",
80-
"react-dom": "18.3.1",
80+
"react-dom": "19.0.0",
8181
"react-final-form": "6.5.9",
8282
"react-hook-form": "7.54.2",
8383
"react-idle-timer": "5.7.2",
84-
"react-intl": "6.8.9",
84+
"react-intl": "7.1.0",
8585
"react-modal": "3.16.3",
8686
"react-popper": "2.3.0",
8787
"react-query": "3.39.3",
8888
"react-router": "7.1.1",
8989
"tailwindcss": "3.4.17",
90-
"uuid": "11.0.4"
90+
"uuid": "11.0.5"
9191
},
9292
"devDependencies": {
9393
"@babel/core": "7.26.0",
@@ -118,9 +118,9 @@
118118
"@types/chai": "5.0.1",
119119
"@types/history": "5.0.0",
120120
"@types/jest": "29.5.14",
121-
"@types/react": "18.3.18",
121+
"@types/react": "19.0.4",
122122
"@types/react-collapse": "5.0.4",
123-
"@types/react-dom": "18.3.5",
123+
"@types/react-dom": "19.0.2",
124124
"@types/react-intl": "3.0.0",
125125
"@types/react-redux": "7.1.34",
126126
"@typescript-eslint/eslint-plugin": "8.19.1",
@@ -157,7 +157,7 @@
157157
"jest-environment-jsdom": "29.7.0",
158158
"jest-fixed-jsdom": "0.0.9",
159159
"jest-transform-stub": "2.0.0",
160-
"jsdom": "25.0.1",
160+
"jsdom": "26.0.0",
161161
"less": "4.2.1",
162162
"less-loader": "12.2.0",
163163
"lint-staged": "15.3.0",
@@ -170,7 +170,7 @@
170170
"storybook": "8.4.7",
171171
"terser-webpack-plugin": "5.3.11",
172172
"thread-loader": "4.0.4",
173-
"typescript": "5.7.2",
173+
"typescript": "5.7.3",
174174
"webpack": "5.97.1",
175175
"webpack-cli": "6.0.1",
176176
"webpack-dev-server": "5.2.0",

src/client/app/app/components/HeaderWithErrorPanel.tsx

+27-17
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
import React, { FunctionComponent, useCallback, useEffect, useMemo, useRef, useState } from 'react';
22
import { useIntl } from 'react-intl';
33
import { useNavigate } from 'react-router';
4+
import { MenuGridIcon } from '@navikt/aksel-icons';
5+
import { ActionMenu, Dropdown, InternalHeader, Spacer } from '@navikt/ds-react';
46
import Endringslogg from '@navikt/familie-endringslogg';
5-
import { BoxedListWithLinks, Header, Popover, SystemButton, UserPanel } from '@navikt/ft-plattform-komponenter';
7+
import { BoxedListWithLinks, Header, SystemButton } from '@navikt/ft-plattform-komponenter';
68
import DriftsmeldingPanel from 'app/components/DriftsmeldingPanel';
79
import ErrorFormatter from 'app/feilhandtering/ErrorFormatter';
810
import { RETTSKILDE_URL, SHAREPOINT_URL } from 'api/eksterneLenker';
@@ -85,7 +87,6 @@ const HeaderWithErrorPanel: FunctionComponent<OwnProps> = ({ queryStrings, crash
8587
setLenkePanelApent,
8688
setAvdelingerPanelApent,
8789
);
88-
const brukerPanel = <UserPanel name={innloggetSaksbehandler?.navn} />;
8990
const fixedHeaderRef = useRef(null);
9091

9192
const goTilAvdelingslederPanel = () => {
@@ -203,21 +204,30 @@ const HeaderWithErrorPanel: FunctionComponent<OwnProps> = ({ queryStrings, crash
203204
/>
204205
</div>
205206
)}
206-
<Popover
207-
popperIsVisible={erLenkePanelApent}
208-
renderArrowElement
209-
customPopperStyles={{ top: '11px', zIndex: 1 }}
210-
popperProps={{
211-
children: popperPropsChildren,
212-
placement: 'bottom-start',
213-
strategy: 'fixed',
214-
}}
215-
referenceProps={{
216-
// eslint-disable-next-line react/prop-types
217-
children: referencePropsChildren,
218-
}}
219-
/>
220-
{brukerPanel}
207+
<ActionMenu>
208+
<ActionMenu.Trigger>
209+
<InternalHeader.Button>
210+
<MenuGridIcon fontSize="1.5rem" title="Systemer og oppslagsverk" />
211+
</InternalHeader.Button>
212+
</ActionMenu.Trigger>
213+
<ActionMenu.Content>
214+
<ActionMenu.Group label="Systemer og oppslagsverk">
215+
<ActionMenu.Item>
216+
<a href={RETTSKILDE_URL} target="_blank" rel="noopener noreferrer">
217+
Rettskilde
218+
</a>
219+
</ActionMenu.Item>
220+
<ActionMenu.Item>
221+
<a href={SHAREPOINT_URL} target="_blank" rel="noopener noreferrer">
222+
Sharepoint
223+
</a>
224+
</ActionMenu.Item>
225+
</ActionMenu.Group>
226+
</ActionMenu.Content>
227+
</ActionMenu>
228+
<Dropdown.Menu.Divider />
229+
<Spacer />
230+
<InternalHeader.User className="text-white" name="Ola Normann" />
221231
{isDev && (
222232
<button type="button" className={styles.knapp} onClick={loggUt}>
223233
Logg ut

0 commit comments

Comments
 (0)