Skip to content

Commit

Permalink
upgrading designsystem react from v37 to v38 (#11766)
Browse files Browse the repository at this point in the history
* upgrading designsystem react from v37 to v38

* fixing snapshot

* fixing xsmall to small on tag
  • Loading branch information
WilliamThorenfeldt authored Dec 4, 2023
1 parent 9abb745 commit 8eaad78
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 36 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export const Navigation = () => {
<menuItem.icon className={classes.icon} />
<span>{t(menuItem.key)}</span>
{menuItem.isBeta && (
<Tag color='info' size='xsmall' variant='primary'>
<Tag color='info' size='small' variant='primary'>
{t('general.beta')}
</Tag>
)}
Expand Down
2 changes: 1 addition & 1 deletion frontend/libs/studio-components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
},
"dependencies": {
"@altinn/icons": "^0.1.0",
"@digdir/design-system-react": "0.35.0",
"@digdir/design-system-react": "0.38.0",
"@digdir/design-system-tokens": "0.10.0",
"react": "^18.2.0",
"react-dom": "^18.2.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export const AltinnHeaderMenu = ({ menuItems }: IAltinnHeaderMenuProps) => {
{t(item.key)}
</NavLink>
{item.isBeta && (
<Tag color='info' size='xsmall' variant='primary'>
<Tag color='info' size='small' variant='primary'>
{t('general.beta')}
</Tag>
)}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
exports[`ProfileMenu should match snapshot 1`] = `
<button
aria-haspopup="true"
class="fds-button-button fds-utility-focusable fds-button-medium fds-button-tertiary fds-button-inverted"
class="fds-button-button-b39e9b36 fds-utility-focusable-dc80d2cb fds-button-medium-b39e9b36 fds-button-tertiary-b39e9b36 fds-button-inverted-b39e9b36"
data-testid="profileButton"
type="button"
>
Expand All @@ -18,7 +18,7 @@ exports[`ProfileMenu should match snapshot 1`] = `
exports[`ProfileMenu should match snapshot with logout text 1`] = `
<button
aria-haspopup="true"
class="fds-button-button fds-utility-focusable fds-button-medium fds-button-tertiary fds-button-inverted"
class="fds-button-button-b39e9b36 fds-utility-focusable-dc80d2cb fds-button-medium-b39e9b36 fds-button-tertiary-b39e9b36 fds-button-inverted-b39e9b36"
data-testid="profileButton"
type="button"
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ export const ResourceTable = ({
flex: 1,
renderCell: (params: GridRenderCellParams) => {
return (
<Tag color={params.row.hasPolicy ? 'info' : 'danger'} variant='secondary' size='xsmall'>
<Tag color={params.row.hasPolicy ? 'info' : 'danger'} variant='secondary' size='small'>
{params.row.hasPolicy
? t('resourceadm.dashboard_table_row_has_policy')
: t('resourceadm.dashboard_table_row_missing_policy')}
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"dependencies": {
"@altinn/altinn-design-system": "0.29.1",
"@altinn/figma-design-tokens": "6.0.1",
"@digdir/design-system-react": "0.37.0",
"@digdir/design-system-react": "0.38.0",
"@digdir/design-system-tokens": "0.10.0",
"@microsoft/applicationinsights-react-js": "17.0.1",
"@microsoft/applicationinsights-web": "3.0.3",
Expand Down
35 changes: 6 additions & 29 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ __metadata:
resolution: "@altinn/studio-components@workspace:frontend/libs/studio-components"
dependencies:
"@altinn/icons": "npm:^0.1.0"
"@digdir/design-system-react": "npm:0.35.0"
"@digdir/design-system-react": "npm:0.38.0"
"@digdir/design-system-tokens": "npm:0.10.0"
"@testing-library/jest-dom": "npm:^6.1.3"
"@testing-library/react": "npm:^14.0.0"
Expand Down Expand Up @@ -1760,25 +1760,9 @@ __metadata:
languageName: node
linkType: hard

"@digdir/design-system-react@npm:0.35.0":
version: 0.35.0
resolution: "@digdir/design-system-react@npm:0.35.0"
dependencies:
"@altinn/figma-design-tokens": "npm:^6.0.1"
"@digdir/design-system-tokens": "npm:^0.8.1"
"@floating-ui/react": "npm:0.25.2"
"@navikt/aksel-icons": "npm:^3.2.4"
react-number-format: "npm:5.2.2"
peerDependencies:
react: ">=18.2.0"
react-dom: ">=18.2.0"
checksum: ee362b031b43a2608cc540bfb963a4a06ee74973723b7f339a36b4e00de847ddb180ffa436e3181b8ee305e46d5104e3921dfff8d33d10cb17bd57ceb59949a2
languageName: node
linkType: hard

"@digdir/design-system-react@npm:0.37.0":
version: 0.37.0
resolution: "@digdir/design-system-react@npm:0.37.0"
"@digdir/design-system-react@npm:0.38.0":
version: 0.38.0
resolution: "@digdir/design-system-react@npm:0.38.0"
dependencies:
"@altinn/figma-design-tokens": "npm:^6.0.1"
"@digdir/design-system-tokens": "npm:^0.10.0"
Expand All @@ -1789,7 +1773,7 @@ __metadata:
peerDependencies:
react: ">=18.2.0"
react-dom: ">=18.2.0"
checksum: 3eda1bb6006cfd692b2299f5f0a13d0be45280d7e643012e657981e88fd7a229f26db9c915721377238cdd6cb8e0ffec9d1108ed42146c1fbb92c9d2297a8bd0
checksum: ccbe4b9ae7e39584167d117b116f7bc1ec6cef5839df58c6a3b79a559b511d9ce3603563bfee64a7279ab7acf34c32371fb963dd559d53334f88b33407df89e7
languageName: node
linkType: hard

Expand All @@ -1807,13 +1791,6 @@ __metadata:
languageName: node
linkType: hard

"@digdir/design-system-tokens@npm:^0.8.1":
version: 0.8.1
resolution: "@digdir/design-system-tokens@npm:0.8.1"
checksum: d2c491e50d7dd6793099672edbf5019dd5667d3b05d8ca937f98405dd8c55f664bbd8b67d1ddff47dd8f1b245dba820758af4859ba02efe0ca043d46678a8633
languageName: node
linkType: hard

"@discoveryjs/json-ext@npm:^0.5.0":
version: 0.5.7
resolution: "@discoveryjs/json-ext@npm:0.5.7"
Expand Down Expand Up @@ -5565,7 +5542,7 @@ __metadata:
dependencies:
"@altinn/altinn-design-system": "npm:0.29.1"
"@altinn/figma-design-tokens": "npm:6.0.1"
"@digdir/design-system-react": "npm:0.37.0"
"@digdir/design-system-react": "npm:0.38.0"
"@digdir/design-system-tokens": "npm:0.10.0"
"@emotion/react": "npm:11.11.1"
"@emotion/styled": "npm:11.11.0"
Expand Down

0 comments on commit 8eaad78

Please sign in to comment.