archive-gh-me/google-map-react
1
0
Fork 0
mirror of https://github.com/google-map-react/google-map-react.git synced 2025-12-08 18:26:32 +00:00
Code Issues Projects Releases Wiki Activity

Move style prop to props, (fast hack to support flex layouts)

Browse Source
This commit is contained in:
cybice 2016-02-02 19:16:11 +03:00
parent b3bbbe68ea
commit a6e6b37675
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/google_map.js
View File

@ -56,14 +56,6 @@ function defaultOptions_(/* maps */) {
};
}
const style = {
width: '100%',
height: '100%',
margin: 0,
padding: 0,
position: 'relative',
};
const latLng2Obj = (latLng) => isPlainObject(latLng)
? latLng
: {lat: latLng[0], lng: latLng[1]};
@ -110,6 +102,7 @@ export default class GoogleMap extends Component {
onGoogleApiLoaded: PropTypes.func,
yesIWantToUseGoogleMapApiInternals: PropTypes.bool,
draggable: PropTypes.bool,
style: PropTypes.any,
};
static defaultProps = {
@ -123,6 +116,13 @@ export default class GoogleMap extends Component {
options: defaultOptions_,
googleMapLoader,
yesIWantToUseGoogleMapApiInternals: false,
style: {
width: '100%',
height: '100%',
margin: 0,
padding: 0,
position: 'relative',
},
};
static googleMapLoader = googleMapLoader; // eslint-disable-line
@ -869,7 +869,7 @@ export default class GoogleMap extends Component {
return (
<div
style={style}
style={this.props.style}
onMouseMove={this._onMapMouseMove}
onMouseDownCapture={this._onMapMouseDownCapture}
onClick={this._onMapClick}