prehistoric-systems/Gitako
1
1
Fork 0
mirror of https://github.com/EnixCoda/Gitako.git synced 2026-03-11 08:54:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix: adopt simpler pjax events and elements

Browse source
This commit is contained in:
EnixCoda 2019-11-19 17:12:13 +08:00
parent 44454152ea
commit 1ac5189c6f
No known key found for this signature in database
GPG key ID: FE06F5DFC1C9B8E4
2 changed files with 10 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/components/SideBar.tsx
View file

@ -52,13 +52,6 @@ const RawGitako: React.FC<Props & ConnectorState> = function RawGitako(props) {
return () => window.removeEventListener('keydown', onKeyDown)
}, [props.disabled, onKeyDown])
const updateMeta = React.useCallback(() => {
if (props.disabled) return
DOMHelper.unmountTopProgressBar()
props.setMetaData({ ...props.metaData, ...URLHelper.parse() })
}, [props.disabled, props.metaData, configContext.val])
useOnLocationChange(updateMeta)
const attachCopyFileButton = React.useCallback(() => {
if (props.disabled) return
if (configContext.val.copyFileButton) return DOMHelper.attachCopyFileBtn()
@ -71,11 +64,15 @@ const RawGitako: React.FC<Props & ConnectorState> = function RawGitako(props) {
}, [props.disabled, configContext.val.copySnippetButton])
useOnLocationChange(attachCopySnippetButton)
React.useEffect(() => {
useOnLocationChange(() => {
if (configContext.val.intelligentToggle === null) {
props.setShouldShow(URLHelper.isInCodePage(props.metaData))
props.setShouldShow(
URLHelper.isInCodePage({
branchName: props.metaData?.branchName,
}),
)
}
}, [props.metaData, configContext.val.intelligentToggle])
}, [props.metaData?.branchName, configContext.val.intelligentToggle])
React.useEffect(() => {
if (configContext.val.copyFileButton) return DOMHelper.attachCopyFileBtn() || undefined // undefined is friendlier to React
@ -196,9 +193,9 @@ async function trySetUpAccessTokenWithCode() {
}
}
function useOnLocationChange(callback: () => void) {
function useOnLocationChange(callback: () => void, deps: React.DependencyList = []) {
const { href, pathname, search } = useLocation()
useDidUpdate(() => {
callback()
}, [href, pathname, search])
}, [href, pathname, search, ...deps])
}

3
src/utils/DOMHelper.ts
View file

@ -122,7 +122,7 @@ export function scrollToRepoContent() {
const pjax = new PJAX({
elements: '',
selectors: ['.repository-content', 'title'],
selectors: ['.repository-content', 'title', '[data-pjax="#js-repo-pjax-container"]'],
scrollTo: false,
analytics: false,
cacheBust: false,
@ -133,7 +133,6 @@ window.addEventListener('pjax:send', () => mountTopProgressBar())
window.addEventListener('pjax:complete', () => unmountTopProgressBar())
export function loadWithPJAX(URL: string) {
mountTopProgressBar()
pjax.loadUrl(URL, { scrollTo: 0 })
}