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

Marker position #1049

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

Marker position #1049

Changes from 3 commits
Commits
Show all changes
5 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
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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 center';
Copy link
Member

@itsmichaeldiego itsmichaeldiego Jul 22, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Default should be google map's default, which is center bottom

Copy link
Author

@IBanda IBanda Jul 22, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

marker positioning

Just for clarity, is that the same thing referenced in the docs? 👆

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@IBanda We're changing the default position, yes, therefore we have to update the docs


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