Merge pull request #46 from binary-butterfly/marker-no-onclick-if-car…

…d-disabled Marker no onclick if card disabled
binary-butterfly · Dec 4, 2024 · bbcefa0 · bbcefa0
2 parents d6fc666 + e117d96
commit bbcefa0
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-butterfly-map",
-  "version": "1.0.0-rc5",
+  "version": "1.0.0-rc6",
   "license": "MIT",
   "private": false,
   "main": "dist/reactButterflyMap.umd.cjs",

diff --git a/src/js/components/ButterflyMap.tsx b/src/js/components/ButterflyMap.tsx
@@ -172,7 +172,9 @@ const ButterflyMap = (props: ButterflyMapProps) => {
                          width: 'fit',
                          height: props.height,
                      }}>
-                    <Markers handleMapMarkerClick={handleMapMarkerClick} pointsOfInterest={sortedPointsOfInterest}/>
+                    <Markers handleMapMarkerClick={handleMapMarkerClick}
+                             pointsOfInterest={sortedPointsOfInterest}
+                             disabledCards={props.disableCards}/>
                 </Map>
                 <CenterMapButton title={locationBlocked ? localStrings.location_permission_needed : ''}
                                  disabled={centerMapDisabled}

diff --git a/src/js/components/Markers.tsx b/src/js/components/Markers.tsx
@@ -6,6 +6,7 @@ import styled from 'styled-components';
 type MarkersProps = {
     pointsOfInterest: PointOfInterest[],
     handleMapMarkerClick: (position: Position) => void,
+    disabledCards?: boolean,
 }
 
 const Markers = React.memo((props: MarkersProps): React.JSX.Element => {
@@ -14,8 +15,8 @@ const Markers = React.memo((props: MarkersProps): React.JSX.Element => {
     return <>
         {pointsOfInterest.map((point) =>
             <PointerDiv id={'react-butterfly-map-pointer-' + point.uuid} key={point.uuid}>
-                <Marker onClick={() => handleMapMarkerClick(point.position)} {...point.position}>
-                        <point.MarkerComponent style={{height: '50px', width: '50px'}}/>
+                <Marker onClick={props.disabledCards ? undefined : () => handleMapMarkerClick(point.position)} {...point.position}>
+                    <point.MarkerComponent style={{height: '50px', width: '50px'}}/>
                 </Marker>
             </PointerDiv>,
         )}