Live location share - beacon tooltip in maximised view (#8572) PSF-926

* pass optional tooltip prop down through markers

Signed-off-by: Kerry Archibald <kerrya@element.io>

* add beaconstatustooltip, handle overflow on beacon status label

Signed-off-by: Kerry Archibald <kerrya@element.io>

* remove debug, fix mouseout

Signed-off-by: Kerry Archibald <kerrya@element.io>

* tidy comments

Signed-off-by: Kerry Archibald <kerrya@element.io>
This commit is contained in:
Kerry 2022-05-13 10:30:53 +02:00 committed by GitHub
parent fdd5494402
commit fbbb9c27ba
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
14 changed files with 271 additions and 118 deletions

View file

@ -148,83 +148,86 @@ exports[`<BeaconMarker /> renders marker when beacon has location 1`] = `
className="mx_Marker mx_Username_color4"
id="!room:server_@alice:server"
>
<div
className="mx_Marker_border"
>
<MemberAvatar
height={36}
member={
RoomMember {
"_events": Object {},
"_eventsCount": 0,
"_isOutOfBand": false,
"_maxListeners": undefined,
"_modified": 1647270879403,
"_requestedProfileInfo": undefined,
"disambiguate": false,
"events": Object {
"member": null,
},
"membership": null,
"name": "@alice:server",
"powerLevel": 0,
"powerLevelNorm": 0,
"rawDisplayName": "@alice:server",
"roomId": "!room:server",
"typing": false,
"user": null,
"userId": "@alice:server",
Symbol(kCapture): false,
}
}
resizeMethod="crop"
viewUserOnClick={false}
width={36}
<OptionalTooltip>
<div
className="mx_Marker_border"
>
<BaseAvatar
<MemberAvatar
height={36}
idName="@alice:server"
name="@alice:server"
hideTitle={false}
member={
RoomMember {
"_events": Object {},
"_eventsCount": 0,
"_isOutOfBand": false,
"_maxListeners": undefined,
"_modified": 1647270879403,
"_requestedProfileInfo": undefined,
"disambiguate": false,
"events": Object {
"member": null,
},
"membership": null,
"name": "@alice:server",
"powerLevel": 0,
"powerLevelNorm": 0,
"rawDisplayName": "@alice:server",
"roomId": "!room:server",
"typing": false,
"user": null,
"userId": "@alice:server",
Symbol(kCapture): false,
}
}
resizeMethod="crop"
title="@alice:server"
url={null}
viewUserOnClick={false}
width={36}
>
<span
className="mx_BaseAvatar"
role="presentation"
<BaseAvatar
height={36}
idName="@alice:server"
name="@alice:server"
resizeMethod="crop"
title="@alice:server"
url={null}
width={36}
>
<span
aria-hidden="true"
className="mx_BaseAvatar_initial"
style={
Object {
"fontSize": "23.400000000000002px",
"lineHeight": "36px",
"width": "36px",
}
}
className="mx_BaseAvatar"
role="presentation"
>
A
</span>
<img
alt=""
aria-hidden="true"
className="mx_BaseAvatar_image"
onError={[Function]}
src="data:image/png;base64,00"
style={
Object {
"height": "36px",
"width": "36px",
<span
aria-hidden="true"
className="mx_BaseAvatar_initial"
style={
Object {
"fontSize": "23.400000000000002px",
"lineHeight": "36px",
"width": "36px",
}
}
}
title="@alice:server"
/>
</span>
</BaseAvatar>
</MemberAvatar>
</div>
>
A
</span>
<img
alt=""
aria-hidden="true"
className="mx_BaseAvatar_image"
onError={[Function]}
src="data:image/png;base64,00"
style={
Object {
"height": "36px",
"width": "36px",
}
}
title="@alice:server"
/>
</span>
</BaseAvatar>
</MemberAvatar>
</div>
</OptionalTooltip>
</div>
</ForwardRef>
</span>

View file

@ -57,13 +57,15 @@ exports[`<LocationViewDialog /> renders map correctly 1`] = `
className="mx_Marker mx_Marker_defaultColor"
id="mx_LocationViewDialog_$2-marker"
>
<div
className="mx_Marker_border"
>
<OptionalTooltip>
<div
className="mx_Marker_icon"
/>
</div>
className="mx_Marker_border"
>
<div
className="mx_Marker_icon"
/>
</div>
</OptionalTooltip>
</div>
</ForwardRef>
</span>

View file

@ -8,13 +8,15 @@ exports[`<Marker /> renders with location icon when no room member 1`] = `
className="mx_Marker mx_Marker_defaultColor"
id="abc123"
>
<div
className="mx_Marker_border"
>
<OptionalTooltip>
<div
className="mx_Marker_icon"
/>
</div>
className="mx_Marker_border"
>
<div
className="mx_Marker_icon"
/>
</div>
</OptionalTooltip>
</div>
</ForwardRef>
`;

View file

@ -24,13 +24,15 @@ exports[`<SmartMarker /> creates a marker on mount 1`] = `
<div
className="mx_Marker mx_Marker_defaultColor"
>
<div
className="mx_Marker_border"
>
<OptionalTooltip>
<div
className="mx_Marker_icon"
/>
</div>
className="mx_Marker_border"
>
<div
className="mx_Marker_icon"
/>
</div>
</OptionalTooltip>
</div>
</ForwardRef>
</span>
@ -61,13 +63,15 @@ exports[`<SmartMarker /> removes marker on unmount 1`] = `
<div
className="mx_Marker mx_Marker_defaultColor"
>
<div
className="mx_Marker_border"
>
<OptionalTooltip>
<div
className="mx_Marker_icon"
/>
</div>
className="mx_Marker_border"
>
<div
className="mx_Marker_icon"
/>
</div>
</OptionalTooltip>
</div>
</ForwardRef>
</span>

View file

@ -167,13 +167,15 @@ exports[`MLocationBody <MLocationBody> without error renders map correctly 1`] =
className="mx_Marker mx_Marker_defaultColor"
id="mx_MLocationBody_$2_1f9acffa-marker"
>
<div
className="mx_Marker_border"
>
<OptionalTooltip>
<div
className="mx_Marker_icon"
/>
</div>
className="mx_Marker_border"
>
<div
className="mx_Marker_icon"
/>
</div>
</OptionalTooltip>
</div>
</ForwardRef>
</span>