Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add ellipsis effect to hidden beacon status #8755

Merged
merged 1 commit into from
Jun 5, 2022
Merged

Add ellipsis effect to hidden beacon status #8755

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions res/css/components/views/beacon/_BeaconStatus.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,11 @@ limitations under the License.

white-space: nowrap;
overflow: hidden;

.mx_BeaconStatus_description_status {
text-overflow: ellipsis;
overflow: hidden;
}
}

.mx_BeaconStatus_expiryTime {
Expand Down
14 changes: 9 additions & 5 deletions src/components/views/beacon/BeaconStatus.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,15 @@ const BeaconStatus: React.FC<Props & HTMLProps<HTMLDivElement>> =
/> }
<div className='mx_BeaconStatus_description'>

{ displayStatus === BeaconDisplayStatus.Loading && <span>{ _t('Loading live location...') }</span> }
{ displayStatus === BeaconDisplayStatus.Stopped && <span>{ _t('Live location ended') }</span> }

{ displayStatus === BeaconDisplayStatus.Error && <span>{ _t('Live location error') }</span> }

{ displayStatus === BeaconDisplayStatus.Loading &&
<span className="mx_BeaconStatus_description_status">{ _t('Loading live location...') }</span>
}
{ displayStatus === BeaconDisplayStatus.Stopped &&
<span className="mx_BeaconStatus_description_status">{ _t('Live location ended') }</span>
}
{ displayStatus === BeaconDisplayStatus.Error &&
<span className="mx_BeaconStatus_description_status">{ _t('Live location error') }</span>
}
{ displayStatus === BeaconDisplayStatus.Active && beacon && <>
<>
<span className='mx_BeaconStatus_label'>{ label }</span>
Expand Down
8 changes: 6 additions & 2 deletions test/components/views/beacon/__snapshots__/BeaconStatus-test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,9 @@ exports[`<BeaconStatus /> renders loading state 1`] = `
<div
className="mx_BeaconStatus_description"
>
<span>
<span
className="mx_BeaconStatus_description_status"
>
Loading live location...
</span>
</div>
Expand Down Expand Up @@ -165,7 +167,9 @@ exports[`<BeaconStatus /> renders stopped state 1`] = `
<div
className="mx_BeaconStatus_description"
>
<span>
<span
className="mx_BeaconStatus_description_status"
>
Live location ended
</span>
</div>
Expand Down
4 changes: 3 additions & 1 deletion test/components/views/beacon/__snapshots__/OwnBeaconStatus-test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@ exports[`<OwnBeaconStatus /> renders without a beacon instance 1`] = `
<div
className="mx_BeaconStatus_description"
>
<span>
<span
className="mx_BeaconStatus_description_status"
>
Loading live location...
</span>
</div>
Expand Down