Skip to content

Commit 5697bff

Browse files
anisometropiealexandredamiron
authored andcommitted
front: fix crash (#2748)
1 parent 772b6f4 commit 5697bff

File tree

1 file changed

+13
-8
lines changed

1 file changed

+13
-8
lines changed

front/src/applications/osrd/components/OSRDConfMap/RenderPopup.js

+13-8
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
import React from 'react';
22
import { Popup } from 'react-map-gl';
33
import { useSelector } from 'react-redux';
4+
5+
import { getFeatureInfoClick } from 'reducers/osrdconf/selectors';
46
import PopupInfos from 'common/Map/Popup/PopupInfos';
57
import PopupInfosCustomContent from 'applications/osrd/components/OSRDConfMap/PopupInfosCustomContent';
68
import PopupInfosCustomTitle from 'applications/osrd/components/OSRDConfMap/PopupInfosCustomTitle';
79

810
export default function RenderPopup() {
9-
const { featureInfoClick } = useSelector((state) => state.osrdconf);
11+
const featureInfoClick = useSelector(getFeatureInfoClick);
1012
if (featureInfoClick.displayPopup) {
1113
let backgroundColor;
1214
switch (featureInfoClick.feature.properties.typeVoie) {
@@ -19,11 +21,14 @@ export default function RenderPopup() {
1921
break;
2022
}
2123

22-
featureInfoClick.feature.properties.source = featureInfoClick.feature.source;
23-
featureInfoClick.feature.properties.clickLngLat = [
24-
featureInfoClick.coordinates[0],
25-
featureInfoClick.coordinates[1],
26-
];
24+
const properties = {
25+
...featureInfoClick.feature.properties,
26+
source: featureInfoClick.feature.source,
27+
clickLngLat: [
28+
featureInfoClick.coordinates[0],
29+
featureInfoClick.coordinates[1],
30+
]
31+
}
2732

2833
return (
2934
<Popup
@@ -33,8 +38,8 @@ export default function RenderPopup() {
3338
className="mapboxgl-hover-custom-popup"
3439
>
3540
<PopupInfos
36-
title={<PopupInfosCustomTitle properties={featureInfoClick.feature.properties} />}
37-
content={<PopupInfosCustomContent data={featureInfoClick.feature.properties} />}
41+
title={<PopupInfosCustomTitle properties={properties} />}
42+
content={<PopupInfosCustomContent data={properties} />}
3843
backgroundColor={backgroundColor}
3944
/>
4045
</Popup>

0 commit comments

Comments
 (0)