Skip to content

Commit 8e2ae4d

Browse files
bordeobordeo
authored
1 parent 32c5ae9 commit 8e2ae4d

File tree

8 files changed

+63
-56
lines changed

8 files changed

+63
-56
lines changed

‎example/src/App.js

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React, { useState, useEffect } from 'react';
22
import styled from 'styled-components';
33

4-
import GoogleMapReact from 'google-map-react'
4+
import GoogleMapReact from 'google-map-react';
55
// import 'google-map-react/dist/index.css'
66

77
import LOS_ANGELES_CENTER from './const/la_center';
@@ -14,28 +14,25 @@ const Wrapper = styled.main`
1414
`;
1515

1616
const App = () => {
17-
const [places, setPlaces] = useState([])
17+
const [places, setPlaces] = useState([]);
1818

1919
const fetchPlaces = async () => {
2020
fetch('places.json')
21-
.then((response) => response.json())
22-
.then((data) => setPlaces(data.results))
23-
}
21+
.then((response) => response.json())
22+
.then((data) => setPlaces(data.results));
23+
};
2424

2525
useEffect(() => {
2626
fetchPlaces();
27-
}, [])
27+
}, []);
2828

2929
if (!places || places.length === 0) {
3030
return null;
3131
}
3232

3333
return (
3434
<Wrapper>
35-
<GoogleMapReact
36-
defaultZoom={10}
37-
defaultCenter={LOS_ANGELES_CENTER}
38-
>
35+
<GoogleMapReact defaultZoom={10} defaultCenter={LOS_ANGELES_CENTER}>
3936
{places.map((place) => (
4037
<Marker
4138
key={place.id}
@@ -46,7 +43,7 @@ const App = () => {
4643
))}
4744
</GoogleMapReact>
4845
</Wrapper>
49-
)
50-
}
46+
);
47+
};
5148

52-
export default App
49+
export default App;

‎example/src/App.test.js

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
1-
import React from 'react'
2-
import ReactDOM from 'react-dom'
3-
import App from './App'
1+
import React from 'react';
2+
import ReactDOM from 'react-dom';
3+
import App from './App';
44
import { createRoot } from 'react-dom/client';
55

6-
76
it('renders without crashing', () => {
8-
const div = document.createElement('div')
7+
const div = document.createElement('div');
98
const root = createRoot(div);
10-
root.render(<App />)
11-
ReactDOM.unmountComponentAtNode(div)
12-
})
9+
root.render(
10+
<React.StrictMode>
11+
<App />
12+
</React.StrictMode>
13+
);
14+
ReactDOM.unmountComponentAtNode(div);
15+
});

‎example/src/const/la_center.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
export default [34.0522, -118.2437];
1+
export default { lat: 34.0522, lng: -118.2437 };

‎example/src/index.js

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
1-
import './index.css'
1+
import './index.css';
22

3-
import React from 'react'
4-
import App from './App'
3+
import React from 'react';
4+
import App from './App';
5+
import { createRoot } from 'react-dom/client';
56

6-
const root = createRoot(document.getElementById('root'))
7-
root.render(<App />)
7+
const root = createRoot(document.getElementById('root'));
8+
root.render(
9+
<React.StrictMode>
10+
<App />
11+
</React.StrictMode>
12+
);

‎example/yarn.lock

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1147,10 +1147,12 @@
11471147
resolved "https://registry.yarnpkg.com/@emotion/unitless/-/unitless-0.7.5.tgz#77211291c1900a700b8a78cfafda3160d76949ed"
11481148
integrity sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg==
11491149

