-
Notifications
You must be signed in to change notification settings - Fork 95
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
refactor!: improved state-handling implementation (#181)
Refactor and partly reimplement the logic for camera-state handling of the map. Introduces explicit controlled and uncontrolled props for the camera parameters. BREAKING CHANGE: The behaviour of the props controlling camera parameters (center, zoom, heading and tilt) changed. Unless you are using controlled props, you have to change the prop names from e.g. `center` to `defaultCenter` (the same goes for `zoom`, `heading` and `tilt`).
- Loading branch information
1 parent
5176df8
commit 904b918
Showing
45 changed files
with
2,183 additions
and
1,254 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,61 +1,274 @@ | ||
| # `<Map>` Component | ||
|
|
||
| React component to display a [Map][gmp-map] instance. | ||
| React component to render a [Google Map][gmp-map]. It can be placed as a child | ||
| into any other component, but it has to be somewhere inside an | ||
| [`<APIProvider>`][api-provider] container. | ||
|
|
||
| The main props to control are the camera parameters – `center`, | ||
| `zoom`, `heading` and `tilt`. At least the center and zoom props have to be | ||
| specified for the map to be shown. | ||
|
|
||
| ```tsx | ||
| import React, {FunctionComponent} from 'react'; | ||
| import {APIProvider, Map} from '@vis.gl/react-google-maps'; | ||
|
|
||
| const App: FunctionComponent<Record<string, unknown>> = () => ( | ||
| <APIProvider apiKey={'Your API key here'}> | ||
| const App = () => ( | ||
| <APIProvider apiKey={process.env.GOOGLE_MAPS_API_KEY}> | ||
| <Map zoom={10} center={{lat: 53.54992, lng: 10.00678}} /> | ||
| </APIProvider> | ||
| ); | ||
| export default App; | ||
| ``` | ||
|
|
||
| By default, the `Map` component is uncontrolled. That is, the props | ||
| for controlling the camera (`center`, `zoom`, `heading` and `tilt`) only | ||
| specify the initial value and the map will allow all user-interactions as is | ||
| default for the Maps JavaScript API. | ||
| ## Controlled and Uncontrolled Props | ||
|
|
||
| The props controlling the camera parameters for the map (center, zoom, | ||
| heading and tilt) can all be specified via controlled or uncontrolled values. | ||
| For example, the center of the map can be specified via either `center` or | ||
| `defaultCenter`. This can even be mixed for the different parameters (for | ||
| example, only the zoom value is controlled, while others are free). | ||
|
|
||
| As is the case with React form elements, the default-values will only be | ||
| applied when the map is first initialized, while the regular parameters will | ||
| make sure the map stays synchronized with the value specified. | ||
|
|
||
| ```tsx | ||
| const UncontrolledMap = () => { | ||
| return <Map defaultCenter={{lat: 40.7, lng: -74}} defaultZoom={12}></Map>; | ||
| }; | ||
| ``` | ||
|
|
||
| When only controlled props are used, the map will always exactly reflect the | ||
| values specified for the camera parameters. When interactions occur, the new | ||
| camera parameters will be published with a `cameraChanged` event and the | ||
| application can use them to update the values passed to the props of the map. | ||
|
|
||
| Only when the values for these props are changed, the camera is updated by | ||
| the library to reflect those values. | ||
| ```tsx | ||
| import {MapCameraChangedEvent, MapCameraProps} from '@vis.gl/react-google-maps'; | ||
|
|
||
| const INITIAL_CAMERA = { | ||
| center: {lat: 40.7, lng: -74}, | ||
| zoom: 12 | ||
| }; | ||
|
|
||
| const ControlledMap = () => { | ||
| const [cameraProps, setCameraProps] = | ||
| useState<MapCameraProps>(INITIAL_CAMERA); | ||
| const handleCameraChange = useCallback((ev: MapCameraChangedEvent) => | ||
| setCameraProps(ev.detail) | ||
| ); | ||
|
|
||
| return <Map {...cameraProps} onCameraChanged={handleCameraChange}></Map>; | ||
| }; | ||
| ``` | ||
|
|
||
| In addition to this, there is also the **externally controlled mode**, | ||
| enabled by the [`controlled` prop](#controlled-boolean). When this mode is | ||
| active, the map will disable all control inputs and will reject to render | ||
| anything not specified in the camera props. | ||
|
|
||
| ## Props | ||
|
|
||
| The MapProps interface extends the [google.maps.MapOptions interface](https://developers.google.com/maps/documentation/javascript/reference/map#MapOptions) | ||
| and includes all possible options available for a Google Maps Platform Map. | ||
| The `MapProps` type extends the [`google.maps.MapOptions` interface] | ||
| [gmp-map-options] and includes all possible options available for a Google | ||
| Map as props. | ||
|
|
||
| The most important of these options are also listed below along with the | ||
| properties added for the react-library. | ||
|
|
||
| :::note | ||
|
|
||
| When specifying the props, the classes provided by the Google | ||
| Maps API (like `google.maps.LatLng` or `google.maps.LatLngBounds`) cannot | ||
| be used, since the API will only be available after the initial | ||
| creation of the React components takes place. Instead, the | ||
| corresponding literal types (`google.maps.LatLngLiteral` or | ||
| `google.maps.LatLngBoundsLiteral`) have to be used. | ||
|
|
||
| ::: | ||
|
|
||
| ### Required | ||
|
|
||
| The map doesn't have any strictly required props, but center and zoom-level have | ||
| to be provided in some way for the map to render. This can be done | ||
|
|
||
| - by specifying both the `center` and `zoom` props, | ||
| - by specifying the `initialCameraProps` prop with `center` and `zoom`, | ||
| - or by specifying the map-region to be shown with the `initialBounds` prop. | ||
|
|
||
| ### General Props | ||
|
|
||
| #### `id`: string | ||
|
|
||
| A string that identifies the map component. This is required when multiple | ||
| maps are present in the same APIProvider context to be able to access them using the | ||
| [`useMap`](../hooks/use-map.md) hook. | ||
|
|
||
| #### `style`: React.CSSProperties | ||
|
|
||
| Additional style rules to apply to the map dom-element. By default, this will | ||
| only contain `{width: '100%', height: '100%'}`. | ||
|
|
||
| #### `className`: string | ||
|
|
||
| Additional css class-name to apply to the element containing the map. | ||
| When a classname is specified, the default height of the map from the | ||
| style-prop is no longer applied. | ||
|
|
||
| ### Camera Control | ||
|
|
||
| #### `center`: [google.maps.LatLngLiteral][gmp-ll] | ||
|
|
||
| Coordinates for the center of the map. | ||
|
|
||
| Additionally, there are other optional properties for the map component. | ||
| #### `zoom`: number | ||
|
|
||
| To add custom style, the `style` property can be set to add inline style to | ||
| the default map style. Also, it is possible to add a class to the map via | ||
| the `className` property. The style passed with the `className` property | ||
| will overwrite the original default inline style of the map. | ||
| The initial resolution at which to display the map. | ||
| The values range from 0 to 22, the level of detail for different zoom-levels | ||
| is approximately: | ||
|
|
||
| The `initialBounds` property can receive bounds on the initial map load. | ||
| When multiple `Map` components are used, it is necessary to apply an id to | ||
| each Map instance. The id can be used to reference the | ||
| - `1`: Entire World | ||
| - `5`: Landmass/continent | ||
| - `10`: City | ||
| - `15`: Streets | ||
| - `20`: Buildings | ||
|
|
||
| Map instance when using the [`useMap` hook](../hooks/use-map.md). | ||
| The Google Maps API Documentation [has some more information on this topic]. | ||
| [gmp-coordinates]. | ||
|
|
||
| #### `heading`: number | ||
|
|
||
| The heading of the map in degrees, measured clockwise from cardinal direction | ||
| North. | ||
|
|
||
| #### `tilt`: number | ||
|
|
||
| For vector maps, sets the angle of incidence for the map, in degrees from the | ||
| viewport plane to the map plane. A value of 0 | ||
|
|
||
| The allowed values are restricted depending on the zoom level of the map: | ||
|
|
||
| - for zoom-levels below 10, the maximum value is 30, | ||
| - for zoom above 15.5, the maximum value is 67.5 | ||
| - between 10 and 15.5, it is a piecewise linear interpolation | ||
| ([see here][get-max-tilt] for details) | ||
|
|
||
| #### `defaultCenter`, `defaultZoom`, `defaultHeading`, `defaultTilt` | ||
|
|
||
| The initial state of the camera. This can be used to leave the map | ||
| component in uncontrolled mode. When both a default-value and a controlled | ||
| value are present for a parameter, the controlled value takes precedence. | ||
|
|
||
| #### `initialBounds`: [google.maps.LatLngBoundsLiteral][gmp-llb] | ||
|
|
||
| An alternative way to specify the region that should initially be visible on | ||
| the map. Has otherwise the same effect as `initialCameraProps`. | ||
|
|
||
| #### `controlled`: boolean | ||
|
|
||
| This Indicates that the map will be controlled externally. Disables all controls | ||
| provided by the map itself. | ||
|
|
||
| ### Events | ||
|
|
||
| The map component supports [all events emitted by the `google.maps.Map` | ||
| instance][gmp-map-events] in a React-typical way. Here is an example: | ||
|
|
||
| ```tsx | ||
| interface MapProps extends google.maps.MapOptions { | ||
| id?: string; | ||
| style?: CSSProperties; | ||
| className?: string; | ||
| initialBounds?: google.maps.LatLngBounds | google.maps.LatLngBoundsLiteral; | ||
| onLoadMap?: (map: google.maps.Map) => void; | ||
| viewport?: unknown; | ||
| viewState?: Record<string, any>; | ||
| initialViewState?: Record<string, any>; | ||
| } | ||
| const MapWithEventHandler = props => { | ||
| const handleCameraChange = useCallback((ev: MapCameraChangedEvent) => { | ||
| console.log('camera changed: ', ev.detail); | ||
| }); | ||
|
|
||
| return <Map {...props} onCameraChanged={handleCameraChange}></Map>; | ||
| }; | ||
| ``` | ||
|
|
||
| To see the Map on the screen, you must set `zoom` and `center` together, or `initialBounds` as options. These | ||
| options can also be set later via `map.setOptions(...)` when the Map instance is accessed via | ||
| the [useMap hook](../hooks/use-map.md). The props `viewport`, `viewState` and `initialViewState` are used | ||
| for an integration with the [DeckGL React Component](https://deck.gl/docs/get-started/using-with-react) and the Map. | ||
| See [the table below](#mapping-of-google-maps-event-names-to-react-props) | ||
| for the full list of props and corresponding prop names. | ||
|
|
||
| All event callbacks receive a single argument of type `MapEvent` with the | ||
| following properties and methods: | ||
|
|
||
| - **`event.type`: string** The Google Maps event type of the event. | ||
| - **`event.map`: google.maps.Map** The Map instance that dispatched the event. | ||
| - **`event.stoppable`: boolean** Indicates if the event can be stopped in | ||
| the event-handler. This is only the case for the `MapMouseEvent` type. | ||
| - **`event.stop()`: () => void** for stoppable events, this will cause the | ||
| event to stop being processed. Other event-types also have this method, | ||
| but it doesn't do anything. | ||
| - **`event.domEvent`: MouseEvent | TouchEvent | PointerEvent | KeyboardEvent | ||
| | Event** For a `MapMouseEvent` this contains the original DOM event being | ||
| handled. For other events, this is undefined. | ||
|
|
||
| Based on the specific event, there is also additional information in the | ||
| **`event.detail`** property: | ||
|
|
||
| - **`MapCameraChangedEvent`** | ||
| - **`center`**, **`zoom`**, **`heading`**, **`tilt`** the current | ||
| camera-parameters of the map | ||
| - **`bounds`: google.maps.LatLngBoundsLiteral** the currently | ||
| visible bounding box | ||
| - **`MapMouseEvent`** details contain | ||
| - **`latLng`: google.maps.LatLngLiteral | null** the map coordinates of the | ||
| mouse | ||
| - **`placeId`: string | null** when a place marker on the map is clicked, | ||
| this will contain the placeId of the Google Places API for that place. | ||
|
|
||
| #### Mapping of Google Maps Event names to React props | ||
|
|
||
| | Google Maps Event | React Prop | Event Type | | ||
| | --------------------------------- | --------------------------------------- | ----------------------- | | ||
| | `bounds_changed` | `onBoundsChanged` and `onCameraChanged` | `MapCameraChangedEvent` | | ||
| | `center_changed` | `onCenterChanged` | `MapCameraChangedEvent` | | ||
| | `zoom_changed` | `onZoomChanged` | `MapCameraChangedEvent` | | ||
| | `heading_changed` | `onHeadingChanged` | `MapCameraChangedEvent` | | ||
| | `tilt_changed` | `onTiltChanged` | `MapCameraChangedEvent` | | ||
| | `projection_changed` | `onProjectionChanged` | `MapCameraChangedEvent` | | ||
| | `click` | `onClick` | `MapMouseEvent` | | ||
| | `contextmenu` | `onContextmenu` | `MapMouseEvent` | | ||
| | `dblclick` | `onDblclick` | `MapMouseEvent` | | ||
| | `mousemove` | `onMousemove` | `MapMouseEvent` | | ||
| | `mouseover` | `onMouseover` | `MapMouseEvent` | | ||
| | `mouseout` | `onMouseout` | `MapMouseEvent` | | ||
| | `drag` | `onDrag` | `MapEvent` | | ||
| | `dragend` | `onDragend` | `MapEvent` | | ||
| | `dragstart` | `onDragstart` | `MapEvent` | | ||
| | `idle` | `onIdle` | `MapEvent` | | ||
| | `isfractionalzoomenabled_changed` | `onIsFractionalZoomEnabledChanged` | `MapEvent` | | ||
| | `mapcapabilities_changed` | `onMapCapabilitiesChanged` | `MapEvent` | | ||
| | `maptypeid_changed` | `onMapTypeIdChanged` | `MapEvent` | | ||
| | `renderingtype_changed` | `onRenderingTypeChanged` | `MapEvent` | | ||
| | `tilesloaded` | `onTilesLoaded` | `MapEvent` | | ||
|
|
||
| ## Context | ||
|
|
||
| The Map creates a context value `GoogleMapsContext` to be used by the hooks and | ||
| components in this library, containing a reference to the `google.maps.Map` | ||
| instance. | ||
|
|
||
| :::note | ||
|
|
||
| Client code should never need to interact with the context directly, always | ||
| use the corresponding hooks instead. | ||
| If you feel like you need to directly access the context, please file a | ||
| bug report about this. | ||
|
|
||
| ::: | ||
|
|
||
| ## Hooks | ||
|
|
||
| You can use the [`useMap()`](../hooks/use-map.md) hook in other components | ||
| to get access to the `google.maps.Map` object rendered in the `<Map>` component. | ||
|
|
||
| ## Source | ||
|
|
||
| [`./src/components/map`][map-source] | ||
|
|
||
| [gmp-map]: https://developers.google.com/maps/documentation/javascript/reference/map#Map | ||
| [gmp-map-options]: https://developers.google.com/maps/documentation/javascript/reference/map#MapOptions | ||
| [gmp-map-events]: https://developers.google.com/maps/documentation/javascript/reference/map#Map-Events | ||
| [gmp-llb]: https://developers.google.com/maps/documentation/javascript/reference/coordinates#LatLngBoundsLiteral | ||
| [gmp-ll]: https://developers.google.com/maps/documentation/javascript/reference/coordinates#LatLngLiteral | ||
| [gmp-coordinates]: https://developers.google.com/maps/documentation/javascript/coordinates | ||
| [api-provider]: ./api-provider.md | ||
| [get-max-tilt]: https://github.com/visgl/react-google-maps/blob/4319bd3b68c40b9aa9b0ce7f377b52d20e824849/src/libraries/limit-tilt-range.ts#L4-L19 | ||
| [map-source]: https://github.com/visgl/react-google-maps/tree/main/src/components/map |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.