Skip to content

refactor: add title to unread notifications button #896

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Mar 18, 2024
Merged

refactor: add title to unread notifications button #896

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6f7f2f0
refactor: add title to unread notifications button
setchy Mar 18, 2024
48fc454
Merge remote-tracking branch 'origin/main' into refactor/unread-notif…
setchy Mar 18, 2024
74fc8fc
test: update snapshot
setchy Mar 18, 2024
1395dbf
Merge branch 'main' into refactor/unread-notifications-title
setchy Mar 18, 2024
cf19e72
test: fix tests
setchy Mar 18, 2024
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
8 changes: 4 additions & 4 deletions src/components/Sidebar.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,22 +137,22 @@ describe('components/Sidebar.tsx', () => {

describe('should render the notifications icon', () => {
it('when there are 0 notifications', () => {
const { getByLabelText } = render(
const { getByTitle } = render(
<AppContext.Provider value={{ isLoggedIn: true, notifications: [] }}>
<MemoryRouter>
<Sidebar />
</MemoryRouter>
</AppContext.Provider>,
);

const notificationsIcon = getByLabelText('0 Unread Notifications');
const notificationsIcon = getByTitle('0 Unread Notifications');
expect(notificationsIcon.className).toContain('text-white');
expect(notificationsIcon.childNodes.length).toBe(1);
expect(notificationsIcon.childNodes[0].nodeName).toBe('svg');
});

it('when there are more than 0 notifications', () => {
const { getByLabelText } = render(
const { getByTitle } = render(
<AppContext.Provider
value={{
isLoggedIn: true,
Expand All @@ -165,7 +165,7 @@ describe('components/Sidebar.tsx', () => {
</AppContext.Provider>,
);

const notificationsIcon = getByLabelText('4 Unread Notifications');
const notificationsIcon = getByTitle('4 Unread Notifications');
expect(notificationsIcon.className).toContain('text-green-500');
expect(notificationsIcon.childNodes.length).toBe(2);
expect(notificationsIcon.childNodes[0].nodeName).toBe('svg');
Expand Down
11 changes: 7 additions & 4 deletions src/components/Sidebar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,16 +52,19 @@ export const Sidebar: React.FC = () => {
<Logo aria-label="Open Gitify" />
</button>

<div
<button
className={`flex justify-around self-stretch items-center my-1 py-1 px-2 text-xs font-extrabold cursor-pointer ${
notificationsCount > 0 ? 'text-green-500' : 'text-white'
}`}
onClick={onOpenGitHubNotifications}
aria-label={`${notificationsCount} Unread Notifications`}
title={`${notificationsCount} Unread Notifications`}
>
<BellIcon size={12} />
<BellIcon
size={12}
aria-label={`${notificationsCount} Unread Notifications`}
/>
{notificationsCount > 0 && notificationsCount}
</div>
</button>
</div>

<div className="py-4 px-3">
Expand Down
18 changes: 10 additions & 8 deletions src/components/__snapshots__/Sidebar.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,13 +59,14 @@ exports[`components/Sidebar.tsx should render itself & its children (logged in)
</g>
</svg>
</button>
<div
aria-label="4 Unread Notifications"
<button
className="flex justify-around self-stretch items-center my-1 py-1 px-2 text-xs font-extrabold cursor-pointer text-green-500"
onClick={[Function]}
title="4 Unread Notifications"
>
<svg
aria-hidden="true"
aria-hidden="false"
aria-label="4 Unread Notifications"
className="octicon octicon-bell"
fill="currentColor"
focusable="false"
Expand All @@ -87,7 +88,7 @@ exports[`components/Sidebar.tsx should render itself & its children (logged in)
/>
</svg>
4
</div>
</button>
</div>
<div
className="py-4 px-3"
Expand Down Expand Up @@ -187,13 +188,14 @@ exports[`components/Sidebar.tsx should render itself & its children (logged out)
</g>
</svg>
</button>
<div
aria-label="4 Unread Notifications"
<button
className="flex justify-around self-stretch items-center my-1 py-1 px-2 text-xs font-extrabold cursor-pointer text-green-500"
onClick={[Function]}
title="4 Unread Notifications"
>
<svg
aria-hidden="true"
aria-hidden="false"
aria-label="4 Unread Notifications"
className="octicon octicon-bell"
fill="currentColor"
focusable="false"
Expand All @@ -215,7 +217,7 @@ exports[`components/Sidebar.tsx should render itself & its children (logged out)
/>
</svg>
4
</div>
</button>
</div>
<div
className="py-4 px-3"
Expand Down