Skip to content

Commit 584d82b

Browse files
committed
NPM updates and some changes to component props
1 parent 4b7d600 commit 584d82b

File tree

7 files changed

+4775
-8191
lines changed

7 files changed

+4775
-8191
lines changed

package-lock.json

Lines changed: 4697 additions & 8127 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -18,68 +18,68 @@
1818
"build-storybook": "storybook build"
1919
},
2020
"devDependencies": {
21-
"@storybook/addon-a11y": "^8.2.1",
21+
"@storybook/addon-a11y": "^8.5.1",
2222
"@storybook/addon-actions": "^8.2.1",
23-
"@storybook/addon-essentials": "^8.2.1",
24-
"@storybook/addon-interactions": "^8.2.1",
25-
"@storybook/addon-links": "^8.2.1",
26-
"@storybook/addon-themes": "^8.2.1",
23+
"@storybook/addon-essentials": "^8.5.1",
24+
"@storybook/addon-interactions": "^8.5.1",
25+
"@storybook/addon-links": "^8.5.1",
26+
"@storybook/addon-themes": "^8.5.1",
2727
"@storybook/blocks": "^8.2.1",
2828
"@storybook/react": "^8.2.1",
29-
"@storybook/react-vite": "^8.2.1",
29+
"@storybook/react-vite": "^8.5.1",
3030
"@storybook/test": "^8.2.1",
3131
"@storybook/theming": "^8.2.1",
32-
"@testing-library/jest-dom": "^6.4.2",
33-
"@testing-library/react": "^15.0.5",
34-
"@testing-library/user-event": "^14.5.2",
35-
"@types/geojson": "^7946.0.14",
36-
"@types/jsdom": "^21.1.6",
37-
"@types/leaflet": "^1.9.12",
38-
"@types/node": "^20.12.7",
39-
"@types/proj4": "^2.5.5",
40-
"@types/react": "^18.3.1",
41-
"@types/react-dom": "^18.3.0",
32+
"@testing-library/jest-dom": "^6.6.3",
33+
"@testing-library/react": "^15.0.7",
34+
"@testing-library/user-event": "^14.6.1",
35+
"@types/geojson": "^7946.0.16",
36+
"@types/jsdom": "^21.1.7",
37+
"@types/leaflet": "^1.9.16",
38+
"@types/node": "^20.17.16",
39+
"@types/proj4": "^2.5.6",
40+
"@types/react": "^18.3.18",
41+
"@types/react-dom": "^18.3.5",
4242
"@types/sinon": "^17.0.3",
4343
"@types/supercluster": "^7.1.3",
44-
"@typescript-eslint/eslint-plugin": "^7.8.0",
45-
"@typescript-eslint/parser": "^7.8.0",
46-
"@vitejs/plugin-react-swc": "^3.6.0",
44+
"@typescript-eslint/eslint-plugin": "^7.18.0",
45+
"@typescript-eslint/parser": "^7.18.0",
46+
"@vitejs/plugin-react-swc": "^3.7.2",
4747
"@vitest/coverage-v8": "^1.6.0",
4848
"copyfiles": "^2.4.1",
49-
"eslint": "^8.56.0",
49+
"eslint": "^8.57.1",
5050
"eslint-config-prettier": "^9.1.0",
51-
"eslint-plugin-prettier": "^5.1.3",
52-
"eslint-plugin-react": "^7.34.1",
51+
"eslint-plugin-prettier": "^5.2.3",
52+
"eslint-plugin-react": "^7.37.4",
5353
"eslint-plugin-storybook": "^0.8.0",
54-
"happy-dom": "^14.11.0",
55-
"husky": "^9.0.11",
56-
"lint-staged": "^15.2.7",
57-
"postcss": "^8.4.38",
54+
"happy-dom": "^14.12.3",
55+
"husky": "^9.1.7",
56+
"lint-staged": "^15.4.3",
57+
"postcss": "^8.5.1",
5858
"postcss-scss": "^4.0.9",
59-
"prettier": "^3.2.5",
60-
"rimraf": "^5.0.5",
61-
"sinon": "^18.0.0",
62-
"storybook": "^8.2.1",
63-
"stylelint": "^16.4.0",
64-
"stylelint-config-recommended": "^14.0.0",
59+
"prettier": "^3.4.2",
60+
"rimraf": "^5.0.10",
61+
"sinon": "^18.0.1",
62+
"storybook": "^8.5.1",
63+
"stylelint": "^16.14.0",
64+
"stylelint-config-recommended": "^14.0.1",
6565
"stylelint-config-sass-guidelines": "^11.1.0",
6666
"stylelint-order": "^6.0.4",
67-
"stylelint-prettier": "^5.0.0",
67+
"stylelint-prettier": "^5.0.3",
6868
"ts-node": "^10.9.2",
69-
"typescript": "^5.4.5",
69+
"typescript": "^5.7.3",
7070
"vite": "^5.4.14",
71-
"vite-plugin-svgr": "^4.2.0",
71+
"vite-plugin-svgr": "^4.3.0",
7272
"vitest": "^1.6.0"
7373
},
7474
"dependencies": {
75-
"@amsterdam/design-system-assets": "^0.2.1",
76-
"@amsterdam/design-system-css": "^0.10.0",
77-
"@amsterdam/design-system-react": "^0.10.0",
78-
"@amsterdam/design-system-react-icons": "^0.1.12",
79-
"@amsterdam/design-system-tokens": "^0.10.0",
75+
"@amsterdam/design-system-assets": "^0.3.0",
76+
"@amsterdam/design-system-css": "^0.14.0",
77+
"@amsterdam/design-system-react": "^0.14.0",
78+
"@amsterdam/design-system-react-icons": "^0.1.13",
79+
"@amsterdam/design-system-tokens": "^0.14.0",
8080
"geojson": "^0.5.0",
8181
"leaflet": "^1.9.4",
82-
"proj4": "^2.11.0",
82+
"proj4": "^2.15.0",
8383
"react": "^18.3.1",
8484
"react-dom": "^18.3.1",
8585
"react-leaflet": "^4.2.1",

src/pages/ContextExamples/ZoomControls/Controls.tsx

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Button, Icon } from '@amsterdam/design-system-react';
1+
import { Button } from '@amsterdam/design-system-react';
22
import {
33
EnlargeIcon,
44
MinimiseIcon,
@@ -22,13 +22,21 @@ const Controls = () => {
2222

2323
return (
2424
<div className={styles.buttons}>
25-
<Button variant="secondary" onClick={handleZoomInClick}>
26-
<span className="ams-visually-hidden">Zoom in</span>
27-
<Icon svg={EnlargeIcon} size="level-5" />
25+
<Button
26+
variant="secondary"
27+
iconOnly
28+
icon={EnlargeIcon}
29+
onClick={handleZoomInClick}
30+
>
31+
Zoom in
2832
</Button>
29-
<Button variant="secondary" onClick={handleZoomOutClick}>
30-
<span className="ams-visually-hidden">Zoom out</span>
31-
<Icon svg={MinimiseIcon} size="level-5" />
33+
<Button
34+
variant="secondary"
35+
iconOnly
36+
icon={MinimiseIcon}
37+
onClick={handleZoomOutClick}
38+
>
39+
Zoom out
3240
</Button>
3341
</div>
3442
);
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
.buttons {
2-
bottom: var(--ams-space-inside-lg, 24px);
2+
bottom: var(--ams-space-md, 24px);
33
display: inline-flex;
44
flex-direction: column;
5-
gap: var(--ams-space-inside-xs, 8px);
5+
gap: var(--ams-space-sm, 8px);
66
position: absolute;
7-
right: var(--ams-space-inside-lg, 24px);
7+
right: var(--ams-space-md, 24px);
88
/* This z-index value should ideally come from an application constant that is greater than the Leaflet top z-index */
99
z-index: 400;
1010
}

src/pages/ContextExamples/ZoomControlsFullScreen/Header.tsx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@ const Header = () => {
44
return (
55
<Grid>
66
<Grid.Cell span="all">
7-
<AmsHeader
8-
menu={<button className="ams-header__menu-button">Menu</button>}
9-
/>
7+
<AmsHeader />
108
</Grid.Cell>
119
</Grid>
1210
);

src/pages/ContextExamples/ZoomControlsFullScreen/ZoomControls.tsx

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import type { FunctionComponent } from 'react';
2-
import { Button, Icon, VisuallyHidden } from '@amsterdam/design-system-react';
2+
import { Button } from '@amsterdam/design-system-react';
33
import {
44
EnlargeIcon,
55
MinimiseIcon,
@@ -24,13 +24,21 @@ const ZoomControls: FunctionComponent = () => {
2424

2525
return (
2626
<div className={styles.buttons}>
27-
<Button variant="secondary" onClick={handleZoomInClick}>
28-
<VisuallyHidden>Zoom in</VisuallyHidden>
29-
<Icon svg={EnlargeIcon} size="level-5" />
27+
<Button
28+
variant="secondary"
29+
iconOnly
30+
icon={EnlargeIcon}
31+
onClick={handleZoomInClick}
32+
>
33+
Zoom in
3034
</Button>
31-
<Button variant="secondary" onClick={handleZoomOutClick}>
32-
<VisuallyHidden>Zoom out</VisuallyHidden>
33-
<Icon svg={MinimiseIcon} size="level-5" />
35+
<Button
36+
variant="secondary"
37+
iconOnly
38+
icon={MinimiseIcon}
39+
onClick={handleZoomOutClick}
40+
>
41+
Zoom out
3442
</Button>
3543
</div>
3644
);

src/pages/ContextExamples/ZoomControlsFullScreen/styles.module.css

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
.buttons {
2-
bottom: var(--ams-space-inside-lg, 24px);
2+
bottom: var(--ams-space-md, 24px);
33
display: inline-flex;
44
flex-direction: column;
5-
gap: var(--ams-space-inside-xs, 8px);
5+
gap: var(--ams-space-sm, 8px);
66
position: absolute;
7-
right: var(--ams-space-inside-lg, 24px);
7+
right: var(--ams-space-md, 24px);
88
/* This z-index value should ideally come from an application constant that is greater than the Leaflet top z-index */
99
z-index: 400;
1010
}

0 commit comments

Comments
 (0)