imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Live location share - show loading UI for beacons with start timestamp in the future (PSF-1081) (#8775)

Browse source 
* check for beacons that are yet to start and show loading ui

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

* update snapshots for js-sdk rename

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

* remove debug

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

* Update test/components/views/messages/MBeaconBody-test.tsx

Co-authored-by: Travis Ralston <travisr@matrix.org>

* Update src/components/views/beacon/displayStatus.ts

Co-authored-by: Travis Ralston <travisr@matrix.org>

Co-authored-by: Travis Ralston <travisr@matrix.org>
This commit is contained in:
Kerry 2022-06-09 14:25:30 +02:00 • committed by GitHub
parent 1d79c78f21
commit 2bdb4d396a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 37 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/components/views/messages/MBeaconBody.tsx
View file

@ -23,7 +23,7 @@ import MatrixClientContext from '../../../contexts/MatrixClientContext';
import { useEventEmitterState } from '../../../hooks/useEventEmitter';
import { _t } from '../../../languageHandler';
import Modal from '../../../Modal';
import { useBeacon } from '../../../utils/beacon';
import { isBeaconWaitingToStart, useBeacon } from '../../../utils/beacon';
import { isSelfLocation } from '../../../utils/location';
import { BeaconDisplayStatus, getBeaconDisplayStatus } from '../beacon/displayStatus';
import BeaconStatus from '../beacon/BeaconStatus';
@ -39,6 +39,7 @@ const useBeaconState = (beaconInfoEvent: MatrixEvent): {
description?: string;
latestLocationState?: BeaconLocationState;
isLive?: boolean;
waitingToStart?: boolean;
} => {
const beacon = useBeacon(beaconInfoEvent);
@ -56,12 +57,19 @@ const useBeaconState = (beaconInfoEvent: MatrixEvent): {
return {};
}
// a beacon's starting timestamp can be in the future
// (either from small deviations in system clock times, or on purpose from another client)
// a beacon is only live between its start timestamp and expiry
// detect when a beacon is waiting to become live
// and display a loading state
const waitingToStart = !!beacon && isBeaconWaitingToStart(beacon);
const { description } = beacon.beaconInfo;
return {
beacon,
description,
isLive,
waitingToStart,
latestLocationState,
};
};
@ -84,12 +92,13 @@ const MBeaconBody: React.FC<IBodyProps> = React.forwardRef(({ mxEvent }, ref) =>
beacon,
isLive,
latestLocationState,
waitingToStart,
} = useBeaconState(mxEvent);
const mapId = useUniqueId(mxEvent.getId());
const matrixClient = useContext(MatrixClientContext);
const [error, setError] = useState<Error>();
const displayStatus = getBeaconDisplayStatus(isLive, latestLocationState, error);
const displayStatus = getBeaconDisplayStatus(isLive, latestLocationState, error, waitingToStart);
const markerRoomMember = isSelfLocation(mxEvent.getContent()) ? mxEvent.sender : undefined;
const isOwnBeacon = beacon?.beaconInfoOwner === matrixClient.getUserId();