diff --git a/package-lock.json b/package-lock.json index ad7402b16..acf064fe9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,10 +8,10 @@ "name": "nav-dekoratoren", "version": "1.0.0", "dependencies": { - "@navikt/ds-css": "2.9.0", - "@navikt/ds-icons": "2.9.0", - "@navikt/ds-react": "2.9.0", - "@navikt/ds-tokens": "2.9.0", + "@navikt/ds-css": "5.4.1", + "@navikt/ds-icons": "3.4.3", + "@navikt/ds-react": "5.4.1", + "@navikt/ds-tokens": "5.4.1", "@navikt/nav-dekoratoren-moduler": "2.1.3", "@promster/express": "7.0.6", "amplitude-js": "8.21.9", @@ -2296,24 +2296,28 @@ } }, "node_modules/@floating-ui/core": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.1.0.tgz", - "integrity": "sha512-zbsLwtnHo84w1Kc8rScAo5GMk1GdecSlrflIbfnEBJwvTSj1SL6kkOYV+nHraMCPEy+RNZZUaZyL8JosDGCtGQ==" + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.4.1.tgz", + "integrity": "sha512-jk3WqquEJRlcyu7997NtR5PibI+y5bi+LS3hPmguVClypenMsCY3CBa3LAQnozRCtCrYWSEtAdiskpamuJRFOQ==", + "dependencies": { + "@floating-ui/utils": "^0.1.1" + } }, "node_modules/@floating-ui/dom": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.1.0.tgz", - "integrity": "sha512-TSogMPVxbRe77QCj1dt8NmRiJasPvuc+eT5jnJ6YpLqgOD2zXc5UA3S1qwybN+GVCDNdKfpKy1oj8RpzLJvh6A==", + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.5.2.tgz", + "integrity": "sha512-6ArmenS6qJEWmwzczWyhvrXRdI/rI78poBcW0h/456+onlabit+2G+QxHx5xTOX60NBJQXjsCLFbW2CmsXpUog==", "dependencies": { - "@floating-ui/core": "^1.0.5" + "@floating-ui/core": "^1.4.1", + "@floating-ui/utils": "^0.1.1" } }, "node_modules/@floating-ui/react": { - "version": "0.17.0", - "resolved": "https://registry.npmjs.org/@floating-ui/react/-/react-0.17.0.tgz", - "integrity": "sha512-LYlTmiB1O2TmeNub1agGYJrO7Qkw1B0Q53aElN5dgZDO5v3yzYJmrGm/xmfD+0T03yEECzPKdwlSFCEPWKMLEQ==", + "version": "0.24.1", + "resolved": "https://registry.npmjs.org/@floating-ui/react/-/react-0.24.1.tgz", + "integrity": "sha512-qjCKUZDEz/4bnJmu4gn66TqsoX912/re8JGEi3pXazsphmyh327l0UpTgpBAT3WkNbnzAH7Adt3wKlLMNtfupw==", "dependencies": { - "@floating-ui/react-dom": "^1.2.0", + "@floating-ui/react-dom": "^2.0.0", "aria-hidden": "^1.1.3", "tabbable": "^6.0.1" }, @@ -2323,17 +2327,22 @@ } }, "node_modules/@floating-ui/react-dom": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@floating-ui/react-dom/-/react-dom-1.2.1.tgz", - "integrity": "sha512-YCLlqibZtgUhxUpxkSp1oekvYgH/jI4KdZEJv85E62twlZHN43xdlQNe6JcF4ROD3/Zu6juNHN+aOygN+6yZjg==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/@floating-ui/react-dom/-/react-dom-2.0.2.tgz", + "integrity": "sha512-5qhlDvjaLmAst/rKb3VdlCinwTF4EYMiVxuuc/HVUjs46W0zgtbMmAZ1UTsDrRTxRmUEzl92mOtWbeeXL26lSQ==", "dependencies": { - "@floating-ui/dom": "^1.1.0" + "@floating-ui/dom": "^1.5.1" }, "peerDependencies": { "react": ">=16.8.0", "react-dom": ">=16.8.0" } }, + "node_modules/@floating-ui/utils": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.1.2.tgz", + "integrity": "sha512-ou3elfqG/hZsbmF4bxeJhPHIf3G2pm0ujc39hYEZrfVqt7Vk/Zji6CXc3W0pmYM8BW1g40U+akTl9DKZhFhInQ==" + }, "node_modules/@humanwhocodes/config-array": { "version": "0.11.8", "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.8.tgz", @@ -2902,21 +2911,21 @@ } }, "node_modules/@navikt/aksel-icons": { - "version": "2.9.0", - "resolved": "https://npm.pkg.github.com/download/@navikt/aksel-icons/2.9.0/5de74b4925840e97d9d76fac2685b5e4899a306b", - "integrity": "sha512-drd7slczZ0cRzZSzqoCePTkXqdIwrGq4itapk3JIm5m2YUpamWlMAr+uFDdVYrDDbqH0xqspFuQdMIZCTdZzJw==", + "version": "5.4.1", + "resolved": "https://npm.pkg.github.com/download/@navikt/aksel-icons/5.4.1/ff7b887a287ef24a443bccef0471a04f4c299387", + "integrity": "sha512-PWjCtiLXSWvUDeeLsRUHCNl69AZpihdVqe8jcOM6sCYwIBv6QFw/HG4rQKtD1VirrsXvk+yOeENTC75zEJXiTw==", "license": "MIT" }, "node_modules/@navikt/ds-css": { - "version": "2.9.0", - "resolved": "https://npm.pkg.github.com/download/@navikt/ds-css/2.9.0/7272f0aeae7c99bd7a474fbe97a993fa1bf44973", - "integrity": "sha512-QaMDwWwDkHTqxle2sBNAfyLgZORpm4MAj99/4wuswdZT23bOL8RHhdPBM5tTWtWGQwv0s4NkFFkh/Bn0+TrWUw==", + "version": "5.4.1", + "resolved": "https://npm.pkg.github.com/download/@navikt/ds-css/5.4.1/261168dc8c8a5bd8739f301d45238d634bab95c3", + "integrity": "sha512-f/Fs5i4vv54dORLa8cq0muXielCUQy6asO7ugFzkzBdfzqa49gizQ14kQAbpGoEkEsfa09oSgyqL/KgH8tPX1g==", "license": "MIT" }, "node_modules/@navikt/ds-icons": { - "version": "2.9.0", - "resolved": "https://npm.pkg.github.com/download/@navikt/ds-icons/2.9.0/0b74c60c5843b8c6f54f130e8cdb9d9005a629e9", - "integrity": "sha512-/ulQBBnvXW6Rt56f4M3OmpJ5GEzoHhg1JzrvDu4oYnMgR6NFsLyFlTECTXWBcj4GQXd11ClaThpfgIxqtJR+pg==", + "version": "3.4.3", + "resolved": "https://npm.pkg.github.com/download/@navikt/ds-icons/3.4.3/eaa8fc38f6d184806d3405a5efbc9d137c2b8d27", + "integrity": "sha512-Ys25tnDUzS+AtagMMW4/154OCZy+pTxCv9uiV4YcZUeXMfjnMiRWx1dueyCODb7FF7Jd6TwELd3G6ieQt/rf+w==", "license": "MIT", "peerDependencies": { "@types/react": "^17.0.30 || ^18.0.0", @@ -2924,20 +2933,18 @@ } }, "node_modules/@navikt/ds-react": { - "version": "2.9.0", - "resolved": "https://npm.pkg.github.com/download/@navikt/ds-react/2.9.0/4264be93b794ab2f5034794603703f2ff698a6ea", - "integrity": "sha512-5UqIHem45LgqpvrQXxTfddxYepCxUDZDhcNhDn2Ggmki+lRtkZEKWbR8eDzogZmLm/ZFjW0KNFi7cI8mpgwUIQ==", + "version": "5.4.1", + "resolved": "https://npm.pkg.github.com/download/@navikt/ds-react/5.4.1/7813d0cb086b3ba77c98bc915cee5d31589ba1ed", + "integrity": "sha512-23QOU3eBJj/x5dRy4CqmOWoFz+tSq14yvD3IDUbiqlGklCHziz9TNSSThW+vINQwVz4T7FNQZRdUsbS9P9RWlA==", "license": "MIT", "dependencies": { - "@floating-ui/react": "0.17.0", - "@navikt/aksel-icons": "^2.9.0", - "@navikt/ds-icons": "^2.9.0", + "@floating-ui/react": "0.24.1", + "@navikt/aksel-icons": "^5.4.1", "@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" + "react-day-picker": "8.3.4" }, "peerDependencies": { "@types/react": "^17.0.30 || ^18.0.0", @@ -2945,9 +2952,9 @@ } }, "node_modules/@navikt/ds-tokens": { - "version": "2.9.0", - "resolved": "https://npm.pkg.github.com/download/@navikt/ds-tokens/2.9.0/53ba172cf8606e14bc003d2f4f50ffd1612e73e0", - "integrity": "sha512-Wrvoh+YPBByv7jwM5KW1g0UoO5jXzuJOfDiaLogbdA3lXLTP8X/e7JTzsl9A6Mh1V9Xd/8xx/DK8np/RqkIyEg==", + "version": "5.4.1", + "resolved": "https://npm.pkg.github.com/download/@navikt/ds-tokens/5.4.1/884606d1e48f698df9df27bbe329ed59aaa85ffd", + "integrity": "sha512-DMSCSO6Z65Kun1WC09XY5wZpjl9B/M52Jjrtbtj9ty/JG/U8jOhsorRhuPBGyAva/l2ry7qtOW6NpXBmh8Uamg==", "license": "MIT" }, "node_modules/@navikt/nav-dekoratoren-moduler": { @@ -4541,23 +4548,14 @@ } }, "node_modules/aria-hidden": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/aria-hidden/-/aria-hidden-1.2.2.tgz", - "integrity": "sha512-6y/ogyDTk/7YAe91T3E2PR1ALVKyM2QbTio5HwM+N1Q6CMlCKhvClyIjkckBswa0f2xJhjsfzIGa1yVSe1UMVA==", + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/aria-hidden/-/aria-hidden-1.2.3.tgz", + "integrity": "sha512-xcLxITLe2HYa1cnYnwCjkOO1PqUHQpozB8x9AR0OgWN2woOBi5kSDVxKfd0b7sb1hw5qFeJhXm9H1nu3xSfLeQ==", "dependencies": { "tslib": "^2.0.0" }, "engines": { "node": ">=10" - }, - "peerDependencies": { - "@types/react": "^16.9.0 || ^17.0.0 || ^18.0.0", - "react": "^16.9.0 || ^17.0.0 || ^18.0.0" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } } }, "node_modules/aria-query": { @@ -7123,11 +7121,6 @@ "node": ">= 8" } }, - "node_modules/exenv": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/exenv/-/exenv-1.2.2.tgz", - "integrity": "sha1-KueOhdmJQVhnCwPUe+wfA72Ru50=" - }, "node_modules/exit": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz", @@ -11163,6 +11156,7 @@ "version": "4.1.1", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", + "devOptional": true, "engines": { "node": ">=0.10.0" } @@ -12321,6 +12315,7 @@ "version": "15.8.1", "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz", "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==", + "dev": true, "dependencies": { "loose-envify": "^1.4.0", "object-assign": "^4.1.1", @@ -12540,29 +12535,6 @@ "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==" }, - "node_modules/react-lifecycles-compat": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz", - "integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==" - }, - "node_modules/react-modal": { - "version": "3.15.1", - "resolved": "https://registry.npmjs.org/react-modal/-/react-modal-3.15.1.tgz", - "integrity": "sha512-duB9bxOaYg7Zt6TMFldIFxQRtSP+Dg3F1ZX3FXxSUn+3tZZ/9JCgeAQKDg7rhZSAqopq8TFRw3yIbnx77gyFTw==", - "dependencies": { - "exenv": "^1.2.0", - "prop-types": "^15.7.2", - "react-lifecycles-compat": "^3.0.0", - "warning": "^4.0.3" - }, - "engines": { - "node": ">=8" - }, - "peerDependencies": { - "react": "^0.14.0 || ^15.0.0 || ^16 || ^17 || ^18", - "react-dom": "^0.14.0 || ^15.0.0 || ^16 || ^17 || ^18" - } - }, "node_modules/react-property": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/react-property/-/react-property-2.0.0.tgz", @@ -13741,9 +13713,9 @@ "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==" }, "node_modules/tabbable": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/tabbable/-/tabbable-6.0.1.tgz", - "integrity": "sha512-SYJSIgeyXW7EuX1ytdneO5e8jip42oHWg9xl/o3oTYhmXusZVgiA+VlPvjIN+kHii9v90AmzTZEBcsEvuAY+TA==" + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/tabbable/-/tabbable-6.2.0.tgz", + "integrity": "sha512-Cat63mxsVJlzYvN51JmVXIgNoUokrIaT2zLclCXjRd8boZ0004U4KCs/sToJ75C6sdlByWxpYnb5Boif1VSFew==" }, "node_modules/tapable": { "version": "2.2.1", @@ -14368,14 +14340,6 @@ "makeerror": "1.0.12" } }, - "node_modules/warning": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz", - "integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==", - "dependencies": { - "loose-envify": "^1.0.0" - } - }, "node_modules/watchpack": { "version": "2.4.0", "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz", @@ -16511,36 +16475,45 @@ "dev": true }, "@floating-ui/core": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.1.0.tgz", - "integrity": "sha512-zbsLwtnHo84w1Kc8rScAo5GMk1GdecSlrflIbfnEBJwvTSj1SL6kkOYV+nHraMCPEy+RNZZUaZyL8JosDGCtGQ==" + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.4.1.tgz", + "integrity": "sha512-jk3WqquEJRlcyu7997NtR5PibI+y5bi+LS3hPmguVClypenMsCY3CBa3LAQnozRCtCrYWSEtAdiskpamuJRFOQ==", + "requires": { + "@floating-ui/utils": "^0.1.1" + } }, "@floating-ui/dom": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.1.0.tgz", - "integrity": "sha512-TSogMPVxbRe77QCj1dt8NmRiJasPvuc+eT5jnJ6YpLqgOD2zXc5UA3S1qwybN+GVCDNdKfpKy1oj8RpzLJvh6A==", + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.5.2.tgz", + "integrity": "sha512-6ArmenS6qJEWmwzczWyhvrXRdI/rI78poBcW0h/456+onlabit+2G+QxHx5xTOX60NBJQXjsCLFbW2CmsXpUog==", "requires": { - "@floating-ui/core": "^1.0.5" + "@floating-ui/core": "^1.4.1", + "@floating-ui/utils": "^0.1.1" } }, "@floating-ui/react": { - "version": "0.17.0", - "resolved": "https://registry.npmjs.org/@floating-ui/react/-/react-0.17.0.tgz", - "integrity": "sha512-LYlTmiB1O2TmeNub1agGYJrO7Qkw1B0Q53aElN5dgZDO5v3yzYJmrGm/xmfD+0T03yEECzPKdwlSFCEPWKMLEQ==", + "version": "0.24.1", + "resolved": "https://registry.npmjs.org/@floating-ui/react/-/react-0.24.1.tgz", + "integrity": "sha512-qjCKUZDEz/4bnJmu4gn66TqsoX912/re8JGEi3pXazsphmyh327l0UpTgpBAT3WkNbnzAH7Adt3wKlLMNtfupw==", "requires": { - "@floating-ui/react-dom": "^1.2.0", + "@floating-ui/react-dom": "^2.0.0", "aria-hidden": "^1.1.3", "tabbable": "^6.0.1" } }, "@floating-ui/react-dom": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@floating-ui/react-dom/-/react-dom-1.2.1.tgz", - "integrity": "sha512-YCLlqibZtgUhxUpxkSp1oekvYgH/jI4KdZEJv85E62twlZHN43xdlQNe6JcF4ROD3/Zu6juNHN+aOygN+6yZjg==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/@floating-ui/react-dom/-/react-dom-2.0.2.tgz", + "integrity": "sha512-5qhlDvjaLmAst/rKb3VdlCinwTF4EYMiVxuuc/HVUjs46W0zgtbMmAZ1UTsDrRTxRmUEzl92mOtWbeeXL26lSQ==", "requires": { - "@floating-ui/dom": "^1.1.0" + "@floating-ui/dom": "^1.5.1" } }, + "@floating-ui/utils": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.1.2.tgz", + "integrity": "sha512-ou3elfqG/hZsbmF4bxeJhPHIf3G2pm0ujc39hYEZrfVqt7Vk/Zji6CXc3W0pmYM8BW1g40U+akTl9DKZhFhInQ==" + }, "@humanwhocodes/config-array": { "version": "0.11.8", "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.8.tgz", @@ -16990,41 +16963,39 @@ } }, "@navikt/aksel-icons": { - "version": "2.9.0", - "resolved": "https://npm.pkg.github.com/download/@navikt/aksel-icons/2.9.0/5de74b4925840e97d9d76fac2685b5e4899a306b", - "integrity": "sha512-drd7slczZ0cRzZSzqoCePTkXqdIwrGq4itapk3JIm5m2YUpamWlMAr+uFDdVYrDDbqH0xqspFuQdMIZCTdZzJw==" + "version": "5.4.1", + "resolved": "https://npm.pkg.github.com/download/@navikt/aksel-icons/5.4.1/ff7b887a287ef24a443bccef0471a04f4c299387", + "integrity": "sha512-PWjCtiLXSWvUDeeLsRUHCNl69AZpihdVqe8jcOM6sCYwIBv6QFw/HG4rQKtD1VirrsXvk+yOeENTC75zEJXiTw==" }, "@navikt/ds-css": { - "version": "2.9.0", - "resolved": "https://npm.pkg.github.com/download/@navikt/ds-css/2.9.0/7272f0aeae7c99bd7a474fbe97a993fa1bf44973", - "integrity": "sha512-QaMDwWwDkHTqxle2sBNAfyLgZORpm4MAj99/4wuswdZT23bOL8RHhdPBM5tTWtWGQwv0s4NkFFkh/Bn0+TrWUw==" + "version": "5.4.1", + "resolved": "https://npm.pkg.github.com/download/@navikt/ds-css/5.4.1/261168dc8c8a5bd8739f301d45238d634bab95c3", + "integrity": "sha512-f/Fs5i4vv54dORLa8cq0muXielCUQy6asO7ugFzkzBdfzqa49gizQ14kQAbpGoEkEsfa09oSgyqL/KgH8tPX1g==" }, "@navikt/ds-icons": { - "version": "2.9.0", - "resolved": "https://npm.pkg.github.com/download/@navikt/ds-icons/2.9.0/0b74c60c5843b8c6f54f130e8cdb9d9005a629e9", - "integrity": "sha512-/ulQBBnvXW6Rt56f4M3OmpJ5GEzoHhg1JzrvDu4oYnMgR6NFsLyFlTECTXWBcj4GQXd11ClaThpfgIxqtJR+pg==", + "version": "3.4.3", + "resolved": "https://npm.pkg.github.com/download/@navikt/ds-icons/3.4.3/eaa8fc38f6d184806d3405a5efbc9d137c2b8d27", + "integrity": "sha512-Ys25tnDUzS+AtagMMW4/154OCZy+pTxCv9uiV4YcZUeXMfjnMiRWx1dueyCODb7FF7Jd6TwELd3G6ieQt/rf+w==", "requires": {} }, "@navikt/ds-react": { - "version": "2.9.0", - "resolved": "https://npm.pkg.github.com/download/@navikt/ds-react/2.9.0/4264be93b794ab2f5034794603703f2ff698a6ea", - "integrity": "sha512-5UqIHem45LgqpvrQXxTfddxYepCxUDZDhcNhDn2Ggmki+lRtkZEKWbR8eDzogZmLm/ZFjW0KNFi7cI8mpgwUIQ==", + "version": "5.4.1", + "resolved": "https://npm.pkg.github.com/download/@navikt/ds-react/5.4.1/7813d0cb086b3ba77c98bc915cee5d31589ba1ed", + "integrity": "sha512-23QOU3eBJj/x5dRy4CqmOWoFz+tSq14yvD3IDUbiqlGklCHziz9TNSSThW+vINQwVz4T7FNQZRdUsbS9P9RWlA==", "requires": { - "@floating-ui/react": "0.17.0", - "@navikt/aksel-icons": "^2.9.0", - "@navikt/ds-icons": "^2.9.0", + "@floating-ui/react": "0.24.1", + "@navikt/aksel-icons": "^5.4.1", "@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" + "react-day-picker": "8.3.4" } }, "@navikt/ds-tokens": { - "version": "2.9.0", - "resolved": "https://npm.pkg.github.com/download/@navikt/ds-tokens/2.9.0/53ba172cf8606e14bc003d2f4f50ffd1612e73e0", - "integrity": "sha512-Wrvoh+YPBByv7jwM5KW1g0UoO5jXzuJOfDiaLogbdA3lXLTP8X/e7JTzsl9A6Mh1V9Xd/8xx/DK8np/RqkIyEg==" + "version": "5.4.1", + "resolved": "https://npm.pkg.github.com/download/@navikt/ds-tokens/5.4.1/884606d1e48f698df9df27bbe329ed59aaa85ffd", + "integrity": "sha512-DMSCSO6Z65Kun1WC09XY5wZpjl9B/M52Jjrtbtj9ty/JG/U8jOhsorRhuPBGyAva/l2ry7qtOW6NpXBmh8Uamg==" }, "@navikt/nav-dekoratoren-moduler": { "version": "2.1.3", @@ -18310,9 +18281,9 @@ } }, "aria-hidden": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/aria-hidden/-/aria-hidden-1.2.2.tgz", - "integrity": "sha512-6y/ogyDTk/7YAe91T3E2PR1ALVKyM2QbTio5HwM+N1Q6CMlCKhvClyIjkckBswa0f2xJhjsfzIGa1yVSe1UMVA==", + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/aria-hidden/-/aria-hidden-1.2.3.tgz", + "integrity": "sha512-xcLxITLe2HYa1cnYnwCjkOO1PqUHQpozB8x9AR0OgWN2woOBi5kSDVxKfd0b7sb1hw5qFeJhXm9H1nu3xSfLeQ==", "requires": { "tslib": "^2.0.0" } @@ -20209,11 +20180,6 @@ } } }, - "exenv": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/exenv/-/exenv-1.2.2.tgz", - "integrity": "sha1-KueOhdmJQVhnCwPUe+wfA72Ru50=" - }, "exit": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz", @@ -23194,7 +23160,8 @@ "object-assign": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=" + "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", + "devOptional": true }, "object-hash": { "version": "3.0.0", @@ -23948,6 +23915,7 @@ "version": "15.8.1", "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz", "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==", + "dev": true, "requires": { "loose-envify": "^1.4.0", "object-assign": "^4.1.1", @@ -24097,22 +24065,6 @@ "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==" }, - "react-lifecycles-compat": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz", - "integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==" - }, - "react-modal": { - "version": "3.15.1", - "resolved": "https://registry.npmjs.org/react-modal/-/react-modal-3.15.1.tgz", - "integrity": "sha512-duB9bxOaYg7Zt6TMFldIFxQRtSP+Dg3F1ZX3FXxSUn+3tZZ/9JCgeAQKDg7rhZSAqopq8TFRw3yIbnx77gyFTw==", - "requires": { - "exenv": "^1.2.0", - "prop-types": "^15.7.2", - "react-lifecycles-compat": "^3.0.0", - "warning": "^4.0.3" - } - }, "react-property": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/react-property/-/react-property-2.0.0.tgz", @@ -24974,9 +24926,9 @@ "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==" }, "tabbable": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/tabbable/-/tabbable-6.0.1.tgz", - "integrity": "sha512-SYJSIgeyXW7EuX1ytdneO5e8jip42oHWg9xl/o3oTYhmXusZVgiA+VlPvjIN+kHii9v90AmzTZEBcsEvuAY+TA==" + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/tabbable/-/tabbable-6.2.0.tgz", + "integrity": "sha512-Cat63mxsVJlzYvN51JmVXIgNoUokrIaT2zLclCXjRd8boZ0004U4KCs/sToJ75C6sdlByWxpYnb5Boif1VSFew==" }, "tapable": { "version": "2.2.1", @@ -25444,14 +25396,6 @@ "makeerror": "1.0.12" } }, - "warning": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz", - "integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==", - "requires": { - "loose-envify": "^1.0.0" - } - }, "watchpack": { "version": "2.4.0", "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz", diff --git a/package.json b/package.json index 0df5cef37..216223e1f 100644 --- a/package.json +++ b/package.json @@ -28,10 +28,10 @@ "url": "https://github.com/navikt/nav-dekoratoren/issues" }, "dependencies": { - "@navikt/ds-css": "2.9.0", - "@navikt/ds-icons": "2.9.0", - "@navikt/ds-react": "2.9.0", - "@navikt/ds-tokens": "2.9.0", + "@navikt/ds-css": "5.4.1", + "@navikt/ds-icons": "3.4.3", + "@navikt/ds-react": "5.4.1", + "@navikt/ds-tokens": "5.4.1", "@navikt/nav-dekoratoren-moduler": "2.1.3", "@promster/express": "7.0.6", "amplitude-js": "8.21.9", diff --git a/src/komponenter/footer/common/del-skjerm-modal/DelSkjermModal.tsx b/src/komponenter/footer/common/del-skjerm-modal/DelSkjermModal.tsx index 56959767a..1571e9817 100644 --- a/src/komponenter/footer/common/del-skjerm-modal/DelSkjermModal.tsx +++ b/src/komponenter/footer/common/del-skjerm-modal/DelSkjermModal.tsx @@ -63,68 +63,60 @@ const DelSkjermModal = (props: Props) => { } }; - const parent = document.getElementById('decorator-footer-inner'); - return ( - parent : undefined} - > -
- -
-
- - - -
- - - - -
    - {[...Array(3)].map((_, i) => ( -
  • - - - -
  • - ))} -
