Live location sharing - basic maximised beacon map (#8310)
* open a dialog with map centered around first beacon Signed-off-by: Kerry Archibald <kerrya@element.io> * add room member markers Signed-off-by: Kerry Archibald <kerrya@element.io> * fix unmount issue in smart marker Signed-off-by: Kerry Archibald <kerrya@element.io> * dont throw on no more live locations Signed-off-by: Kerry Archibald <kerrya@element.io> * cursor on beacon maps Signed-off-by: Kerry Archibald <kerrya@element.io> * fussy import ordering Signed-off-by: Kerry Archibald <kerrya@element.io> * test dialog opening from beacon body Signed-off-by: Kerry Archibald <kerrya@element.io> * test beaconmarker Signed-off-by: Kerry Archibald <kerrya@element.io> * test BeaconViewDialog Signed-off-by: Kerry Archibald <kerrya@element.io> * comment Signed-off-by: Kerry Archibald <kerrya@element.io> * use unstable prefix for wk tile_Server Signed-off-by: Kerry Archibald <kerrya@element.io> * unstable prefix for new m.tile_server use in test Signed-off-by: Kerry Archibald <kerrya@element.io>
This commit is contained in:
parent
1c215e2b71
commit
f95106d2c6
20 changed files with 894 additions and 56 deletions
|
@ -72,12 +72,21 @@ interface SmartMarkerProps {
|
|||
const SmartMarker: React.FC<SmartMarkerProps> = ({ id, map, geoUri, roomMember, useMemberColor }) => {
|
||||
const { onElementRef } = useMapMarker(map, geoUri);
|
||||
|
||||
return <Marker
|
||||
ref={onElementRef}
|
||||
id={id}
|
||||
roomMember={roomMember}
|
||||
useMemberColor={useMemberColor}
|
||||
/>;
|
||||
return (
|
||||
// maplibregl hijacks the Marker dom element
|
||||
// and removes it from the dom when the maplibregl.Marker instance
|
||||
// is removed
|
||||
// wrap in a span so that react doesn't get confused
|
||||
// when trying to unmount this component
|
||||
<span>
|
||||
<Marker
|
||||
ref={onElementRef}
|
||||
id={id}
|
||||
roomMember={roomMember}
|
||||
useMemberColor={useMemberColor}
|
||||
/>
|
||||
</span>
|
||||
);
|
||||
};
|
||||
|
||||
export default SmartMarker;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue