diff options
| author | Aubrey-Li <63608597+Aubrey-Li@users.noreply.github.com> | 2021-06-28 10:35:35 -0700 |
|---|---|---|
| committer | Aubrey-Li <63608597+Aubrey-Li@users.noreply.github.com> | 2021-06-28 10:35:35 -0700 |
| commit | 033e7a1aa20947f28672e8512245c2cd69982350 (patch) | |
| tree | a2c6c3579f439d99168e0b8dfc53e12cbbd20492 /src | |
| parent | dbff7ae16f240f80b8b8131d35929b4a2135d0aa (diff) | |
| parent | 0a152e2ca315171c5b8a80c8f3c2dc57c6e14c65 (diff) | |
Merge branch 'trails-aubrey' of https://github.com/brown-dash/Dash-Web into trails-aubrey
Diffstat (limited to 'src')
| -rw-r--r-- | src/client/views/collections/CollectionMapView.tsx | 54 |
1 files changed, 26 insertions, 28 deletions
diff --git a/src/client/views/collections/CollectionMapView.tsx b/src/client/views/collections/CollectionMapView.tsx index 67864f92f..07755ed71 100644 --- a/src/client/views/collections/CollectionMapView.tsx +++ b/src/client/views/collections/CollectionMapView.tsx @@ -23,9 +23,7 @@ export type LocationData = google.maps.LatLngLiteral & { }; const mapContainerStyle = { - width: '100%', - heiht: '100%', - overflow: 'hidden', + height: '100%', }; @@ -87,31 +85,31 @@ export default class CollectionMapView extends CollectionSubView<MapSchema, Goog return <div className="collectionMapView" ref={this.createDashEventsTarget}> - <LoadScript - googleMapsApiKey={process.env.GOOGLE_MAPS!} - libraries={['places']} - > - <div className={"collectionMapView-contents"} - style={{ pointerEvents: active() ? undefined : "none", overflow: 'hidden' }} - onWheel={e => e.stopPropagation()} - onPointerDown={e => (e.button === 0 && !e.ctrlKey) && e.stopPropagation()} > - - <GoogleMap - mapContainerStyle={mapContainerStyle} - zoom={5} - center={defaultCenter} - > - <Marker - // name={'SOMA'} - position={{ lat: 37.778519, lng: -122.405640 }} /> - <Marker - // name={'Dolores park'} - position={{ lat: 47.617701, lng: -122.359485 }} /> - - </GoogleMap> - - </div> - </LoadScript > + + <div className={"collectionMapView-contents"} + style={{ pointerEvents: active() ? undefined : "none", overflow: 'hidden' }} + onWheel={e => e.stopPropagation()} + onPointerDown={e => (e.button === 0 && !e.ctrlKey) && e.stopPropagation()} > + <LoadScript + googleMapsApiKey={process.env.GOOGLE_MAPS!} + libraries={['places']} + > + <div className="map-wrapper"> + <GoogleMap + mapContainerStyle={mapContainerStyle} + zoom={5} + center={defaultCenter} + > + <Marker + // name={'SOMA'} + position={{ lat: 37.778519, lng: -122.405640 }} /> + <Marker + // name={'Dolores park'} + position={{ lat: 47.617701, lng: -122.359485 }} /> + </GoogleMap> + </div> + </LoadScript > + </div> </div >; } |