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

Fix build (#605)

Browse Source 
* Fix build by updating yarn

* Fix lint

* Fix build by adding react-dom to devDependencies

* Fix lint again
This commit is contained in:
Michael Diego 2018-06-22 16:44:26 +03:00 committed by GitHub
parent bc63943a11
commit a73629b389
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 734 additions and 624 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
package.json
View File

@ -86,6 +86,7 @@
"prettier": "^0.22.0",
"prop-types": "^15.5.6",
"react": "^16.0.0",
"react-dom": "^16.4.1",
"react-motion": "^0.4.4",
"react-router": "^3.2.0",
"recompose": "^0.26.0",

9
src/google_map_markers.js
View File

@ -269,7 +269,7 @@ export default class GoogleMapMarkers extends Component {
? this.props.geoService.fromLatLngToContainerPixel(latLng)
: this.props.geoService.project(latLng);
let stylePtPos = {
const stylePtPos = {
left: pt.x,
top: pt.y,
};
@ -279,14 +279,11 @@ export default class GoogleMapMarkers extends Component {
// and the southeast corner to lock the overlay to the correct geographic bounds.
if (
child.props.seLatLng !== undefined ||
(
child.props.seLat !== undefined &&
child.props.seLng !== undefined
)
(child.props.seLat !== undefined && child.props.seLng !== undefined)
) {
const seLatLng = child.props.seLatLng !== undefined
? child.props.seLatLng
: {lat: child.props.seLat, lng: child.props.seLng};
: { lat: child.props.seLat, lng: child.props.seLng };
const sePt = this.props.projectFromLeftTop
? this.props.geoService.fromLatLngToContainerPixel(seLatLng)

121
test/components/GoogleMap.spec.js
View File

@ -14,13 +14,12 @@ describe('Components', () => {
class MapMarker extends Component {
render() {
return (
<div className={mapMarkerClassName}>Marker</div>
);
return <div className={mapMarkerClassName}>Marker</div>;
}
}
class MapHolder extends Component { // eslint-disable-line react/no-multi-comp
class MapHolder extends Component {
// eslint-disable-line react/no-multi-comp
static propTypes = {
center: PropTypes.array,
zoom: PropTypes.number,
@ -34,10 +33,7 @@ describe('Components', () => {
render() {
return (
<GoogleMap
center={this.props.center}
zoom={this.props.zoom}
>
<GoogleMap center={this.props.center} zoom={this.props.zoom}>
<MapMarker lat={59.955413} lng={30.337844} />
</GoogleMap>
);
@ -46,11 +42,12 @@ describe('Components', () => {
// console.log('GoogleMap', GoogleMap);
const mapHolder = TestUtils.renderIntoDocument(
<MapHolder />
);
const mapHolder = TestUtils.renderIntoDocument(<MapHolder />);
const marker = TestUtils.findRenderedDOMComponentWithClass(mapHolder, 'mapMarkerClassName');
const marker = TestUtils.findRenderedDOMComponentWithClass(
mapHolder,
'mapMarkerClassName'
);
expect(marker.parentNode.style.left).toEqual('0.250129066669615px');
expect(marker.parentNode.style.top).toEqual('-12.62811732746195px');
});
@ -58,15 +55,15 @@ describe('Components', () => {
it('Should accept center prop as lat lng object', () => {
const mapMarkerClassName = 'mapMarkerClassName';
class MapMarker extends Component { // eslint-disable-line react/no-multi-comp
class MapMarker extends Component {
// eslint-disable-line react/no-multi-comp
render() {
return (
<div className={mapMarkerClassName}>Marker</div>
);
return <div className={mapMarkerClassName}>Marker</div>;
}
}
class MapHolder extends Component { // eslint-disable-line react/no-multi-comp
class MapHolder extends Component {
// eslint-disable-line react/no-multi-comp
static propTypes = {
center: PropTypes.any,
zoom: PropTypes.number,
@ -74,7 +71,7 @@ describe('Components', () => {
};
static defaultProps = {
center: {lat: 59.938043, lng: 30.337157},
center: { lat: 59.938043, lng: 30.337157 },
zoom: 9,
};
@ -84,21 +81,19 @@ describe('Components', () => {
render() {
return (
<GoogleMap
center={this.props.center}
zoom={this.props.zoom}
>
<GoogleMap center={this.props.center} zoom={this.props.zoom}>
<MapMarker lat={59.955413} lng={30.337844} />
</GoogleMap>
);
}
}
const mapHolder = TestUtils.renderIntoDocument(
<MapHolder />
);
const mapHolder = TestUtils.renderIntoDocument(<MapHolder />);
const marker = TestUtils.findRenderedDOMComponentWithClass(mapHolder, 'mapMarkerClassName');
const marker = TestUtils.findRenderedDOMComponentWithClass(
mapHolder,
'mapMarkerClassName'
);
expect(marker.parentNode.style.left).toEqual('0.250129066669615px');
expect(marker.parentNode.style.top).toEqual('-12.62811732746195px');
});
@ -106,15 +101,15 @@ describe('Components', () => {
it('Should accept defaultCenter and defaultZoom props', () => {
const mapMarkerClassName = 'mapMarkerClassName';
class MapMarker extends Component { // eslint-disable-line react/no-multi-comp
class MapMarker extends Component {
// eslint-disable-line react/no-multi-comp
render() {
return (
<div className={mapMarkerClassName}>Marker</div>
);
return <div className={mapMarkerClassName}>Marker</div>;
}
}
class MapHolder extends Component { // eslint-disable-line react/no-multi-comp
class MapHolder extends Component {
// eslint-disable-line react/no-multi-comp
static propTypes = {
center: PropTypes.any,
zoom: PropTypes.number,
@ -122,7 +117,7 @@ describe('Components', () => {
};
static defaultProps = {
center: {lat: 59.938043, lng: 30.337157},
center: { lat: 59.938043, lng: 30.337157 },
zoom: 9,
};
@ -132,7 +127,7 @@ describe('Components', () => {
render() {
return (
<GoogleMap
<GoogleMap
defaultCenter={this.props.center}
defaultZoom={this.props.zoom}
>
@ -142,20 +137,20 @@ describe('Components', () => {
}
}
const mapHolder = TestUtils.renderIntoDocument(
<MapHolder />
);
const mapHolder = TestUtils.renderIntoDocument(<MapHolder />);
const marker = TestUtils.findRenderedDOMComponentWithClass(mapHolder, 'mapMarkerClassName');
const marker = TestUtils.findRenderedDOMComponentWithClass(
mapHolder,
'mapMarkerClassName'
);
expect(marker.parentNode.style.left).toEqual('0.250129066669615px');
expect(marker.parentNode.style.top).toEqual('-12.62811732746195px');
});
it('Should call custom loader', () => {
const API_KEY = 'API_KEY';
const spy = expect.createSpy(() => {});
const asyncSpy = async (a) => spy(a);
const asyncSpy = async a => spy(a);
TestUtils.renderIntoDocument(
<GoogleMap
@ -178,7 +173,8 @@ describe('Components', () => {
it('Should add a className to the marker from $markerHolderClassName', () => {
const markerHolderClassName = 'marker-holder-class-name';
class MapHolder extends Component { // eslint-disable-line react/no-multi-comp
class MapHolder extends Component {
// eslint-disable-line react/no-multi-comp
static propTypes = {
center: PropTypes.array,
zoom: PropTypes.number,
@ -196,29 +192,31 @@ describe('Components', () => {
render() {
return (
<GoogleMap
center={this.props.center}
zoom={this.props.zoom}
>
<div lat={59.955413} lng={30.337844} $markerHolderClassName={markerHolderClassName} />
<GoogleMap center={this.props.center} zoom={this.props.zoom}>
<div
lat={59.955413}
lng={30.337844}
$markerHolderClassName={markerHolderClassName}
/>
</GoogleMap>
);
}
}
const mapHolder = TestUtils.renderIntoDocument(
<MapHolder />
);
const mapHolder = TestUtils.renderIntoDocument(<MapHolder />);
const marker = TestUtils
.findRenderedDOMComponentWithClass(mapHolder, 'marker-holder-class-name');
const marker = TestUtils.findRenderedDOMComponentWithClass(
mapHolder,
'marker-holder-class-name'
);
expect(marker.className).toEqual('marker-holder-class-name');
expect(marker.style.left).toEqual('0.250129066669615px');
expect(marker.style.top).toEqual('-12.62811732746195px');
});
it('Should not add a className to the marker if $markerHolderClassName is not present', () => {
class MapHolder extends Component { // eslint-disable-line react/no-multi-comp
class MapHolder extends Component {
// eslint-disable-line react/no-multi-comp
static propTypes = {
center: PropTypes.array,
zoom: PropTypes.number,
@ -236,22 +234,23 @@ describe('Components', () => {
render() {
return (
<GoogleMap
center={this.props.center}
zoom={this.props.zoom}
>
<div className="marker-class-name" lat={59.955413} lng={30.337844}/>
<GoogleMap center={this.props.center} zoom={this.props.zoom}>
<div
className="marker-class-name"
lat={59.955413}
lng={30.337844}
/>
</GoogleMap>
);
}
}
const mapHolder = TestUtils.renderIntoDocument(
<MapHolder />
);
const mapHolder = TestUtils.renderIntoDocument(<MapHolder />);
const marker = TestUtils
.findRenderedDOMComponentWithClass(mapHolder, 'marker-class-name');
const marker = TestUtils.findRenderedDOMComponentWithClass(
mapHolder,
'marker-class-name'
);
expect(marker.parentNode.className).toNotExist();
expect(marker.parentNode.style.left).toEqual('0.250129066669615px');
expect(marker.parentNode.style.top).toEqual('-12.62811732746195px');

1227
yarn.lock
View File

File diff suppressed because it is too large Load Diff