Add ellipsis effect to hidden beacon status (matrix-org#8755)

JanBurp · Jun 14, 2022 · 8a891a6 · 8a891a6
1 parent 30a820f
commit 8a891a6
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 8 deletions.
diff --git a/res/css/components/views/beacon/_BeaconStatus.scss b/res/css/components/views/beacon/_BeaconStatus.scss
@@ -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 {

diff --git a/src/components/views/beacon/BeaconStatus.tsx b/src/components/views/beacon/BeaconStatus.tsx
@@ -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>

diff --git a/test/components/views/beacon/__snapshots__/BeaconStatus-test.tsx.snap b/test/components/views/beacon/__snapshots__/BeaconStatus-test.tsx.snap
@@ -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>
@@ -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>

diff --git a/test/components/views/beacon/__snapshots__/OwnBeaconStatus-test.tsx.snap b/test/components/views/beacon/__snapshots__/OwnBeaconStatus-test.tsx.snap
@@ -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>