-
+ + +
+ +
+
+ + + +
+ + + + +
    + {[...Array(3)].map((_, i) => ( +
  • + + + +
  • + ))} +
+
+
+ {isLoading && } + {isOpen && isSuccess && ( + <> + +
+ + +
+ + )} + {!isOpen && !isLoading && ( + + + + )}
- {isLoading && } - {isOpen && isSuccess && ( - <> - -
- - -
- - )} - {!isOpen && !isLoading && ( - - - - )} -
+ ); }; diff --git a/src/komponenter/header/logoutWarning/LogoutWarning.tsx b/src/komponenter/header/logoutWarning/LogoutWarning.tsx index 4737c0511..7c23dc385 100644 --- a/src/komponenter/header/logoutWarning/LogoutWarning.tsx +++ b/src/komponenter/header/logoutWarning/LogoutWarning.tsx @@ -1,4 +1,4 @@ -import { BodyLong, Button, Heading, Modal } from '@navikt/ds-react'; +import { BodyLong, Button, Modal } from '@navikt/ds-react'; import React, { useEffect } from 'react'; import { useLoginStatus } from 'utils/hooks/useLoginStatus'; import { finnTekst } from 'tekster/finn-tekst'; @@ -34,8 +34,6 @@ export const LogoutWarning = () => { return null; } - const parent = document.getElementById('logout-warning'); - const titleId: LangKey = isSessionExpiring ? 'snart-session-logget-ut-tittel' : 'snart-token-logget-ut-tittel'; const textBodyId: LangKey = isSessionExpiring ? 'snart-session-logget-ut-body' : 'snart-token-logget-ut-body'; @@ -45,16 +43,14 @@ export const LogoutWarning = () => { e.preventDefault()} className={classNames(styles.logoutWarning, isOpen && styles.visible)} - parentSelector={parent ? () => parent : undefined} > - - - {finnTekst(titleId, language, minutesToSessionEnd.toString())} - + {finnTekst(textBodyId, language)}
{isSessionExpiring && ( @@ -71,7 +67,7 @@ export const LogoutWarning = () => { {finnTekst('logg-ut-knapp', language)}
-
+
); }; diff --git a/src/utils/hooks/useLoginStatus.ts b/src/utils/hooks/useLoginStatus.ts index 2899cd8e8..ecd84c90f 100644 --- a/src/utils/hooks/useLoginStatus.ts +++ b/src/utils/hooks/useLoginStatus.ts @@ -87,5 +87,5 @@ export const useLoginStatus = () => { window.addEventListener('visibilitychange', onVisibilityChange); }, []); - return { isTokenExpiring, isSessionExpiring, refreshTokenHandler, logoutHandler, secondsToSessionExpires}; + return { isTokenExpiring, isSessionExpiring, refreshTokenHandler, logoutHandler, secondsToSessionExpires }; };