OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Sort the pinning message list in the same order than the banner (#12937)

dbkr/sss
Florian Duros 2024-08-30 16:57:30 +02:00 committed by GitHub
parent 19f8b44745
commit 13ec19c22e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/views/right_panel/PinnedMessagesCard.tsx
View File

@ -34,7 +34,7 @@ import { filterBoolean } from "../../../utils/arrays";
import Modal from "../../../Modal"; import Modal from "../../../Modal";
import { UnpinAllDialog } from "../dialogs/UnpinAllDialog"; import { UnpinAllDialog } from "../dialogs/UnpinAllDialog";
import EmptyState from "./EmptyState"; import EmptyState from "./EmptyState";
import { useFetchedPinnedEvents, usePinnedEvents, useReadPinnedEvents } from "../../../hooks/usePinnedEvents"; import { usePinnedEvents, useReadPinnedEvents, useSortedFetchedPinnedEvents } from "../../../hooks/usePinnedEvents";
/** /**
* List the pinned messages in a room inside a Card. * List the pinned messages in a room inside a Card.
@ -59,7 +59,7 @@ export function PinnedMessagesCard({ room, onClose, permalinkCreator }: PinnedMe
const roomContext = useRoomContext(); const roomContext = useRoomContext();
const pinnedEventIds = usePinnedEvents(room); const pinnedEventIds = usePinnedEvents(room);
const readPinnedEvents = useReadPinnedEvents(room); const readPinnedEvents = useReadPinnedEvents(room);
const pinnedEvents = useFetchedPinnedEvents(room, pinnedEventIds); const pinnedEvents = useSortedFetchedPinnedEvents(room, pinnedEventIds);
useEffect(() => { useEffect(() => {
if (!cli || cli.isGuest()) return; // nothing to do if (!cli || cli.isGuest()) return; // nothing to do

2
test/components/views/right_panel/PinnedMessagesCard-test.tsx
View File

@ -165,12 +165,14 @@ describe("<PinnedMessagesCard />", () => {
room: "!room:example.org", room: "!room:example.org",
user: "@alice:example.org", user: "@alice:example.org",
msg: "First pinned message", msg: "First pinned message",
ts: 2,
}); });
const pin2 = mkMessage({ const pin2 = mkMessage({
event: true, event: true,
room: "!room:example.org", room: "!room:example.org",
user: "@alice:example.org", user: "@alice:example.org",
msg: "The second one", msg: "The second one",
ts: 1,
}); });
it("should show spinner whilst loading", async () => { it("should show spinner whilst loading", async () => {

8
test/components/views/right_panel/__snapshots__/PinnedMessagesCard-test.tsx.snap
View File

@ -184,7 +184,7 @@ exports[`<PinnedMessagesCard /> should show two pinned messages 1`] = `
class="mx_EventTile_body translate" class="mx_EventTile_body translate"
dir="auto" dir="auto"
> >
The second one First pinned message
</div> </div>
</div> </div>
</div> </div>
@ -250,7 +250,7 @@ exports[`<PinnedMessagesCard /> should show two pinned messages 1`] = `
class="mx_EventTile_body translate" class="mx_EventTile_body translate"
dir="auto" dir="auto"
> >
First pinned message The second one
</div> </div>
</div> </div>
</div> </div>
@ -379,7 +379,7 @@ exports[`<PinnedMessagesCard /> unpin all should not allow to unpinall 1`] = `
class="mx_EventTile_body translate" class="mx_EventTile_body translate"
dir="auto" dir="auto"
> >
The second one First pinned message
</div> </div>
</div> </div>
</div> </div>
@ -445,7 +445,7 @@ exports[`<PinnedMessagesCard /> unpin all should not allow to unpinall 1`] = `
class="mx_EventTile_body translate" class="mx_EventTile_body translate"
dir="auto" dir="auto"
> >
First pinned message The second one
</div> </div>
</div> </div>
</div> </div>