change open popup logic

3 years ago · 9001bdea2c
parent daa4878912
commit 9001bdea2c
3 changed files with 3 additions and 6 deletions
--- a/src/Countries.jsx
+++ b/src/Countries.jsx
@ -627,11 +627,10 @@ export default function Countries({ mapOptions, onMapOptionClick }) {
                    onMouseLeave={handleMouseLeave}
                  >
-                    {popupInfo && <Popup
+                    {open && <Popup
                      longitude={popupInfo.lon}
                      latitude={popupInfo.lat}
                      closeButton={false}
                      onClose={() => setPopupInfo(null)}
                    >
                      {popupInfo.country_russian_name}
                    </Popup>}
--- a/src/Points.jsx
+++ b/src/Points.jsx
@ -1109,11 +1109,10 @@ export default function Points({ mapOptions, onMapOptionClick }) {
                    onMouseLeave={handleMouseLeave}
                  >
-                    {popupInfo && <Popup
+                    {open && <Popup
                      longitude={popupInfo.lon}
                      latitude={popupInfo.lat}
                      closeButton={false}
                      onClose={() => setPopupInfo(null)}
                    >
                      <h3>{popupInfo.res_name_parc}</h3>
                      {popupInfo.region_name}
--- a/src/Regions.jsx
+++ b/src/Regions.jsx
@ -684,11 +684,10 @@ export default function Regions({ mapOptions, onMapOptionClick }) {
                    onMouseLeave={handleMouseLeave}
                  >
-                    {popupInfo && <Popup
+                    {open && <Popup
                      longitude={popupInfo.lon}
                      latitude={popupInfo.lat}
                      closeButton={false}
                      onClose={() => setPopupInfo(null)}
                    >
                      {popupInfo.region_name}
                    </Popup>}