PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Modify to navigate only on notification dots click

Browse source
This commit is contained in:
Jaiwanth 2021-05-20 10:55:22 +05:30
parent 3e8863fc9a
commit bf2d26ef21
5 changed files with 36 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/components/views/spaces/SpacePanel.tsx
View file

@ -74,7 +74,11 @@ const SpaceButton: React.FC<IButtonProps> = ({
let notifBadge;
if (notificationState) {
notifBadge = <div className="mx_SpacePanel_badgeContainer">
<NotificationBadge forceCount={false} notification={notificationState} />
<NotificationBadge
onClick={() => SpaceStore.instance.setActiveRoomInSpace(space)}
forceCount={false}
notification={notificationState}
/>
</div>;
}

6
src/components/views/spaces/SpaceTreeLevel.tsx
View file

@ -326,7 +326,11 @@ export class SpaceItem extends React.PureComponent<IItemProps, IItemState> {
let notifBadge;
if (notificationState) {
notifBadge = <div className="mx_SpacePanel_badgeContainer">
<NotificationBadge forceCount={false} notification={notificationState} />
<NotificationBadge
onClick={() => SpaceStore.instance.setActiveRoomInSpace(space)}
forceCount={false}
notification={notificationState}
/>
</div>;
}

35
src/stores/SpaceStore.tsx
View file

@ -108,6 +108,24 @@ export class SpaceStoreClass extends AsyncStoreWithClient<IState> {
return this._suggestedRooms;
}
public async setActiveRoomInSpace(space: Room | null) {
if (space && !space.isSpaceRoom()) return;
if (space !== this.activeSpace) await this.setActiveSpace(space);
const notificationState = space
? this.getNotificationState(space.roomId)
: RoomNotificationStateStore.instance.globalState;
if (notificationState.count) {
const roomId = notificationState.getFirstRoomWithNotifications();
defaultDispatcher.dispatch({
action: "view_room",
room_id: roomId,
context_switch: true,
});
}
}
/**
* Sets the active space, updates room list filters,
* optionally switches the user's room back to where they were when they last viewed that space.
@ -116,22 +134,7 @@ export class SpaceStoreClass extends AsyncStoreWithClient<IState> {
* should not be done when the space switch is done implicitly due to another event like switching room.
*/
public async setActiveSpace(space: Room | null, contextSwitch = true) {
if (space && !space.isSpaceRoom()) return;
if (space === this.activeSpace) {
const notificationState = space
? this.getNotificationState(space.roomId)
: RoomNotificationStateStore.instance.globalState;
if (notificationState.count) {
const roomId = notificationState.getRoomWithMaxNotifications();
defaultDispatcher.dispatch({
action: "view_room",
room_id: roomId,
context_switch: true,
});
}
return;
}
if (space === this.activeSpace || (space && !space.isSpaceRoom())) return;
this._activeSpace = space;
this.emit(UPDATE_SELECTED_SPACE, this.activeSpace);

5
src/stores/notifications/SpaceNotificationState.ts
View file

@ -53,9 +53,8 @@ export class SpaceNotificationState extends NotificationState {
this.calculateTotalState();
}
public getRoomWithMaxNotifications() {
return this.rooms.reduce((prev, curr) =>
(prev._notificationCounts.total > curr._notificationCounts.total ? prev : curr)).roomId;
public getFirstRoomWithNotifications() {
return this.rooms.find((room) => room._notificationCounts.total > 0).roomId;
}
public destroy() {

12
src/stores/notifications/SummarizedNotificationState.ts
View file

@ -16,7 +16,6 @@ limitations under the License.
import { NotificationColor } from "./NotificationColor";
import { NotificationState } from "./NotificationState";
import { Room } from "matrix-js-sdk/src/models/room";
import { RoomNotificationState } from "./RoomNotificationState";
/**
@ -27,13 +26,13 @@ import { RoomNotificationState } from "./RoomNotificationState";
*/
export class SummarizedNotificationState extends NotificationState {
private totalStatesWithUnread = 0;
unreadRooms: Room[];
private unreadRoomId: string;
constructor() {
super();
this._symbol = null;
this._count = 0;
this.unreadRooms = [];
this.unreadRoomId = null;
this._color = NotificationColor.None;
}
@ -41,9 +40,8 @@ export class SummarizedNotificationState extends NotificationState {
return this.totalStatesWithUnread;
}
public getRoomWithMaxNotifications() {
return this.unreadRooms.reduce((prev, curr) =>
(prev._notificationCounts.total > curr._notificationCounts.total ? prev : curr)).roomId;
public getFirstRoomWithNotifications() {
return this.unreadRoomId;
}
/**
@ -65,7 +63,7 @@ export class SummarizedNotificationState extends NotificationState {
this._color = other.color;
}
if (other.hasUnreadCount) {
this.unreadRooms.push(other.room);
this.unreadRoomId = !this.unreadRoomId ? other.room.roomId : this.unreadRoomId;
this.totalStatesWithUnread++;
}
}