Skip to content
This repository was archived by the owner on Nov 8, 2022. It is now read-only.

Commit 6d481b3

Browse files
mydearxymmydearxym
committed
chore: Merge branch 'dev'
2 parents 3de1415 + 577c716 commit 6d481b3

File tree

12 files changed

+110
-130
lines changed

12 files changed

+110
-130
lines changed

‎components/Tabber/index.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import React from 'react'
66
import T from 'prop-types'
77

8-
import { buildLog, THREAD, C11N, sortByIndex } from '@utils'
8+
import { buildLog, THREAD, C11N, sortByIndex, TYPE } from '@utils'
99
import NormalView from './NormalView'
1010
import BriefView from './BriefView'
1111

@@ -19,13 +19,13 @@ const Tabber = ({ source, active, onChange, layout, communityRaw }) => {
1919
const sortedSource = sortByIndex(aliasSource)
2020

2121
return (
22-
<React.Fragment>
22+
<div id={TYPE.APP_TABBER_ID}>
2323
{layout === C11N.DIGEST ? (
2424
<NormalView source={sortedSource} active={active} onChange={onChange} />
2525
) : (
2626
<BriefView source={sortedSource} active={active} onChange={onChange} />
2727
)}
28-
</React.Fragment>
28+
</div>
2929
)
3030
}
3131

‎containers/Header/Header.js‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
import React from 'react'
22

