Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Control currently viewed event via RoomViewStore #1058

Merged
merged 19 commits into from
Jun 8, 2017
Merged

Control currently viewed event via RoomViewStore #1058

Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
d3cf78f
Control currently viewied event via RoomViewStore
Jun 8, 2017
f320f7d
Remove redundant action id
Jun 8, 2017
ea97d16
Merge branch 'develop' into luke/fix-event-id-state
Jun 8, 2017
aa20ad7
Remove redundant `currentRoomAlias`
Jun 8, 2017
8ddc38c
Doc _viewRoom highlighted
Jun 8, 2017
2e82bf4
Explain setting of highlighted in room/$eventId showScreen handling.
Jun 8, 2017
dca2be6
Add RoomView initial state and docs
Jun 8, 2017
e58e4db
Explain why search results are cleared when eventId changes
Jun 8, 2017
59e649f
Add comment about roomId potentially not being resolved following an …
Jun 8, 2017
1792fa4
Null-guard roomId before sending a dispatch to update scroll state
Jun 8, 2017
000a045
Rename RVS state (event -> initialEvent) and redocument
Jun 8, 2017
36f72cc
Don't alter members of payload (when defaulting an event to scroll to…
Jun 8, 2017
1ff2be1
Update docs for RVS
Jun 8, 2017
c02dbd1
Rename initial state variables
Jun 8, 2017
8cfdb4c
Clarify initial event
Jun 8, 2017
cd8093d
Explicit undefined initialEventPixelOffset
Jun 8, 2017
c72edab
Update doc for getInitialEventId
Jun 8, 2017
9892566
Highlighted means highlighted
Jun 8, 2017
5588e11
Clarify doc for highlighted
Jun 8, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/components/structures/MatrixChat.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1119,7 +1119,9 @@ module.exports = React.createClass({
const payload = {
action: 'view_room',
event_id: eventId,
// If an event ID is set (truthy), mark it as highlighted
// If an event ID is given in the URL hash, notify RoomViewStore to mark
// it as highlighted, which will propagate to RoomView and highlight the
// associated EventTile.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

perfect ⭐

highlighted: Boolean(eventId),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

comment to explain what's going on here would be helpful

third_party_invite: thirdPartyInvite,
oob_data: oobData,
Expand Down