Merge pull request #167 from navikt/react-18

Støtt React 18. Release 6.4.0
navikt · Sep 18, 2023 · c214409 · c214409
2 parents 87f5971 + 622b777
commit c214409
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 20 deletions.
diff --git a/component/package-lock.json b/component/package-lock.json
diff --git a/component/package.json b/component/package.json
@@ -40,8 +40,8 @@
     "typescript": "^4.8.4"
   },
   "peerDependencies": {
-    "react": "17",
-    "react-dom": "17",
+    "react": "17 || 18",
+    "react-dom": "17 || 18",
     "@navikt/ds-css": ">=2",
     "@navikt/ds-icons": ">=2",
     "@navikt/ds-react": ">=2"

diff --git a/component/src/utils/amplitude.tsx b/component/src/utils/amplitude.tsx
@@ -1,6 +1,6 @@
 import amplitude, {AmplitudeClient} from 'amplitude-js'
 import {Notifikasjon} from '../api/graphql-types'
-import React, {createContext, FC, useContext, useMemo} from "react";
+import React, {createContext, ReactNode, useContext, useMemo} from "react";
 import {Miljø} from "../index";
 
 const createAmpltiudeInstance = (apiKey: string) => {
@@ -79,9 +79,10 @@ const AmplitudeContext = createContext(createAmplitudeLogger(stubbedAmplitudeCli
 
 type Props = {
   miljo: Miljø,
+  children: ReactNode,
 }
 
-export const AmplitudeProvider: FC<Props> = ({miljo, children}) => {
+export const AmplitudeProvider = ({miljo, children}: Props) => {
   const client = useAmplitudeClient(miljo)
   const logger = createAmplitudeLogger(client)
   return <AmplitudeContext.Provider value={logger}>