1150-
"@googlemaps/js-api-loader@^1.2.0":
1151-
version "1.2.0"
1152-
resolved "https://registry.yarnpkg.com/@googlemaps/js-api-loader/-/js-api-loader-1.2.0.tgz#d5229607638932ae7d0c1e91d1fc19784238834e"
1153-
integrity sha512-iSE0dRlnOSVOL07FJq7M0Vvi6se1gaJH196yZ04a1TZmKiDDAoVftl+OOv/sL1RgnOwk67mlsDF9o7p8TkdVmg==
1150+
"@googlemaps/js-api-loader@^1.13.8":
1151+
version "1.14.3"
1152+
resolved "https://registry.npmjs.org/@googlemaps/js-api-loader/-/js-api-loader-1.14.3.tgz#d7a161cd547be04ad46a1cb176e6c2647f6d74a7"
1153+
integrity sha512-6iIb+qpGgQpgIHmIFO44WhE1rDUxPVHuezNFL30wRJnkvhwFm94tD291UvNg9L05hLDSoL16jd0lbqqmdy4C5g==
1154+
dependencies:
1155+
fast-deep-equal "^3.1.3"
11541156

11551157
"@hapi/address@2.x.x":
11561158
version "2.1.4"
@@ -4385,9 +4387,9 @@ extsprintf@^1.2.0:
43854387
resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
43864388
integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=
43874389

4388-
fast-deep-equal@^3.1.1:
4390+
fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
43894391
version "3.1.3"
4390-
resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
4392+
resolved "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
43914393
integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
43924394

43934395
fast-glob@^2.0.2:
@@ -8311,7 +8313,7 @@ prompts@^2.0.1:
83118313
kleur "^3.0.3"
83128314
sisteransi "^1.0.4"
83138315

8314-
prop-types@^15.6.2, prop-types@^15.7.2:
8316+
prop-types@^15.7.2:
83158317
version "15.7.2"
83168318
resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5"
83178319
integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==
@@ -8996,13 +8998,12 @@ saxes@^3.1.9:
89968998
dependencies:
89978999
xmlchars "^2.1.1"
89989000

8999-
scheduler@^0.19.1:
9000-
version "0.19.1"
9001-
resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.19.1.tgz#4f3e2ed2c1a7d65681f4c854fa8c5a1ccb40f196"
9002-
integrity sha512-n/zwRWRYSUj0/3g/otKDRPMh6qv2SYMWNq85IEa8iZyAv8od9zDYpGSnpBEjNgcMNq6Scbu5KfIPxNF72R/2EA==
9001+
scheduler@^0.21.0:
9002+
version "0.21.0"
9003+
resolved "https://registry.npmjs.org/scheduler/-/scheduler-0.21.0.tgz#6fd2532ff5a6d877b6edb12f00d8ab7e8f308820"
9004+
integrity sha512-1r87x5fz9MXqswA2ERLo0EbOAU74DpIUO090gIasYTqlVoJeMcl+Z1Rg7WHz+qtPujhS/hGIt9kxZOYBV3faRQ==
90039005
dependencies:
90049006
loose-envify "^1.1.0"
9005-
object-assign "^4.1.1"
90069007

90079008
schema-utils@^1.0.0:
90089009
version "1.0.0"

‎package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
},
1717
"scripts": {
1818
"build": "microbundle-crl -f cjs,umd src/index.cjs.js && microbundle-crl -f es,modern src/index.js",
19-
"start": "microbundle-crl watch -f cjs,umd",
19+
"start": "microbundle-crl watch -f es,modern src/index.js",
2020
"prepare": "run-s build",
2121
"test": "run-s test:unit test:lint test:build",
2222
"test:build": "run-s build",
@@ -55,8 +55,8 @@
5555
"microbundle-crl": "^0.13.10",
5656
"npm-run-all": "^4.1.5",
5757
"prettier": "^2.0.4",
58-
"react": "^16.0.0 || ^17.0.2 || ^18.0.0",
59-
"react-dom": "^16.0.0 || ^17.0.2 || ^18.0.0",
58+
"react": "^18.2.0",
59+
"react-dom": "^18.2.0",
6060
"react-scripts": "^3.4.1"
6161
},
6262
"files": [
@@ -74,4 +74,4 @@
7474
"javascript",
7575
"react-component"
7676
]
77-
}
77+
}

