Skip to content

fix: Add loading state to "Refresh Notifications" button #962

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 1 commit into from
Apr 5, 2024
Merged

fix: Add loading state to "Refresh Notifications" button #962

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 10 additions & 4 deletions src/components/Sidebar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ export const Sidebar: React.FC = () => {
const location = useLocation();

const { isLoggedIn } = useContext(AppContext);
const { notifications, fetchNotifications } = useContext(AppContext);
const { notifications, fetchNotifications, isFetching } =
useContext(AppContext);

const onOpenBrowser = useCallback(() => {
openExternalLink(`https://github.com/${Constants.REPO_SLUG}`);
Expand All @@ -38,10 +39,10 @@ export const Sidebar: React.FC = () => {
}, [notifications]);

const sidebarButtonClasses =
'flex justify-evenly items-center bg-transparent border-0 w-full text-sm text-white my-1 py-2 cursor-pointer hover:text-gray-500 focus:outline-none';
'flex justify-evenly items-center bg-transparent border-0 w-full text-sm text-white my-1 py-2 cursor-pointer hover:text-gray-500 focus:outline-none disabled:text-gray-500 disabled:cursor-default';

return (
<div className="flex flex-col fixed left-14 w-14 -ml-14 h-full bg-gray-sidebar overflow-y-auto ">
<div className="flex flex-col fixed left-14 w-14 -ml-14 h-full bg-gray-sidebar overflow-y-auto">
<div className="flex flex-col flex-1 items-center py-4">
<button
className="w-5 my-3 mx-auto cursor-pointer outline-none"
Expand Down Expand Up @@ -77,8 +78,13 @@ export const Sidebar: React.FC = () => {
navigate('/', { replace: true });
fetchNotifications();
}}
disabled={isFetching}
>
<SyncIcon size={16} aria-label="Refresh Notifications" />
<SyncIcon
size={16}
aria-label="Refresh Notifications"
className={isFetching ? 'animate-spin' : undefined}
/>
</button>

<button
Expand Down
8 changes: 4 additions & 4 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 @@ -2,7 +2,7 @@

exports[`components/Sidebar.tsx should render itself & its children (logged in) 1`] = `
<div
className="flex flex-col fixed left-14 w-14 -ml-14 h-full bg-gray-sidebar overflow-y-auto "
className="flex flex-col fixed left-14 w-14 -ml-14 h-full bg-gray-sidebar overflow-y-auto"
>
<div
className="flex flex-col flex-1 items-center py-4"
Expand Down Expand Up @@ -94,7 +94,7 @@ exports[`components/Sidebar.tsx should render itself & its children (logged in)
>
<button
aria-label="Quit Gitify"
className="flex justify-evenly items-center bg-transparent border-0 w-full text-sm text-white my-1 py-2 cursor-pointer hover:text-gray-500 focus:outline-none"
className="flex justify-evenly items-center bg-transparent border-0 w-full text-sm text-white my-1 py-2 cursor-pointer hover:text-gray-500 focus:outline-none disabled:text-gray-500 disabled:cursor-default"
onClick={[Function]}
title="Quit Gitify"
>
Expand Down Expand Up @@ -127,7 +127,7 @@ exports[`components/Sidebar.tsx should render itself & its children (logged in)

exports[`components/Sidebar.tsx should render itself & its children (logged out) 1`] = `
<div
className="flex flex-col fixed left-14 w-14 -ml-14 h-full bg-gray-sidebar overflow-y-auto "
className="flex flex-col fixed left-14 w-14 -ml-14 h-full bg-gray-sidebar overflow-y-auto"
>
<div
className="flex flex-col flex-1 items-center py-4"
Expand Down Expand Up @@ -219,7 +219,7 @@ exports[`components/Sidebar.tsx should render itself & its children (logged out)
>
<button
aria-label="Quit Gitify"
className="flex justify-evenly items-center bg-transparent border-0 w-full text-sm text-white my-1 py-2 cursor-pointer hover:text-gray-500 focus:outline-none"
className="flex justify-evenly items-center bg-transparent border-0 w-full text-sm text-white my-1 py-2 cursor-pointer hover:text-gray-500 focus:outline-none disabled:text-gray-500 disabled:cursor-default"
onClick={[Function]}
title="Quit Gitify"
>
Expand Down