Delint

matrix-org · Jul 29, 2022 · 394c261 · 394c261
1 parent 1af0476
commit 394c261
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 26 deletions.
diff --git a/src/@types/global.d.ts b/src/@types/global.d.ts
@@ -174,12 +174,7 @@ declare global {
     }
 
     interface HTMLDialogElement {
-        readonly open: boolean;
-        returnValue?: string;
         oncancel?(ev: Event);
-        show(): void;
-        showModal(): void;
-        close(returnValue?: string): void;
     }
 
     // Add Chrome-specific `instant` ScrollBehaviour

diff --git a/src/components/views/beacon/BeaconViewDialog.tsx b/src/components/views/beacon/BeaconViewDialog.tsx
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, { useState, useEffect } from 'react';
+import React, { useState, useEffect, useContext } from 'react';
 import {
     Beacon,
     Room,
@@ -136,7 +136,8 @@ const BeaconViewDialog: React.FC<IProps> = ({
                 id='mx_BeaconViewDialog'
                 bounds={bounds}
                 centerGeoUri={centerGeoUri}
-                interactiveonError={setMapDisplayError}
+                interactive
+                onError={setMapDisplayError}
                 className="mx_BeaconViewDialog_map"
             >
                 {
@@ -152,26 +153,25 @@ const BeaconViewDialog: React.FC<IProps> = ({
                         </>
                 }
             </Map> }
-                { mapDisplayError &&
-                    <MapError
-                        error={mapDisplayError.message as LocationShareError}
-                        isMinimised
-                    />
-                }
-                { !centerGeoUri && !mapDisplayError &&<MapFallback
-                    data-test-id='beacon-view-dialog-map-fallback'
-                    className='mx_BeaconViewDialog_map'
-                >
-                    <span className='mx_BeaconViewDialog_mapFallbackMessage'>{ _t('No live locations') }</span>
-                    <AccessibleButton
-                        kind='primary'
-                        onClick={onFinished}
-                        data-test-id='beacon-view-dialog-fallback-close'
-                    >
-                        { _t('Close') }
-                    </AccessibleButton>
-                </MapFallback>
+            { mapDisplayError &&
+                <MapError
+                    error={mapDisplayError.message as LocationShareError}
+                    isMinimised
+                />
             }
+            { !centerGeoUri && !mapDisplayError && <MapFallback
+                data-test-id='beacon-view-dialog-map-fallback'
+                className='mx_BeaconViewDialog_map'
+            >
+                <span className='mx_BeaconViewDialog_mapFallbackMessage'>{ _t('No live locations') }</span>
+                <AccessibleButton
+                    kind='primary'
+                    onClick={onFinished}
+                    data-test-id='beacon-view-dialog-fallback-close'
+                >
+                    { _t('Close') }
+                </AccessibleButton>
+            </MapFallback> }
             { isSidebarOpen ?
                 <DialogSidebar beacons={liveBeacons} onBeaconClick={onBeaconListItemClick}requestClose={() => setSidebarOpen(false)} /> :
                 <AccessibleButton