Skip to content

Commit db3cb19

Browse files
authored
fix: title tooltip alignment (#2215)
Signed-off-by: Adam Setch <[email protected]>
1 parent e350133 commit db3cb19

17 files changed

+958
-1167
lines changed

src/renderer/components/filters/FilterSection.tsx

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import { AppContext } from '../../context/App';
77
import type { FilterSettingsState, FilterValue } from '../../types';
88
import type { Filter } from '../../utils/notifications/filters';
99
import { Checkbox } from '../fields/Checkbox';
10-
import { Tooltip } from '../fields/Tooltip';
1110
import { Title } from '../primitives/Title';
1211
import { RequiresDetailedNotificationWarning } from './RequiresDetailedNotificationsWarning';
1312

@@ -34,22 +33,21 @@ export const FilterSection = <T extends FilterValue>({
3433

3534
return (
3635
<fieldset id={id}>
37-
<Stack align="baseline" direction="horizontal" gap="condensed">
38-
<Title icon={icon}>{title}</Title>
39-
{tooltip && (
40-
<Tooltip
41-
name={`tooltip-${id}`}
42-
tooltip={
43-
<Stack direction="vertical" gap="condensed">
44-
{tooltip}
45-
{filter.requiresDetailsNotifications && (
46-
<RequiresDetailedNotificationWarning />
47-
)}
48-
</Stack>
49-
}
50-
/>
51-
)}
52-
</Stack>
36+
<Title
37+
icon={icon}
38+
tooltip={
39+
tooltip && (
40+
<>
41+
{tooltip}
42+
{filter.requiresDetailsNotifications && (
43+
<RequiresDetailedNotificationWarning />
44+
)}
45+
</>
46+
)
47+
}
48+
>
49+
{title}
50+
</Title>
5351

5452
<Stack
5553
direction={layout}

src/renderer/components/filters/OrganizationFilter.tsx

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import {
1313
hasExcludeOrganizationFilters,
1414
hasIncludeOrganizationFilters,
1515
} from '../../utils/notifications/filters/organizations';
16-
import { Tooltip } from '../fields/Tooltip';
1716
import { Title } from '../primitives/Title';
1817

1918
type InputToken = {
@@ -135,17 +134,17 @@ export const OrganizationFilter: FC = () => {
135134

136135
return (
137136
<fieldset id="filter-organizations">
138-
<Stack align="baseline" direction="horizontal" gap="condensed">
139-
<Title icon={OrganizationIcon}>Organizations</Title>
140-
<Tooltip
141-
name="tooltip-filter-organizations"
142-
tooltip={
143-
<Stack direction="vertical" gap="condensed">
144-
<Text>Filter notifications by organization.</Text>
145-
</Stack>
146-
}
147-
/>
148-
</Stack>
137+
<Title
138+
icon={OrganizationIcon}
139+
tooltip={
140+
<Stack direction="vertical" gap="condensed">
141+
<Text>Filter notifications by organization.</Text>
142+
</Stack>
143+
}
144+
>
145+
Organizations
146+
</Title>
147+
149148
<Stack direction="vertical" gap="condensed">
150149
<Stack
151150
align="center"

src/renderer/components/filters/UserHandleFilter.tsx

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import {
1313
hasExcludeHandleFilters,
1414
hasIncludeHandleFilters,
1515
} from '../../utils/notifications/filters/handles';
16-
import { Tooltip } from '../fields/Tooltip';
1716
import { Title } from '../primitives/Title';
1817
import { RequiresDetailedNotificationWarning } from './RequiresDetailedNotificationsWarning';
1918

@@ -121,18 +120,18 @@ export const UserHandleFilter: FC = () => {
121120

122121
return (
123122
<fieldset id="filter-user-handles">
124-
<Stack align="baseline" direction="horizontal" gap="condensed">
125-
<Title icon={MentionIcon}>Handles</Title>
126-
<Tooltip
127-
name="tooltip-filter-handles"
128-
tooltip={
129-
<Stack direction="vertical" gap="condensed">
130-
<Text>Filter notifications by user handle.</Text>
131-
<RequiresDetailedNotificationWarning />
132-
</Stack>
133-
}
134-
/>
135-
</Stack>
123+
<Title
124+
icon={MentionIcon}
125+
tooltip={
126+
<Stack direction="vertical" gap="condensed">
127+
<Text>Filter notifications by user handle.</Text>
128+
<RequiresDetailedNotificationWarning />
129+
</Stack>
130+
}
131+
>
132+
Handles
133+
</Title>
134+
136135
<Stack direction="vertical" gap="condensed">
137136
<Stack
138137
align="center"

0 commit comments

Comments
 (0)