Compare commits

...
Author SHA1 Message Date
github-actions[bot] 8a58d75efb Lerna versionbump [ci skip]
- @navikt/ds-css@0.15.5
 - @navikt/ds-react@0.16.9
 - @navikt/ds-react-internal@0.11.9
2022-02-21 09:35:40 +00:00
Ken bf18ffcb0c [FIX] ToggleGroup css-patch (#1430) 2022-02-21 10:28:43 +01:00
Ken ad3c88d542 [ci skip] revert siste endring 2022-02-18 16:01:41 +01:00
Ken eb90447bb7 [FIX] Forced CJS-versjon av ToggleGroup 2022-02-18 14:23:42 +01:00
github-actions[bot] cb429868c1 Lerna versionbump [ci skip]
- @navikt/ds-css@0.15.4
 - @navikt/ds-react@0.16.8
 - @navikt/ds-react-internal@0.11.8
2022-02-18 10:42:43 +00:00
KenandAndreas Nordahl e09f478a09 [FIX] Toggle-buttons (#1371)
Co-authored-by: Andreas Nordahl <andnorda@gmail.com>

Har fått 👍 på design og UU nå, så publiserer komponenten!
2022-02-18 11:34:32 +01:00
github-actions[bot] 00259c629b Lerna versionbump [ci skip]
- @navikt/ds-react@0.16.7
 - @navikt/ds-react-internal@0.11.7
2022-02-16 14:18:21 +00:00
Ken 6124812ba8 [FIX] Bedre alt-tekster for ikoner i Alert (#1425) 2022-02-16 15:10:33 +01:00
github-actions[bot] 5f6bd160d6 Lerna versionbump [ci skip]
- @navikt/ds-react@0.16.6
 - @navikt/ds-react-internal@0.11.6
2022-02-14 09:49:45 +00:00
Andreas Nordahl b876ffb607 [fix] add specific table types (#1422) 2022-02-14 10:42:08 +01:00
Ken 6886cf7a67 Delay on button-story for chromatic (#1417) 2022-02-11 13:03:43 +01:00
github-actions[bot] a9e58e7bb2 Lerna versionbump [ci skip]
- @navikt/ds-css@0.15.3
2022-02-11 08:22:17 +00:00
Ken 861803f5ae [fix] hover farge-fix (#1418) 2022-02-11 09:15:12 +01:00
github-actions[bot] 5d383b754f Lerna versionbump [ci skip]
- @navikt/ds-icons@0.8.4
 - @navikt/ds-react@0.16.5
 - @navikt/ds-react-internal@0.11.5
2022-02-10 15:23:35 +00:00
Andreas Nordahl a8dc377870 [fix] update icons (#1416) 2022-02-10 16:15:16 +01:00
github-actions[bot] ead0378644 Lerna versionbump [ci skip]
- @navikt/ds-icons@0.8.3
 - @navikt/ds-react@0.16.4
 - @navikt/ds-react-internal@0.11.4
2022-02-08 15:50:02 +00:00
KenandKenAJoh 10a6bc18c4 [FIX] Ikonsynk Figma (#1414)
Co-authored-by: KenAJoh <KenAJoh@users.noreply.github.com>
2022-02-08 16:42:29 +01:00
github-actions[bot] 68d4b60f0e Lerna versionbump [ci skip]
- @navikt/ds-react@0.16.3
 - @navikt/ds-react-internal@0.11.3
2022-02-08 15:11:06 +00:00
Karl O 106e37bc54 [FIX] allow passing aria props to react-modal in modal (#1412) 2022-02-08 16:02:50 +01:00
github-actions[bot] 78080293d3 Lerna versionbump [ci skip]
- @navikt/ds-icons@0.8.2
 - @navikt/ds-react@0.16.2
 - @navikt/ds-react-internal@0.11.2
2022-02-08 13:03:24 +00:00
KenandKenAJoh d511210582 [fix] Ikoner synket fra figma (#1411)
Co-authored-by: KenAJoh <KenAJoh@users.noreply.github.com>
2022-02-08 13:55:36 +01:00
github-actions[bot] 78b103bb3e Lerna versionbump [ci skip]
- @navikt/ds-css@0.15.2
2022-02-08 10:36:10 +00:00
Ken 9c78338164 [fix] fikset tokens css (#1410) 2022-02-08 11:29:01 +01:00
github-actions[bot] 08c9069879 Lerna versionbump [ci skip]
- @navikt/ds-css@0.15.1
 - @navikt/ds-react@0.16.1
 - @navikt/ds-tailwind@0.1.2
 - @navikt/ds-react-internal@0.11.1
2022-02-07 13:05:59 +00:00
Ken 3ab1645994 [fix] fjernet failed import i typo story 2022-02-07 13:49:10 +01:00
Ken a64fc8905d fikset tailwind versjon 2022-02-07 13:40:53 +01:00
Ken 5d83818c1b yarn lock 2022-02-07 13:40:53 +01:00
github-actions[bot] 1148825a99 Lerna versionbump [ci skip]
- @navikt/ds-css@0.15.0
 - @navikt/ds-react@0.16.0
 - @navikt/ds-react-internal@0.11.0
2022-02-07 12:32:00 +00:00
Ken 778b1a4932 [FEATURE] Fjernet 2xlarge Heading, mobilskalering (#1401) 2022-02-07 13:24:18 +01:00
github-actions[bot] 74b77c0bba Lerna versionbump [ci skip]
- @navikt/ds-css@0.14.2
 - @navikt/ds-tailwind@0.1.1
 - @navikt/ds-tokens@0.8.1
2022-02-07 11:37:49 +00:00
Ken 5fc4ea483d [FIX] Tailwind config i ds-tokens (#1397)
* satt opp filstruktur

* json fil med formaterte tokens

* forenklet build

* satt opp data for tailwind

* la til gitignore

* fikset gitignore

* colors test

* ferdig tailwind config

* satt opp gitignore

* slettet git fil

* flyttet gitignore

* flettet tw.config

* comments

* fikset var prefix

* oppdatert build-script

* tailwind pakke

* flyttet tailwind pakke

* fjernet npmignore

* oppdatert src i package json

* fikset config

* flyttet theme under extended

* fjernet console.log

* fikset tsconfig?

* flyttet colors ut av extend

* tsconfig fix v ts-ignore

* sikrer riktig bygg-rekkefølge

* force token build
2022-02-07 12:30:21 +01:00
github-actions[bot] d002c03647 Lerna versionbump [ci skip]
- @navikt/ds-react@0.15.3
 - @navikt/ds-react-internal@0.10.3
2022-02-02 11:41:48 +00:00
larseirikhansen da1ffe8318 [FIX] HelpText Popover scroll (#1406)
* FIX: HelpText Popover scroll

* edge case in case focus() does not exist on ref
2022-02-02 12:33:23 +01:00
github-actions[bot] 0128f5a467 Lerna versionbump [ci skip]
- @navikt/ds-icons@0.8.1
 - @navikt/ds-react@0.15.2
 - @navikt/ds-react-internal@0.10.2
2022-01-31 14:20:25 +00:00
KenandKenAJoh 0a61ab629a [FIX] Ikonsynk Figma (#1405)
Co-authored-by: KenAJoh <KenAJoh@users.noreply.github.com>
2022-01-31 15:13:25 +01:00
github-actions[bot] 4ea5face0c Lerna versionbump [ci skip]
- @navikt/ds-css@0.14.1
 - @navikt/ds-react@0.15.1
 - @navikt/ds-react-internal@0.10.1
2022-01-28 11:54:39 +00:00
Andreas NordahlandKen 248a83221a [fix] Indeterminate checkbox (#1404)
* functional

* styles

* flyttet global token til root

Co-authored-by: Ken <ken.aleksander@gmail.com>
2022-01-28 12:47:01 +01:00
github-actions[bot] eceaa7e659 Lerna versionbump [ci skip]
- @navikt/ds-css@0.14.0
 - @navikt/ds-icons@0.8.0
 - @navikt/ds-react@0.15.0
 - @navikt/ds-react-internal@0.10.0
2022-01-28 09:24:05 +00:00
KenandAndreas Nordahl 811c0024c5 [FEATURE] AccordionMenu -> Menu
Co-authored-by: Andreas Nordahl <andnorda@gmail.com>
2022-01-28 10:17:16 +01:00
Andreas Nordahl aaefaddb13 Purge doc stories (#1403) 2022-01-27 17:31:53 +01:00
github-actions[bot] f464347f6e Lerna versionbump [ci skip]
- @navikt/ds-css@0.13.0
 - @navikt/ds-tokens@0.8.0
2022-01-27 09:54:20 +00:00
github-actions[bot]andKenAJoh 6608d01c1e [FEATURE] Tokens sync Figma (#1402)
Co-authored-by: KenAJoh <KenAJoh@users.noreply.github.com>
2022-01-27 10:47:08 +01:00
github-actions[bot] 335bc62922 Lerna versionbump [ci skip]
- @navikt/ds-css@0.12.14
 - @navikt/ds-react@0.14.15
 - @navikt/ds-react-internal@0.9.15
2022-01-22 17:20:09 +00:00
Ken 3c230d8f4c [FIX] Accordion: Figma 3.0 Beta sync (#1390) 2022-01-22 18:12:10 +01:00
Ken 5bb7de3b4c [ci skip] readme link fix 2022-01-22 18:09:47 +01:00
github-actions[bot] 9597c24328 Lerna versionbump [ci skip]
- @navikt/ds-css@0.12.13
 - @navikt/ds-react@0.14.14
 - @navikt/ds-react-internal@0.9.14
2022-01-21 13:57:29 +00:00
Ken 2642c2914e [FIX] loading-state på Switch bli nå disabled (#1396) 2022-01-21 14:50:02 +01:00
90 changed files with 1654 additions and 1030 deletions

No files matched your search

-105
View File
@@ -1,105 +0,0 @@
:root {
--navds-accordion-menu-color-text: var(--navds-semantic-color-link);
--navds-accordion-menu-color-text-focus: var(--navds-semantic-color-text);
--navds-accordion-menu-color-background-hover: var(
--navds-global-color-blue-50
);
--navds-accordion-menu-color-text-active: var(--navds-semantic-color-text);
--navds-accordion-menu-outline-focus: var(--navds-semantic-color-focus);
}
.navds-accordion-menu__list {
list-style: none;
margin: 0;
padding: 0;
font-weight: var(--navds-font-weight-bold);
}
.navds-accordion-menu-collapsable__button {
cursor: pointer;
background-color: transparent;
border: none;
font: inherit;
text-align: inherit;
margin: 0;
padding: 0;
width: 100%;
display: flex;
justify-content: space-between;
align-items: center;
font-weight: var(--navds-font-weight-bold);
color: var(--navds-accordion-menu-color-text);
text-decoration: underline;
}
.navds-accordion-menu-item,
.navds-accordion-menu-collapsable__button {
display: flex;
padding: var(--navds-spacing-3) var(--navds-spacing-4);
text-decoration: none;
}
.navds-accordion-menu-collapsable__expand-icon {
font-size: 1.5rem;
color: var(--navds-accordion-menu-color);
flex-shrink: 0;
margin-left: var(--navds-spacing-2);
}
.navds-accordion-menu-collapsable--open
> .navds-accordion-menu-collapsable__button
> .navds-accordion-menu-collapsable__expand-icon {
transform: rotate(180deg);
}
.navds-accordion-menu-collapsable .navds-accordion-menu-item,
.navds-accordion-menu-collapsable
.navds-accordion-menu-collapsable
.navds-accordion-menu-collapsable__button {
padding-left: var(--navds-spacing-8);
}
.navds-accordion-menu-collapsable
.navds-accordion-menu-collapsable
.navds-accordion-menu-item,
.navds-accordion-menu-collapsable
.navds-accordion-menu-collapsable
.navds-accordion-menu-collapsable
.navds-accordion-menu-collapsable__button {
padding-left: var(--navds-spacing-12);
}
.navds-accordion-menu-collapsable
.navds-accordion-menu-collapsable
.navds-accordion-menu-collapsable
.navds-accordion-menu-item,
.navds-accordion-menu-collapsable
.navds-accordion-menu-collapsable
.navds-accordion-menu-collapsable
.navds-accordion-menu-collapsable
.navds-accordion-menu-collapsable__button {
padding-left: var(--navds-spacing-16);
}
.navds-accordion-menu-item:focus,
.navds-accordion-menu-collapsable__button:focus {
outline: 3px solid var(--navds-accordion-menu-outline-focus);
outline-offset: -3px;
color: var(--navds-accordion-menu-color-text-focus);
}
.navds-accordion-menu-collapsable__button:focus
> .navds-accordion-menu-collapsable__expand-icon {
color: var(--navds-accordion-menu-color-focus);
}
.navds-accordion-menu-item:hover,
.navds-accordion-menu-collapsable__button:hover {
background-color: var(--navds-accordion-menu-color-background-hover);
}
.navds-accordion-menu-item--active {
box-shadow: inset 0.5rem 0 var(--navds-semantic-color-link);
color: var(--navds-accordion-menu-color-text-active);
text-decoration: none;
}
+46 -24
View File
@@ -4,11 +4,16 @@
---navds-semantic-color-component-background-light
);
--navds-accordion-color-text-hover: var(--navds-semantic-color-link);
--navds-accordion-color-border: var(--navds-semantic-color-border-muted);
--navds-accordion-color-border-hover: var(
--navds-semantic-color-interaction-primary
);
--navds-accordion-color-border-focus: var(
---navds-semantic-color-component-background-light
--navds-accordion-color-text-open: var(--navds-semantic-color-text);
--navds-accordion-color-text-open-hover: var(
--navds-semantic-color-interaction-primary
);
--navds-accordion-color-background-open: var(
--navds-semantic-color-interaction-primary-hover-subtle
);
}
@@ -20,16 +25,53 @@
background: var(--navds-accordion-color-background);
}
.navds-accordion__header {
width: 100%;
display: flex;
justify-content: space-between;
align-items: center;
gap: var(--navds-spacing-4);
padding: var(--navds-spacing-4) var(--navds-spacing-3);
margin: 0;
text-align: left;
background: transparent;
cursor: pointer;
border: none;
border-bottom: 2px solid var(--navds-accordion-color-border);
}
.navds-accordion__header:focus {
outline: none;
box-shadow: var(--navds-shadow-focus);
border-color: var(--navds-accordion-color-border-focus);
}
.navds-accordion__header:hover {
color: var(--navds-accordion-color-text-hover);
border-color: var(--navds-accordion-color-border-hover);
text-decoration: underline;
}
.navds-accordion__item--open > .navds-accordion__header {
background-color: var(--navds-accordion-color-background-open);
color: var(--navds-accordion-color-text-open);
border-color: transparent;
}
.navds-accordion__item--open > .navds-accordion__header:hover {
border-color: transparent;
color: var(--navds-accordion-color-text-open-hover);
}
.navds-accordion__content {
color: var(--navds-accordion-color-text);
padding: var(--navds-spacing-5) var(--navds-spacing-3) var(--navds-spacing-10);
border-bottom: 2px solid var(--navds-accordion-color-border);
}
.navds-accordion__item--open
> .navds-accordion__header:hover
+ *
.navds-accordion__content {
border-color: var(--navds-accordion-color-border-hover);
}
.navds-accordion__expand-icon {
@@ -42,26 +84,6 @@
transform: rotateZ(180deg);
}
.navds-accordion__header {
padding: var(--navds-spacing-4) var(--navds-spacing-3);
background: transparent;
text-align: left;
border: none;
width: 100%;
margin: 0;
cursor: pointer;
display: flex;
justify-content: space-between;
align-items: center;
border-bottom: 2px solid #a0a0a0;
gap: var(--navds-spacing-4);
}
.navds-accordion__content {
color: var(--navds-accordion-color-text);
padding: var(--navds-spacing-5) var(--navds-spacing-3) var(--navds-spacing-10);
}
.navds-accordion__expand-icon--filled {
display: none;
}
+38 -8
View File
@@ -1,7 +1,8 @@
:root {
--navds-radio-checkbox-color-background: var(
--navds-semantic-color-canvas-background-light
--navds-semantic-color-component-background-light
);
--navds-radio-checkbox-color-text: var(--navds-semantic-color-text);
--navds-radio-checkbox-color-background-hover: var(
--navds-semantic-color-interaction-primary-hover-subtle
);
@@ -73,7 +74,7 @@
.navds-checkbox__description,
.navds-radio__description {
color: var(--navds-color-text-primary);
color: var(--navds-radio-checkbox-color-text);
}
.navds-checkbox--small > .navds-checkbox__input,
@@ -107,6 +108,29 @@
var(--navds-shadow-focus);
}
.navds-checkbox__input:indeterminate + .navds-checkbox__label::before {
box-shadow: none;
background-color: var(--navds-radio-checkbox-color-background-checked);
}
.navds-checkbox__input:indeterminate + .navds-checkbox__label::after {
content: "";
position: absolute;
top: 50%;
transform: translate(0.375rem, -50%);
background-color: var(--navds-radio-checkbox-color-background);
width: 0.75rem;
height: 0.25rem;
border-radius: 1px;
flex-shrink: 0;
}
.navds-checkbox--small
.navds-checkbox__input:indeterminate
+ .navds-checkbox__label::after {
transform: translate(0.25rem, -50%);
}
.navds-checkbox__input:checked + .navds-checkbox__label::before {
background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAxMyAxMCI+ICAgIDxnPiAgICA8cGF0aCBmaWxsPSIjRkZGRkZGIiBkPSJNNCwxMGMtMC40LDAtMC44LTAuMS0xLjEtMC40TDAuNCw3LjFDMC4xLDYuOCwwLDYuNCwwLDZzMC4yLTAuOCwwLjUtMS4xQzEsNC40LDIsNC40LDIuNSw0LjlMNCw2LjRsNi40LTYgICAgQzEwLjgsMC4xLDExLjEsMCwxMS41LDBjMC40LDAsMC44LDAuMiwxLDAuNWMwLjYsMC42LDAuNSwxLjYtMC4xLDIuMXYwTDUsOS42QzQuNyw5LjksNC40LDEwLDQsMTB6IE0xMS44LDEuOUwxMS44LDEuOSAgICBDMTEuOCwxLjksMTEuOCwxLjksMTEuOCwxLjl6IE0xMS4yLDEuMUMxMS4yLDEuMSwxMS4yLDEuMSwxMS4yLDEuMUwxMS4yLDEuMXoiLz4gICAgPC9nPjwvc3ZnPg==);
background-position: 6px center;
@@ -121,7 +145,7 @@
+ .navds-checkbox__label::before {
background-position: 4px center;
}
.navds-checkbox__input:indeterminate:focus + .navds-checkbox__label::before,
.navds-checkbox__input:checked:focus + .navds-checkbox__label::before {
box-shadow: inset 0 0 0 1px white, var(--navds-shadow-focus);
}
@@ -142,28 +166,34 @@
color: var(--navds-radio-checkbox-color-label-hover);
}
.navds-checkbox__input:hover:not(:disabled):not(:checked):not(:focus)
.navds-checkbox__input:hover:not(:disabled):not(:checked):not(:indeterminate):not(:focus)
+ .navds-checkbox__label::before,
.navds-radio__input:hover:not(:disabled):not(:checked):not(:focus)
+ .navds-radio__label::before {
box-shadow: inset 0 0 0 2px var(--navds-radio-checkbox-color-shadow-hover);
}
.navds-checkbox__input:hover:not(:disabled):not(:checked):not(:indeterminate)
+ .navds-checkbox__label::before,
.navds-radio__input:hover:not(:disabled):not(:checked)
+ .navds-radio__label::before {
background-color: var(--navds-radio-checkbox-color-background-hover);
}
.navds-checkbox--error
> .navds-checkbox__input:not(:hover):not(:disabled):not(:checked)
> .navds-checkbox__input:not(:hover):not(:disabled):not(:checked):not(:indeterminate)
+ .navds-checkbox__label::before,
.navds-radio--error
> .navds-radio__input:not(:hover):not(:disabled):not(:checked)
> .navds-radio__input:not(:hover):not(:disabled):not(:checked):not(:indeterminate)
+ .navds-radio__label::before {
box-shadow: inset 0 0 0 2px var(--navds-radio-checkbox-color-shadow-error);
}
.navds-checkbox--error
> .navds-checkbox__input:focus:not(:hover):not(:disabled):not(:checked)
> .navds-checkbox__input:focus:not(:hover):not(:disabled):not(:checked):not(:indeterminate)
+ .navds-checkbox__label::before,
.navds-radio--error
> .navds-radio__input:focus:not(:hover):not(:disabled):not(:checked)
> .navds-radio__input:focus:not(:hover):not(:disabled):not(:checked):not(:indeterminate)
+ .navds-radio__label::before {
box-shadow: inset 0 0 0 2px var(--navds-radio-checkbox-color-shadow-error),
var(--navds-shadow-focus);
+1 -1
View File
@@ -210,7 +210,7 @@
appearance: none;
}
.navds-switch--disabled {
.navds-switch--disabled:not(.navds-switch--loading) {
opacity: 0.3;
}
+2 -1
View File
@@ -3,7 +3,6 @@
@import "grid.css";
@import "accordion.css";
@import "accordion-menu.css";
@import "alert.css";
@import "button.css";
@import "content-container.css";
@@ -12,9 +11,11 @@
@import "help-text.css";
@import "link.css";
@import "loader.css";
@import "menu.css";
@import "modal.css";
@import "popover.css";
@import "tag.css";
@import "toggle-group.css";
@import "panel.css";
@import "link-panel.css";
@import "speech-bubble.css";
+102
View File
@@ -0,0 +1,102 @@
:root {
--navds-menu-color-text: var(--navds-semantic-color-link);
--navds-menu-color-text-hover: var(--navds-semantic-color-text);
--navds-menu-color-text-focus: var(--navds-semantic-color-text);
--navds-menu-color-background-hover: var(--navds-global-color-blue-50);
--navds-menu-color-text-active: var(--navds-semantic-color-text);
--navds-menu-outline-focus: var(--navds-semantic-color-focus);
}
.navds-menu__list {
list-style: none;
margin: 0;
padding: 0;
padding: 0 0.5rem;
}
.navds-menu__list--inner {
padding: 0;
}
.navds-menu-collapse__button {
cursor: pointer;
background-color: transparent;
border: none;
font: inherit;
text-align: inherit;
margin: 0;
width: 100%;
justify-content: space-between;
align-items: center;
font-weight: var(--navds-font-weight-bold);
color: var(--navds-menu-color-text);
}
.navds-menu-item,
.navds-menu-collapse__button {
font-weight: var(--navds-font-weight-bold);
display: flex;
padding: var(--navds-spacing-3) var(--navds-spacing-2);
text-decoration: none;
}
.navds-menu-item:focus,
.navds-menu-collapse__button:focus {
outline: 3px solid var(--navds-menu-outline-focus);
outline-offset: -3px;
color: var(--navds-menu-color-text-focus);
}
.navds-menu-collapse__button:focus > .navds-menu-collapse__expand-icon {
color: var(--navds-menu-color-focus);
}
.navds-menu-item:hover,
.navds-menu-collapse__button:hover {
background-color: var(--navds-menu-color-background-hover);
color: var(--navds-menu-color-text-hover);
}
.navds-menu-item--active {
box-shadow: -0.5rem 0 var(--navds-semantic-color-link);
color: var(--navds-menu-color-text-active);
text-decoration: none;
}
/* Collapse icon */
.navds-menu-collapse__expand-icon {
font-size: 1.5rem;
flex-shrink: 0;
margin-left: var(--navds-spacing-2);
}
.navds-menu-collapse__expand-icon--filled,
.navds-menu-collapse__button:hover > .navds-menu-collapse__expand-icon {
display: none;
}
.navds-menu-collapse__button:hover > .navds-menu-collapse__expand-icon--filled {
display: block;
}
.navds-menu-collapse--open
> .navds-menu-collapse__button
> .navds-menu-collapse__expand-icon {
transform: rotate(180deg);
}
/* Nesting levels */
.navds-menu__list[data-depth="1"] .navds-menu-collapse__button,
.navds-menu__list[data-depth="1"] .navds-menu-item {
padding-left: var(--navds-spacing-6);
}
.navds-menu__list[data-depth="2"] .navds-menu-collapse__button,
.navds-menu__list[data-depth="2"] .navds-menu-item {
padding-left: var(--navds-spacing-10);
}
.navds-menu__list[data-depth="3"] .navds-menu-collapse__button,
.navds-menu__list[data-depth="3"] .navds-menu-item {
padding-left: var(--navds-spacing-14);
}
+2 -2
View File
@@ -1,6 +1,6 @@
{
"name": "@navikt/ds-css",
"version": "0.12.12",
"version": "0.15.5",
"private": false,
"description": "Css for NAV Designsystem components",
"author": "NAV Designsystem team",
@@ -21,7 +21,7 @@
"watch": "postcss --watch --use postcss-import -o dist/index.css index.css"
},
"devDependencies": {
"@navikt/ds-tokens": "^0.7.1",
"@navikt/ds-tokens": "^0.8.1",
"normalize.css": "^8.0.1",
"postcss": "^8.3.6",
"postcss-cli": "^8.3.1",
+96
View File
@@ -0,0 +1,96 @@
:root {
--navds-toggle-group-color-background: var(
--navds-semantic-color-component-background-light
);
--navds-toggle-group-color-text: var(--navds-semantic-color-text);
--navds-toggle-group-color-border: var(--navds-semantic-color-divider);
--navds-toggle-group-color-background-hover: var(
--navds-semantic-color-interaction-primary-hover-subtle
);
--navds-toggle-group-color-text-hover: var(
--navds-semantic-color-interaction-primary
);
--navds-toggle-group-color-background-pressed: var(
--navds-semantic-color-interaction-primary-selected
);
--navds-toggle-group-color-text-pressed: var(
--navds-semantic-color-text-inverted
);
}
.navds-toggle-group {
border-radius: 7px;
background-color: var(--navds-toggle-group-color-background);
box-shadow: inset 0 0 0 1px var(--navds-toggle-group-color-border);
padding: calc(var(--navds-spacing-1) + 1px);
gap: var(--navds-spacing-1);
display: inline-grid;
grid-auto-flow: column;
grid-auto-columns: 1fr;
}
.navds-toggle-group__button {
display: inline-flex;
align-items: center;
justify-content: center;
padding: var(--navds-spacing-3);
min-height: 48px;
border: none;
cursor: pointer;
background-color: var(--navds-toggle-group-color-background);
color: var(--navds-toggle-group-color-text);
border-radius: 2px;
min-width: fit-content;
}
.navds-toggle-group__button:hover {
background-color: var(--navds-toggle-group-color-background-hover);
color: var(--navds-toggle-group-color-text-hover);
}
.navds-toggle-group__button:focus {
outline: none;
box-shadow: 0 0 0 1px var(--navds-toggle-group-color-background),
0 0 0 4px var(--navds-semantic-color-focus);
}
.navds-toggle-group__button:focus:hover[aria-pressed="false"] {
box-shadow: 0 0 0 1px var(--navds-toggle-group-color-background-hover),
0 0 0 4px var(--navds-semantic-color-focus);
}
.navds-toggle-group__button-inner {
display: flex;
align-items: center;
gap: var(--navds-spacing-2);
}
.navds-toggle-group__button-inner > * {
flex-shrink: 0;
}
.navds-toggle-group__button[aria-pressed="true"] {
background-color: var(--navds-toggle-group-color-background-pressed);
color: var(--navds-toggle-group-color-text-pressed);
}
.navds-toggle-group--small > .navds-toggle-group__button {
padding: 0.375rem;
min-height: 32px;
min-width: fit-content;
}
.navds-toggle-group__button > .navds-toggle-group__button-inner > svg {
font-size: 1.5rem;
}
.navds-toggle-group--small
> .navds-toggle-group__button
> .navds-toggle-group__button-inner
> svg {
font-size: 1.125rem;
}
.navds-toggle-group__label {
margin-bottom: 0.5rem;
}
+24 -11
View File
@@ -4,34 +4,47 @@
margin: 0;
}
.navds-heading--2xlarge {
.navds-heading--xlarge {
font-size: var(--navds-font-size-heading-2xlarge);
letter-spacing: -0.01em;
line-height: var(--navds-font-line-height-heading-2xlarge);
}
.navds-heading--2xlarge.navds-typo--spacing {
.navds-heading--xlarge.navds-typo--spacing {
margin-bottom: var(--navds-spacing-5);
}
.navds-heading--xlarge {
.navds-heading--large {
font-size: var(--navds-font-size-heading-xlarge);
letter-spacing: -0.008em;
line-height: var(--navds-font-line-height-heading-xlarge);
}
.navds-heading--xlarge.navds-typo--spacing {
.navds-heading--large.navds-typo--spacing {
margin-bottom: var(--navds-spacing-4);
}
.navds-heading--large {
font-size: var(--navds-font-size-heading-large);
letter-spacing: -0.004em;
line-height: var(--navds-font-line-height-heading-large);
}
/* Mobile scale */
@media (max-width: 480px) {
.navds-heading--xlarge {
font-size: var(--navds-font-size-heading-xlarge);
letter-spacing: -0.008em;
line-height: var(--navds-font-line-height-heading-xlarge);
}
.navds-heading--large.navds-typo--spacing {
margin-bottom: var(--navds-spacing-3);
.navds-heading--xlarge.navds-typo--spacing {
margin-bottom: var(--navds-spacing-4);
}
.navds-heading--large {
font-size: var(--navds-font-size-heading-large);
letter-spacing: -0.004em;
line-height: var(--navds-font-line-height-heading-large);
}
.navds-heading--large.navds-typo--spacing {
margin-bottom: var(--navds-spacing-3);
}
}
.navds-heading--medium {
+4 -3
View File
@@ -22,9 +22,10 @@ export const getPublishedIcons = async () => {
throw e;
});
return data?.meta?.components?.filter(
(component: any) => component?.containing_frame?.pageName !== "🔆Pictogram"
);
return data?.meta?.components?.filter((component: any) => {
const page = component?.containing_frame?.pageName;
return page !== "🔆Pictogram" && page !== "🧩Placeholder";
});
};
/**
@@ -2,7 +2,7 @@ import React from "react";
import { storiesOf } from "@storybook/react";
import isChromatic from "chromatic/isChromatic";
import * as Icons from "../src";
import * as Icons from "./src";
export default {
title: "ds-icons/Ikoner",
argTypes: {
+76 -4
View File
@@ -743,6 +743,18 @@
"created_at": "2021-01-11T13:37:55.499Z",
"pageName": "Status"
},
{
"name": "Eu",
"description": "",
"created_at": "2022-02-08T11:45:47.104Z",
"pageName": "International"
},
{
"name": "EuFilled",
"description": "",
"created_at": "2022-02-08T11:45:47.109Z",
"pageName": "International"
},
{
"name": "Expand",
"description": "",
@@ -857,6 +869,18 @@
"created_at": "2021-01-11T13:37:55.491Z",
"pageName": "File"
},
{
"name": "FileError",
"description": "",
"created_at": "2022-01-27T12:48:37.583Z",
"pageName": "File"
},
{
"name": "FileErrorFilled",
"description": "",
"created_at": "2022-01-27T12:48:37.605Z",
"pageName": "File"
},
{
"name": "FileFilled",
"description": "",
@@ -875,6 +899,30 @@
"created_at": "2021-04-26T09:24:37.951Z",
"pageName": "File"
},
{
"name": "FileProgressFilled",
"description": "",
"created_at": "2022-01-27T12:48:37.592Z",
"pageName": "File"
},
{
"name": "Files",
"description": "",
"created_at": "2022-01-27T12:48:37.567Z",
"pageName": "File"
},
{
"name": "FileSuccess",
"description": "",
"created_at": "2022-01-27T12:48:37.575Z",
"pageName": "File"
},
{
"name": "FileSuccessFilled",
"description": "",
"created_at": "2022-01-27T12:48:37.598Z",
"pageName": "File"
},
{
"name": "FillForms",
"description": "",
@@ -900,15 +948,15 @@
"pageName": "Interface"
},
{
"name": "FilterFilled",
"name": "Filter2Filled",
"description": "",
"created_at": "2021-01-11T13:37:55.605Z",
"created_at": "2022-01-14T09:16:08.197Z",
"pageName": "Interface"
},
{
"name": "FilterFilled2",
"name": "FilterFilled",
"description": "",
"created_at": "2022-01-14T09:16:08.197Z",
"created_at": "2021-01-11T13:37:55.605Z",
"pageName": "Interface"
},
{
@@ -971,6 +1019,30 @@
"created_at": "2021-01-28T14:00:38.520Z",
"pageName": "Fyrstikkalleen"
},
{
"name": "FullscreenEnter",
"description": "",
"created_at": "2022-02-10T15:01:12.614Z",
"pageName": "Interface"
},
{
"name": "FullscreenEnterFilled",
"description": "",
"created_at": "2022-02-10T15:01:12.604Z",
"pageName": "Interface"
},
{
"name": "FullscreenExit",
"description": "",
"created_at": "2022-02-10T15:01:12.597Z",
"pageName": "Interface"
},
{
"name": "FullscreenExitFilled",
"description": "",
"created_at": "2022-02-10T15:01:12.608Z",
"pageName": "Interface"
},
{
"name": "Glass",
"description": "",
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "@navikt/ds-icons",
"version": "0.7.3",
"version": "0.8.4",
"private": false,
"description": "NAVs egne ikoner i SVG og React format",
"repository": {
@@ -1,23 +0,0 @@
import { Meta } from "@storybook/addon-docs";
<Meta title="ds-icons/Kom i gang" />
# Ta i bruk ikonpakken `@navikt/ds-icons`
Alle ikoner kan bli funnet her https://design.nav.no/designsystem/resources/icons
## Oppsett
```bash
yarn add @navikt/ds-icons
```
```jsx
Import { Expand } from `@navikt/ds-icons`;
<Expand
title="Åpne meny"
/>
```
Note: Det kan være tilfeller der oppsettet ditt ikke har støtte for SVG, og det må da legges til manuelt i eks en webpack config basert på hva som blir brukt.
+10
View File
@@ -0,0 +1,10 @@
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M11.6836 0.585361C11.7435 0.401105 12.0041 0.401105 12.064 0.585362L12.5383 2.04506C12.5651 2.12746 12.6419 2.18325 12.7286 2.18325H14.2632C14.4569 2.18325 14.5375 2.43117 14.3807 2.54505L13.1391 3.44712C13.069 3.49805 13.0397 3.58833 13.0664 3.67074L13.5407 5.13034C13.6006 5.3146 13.3897 5.46783 13.233 5.35394L11.9914 4.45183C11.9213 4.4009 11.8263 4.4009 11.7563 4.45183L10.5146 5.35397C10.3578 5.46785 10.1469 5.31462 10.2068 5.13036L10.6811 3.67074C10.7079 3.58833 10.6785 3.49805 10.6084 3.44712L9.36682 2.54505C9.21008 2.43117 9.29063 2.18325 9.48438 2.18325H11.0191C11.1057 2.18325 11.1825 2.12746 11.2093 2.04506L11.6836 0.585361Z" fill="#262626"/>
<path d="M3.72187 3.991C3.63391 3.81837 3.81823 3.63404 3.99086 3.72199L5.38403 4.43175C5.46122 4.47108 5.55497 4.45623 5.61623 4.39497L6.72162 3.28964C6.85862 3.15264 7.09089 3.271 7.06057 3.46236L6.81595 5.00634C6.80239 5.09192 6.84548 5.1765 6.92269 5.21584L8.31573 5.92562C8.48835 6.01358 8.44758 6.27105 8.25622 6.30136L6.71211 6.54594C6.62654 6.55949 6.55942 6.62661 6.54587 6.71219L6.30129 8.25637C6.27098 8.44773 6.01351 8.48851 5.92555 8.31588L5.21577 6.92284C5.17643 6.84564 5.09185 6.80254 5.00627 6.8161L3.46232 7.06072C3.27095 7.09104 3.1526 6.85877 3.2896 6.72177L4.39497 5.61639C4.45624 5.55513 4.47109 5.46137 4.43175 5.38417L3.72187 3.991Z" fill="#262626"/>
<path d="M0.585361 12.2186C0.401105 12.1587 0.401105 11.898 0.585362 11.8381L2.15739 11.3273C2.23979 11.3005 2.29558 11.2238 2.29558 11.1371V9.48437C2.29558 9.29062 2.54351 9.21007 2.65739 9.36682L3.62879 10.704C3.67971 10.7741 3.76999 10.8034 3.8524 10.7767L5.42439 10.2659C5.60866 10.206 5.76189 10.4169 5.64799 10.5737L4.6764 11.9108C4.62546 11.9809 4.62546 12.0758 4.6764 12.1459L5.64802 13.4831C5.76191 13.6398 5.60869 13.8507 5.42442 13.7909L3.85239 13.2801C3.76999 13.2533 3.67971 13.2827 3.62879 13.3528L2.65739 14.6899C2.54351 14.8467 2.29558 14.7661 2.29558 14.5724V12.9196C2.29558 12.8329 2.23979 12.7562 2.15739 12.7294L0.585361 12.2186Z" fill="#262626"/>
<path d="M3.99086 20.0891C3.81823 20.177 3.63391 19.9927 3.72186 19.8201L4.43169 18.4269C4.47103 18.3497 4.45618 18.2559 4.39492 18.1947L3.28959 17.0893C3.15259 16.9523 3.27096 16.72 3.46232 16.7503L5.00638 16.995C5.09197 17.0086 5.17655 16.9655 5.21589 16.8883L5.92553 15.4953C6.01348 15.3226 6.27096 15.3634 6.30128 15.5548L6.54591 17.0989C6.55947 17.1845 6.62659 17.2516 6.71216 17.2651L8.25628 17.5097C8.44763 17.54 8.48841 17.7975 8.31579 17.8854L6.92289 18.5952C6.8457 18.6346 6.80261 18.7191 6.81616 18.8047L7.06069 20.3488C7.09099 20.5401 6.85872 20.6585 6.72173 20.5215L5.61627 19.416C5.55501 19.3548 5.46126 19.3399 5.38406 19.3793L3.99086 20.0891Z" fill="#262626"/>
<path d="M12.064 23.1204C12.0041 23.3047 11.7435 23.3047 11.6836 23.1205L11.2092 21.6608C11.1824 21.5784 11.1056 21.5226 11.019 21.5226H9.4844C9.29066 21.5226 9.2101 21.2746 9.36685 21.1608L10.6085 20.2587C10.6786 20.2078 10.7079 20.1175 10.6812 20.0351L10.2068 18.5756C10.1469 18.3914 10.3578 18.2381 10.5146 18.352L11.7563 19.254C11.8264 19.3049 11.9213 19.3049 11.9914 19.254L13.233 18.352C13.3897 18.2381 13.6006 18.3914 13.5407 18.5756L13.0665 20.0351C13.0397 20.1175 13.069 20.2078 13.1391 20.2587L14.3807 21.1608C14.5375 21.2746 14.4569 21.5226 14.2632 21.5226H12.7285C12.6418 21.5226 12.565 21.5784 12.5383 21.6608L12.064 23.1204Z" fill="#262626"/>
<path d="M20.0891 19.8201C20.177 19.9928 19.9927 20.1771 19.8201 20.0892L18.427 19.3794C18.3498 19.3401 18.2561 19.3549 18.1948 19.4162L17.0893 20.5217C16.9523 20.6587 16.72 20.5403 16.7503 20.3489L16.995 18.8047C17.0085 18.7191 16.9654 18.6345 16.8882 18.5952L15.4953 17.8855C15.3227 17.7975 15.3634 17.54 15.5548 17.5097L17.0989 17.2652C17.1845 17.2516 17.2516 17.1845 17.2651 17.0989L17.5097 15.5548C17.54 15.3634 17.7975 15.3226 17.8854 15.4953L18.5952 16.8883C18.6345 16.9655 18.7191 17.0086 18.8047 16.9951L20.3487 16.7504C20.5401 16.72 20.6584 16.9523 20.5214 17.0893L19.416 18.1949C19.3547 18.2562 19.3399 18.3499 19.3792 18.4271L20.0891 19.8201Z" fill="#262626"/>
<path d="M23.4144 11.8382C23.5987 11.8981 23.5987 12.1588 23.4145 12.2187L21.8424 12.7295C21.76 12.7563 21.7042 12.8331 21.7042 12.9197V14.5726C21.7042 14.7663 21.4563 14.8469 21.3424 14.6901L20.3709 13.3528C20.3199 13.2827 20.2297 13.2534 20.1473 13.2802L18.5754 13.791C18.3912 13.8508 18.2379 13.64 18.3518 13.4832L19.3233 12.146C19.3743 12.0759 19.3743 11.981 19.3233 11.9109L18.3518 10.5737C18.2379 10.4169 18.3912 10.206 18.5754 10.2659L20.1473 10.7767C20.2297 10.8035 20.32 10.7742 20.371 10.7041L21.3424 9.36682C21.4563 9.21007 21.7042 9.29062 21.7042 9.48437V11.1373C21.7042 11.2239 21.76 11.3007 21.8424 11.3275L23.4144 11.8382Z" fill="#262626"/>
<path d="M19.82 3.72203C19.9927 3.63407 20.177 3.8184 20.089 3.99102L19.3792 5.38419C19.3399 5.46139 19.3547 5.55514 19.416 5.61641L20.5214 6.72179C20.6584 6.85879 20.54 7.09107 20.3487 7.06075L18.8045 6.81606C18.719 6.8025 18.6344 6.8456 18.595 6.92281L17.8854 8.31578C17.7975 8.48842 17.54 8.44765 17.5097 8.25629L17.2651 6.71221C17.2515 6.62664 17.1844 6.55952 17.0988 6.54596L15.5547 6.30132C15.3634 6.271 15.3226 6.01354 15.4952 5.92558L16.8882 5.21585C16.9654 5.17652 17.0085 5.09194 16.9949 5.00635L16.7503 3.46238C16.72 3.27102 16.9522 3.15266 17.0892 3.28965L18.1948 4.39506C18.2561 4.45632 18.3498 4.47116 18.427 4.43183L19.82 3.72203Z" fill="#262626"/>
</svg>

After

Width:  |  Height:  |  Size: 5.3 KiB

+3
View File
@@ -0,0 +1,3 @@
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M0 2C0 0.89543 0.895431 0 2 0H22C23.1046 0 24 0.895431 24 2V22C24 23.1046 23.1046 24 22 24H2C0.89543 24 0 23.1046 0 22V2ZM11.6942 1.58536C11.754 1.4011 12.0147 1.40111 12.0746 1.58536L12.4898 2.86313C12.5166 2.94553 12.5934 3.00132 12.68 3.00132H14.0233C14.2171 3.00132 14.2976 3.24925 14.1409 3.36313L13.054 4.15276C12.9839 4.20369 12.9546 4.29397 12.9814 4.37637L13.3966 5.65405C13.4564 5.83831 13.2455 5.99154 13.0888 5.87766L12.0019 5.08798C11.9318 5.03705 11.8369 5.03705 11.7668 5.08798L10.6799 5.87768C10.5231 5.99156 10.3123 5.83833 10.3721 5.65407L10.7873 4.37637C10.8141 4.29397 10.7848 4.20369 10.7147 4.15276L9.6278 3.36313C9.47105 3.24925 9.55161 3.00132 9.74535 3.00132H11.0888C11.1754 3.00132 11.2522 2.94553 11.279 2.86313L11.6942 1.58536ZM4.704 4.43512C4.53138 4.34717 4.34706 4.5315 4.43502 4.70413L5.05696 5.92473C5.0963 6.00193 5.08145 6.09568 5.02018 6.15695L4.05175 7.12538C3.91475 7.26238 4.03311 7.49465 4.22447 7.46433L5.57715 7.25002C5.66273 7.23646 5.74731 7.27955 5.78664 7.35676L6.40849 8.57722C6.49645 8.74985 6.75392 8.70907 6.78423 8.51772L6.99851 7.16483C7.01207 7.07925 7.07919 7.01213 7.16476 6.99858L8.51758 6.7843C8.70894 6.75399 8.74972 6.49652 8.57709 6.40856L7.35662 5.78671C7.27941 5.74737 7.23632 5.66279 7.24988 5.57721L7.4642 4.22451C7.49452 4.03315 7.26225 3.91479 7.12524 4.05178L6.1568 5.02018C6.09553 5.08144 6.00179 5.09629 5.92459 5.05696L4.704 4.43512ZM1.58536 12.2163C1.40111 12.1564 1.40111 11.8957 1.58536 11.8358L2.9661 11.3872C3.0485 11.3604 3.10429 11.2836 3.10429 11.197V9.74534C3.10429 9.55159 3.35223 9.47104 3.4661 9.6278L4.31929 10.8023C4.37021 10.8724 4.46049 10.9017 4.5429 10.8749L5.9236 10.4263C6.10787 10.3664 6.26109 10.5773 6.1472 10.7341L5.29384 11.9085C5.24291 11.9786 5.24291 12.0735 5.29384 12.1436L6.14722 13.3181C6.26111 13.4748 6.10789 13.6857 5.92363 13.6258L4.5429 13.1772C4.46049 13.1505 4.37022 13.1798 4.31929 13.2499L3.4661 14.4243C3.35222 14.5811 3.10429 14.5005 3.10429 14.3068V12.8551C3.10429 12.7685 3.0485 12.6917 2.9661 12.6649L1.58536 12.2163ZM4.43501 19.1228C4.34705 19.2954 4.53138 19.4798 4.704 19.3918L5.92462 18.7699C6.00182 18.7306 6.09557 18.7454 6.15684 18.8067L7.12535 19.7752C7.26234 19.9122 7.49461 19.7938 7.46431 19.6025L7.25008 18.2497C7.23652 18.1641 7.27961 18.0796 7.35681 18.0402L8.57716 17.4184C8.74977 17.3304 8.70899 17.0729 8.51764 17.0426L7.1648 16.8283C7.07923 16.8148 7.01212 16.7477 6.99856 16.6621L6.78423 15.3093C6.75391 15.1179 6.49643 15.0771 6.40848 15.2498L5.78675 16.4702C5.74742 16.5474 5.66283 16.5905 5.57724 16.577L4.22447 16.3626C4.03311 16.3323 3.91475 16.5645 4.05174 16.7015L5.02013 17.67C5.0814 17.7312 5.09624 17.825 5.05691 17.9022L4.43501 19.1228ZM12.0746 22.1451C12.0147 22.3293 11.754 22.3293 11.6942 22.1451L11.2789 20.8673C11.2521 20.7849 11.1753 20.7291 11.0887 20.7291H9.74537C9.55163 20.7291 9.47107 20.4812 9.62782 20.3673L10.7147 19.5777C10.7848 19.5268 10.8142 19.4365 10.7874 19.3541L10.3722 18.0765C10.3123 17.8923 10.5232 17.739 10.6799 17.8529L11.7668 18.6425C11.8369 18.6934 11.9318 18.6934 12.0019 18.6425L13.0888 17.8529C13.2455 17.739 13.4564 17.8923 13.3965 18.0765L12.9814 19.3541C12.9546 19.4365 12.9839 19.5268 13.054 19.5777L14.1409 20.3673C14.2976 20.4812 14.2171 20.7291 14.0233 20.7291H12.6799C12.5933 20.7291 12.5165 20.7849 12.4897 20.8673L12.0746 22.1451ZM19.1228 19.3919C19.2954 19.4798 19.4798 19.2955 19.3918 19.1229L18.7699 17.9024C18.7305 17.8252 18.7454 17.7314 18.8066 17.6702L19.7752 16.7016C19.9121 16.5646 19.7938 16.3323 19.6024 16.3626L18.2497 16.577C18.1641 16.5905 18.0795 16.5475 18.0402 16.4702L17.4184 15.2498C17.3304 15.0771 17.0729 15.1179 17.0426 15.3093L16.8283 16.6621C16.8148 16.7477 16.7477 16.8148 16.6621 16.8284L15.3093 17.0426C15.1179 17.073 15.0772 17.3304 15.2498 17.4184L16.4702 18.0402C16.5474 18.0795 16.5905 18.1641 16.5769 18.2497L16.3626 19.6026C16.3322 19.794 16.5645 19.9123 16.7015 19.7753L17.6701 18.8068C17.7313 18.7456 17.8251 18.7307 17.9023 18.77L19.1228 19.3919ZM22.4146 11.8359C22.5988 11.8958 22.5988 12.1565 22.4146 12.2164L21.0338 12.665C20.9514 12.6918 20.8956 12.7686 20.8956 12.8552V14.3069C20.8956 14.5007 20.6477 14.5812 20.5338 14.4245L19.6805 13.25C19.6296 13.1798 19.5393 13.1505 19.4569 13.1773L18.0763 13.6259C17.8921 13.6858 17.7389 13.4749 17.8527 13.3182L18.706 12.1437C18.757 12.0736 18.757 11.9787 18.706 11.9086L17.8527 10.7341C17.7388 10.5773 17.8921 10.3664 18.0763 10.4263L19.457 10.875C19.5394 10.9017 19.6297 10.8724 19.6806 10.8023L20.5338 9.6278C20.6477 9.47104 20.8956 9.55159 20.8956 9.74534V11.1971C20.8956 11.2838 20.9514 11.3605 21.0338 11.3873L22.4146 11.8359ZM19.3918 4.70416C19.4797 4.53153 19.2954 4.34721 19.1228 4.43517L17.9023 5.05703C17.8251 5.09637 17.7314 5.08152 17.6701 5.02027L16.7015 4.05179C16.5645 3.9148 16.3322 4.03316 16.3625 4.22452L16.5769 5.57722C16.5904 5.6628 16.5473 5.74738 16.4701 5.78672L15.2497 6.40853C15.0771 6.49648 15.1179 6.75395 15.3092 6.78427L16.6621 6.9986C16.7476 7.01216Line truncated
</svg>

After

Width:  |  Height:  |  Size: 5.3 KiB

+3
View File
@@ -0,0 +1,3 @@
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M14.4142 0H2V22H12V20H4V2H12V7H17V14H19V4.58579L14.4142 0ZM16.5858 5L14 2.41421V5H16.5858ZM18 17.5858L21.2929 14.2929L22.7071 15.7071L19.4142 19L22.7071 22.2929L21.2929 23.7071L18 20.4142L14.7071 23.7071L13.2929 22.2929L16.5858 19L13.2929 15.7071L14.7071 14.2929L18 17.5858Z" fill="#262626"/>
</svg>

After

Width:  |  Height:  |  Size: 445 B

@@ -0,0 +1,3 @@
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M2 0V22H11.5L14.5 19L11 15.5L14.5 12L18 15.5L19 14.5V4.5L14.5 0H2ZM13.5 5V2L16.5 5H13.5ZM13.2929 22.2929L16.5858 19L13.2929 15.7071L14.7071 14.2929L18 17.5858L21.2929 14.2929L22.7071 15.7071L19.4142 19L22.7071 22.2929L21.2929 23.7071L18 20.4142L14.7071 23.7071L13.2929 22.2929Z" fill="#262626"/>
</svg>

After

Width:  |  Height:  |  Size: 448 B

+1 -2
View File
@@ -1,4 +1,3 @@
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M2 23V10C2 9.44772 2.44772 9 3 9H11.5556C12.1078 9 12.5556 9.44772 12.5556 10V12H21C21.5523 12 22 12.4477 22 13V23C22 23.5523 21.5523 24 21 24H3C2.44772 24 2 23.5523 2 23Z" fill="#262626"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M4 0H20V10H14V9C14 7.89543 13.1046 7 12 7H4V0ZM8 5H16V3H8V5Z" fill="#262626"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M20 0H4V7H12C13.1046 7 14 7.89543 14 9V10H20V0ZM16 5H8V3H16V5ZM2 10V23C2 23.5523 2.44772 24 3 24H21C21.5523 24 22 23.5523 22 23V13C22 12.4477 21.5523 12 21 12H12.5556V10C12.5556 9.44772 12.1078 9 11.5556 9H3C2.44772 9 2 9.44772 2 10Z" fill="#262626"/>
</svg>

Before

Width:  |  Height:  |  Size: 430 B

After

Width:  |  Height:  |  Size: 404 B

@@ -0,0 +1,3 @@
<svg width="25" height="24" viewBox="0 0 25 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M2 22V0H14.5L19 4.5V11H17.3135C11.6605 11 8.31543 17.3293 11.5 22H2ZM13.5 2V5H16.5L13.5 2ZM20.2122 20.7723C18.8453 22.1391 16.6293 22.1391 15.2624 20.7723C13.8956 19.4054 13.8956 17.1893 15.2624 15.8225C16.6293 14.4557 18.8453 14.4557 20.2122 15.8225L20.3897 16H19V18H24.0406V13L22.0406 13V14.8225L21.6264 14.4083C19.4785 12.2604 15.9961 12.2604 13.8482 14.4083C11.7003 16.5562 11.7003 20.0386 13.8482 22.1865C15.9961 24.3344 19.4785 24.3344 21.6264 22.1865L20.2122 20.7723Z" fill="#262626"/>
</svg>

After

Width:  |  Height:  |  Size: 645 B

+3
View File
@@ -0,0 +1,3 @@
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M2 0H14.4142L19 4.58579V16H17V7H12V2H4V20H11V22H2V0ZM14 2.41421L16.5858 5H14V2.41421ZM22.2689 14.3177L16.0317 21.0004L13.7593 18.3492L12.2407 19.6508L15.9683 23.9996L23.7311 15.6823L22.2689 14.3177Z" fill="#262626"/>
</svg>

After

Width:  |  Height:  |  Size: 369 B

@@ -0,0 +1,3 @@
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M2 0V22H12L10 19.5L14 16L16 18L19 15V4.5L14.5 0H2ZM13.5 5V2L16.5 5H13.5ZM22.2689 14.3177L16.0317 21.0004L13.7593 18.3492L12.2407 19.6508L15.9683 23.9996L23.7311 15.6823L22.2689 14.3177Z" fill="#262626"/>
</svg>

After

Width:  |  Height:  |  Size: 356 B

+3
View File
@@ -0,0 +1,3 @@
<svg width="25" height="24" viewBox="0 0 25 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M14.4142 0H2V22H11V20H4V2H12V7H17V11H19V4.58579L14.4142 0ZM16.5858 5L14 2.41421V5H16.5858ZM20.2122 20.7723C18.8453 22.1391 16.6293 22.1391 15.2624 20.7723C13.8956 19.4054 13.8956 17.1893 15.2624 15.8225C16.6293 14.4557 18.8453 14.4557 20.2122 15.8225L20.3897 16H19V18H24.0406V13L22.0406 13V14.8225L21.6264 14.4083C19.4785 12.2604 15.9961 12.2604 13.8482 14.4083C11.7003 16.5562 11.7003 20.0386 13.8482 22.1865C15.9961 24.3344 19.4785 24.3344 21.6264 22.1865L20.2122 20.7723Z" fill="#262626"/>
</svg>

After

Width:  |  Height:  |  Size: 645 B

@@ -0,0 +1,3 @@
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M17.5857 5L12.2928 10.2929L13.707 11.7071L19 6.41412V11H21V3H13V5L17.5857 5ZM5 13V17.5859L10.293 12.2929L11.7072 13.7071L6.4143 19H11V21H3V13H5Z" fill="#262626"/>
</svg>

After

Width:  |  Height:  |  Size: 315 B

@@ -0,0 +1,3 @@
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M1 0C0.447715 0 0 0.447716 0 1V23C0 23.5523 0.447716 24 1 24H23C23.5523 24 24 23.5523 24 23V1C24 0.447715 23.5523 0 23 0H1ZM12.2928 10.2929L17.5857 5L13 5V3H21V11H19V6.41412L13.707 11.7071L12.2928 10.2929ZM5 17.5859V13H3V21H11V19H6.4143L11.7072 13.7071L10.293 12.2929L5 17.5859Z" fill="#262626"/>
</svg>

After

Width:  |  Height:  |  Size: 449 B

@@ -0,0 +1,3 @@
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M16.414 8.99999L21.7068 3.7071L20.2926 2.29288L14.9999 7.58561V2.99999H12.9999V11H20.9999V8.99999H16.414ZM7.58562 15L2.29272 20.2929L3.70694 21.7071L8.99991 16.4141L8.99991 21H10.9999L10.9999 13L2.99991 13L2.99991 15L7.58562 15Z" fill="#262626"/>
</svg>

After

Width:  |  Height:  |  Size: 399 B

@@ -0,0 +1,3 @@
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M1 0C0.447715 0 0 0.447716 0 1V23C0 23.5523 0.447716 24 1 24H23C23.5523 24 24 23.5523 24 23V1C24 0.447715 23.5523 0 23 0H1ZM21.7068 3.70709L16.414 8.99998H20.9999V11H12.9999V2.99998H14.9999V7.5856L20.2926 2.29288L21.7068 3.70709ZM2.29272 20.2929L7.58562 15L2.99991 15L2.99991 13L10.9999 13L10.9999 21H8.99991V16.4141L3.70694 21.7071L2.29272 20.2929Z" fill="#262626"/>
</svg>

After

Width:  |  Height:  |  Size: 520 B

+1 -1
View File
@@ -4,5 +4,5 @@
"outDir": "./cjs",
"module": "commonjs"
},
"exclude": ["./figma", "./scripts", "**/stories"]
"exclude": ["./figma", "./scripts", "**/*.stories.*"]
}
+3 -2
View File
@@ -1,6 +1,6 @@
{
"name": "@navikt/ds-react",
"version": "0.14.13",
"version": "0.16.9",
"private": false,
"description": "NAV designsystem react components",
"author": "NAV Designsystem team",
@@ -35,8 +35,9 @@
},
"dependencies": {
"@material-ui/core": "^4.12.3",
"@navikt/ds-icons": "^0.7.3",
"@navikt/ds-icons": "^0.8.4",
"@popperjs/core": "^2.10.1",
"@radix-ui/react-toggle-group": "^0.1.4",
"classnames": "^2.2.6",
"react-collapse": "^5.1.0",
"react-merge-refs": "^1.1.0",
@@ -1,39 +0,0 @@
import React, { forwardRef } from "react";
import cl from "classnames";
import MenuItems from "./MenuItems";
import Collapsable, {
AccordionMenuCollapsableType,
} from "./AccordionMenuCollapsable";
import Item, { AccordionMenuItemType } from "./AccordionMenuItem";
export interface AccordionMenuProps extends React.HTMLAttributes<HTMLElement> {
children: React.ReactNode;
}
interface AccordionMenuComponent
extends React.ForwardRefExoticComponent<
AccordionMenuProps & React.RefAttributes<HTMLElement>
> {
Collapsable: AccordionMenuCollapsableType;
Item: AccordionMenuItemType;
}
const AccordionMenu = forwardRef<HTMLElement, AccordionMenuProps>(
({ children, className, ...rest }, ref) => {
return (
<nav
role="navigation"
ref={ref}
className={cl("navds-accordion-menu", className)}
{...rest}
>
<MenuItems>{children}</MenuItems>
</nav>
);
}
) as AccordionMenuComponent;
AccordionMenu.Collapsable = Collapsable;
AccordionMenu.Item = Item;
export default AccordionMenu;
@@ -1,45 +0,0 @@
import React, { forwardRef, HTMLAttributes, useState } from "react";
import cl from "classnames";
import { Expand } from "@navikt/ds-icons";
import MenuItems from "./MenuItems";
export interface AccordionMenuCollapsableProps
extends HTMLAttributes<HTMLDivElement> {
title: string;
defaultOpen?: boolean;
children: React.ReactNode;
}
export type AccordionMenuCollapsableType = React.ForwardRefExoticComponent<
AccordionMenuCollapsableProps & React.RefAttributes<HTMLDivElement>
>;
const Collapsable: AccordionMenuCollapsableType = forwardRef(
({ children, defaultOpen = false, title, className, ...rest }, ref) => {
const [isOpen, setIsOpen] = useState(defaultOpen);
return (
<div
ref={ref}
className={cl("navds-accordion-menu-collapsable", className, {
"navds-accordion-menu-collapsable--open": isOpen,
})}
{...rest}
>
<button
onClick={() => setIsOpen(!isOpen)}
className="navds-accordion-menu-collapsable__button"
>
{title}
<Expand
title={isOpen ? "Pil peker opp" : "Pil peker ned"}
className="navds-accordion-menu-collapsable__expand-icon"
/>
</button>
{isOpen && <MenuItems>{children}</MenuItems>}
</div>
);
}
);
export default Collapsable;
@@ -1,13 +0,0 @@
import React from "react";
const MenuItems = ({ children }: { children: React.ReactNode }) => (
<ul className="navds-accordion-menu__list">
{React.Children.toArray(children).map((child, i) => (
<li key={i} className="navds-accordion-menu__list-item">
{child}
</li>
))}
</ul>
);
export default MenuItems;
@@ -1,3 +0,0 @@
export { default as AccordionMenu, AccordionMenuProps } from "./AccordionMenu";
export { AccordionMenuCollapsableProps } from "./AccordionMenuCollapsable";
export { AccordionMenuItemProps } from "./AccordionMenuItem";
@@ -1,66 +0,0 @@
import { Meta, Canvas } from "@storybook/addon-docs";
import { AccordionMenu } from "../../index";
<Meta title="ds-react/accordion-menu/intro" />
# Hvordan ta i bruk Accordion-menu
```jsx
<AccordionMenu>
<AccordionMenu.item href="#leo">Leo</AccordionMenu.item>
<AccordionMenu.Collapsable title="Proin">
<AccordionMenu.item href="#nulla" active>
Nulla
</AccordionMenu.item>
<AccordionMenu.item href="#luctus">Luctus</AccordionMenu.item>
</AccordionMenu.Collapsable>
<AccordionMenu.Collapsable title="Accumsan">
<AccordionMenu.item href="#justo" aria-current="page">
Justo
</AccordionMenu.item>
<AccordionMenu.Collapsable title="Proin">
<AccordionMenu.item href="#nulla">Nulla</AccordionMenu.item>
<AccordionMenu.item href="#luctus">Luctus</AccordionMenu.item>
</AccordionMenu.Collapsable>
</AccordionMenu.Collapsable>
</AccordionMenu>
```
<Canvas>
<AccordionMenu>
<AccordionMenu.Item href="#leo">Leo</AccordionMenu.Item>
<AccordionMenu.Collapsable title="Proin">
<AccordionMenu.Item href="#nulla" active>
Nulla
</AccordionMenu.Item>
<AccordionMenu.Item href="#luctus">Luctus</AccordionMenu.Item>
</AccordionMenu.Collapsable>
<AccordionMenu.Collapsable title="Accumsan">
<AccordionMenu.Item href="#justo" aria-current="page">
Justo
</AccordionMenu.Item>
<AccordionMenu.Collapsable title="Proin">
<AccordionMenu.Item href="#nulla">Nulla</AccordionMenu.Item>
<AccordionMenu.Item href="#luctus">Luctus</AccordionMenu.Item>
</AccordionMenu.Collapsable>
</AccordionMenu.Collapsable>
</AccordionMenu>
</Canvas>
Accordion-menu støtter opp til maks to-nivårer av `AccordionMenu.Collapsable` akkurat nå.
`AccordionMenu.Item` er implementert med `OverridableComponent`, noe som
gjør at man kan ta i bruk eks react-router slik:
```jsx
<AccordionMenu.item
as={NavLink}
activeClassName="navds-accordion-menu-item--active"
to="/1"
>
Lenketekst
</AccordionMenu.item>
```
Her er `NavLink` fra `react-router-dom` brukt, og man får da
samtidig bruke alle propsene til denne komponenten som da er `activeClassName` her.
@@ -1,141 +0,0 @@
import * as React from "react";
import { AccordionMenu } from "../index";
import { NavLink, HashRouter as Router } from "react-router-dom";
export default {
title: "ds-react/accordion-menu",
component: { AccordionMenu },
};
export const All = () => (
<div
style={{
background: "white",
maxWidth: 288,
}}
>
<AccordionMenu>
<AccordionMenu.Item href="#leo">Leo</AccordionMenu.Item>
<AccordionMenu.Collapsable title="Proin">
<AccordionMenu.Item href="#nulla" active>
Nulla
</AccordionMenu.Item>
<AccordionMenu.Item href="#luctus">Luctus</AccordionMenu.Item>
</AccordionMenu.Collapsable>
<AccordionMenu.Collapsable title="Accumsan">
<AccordionMenu.Item href="#justo" aria-current="page">
Justo
</AccordionMenu.Item>
<AccordionMenu.Item href="#pariatur" active aria-current="page">
Pariatur
</AccordionMenu.Item>
<AccordionMenu.Collapsable title="Proin">
<AccordionMenu.Item href="#nulla" active>
Nulla
</AccordionMenu.Item>
<AccordionMenu.Item href="#luctus">Luctus</AccordionMenu.Item>
</AccordionMenu.Collapsable>
</AccordionMenu.Collapsable>
<AccordionMenu.Item href="#justo" active>
Justo
</AccordionMenu.Item>
<AccordionMenu.Item href="#pariatur">Pariatur</AccordionMenu.Item>
</AccordionMenu>
</div>
);
export const ReactRouter = () => (
<AccordionMenu>
<AccordionMenu.Collapsable title="Nivå 1 – 3 rems høy">
<AccordionMenu.Item
as={NavLink}
activeClassName="navds-accordion-menu-item--active"
to="/1"
>
Nivå 2 innrykk 2 rems
</AccordionMenu.Item>
<AccordionMenu.Item
as={NavLink}
activeClassName="navds-accordion-menu-item--active"
to="/2"
>
Subtitle 3
</AccordionMenu.Item>
</AccordionMenu.Collapsable>
<AccordionMenu.Collapsable title="Skjema og søknad">
<AccordionMenu.Collapsable title="Satser">
<AccordionMenu.Item
as={NavLink}
activeClassName="navds-accordion-menu-item--active"
to="/3"
>
Nivå 3 – 3 rems innrykk Har du rett til dagpenger når du mottar annen
økonomisk støtte fra NAV?
</AccordionMenu.Item>
</AccordionMenu.Collapsable>
<AccordionMenu.Item
as={NavLink}
activeClassName="navds-accordion-menu-item--active"
to="/4"
>
Subtitle 2
</AccordionMenu.Item>
<AccordionMenu.Item
as={NavLink}
activeClassName="navds-accordion-menu-item--active"
to="/5"
>
Subtitle 3
</AccordionMenu.Item>
</AccordionMenu.Collapsable>
<AccordionMenu.Collapsable title="Sakbehandlingstider">
<AccordionMenu.Collapsable title="Subtitle 4 Lang tittel på andre nivå lorem ipsum">
<AccordionMenu.Item
as={NavLink}
activeClassName="navds-accordion-menu-item--active"
to="/6"
>
Subtitle 5
</AccordionMenu.Item>
</AccordionMenu.Collapsable>
</AccordionMenu.Collapsable>
<AccordionMenu.Item
as={NavLink}
activeClassName="navds-accordion-menu-item--active"
to="/7"
>
Internasjonalt
</AccordionMenu.Item>
<AccordionMenu.Collapsable title="Meld fra om endringer lang tittel på første nivå">
<AccordionMenu.Item
as={NavLink}
activeClassName="navds-accordion-menu-item--active"
to="/8"
>
Subtitle 6
</AccordionMenu.Item>
</AccordionMenu.Collapsable>
<AccordionMenu.Item
as={NavLink}
activeClassName="navds-accordion-menu-item--active"
to="/9"
>
Nivå 1
</AccordionMenu.Item>
</AccordionMenu>
);
ReactRouter.decorators = [
(Story) => (
<Router>
<div
style={{
background: "white",
maxWidth: 288,
}}
>
<Story />
</div>
</Router>
),
];
@@ -43,6 +43,7 @@ const AccordionHeader: AccordionHeaderType = forwardRef(
return (
<button
{...rest}
ref={ref}
id={context.buttonId}
className={cl(
@@ -52,17 +53,17 @@ const AccordionHeader: AccordionHeaderType = forwardRef(
"navds-heading--small"
)}
onClick={handleClick}
{...rest}
aria-expanded={context.open}
>
{children}
<Expand
title={context.open ? "Lukk panel ikon" : "Åpne panel ikon"}
aria-hidden
className={cl("navds-accordion__expand-icon", {
"navds-accordion__expand-icon--flip": context.open,
})}
/>
<ExpandFilled
title={context.open ? "Lukk panel ikon" : "Åpne panel ikon"}
aria-hidden
className={cl(
"navds-accordion__expand-icon",
"navds-accordion__expand-icon--filled",
@@ -0,0 +1,90 @@
import React, { useState } from "react";
import AccordionContent from "./AccordionContent";
import AccordionHeader from "./AccordionHeader";
import AccordionItem from "./AccordionItem";
import { Accordion } from ".";
export default {
title: "ds-react/accordion",
component: Accordion,
subcomponents: {
AccordionItem,
AccordionContent,
AccordionHeader,
},
};
export const All = () => {
const [open, setOpen] = useState(false);
return (
<>
<h1>Accordion</h1>
<h2>Controlled</h2>
<Accordion>
<Accordion.Item open={open}>
<Accordion.Header onClick={() => setOpen(!open)}>
Accordion header text
</Accordion.Header>
<Accordion.Content>
Magna aliquip aliquip fugiat nostrud nostrud velit pariatur veniam
officia laboris voluptate officia pariatur.Lorem est ex anim velit
occaecat nisi qui nostrud sit consectetur consectetur officia
nostrud ullamco. Est ex duis proident nostrud elit qui laborum anim
minim eu eiusmod. Veniam in nostrud sunt tempor velit incididunt
sint ex dolor qui velit id eu. Deserunt magna sunt velit in. Est
exercitation id cillum qui do. Minim adipisicing nostrud commodo
proident occaecat aliquip nulla anim proident reprehenderit. Magna
ipsum officia veniam cupidatat duis veniam dolore reprehenderit
mollit velit.Ut consequat commodo minim occaecat id pariatur. Nisi
enim tempor laborum commodo. Tempor sit quis nostrud eu cupidatat
sunt commodo reprehenderit irure deserunt eiusmod ipsum.
Exercitation quis commodo cillum eiusmod eiusmod. Do laborum qui
proident commodo adipisicing eiusmod id.
</Accordion.Content>
</Accordion.Item>
</Accordion>
<h2>Un-controlled</h2>
<Accordion>
<Accordion.Item>
<Accordion.Header>Accordion header text</Accordion.Header>
<Accordion.Content>
Magna aliquip aliquip fugiat nostrud nostrud velit pariatur veniam
officia laboris voluptate officia pariatur.Lorem est ex anim velit
occaecat nisi qui nostrud sit consectetur consectetur officia
nostrud ullamco. Est ex duis proident nostrud elit qui laborum anim
minim eu eiusmod. Veniam in nostrud sunt tempor velit incididunt
sint ex dolor qui velit id eu. Deserunt magna sunt velit in. Est
exercitation id cillum qui do. Minim adipisicing nostrud commodo
proident occaecat aliquip nulla anim proident reprehenderit. Magna
ipsum officia veniam cupidatat duis veniam dolore reprehenderit
mollit velit.Ut consequat commodo minim occaecat id pariatur. Nisi
enim tempor laborum commodo. Tempor sit quis nostrud eu cupidatat
sunt commodo reprehenderit irure deserunt eiusmod ipsum.
Exercitation quis commodo cillum eiusmod eiusmod. Do laborum qui
proident commodo adipisicing eiusmod id.
</Accordion.Content>
</Accordion.Item>
<Accordion.Item>
<Accordion.Header>Accordion header text</Accordion.Header>
<Accordion.Content>
Magna aliquip aliquip fugiat nostrud nostrud velit pariatur veniam
officia laboris voluptate officia pariatur.Lorem est ex anim velit
occaecat nisi qui nostrud sit consectetur consectetur officia
nostrud ullamco. Est ex duis proident nostrud elit qui laborum anim
minim eu eiusmod. Veniam in nostrud sunt tempor velit incididunt
sint ex dolor qui velit id eu. Deserunt magna sunt velit in. Est
exercitation id cillum qui do. Minim adipisicing nostrud commodo
proident occaecat aliquip nulla anim proident reprehenderit. Magna
ipsum officia veniam cupidatat duis veniam dolore reprehenderit
mollit velit.Ut consequat commodo minim occaecat id pariatur. Nisi
enim tempor laborum commodo. Tempor sit quis nostrud eu cupidatat
sunt commodo reprehenderit irure deserunt eiusmod ipsum.
Exercitation quis commodo cillum eiusmod eiusmod. Do laborum qui
proident commodo adipisicing eiusmod id.
</Accordion.Content>
</Accordion.Item>
</Accordion>
</>
);
};
@@ -1,72 +0,0 @@
import { Meta, Canvas, Props } from "@storybook/addon-docs";
import { Accordion } from "../../index";
<Meta title="ds-react/accordion/intro" />
# Hvordan ta i bruk Accordion
```jsx
<Accordion>
<Accordion.Item>
<Accordion.Header>Accordion header text</Accordion.Header>
<Accordion.Content>
Magna aliquip aliquip fugiat nostrud nostrud velit pariatur veniam officia
laboris voluptate officia pariatur.Lorem est ex anim velit occaecat nisi
qui nostrud sit.
</Accordion.Content>
</Accordion.Item>
<Accordion.Item>
<Accordion.Header>Aliquip amet irure consectetur occaecat</Accordion.Header>
<Accordion.Content>
Cupidatat aliqua eu ea et anim excepteur. Labore aliquip dolore laborum
consequat. Reprehenderit ad velit quis eiusmod ex sint aliquip do deserunt
amet exercitation velit Lorem.
</Accordion.Content>
</Accordion.Item>
</Accordion>
```
<Canvas>
<Accordion>
<Accordion.Item>
<Accordion.Header>Accordion header text</Accordion.Header>
<Accordion.Content>
Magna aliquip aliquip fugiat nostrud nostrud velit pariatur veniam
officia laboris voluptate officia pariatur.Lorem est ex anim velit
occaecat nisi qui nostrud sit.
</Accordion.Content>
</Accordion.Item>
<Accordion.Item>
<Accordion.Header>
Aliquip amet irure consectetur occaecat
</Accordion.Header>
<Accordion.Content>
Cupidatat aliqua eu ea et anim excepteur. Labore aliquip dolore laborum
consequat. Reprehenderit ad velit quis eiusmod ex sint aliquip do
deserunt amet exercitation velit Lorem.
</Accordion.Content>
</Accordion.Item>
</Accordion>
</Canvas>
## Controlled state
Accordion-komponeten styrer selv open-state, men om man ønsker kan man selv overskrive denne med
`open`-prop + `onClick`-prop slik det er gjort på eksemplet.
```jsx
<Accordion>
<Accordion.Item open={open}>
<Accordion.Header onClick={(open) => setOpen(!open)}>
Accordion header text
</Accordion.Header>
<Accordion.Content>
Magna aliquip aliquip fugiat nostrud nostrud velit pariatur veniam officia
laboris voluptate officia pariatur.Lorem est ex anim velit
</Accordion.Content>
</Accordion.Item>
</Accordion>
```
`renderContentWhenClosed`-prop på `Accordion.Item` bestemmer om innholdet (children) skal beholdes i dom-strukturen mens
Accordion er lukket. Defaulter til `false`.
@@ -1,92 +0,0 @@
import React, { useState } from "react";
import AccordionContent from "../AccordionContent";
import AccordionHeader from "../AccordionHeader";
import AccordionItem from "../AccordionItem";
import { Accordion } from "../index";
export default {
title: "ds-react/accordion",
component: Accordion,
subcomponents: {
AccordionItem,
AccordionContent,
AccordionHeader,
},
};
export const All = () => {
const [open, setOpen] = useState(false);
return (
<>
<div>
<h1>Accordion</h1>
<h2>Controlled</h2>
<Accordion>
<Accordion.Item open={open}>
<Accordion.Header onClick={() => setOpen(!open)}>
Accordion header text
</Accordion.Header>
<Accordion.Content>
Magna aliquip aliquip fugiat nostrud nostrud velit pariatur veniam
officia laboris voluptate officia pariatur.Lorem est ex anim velit
occaecat nisi qui nostrud sit consectetur consectetur officia
nostrud ullamco. Est ex duis proident nostrud elit qui laborum
anim minim eu eiusmod. Veniam in nostrud sunt tempor velit
incididunt sint ex dolor qui velit id eu. Deserunt magna sunt
velit in. Est exercitation id cillum qui do. Minim adipisicing
nostrud commodo proident occaecat aliquip nulla anim proident
reprehenderit. Magna ipsum officia veniam cupidatat duis veniam
dolore reprehenderit mollit velit.Ut consequat commodo minim
occaecat id pariatur. Nisi enim tempor laborum commodo. Tempor sit
quis nostrud eu cupidatat sunt commodo reprehenderit irure
deserunt eiusmod ipsum. Exercitation quis commodo cillum eiusmod
eiusmod. Do laborum qui proident commodo adipisicing eiusmod id.
</Accordion.Content>
</Accordion.Item>
</Accordion>
<h2>Un-controlled</h2>
<Accordion>
<Accordion.Item>
<Accordion.Header>Accordion header text</Accordion.Header>
<Accordion.Content>
Magna aliquip aliquip fugiat nostrud nostrud velit pariatur veniam
officia laboris voluptate officia pariatur.Lorem est ex anim velit
occaecat nisi qui nostrud sit consectetur consectetur officia
nostrud ullamco. Est ex duis proident nostrud elit qui laborum
anim minim eu eiusmod. Veniam in nostrud sunt tempor velit
incididunt sint ex dolor qui velit id eu. Deserunt magna sunt
velit in. Est exercitation id cillum qui do. Minim adipisicing
nostrud commodo proident occaecat aliquip nulla anim proident
reprehenderit. Magna ipsum officia veniam cupidatat duis veniam
dolore reprehenderit mollit velit.Ut consequat commodo minim
occaecat id pariatur. Nisi enim tempor laborum commodo. Tempor sit
quis nostrud eu cupidatat sunt commodo reprehenderit irure
deserunt eiusmod ipsum. Exercitation quis commodo cillum eiusmod
eiusmod. Do laborum qui proident commodo adipisicing eiusmod id.
</Accordion.Content>
</Accordion.Item>
<Accordion.Item>
<Accordion.Header>Accordion header text</Accordion.Header>
<Accordion.Content>
Magna aliquip aliquip fugiat nostrud nostrud velit pariatur veniam
officia laboris voluptate officia pariatur.Lorem est ex anim velit
occaecat nisi qui nostrud sit consectetur consectetur officia
nostrud ullamco. Est ex duis proident nostrud elit qui laborum
anim minim eu eiusmod. Veniam in nostrud sunt tempor velit
incididunt sint ex dolor qui velit id eu. Deserunt magna sunt
velit in. Est exercitation id cillum qui do. Minim adipisicing
nostrud commodo proident occaecat aliquip nulla anim proident
reprehenderit. Magna ipsum officia veniam cupidatat duis veniam
dolore reprehenderit mollit velit.Ut consequat commodo minim
occaecat id pariatur. Nisi enim tempor laborum commodo. Tempor sit
quis nostrud eu cupidatat sunt commodo reprehenderit irure
deserunt eiusmod ipsum. Exercitation quis commodo cillum eiusmod
eiusmod. Do laborum qui proident commodo adipisicing eiusmod id.
</Accordion.Content>
</Accordion.Item>
</Accordion>
</div>
</>
);
};
+5 -9
View File
@@ -36,13 +36,13 @@ export interface AlertProps extends React.HTMLAttributes<HTMLDivElement> {
const Icon = ({ variant, ...props }) => {
switch (variant) {
case "error":
return <ErrorFilled {...props} />;
return <ErrorFilled title="Feil" {...props} />;
case "warning":
return <WarningFilled {...props} />;
return <WarningFilled title="Advarsel" {...props} />;
case "info":
return <InformationFilled {...props} />;
return <InformationFilled title="Informasjon" {...props} />;
case "success":
return <SuccessFilled {...props} />;
return <SuccessFilled title="Suksess" {...props} />;
default:
return null;
}
@@ -76,11 +76,7 @@ const Alert = forwardRef<HTMLDivElement, AlertProps>(
{ "navds-alert--full-width": fullWidth, "navds-alert--inline": inline }
)}
>
<Icon
title={`${variant}-ikon`}
variant={variant}
className="navds-alert__icon"
/>
<Icon variant={variant} className="navds-alert__icon" />
<BodyLong as="div" size={size} className="navds-alert__wrapper">
{children}
</BodyLong>
@@ -1,6 +1,6 @@
import React from "react";
import { Alert } from "..";
import { BodyLong, Heading } from "../..";
import { Alert } from ".";
import { BodyLong, Heading } from "..";
export default {
title: "ds-react/alert",
@@ -1,96 +0,0 @@
import { Meta, Canvas } from "@storybook/addon-docs";
import { Alert, Heading, BodyLong } from "../../index";
<Meta title="ds-react/alert/intro" />
# Hvordan ta i bruk Alert
```jsx
<Alert variant="info">
Id elit esse enim reprehenderit.Tempor tempor ex exercitation id aute
eu.Laborum nulla nisi irure voluptate mollit fugiat.Est quis culpa nostrud et
reprehenderit ea sint.Eu veniam labore enim labore qui eiusmod Lorem amet ad
esse.
</Alert>
```
<Canvas>
<Alert variant="info">
Id elit esse enim reprehenderit.Tempor tempor ex exercitation id aute
eu.Laborum nulla nisi irure voluptate mollit fugiat.Est quis culpa nostrud
et reprehenderit ea sint.Eu veniam labore enim labore qui eiusmod Lorem amet
ad esse.
</Alert>
</Canvas>
## Varianter
`variants`-prop kan brukes for å endre utseende mellom
`info`, `success`, `warning` og `error`.
<Canvas>
<Alert variant="info">Id elit esse enim reprehenderit.</Alert>
<Alert variant="success">Id elit esse enim reprehenderit.</Alert>
<Alert variant="warning">Id elit esse enim reprehenderit.</Alert>
<Alert variant="error">Id elit esse enim reprehenderit.</Alert>
</Canvas>
## Sizing
Alert har to størrelser: Default 64px height og small 32px height default.
<Canvas>
<Alert size="small" variant="info">
Id elit esse enim reprehenderit.
</Alert>
<Alert size="small" variant="success">
Id elit esse enim reprehenderit.
</Alert>
<Alert size="small" variant="warning">
Id elit esse enim reprehenderit.
</Alert>
<Alert size="small" variant="error">
Id elit esse enim reprehenderit.
</Alert>
</Canvas>
## fullWidth
<Canvas>
<div style={{ margin: 32, display: "grid", gap: 16 }}>
<Alert fullWidth variant="info">
Id elit esse enim reprehenderit.
</Alert>
<Alert fullWidth size="small" variant="info">
Id elit esse enim reprehenderit.
</Alert>
</div>
</Canvas>
## Med heading
```jsx
<Alert variant="info">
<Heading spacing size="small" level="2">
Aliquip duis est in commodo pariatur
</Heading>
<BodyLong>
Ullamco ullamco laborum et commodo sint culpa cupidatat culpa qui laboris
ex. Labore ex occaecat proident qui qui fugiat magna. Fugiat sint commodo
consequat eu aute.
</BodyLong>
</Alert>
```
<Canvas>
<Alert variant="info">
<Heading spacing size="small" level="3">
Aliquip duis est in commodo pariatur
</Heading>
<BodyLong>
Ullamco ullamco laborum et commodo sint culpa cupidatat culpa qui laboris
ex. Labore ex occaecat proident qui qui fugiat magna. Fugiat sint commodo
consequat eu aute.
</BodyLong>
</Alert>
</Canvas>
@@ -1,10 +1,13 @@
import React, { useState } from "react";
import { Button } from "../index";
import { Button } from "./index";
import { Success } from "@navikt/ds-icons";
export default {
title: "ds-react/button",
component: Button,
parameters: {
chromatic: { delay: 300 },
},
};
const Section = ({ children }) => (
@@ -1,76 +0,0 @@
import { Meta, Canvas } from "@storybook/addon-docs";
import { Button, Loader } from "../../index";
import { Success } from "@navikt/ds-icons";
<Meta title="ds-react/button/intro" />
# Hvordan ta i bruk Button
```jsx
<Button>Button</Button>
```
<Canvas>
<Button>Button</Button>
</Canvas>
## Varianter
`variants`-prop kan brukes for å endre utseende mellom
`primary`, `secondary`, `tertiary` og `danger`
<Canvas>
<Button variant="primary">Primary</Button>
<Button variant="secondary">Secondary</Button>
<Button variant="tertiary">Tertiary</Button>
<Button variant="danger">Danger</Button>
</Canvas>
## Sizing
Button har to størrelser: Default 48px min-height og small 32px min-height
<Canvas>
<Button size="small" variant="primary">
Primary
</Button>
<Button size="small" variant="secondary">
Secondary
</Button>
<Button size="small" variant="tertiary">
Tertiary
</Button>
<Button size="small" variant="danger">
Danger
</Button>
</Canvas>
## Loading
Button har en egen `loading`-prop setter knappen til disabled og viser `Loader`.
Button width bli automatisk justert basert på innholdet sin bredde.
<Canvas>
<Button loading variant="primary">
Primary
</Button>
<Button loading variant="secondary">
Secondary
</Button>
</Canvas>
## Med ikon
Hvis man setter ikoner (svg) rett på button vil størrelsen
bli justert automatisk og sentrert.
<Canvas>
<Button>
<Success /> Knapp <Success />
</Button>
<Button size="small">
<Success />
Knapp
<Success />
</Button>
</Canvas>
+4 -2
View File
@@ -89,13 +89,15 @@ const Switch = forwardRef<HTMLInputElement, SwitchProps>((props, ref) => {
`navds-switch--${size}`,
`navds-switch--${position}`,
{
"navds-switch--disabled": inputProps.disabled,
"navds-switch--loading": loading,
"navds-switch--disabled": inputProps.disabled ?? loading,
}
)}
>
<input
{...omit(rest, ["size"])}
{...omit(inputProps, ["aria-invalid", "aria-describedby"])}
disabled={inputProps.disabled ?? loading}
checked={checkedProp}
defaultChecked={defaultChecked}
ref={ref}
@@ -106,7 +108,7 @@ const Switch = forwardRef<HTMLInputElement, SwitchProps>((props, ref) => {
<span className="navds-switch__track">
<span className="navds-switch__thumb">
{loading ? (
<Loader size="xsmall" />
<Loader size="xsmall" aria-live="polite" />
) : checked ? (
<SelectedIcon />
) : null}
@@ -24,6 +24,11 @@ export interface CheckboxProps
* The value of the HTML element.
*/
value?: string;
/**
* Specify whether the Checkbox is in an indeterminate state
* @default false
*/
indeterminate?: boolean;
}
const Checkbox = forwardRef<HTMLInputElement, CheckboxProps>((props, ref) => {
@@ -52,8 +57,20 @@ const Checkbox = forwardRef<HTMLInputElement, CheckboxProps>((props, ref) => {
"hideLabel",
])}
{...inputProps}
type="checkbox"
className="navds-checkbox__input"
ref={ref}
aria-checked={props.indeterminate ? "mixed" : inputProps.checked}
ref={(el) => {
if (el) {
el.indeterminate = props.indeterminate ?? false;
}
if (typeof ref === "function") {
ref(el);
} else if (ref != null) {
ref.current = el;
}
}}
/>
<label htmlFor={inputProps.id} className="navds-checkbox__label">
<div
@@ -1,4 +1,4 @@
import React from "react";
import React, { useState } from "react";
import { Checkbox, CheckboxGroup } from "../../index";
import { Meta } from "@storybook/react/types-6-0";
export default {
@@ -6,6 +6,36 @@ export default {
component: Checkbox,
} as Meta;
export const Indeterminate = () => {
const [checked, setChecked] = useState([true, false]);
return (
<>
<Checkbox
checked={checked[0] && checked[1]}
indeterminate={checked[0] !== checked[1]}
onChange={(e) => setChecked([e.target.checked, e.target.checked])}
>
Parent
</Checkbox>
<div style={{ paddingLeft: "2rem" }}>
<Checkbox
checked={checked[0]}
onChange={(e) => setChecked([e.target.checked, checked[1]])}
>
Child 1
</Checkbox>
<Checkbox
checked={checked[1]}
onChange={(e) => setChecked([checked[0], e.target.checked])}
>
Child 2
</Checkbox>
</div>
</>
);
};
export const All = () => {
const Checkboxes = (props) => (
<CheckboxGroup
@@ -51,6 +81,13 @@ export const All = () => {
<Checkbox value="Orange" description="Laborum ad" disabled defaultChecked>
Orange
</Checkbox>
<h3>Indeterminate</h3>
<Checkbox value="Apple" indeterminate>
Apple
</Checkbox>
<Checkbox value="Orange" indeterminate size="small">
Orange
</Checkbox>
<h2>Checkbox group</h2>
<Checkboxes />
@@ -32,7 +32,6 @@ const useCheckbox = ({ children, ...props }: CheckboxProps) => {
...rest,
inputProps: {
...inputProps,
type: "checkbox",
checked: checkboxGroup?.value
? checkboxGroup.value.includes(props.value as string)
: props.checked,
@@ -9,6 +9,7 @@ export default {
export const All = () => {
const [checked, setChecked] = useState(false);
const [loadingState, setLoadingState] = useState(false);
return (
<div style={{ width: "fit-content" }}>
<h1>Switch</h1>
@@ -91,6 +92,13 @@ export const All = () => {
<Switch disabled loading>
Label text
</Switch>
<Switch checked loading>
Label text
</Switch>
<button onClick={() => setLoadingState(!loadingState)}>
Toggle loading
</button>
<Switch loading={loadingState}>Label text</Switch>
</div>
);
};
@@ -27,14 +27,14 @@ const HelpText = forwardRef<HTMLButtonElement, HelpTextProps>(
) => {
const buttonRef = useRef<HTMLButtonElement | null>(null);
const mergedRef = mergeRefs([buttonRef, ref]);
const popoverRef = useRef<HTMLDivElement | null>(null);
const [popoverRef, setPopoverRef] = useState<HTMLDivElement | null>(null);
const wrapperRef = useRef<HTMLDivElement | null>(null);
const [open, setOpen] = useState(false);
useEffect(() => {
open && popoverRef.current?.focus();
}, [open]);
open && popoverRef?.focus?.();
}, [open, popoverRef]);
const handleClick = (
e: React.MouseEvent<HTMLButtonElement, MouseEvent>
@@ -42,7 +42,6 @@ const HelpText = forwardRef<HTMLButtonElement, HelpTextProps>(
setOpen((x) => !x);
rest.onClick && rest.onClick(e);
};
return (
<div className="navds-help-text" ref={wrapperRef}>
<button
@@ -59,7 +58,7 @@ const HelpText = forwardRef<HTMLButtonElement, HelpTextProps>(
<span className="navds-sr-only">{title}</span>
</button>
<Popover
ref={popoverRef}
ref={setPopoverRef}
onClose={() => setOpen(false)}
className="navds-help-text__popover"
open={open}
+2 -1
View File
@@ -1,5 +1,4 @@
export * from "./accordion";
export * from "./accordion-menu";
export * from "./alert";
export * from "./button";
export * from "./form";
@@ -9,12 +8,14 @@ export * from "./guide-panel";
export * from "./link";
export * from "./link-panel";
export * from "./loader";
export * from "./menu";
export * from "./modal";
export * from "./panel";
export * from "./popover";
export * from "./speech-bubble";
export * from "./step-indicator";
export * from "./tag";
export * from "./toggle-group";
export * from "./table";
export * from "./typography";
export * from "./util";
+36
View File
@@ -0,0 +1,36 @@
import React, { forwardRef } from "react";
import cl from "classnames";
import MenuItems from "./MenuItems";
import Item, { MenuItemType } from "./MenuItem";
import Collapse, { MenuCollapseType } from "./MenuCollapse";
export interface MenuProps extends React.HTMLAttributes<HTMLElement> {
children: React.ReactNode;
}
interface MenuComponent
extends React.ForwardRefExoticComponent<
MenuProps & React.RefAttributes<HTMLElement>
> {
Collapse: MenuCollapseType;
Item: MenuItemType;
}
const Menu = forwardRef<HTMLElement, MenuProps>(
({ children, className, ...rest }, ref) => (
<nav
{...rest}
role="navigation"
ref={ref}
className={cl("navds-menu", className)}
>
<MenuItems>{children}</MenuItems>
</nav>
)
) as MenuComponent;
Menu.Collapse = Collapse;
Menu.Item = Item;
export default Menu;
@@ -0,0 +1,80 @@
import React, {
createContext,
forwardRef,
HTMLAttributes,
useContext,
useState,
} from "react";
import cl from "classnames";
import { Expand, ExpandFilled } from "@navikt/ds-icons";
import MenuItems from "./MenuItems";
export const NestingContext = createContext<{ depth: number }>({ depth: 1 });
const NestingProvider = ({ children }) => {
const context = useContext(NestingContext);
return (
<NestingContext.Provider
value={{
depth: context.depth + 1,
}}
>
{children}
</NestingContext.Provider>
);
};
export interface MenuCollapseProps extends HTMLAttributes<HTMLDivElement> {
title: string;
defaultOpen?: boolean;
children: React.ReactNode;
}
export type MenuCollapseType = React.ForwardRefExoticComponent<
MenuCollapseProps & React.RefAttributes<HTMLDivElement>
>;
const Collapse: MenuCollapseType = forwardRef(
({ children, defaultOpen = false, title, className, ...rest }, ref) => {
const [isOpen, setIsOpen] = useState(defaultOpen);
const context = useContext(NestingContext);
return (
<div
{...rest}
ref={ref}
className={cl("navds-menu-collapse", className, {
"navds-menu-collapse--open": isOpen,
})}
>
<button
onClick={() => setIsOpen(!isOpen)}
className="navds-menu-collapse__button"
>
{title}
<Expand
title={isOpen ? "lukk navigasjons-skuff" : "åpne navigason-skuff"}
className="navds-menu-collapse__expand-icon"
/>
<ExpandFilled
title={isOpen ? "lukk navigasjons-skuff" : "åpne navigason-skuff"}
className="navds-menu-collapse__expand-icon navds-menu-collapse__expand-icon--filled"
/>
</button>
<NestingProvider>
{isOpen && (
<MenuItems
data-depth={context.depth}
className="navds-menu__list--inner"
>
{children}
</MenuItems>
)}
</NestingProvider>
</div>
);
}
);
export default Collapse;
@@ -2,7 +2,7 @@ import React, { forwardRef } from "react";
import { OverridableComponent } from "..";
import cl from "classnames";
export interface AccordionMenuItemProps
export interface MenuItemProps
extends React.AnchorHTMLAttributes<HTMLAnchorElement> {
children: React.ReactNode;
/**
@@ -12,12 +12,12 @@ export interface AccordionMenuItemProps
active?: boolean;
}
export type AccordionMenuItemType = OverridableComponent<
AccordionMenuItemProps,
export type MenuItemType = OverridableComponent<
MenuItemProps,
HTMLAnchorElement
>;
const Item: AccordionMenuItemType = forwardRef(
const Item: MenuItemType = forwardRef(
(
{ children, as: Component = "a", active = false, className, ...rest },
ref
@@ -25,8 +25,8 @@ const Item: AccordionMenuItemType = forwardRef(
return (
<Component
ref={ref}
className={cl("navds-accordion-menu-item", className, {
"navds-accordion-menu-item--active": active,
className={cl("navds-menu-item", className, {
"navds-menu-item--active": active,
})}
{...rest}
>
+21
View File
@@ -0,0 +1,21 @@
import cl from "classnames";
import React from "react";
const MenuItems = ({
children,
className,
...rest
}: {
children: React.ReactNode;
className?: string;
}) => (
<ul {...rest} className={cl("navds-menu__list", className)}>
{React.Children.toArray(children).map((child, i) => (
<li key={i} className="navds-menu__list-item">
{child}
</li>
))}
</ul>
);
export default MenuItems;
+3
View File
@@ -0,0 +1,3 @@
export { default as Menu, MenuProps } from "./Menu";
export { MenuCollapseProps } from "./MenuCollapse";
export { MenuItemProps } from "./MenuItem";
@@ -0,0 +1,93 @@
import { Meta, Canvas } from "@storybook/addon-docs";
import { Menu } from "../../index";
<Meta title="ds-react/menu/intro" />
# Hvordan ta i bruk Menu
```jsx
<Menu>
<Menu.Item href="#leo">Leo</Menu.Item>
<Menu.Collapse title="Proin">
<Menu.Item href="#nulla" active>
Nulla
</Menu.Item>
<Menu.Item href="#luctus">Luctus</Menu.Item>
</Menu.Collapse>
<Menu.Collapse title="Accumsan">
<Menu.Item href="#justo" aria-current="page">
Justo
</Menu.Item>
<Menu.Collapse title="Proin">
<Menu.Item href="#nulla">Nulla</Menu.Item>
<Menu.Item href="#luctus">Luctus</Menu.Item>
</Menu.Collapse>
</Menu.Collapse>
</Menu>
```
<Canvas>
<Menu>
<Menu.Item href="#leo">Leo</Menu.Item>
<Menu.Collapse title="Proin">
<Menu.Item href="#nulla" active>
Nulla
</Menu.Item>
<Menu.Item href="#luctus">Luctus</Menu.Item>
</Menu.Collapse>
<Menu.Collapse title="Accumsan">
<Menu.Item href="#justo">Justo</Menu.Item>
<Menu.Collapse title="Proin">
<Menu.Item href="#nulla">Nulla</Menu.Item>
<Menu.Item href="#luctus">Luctus</Menu.Item>
</Menu.Collapse>
</Menu.Collapse>
</Menu>
</Canvas>
## Elementer i menyen
Menyen har to typer elementer man kan bruke: `Collapse` for nesting og `Item` for navigasjonslenker på siden.
<Canvas>
<div>
<h2>Item</h2>
<Menu>
<Menu.Item href="#leo">Lenke</Menu.Item>
<Menu.Item href="#leo">Lenke</Menu.Item>
<Menu.Item href="#leo">Lenke</Menu.Item>
<Menu.Item href="#leo">Lenke</Menu.Item>
<Menu.Item href="#leo">Lenke</Menu.Item>
</Menu>
<h2>Collapses + Item</h2>
<Menu>
<Menu.Collapse title="Proin">
<Menu.Item href="#nulla" active>
Nulla
</Menu.Item>
<Menu.Item href="#luctus">Luctus</Menu.Item>
</Menu.Collapse>
<Menu.Collapse title="Accumsan">
<Menu.Item href="#justo">Justo</Menu.Item>
<Menu.Collapse title="Proin">
<Menu.Item href="#nulla">Nulla</Menu.Item>
<Menu.Item href="#luctus">Luctus</Menu.Item>
</Menu.Collapse>
</Menu.Collapse>
<Menu.Item href="#leo">Lenke</Menu.Item>
<Menu.Item href="#leo">Lenke</Menu.Item>
</Menu>
</div>
</Canvas>
`Menu.Item` er implementert med `OverridableComponent`, noe som
gjør at man kan ta i bruk eks react-router slik:
```jsx
<Menu.Item as={NavLink} activeClassName="navds-menu-item--active" to="/1">
Lenketekst
</Menu.Item>
```
Her er `NavLink` fra `react-router-dom` brukt, og man får da
samtidig bruke alle propsene til denne komponenten som da er `activeClassName` her.
@@ -0,0 +1,139 @@
import * as React from "react";
import cl from "classnames";
import { Menu } from "../index";
import { NavLink, HashRouter as Router } from "react-router-dom";
import { MenuItemProps } from "../MenuItem";
export default {
title: "ds-react/menu",
component: { Menu },
};
export const All = () => (
<div
style={{
background: "white",
maxWidth: 288,
}}
>
<h2>Only Menu.Items</h2>
<Menu>
<Menu.Item href="#leo">Leo</Menu.Item>
<Menu.Item href="#justo">Justo</Menu.Item>
<Menu.Item href="#pariatur" active aria-current="page">
Pariatur
</Menu.Item>
<Menu.Item href="#nulla">Nulla</Menu.Item>
<Menu.Item href="#luctus">Luctus</Menu.Item>
<Menu.Item href="#justo">Justo</Menu.Item>
<Menu.Item href="#pariatur">Pariatur</Menu.Item>
</Menu>
<h2>With Collapse</h2>
<Menu>
<Menu.Item href="#leo">Leo</Menu.Item>
<Menu.Collapse title="Proin">
<Menu.Item href="#nulla" active>
Nulla
</Menu.Item>
<Menu.Item href="#luctus">Luctus</Menu.Item>
</Menu.Collapse>
<Menu.Collapse title="Accumsan">
<Menu.Item href="#justo" aria-current="page">
Justo
</Menu.Item>
<Menu.Item href="#pariatur" active aria-current="page">
Pariatur
</Menu.Item>
<Menu.Collapse title="Proin">
<Menu.Item href="#nulla" active>
Nulla
</Menu.Item>
<Menu.Collapse title="Proin">
<Menu.Item href="#nulla" active>
Nulla
</Menu.Item>
<Menu.Item href="#luctus">Luctus</Menu.Item>
</Menu.Collapse>
<Menu.Item href="#luctus">Luctus</Menu.Item>
</Menu.Collapse>
</Menu.Collapse>
<Menu.Item href="#justo" active>
Justo
</Menu.Item>
<Menu.Item href="#pariatur">Pariatur</Menu.Item>
</Menu>
</div>
);
export const ReactRouter = () => {
const MenuItemLink = (props: MenuItemProps & { to: string }) => {
const { to } = props;
const CustomLink = React.useMemo(
() => (props: MenuItemProps) => (
<NavLink
{...props}
to={to}
className={({ isActive }) =>
cl(props.className, {
"navds-menu-item--active": isActive,
})
}
/>
),
[to]
);
return (
<Menu.Item {...props} as={CustomLink}>
Nivå 2 innrykk 2 rems
</Menu.Item>
);
};
return (
<Menu>
<Menu.Collapse title="Nivå 1 - 3 rems høy">
<MenuItemLink to="/1">Nivå 2 innrykk 2 rems</MenuItemLink>
<MenuItemLink to="/2">Subtitle 3</MenuItemLink>
</Menu.Collapse>
<Menu.Collapse title="Skjema og søknad">
<Menu.Collapse title="Satser">
<MenuItemLink to="/3">
Nivå 3 - 3 rems innrykk Har du rett til dagpenger når du mottar
annen økonomisk støtte fra NAV?
</MenuItemLink>
</Menu.Collapse>
<MenuItemLink to="/4">Subtitle 2</MenuItemLink>
<MenuItemLink to="/5">Subtitle 3</MenuItemLink>
</Menu.Collapse>
<Menu.Collapse title="Sakbehandlingstider">
<Menu.Collapse title="Subtitle 4 Lang tittel på andre nivå lorem ipsum">
<MenuItemLink to="/6">Subtitle 5</MenuItemLink>
</Menu.Collapse>
</Menu.Collapse>
<MenuItemLink to="/7">Internasjonalt</MenuItemLink>
<Menu.Collapse title="Meld fra om endringer lang tittel på første nivå">
<MenuItemLink to="/8">Subtitle 6</MenuItemLink>
</Menu.Collapse>
<MenuItemLink to="/9">Nivå 1</MenuItemLink>
</Menu>
);
};
ReactRouter.decorators = [
(Story) => (
<Router>
<div
style={{
background: "white",
maxWidth: 288,
}}
>
<Story />
</div>
</Router>
),
];
+12 -1
View File
@@ -6,7 +6,7 @@ import { Close } from "@navikt/ds-icons";
import { Button } from "..";
import ModalContent, { ModalContentType } from "./ModalContent";
export interface ModalProps {
export interface ModalProps extends ReactModal {
/**
* Modal content
*/
@@ -33,6 +33,9 @@ export interface ModalProps {
* @default true
*/
closeButton?: boolean;
"aria-labelledby"?: string;
"aria-describedby"?: string;
"aria-modal"?: boolean;
}
interface ModalComponent
@@ -56,6 +59,9 @@ const Modal = forwardRef<ReactModal, ModalProps>(
className,
shouldCloseOnOverlayClick = true,
closeButton = true,
"aria-describedby": ariaDescribedBy,
"aria-labelledby": ariaLabelledBy,
"aria-modal": ariaModal,
...rest
},
ref
@@ -81,6 +87,11 @@ const Modal = forwardRef<ReactModal, ModalProps>(
overlayClassName="navds-modal__overlay"
shouldCloseOnOverlayClick={shouldCloseOnOverlayClick}
onRequestClose={(e) => onModalCloseRequest(e)}
aria={{
describedby: ariaDescribedBy,
labelledby: ariaLabelledBy,
modal: ariaModal,
}}
>
{children}
{closeButton && (
@@ -55,11 +55,7 @@ const PageHeader = forwardRef<HTMLDivElement, PageHeaderProps>(
<div className="navds-page-header__illustration">{illustration}</div>
)}
<div className="navds-page-header__wrapper">
<Heading
className="navds-page-header__title"
size="2xlarge"
level="1"
>
<Heading className="navds-page-header__title" size="xlarge" level="1">
{children}
</Heading>
{description && (
+1 -1
View File
@@ -3,7 +3,7 @@ import cl from "classnames";
import { BodyShort } from "..";
import { TableContext } from ".";
interface DataCellProps extends React.HTMLAttributes<HTMLTableCellElement> {}
interface DataCellProps extends React.TdHTMLAttributes<HTMLTableCellElement> {}
export interface DataCellType
extends React.ForwardRefExoticComponent<
+1 -1
View File
@@ -2,7 +2,7 @@ import React, { forwardRef, useContext } from "react";
import cl from "classnames";
import { Label, TableContext } from "..";
interface HeaderCellProps extends React.HTMLAttributes<HTMLTableCellElement> {
interface HeaderCellProps extends React.ThHTMLAttributes<HTMLTableCellElement> {
scope?: string;
}
+2 -1
View File
@@ -6,7 +6,8 @@ import Row, { RowType } from "./Row";
import HeaderCell, { HeaderCellType } from "./HeaderCell";
import DataCell, { DataCellType } from "./DataCell";
export interface TableProps extends React.HTMLAttributes<HTMLTableElement> {
export interface TableProps
extends React.TableHTMLAttributes<HTMLTableElement> {
/**
* Changes padding
* @default "medium"
@@ -0,0 +1,111 @@
import React, { useState } from "react";
import { Attachment, Hamburger, Star, System } from "@navikt/ds-icons";
import { ToggleGroup } from "../index";
import { Meta } from "@storybook/react/types-6-0";
export default {
title: "ds-react/toggle-group",
component: ToggleGroup,
parameters: {
chromatic: { disable: true },
},
} as Meta;
const Items = (icon?: boolean, both?: boolean) => (
<>
<ToggleGroup.Item value="first">
{both ? (
<>
<Hamburger /> First
</>
) : (
<>{icon ? <Hamburger /> : "First"}</>
)}
</ToggleGroup.Item>
<ToggleGroup.Item value="second">
{both ? (
<>
<Star /> Second more txt
</>
) : (
<>{icon ? <Star /> : "Second more txt"}</>
)}
</ToggleGroup.Item>
<ToggleGroup.Item value="third">
{both ? (
<>
<Attachment /> Thrid
</>
) : (
<>{icon ? <Attachment /> : "Third"}</>
)}
</ToggleGroup.Item>
<ToggleGroup.Item value="fourth">
{both ? (
<>
<System /> Fourth
</>
) : (
<>{icon ? <System /> : "Fourth"}</>
)}
</ToggleGroup.Item>
</>
);
export const All = () => {
const [activeValue, setActiveValue] = useState("first");
return (
<div>
<h2>ToggleGroup</h2>
<h3>{activeValue}</h3>
<div style={{ display: "flex", flexDirection: "column", gap: "0.5rem" }}>
<ToggleGroup value={activeValue} onChange={setActiveValue}>
{Items()}
</ToggleGroup>
<ToggleGroup value={activeValue} onChange={setActiveValue}>
{Items(true)}
</ToggleGroup>
<ToggleGroup value={activeValue} onChange={setActiveValue}>
{Items(true, true)}
</ToggleGroup>
</div>
<h2>ToggleGroup Small</h2>
<h3>{activeValue}</h3>
<div style={{ display: "flex", flexDirection: "column", gap: "0.5rem" }}>
<ToggleGroup size="small" value={activeValue} onChange={setActiveValue}>
{Items()}
</ToggleGroup>
<ToggleGroup size="small" value={activeValue} onChange={setActiveValue}>
{Items(true)}
</ToggleGroup>
<ToggleGroup size="small" value={activeValue} onChange={setActiveValue}>
{Items(true, true)}
</ToggleGroup>
</div>
<h2>ToggleGroup label</h2>
<div style={{ display: "flex", flexDirection: "column", gap: "0.5rem" }}>
<ToggleGroup
label="Label msg"
value={activeValue}
onChange={setActiveValue}
>
{Items()}
</ToggleGroup>
<ToggleGroup
label="Label msg"
value={activeValue}
onChange={setActiveValue}
aria-describedby="demo-id"
>
{Items()}
</ToggleGroup>
</div>
<div style={{ display: "flex", flexDirection: "column", gap: "0.5rem" }}>
<h2>Uncontrolled</h2>
<ToggleGroup onChange={setActiveValue} defaultValue="second">
{Items()}
</ToggleGroup>
</div>
</div>
);
};
@@ -0,0 +1,131 @@
import cl from "classnames";
import React, {
createContext,
forwardRef,
HTMLAttributes,
useState,
} from "react";
import ToggleItem, { ToggleItemType } from "./ToggleItem";
import * as RadixToggleGroup from "@radix-ui/react-toggle-group";
import { Label, useId } from "..";
export interface ToggleGroupProps
extends Omit<HTMLAttributes<HTMLDivElement>, "onChange" | "dir"> {
/**
* Toggles.Item elements
*/
children: React.ReactNode;
/**
* Changes padding and font-size
* @default "medium"
*/
size?: "medium" | "small";
/**
* Controlled selected value
*/
value?: string;
/**
* If not controlled, a default-value needs to be set
*/
defaultValue?: string;
/**
* Returns elements that wants to be active
*/
onChange: (value: string) => void;
/**
* Label describing ToggleGroup
*/
label?: React.ReactNode;
}
interface ToggleGroupComponent
extends React.ForwardRefExoticComponent<
ToggleGroupProps & React.RefAttributes<HTMLDivElement>
> {
Item: ToggleItemType;
}
interface ToggleContextProps {
size: "medium" | "small";
}
export const ToggleGroupContext = createContext<ToggleContextProps | null>(
null
);
const ToggleGroup = forwardRef<HTMLDivElement, ToggleGroupProps>(
(
{
className,
children,
onChange,
size = "medium",
label,
value,
defaultValue,
id,
"aria-describedby": desc,
...rest
},
ref
) => {
const [groupValue, setGroupValue] = useState(defaultValue);
const labelId = `toggle-group-label-${useId()}`;
const handleValueChange = (v: string) => {
if (v !== "") {
setGroupValue(v);
onChange?.(v);
}
};
if (!value && !defaultValue) {
console.error("ToggleGroup without value/defaultvalue is not allowed");
}
const describeBy = cl({
[desc ?? ""]: !!desc,
[labelId]: !!label,
});
return (
<ToggleGroupContext.Provider
value={{
size,
}}
>
<div>
{label && (
<Label
size={size}
className="navds-toggle-group__label"
id={labelId}
>
{label}
</Label>
)}
<RadixToggleGroup.Root
{...rest}
onValueChange={handleValueChange}
value={value ?? groupValue}
defaultValue={defaultValue}
ref={ref}
className={cl(
"navds-toggle-group",
className,
`navds-toggle-group--${size}`
)}
{...(describeBy && { "aria-describedby": describeBy })}
type="single"
>
{children}
</RadixToggleGroup.Root>
</div>
</ToggleGroupContext.Provider>
);
}
) as ToggleGroupComponent;
ToggleGroup.Item = ToggleItem;
export default ToggleGroup;
@@ -0,0 +1,45 @@
import React, { forwardRef, useContext } from "react";
import cl from "classnames";
import { Label } from "..";
import * as RadixToggleGroup from "@radix-ui/react-toggle-group";
import { ToggleGroupContext } from "./ToggleGroup";
export interface ToggleItemProps
extends React.HTMLAttributes<HTMLButtonElement> {
/**
* Content
*/
children: React.ReactNode;
/**
* Value for state-handling
*/
value: string;
}
export type ToggleItemType = React.ForwardRefExoticComponent<
ToggleItemProps & React.RefAttributes<HTMLButtonElement>
>;
const ToggleItem = forwardRef<HTMLButtonElement, ToggleItemProps>(
({ className, children, ...rest }, ref) => {
const context = useContext(ToggleGroupContext);
return (
<RadixToggleGroup.Item
{...rest}
ref={ref}
className={cl("navds-toggle-group__button", className)}
>
<Label
as="span"
className="navds-toggle-group__button-inner"
size={context?.size}
>
{children}
</Label>
</RadixToggleGroup.Item>
);
}
) as ToggleItemType;
export default ToggleItem;
@@ -0,0 +1,2 @@
export { default as ToggleGroup } from "./ToggleGroup";
export { ToggleGroupProps } from "./ToggleGroup";
@@ -11,7 +11,7 @@ export interface HeadingProps extends React.HTMLAttributes<HTMLHeadingElement> {
/**
* Sizes from largest "2xl" to smallest "s"
*/
size: "2xlarge" | "xlarge" | "large" | "medium" | "small" | "xsmall";
size: "xlarge" | "large" | "medium" | "small" | "xsmall";
/**
* Heading text
*/
@@ -1,3 +0,0 @@
.typo-story > div:nth-child(even) {
background: var(--navds-global-color-gray-200);
}
@@ -1,83 +0,0 @@
import { Meta } from "@storybook/addon-docs";
import { Alert, Heading, BodyLong } from "@navikt/ds-react";
<Meta title="ds-react/Typography/intro" />
# Hvordan ta i bruk typografien
Typografien kan tas i bruk som React komponenter eller ved å ta i bruk css-stilene.
Se eksemplene under ds-react tabben her i storybook for å se hvordan man tar i bruk både react og stilpakken for dette oppsettet.
Oppsettet er forbedret med blandt annet letter-spacing og line-height.
I tillegg kan man nå sette `spacing` proppen og man får da automatisk margin-bottom på typo-elementet.
Da kan man lett sikre riktig spacing mellom tekst i en artikkel.
Font-size er skrevet med REM, men basert på 16px root font size.
Dette vil si at de som har forstørret font-size på root vil ende opp med større font enn forventet.
For de som har satt root font size til 18px (1.125rem) kan da "fikse" dette ved å endre tilbake til 16px,
da det nye typo-oppsettet fikser større font, eller man ta i bruk css-en under.
Denne stylingen vil overskrive default variablene og tilpasse font-size.
```css
/* autogenerated fix for 18px root-font-size*/
:root {
--navds-font-size-heading-2xlarge: 2.2222222222222223rem;
--navds-font-size-heading-xlarge: 1.7777777777777777rem;
--navds-font-size-heading-large: 1.5555555555555556rem;
--navds-font-size-heading-medium: 1.3333333333333333rem;
--navds-font-size-heading-small: 1.1111111111111112rem;
--navds-font-size-xlarge: 1.1111111111111112rem;
--navds-font-size-large: 1rem;
--navds-font-size-medium: 0.8888888888888888rem;
--navds-font-size-small: 0.7777777777777778rem;
}
```
Vi anbefaler å før eller siden endre tilbake til default root font size da designsystemet sine nye
komponenter og design-tokens er basert på dette. Endringen til 18px root font size var i grunn for å teste en løsning for å
forstørre font, noe som er fikset ved nye typo-løsningen. Vi vil derfor unngå å måtte ha midlertidge patcher/fikser
for å tilpasse systemet for alle de forskjellige variantene av font size på root.
## Migrasjonsguide fra `nav-frontend-typografi` til `@navikt/ds-react`
De nye typografi-komponentene er ikke helt en-til-en med de gamle, så det kan hende du må trekke på en designer om du er usikker på hvilken komponent du skal velge. Eller du kan spørre en av oss i designsystemet.
### Overskrifter
Overskrifters tekststørrelse er nå uavhengig heading-nivå. Det betyr at du står fritt til å sørge for at overskrift-hierarkiet stemmer for din side, uavhengig av visuelt hierarki. Før kunne det være trøblete om men f.eks. ønsket seg en h1, men `<Sidetittel>` opplevdes som for stor.
En direkte en-til-en oversettelse av gamle komponenter til nye, hvor man bevarer størrelsene, ser sånn ut:
`<Sidetittel> -> <Heading size="2xlarge">`
`<Innholdstittel> -> <Heading size="xlarge">`
`<Systemtittel> -> <Heading size="medium">`
`<Undertittel> -> <Heading size="small">`
<Alert variant="warning">
Pass på å sette riktig `level` i hver Heading-komponent for å ivareta
hierarkiet (h1-h6).
</Alert>
### Brødtekst
De nye komponentene for brødtekst heter `<BodyLong>` og `<BodyShort>`. `<BodyLong>` er ment å brukes der det er snakk om løpende tekst, f.eks. i en artikkel. I komponent-tekst som med fordel kan være mer kompakt skal `<BodyShort>` brukes, for den har en lavere linjehøyde.
Ny brødtekst-størrelse er 18px. Om du bygger grensesnitt med kompakt design (les; interne flater) der du ønsker å fortsette å bruke 16px brødtekst så finnes det en `<BodyLong size="small">` og `<BodyShort size="small">` som er til for deg.
`<Normaltekst> ->` `<BodyLong>`/`<BodyShort>` (muligens med `size=small`)
### Andre komponenter
`<Ingress> -> <Ingress>`
`<Element> -> <Label>`
`<UndertekstBold> -> <Detail>`
`<Undertekst> -> <Detail size="small">`
`<Feilmelding>` Denne har vi valgt å ikke videreføre, for vi er usikre på om det er behov for en egen komponent. Skriv gjerne en melding på #designsystem eller send en PM til @andreas.nordahl eller @ken.aleksander.johansen om du savner den.
@@ -1,6 +1,5 @@
import React from "react";
import { Heading, BodyShort, BodyLong, Detail, Ingress, Label } from "../index";
import "./index.css";
export default {
title: "ds-react/typography",
@@ -16,7 +15,7 @@ const TitleTemplate = ({ level, size, spacing }) => (
);
export const HeadingStory = TitleTemplate.bind({});
HeadingStory.args = { level: 1, size: "2xlarge", spacing: false };
HeadingStory.args = { level: 1, size: "xlarge", spacing: false };
const IngressTemplate = ({ spacing }) => (
<Ingress spacing={spacing}>{lorem()}</Ingress>
@@ -64,8 +63,8 @@ DetailStory.args = { spacing: false, size: "medium" };
export const SideInnholdEksempel = () => {
return (
<div style={{ maxWidth: 600 }}>
<Heading level={"1"} size="2xlarge" spacing>
Title lvl 1 2xlarge
<Heading level={"1"} size="xlarge" spacing>
Title lvl 1 xlarge
</Heading>
<BodyLong spacing>
BodyLong: Aliqua ad et nisi commodo sit excepteur in commodo proident
@@ -87,7 +86,7 @@ export const SideInnholdEksempel = () => {
sunt proident irure consectetur excepteur.
</BodyLong>
<Heading level={"2"} size="xlarge" spacing>
Title lvl 2 xlarge
Title lvl 2 large
</Heading>
<Ingress spacing>
Ingress: Mollit incididunt incididunt officia amet est et non aliqua
+2
View File
@@ -0,0 +1,2 @@
src/tokens.ts
tailwind.config.js
+5
View File
@@ -0,0 +1,5 @@
module.exports = {
transform: {
"^.+\\.ts?$": "ts-jest",
},
};
+33
View File
@@ -0,0 +1,33 @@
{
"name": "@navikt/ds-tailwind",
"version": "0.1.2",
"private": false,
"description": "Auto-generated tailwind config based on @navikt/ds-tokens",
"author": "NAV Designsystem team",
"keywords": [
"tailwind",
"design-tokens"
],
"main": "tailwind.config.js",
"license": "MIT",
"files": [
"tailwind.config.js"
],
"scripts": {
"build": "ts-node ./src",
"test": "jest"
},
"repository": {
"type": "git",
"url": "git+https://github.com/navikt/nav-frontend-moduler.git",
"directory": "@navikt/core/tailwind"
},
"devDependencies": {
"@navikt/ds-tokens": "^0.8.1",
"@types/jest": "^27.0.1",
"jest": "^27.2.0",
"lodash": "^4.17.21",
"ts-jest": "^27.0.5",
"ts-node": "^10.3.0"
}
}
+34
View File
@@ -0,0 +1,34 @@
// @ts-ignore
import * as TokensBuild from "@navikt/ds-tokens/dist/tokens";
import { writeFileSync } from "fs";
import { kebabCase } from "lodash";
import Reducer from "./reducer";
const tokens = Object.entries(TokensBuild).reduce(
(old, [key, val]) => ({
...old,
[kebabCase(key).replace("navds-", "")]: val,
}),
{}
);
const config = {
theme: {
colors: Reducer(tokens, ["semantic-color", "global-color"]),
extend: {
spacing: Reducer(tokens, ["spacing"]),
zIndex: Reducer(tokens, ["z-index"]),
boxShadow: Reducer(tokens, ["shadow"]),
fontWeight: Reducer(tokens, ["font-weight"]),
fontSize: Reducer(tokens, ["font-size"]),
lineHeight: Reducer(tokens, ["font-line-height"]),
fontFamily: Reducer(tokens, ["font-family"]),
},
},
};
const outputString = `module.exports = ${JSON.stringify(config, null, 2)};`;
writeFileSync("tailwind.config.js", outputString);
console.log("Success: Tailwind config ");
+20
View File
@@ -0,0 +1,20 @@
const replaceKey = (s: string, keys: string[]) => {
let key = s;
keys.forEach((k) => {
key = key.replace(`${k}-`, "");
});
return key;
};
/* Cherry-picks object keys we want */
const Reducer = (
tokens: { [key: string]: string | number },
replace: string[]
) =>
Object.entries(tokens).reduce((old, [key, value]) => {
return replace.find((v) => key.startsWith(v))
? { ...old, [replaceKey(key, replace)]: value }
: { ...old };
}, {});
export default Reducer;
@@ -0,0 +1,42 @@
import Reducer from "../reducer";
describe("Check correct parsing of tailind tokens", () => {
test("Check reducer function", () => {
expect(
Reducer(
{
"shadow-focus-inverted":
"0 0 0 3px var(navds-semantic-color-focus-inverted)",
"z-index-focus": 10,
"global-color-blue-300": "rgba(102, 165, 244, 1)",
"semantic-color-interaction-primary":
"var(--navds-gloab-color-blue-300)",
},
["shadow"]
)
).toEqual({
"focus-inverted": "0 0 0 3px var(navds-semantic-color-focus-inverted)",
});
});
test("Check reducer function with multiple keys", () => {
expect(
Reducer(
{
"shadow-focus-inverted":
"0 0 0 3px var(navds-semantic-color-focus-inverted)",
"z-index-focus": 10,
"global-color-transparent": "rgba(255, 255, 255, 0)",
"global-color-white": "rgba(255, 255, 255, 1)",
"semantic-color-border-inverted": "var(navds-global-color-gray-200)",
"semantic-color-border-muted": "var(navds-global-color-gray-400)",
},
["global-color", "semantic-color"]
)
).toEqual({
transparent: "rgba(255, 255, 255, 0)",
white: "rgba(255, 255, 255, 1)",
"border-inverted": "var(navds-global-color-gray-200)",
"border-muted": "var(navds-global-color-gray-400)",
});
});
});
+8
View File
@@ -0,0 +1,8 @@
{
"compilerOptions": {
"esModuleInterop": true,
"allowJs": true
},
"include": ["src/**/*"],
"exclude": ["node_modules"]
}
+2 -1
View File
@@ -9,6 +9,7 @@ StyleDictionary.registerTransform({
});
const StyleDictionaryExtended = StyleDictionary.extend(
__dirname + "/config.json"
__dirname + "/config.js"
);
StyleDictionaryExtended.buildAllPlatforms();
+52
View File
@@ -0,0 +1,52 @@
module.exports = {
source: ["src/index.js", "src/**/*.json"],
platforms: {
scss: {
transformGroup: "scss",
buildPath: "dist/",
files: [
{
destination: "tokens.scss",
format: "scss/variables",
},
],
},
less: {
transformGroup: "less",
buildPath: "dist/",
files: [
{
destination: "tokens.less",
format: "less/variables",
},
],
},
css: {
transformGroup: "css",
buildPath: "dist/",
files: [
{
destination: "tokens.css",
format: "css/variables",
options: {
outputReferences: true,
},
},
],
},
js: {
transformGroup: "js",
buildPath: "dist/",
files: [
{
destination: "tokens.js",
format: "javascript/es6",
},
{
destination: "tokens-cjs.js",
format: "javascript/module-flat",
},
],
},
},
};
-52
View File
@@ -1,52 +0,0 @@
{
"source": ["src/index.js", "src/**/*.json"],
"platforms": {
"scss": {
"transformGroup": "scss",
"buildPath": "dist/",
"files": [
{
"destination": "tokens.scss",
"format": "scss/variables"
}
]
},
"less": {
"transformGroup": "less",
"buildPath": "dist/",
"files": [
{
"destination": "tokens.less",
"format": "less/variables"
}
]
},
"css": {
"transformGroup": "css",
"buildPath": "dist/",
"files": [
{
"destination": "tokens.css",
"format": "css/variables",
"options": {
"outputReferences": true
}
}
]
},
"js": {
"transformGroup": "js",
"buildPath": "dist/",
"files": [
{
"destination": "tokens.js",
"format": "javascript/es6"
},
{
"destination": "tokens-cjs.js",
"format": "javascript/module-flat"
}
]
}
}
}
+3 -2
View File
@@ -1,6 +1,6 @@
{
"name": "@navikt/ds-tokens",
"version": "0.7.1",
"version": "0.8.1",
"private": false,
"description": "Auto-generated design-tokens for NAV design-systems framework",
"author": "NAV Designsystem team",
@@ -14,7 +14,8 @@
"license": "MIT",
"files": [
"/dist",
"/src"
"/src",
"/tailwind"
],
"scripts": {
"build": "node ./build.js",
+13 -4
View File
@@ -74,16 +74,25 @@
"value": "rgba(241, 241, 241, 1)"
},
"200": {
"value": "rgba(201, 201, 201, 1)"
"value": "rgba(229, 229, 229, 1)"
},
"300": {
"value": "rgba(207, 207, 207, 1)"
},
"400": {
"value": "rgba(160, 160, 160, 1)"
"value": "rgba(176, 176, 176, 1)"
},
"500": {
"value": "rgba(143, 143, 143, 1)"
},
"600": {
"value": "rgba(106, 106, 106, 1)"
"value": "rgba(112, 112, 112, 1)"
},
"700": {
"value": "rgba(89, 89, 89, 1)"
},
"800": {
"value": "rgba(79, 79, 79, 1)"
"value": "rgba(64, 64, 64, 1)"
},
"900": {
"value": "rgba(38, 38, 38, 1)"
+3 -3
View File
@@ -1,6 +1,6 @@
{
"name": "@navikt/ds-react-internal",
"version": "0.9.13",
"version": "0.11.9",
"private": false,
"description": "NAV internal designsystem react components",
"author": "NAV Designsystem team",
@@ -33,8 +33,8 @@
"watch": "tsc --watch -p tsconfig.esm.json"
},
"dependencies": {
"@navikt/ds-icons": "^0.7.3",
"@navikt/ds-react": "^0.14.13",
"@navikt/ds-icons": "^0.8.4",
"@navikt/ds-react": "^0.16.9",
"@popperjs/core": "^2.10.1",
"classnames": "^2.3.1",
"copy-to-clipboard": "^3.3.1",
+1 -1
View File
@@ -40,7 +40,7 @@ Gå til [CONTRIBUTING.md](https://github.com/navikt/nav-frontend-moduler/blob/ma
## Lisenser
Gå til [LICENSE](https://github.com/navikt/nav-frontend-moduler/blob/master/LICENSE)
Gå til [LICENSE](https://github.com/navikt/nav-frontend-moduler/blob/master/LICENCE)
## Contributors
+1
View File
@@ -17,6 +17,7 @@
"@navikt/core/react",
"@navikt/core/icons",
"@navikt/core/tokens",
"@navikt/core/tailwind",
"@navikt/internal/css",
"@navikt/internal/react"
]
+2 -1
View File
@@ -8,8 +8,9 @@
"postinstall": "husky install",
"boot": "yarn clean:lib && yarn build:packages --stream",
"storybook": "start-storybook -p 6006",
"build:packages": "yarn run --silent lerna run build",
"build:packages": "yarn build:tokens && yarn run --silent lerna run build",
"build:storybook": "build-storybook",
"build:tokens": "yarn workspace @navikt/ds-tokens build",
"chromatic": "npx chromatic --project-token x3xqdfgkujg",
"lerna:watch": "yarn run lerna run watch --stream",
"update:icons": "yarn workspace @navikt/ds-icons update",
+1 -1
View File
@@ -6,5 +6,5 @@
"target": "es6",
"moduleResolution": "node"
},
"exclude": ["**/stories", "**/*.test.ts", "**/*.test.tsx"]
"exclude": ["**/stories", "**/*.stories.*", "**/*.test.ts", "**/*.test.tsx"]
}
+123
View File
@@ -1107,6 +1107,13 @@
dependencies:
regenerator-runtime "^0.13.4"
"@babel/runtime@^7.13.10":
version "7.17.0"
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.17.0.tgz#b8d142fc0f7664fb3d9b5833fd40dcbab89276c0"
integrity sha512-etcO/ohMNaNA2UBdaXBBSX/3aEzFMRrVfaPv8Ptc0k+cWpWW0QFiGZ2XnVqQZI1Cf734LbPGmqBKWESfW4x/dQ==
dependencies:
regenerator-runtime "^0.13.4"
"@babel/template@^7.12.7", "@babel/template@^7.16.0", "@babel/template@^7.3.3":
version "7.16.0"
resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.16.0.tgz#d16a35ebf4cd74e202083356fab21dd89363ddd6"
@@ -2547,6 +2554,122 @@
resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.0.tgz#6734f8ebc106a0860dff7f92bf90df193f0935d7"
integrity sha512-zrsUxjLOKAzdewIDRWy9nsV1GQsKBCWaGwsZQlCgr6/q+vjyZhFgqedLfFBuI9anTPEUT4APq9Mu0SZBTzIcGQ==
"@radix-ui/primitive@0.1.0":
version "0.1.0"
resolved "https://registry.yarnpkg.com/@radix-ui/primitive/-/primitive-0.1.0.tgz#6206b97d379994f0d1929809db035733b337e543"
integrity sha512-tqxZKybwN5Fa3VzZry4G6mXAAb9aAqKmPtnVbZpL0vsBwvOHTBwsjHVPXylocYLwEtBY9SCe665bYnNB515uoA==
dependencies:
"@babel/runtime" "^7.13.10"
"@radix-ui/react-collection@0.1.3":
version "0.1.3"
resolved "https://registry.yarnpkg.com/@radix-ui/react-collection/-/react-collection-0.1.3.tgz#7b584f5db40ce165883b87c383d3bd16c0000d69"
integrity sha512-tMBY65l87tj77fMX44EBjm5p8clR6swkcNFr0/dDVdEPC0Vf3fwkv62dezCnZyrRBpkOgZPDOp2kO73hYlCfXw==
dependencies:
"@babel/runtime" "^7.13.10"
"@radix-ui/react-compose-refs" "0.1.0"
"@radix-ui/react-context" "0.1.1"
"@radix-ui/react-primitive" "0.1.3"
"@radix-ui/react-slot" "0.1.2"
"@radix-ui/react-compose-refs@0.1.0":
version "0.1.0"
resolved "https://registry.yarnpkg.com/@radix-ui/react-compose-refs/-/react-compose-refs-0.1.0.tgz#cff6e780a0f73778b976acff2c2a5b6551caab95"
integrity sha512-eyclbh+b77k+69Dk72q3694OHrn9B3QsoIRx7ywX341U9RK1ThgQjMFZoPtmZNQTksXHLNEiefR8hGVeFyInGg==
dependencies:
"@babel/runtime" "^7.13.10"
"@radix-ui/react-context@0.1.1":
version "0.1.1"
resolved "https://registry.yarnpkg.com/@radix-ui/react-context/-/react-context-0.1.1.tgz#06996829ea124d9a1bc1dbe3e51f33588fab0875"
integrity sha512-PkyVX1JsLBioeu0jB9WvRpDBBLtLZohVDT3BB5CTSJqActma8S8030P57mWZb4baZifMvN7KKWPAA40UmWKkQg==
dependencies:
"@babel/runtime" "^7.13.10"
"@radix-ui/react-id@0.1.4":
version "0.1.4"
resolved "https://registry.yarnpkg.com/@radix-ui/react-id/-/react-id-0.1.4.tgz#4cd6126e6ac8a43ebe6d52948a068b797cc9ad71"
integrity sha512-/hq5m/D0ZfJWOS7TLF+G0l08KDRs87LBE46JkAvgKkg1fW4jkucx9At9D9vauIPSbdNmww5kXEp566hMlA8eXA==
dependencies:
"@babel/runtime" "^7.13.10"
"@radix-ui/react-use-layout-effect" "0.1.0"
"@radix-ui/react-primitive@0.1.3":
version "0.1.3"
resolved "https://registry.yarnpkg.com/@radix-ui/react-primitive/-/react-primitive-0.1.3.tgz#585c35ef2ec06bab0ea9e0fc5c916e556661b881"
integrity sha512-fcyADaaAx2jdqEDLsTs6aX50S3L1c9K9CC6XMpJpuXFJCU4n9PGTFDZRtY2gAoXXoRCPIBsklCopSmGb6SsDjQ==
dependencies:
"@babel/runtime" "^7.13.10"
"@radix-ui/react-slot" "0.1.2"
"@radix-ui/react-roving-focus@0.1.4":
version "0.1.4"
resolved "https://registry.yarnpkg.com/@radix-ui/react-roving-focus/-/react-roving-focus-0.1.4.tgz#693ca3eaab153feabe37f9d50987d6d2911cf819"
integrity sha512-zaixcAxRcWQliUSx6l9rdfJhvcbuY7Tb4Emb7H4DWCTx1kenXH8+n9mwa8gaSIJLLSSSMzBpQATlpFw9xv/bJQ==
dependencies:
"@babel/runtime" "^7.13.10"
"@radix-ui/primitive" "0.1.0"
"@radix-ui/react-collection" "0.1.3"
"@radix-ui/react-compose-refs" "0.1.0"
"@radix-ui/react-context" "0.1.1"
"@radix-ui/react-id" "0.1.4"
"@radix-ui/react-primitive" "0.1.3"
"@radix-ui/react-use-callback-ref" "0.1.0"
"@radix-ui/react-use-controllable-state" "0.1.0"
"@radix-ui/react-slot@0.1.2":
version "0.1.2"
resolved "https://registry.yarnpkg.com/@radix-ui/react-slot/-/react-slot-0.1.2.tgz#e6f7ad9caa8ce81cc8d532c854c56f9b8b6307c8"
integrity sha512-ADkqfL+agEzEguU3yS26jfB50hRrwf7U4VTwAOZEmi/g+ITcBWe12yM46ueS/UCIMI9Py+gFUaAdxgxafFvY2Q==
dependencies:
"@babel/runtime" "^7.13.10"
"@radix-ui/react-compose-refs" "0.1.0"
"@radix-ui/react-toggle-group@^0.1.4":
version "0.1.4"
resolved "https://registry.yarnpkg.com/@radix-ui/react-toggle-group/-/react-toggle-group-0.1.4.tgz#e8204e1c458f0673acb58eb82677c35b867c04f8"
integrity sha512-pzs3Cc5I9JKnBdCBCB4xfhbQpWNKY9dYwKVxcYLzGmaUsVPUiAq2AYr/Ht3LebhIxWYHkggjX8EOTeO6ExMr8Q==
dependencies:
"@babel/runtime" "^7.13.10"
"@radix-ui/primitive" "0.1.0"
"@radix-ui/react-context" "0.1.1"
"@radix-ui/react-primitive" "0.1.3"
"@radix-ui/react-roving-focus" "0.1.4"
"@radix-ui/react-toggle" "0.1.3"
"@radix-ui/react-use-controllable-state" "0.1.0"
"@radix-ui/react-toggle@0.1.3":
version "0.1.3"
resolved "https://registry.yarnpkg.com/@radix-ui/react-toggle/-/react-toggle-0.1.3.tgz#ca471d1b49bdf0c9b821f4c4e39feca70b7cde6a"
integrity sha512-ig2LsivpVOxbPoBpNy/6dgB5WNm0mkPMaBBgwo7yufDhlUExdp+bRCqkcWkN9EV42SEbd4etNEIrLAqppfgq3g==
dependencies:
"@babel/runtime" "^7.13.10"
"@radix-ui/primitive" "0.1.0"
"@radix-ui/react-primitive" "0.1.3"
"@radix-ui/react-use-controllable-state" "0.1.0"
"@radix-ui/react-use-callback-ref@0.1.0":
version "0.1.0"
resolved "https://registry.yarnpkg.com/@radix-ui/react-use-callback-ref/-/react-use-callback-ref-0.1.0.tgz#934b6e123330f5b3a6b116460e6662cbc663493f"
integrity sha512-Va041McOFFl+aV+sejvl0BS2aeHx86ND9X/rVFmEFQKTXCp6xgUK0NGUAGcgBlIjnJSbMYPGEk1xKSSlVcN2Aw==
dependencies:
"@babel/runtime" "^7.13.10"
"@radix-ui/react-use-controllable-state@0.1.0":
version "0.1.0"
resolved "https://registry.yarnpkg.com/@radix-ui/react-use-controllable-state/-/react-use-controllable-state-0.1.0.tgz#4fced164acfc69a4e34fb9d193afdab973a55de1"
integrity sha512-zv7CX/PgsRl46a52Tl45TwqwVJdmqnlQEQhaYMz/yBOD2sx2gCkCFSoF/z9mpnYWmS6DTLNTg5lIps3fV6EnXg==
dependencies:
"@babel/runtime" "^7.13.10"
"@radix-ui/react-use-callback-ref" "0.1.0"
"@radix-ui/react-use-layout-effect@0.1.0":
version "0.1.0"
resolved "https://registry.yarnpkg.com/@radix-ui/react-use-layout-effect/-/react-use-layout-effect-0.1.0.tgz#ebf71bd6d2825de8f1fbb984abf2293823f0f223"
integrity sha512-+wdeS51Y+E1q1Wmd+1xSSbesZkpVj4jsg0BojCbopWvgq5iBvixw5vgemscdh58ep98BwUbsFYnrywFhV9yrVg==
dependencies:
"@babel/runtime" "^7.13.10"
"@samverschueren/stream-to-observable@^0.3.0":
version "0.3.1"
resolved "https://registry.yarnpkg.com/@samverschueren/stream-to-observable/-/stream-to-observable-0.3.1.tgz#a21117b19ee9be70c379ec1877537ef2e1c63301"