mirrors/element-web
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2026-05-05 04:06:44 +02:00
Code Issues Projects Releases Wiki Activity

Iterate

Browse Source
This commit is contained in:
Michael Telatynski 2026-04-28 12:15:11 +01:00
parent 2ad73c1eb7
commit f50669dfa3
No known key found for this signature in database
GPG Key ID: A2B008A5F49F5D0D
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/web/src/emojipicker/recent.ts
View File

@ -73,6 +73,6 @@ export function get(limit = 24): string[] {
const recents = getRecentEmoji();
// perform a stable sort on `count` to keep the recent (date) order as a secondary sort factor
const sorted = orderBy(recents, "1", "desc");
const sorted = orderBy(recents, "total", "desc");
return sorted.slice(0, limit).map(({ emoji }) => emoji);
}

23
apps/web/test/unit-tests/components/views/emojipicker/EmojiPicker-test.tsx
View File

@ -13,6 +13,7 @@ import userEvent from "@testing-library/user-event";
import EmojiPicker from "../../../../../src/components/views/emojipicker/EmojiPicker";
import { stubClient } from "../../../../test-utils";
import SettingsStore from "../../../../../src/settings/SettingsStore";
import { SettingLevel } from "../../../../../src/settings/SettingLevel.ts";
describe("EmojiPicker", function () {
stubClient();
@ -23,10 +24,7 @@ describe("EmojiPicker", function () {
beforeEach(() => {
// Clear recent emojis to prevent test pollution
jest.spyOn(SettingsStore, "getValue").mockImplementation((settingName) => {
if (settingName === "recent_emoji") return [] as any;
return jest.requireActual("../../../../../src/settings/SettingsStore").default.getValue(settingName);
});
SettingsStore.reset();
});
afterEach(() => {
@ -98,10 +96,11 @@ describe("EmojiPicker", function () {
it("should initialize categories with recent as firstVisible when recent emojis exist", () => {
// Mock recent emojis
jest.spyOn(SettingsStore, "getValue").mockImplementation((settingName) => {
if (settingName === "recent_emoji") return ["😀", "🎉", "❤️"] as any;
return jest.requireActual("../../../../../src/settings/SettingsStore").default.getValue(settingName);
});
SettingsStore.setValue("recent_emoji", null, SettingLevel.ACCOUNT, [
{ emoji: "😀", total: 3 },
{ emoji: "🎉", total: 2 },
{ emoji: "❤️", total: 2 },
]);
const ref = createRef<EmojiPicker>();
render(<EmojiPicker ref={ref} onChoose={(str: string) => false} onFinished={jest.fn()} />);
@ -394,10 +393,10 @@ describe("EmojiPicker", function () {
it("check tabindex for recent category when recent emojis exist", async () => {
// Mock recent emojis
jest.spyOn(SettingsStore, "getValue").mockImplementation((settingName) => {
if (settingName === "recent_emoji") return ["😀", "🎉"] as any;
return jest.requireActual("../../../../../src/settings/SettingsStore").default.getValue(settingName);
});
SettingsStore.setValue("recent_emoji", null, SettingLevel.ACCOUNT, [
{ emoji: "😀", total: 3 },
{ emoji: "🎉", total: 2 },
]);
const { container } = render(<EmojiPicker onChoose={jest.fn()} onFinished={jest.fn()} />);