Skip to content

Commit 4331016

Browse files
authored
Merge branch 'master' into patch-1
2 parents 1bc67b0 + 99c7da1 commit 4331016

File tree

7 files changed

+16564
-5178
lines changed

7 files changed

+16564
-5178
lines changed

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,3 @@ npm-debug.log
88
node_modules
99
.env
1010
public/
11-
dist

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ export default GoogleApiWrapper({
8888

8989
## Examples
9090

91-
Check out the example site at: [http://fullstackreact.github.io/google-maps-react](http://fullstackreact.github.io/basic)
91+
Check out the example site at: [http://fullstackreact.github.io/google-maps-react](http://fullstackreact.github.io/google-maps-react)
9292

9393
## Additional Map Props
9494
The Map component takes a number of optional props.

index.d.ts

Lines changed: 31 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ export interface IProvidedProps {
2424
loaded?: boolean
2525
}
2626

27-
type mapEventHandler = (mapProps?: IMapProps, map?: google.maps.Map, event?) => any
27+
type mapEventHandler = (mapProps?: IMapProps, map?: google.maps.Map, event?: any) => any
2828

29-
type Style = Object<string, string | number | boolean>
29+
type Style = Object
3030

3131
export interface IMapProps extends google.maps.MapOptions {
3232
google: GoogleAPI
@@ -39,6 +39,15 @@ export interface IMapProps extends google.maps.MapOptions {
3939
centerAroundCurrentLocation?: boolean
4040
initialCenter?: google.maps.LatLngLiteral
4141
center?: google.maps.LatLngLiteral
42+
zoom?: number
43+
44+
zoomControl?: boolean
45+
mapTypeControl?: boolean
46+
scaleControl?: boolean
47+
streetViewControl?: boolean
48+
panControl?: boolean
49+
rotateControl?: boolean
50+
fullscreenControl?: boolean
4251

4352
visible?: boolean
4453

@@ -64,13 +73,24 @@ export interface IMapProps extends google.maps.MapOptions {
6473
onZoomChanged?: mapEventHandler
6574
}
6675

67-
type markerEventHandler = (props?: IMarkerProps, marker?: google.maps.Marker, event?) => any
76+
type markerEventHandler = (props?: IMarkerProps, marker?: google.maps.Marker, event?: any) => any
6877

6978
export interface IMarkerProps extends Partial<google.maps.MarkerOptions> {
7079
mapCenter?: google.maps.LatLng | google.maps.LatLngLiteral
80+
position?: google.maps.LatLngLiteral
81+
label?: string
82+
title?: string
83+
name?: string
7184

7285
onClick?: markerEventHandler
86+
onDblclick?: markerEventHandler
87+
onDragend?: markerEventHandler
88+
onMousedown?: markerEventHandler
89+
onMouseout?: markerEventHandler
7390
onMouseover?: markerEventHandler
91+
onDragend?: markerEventHandler
92+
onMouseup?: markerEventHandler
93+
onRecenter?: markerEventHandler
7494
}
7595

7696
export class Map extends React.Component<IMapProps, any> {
@@ -94,14 +114,18 @@ export class Circle extends React.Component<any, any> {
94114
}
95115

96116
export interface IInfoWindowProps extends Partial<google.maps.InfoWindowOptions> {
97-
google: typeof google
98-
map: google.maps.Map
117+
118+
google?: typeof google
119+
map?: google.maps.Map
99120
marker?: google.maps.Marker
121+
100122
position?: google.maps.LatLng | google.maps.LatLngLiteral
101123
visible?: boolean
124+
102125
children: React.ReactNode
103-
onClose(): void
104-
onOpen(): void
126+
onClose?(): void
127+
onOpen?(): void
128+
105129
}
106130

107131
export class InfoWindow extends React.Component<IInfoWindowProps, any> {

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy