Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update example to use the new markerPosition prop #1051

Draft
wants to merge 6 commits into
base: master
Choose a base branch
from
Draft

Update example to use the new markerPosition prop #1051

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
18a5986
add markerPosition prop
IBanda Jul 20, 2021
556bd78
use existing marker wrapper
IBanda Jul 20, 2021
f8cac72
print error in none production env
IBanda Jul 21, 2021
eefa0e4
use `center bottom` as default marker position
IBanda Jul 22, 2021
93e7950
add missing closing bracket
IBanda Jul 22, 2021
755bfa3
position marker using `markerPosition` prop
IBanda Aug 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
24 changes: 11 additions & 13 deletions example/src/App.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, { useState, useEffect } from 'react';
import styled from 'styled-components';

import GoogleMapReact from 'google-map-react'
import GoogleMapReact from 'google-map-react';
// import 'google-map-react/dist/index.css'

import LOS_ANGELES_CENTER from './const/la_center';
Expand All @@ -14,39 +14,37 @@ const Wrapper = styled.main`
`;

const App = () => {
const [places, setPlaces] = useState([])
const [places, setPlaces] = useState([]);

const fetchPlaces = async () => {
fetch('places.json')
.then((response) => response.json())
.then((data) => setPlaces(data.results))
}
.then((response) => response.json())
.then((data) => setPlaces(data.results));
};

useEffect(() => {
fetchPlaces();
}, [])
}, []);

if (!places || places.length === 0) {
return null;
}

return (
<Wrapper>
<GoogleMapReact
defaultZoom={10}
defaultCenter={LOS_ANGELES_CENTER}
>
<GoogleMapReact defaultZoom={10} defaultCenter={LOS_ANGELES_CENTER}>
{places.map((place) => (
<Marker
key={place.id}
text={place.name}
lat={place.geometry.location.lat}
lng={place.geometry.location.lng}
markerPosition='center center'
/>
))}
</GoogleMapReact>
</Wrapper>
)
}
);
};

export default App
export default App;
11 changes: 1 addition & 10 deletions example/src/components/Marker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,28 +3,19 @@ import PropTypes from 'prop-types';
import styled from 'styled-components';

const Wrapper = styled.div`
position: absolute;
top: 50%;
left: 50%;
width: 18px;
height: 18px;
background-color: #000;
border: 2px solid #fff;
border-radius: 100%;
user-select: none;
transform: translate(-50%, -50%);
cursor: ${(props) => (props.onClick ? 'pointer' : 'default')};
&:hover {
z-index: 1;
}
`;

const Marker = ({ text, onClick }) => (
<Wrapper
alt={text}
onClick={onClick}
/>
);
const Marker = ({ text, onClick }) => <Wrapper alt={text} onClick={onClick} />;

Marker.defaultProps = {
onClick: null,
Expand Down
43 changes: 40 additions & 3 deletions src/google_map_markers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,25 @@ const mainStyle = {
};

const style = {
width: 0,
height: 0,
left: 0,
top: 0,
backgroundColor: 'transparent',
position: 'absolute',
};

const markerAxisX = {
left: 0,
center: '-50%',
right: '-100%',
};

const markerAxisY = {
top: 0,
center: '-50%',
bottom: '-100%',
};
const isProduction = process.env.NODE_ENV === 'production';

export default class GoogleMapMarkers extends Component {
/* eslint-disable react/forbid-prop-types */
static propTypes = {
Expand Down Expand Up @@ -320,10 +331,36 @@ export default class GoogleMapMarkers extends Component {
...latLng,
};

const markerPosition = child.props.markerPosition || 'center bottom';

if (typeof markerPosition === 'string') {
[this.markerPosX, this.markerPosY] = markerPosition.trim().split(' ');

if (!markerAxisX[this.markerPosX] && !isProduction)
console.error(
`Invalid x value passed for markerPosition, expected strings left,center or right`
);

if (!markerAxisY[this.markerPosY] && !isProduction)
console.error(
`Invalid y value passed for markerPosition, expected strings top,center or bottom`
);
} else if (!isProduction) {
console.error(
`Warning: Failed prop type: Invalid prop markerPosition of ${typeof markerPosition} supplied, expected string`
);
}

return (
<div
key={childKey}
style={{ ...style, ...stylePtPos }}
style={{
...style,
...stylePtPos,
transform: `translate(${markerAxisX[this.markerPosX]},${
markerAxisY[this.markerPosY]
})`,
}}
className={child.props.$markerHolderClassName}
>
{React.cloneElement(child, {
Expand Down