‎src/google_map.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -259,6 +259,7 @@ class GoogleMap extends Component {
259259

260260
componentDidMount() {
261261
this.mounted_ = true;
262+
this.markersDispatcher_ = new MarkerDispatcher(this);
262263
addPassiveEventListener(window, 'resize', this._onWindowResize, false);
263264
addPassiveEventListener(window, 'keydown', this._onKeyDownCapture, true);
264265
const mapDom = ReactDOM.findDOMNode(this.googleMapDom_);

‎yarn.lock

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9470,13 +9470,13 @@ react-dev-utils@^10.2.1:
94709470
strip-ansi "6.0.0"
94719471
text-table "0.2.0"
94729472

9473-
"react-dom@^16.0.0 || ^17.0.2 || ^18.0.0":
9474-
version "18.0.0"
9475-
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-18.0.0.tgz#26b88534f8f1dbb80853e1eabe752f24100d8023"
9476-
integrity sha512-XqX7uzmFo0pUceWFCt7Gff6IyIMzFUn7QMZrbrQfGxtaxXZIcGQzoNpRLE3fQLnS4XzLLPMZX2T9TRcSrasicw==
9473+
react-dom@^18.2.0:
9474+
version "18.2.0"
9475+
resolved "https://registry.npmjs.org/react-dom/-/react-dom-18.2.0.tgz#22aaf38708db2674ed9ada224ca4aa708d821e3d"
9476+
integrity sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==
94779477
dependencies:
94789478
loose-envify "^1.1.0"
9479-
scheduler "^0.21.0"
9479+
scheduler "^0.23.0"
94809480

94819481
react-error-overlay@^6.0.7:
94829482
version "6.0.7"
@@ -9548,10 +9548,10 @@ react-scripts@^3.4.1:
95489548
optionalDependencies:
95499549
fsevents "2.1.2"
95509550

9551-
"react@^16.0.0 || ^17.0.2 || ^18.0.0":
9552-
version "18.0.0"
9553-
resolved "https://registry.yarnpkg.com/react/-/react-18.0.0.tgz#b468736d1f4a5891f38585ba8e8fb29f91c3cb96"
9554-
integrity sha512-x+VL6wbT4JRVPm7EGxXhZ8w8LTROaxPXOqhlGyVSrv0sB1jkyFGgXxJ8LVoPRLvPR6/CIZGFmfzqUa2NYeMr2A==
9551+
react@^18.2.0:
9552+
version "18.2.0"
9553+
resolved "https://registry.npmjs.org/react/-/react-18.2.0.tgz#555bd98592883255fa00de14f1151a917b5d77d5"
9554+
integrity sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==
95559555
dependencies:
95569556
loose-envify "^1.1.0"
95579557

@@ -10145,10 +10145,10 @@ saxes@^3.1.9:
1014510145
dependencies:
1014610146
xmlchars "^2.1.1"
1014710147

10148-
scheduler@^0.21.0:
10149-
version "0.21.0"
10150-
resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.21.0.tgz#6fd2532ff5a6d877b6edb12f00d8ab7e8f308820"
10151-
integrity sha512-1r87x5fz9MXqswA2ERLo0EbOAU74DpIUO090gIasYTqlVoJeMcl+Z1Rg7WHz+qtPujhS/hGIt9kxZOYBV3faRQ==
10148+
scheduler@^0.23.0:
10149+
version "0.23.0"
10150+
resolved "https://registry.npmjs.org/scheduler/-/scheduler-0.23.0.tgz#ba8041afc3d30eb206a487b6b384002e4e61fdfe"
10151+
integrity sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw==
1015210152
dependencies:
1015310153
loose-envify "^1.1.0"
1015410154

0 commit comments

Comments
 (0)