Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .changeset/hide-single-reaction-count.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
default: minor
---

Adds an opt-in "Hide Single Reaction Counts" setting that removes the count numeral from reaction chips with only one participant. Useful when bot reactions clutter the timeline.
6 changes: 6 additions & 0 deletions src/app/components/message/Reaction.css.ts
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,12 @@ export const Reaction = style([
},
]);

// Declared after Reaction so it wins the cascade tie and rebalances the
// right-side padding that was sized for the trailing count numeral.
export const ReactionNoCount = style({
padding: `${toRem(2)} ${config.space.S100} ${toRem(2)} ${config.space.S100}`,
});

export const ReactionText = style([
DefaultReset,
{
Expand Down
71 changes: 71 additions & 0 deletions src/app/components/message/Reaction.test.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
import { render, screen } from '@testing-library/react';
import { beforeEach, describe, expect, it, vi } from 'vitest';
import type { MatrixClient } from '$types/matrix-sdk';
import { useSetting } from '$state/hooks/settings';
import * as css from './Reaction.css';
import { Reaction } from './Reaction';

vi.mock(import('$state/settings'), async (importOriginal) => ({
...(await importOriginal()),
settingsAtom: {} as never,
}));

vi.mock('$state/hooks/settings', () => ({
useSetting: vi.fn<typeof useSetting>(),
}));

const defaultSettingValues: Record<string, unknown> = {
hideSingleReactionCount: false,
};

describe('Reaction', () => {
beforeEach(() => {
vi.mocked(useSetting).mockImplementation(((_atom: unknown, key: string) => {
return [defaultSettingValues[key], vi.fn<() => void>()] as never;
}) as never);
});

it('shows the count on single-reaction chips by default', () => {
render(<Reaction mx={{ roomId: '' } as unknown as MatrixClient} count={1} reaction="😀" />);

expect(screen.getByText('1')).toBeInTheDocument();
expect(screen.getByRole('button')).toHaveClass(css.Reaction);
expect(screen.getByRole('button')).not.toHaveClass(css.ReactionNoCount);
});

it('shows the count on multi-reaction chips by default', () => {
render(<Reaction mx={{ roomId: '' } as unknown as MatrixClient} count={3} reaction="😀" />);

expect(screen.getByText('3')).toBeInTheDocument();
expect(screen.getByRole('button')).not.toHaveClass(css.ReactionNoCount);
});

it('hides the count on single-reaction chips when the setting is enabled', () => {
vi.mocked(useSetting).mockImplementation(((_atom: unknown, key: string) => {
if (key === 'hideSingleReactionCount') {
return [true, vi.fn<() => void>()] as never;
}
return [defaultSettingValues[key], vi.fn<() => void>()] as never;
}) as never);

render(<Reaction mx={{ roomId: '' } as unknown as MatrixClient} count={1} reaction="😀" />);

expect(screen.getByText('😀')).toBeInTheDocument();
expect(screen.queryByText('1')).not.toBeInTheDocument();
expect(screen.getByRole('button')).toHaveClass(css.ReactionNoCount);
});

it('keeps the count on multi-reaction chips when the setting is enabled', () => {
vi.mocked(useSetting).mockImplementation(((_atom: unknown, key: string) => {
if (key === 'hideSingleReactionCount') {
return [true, vi.fn<() => void>()] as never;
}
return [defaultSettingValues[key], vi.fn<() => void>()] as never;
}) as never);

render(<Reaction mx={{ roomId: '' } as unknown as MatrixClient} count={2} reaction="😀" />);

expect(screen.getByText('2')).toBeInTheDocument();
expect(screen.getByRole('button')).not.toHaveClass(css.ReactionNoCount);
});
});
14 changes: 10 additions & 4 deletions src/app/components/message/Reaction.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ import { useAtomValue } from 'jotai';
import { Image as MediaImage } from '$components/media';
import { useRenderableMediaUrl } from '$hooks/useRenderableMediaUrl';
import { nicknamesAtom } from '$state/nicknames';
import { settingsAtom } from '$state/settings';
import { useSetting } from '$state/hooks/settings';
import * as css from './Reaction.css';

export const Reaction = as<
Expand All @@ -22,6 +24,8 @@ export const Reaction = as<
}
>(({ className, mx, count, reaction, useAuthentication, ...props }, ref) => {
const [imgError, setImgError] = useState(false);
const [hideSingleReactionCount] = useSetting(settingsAtom, 'hideSingleReactionCount');
const showCount = !hideSingleReactionCount || count > 1;
const rawReactionUrl = reaction.startsWith('mxc://')
? (mxcUrlToHttp(mx, reaction, useAuthentication) ?? undefined)
: undefined;
Expand All @@ -30,7 +34,7 @@ export const Reaction = as<
return (
<Box
as="button"
className={classNames(css.Reaction, className)}
className={classNames(css.Reaction, !showCount && css.ReactionNoCount, className)}
alignItems="Center"
shrink="No"
gap="200"
Expand Down Expand Up @@ -64,9 +68,11 @@ export const Reaction = as<
</Text>
)}
</Text>
<Text as="span" size="T300">
{count}
</Text>
{showCount && (
<Text as="span" size="T300">
{count}
</Text>
)}
</Box>
);
});
Expand Down
11 changes: 11 additions & 0 deletions src/app/features/settings/general/General.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -819,6 +819,10 @@ function Messages() {
settingsAtom,
'hideMembershipInReadOnly'
);
const [hideSingleReactionCount, setHideSingleReactionCount] = useSetting(
settingsAtom,
'hideSingleReactionCount'
);
const [showAllTimestamps, setShowAllTimestamps] = useSetting(settingsAtom, 'showAllTimestamps');

const [messageLayout] = useSetting(settingsAtom, 'messageLayout');
Expand Down Expand Up @@ -896,6 +900,13 @@ function Messages() {
value={hideMembershipInReadOnly}
onChange={setHideMembershipInReadOnly}
/>
<SettingToggle
title="Hide Single Reaction Counts"
focusId="hide-single-reaction-count"
description="Hide the count numeral on reactions with only one participant."
value={hideSingleReactionCount}
onChange={setHideSingleReactionCount}
/>
<SettingToggle
title="Show Hidden Events"
focusId="show-hidden-events"
Expand Down
1 change: 1 addition & 0 deletions src/app/features/settings/settingsLink.ts
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ export const settingsLinkFocusIdsBySection: Record<SettingsSectionId, readonly s
'hide-member-events-read-only-rooms',
'hide-membership-change',
'hide-profile-change',
'hide-single-reaction-count',
'hide-read-receipts',
'hide-typing-indicators',
'large-room-call-button',
Expand Down
2 changes: 2 additions & 0 deletions src/app/state/settings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,7 @@ export interface Settings {
alwaysInlineEditor: boolean;
messageLayout: MessageLayout;
messageSpacing: MessageSpacing;
hideSingleReactionCount: boolean;
hideMembershipEvents: boolean;
hideNickAvatarEvents: boolean;
showHiddenEvents: boolean;
Expand Down Expand Up @@ -329,6 +330,7 @@ export const defaultSettings: Settings = {
alwaysInlineEditor: false,
messageLayout: 0,
messageSpacing: '400',
hideSingleReactionCount: false,
hideMembershipEvents: false,
hideNickAvatarEvents: true,
mediaAutoLoad: true,
Expand Down
Loading