From 3c3aaed96f1ea387aebaedd6aac9533dbb0f2588 Mon Sep 17 00:00:00 2001 From: frodehansen2 Date: Mon, 19 Aug 2024 11:52:08 +0200 Subject: [PATCH] Oppdaterte felleskomponenter ifbm aksel-oppsummeringsmal (#2113) * Felleskomponenter ifbm Aksel oppsummering * Oppdatere versjonsnumre * Cleanup --- .../CHANGELOG.md | 9 ++++ .../package.json | 2 +- apps/endringsmelding-pleiepenger/CHANGELOG.md | 10 ++++ apps/endringsmelding-pleiepenger/package.json | 2 +- .../CHANGELOG.md | 10 ++++ .../package.json | 2 +- .../CHANGELOG.md | 10 ++++ .../package.json | 2 +- .../CHANGELOG.md | 10 ++++ .../package.json | 2 +- apps/omsorgspengesoknad/CHANGELOG.md | 11 ++++ apps/omsorgspengesoknad/package.json | 2 +- .../CHANGELOG.md | 11 ++++ .../package.json | 2 +- apps/pleiepenger-sykt-barn/CHANGELOG.md | 11 ++++ apps/pleiepenger-sykt-barn/package.json | 2 +- apps/sif-ettersending/CHANGELOG.md | 9 ++++ apps/sif-ettersending/package.json | 2 +- packages/sif-common-core-ds/CHANGELOG.md | 8 +++ packages/sif-common-core-ds/package.json | 2 +- .../src/styles/sif-ds-theme.css | 21 ++++++++ packages/sif-common-forms-ds/CHANGELOG.md | 8 +++ packages/sif-common-forms-ds/package.json | 2 +- packages/sif-common-soknad-ds/CHANGELOG.md | 10 ++++ packages/sif-common-soknad-ds/package.json | 2 +- .../edit-step-link/EditStepLink.tsx | 18 +++++++ packages/sif-common-ui/CHANGELOG.md | 9 ++++ packages/sif-common-ui/package.json | 2 +- .../components/summary-list/SummaryList.tsx | 54 ++++++++++++++----- .../components/summary-list/summaryList.scss | 23 ++++++++ packages/sif-common-utils/CHANGELOG.md | 6 +++ packages/sif-common-utils/package.json | 2 +- .../sif-common-utils/src/dateFormatter.ts | 16 +++++- packages/sif-common-utils/src/index.ts | 1 + packages/sif-common-utils/src/stringUtils.ts | 3 ++ 35 files changed, 267 insertions(+), 29 deletions(-) create mode 100644 packages/sif-common-soknad-ds/src/components/edit-step-link/EditStepLink.tsx create mode 100644 packages/sif-common-utils/src/stringUtils.ts diff --git a/apps/ekstra-omsorgsdager-andre-forelder-ikke-tilsyn/CHANGELOG.md b/apps/ekstra-omsorgsdager-andre-forelder-ikke-tilsyn/CHANGELOG.md index 425005b66d..1b5a67cb55 100644 --- a/apps/ekstra-omsorgsdager-andre-forelder-ikke-tilsyn/CHANGELOG.md +++ b/apps/ekstra-omsorgsdager-andre-forelder-ikke-tilsyn/CHANGELOG.md @@ -1,5 +1,14 @@ # @navikt/ekstra-omsorgsdager-andre-forelder-ikke-tilsyn +## 1.25.15 + +### Patch Changes + +- Updated dependencies [d42de23] + - @navikt/sif-common-soknad-ds@12.0.8 + - @navikt/sif-common-core-ds@9.17.23 + - @navikt/sif-common-utils@3.46.11 + ## 1.25.14 ### Patch Changes diff --git a/apps/ekstra-omsorgsdager-andre-forelder-ikke-tilsyn/package.json b/apps/ekstra-omsorgsdager-andre-forelder-ikke-tilsyn/package.json index 182679a01c..5d5d4e37ae 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.25.14", + "version": "1.25.15", "repository": "https://github.com/navikt/sif-brukerdialog", "private": true, "type": "module", diff --git a/apps/endringsmelding-pleiepenger/CHANGELOG.md b/apps/endringsmelding-pleiepenger/CHANGELOG.md index 49ec6a85b5..3ef69be925 100644 --- a/apps/endringsmelding-pleiepenger/CHANGELOG.md +++ b/apps/endringsmelding-pleiepenger/CHANGELOG.md @@ -1,5 +1,15 @@ # @navikt/endringsmelding-pleiepenger +## 2.30.14 + +### Patch Changes + +- Updated dependencies [d42de23] + - @navikt/sif-common-soknad-ds@12.0.8 + - @navikt/sif-common-core-ds@9.17.23 + - @navikt/sif-common-utils@3.46.11 + - @navikt/sif-common-forms-ds@9.0.10 + ## 2.30.13 ### Patch Changes diff --git a/apps/endringsmelding-pleiepenger/package.json b/apps/endringsmelding-pleiepenger/package.json index 1ceb4232be..e7f3a70cee 100644 --- a/apps/endringsmelding-pleiepenger/package.json +++ b/apps/endringsmelding-pleiepenger/package.json @@ -5,7 +5,7 @@ "license": "MIT", "name": "@navikt/endringsmelding-pleiepenger", "repository": "https://github.com/navikt/sif-brukerdialog", - "version": "2.30.13", + "version": "2.30.14", "private": true, "dependencies": { "@navikt/ds-css": "6.16.0", diff --git a/apps/omsorgsdager-aleneomsorg-dialog/CHANGELOG.md b/apps/omsorgsdager-aleneomsorg-dialog/CHANGELOG.md index fa20b69bca..70384d303d 100644 --- a/apps/omsorgsdager-aleneomsorg-dialog/CHANGELOG.md +++ b/apps/omsorgsdager-aleneomsorg-dialog/CHANGELOG.md @@ -1,5 +1,15 @@ # @navikt/omsorgsdager-aleneomsorg-dialog +## 2.19.15 + +### Patch Changes + +- Updated dependencies [d42de23] + - @navikt/sif-common-soknad-ds@12.0.8 + - @navikt/sif-common-core-ds@9.17.23 + - @navikt/sif-common-utils@3.46.11 + - @navikt/sif-common-forms-ds@9.0.10 + ## 2.19.14 ### Patch Changes diff --git a/apps/omsorgsdager-aleneomsorg-dialog/package.json b/apps/omsorgsdager-aleneomsorg-dialog/package.json index 5fb5a254e0..4153a940bc 100644 --- a/apps/omsorgsdager-aleneomsorg-dialog/package.json +++ b/apps/omsorgsdager-aleneomsorg-dialog/package.json @@ -4,7 +4,7 @@ "license": "MIT", "name": "@navikt/omsorgsdager-aleneomsorg-dialog", "repository": "https://github.com/navikt/sif-brukerdialog", - "version": "2.19.14", + "version": "2.19.15", "private": true, "type": "module", "scripts": { diff --git a/apps/omsorgspengerutbetaling-arbeidstaker-soknad/CHANGELOG.md b/apps/omsorgspengerutbetaling-arbeidstaker-soknad/CHANGELOG.md index aa3c16d429..ea2a0e58ee 100644 --- a/apps/omsorgspengerutbetaling-arbeidstaker-soknad/CHANGELOG.md +++ b/apps/omsorgspengerutbetaling-arbeidstaker-soknad/CHANGELOG.md @@ -1,5 +1,15 @@ # @navikt/omsorgspengerutbetaling-arbeidstaker-soknad +## 1.4.15 + +### Patch Changes + +- Updated dependencies [d42de23] + - @navikt/sif-common-soknad-ds@12.0.8 + - @navikt/sif-common-core-ds@9.17.23 + - @navikt/sif-common-utils@3.46.11 + - @navikt/sif-common-forms-ds@9.0.10 + ## 1.4.14 ### Patch Changes diff --git a/apps/omsorgspengerutbetaling-arbeidstaker-soknad/package.json b/apps/omsorgspengerutbetaling-arbeidstaker-soknad/package.json index ade73b5913..e090610876 100644 --- a/apps/omsorgspengerutbetaling-arbeidstaker-soknad/package.json +++ b/apps/omsorgspengerutbetaling-arbeidstaker-soknad/package.json @@ -4,7 +4,7 @@ "license": "MIT", "name": "@navikt/omsorgspengerutbetaling-arbeidstaker-soknad", "repository": "https://github.com/navikt/sif-brukerdialog", - "version": "1.4.14", + "version": "1.4.15", "private": true, "dependencies": { "@navikt/ds-css": "6.16.0", diff --git a/apps/omsorgspengerutbetaling-soknad/CHANGELOG.md b/apps/omsorgspengerutbetaling-soknad/CHANGELOG.md index 6efde6b4b0..6203a44dd6 100644 --- a/apps/omsorgspengerutbetaling-soknad/CHANGELOG.md +++ b/apps/omsorgspengerutbetaling-soknad/CHANGELOG.md @@ -1,5 +1,15 @@ # @navikt/omsorgspengerutbetaling-soknad +## 1.13.9 + +### Patch Changes + +- Updated dependencies [d42de23] + - @navikt/sif-common-soknad-ds@12.0.8 + - @navikt/sif-common-core-ds@9.17.23 + - @navikt/sif-common-utils@3.46.11 + - @navikt/sif-common-forms-ds@9.0.10 + ## 1.13.8 ### Patch Changes diff --git a/apps/omsorgspengerutbetaling-soknad/package.json b/apps/omsorgspengerutbetaling-soknad/package.json index 75a6975831..803917d5d5 100644 --- a/apps/omsorgspengerutbetaling-soknad/package.json +++ b/apps/omsorgspengerutbetaling-soknad/package.json @@ -4,7 +4,7 @@ "license": "MIT", "name": "@navikt/omsorgspengerutbetaling-soknad", "repository": "https://github.com/navikt/sif-brukerdialog", - "version": "1.13.8", + "version": "1.13.9", "private": true, "type": "module", "dependencies": { diff --git a/apps/omsorgspengesoknad/CHANGELOG.md b/apps/omsorgspengesoknad/CHANGELOG.md index b50ab2af33..9864c9951c 100644 --- a/apps/omsorgspengesoknad/CHANGELOG.md +++ b/apps/omsorgspengesoknad/CHANGELOG.md @@ -1,5 +1,16 @@ # @navikt/omsorgspengesoknad +## 1.28.15 + +### Patch Changes + +- Updated dependencies [d42de23] + - @navikt/sif-common-soknad-ds@12.0.8 + - @navikt/sif-common-core-ds@9.17.23 + - @navikt/sif-common-utils@3.46.11 + - @navikt/sif-common-ui@0.7.28 + - @navikt/sif-common-forms-ds@9.0.10 + ## 1.28.14 ### Patch Changes diff --git a/apps/omsorgspengesoknad/package.json b/apps/omsorgspengesoknad/package.json index 3590c1805f..cb41d90388 100644 --- a/apps/omsorgspengesoknad/package.json +++ b/apps/omsorgspengesoknad/package.json @@ -4,7 +4,7 @@ "license": "MIT", "name": "@navikt/omsorgspengesoknad", "repository": "https://github.com/navikt/sif-brukerdialog", - "version": "1.28.14", + "version": "1.28.15", "private": true, "type": "module", "dependencies": { diff --git a/apps/pleiepenger-i-livets-sluttfase-soknad/CHANGELOG.md b/apps/pleiepenger-i-livets-sluttfase-soknad/CHANGELOG.md index ca3fc324be..2c3b21de6e 100644 --- a/apps/pleiepenger-i-livets-sluttfase-soknad/CHANGELOG.md +++ b/apps/pleiepenger-i-livets-sluttfase-soknad/CHANGELOG.md @@ -1,5 +1,16 @@ # @navikt/pleiepenger-i-livets-sluttfase-soknad +## 2.9.9 + +### Patch Changes + +- Updated dependencies [d42de23] + - @navikt/sif-common-soknad-ds@12.0.8 + - @navikt/sif-common-core-ds@9.17.23 + - @navikt/sif-common-utils@3.46.11 + - @navikt/sif-common-ui@0.7.28 + - @navikt/sif-common-forms-ds@9.0.10 + ## 2.9.8 ### Patch Changes diff --git a/apps/pleiepenger-i-livets-sluttfase-soknad/package.json b/apps/pleiepenger-i-livets-sluttfase-soknad/package.json index 2a4d0b4115..3558348bd7 100644 --- a/apps/pleiepenger-i-livets-sluttfase-soknad/package.json +++ b/apps/pleiepenger-i-livets-sluttfase-soknad/package.json @@ -4,7 +4,7 @@ "license": "MIT", "name": "@navikt/pleiepenger-i-livets-sluttfase-soknad", "repository": "https://github.com/navikt/sif-brukerdialog", - "version": "2.9.8", + "version": "2.9.9", "private": true, "type": "module", "dependencies": { diff --git a/apps/pleiepenger-sykt-barn/CHANGELOG.md b/apps/pleiepenger-sykt-barn/CHANGELOG.md index eb4453f322..7ed99236fb 100644 --- a/apps/pleiepenger-sykt-barn/CHANGELOG.md +++ b/apps/pleiepenger-sykt-barn/CHANGELOG.md @@ -1,5 +1,16 @@ # @navikt/pleiepenger-sykt-barn +## 3.15.10 + +### Patch Changes + +- Updated dependencies [d42de23] + - @navikt/sif-common-soknad-ds@12.0.8 + - @navikt/sif-common-core-ds@9.17.23 + - @navikt/sif-common-utils@3.46.11 + - @navikt/sif-common-ui@0.7.28 + - @navikt/sif-common-forms-ds@9.0.10 + ## 3.15.9 ### Patch Changes diff --git a/apps/pleiepenger-sykt-barn/package.json b/apps/pleiepenger-sykt-barn/package.json index 9ea96957eb..21bd453f07 100644 --- a/apps/pleiepenger-sykt-barn/package.json +++ b/apps/pleiepenger-sykt-barn/package.json @@ -4,7 +4,7 @@ "license": "MIT", "name": "@navikt/pleiepenger-sykt-barn", "repository": "https://github.com/navikt/sif-brukerdialog", - "version": "3.15.9", + "version": "3.15.10", "private": true, "type": "module", "dependencies": { diff --git a/apps/sif-ettersending/CHANGELOG.md b/apps/sif-ettersending/CHANGELOG.md index a98490380c..bab74a8fa4 100644 --- a/apps/sif-ettersending/CHANGELOG.md +++ b/apps/sif-ettersending/CHANGELOG.md @@ -1,5 +1,14 @@ # @navikt/sif-ettersending +## 3.35.10 + +### Patch Changes + +- Updated dependencies [d42de23] + - @navikt/sif-common-soknad-ds@12.0.8 + - @navikt/sif-common-core-ds@9.17.23 + - @navikt/sif-common-utils@3.46.11 + ## 3.35.9 ### Patch Changes diff --git a/apps/sif-ettersending/package.json b/apps/sif-ettersending/package.json index 94ed165b96..add2c2a766 100644 --- a/apps/sif-ettersending/package.json +++ b/apps/sif-ettersending/package.json @@ -4,7 +4,7 @@ "license": "MIT", "name": "@navikt/sif-ettersending", "repository": "https://github.com/navikt/sif-ettersending", - "version": "3.35.9", + "version": "3.35.10", "private": true, "type": "module", "dependencies": { diff --git a/packages/sif-common-core-ds/CHANGELOG.md b/packages/sif-common-core-ds/CHANGELOG.md index 385f1f85f7..e5e8790e99 100644 --- a/packages/sif-common-core-ds/CHANGELOG.md +++ b/packages/sif-common-core-ds/CHANGELOG.md @@ -1,5 +1,13 @@ # @navikt/sif-common-core-ds +## 9.17.23 + +### Patch Changes + +- d42de23: Oppdaterte felleskomponenter ifbm aksel-oppsummeringsmal +- Updated dependencies [d42de23] + - @navikt/sif-common-utils@3.46.11 + ## 9.17.22 ### Patch Changes diff --git a/packages/sif-common-core-ds/package.json b/packages/sif-common-core-ds/package.json index 4d987df2db..6ee6897f9a 100644 --- a/packages/sif-common-core-ds/package.json +++ b/packages/sif-common-core-ds/package.json @@ -2,7 +2,7 @@ "author": "navikt", "main": "src", "name": "@navikt/sif-common-core-ds", - "version": "9.17.22", + "version": "9.17.23", "private": true, "dependencies": { "@navikt/sif-common-utils": "workspace:*", diff --git a/packages/sif-common-core-ds/src/styles/sif-ds-theme.css b/packages/sif-common-core-ds/src/styles/sif-ds-theme.css index 120b260332..445eb7a5ba 100644 --- a/packages/sif-common-core-ds/src/styles/sif-ds-theme.css +++ b/packages/sif-common-core-ds/src/styles/sif-ds-theme.css @@ -16,3 +16,24 @@ body.sif-ds-theme { .navds-fieldset__description > .expandableInfo:first-child { margin-top: 1rem; } +.navds-form-summary__answers .navds-form-summary__answers { + background-color: var(--a-surface-subtle); +} +.navds-form-summary__answers--compact .navds-form-summary__answer { + padding-bottom: 0.125rem !important; + margin-bottom: 0.125rem !important; + border: none !important; +} +.navds-form-summary__answers--compact .navds-form-summary__answer dt { + display: inline-block; + padding-right: 0.5rem; +} +.navds-form-summary__answers--compact .navds-form-summary__answer dt:after { + content: ':'; +} +.navds-form-summary__answers--compact .navds-form-summary__answer dd { + display: inline-block; +} +.navds-form-summary__answers--compact .navds-form-summary__answer dd.fullWidth { + display: block; +} diff --git a/packages/sif-common-forms-ds/CHANGELOG.md b/packages/sif-common-forms-ds/CHANGELOG.md index b92cb9105b..72d3f55fcd 100644 --- a/packages/sif-common-forms-ds/CHANGELOG.md +++ b/packages/sif-common-forms-ds/CHANGELOG.md @@ -1,5 +1,13 @@ # @navikt/sif-common-forms-ds +## 9.0.10 + +### Patch Changes + +- Updated dependencies [d42de23] + - @navikt/sif-common-core-ds@9.17.23 + - @navikt/sif-common-utils@3.46.11 + ## 9.0.9 ### Patch Changes diff --git a/packages/sif-common-forms-ds/package.json b/packages/sif-common-forms-ds/package.json index 2b15f6db72..bfdfc731c9 100644 --- a/packages/sif-common-forms-ds/package.json +++ b/packages/sif-common-forms-ds/package.json @@ -3,7 +3,7 @@ "description": "Fellesskjema for sykdom i familien", "main": "src", "name": "@navikt/sif-common-forms-ds", - "version": "9.0.9", + "version": "9.0.10", "private": true, "peerDependencies": { "@navikt/sif-common-core-ds": "workspace:*", diff --git a/packages/sif-common-soknad-ds/CHANGELOG.md b/packages/sif-common-soknad-ds/CHANGELOG.md index 5087dc4d4f..f5769bbe8a 100644 --- a/packages/sif-common-soknad-ds/CHANGELOG.md +++ b/packages/sif-common-soknad-ds/CHANGELOG.md @@ -1,5 +1,15 @@ # @navikt/sif-common-soknad-ds +## 12.0.8 + +### Patch Changes + +- d42de23: Oppdaterte felleskomponenter ifbm aksel-oppsummeringsmal +- Updated dependencies [d42de23] + - @navikt/sif-common-core-ds@9.17.23 + - @navikt/sif-common-utils@3.46.11 + - @navikt/sif-common-ui@0.7.28 + ## 12.0.7 ### Patch Changes diff --git a/packages/sif-common-soknad-ds/package.json b/packages/sif-common-soknad-ds/package.json index d349e13df7..0eeb796a31 100644 --- a/packages/sif-common-soknad-ds/package.json +++ b/packages/sif-common-soknad-ds/package.json @@ -3,7 +3,7 @@ "description": "Basis felleskomponenter for sykdom i familien søknadsskjema", "name": "@navikt/sif-common-soknad-ds", "main": "src", - "version": "12.0.7", + "version": "12.0.8", "private": true, "peerDependencies": { "@navikt/ds-css": "6.13.0", diff --git a/packages/sif-common-soknad-ds/src/components/edit-step-link/EditStepLink.tsx b/packages/sif-common-soknad-ds/src/components/edit-step-link/EditStepLink.tsx new file mode 100644 index 0000000000..9092bd82fd --- /dev/null +++ b/packages/sif-common-soknad-ds/src/components/edit-step-link/EditStepLink.tsx @@ -0,0 +1,18 @@ +import { FormSummary } from '@navikt/ds-react'; + +interface Props { + onEdit: () => void; +} + +const EditStepLink = ({ onEdit }: Props) => ( + { + evt.stopPropagation(); + evt.preventDefault(); + onEdit(); + }} + /> +); + +export default EditStepLink; diff --git a/packages/sif-common-ui/CHANGELOG.md b/packages/sif-common-ui/CHANGELOG.md index a4b5774003..2ad3735d79 100644 --- a/packages/sif-common-ui/CHANGELOG.md +++ b/packages/sif-common-ui/CHANGELOG.md @@ -1,5 +1,14 @@ # @navikt/sif-common-ui +## 0.7.28 + +### Patch Changes + +- d42de23: Oppdaterte felleskomponenter ifbm aksel-oppsummeringsmal +- Updated dependencies [d42de23] + - @navikt/sif-common-core-ds@9.17.23 + - @navikt/sif-common-utils@3.46.11 + ## 0.7.27 ### Patch Changes diff --git a/packages/sif-common-ui/package.json b/packages/sif-common-ui/package.json index 557fc0cd13..eddea8b366 100644 --- a/packages/sif-common-ui/package.json +++ b/packages/sif-common-ui/package.json @@ -1,7 +1,7 @@ { "name": "@navikt/sif-common-ui", "main": "src/index.ts", - "version": "0.7.27", + "version": "0.7.28", "private": true, "dependencies": { "@navikt/ds-css": "6.16.0", diff --git a/packages/sif-common-ui/src/components/summary-list/SummaryList.tsx b/packages/sif-common-ui/src/components/summary-list/SummaryList.tsx index 072342716a..f3da6a93f4 100644 --- a/packages/sif-common-ui/src/components/summary-list/SummaryList.tsx +++ b/packages/sif-common-ui/src/components/summary-list/SummaryList.tsx @@ -1,24 +1,50 @@ -import bemUtils from '@navikt/sif-common-core-ds/src/utils/bemUtils'; +import { List } from '@navikt/ds-react'; import React from 'react'; -import './summaryList.scss'; +import bemUtils from '@navikt/sif-common-core-ds/src/utils/bemUtils'; import classNames from 'classnames'; +import './summaryList.scss'; -interface Props { - items: any[]; +interface Props { + items: ItemType[]; bullets?: boolean; - itemRenderer: (data: any) => React.ReactNode; + useAkselList?: boolean; + variant?: 'blocks' | 'bullet-blocks'; + as?: 'ul' | 'ol'; + itemTitleRenderer?: (data: ItemType) => string; + itemRenderer: (data: ItemType) => React.ReactNode; } const bem = bemUtils('summaryList'); -const SummaryList: React.FunctionComponent = ({ items, itemRenderer, bullets }) => ( -
    - {items.map((item, idx) => ( -
  • - {itemRenderer(item)} -
    • - ))} -
-); +function SummaryList({ + items, + itemRenderer, + useAkselList, + itemTitleRenderer, + variant, + as, + bullets, +}: Props) { + return useAkselList || variant !== undefined ? ( + + {items.map((item, idx) => ( + + {itemRenderer(item)} + + ))} + + ) : ( +
    + {items.map((item, idx) => ( +
  • + {itemRenderer(item)} +
    • + ))} +
+ ); +} export default SummaryList; diff --git a/packages/sif-common-ui/src/components/summary-list/summaryList.scss b/packages/sif-common-ui/src/components/summary-list/summaryList.scss index f678ec0f6e..b4f75f4bbb 100644 --- a/packages/sif-common-ui/src/components/summary-list/summaryList.scss +++ b/packages/sif-common-ui/src/components/summary-list/summaryList.scss @@ -4,3 +4,26 @@ padding-bottom: 0.5rem; } } + +/** Variant blocks */ +.navds-list__item.sif_navds-form-summary-listItem--blocks { + background-color: var(--a-surface-subtle); + border-radius: var(--a-border-radius-large); + padding: var(--a-spacing-2) var(--a-spacing-3) !important; + list-style-position: inside; + gap: 0 !important; +} + +.navds-list__item.sif_navds-form-summary-listItem--blocks .navds-form-summary__answers { + padding: 0; + margin: 0; +} + +.navds-list .sif_navds-form-summary-listItem--blocks .navds-list__item-marker--bullet { + display: none !important; +} + +/** Variant bullet-blocks */ +.navds-list__item.sif_navds-form-summary-listItem--bullet-blocks:not(:last-child) { + margin-bottom: var(--a-spacing-6); +} diff --git a/packages/sif-common-utils/CHANGELOG.md b/packages/sif-common-utils/CHANGELOG.md index e9d40f3361..a50bca1612 100644 --- a/packages/sif-common-utils/CHANGELOG.md +++ b/packages/sif-common-utils/CHANGELOG.md @@ -1,5 +1,11 @@ # @navikt/sif-common-utils +## 3.46.11 + +### Patch Changes + +- d42de23: Oppdaterte felleskomponenter ifbm aksel-oppsummeringsmal + ## 3.46.10 ### Patch Changes diff --git a/packages/sif-common-utils/package.json b/packages/sif-common-utils/package.json index 61b4005754..90fce253c4 100644 --- a/packages/sif-common-utils/package.json +++ b/packages/sif-common-utils/package.json @@ -3,7 +3,7 @@ "author": "navikt", "description": "Diverse utils for Sykdom i familien teamet", "main": "src/index.ts", - "version": "3.46.10", + "version": "3.46.11", "private": true, "dependencies": { "dayjs": "1.11.12", diff --git a/packages/sif-common-utils/src/dateFormatter.ts b/packages/sif-common-utils/src/dateFormatter.ts index 9c1c7a97fa..6f7201486a 100644 --- a/packages/sif-common-utils/src/dateFormatter.ts +++ b/packages/sif-common-utils/src/dateFormatter.ts @@ -1,7 +1,7 @@ import dayjs from 'dayjs'; import 'dayjs/locale/nb'; import 'dayjs/locale/nn'; -import { ISODate, ISODateToDate, getValidLocale } from '.'; +import { capsFirstCharacter, getValidLocale, ISODate, ISODateToDate } from './'; dayjs.locale('nb'); @@ -88,4 +88,18 @@ export const dateFormatter = { */ dayDateShortMonth: (date: Date, locale?: string) => dayjs(date).locale(getValidLocale(locale)).format('dddd D. MMM'), + + /** + * + * @param date: Date + * @return Måned årstall + */ + monthFullYear: (date: Date, locale?: string) => dayjs(date).locale(getValidLocale(locale)).format('MMMM YYYY'), + /** + * + * @param date: Date + * @return Måned årstall + */ + MonthFullYear: (date: Date, locale?: string) => + capsFirstCharacter(dayjs(date).locale(getValidLocale(locale)).format('MMMM YYYY')), }; diff --git a/packages/sif-common-utils/src/index.ts b/packages/sif-common-utils/src/index.ts index 3e93babc4e..48c4b93510 100644 --- a/packages/sif-common-utils/src/index.ts +++ b/packages/sif-common-utils/src/index.ts @@ -9,6 +9,7 @@ export * from './guid'; export * from './timeUtils'; export * from './localeUtils'; export * from './jsonSort'; +export * from './stringUtils'; export * from './typeGuardUtilities'; export * from './types'; export * from './weekdayUtils'; diff --git a/packages/sif-common-utils/src/stringUtils.ts b/packages/sif-common-utils/src/stringUtils.ts new file mode 100644 index 0000000000..99d54b0a98 --- /dev/null +++ b/packages/sif-common-utils/src/stringUtils.ts @@ -0,0 +1,3 @@ +export const capsFirstCharacter = (text: string): string => { + return text.charAt(0).toUpperCase() + text.slice(1); +};