diff --git a/src/components/SideBar.tsx b/src/components/SideBar.tsx index e0d4380..4769aca 100644 --- a/src/components/SideBar.tsx +++ b/src/components/SideBar.tsx @@ -14,7 +14,6 @@ import { run } from 'utils/general' import { useCatchNetworkError } from 'utils/hooks/useCatchNetworkError' import { useLoadedContext } from 'utils/hooks/useLoadedContext' import { loadWithPJAX, useOnPJAXDone, usePJAX } from 'utils/hooks/usePJAX' -import { useProgressBar } from 'utils/hooks/useProgressBar' import { useStateIO } from 'utils/hooks/useStateIO' import { SideBarErrorContext } from '../containers/ErrorContext' import { RepoContext } from '../containers/RepoContext' @@ -98,7 +97,6 @@ export function SideBar() { platform.usePlatformHooks?.() usePJAX() - useProgressBar() // Hide sidebar when error due to auth but token is set #128 const hideSidebarOnInvalidToken: boolean = diff --git a/src/platforms/Gitea/index.ts b/src/platforms/Gitea/index.ts index 1fb0371..2052189 100644 --- a/src/platforms/Gitea/index.ts +++ b/src/platforms/Gitea/index.ts @@ -1,4 +1,5 @@ import { resolveGitModules } from 'utils/gitSubmodule' +import { useProgressBar } from 'utils/hooks/useProgressBar' import { sortFoldersToFront } from 'utils/treeParser' import * as API from './API' import * as DOMHelper from './DOMHelper' @@ -169,4 +170,7 @@ export const Gitea: Platform = { getOAuthLink() { return `${window.location.protocol}//${window.location.host}/api/v1/user/applications/oauth2` }, + usePlatformHooks() { + useProgressBar() + }, } diff --git a/src/platforms/Gitee/index.ts b/src/platforms/Gitee/index.ts index 45d5177..224125d 100644 --- a/src/platforms/Gitee/index.ts +++ b/src/platforms/Gitee/index.ts @@ -3,6 +3,7 @@ import { platform } from 'platforms' import * as React from 'react' import { resolveGitModules } from 'utils/gitSubmodule' import { useOnPJAXDone } from 'utils/hooks/usePJAX' +import { useProgressBar } from 'utils/hooks/useProgressBar' import { sortFoldersToFront } from 'utils/treeParser' import * as API from './API' import * as DOMHelper from './DOMHelper' @@ -174,6 +175,9 @@ export const Gitee: Platform = { setOAuth(code) { return API.OAuth(code) }, + usePlatformHooks() { + useProgressBar() + }, } export function useGiteeAttachCopySnippetButton(copySnippetButton: boolean) { diff --git a/src/utils/hooks/useProgressBar.ts b/src/utils/hooks/useProgressBar.ts index f5c3433..29a0c2b 100644 --- a/src/utils/hooks/useProgressBar.ts +++ b/src/utils/hooks/useProgressBar.ts @@ -1,6 +1,4 @@ import * as NProgress from 'nprogress' -import { platform } from 'platforms' -import { GitHub } from 'platforms/GitHub' import * as React from 'react' import { useEvent } from 'react-use' @@ -13,14 +11,11 @@ const progressBar = { }, } -const isGitHub = platform === GitHub // use native progress bar on GitHub -export const useProgressBar = isGitHub - ? function () {} - : function useProgressBar() { - React.useEffect(() => { - NProgress.configure({ showSpinner: false }) - }, []) - useEvent('pjax:fetch', progressBar.mount, window) - useEvent('pjax:unload', progressBar.unmount, window) - } +export function useProgressBar() { + React.useEffect(() => { + NProgress.configure({ showSpinner: false }) + }, []) + useEvent('pjax:fetch', progressBar.mount, window) + useEvent('pjax:unload', progressBar.unmount, window) +}