This repository has been archived by the owner on Sep 11, 2024. It is now read-only.
-
-
Notifications
You must be signed in to change notification settings - Fork 832
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Live location sharing - consolidate maps (#8236)
* extract location markers into generic Marker Signed-off-by: Kerry Archibald <kerrya@element.io> * wrap marker in smartmarker Signed-off-by: Kerry Archibald <kerrya@element.io> * test smartmarker Signed-off-by: Kerry Archibald <kerrya@element.io> * working map in location body Signed-off-by: Kerry Archibald <kerrya@element.io> * test Map Signed-off-by: Kerry Archibald <kerrya@element.io> * remove skinned sdk Signed-off-by: Kerry Archibald <kerrya@element.io> * update snaps with new mocks Signed-off-by: Kerry Archibald <kerrya@element.io> * use new ZoomButtons in MLocationBody Signed-off-by: Kerry Archibald <kerrya@element.io> * make LocationViewDialog map interactive Signed-off-by: Kerry Archibald <kerrya@element.io> * test MLocationBody Signed-off-by: Kerry Archibald <kerrya@element.io> * test LocationViewDialog Signed-off-by: Kerry Archibald <kerrya@element.io> * add copyrights, shrink snapshot Signed-off-by: Kerry Archibald <kerrya@element.io> * update comment Signed-off-by: Kerry Archibald <kerrya@element.io> * lint Signed-off-by: Kerry Archibald <kerrya@element.io> * lint Signed-off-by: Kerry Archibald <kerrya@element.io>
- Loading branch information
Kerry
committed
Apr 11, 2022
1 parent
944e11d
commit 9ba55d1
Showing
16 changed files
with
889 additions
and
234 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
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 |
|---|---|---|
| @@ -0,0 +1,101 @@ | ||
| /* | ||
| Copyright 2022 The Matrix.org Foundation C.I.C. | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| import React, { ReactNode, useContext, useEffect } from 'react'; | ||
| import classNames from 'classnames'; | ||
| import { ClientEvent, IClientWellKnown } from 'matrix-js-sdk/src/matrix'; | ||
| import { logger } from 'matrix-js-sdk/src/logger'; | ||
|
|
||
| import MatrixClientContext from '../../../contexts/MatrixClientContext'; | ||
| import { useEventEmitterState } from '../../../hooks/useEventEmitter'; | ||
| import { parseGeoUri } from '../../../utils/location'; | ||
| import { tileServerFromWellKnown } from '../../../utils/WellKnownUtils'; | ||
| import { useMap } from '../../../utils/location/useMap'; | ||
|
|
||
| const useMapWithStyle = ({ id, centerGeoUri, onError, interactive }) => { | ||
| const bodyId = `mx_Map_${id}`; | ||
|
|
||
| // style config | ||
| const context = useContext(MatrixClientContext); | ||
| const mapStyleUrl = useEventEmitterState( | ||
| context, | ||
| ClientEvent.ClientWellKnown, | ||
| (clientWellKnown: IClientWellKnown) => tileServerFromWellKnown(clientWellKnown)?.["map_style_url"], | ||
| ); | ||
|
|
||
| const map = useMap({ interactive, bodyId, onError }); | ||
|
|
||
| useEffect(() => { | ||
| if (mapStyleUrl && map) { | ||
| map.setStyle(mapStyleUrl); | ||
| } | ||
| }, [mapStyleUrl, map]); | ||
|
|
||
| useEffect(() => { | ||
| if (map && centerGeoUri) { | ||
| try { | ||
| const coords = parseGeoUri(centerGeoUri); | ||
| map.setCenter({ lon: coords.longitude, lat: coords.latitude }); | ||
| } catch (error) { | ||
| logger.error('Could not set map center', centerGeoUri); | ||
| } | ||
| } | ||
| }, [map, centerGeoUri]); | ||
|
|
||
| return { | ||
| map, | ||
| bodyId, | ||
| }; | ||
| }; | ||
|
|
||
| interface MapProps { | ||
| id: string; | ||
| interactive?: boolean; | ||
| centerGeoUri?: string; | ||
| className?: string; | ||
| onClick?: () => void; | ||
| onError?: (error: Error) => void; | ||
| children?: (renderProps: { | ||
| map: maplibregl.Map; | ||
| }) => ReactNode; | ||
| } | ||
|
|
||
| const Map: React.FC<MapProps> = ({ | ||
| centerGeoUri, className, id, onError, onClick, children, interactive, | ||
| }) => { | ||
| const { map, bodyId } = useMapWithStyle({ centerGeoUri, onError, id, interactive }); | ||
|
|
||
| const onMapClick = ( | ||
| event: React.MouseEvent<HTMLDivElement, MouseEvent>, | ||
| ) => { | ||
| // Eat click events when clicking the attribution button | ||
| const target = event.target as Element; | ||
| if (target.classList.contains("maplibregl-ctrl-attrib-button")) { | ||
| return; | ||
| } | ||
|
|
||
| onClick && onClick(); | ||
| }; | ||
|
|
||
| return <div className={classNames('mx_Map', className)} | ||
| id={bodyId} | ||
| onClick={onMapClick} | ||
| > | ||
| { !!children && !!map && children({ map }) } | ||
| </div>; | ||
| }; | ||
|
|
||
| export default Map; |
Oops, something went wrong.