3-
import { TYPE } from '@utils'
4-
53
import MailBox from '@containers/MailBox'
64
import UserLister from '@containers/UserLister'
75
import Cashier from '@containers/Cashier'
@@ -40,7 +38,7 @@ const Header = ({
4038
fixed={fixed}
4139
testid="header"
4240
>
43-
<InnerWrapper id={TYPE.APP_HEADER_ID}>
41+
<InnerWrapper>
4442
<RouterWrapper>
4543
{fixed ? (
4644
<ThreadsNav activeInfo={activeInfo} curRoute={curRoute} />

‎containers/Header/index.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import React from 'react'
88
import { Affix } from 'antd'
99

10-
import { connectStore, buildLog } from '@utils'
10+
import { connectStore, buildLog, TYPE } from '@utils'
1111

1212
import Header from './Header'
1313
import { useInit } from './logic'
@@ -30,7 +30,7 @@ const HeaderContainer = ({ header }) => {
3030
} = header
3131

3232
return (
33-
<React.Fragment>
33+
<div id={TYPE.APP_HEADER_ID}>
3434
{fixed && (
3535
<Affix onChange={log}>
3636
<Header
@@ -57,7 +57,7 @@ const HeaderContainer = ({ header }) => {
5757
curCommunity={curCommunity}
5858
/>
5959
)}
60-
</React.Fragment>
60+
</div>
6161
)
6262
}
6363

‎containers/Header/logic.js‎

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import {
1313
$solver,
1414
thread2Subpath,
1515
atomizeValues,
16-
pageGoTop,
16+
scrollToHeader,
1717
errRescue,
1818
Global,
1919
// getParameterByName,
@@ -45,7 +45,7 @@ export const onThreadChange = thread => {
4545
const activeThread = thread.raw
4646
const subPath = thread2Subpath(activeThread)
4747

48-
pageGoTop()
48+
scrollToHeader()
4949

5050
store.markRoute({ subPath })
5151
store.setViewing({ activeThread })
@@ -124,18 +124,15 @@ const ErrSolver = [
124124
// init & uninit
125125
// ###############################
126126
export const useInit = _store => {
127-
useEffect(
128-
() => {
129-
store = _store
130-
// log('effect init')
131-
sub$ = sr71$.data().subscribe($solver(DataSolver, ErrSolver))
132-
checkSesstionState()
133-
134-
return () => {
135-
sr71$.stop()
136-
sub$.unsubscribe()
137-
}
138-
},
139-
[_store]
140-
)
127+
useEffect(() => {
128+
store = _store
129+
// log('effect init')
130+
sub$ = sr71$.data().subscribe($solver(DataSolver, ErrSolver))
131+
checkSesstionState()
132+
133+
return () => {
134+
sr71$.stop()
135+
sub$.unsubscribe()
136+
}
137+
}, [_store])
141138
}

‎containers/JobsThread/logic.js‎

Lines changed: 16 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@ import {
1212
ROUTE,
1313
THREAD,
1414
$solver,
15-
// scrollIntoEle,
16-
pageGoTop,
15+
scrollToTabber,
1716
notEmpty,
1817
errRescue,
1918
// GA,
@@ -36,11 +35,11 @@ export const inAnchor = () => store.setHeaderFix(false)
3635
export const outAnchor = () => store.setHeaderFix(true)
3736

3837
export const loadJobs = (page = 1) => {
38+
scrollToTabber()
39+
3940
const { curCommunity } = store
4041
const userHasLogin = store.isLogin
4142

42-
store.markState({ curView: TYPE.LOADING })
43-
4443
const args = {
4544
filter: {
4645
page,
@@ -57,10 +56,9 @@ export const loadJobs = (page = 1) => {
5756
}
5857

5958
args.filter = R.pickBy(notEmpty, args.filter)
60-
// scrollIntoEle(TYPE.APP_HEADER_ID)
61-
pageGoTop()
6259

6360
log('######## loadJobs args: ', args)
61+
store.markState({ curView: TYPE.LOADING })
6462
sr71$.query(S.pagedJobs, args)
6563
store.markRoute({ page, ...store.filtersData })
6664
}
@@ -184,18 +182,15 @@ const ErrSolver = [
184182
// init & uninit
185183
// ###############################
186184
export const useInit = _store =>
187-
useEffect(
188-
() => {
189-
store = _store
190-
// log('effect init')
191-
sub$ = sr71$.data().subscribe($solver(DataSolver, ErrSolver))
192-
193-
return () => {
194-
if (store.curView === TYPE.LOADING || !sub$) return false
195-
log('===== do uninit')
196-
sr71$.stop()
197-
sub$.unsubscribe()
198-
}
199-
},
200-
[_store]
201-
)
185+
useEffect(() => {
186+
store = _store
187+
// log('effect init')
188+
sub$ = sr71$.data().subscribe($solver(DataSolver, ErrSolver))
189+
190+
return () => {
191+
if (store.curView === TYPE.LOADING || !sub$) return false
192+
log('===== do uninit')
193+
sr71$.stop()
194+
sub$.unsubscribe()
195+
}
196+
}, [_store])

‎containers/PostsThread/logic.js‎

Lines changed: 18 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ import {
1313
THREAD,
1414
COMMUNITY_SPEC_THREADS,
1515
$solver,
16-
pageGoTop,
1716
notEmpty,
1817
thread2Subpath,
1918
errRescue,
19+
scrollToTabber,
2020
} from '@utils'
2121

2222
import SR71 from '@utils/async/sr71'
@@ -41,6 +41,8 @@ export const inAnchor = () => store.setHeaderFix(false)
4141
export const outAnchor = () => store.setHeaderFix(true)
4242

4343
export const loadPosts = (page = 1) => {
44+
scrollToTabber()
45+
4446
const { curCommunity } = store
4547
const { subPath: topic } = store.curRoute
4648

@@ -50,8 +52,6 @@ export const loadPosts = (page = 1) => {
5052

5153
const userHasLogin = store.isLogin
5254

53-
store.markState({ curView: TYPE.LOADING })
54-
5555
const args = {
5656
filter: {
5757
page,
@@ -66,12 +66,10 @@ export const loadPosts = (page = 1) => {
6666
if (curCommunity.raw === ROUTE.HOME) {
6767
args.filter = R.merge(args.filter, { topic })
6868
}
69-
7069
args.filter = R.pickBy(notEmpty, args.filter)
71-
// scrollIntoEle(TYPE.APP_HEADER_ID)
72-
pageGoTop()
7370

7471
log('args: ', args)
72+
store.markState({ curView: TYPE.LOADING })
7573
sr71$.query(S.pagedPosts, args)
7674
store.markRoute({ page, ...store.filtersData })
7775
}
@@ -244,24 +242,21 @@ const ErrSolver = [
244242
// init & uninit
245243
// ###############################
246244
export const useInit = _store =>
247-
useEffect(
248-
() => {
249-
store = _store
250-
// log('effect init')
251-
sub$ = sr71$.data().subscribe($solver(DataSolver, ErrSolver))
245+
useEffect(() => {
246+
store = _store
247+
// log('effect init')
248+
sub$ = sr71$.data().subscribe($solver(DataSolver, ErrSolver))
252249

253-
/*
250+
/*
254251
NOTE: city communities list is not supported by SSR
255252
need load manully
256253
*/
257-
loadCityCommunities()
258-
259-
return () => {
260-
if (store.curView === TYPE.LOADING || !sub$) return false
261-
// log('===== do uninit')
262-
sr71$.stop()
263-
sub$.unsubscribe()
264-
}
265-
},
266-
[_store]
267-
)
254+
loadCityCommunities()
255+
256+
return () => {
257+
if (store.curView === TYPE.LOADING || !sub$) return false
258+
// log('===== do uninit')
259+
sr71$.stop()
260+
sub$.unsubscribe()
261+
}
262+
}, [_store])

‎containers/ReposThread/logic.js‎

Lines changed: 16 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ import {
88
EVENT,
99
TYPE,
1010
THREAD,
11-
// scrollIntoEle,
12-
pageGoTop,
11+
scrollToTabber,
1312
asyncRes,
1413
notEmpty,
1514
} from '@utils'
@@ -31,11 +30,11 @@ export const inAnchor = () => store.setHeaderFix(false)
3130
export const outAnchor = () => store.setHeaderFix(true)
3231

3332
export const loadRepos = (page = 1) => {
33+
scrollToTabber()
34+
3435
const { curCommunity } = store
3536
const userHasLogin = store.isLogin
3637

37-
store.markState({ curView: TYPE.LOADING })
38-
3938
const args = {
4039
filter: {
4140
page,
@@ -48,10 +47,9 @@ export const loadRepos = (page = 1) => {
4847
}
4948

5049
args.filter = R.pickBy(notEmpty, args.filter)
51-
// scrollIntoEle(TYPE.APP_HEADER_ID)
52-
pageGoTop()
5350

5451
log('load repos --> ', args)
52+
store.markState({ curView: TYPE.LOADING })
5553
sr71$.query(S.pagedRepos, args)
5654
store.markRoute({ page, ...store.filtersData })
5755
}
@@ -148,18 +146,15 @@ const ErrSolver = []
148146
// init & uninit
149147
// ###############################
150148
export const useInit = _store =>
151-
useEffect(
152-
() => {
153-
store = _store
154-
// log('effect init')
155-
sub$ = sr71$.data().subscribe($solver(DataSolver, ErrSolver))
156-
157-
return () => {
158-
if (store.curView === TYPE.LOADING || !sub$) return false
159-
log('===== do uninit')
160-
sr71$.stop()
161-
sub$.unsubscribe()
162-
}
163-
},
164-
[_store]
165-
)
149+
useEffect(() => {
150+
store = _store
151+
// log('effect init')
152+
sub$ = sr71$.data().subscribe($solver(DataSolver, ErrSolver))
153+
154+
return () => {
155+
if (store.curView === TYPE.LOADING || !sub$) return false
156+
log('===== do uninit')
157+
sr71$.stop()
158+
sub$.unsubscribe()
159+
}
160+
}, [_store])

‎containers/UserPublishedComments/logic.js‎

Lines changed: 15 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import {
1313
ERR,
1414
pagedFilter,
1515
errRescue,
16-
pageGoTop,
16+
scrollToHeader,
1717
} from '@utils'
1818

1919
import SR71 from '@utils/async/sr71'
@@ -67,7 +67,7 @@ export const threadOnChange = curThread => {
6767
}
6868

6969
export const onPageChange = (page = 1) => {
70-
pageGoTop()
70+
scrollToHeader()
7171
switch (store.curThread) {
7272
case THREAD.JOB:
7373
return loadJobComments(page)
@@ -144,20 +144,17 @@ const ErrSolver = [
144144
// init & uninit
145145
// ###############################
146146
export const useInit = _store => {
147-
useEffect(
148-
() => {
149-
store = _store
150-
// log('effect init')
151-
sub$ = sr71$.data().subscribe($solver(DataSolver, ErrSolver))
152-
loadPostComments()
153-
154-
return () => {
155-
// log('effect uninit')
156-
if (!sub$) return false
157-
// log('===== do uninit')
158-
sub$.unsubscribe()
159-
}
160-
},
161-
[_store]
162-
)
147+
useEffect(() => {
148+
store = _store
149+
// log('effect init')
150+
sub$ = sr71$.data().subscribe($solver(DataSolver, ErrSolver))
151+
loadPostComments()
152+
153+
return () => {
154+
// log('effect uninit')
155+
if (!sub$) return false
156+
// log('===== do uninit')
157+
sub$.unsubscribe()
158+
}
159+
}, [_store])
163160
}

0 commit comments

Comments
 (0)