Skip to content

Commit d6fc666

Browse files
Merge pull request #45 from binary-butterfly/add-disable-cards-feature
Add disable cards feature
2 parents 800c40a + cccce54 commit d6fc666

File tree

3 files changed

+21
-15
lines changed

3 files changed

+21
-15
lines changed

package-lock.json

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

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "react-butterfly-map",
3-
"version": "1.0.0-rc4",
3+
"version": "1.0.0-rc5",
44
"license": "MIT",
55
"private": false,
66
"main": "dist/reactButterflyMap.umd.cjs",

src/js/components/ButterflyMap.tsx

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,16 @@ const ButterflyMap = (props: ButterflyMapProps) => {
6565
setPaginationPage(1);
6666
}
6767

68-
setSortedPointsOfInterest(
69-
newPoints.sort((a: PointOfInterest, b: PointOfInterest): number => {
70-
return calculateDistance(position, a.position) - calculateDistance(position, b.position);
71-
}),
72-
);
73-
setClosestPointOfInterest(newPoints[0]);
68+
if (props.disableCards) {
69+
setSortedPointsOfInterest(newPoints);
70+
} else {
71+
setSortedPointsOfInterest(
72+
newPoints.sort((a: PointOfInterest, b: PointOfInterest): number => {
73+
return calculateDistance(position, a.position) - calculateDistance(position, b.position);
74+
}),
75+
);
76+
setClosestPointOfInterest(newPoints[0]);
77+
}
7478
}, [props.pointsOfInterest, position]);
7579

7680
const theme = completeTheme(reduceMotion, props.theme);
@@ -152,11 +156,12 @@ const ButterflyMap = (props: ButterflyMapProps) => {
152156
setHideMap={setHideMap}
153157
/>
154158
{!hideMap && <MapAndBarContainer>
155-
<MapSidebar data-showing={sidebarShowing} height={props.height}>
156-
{closestPointOfInterest && <closestPointOfInterest.SidebarComponent closeSidebar={() => setSidebarShowing(false)}
157-
handlePoiClick={handlePoiClick}
158-
userPosition={userPosition}/>}
159-
</MapSidebar>
159+
{!props.disableCards &&
160+
<MapSidebar data-showing={sidebarShowing} height={props.height}>
161+
{closestPointOfInterest && <closestPointOfInterest.SidebarComponent closeSidebar={() => setSidebarShowing(false)}
162+
handlePoiClick={handlePoiClick}
163+
userPosition={userPosition}/>}
164+
</MapSidebar>}
160165
<MapContainer>
161166
<Map mapStyle={props.tileServer}
162167
{...viewState}
@@ -176,7 +181,7 @@ const ButterflyMap = (props: ButterflyMapProps) => {
176181
</CenterMapButton>
177182
</MapContainer>
178183
</MapAndBarContainer>}
179-
{sortedPointsOfInterest.length > 0 &&
184+
{(!props.disableCards && sortedPointsOfInterest.length > 0) &&
180185
<PointBar userPosition={userPosition}
181186
localStrings={localStrings}
182187
page={props.paginationPage ?? paginationPage}
@@ -203,6 +208,7 @@ type ButterflyMapProps = {
203208
paginationPage?: number,
204209
setPaginationPage?: React.Dispatch<React.SetStateAction<number>>,
205210
totalCount?: number,
211+
disableCards?: boolean,
206212
}
207213

208214
export default ButterflyMap;

0 commit comments

Comments
 (0)