Compare commits

...
Author SHA1 Message Date
github-actions[bot]andgithub-actions[bot] 6b2547cec5 Version Packages (#2375)
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
2023-10-16 11:20:56 +02:00
Ken 5d4a46d1a8 [aksel.nav.no] Added hotjar (#2362)
* 🔊 Added hotjar

* ⬆️ Bump yarn lock
2023-10-16 10:29:40 +02:00
Ken cb8c7cabee 🐛 Fikset hover på radio ved bruk av readonly (#2363) 2023-10-16 09:36:11 +02:00
22 changed files with 125 additions and 51 deletions

No files matched your search

+2
View File
@@ -1,5 +1,7 @@
# @navikt/aksel-icons
## 5.7.1
## 5.7.0
### Minor Changes
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "@navikt/aksel-icons",
"version": "5.7.0",
"version": "5.7.1",
"author": "Aksel | NAV",
"homepage": "https://aksel.nav.no/ikoner",
"repository": {
+2
View File
@@ -1,5 +1,7 @@
# @navikt/aksel-stylelint
## 5.7.1
## 5.7.0
## 5.6.5
+3 -3
View File
@@ -1,6 +1,6 @@
{
"name": "@navikt/aksel-stylelint",
"version": "5.7.0",
"version": "5.7.1",
"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.7.0",
"@navikt/ds-tokens": "^5.7.0",
"@navikt/ds-css": "^5.7.1",
"@navikt/ds-tokens": "^5.7.1",
"@types/jest": "^29.0.0",
"concurrently": "7.2.1",
"copyfiles": "2.4.1",
+7
View File
@@ -1,5 +1,12 @@
# @navikt/aksel
## 5.7.1
### Patch Changes
- Updated dependencies [[`cb8c7cabe`](https://github.com/navikt/aksel/commit/cb8c7cabeec6ddcf08c06debd7ca889888b1f5e6)]:
- @navikt/ds-css@5.7.1
## 5.7.0
### Patch Changes
+2 -2
View File
@@ -1,6 +1,6 @@
{
"name": "@navikt/aksel",
"version": "5.7.0",
"version": "5.7.1",
"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.7.0",
"@navikt/ds-css": "5.7.1",
"axios": "1.3.6",
"chalk": "4.1.0",
"clipboardy": "^2.3.0",
+6
View File
@@ -1,5 +1,11 @@
# @navikt/ds-css
## 5.7.1
### Patch Changes
- Radio: readonly håndterer nå hover-state bedre ([#2363](https://github.com/navikt/aksel/pull/2363))
## 5.7.0
### Patch Changes
+2 -4
View File
@@ -287,10 +287,8 @@
.navds-checkbox--readonly
> .navds-checkbox__input:hover:not(:checked):not(:indeterminate):not(:focus-visible)
+ .navds-checkbox__label::before,
.navds-radio--readonly > .navds-radio__input:not(:disabled):not(:checked):not(:indeterminate) + .navds-radio__label::before,
.navds-radio--readonly
> .navds-radio__input:hover:not(:checked):not(:indeterminate):not(:focus-visible)
+ .navds-radio__label::before {
.navds-radio--readonly > .navds-radio__input:not(:disabled):not(:checked) + .navds-radio__label::before,
.navds-radio--readonly > .navds-radio__input:hover:not(:checked):not(:focus-visible) + .navds-radio__label::before {
background-color: var(--__ac-radio-checkbox-readonly-bg);
box-shadow: inset 0 0 0 2px var(--__ac-radio-checkbox-readonly-border);
}
+2 -2
View File
@@ -1,6 +1,6 @@
{
"name": "@navikt/ds-css",
"version": "5.7.0",
"version": "5.7.1",
"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.7.0",
"@navikt/ds-tokens": "^5.7.1",
"cssnano": "6.0.0",
"fast-glob": "3.2.11",
"lodash": "4.17.21",
+10
View File
@@ -1,5 +1,15 @@
# @navikt/ds-react
## 5.7.1
### Patch Changes
- Radio: readonly håndterer nå hover-state bedre ([#2363](https://github.com/navikt/aksel/pull/2363))
- Updated dependencies []:
- @navikt/ds-tokens@5.7.1
- @navikt/aksel-icons@5.7.1
## 5.7.0
### Patch Changes
+3 -3
View File
@@ -1,6 +1,6 @@
{
"name": "@navikt/ds-react",
"version": "5.7.0",
"version": "5.7.1",
"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.7.0",
"@navikt/ds-tokens": "^5.7.0",
"@navikt/aksel-icons": "^5.7.1",
"@navikt/ds-tokens": "^5.7.1",
"@radix-ui/react-tabs": "1.0.0",
"@radix-ui/react-toggle-group": "1.0.0",
"clsx": "^1.2.1",
@@ -1,9 +1,9 @@
import { Meta } from "@storybook/react";
import React, { useState } from "react";
import { Accordion, Radio, RadioGroup } from "../../index";
import AccordionItem from "../../accordion/AccordionItem";
import AccordionHeader from "../../accordion/AccordionHeader";
import AccordionContent from "../../accordion/AccordionContent";
import AccordionHeader from "../../accordion/AccordionHeader";
import AccordionItem from "../../accordion/AccordionItem";
import { Accordion, Radio, RadioGroup } from "../../index";
const meta: Meta<typeof Radio> = {
title: "ds-react/Radio",
@@ -138,3 +138,26 @@ export const TestInsideAccordion = () => (
</AccordionItem>
</Accordion>
);
export const Readonly = () => (
<div className="colgap">
<RadioGroup
legend="Hvilken frukt liker du?"
defaultValue={["banan"]}
readOnly
>
<Radio value="banan">Banan</Radio>
<Radio value="eple">Eple</Radio>
<Radio value="druer">Druer</Radio>
</RadioGroup>
<RadioGroup
legend="Hvilken frukt liker du?"
error="feilmelding"
defaultValue="eple"
readOnly
>
<Radio value="eple">Eple</Radio>
<Radio value="banan">Banan</Radio>
</RadioGroup>
</div>
);
+2
View File
@@ -1,5 +1,7 @@
# @navikt/ds-tailwind
## 5.7.1
## 5.7.0
## 5.6.5
+2 -2
View File
@@ -1,6 +1,6 @@
{
"name": "@navikt/ds-tailwind",
"version": "5.7.0",
"version": "5.7.1",
"description": "Tailwind config based on @navikt/ds-tokens",
"author": "Aksel | NAV designsystem team",
"keywords": [
@@ -22,7 +22,7 @@
"directory": "@navikt/core/tailwind"
},
"devDependencies": {
"@navikt/ds-tokens": "^5.7.0",
"@navikt/ds-tokens": "^5.7.1",
"@types/jest": "^29.0.0",
"color": "4.2.3",
"jest": "^29.0.0",
+2
View File
@@ -1,5 +1,7 @@
# @navikt/ds-tokens
## 5.7.1
## 5.7.0
## 5.6.5
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "@navikt/ds-tokens",
"version": "5.7.0",
"version": "5.7.1",
"description": "Design-tokens for NAV designsystem",
"author": "Aksel | NAV designsystem team",
"keywords": [
+10
View File
@@ -1,5 +1,15 @@
# Changelog
## 5.7.1
### @navikt/ds-react
- Radio: readonly håndterer nå hover-state bedre ([#2363](https://github.com/navikt/aksel/pull/2363))
### @navikt/ds-css
- Radio: readonly håndterer nå hover-state bedre ([#2363](https://github.com/navikt/aksel/pull/2363))
## 5.7.0
### @navikt/aksel-icons
+5 -5
View File
@@ -15,11 +15,11 @@
"website"
],
"dependencies": {
"@navikt/aksel-icons": "^5.7.0",
"@navikt/ds-css": "^5.7.0",
"@navikt/ds-react": "^5.7.0",
"@navikt/ds-tailwind": "^5.7.0",
"@navikt/ds-tokens": "^5.7.0"
"@navikt/aksel-icons": "^5.7.1",
"@navikt/ds-css": "^5.7.1",
"@navikt/ds-react": "^5.7.1",
"@navikt/ds-tailwind": "^5.7.1",
"@navikt/ds-tokens": "^5.7.1"
},
"devDependencies": {
"prettier-plugin-tailwindcss": "^0.2.3"
+7 -6
View File
@@ -5,14 +5,15 @@ const withBundleAnalyzer = require("@next/bundle-analyzer")({
});
const cdnUrl = "https://cdn.nav.no";
const hotjarUrl = "https://*.hotjar.com";
const ContentSecurityPolicy = `
default-src 'self' 'unsafe-inline' ${cdnUrl};
font-src 'self' ${cdnUrl} data:;
img-src 'self' cdn.sanity.io https://avatars.githubusercontent.com data: ${cdnUrl};
script-src 'self' ${cdnUrl} https://in2.taskanalytics.com/tm.js 'nonce-4e1aa203a32e' 'unsafe-eval';
style-src 'self' ${cdnUrl} 'unsafe-inline';
connect-src 'self' ${cdnUrl} https://raw.githubusercontent.com/navikt/ https://hnbe3yhs.apicdn.sanity.io wss://hnbe3yhs.api.sanity.io cdn.sanity.io *.api.sanity.io https://amplitude.nav.no https://in2.taskanalytics.com/03346;
font-src 'self' ${cdnUrl} ${hotjarUrl} data:;
img-src 'self' cdn.sanity.io https://avatars.githubusercontent.com data: ${cdnUrl} ${hotjarUrl};
script-src 'self' ${cdnUrl} ${hotjarUrl} https://in2.taskanalytics.com/tm.js 'nonce-4e1aa203a32e' 'unsafe-eval';
style-src 'self' ${cdnUrl} ${hotjarUrl} 'unsafe-inline';
connect-src 'self' ${cdnUrl} ${hotjarUrl} https://raw.githubusercontent.com/navikt/ https://hnbe3yhs.apicdn.sanity.io wss://hnbe3yhs.api.sanity.io cdn.sanity.io *.api.sanity.io https://amplitude.nav.no https://in2.taskanalytics.com/03346;
frame-ancestors 'self' localhost:3000;
media-src 'self' ${cdnUrl} cdn.sanity.io;
frame-src 'self' https://web.microsoftstream.com localhost:3000 https://aksel.ekstern.dev.nav.no;
@@ -53,7 +54,7 @@ const useCdn = process.env.USE_CDN_ASSETS === "true";
const config = () =>
withBundleAnalyzer({
transpilePackages: ["@navikt/ds-tokens"],
transpilePackages: ["@navikt/ds-tokens", "react-hotjar"],
publicRuntimeConfig: {
NEXT_PUBLIC_TEST: process.env.NEXT_PUBLIC_TEST,
},
+1
View File
@@ -49,6 +49,7 @@
"prism-react-renderer": "^2.0.0",
"react": "^18.0.0",
"react-dom": "^18.0.0",
"react-hotjar": "^6.1.0",
"react-responsive-masonry": "^2.1.7",
"sanity": "3.16.2",
"sanity-plugin-asset-source-unsplash": "^1.1.0",
+4 -2
View File
@@ -1,11 +1,12 @@
import { AppProps } from "next/app";
import { BaseSEO } from "components/website-modules/seo/BaseSEO";
import {
initAmplitude,
usePageView,
} from "components/website-modules/utils/amplitude";
import { useScrollToHashOnPageLoad } from "components/website-modules/utils/util";
import { AppProps } from "next/app";
import { useEffect } from "react";
import { hotjar } from "react-hotjar";
import { IdContext } from "../components/website-modules/utils/contexts/id-context";
import "../styles/index.css";
@@ -18,12 +19,13 @@ function App({ Component, pageProps, router }: AppProps) {
useEffect(() => {
window.location.host === "design.nav.no" &&
window.location.replace(`http://aksel.nav.no`);
hotjar.initialize(148751, 6);
}, []);
return (
<>
<BaseSEO path={router.asPath} />
<IdContext.Provider value={{ id: pageProps?.id ?? pageProps?.page?._id }}>
<Component {...pageProps} />
</IdContext.Provider>
+25 -17
View File
@@ -3453,7 +3453,7 @@ __metadata:
languageName: node
linkType: hard
"@navikt/aksel-icons@^5.6.5, @navikt/aksel-icons@workspace:@navikt/aksel-icons":
"@navikt/aksel-icons@^5.7.0, @navikt/aksel-icons@workspace:@navikt/aksel-icons":
version: 0.0.0-use.local
resolution: "@navikt/aksel-icons@workspace:@navikt/aksel-icons"
dependencies:
@@ -3480,8 +3480,8 @@ __metadata:
version: 0.0.0-use.local
resolution: "@navikt/aksel-stylelint@workspace:@navikt/aksel-stylelint"
dependencies:
"@navikt/ds-css": ^5.6.5
"@navikt/ds-tokens": ^5.6.5
"@navikt/ds-css": ^5.7.0
"@navikt/ds-tokens": ^5.7.0
"@types/jest": ^29.0.0
concurrently: 7.2.1
copyfiles: 2.4.1
@@ -3499,7 +3499,7 @@ __metadata:
version: 0.0.0-use.local
resolution: "@navikt/aksel@workspace:@navikt/aksel"
dependencies:
"@navikt/ds-css": 5.6.5
"@navikt/ds-css": 5.7.0
"@types/inquirer": ^9.0.3
"@types/jest": ^29.0.0
axios: 1.3.6
@@ -3523,11 +3523,11 @@ __metadata:
languageName: unknown
linkType: soft
"@navikt/ds-css@*, @navikt/ds-css@5.6.5, @navikt/ds-css@^5.6.5, @navikt/ds-css@workspace:@navikt/core/css":
"@navikt/ds-css@*, @navikt/ds-css@5.7.0, @navikt/ds-css@^5.7.0, @navikt/ds-css@workspace:@navikt/core/css":
version: 0.0.0-use.local
resolution: "@navikt/ds-css@workspace:@navikt/core/css"
dependencies:
"@navikt/ds-tokens": ^5.6.5
"@navikt/ds-tokens": ^5.7.0
cssnano: 6.0.0
fast-glob: 3.2.11
lodash: 4.17.21
@@ -3540,13 +3540,13 @@ __metadata:
languageName: unknown
linkType: soft
"@navikt/ds-react@*, @navikt/ds-react@^5.6.5, @navikt/ds-react@workspace:@navikt/core/react":
"@navikt/ds-react@*, @navikt/ds-react@^5.7.0, @navikt/ds-react@workspace:@navikt/core/react":
version: 0.0.0-use.local
resolution: "@navikt/ds-react@workspace:@navikt/core/react"
dependencies:
"@floating-ui/react": 0.25.4
"@navikt/aksel-icons": ^5.6.5
"@navikt/ds-tokens": ^5.6.5
"@navikt/aksel-icons": ^5.7.0
"@navikt/ds-tokens": ^5.7.0
"@radix-ui/react-tabs": 1.0.0
"@radix-ui/react-toggle-group": 1.0.0
"@testing-library/dom": 8.13.0
@@ -3580,11 +3580,11 @@ __metadata:
languageName: unknown
linkType: soft
"@navikt/ds-tailwind@^5.6.5, @navikt/ds-tailwind@workspace:@navikt/core/tailwind":
"@navikt/ds-tailwind@^5.7.0, @navikt/ds-tailwind@workspace:@navikt/core/tailwind":
version: 0.0.0-use.local
resolution: "@navikt/ds-tailwind@workspace:@navikt/core/tailwind"
dependencies:
"@navikt/ds-tokens": ^5.6.5
"@navikt/ds-tokens": ^5.7.0
"@types/jest": ^29.0.0
color: 4.2.3
jest: ^29.0.0
@@ -3595,7 +3595,7 @@ __metadata:
languageName: unknown
linkType: soft
"@navikt/ds-tokens@^5.6.5, @navikt/ds-tokens@workspace:@navikt/core/tokens":
"@navikt/ds-tokens@^5.7.0, @navikt/ds-tokens@workspace:@navikt/core/tokens":
version: 0.0.0-use.local
resolution: "@navikt/ds-tokens@workspace:@navikt/core/tokens"
dependencies:
@@ -8490,11 +8490,11 @@ __metadata:
version: 0.0.0-use.local
resolution: "aksel.nav.no@workspace:aksel.nav.no"
dependencies:
"@navikt/aksel-icons": ^5.6.5
"@navikt/ds-css": ^5.6.5
"@navikt/ds-react": ^5.6.5
"@navikt/ds-tailwind": ^5.6.5
"@navikt/ds-tokens": ^5.6.5
"@navikt/aksel-icons": ^5.7.0
"@navikt/ds-css": ^5.7.0
"@navikt/ds-react": ^5.7.0
"@navikt/ds-tailwind": ^5.7.0
"@navikt/ds-tokens": ^5.7.0
prettier-plugin-tailwindcss: ^0.2.3
languageName: unknown
linkType: soft
@@ -21843,6 +21843,13 @@ __metadata:
languageName: node
linkType: hard
"react-hotjar@npm:^6.1.0":
version: 6.1.0
resolution: "react-hotjar@npm:6.1.0"
checksum: 555600eb277a08ba01268b42d9552a44014fad4fcc5db37229657d386673f0399e9b7e1fb25bf287afeec09ee8f2546def374f448ca68ae23745f4ace03d5e3a
languageName: node
linkType: hard
"react-infinite-scroll-component@npm:6.1.0":
version: 6.1.0
resolution: "react-infinite-scroll-component@npm:6.1.0"
@@ -26623,6 +26630,7 @@ __metadata:
prism-react-renderer: ^2.0.0
react: ^18.0.0
react-dom: ^18.0.0
react-hotjar: ^6.1.0
react-responsive-masonry: ^2.1.7
sanity: 3.16.2
sanity-plugin-asset-source-unsplash: ^1.1.0