-
- ;
+ return
-
-
-
-
-
-
- { title }
-
-
- { _t("You can select all or individual messages to retry or delete") }
-
-
- { buttonRow }
-
-
+
+ );
+};
diff --git a/src/components/views/beacon/BeaconListItem.tsx b/src/components/views/beacon/BeaconListItem.tsx
index bcfb497176..414b45a7f7 100644
--- a/src/components/views/beacon/BeaconListItem.tsx
+++ b/src/components/views/beacon/BeaconListItem.tsx
@@ -14,13 +14,14 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
-import React, { useContext } from 'react';
+import React, { HTMLProps, useContext } from 'react';
import { Beacon, BeaconEvent } from 'matrix-js-sdk/src/matrix';
import { LocationAssetType } from 'matrix-js-sdk/src/@types/location';
import MatrixClientContext from '../../../contexts/MatrixClientContext';
import { useEventEmitterState } from '../../../hooks/useEventEmitter';
import { humanizeTime } from '../../../utils/humanize';
+import { preventDefaultWrapper } from '../../../utils/NativeEventUtils';
import { _t } from '../../../languageHandler';
import MemberAvatar from '../avatars/MemberAvatar';
import BeaconStatus from './BeaconStatus';
@@ -32,7 +33,7 @@ interface Props {
beacon: Beacon;
}
-const BeaconListItem: React.FC
+
+
+
+
+
+
+ { props.title }
+
+ {
+ props.description &&
+
+ { props.description }
+
+ }
+
+ { props.buttons }
+
+ {})}>
+
{ _t("Updated %(humanizedUpdateTime)s", { humanizedUpdateTime }) }
diff --git a/src/components/views/beacon/BeaconViewDialog.tsx b/src/components/views/beacon/BeaconViewDialog.tsx
index af21c64339..50a880c1b3 100644
--- 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, useRef, useEffect } from 'react';
+import React, { useState, useEffect } from 'react';
import { MatrixClient } from 'matrix-js-sdk/src/client';
import {
Beacon,
@@ -45,7 +45,16 @@ interface IProps extends IDialogProps {
roomId: Room['roomId'];
matrixClient: MatrixClient;
// open the map centered on this beacon's location
- focusBeacon?: Beacon;
+ initialFocusedBeacon?: Beacon;
+}
+
+// track the 'focused time' as ts
+// to make it possible to refocus the same beacon
+// as the beacon location may change
+// or the map may move around
+interface FocusedBeaconState {
+ ts: number;
+ beacon?: Beacon;
}
const getBoundsCenter = (bounds: Bounds): string | undefined => {
@@ -59,31 +68,52 @@ const getBoundsCenter = (bounds: Bounds): string | undefined => {
});
};
-const useInitialMapPosition = (liveBeacons: Beacon[], focusBeacon?: Beacon): {
+const useInitialMapPosition = (liveBeacons: Beacon[], { beacon, ts }: FocusedBeaconState): {
bounds?: Bounds; centerGeoUri: string;
} => {
- const bounds = useRef-
- { beacons.map((beacon) =>
{ room.name }
-{ _t("This is the beginning of your direct message history with
{ _t(introMessage, {}, { displayName: () => { displayName }, }) }
{ caption &&{ caption }
} @@ -200,7 +209,7 @@ const NewRoomIntro = () => { ); let subButton; - if (room.currentState.mayClientSendStateEvent(EventType.RoomEncryption, MatrixClientPeg.get())) { + if (room.currentState.mayClientSendStateEvent(EventType.RoomEncryption, MatrixClientPeg.get()) && !isLocalRoom) { subButton = (
- { _t("(~%(count)s results)", { count: this.props.searchInfo.searchCount }) }
-
;
- }
-
- // XXX: this is a bit inefficient - we could just compare room.name for 'Empty room'...
- let settingsHint = false;
- const members = this.props.room ? this.props.room.getJoinedMembers() : undefined;
- if (members) {
- if (members.length === 1 && members[0].userId === MatrixClientPeg.get().credentials.userId) {
- const nameEvent = this.props.room.currentState.getStateEvents('m.room.name', '');
- if (!nameEvent || !nameEvent.getContent().name) {
- settingsHint = true;
- }
- }
- }
-
- let oobName = _t("Join Room");
- if (this.props.oobData && this.props.oobData.name) {
- oobName = this.props.oobData.name;
- }
-
- let contextMenu: JSX.Element;
- if (this.state.contextMenuPosition && this.props.room) {
- contextMenu = (
- { roomName }
;
- } }
-
- { buttons }
+ return buttons;
+ }
+
+ private renderName(oobName) {
+ let contextMenu: JSX.Element;
+ if (this.state.contextMenuPosition && this.props.room) {
+ contextMenu = (
+
+ { (name) => {
+ const roomName = name || oobName;
+ return ;
+
+ if (this.props.enableRoomOptionsMenu) {
+ return (
+
+ { roomName }
+ { this.props.room && }
+ { contextMenu }
+
+ );
+ }
+
+ return
+ ;
+ }
const e2eIcon = this.props.e2eStatus ? {
{ searchStatus }
{ topicElement }
{ betaPill }
- { rightRow }
-
{ roomName }
;
+ } }
+
+ { roomName }
+
;
+ }
+
+ public render() {
+ let searchStatus = null;
+
+ // don't display the search count until the search completes and
+ // gives us a valid (possibly zero) searchCount.
+ if (this.props.searchInfo &&
+ this.props.searchInfo.searchCount !== undefined &&
+ this.props.searchInfo.searchCount !== null) {
+ searchStatus =
+ { _t("(~%(count)s results)", { count: this.props.searchInfo.searchCount }) }
;
+ }
+
+ let oobName = _t("Join Room");
+ if (this.props.oobData && this.props.oobData.name) {
+ oobName = this.props.oobData.name;
+ }
+
+ const name = this.renderName(oobName);
+
+ const topicElement =
+ { this.renderButtons() }
+
+ { buttonsText }
;
+
+ beforeEach(() => {
+ render(
+ -
+
-
+
+
+
+
+ ++++ + Updated a few seconds ago + ++ + @alice:server.org + + + Live until 16:14 + +++++ + + +++ ++
+
+
-
+ );
+
`;
diff --git a/test/components/views/dialogs/SpotlightDialog-test.tsx b/test/components/views/dialogs/SpotlightDialog-test.tsx
index 7c8bbc6bc7..c2445139a7 100644
--- a/test/components/views/dialogs/SpotlightDialog-test.tsx
+++ b/test/components/views/dialogs/SpotlightDialog-test.tsx
@@ -14,8 +14,9 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
-import { mount } from "enzyme";
-import { IProtocol, IPublicRoomsChunkRoom, MatrixClient, RoomMember } from "matrix-js-sdk/src/matrix";
+import { mount, ReactWrapper } from "enzyme";
+import { mocked } from "jest-mock";
+import { IProtocol, IPublicRoomsChunkRoom, MatrixClient, Room, RoomMember } from "matrix-js-sdk/src/matrix";
import { sleep } from "matrix-js-sdk/src/utils";
import React from "react";
import { act } from "react-dom/test-utils";
@@ -23,7 +24,15 @@ import sanitizeHtml from "sanitize-html";
import SpotlightDialog, { Filter } from "../../../../src/components/views/dialogs/spotlight/SpotlightDialog";
import { MatrixClientPeg } from "../../../../src/MatrixClientPeg";
-import { stubClient } from "../../../test-utils";
+import { LocalRoom, LOCAL_ROOM_ID_PREFIX } from "../../../../src/models/LocalRoom";
+import DMRoomMap from "../../../../src/utils/DMRoomMap";
+import { mkRoom, stubClient } from "../../../test-utils";
+
+jest.mock("../../../../src/utils/direct-messages", () => ({
+ // @ts-ignore
+ ...jest.requireActual("../../../../src/utils/direct-messages"),
+ startDmOnFirstMessage: jest.fn(),
+}));
interface IUserChunkMember {
user_id: string;
@@ -110,10 +119,23 @@ describe("Spotlight Dialog", () => {
guest_can_join: false,
};
- beforeEach(() => {
- mockClient({ rooms: [testPublicRoom], users: [testPerson] });
- });
+ let testRoom: Room;
+ let testLocalRoom: LocalRoom;
+ let mockedClient: MatrixClient;
+
+ beforeEach(() => {
+ mockedClient = mockClient({ rooms: [testPublicRoom], users: [testPerson] });
+ testRoom = mkRoom(mockedClient, "!test23:example.com");
+ mocked(testRoom.getMyMembership).mockReturnValue("join");
+ testLocalRoom = new LocalRoom(LOCAL_ROOM_ID_PREFIX + "test23", mockedClient, mockedClient.getUserId());
+ testLocalRoom.updateMyMembership("join");
+ mocked(mockedClient.getVisibleRooms).mockReturnValue([testRoom, testLocalRoom]);
+
+ jest.spyOn(DMRoomMap, "shared").mockReturnValue({
+ getUserIdForRoomId: jest.fn(),
+ } as unknown as DMRoomMap);
+ });
describe("should apply filters supplied via props", () => {
it("without filter", async () => {
const wrapper = mount(
@@ -289,4 +311,38 @@ describe("Spotlight Dialog", () => {
wrapper.unmount();
});
});
+
+ describe("searching for rooms", () => {
+ let wrapper: ReactWrapper;
+ let options: ReactWrapper;
+
+ beforeAll(async () => {
+ wrapper = mount(
+