diff options
| author | Oskar Nyberg <oskar@mullvad.net> | 2020-09-03 17:42:39 +0200 |
|---|---|---|
| committer | Oskar Nyberg <oskar@mullvad.net> | 2020-09-10 10:03:47 +0200 |
| commit | 0c1c4f978e1cd0e73ea8e61eca86f304ad141733 (patch) | |
| tree | 20c80344e32e01732105ca1aa04c0066d3333681 /gui/src | |
| parent | a0318e4f107e91bfcece741ffa77b841e1292c95 (diff) | |
| download | mullvadvpn-0c1c4f978e1cd0e73ea8e61eca86f304ad141733.tar.xz mullvadvpn-0c1c4f978e1cd0e73ea8e61eca86f304ad141733.zip | |
Change map styles to make transition seem more smooth
Diffstat (limited to 'gui/src')
| -rw-r--r-- | gui/src/renderer/components/SvgMap.tsx | 44 |
1 files changed, 18 insertions, 26 deletions
diff --git a/gui/src/renderer/components/SvgMap.tsx b/gui/src/renderer/components/SvgMap.tsx index ea5dbf4978..aa2a8d430b 100644 --- a/gui/src/renderer/components/SvgMap.tsx +++ b/gui/src/renderer/components/SvgMap.tsx @@ -33,12 +33,28 @@ const mapStyle = { }; const zoomableGroupStyle = { - transition: `transform ${MOVE_SPEED}ms ease-in-out`, + transition: `transform ${MOVE_SPEED}ms ease-out`, }; const markerStyle = mergeRsmStyle({ default: { - transition: `transform ${MOVE_SPEED}ms ease-in-out`, + transition: `transform ${MOVE_SPEED}ms ease-out`, + }, +}); + +const geographyStyle = mergeRsmStyle({ + default: { + fill: '#294d73', + stroke: '#192e45', + strokeWidth: 0.2, + }, +}); + +const stateProvinceLineStyle = mergeRsmStyle({ + default: { + fill: 'transparent', + stroke: '#192e45', + strokeWidth: 0.2, }, }); @@ -154,30 +170,6 @@ export default function SvgMap(props: IProps) { [combinedViewportBboxMatch], ); - const geographyStyle = useMemo( - () => - mergeRsmStyle({ - default: { - fill: '#294d73', - stroke: '#192e45', - strokeWidth: `${1 / zoomLevel}`, - }, - }), - [zoomLevel], - ); - - const stateProvinceLineStyle = useMemo( - () => - mergeRsmStyle({ - default: { - fill: 'transparent', - stroke: '#192e45', - strokeWidth: `${1 / zoomLevel}`, - }, - }), - [zoomLevel], - ); - const removeOldViewportBboxes = useCallback(() => { setViewportBboxes((viewportBboxes) => viewportBboxes.slice(-1)); }, []); |
