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

Commit c267f80

Browse files
mydearxymmydearxym
committed
selector -> storeSelector (container && logic.js && generators)
1 parent 1525757 commit c267f80

File tree

18 files changed

+99
-97
lines changed

18 files changed

+99
-97
lines changed

‎containers/Body/index.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ const AppBanner = ({ route }) => {
7878
)
7979
}
8080

81-
const selector = ({ store }) => ({
81+
const storeSelector = ({ store }) => ({
8282
body: store.body,
8383
})
8484

@@ -109,4 +109,4 @@ class ContentContainer extends React.Component {
109109
}
110110
}
111111

112-
export default inject(selector)(observer(ContentContainer))
112+
export default inject(storeSelector)(observer(ContentContainer))

‎containers/Body/logic.js‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,21 @@ import { makeDebugger } from '../../utils/functions'
33

44
const debug = makeDebugger('L:Body')
55

6-
let store = null
6+
let body = null
77

88
export function openPreview(type) {
9-
store.openPreview(type)
9+
body.openPreview(type)
1010
}
1111

1212
export function changeTheme(name) {
1313
debug('changeTheme', name)
14-
store.changeTheme(name)
14+
body.changeTheme(name)
1515
}
1616

1717
export function changeLocale(lang) {
1818
// debug('changeLocale', lang)
1919

20-
if (!store.isLocaleExist(lang)) {
20+
if (!body.isLocaleExist(lang)) {
2121
debug('process.env.NODE_ENV:', process.env.NODE_ENV)
2222
const localeUrl =
2323
process.env.NODE_ENV === 'development'
@@ -26,18 +26,18 @@ export function changeLocale(lang) {
2626
fetch(localeUrl)
2727
.then(res => res.json())
2828
.then(vals => {
29-
store.setLangMessages(lang, vals)
30-
store.changeLocale(lang)
29+
body.setLangMessages(lang, vals)
30+
body.changeLocale(lang)
3131
})
3232
} else {
33-
store.changeLocale(lang)
33+
body.changeLocale(lang)
3434
}
3535
}
3636

3737
export function openDoraemon() {
38-
store.openDoraemon()
38+
body.openDoraemon()
3939
}
4040

4141
export function init(selectStore) {
42-
store = selectStore
42+
body = selectStore
4343
}

‎containers/Decrator/index.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ const Container = styled.div`
4646
}
4747
`
4848

49-
const selector = ({ store }) => ({
49+
const storeSelector = ({ store }) => ({
5050
theme: store.theme,
5151
})
5252

@@ -61,4 +61,4 @@ const ThemeObserver = ({ children, theme }) => (
6161
</ThemeProvider>
6262
)
6363

64-
export default inject(selector)(observer(ThemeObserver))
64+
export default inject(storeSelector)(observer(ThemeObserver))

‎containers/Doraemon/index.js‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
import React from 'react'
88
import { inject, observer } from 'mobx-react'
9-
// import R from 'ramda'
109

1110
// import Link from 'next/link'
1211
// import styled from 'styled-components'
@@ -46,22 +45,22 @@ const HintIcon = ({ index, active, cur }) => {
4645
)
4746
}
4847

49-
const selector = ({ store }) => ({
50-
store: store.doraemon,
48+
const storeSelector = ({ store }) => ({
49+
doraemon: store.doraemon,
5150
})
5251

5352
class DoraemonContainer extends React.Component {
5453
componentWillMount() {
5554
debug('mount')
56-
// TODO? maybe: this.logic = new Logic(this.props.store)
57-
logic.init(this.props.store)
55+
// TODO? maybe: this.logic = new Logic(this.props.doraemon)
56+
logic.init(this.props.doraemon)
5857
}
5958
// ref={infobar => (this[`infobar${suggestion.title}`] = infobar)}
6059
// ref={wraper => (this.wraper = wraper)}
6160

6261
render() {
63-
const { store } = this.props
64-
const { inputValue, suggestions, activeRaw, prefix, visible } = store
62+
const { doraemon } = this.props
63+
const { inputValue, suggestions, activeRaw, prefix, visible } = doraemon
6564

6665
// debug('activeRaw: ', activeRaw)
6766
// debug('suggestion.raw: ', suggestions.toJSON())
@@ -71,7 +70,7 @@ class DoraemonContainer extends React.Component {
7170
<PageOverlay visible={visible} onClick={logic.hidePanel} />
7271
<PanelContainer visible={visible}>
7372
<InputEditor value={inputValue} searching={false} prefix={prefix} />
74-
{logic.repoNotFound(store) && <AlertBar>Repo not found</AlertBar>}
73+
{logic.repoNotFound(doraemon) && <AlertBar>Repo not found</AlertBar>}
7574
<Wrapper>
7675
<SuggestionWrapper empty={suggestions.length === 0}>
7776
{suggestions.map((suggestion, i) => (
@@ -99,4 +98,4 @@ class DoraemonContainer extends React.Component {
9998
}
10099
}
101100

102-
export default inject(selector)(observer(DoraemonContainer))
101+
export default inject(storeSelector)(observer(DoraemonContainer))

‎containers/Doraemon/logic.js‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { SwissArmyKnife, clearfyCmd } from './helper/swissArmyKnife'
77

88
const debug = makeDebugger('L:Doraemon')
99

10-
let store = null
10+
let doraemon = null
1111
let pockect$ = null
1212
let SAK = null
1313
let cmdResolver = []
@@ -17,7 +17,7 @@ const inputValueIsNotEmpty = R.compose(R.not, R.isEmpty, R.prop('inputValue'))
1717
const isNotSearching = R.compose(R.not, R.prop('searching'))
1818

1919
function queryPocket() {
20-
pockect$.query(store.inputValue)
20+
pockect$.query(doraemon.inputValue)
2121
}
2222

2323
const initCmdResolver = () => {
@@ -41,7 +41,7 @@ const initCmdResolver = () => {
4141
action: () => {
4242
SAK.completeInput(true)
4343
queryPocket()
44-
store.markState({
44+
doraemon.markState({
4545
inputForOtherUse: true,
4646
inputValue: Global.localStorage.getItem('debug'),
4747
})
@@ -63,7 +63,7 @@ const initCmdResolver = () => {
6363
match: SAK.stepTwoCmd('themes'),
6464
action: cmdpath => {
6565
const theme = R.last(cmdpath)
66-
store.changeTheme(theme)
66+
doraemon.changeTheme(theme)
6767
},
6868
},
6969
{
@@ -81,7 +81,7 @@ const initCmdResolver = () => {
8181
if (cmd === 'github') {
8282
Global.window.open('https://github.com/visionmedia/debug', '_blank')
8383
} else if (cmd === 'write') {
84-
Global.localStorage.setItem('debug', store.inputValue)
84+
Global.localStorage.setItem('debug', doraemon.inputValue)
8585
hidePanel()
8686
}
8787
},
@@ -112,7 +112,7 @@ const initCmdResolver = () => {
112112
}
113113

114114
const doCmd = () => {
115-
const cmd = clearfyCmd(store.activeRaw)
115+
const cmd = clearfyCmd(doraemon.activeRaw)
116116
// debug('clearfyCmd: ', cmd)
117117
// Do not use forEach, cause forEach will not break
118118
for (let i = 0; i < cmdResolver.length; i += 1) {
@@ -175,34 +175,34 @@ export function navToSuggestion(suggestion) {
175175
}
176176

177177
export function hidePanel() {
178-
store.hideDoraemon()
178+
// doraemon.hideDoraemon()
179179
pockect$.stop()
180180
}
181181

182182
export function inputOnChange(e) {
183183
const inputValue = e.target.value
184-
store.markState({
184+
doraemon.markState({
185185
inputValue,
186186
// searching: true,
187187
})
188188
queryPocket()
189189
}
190190

191191
export function init(selectedStore) {
192-
store = selectedStore
193-
debug('store', store)
192+
doraemon = selectedStore
193+
debug('doraemon', doraemon)
194194

195-
pockect$ = new Pockect(store)
196-
SAK = new SwissArmyKnife(store)
195+
pockect$ = new Pockect(doraemon)
196+
SAK = new SwissArmyKnife(doraemon)
197197

198198
initCmdResolver()
199199

200200
pockect$.cmdSuggesttion().subscribe(res => {
201201
// debug('--> loadSuggestions res: ', res)
202-
store.loadSuggestions(res)
202+
doraemon.loadSuggestions(res)
203203
})
204204

205205
pockect$.emptyInput().subscribe(() => {
206-
store.clearSuggestions()
206+
doraemon.clearSuggestions()
207207
})
208208
}

‎containers/GithubSearchPanel/index.js‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -51,30 +51,30 @@ const SearchEditor = ({ value, searching }) => (
5151
</EditorBar>
5252
)
5353

54-
const selector = ({ store }) => ({
55-
store: store.github,
54+
const storeSelector = ({ store }) => ({
55+
github: store.github,
5656
})
5757

5858
class UniversePanelContainer extends React.Component {
5959
// TODO use componentWillMount?
6060
componentWillMount() {
6161
debug('mount')
62-
logic.init(this.props.store)
62+
logic.init(this.props.github)
6363
}
6464

6565
render() {
66-
const { store } = this.props
67-
const { reposData, inputValue, searching } = store
66+
const { github } = this.props
67+
const { reposData, inputValue, searching } = github
6868

6969
// debug('repos: ', repos)
7070
// debug('searching: ', searching)
71-
// debug('logic.repoNotFound2(store): ', logic.repoNotFound2(store))
71+
// debug('logic.repoNotFound2(github): ', logic.repoNotFound2(github))
7272

7373
return (
7474
<PanelContainer>
7575
<SearchEditor value={inputValue} searching={searching} />
7676

77-
{logic.repoNotFound(store) && <AlertBar>Repo not found</AlertBar>}
77+
{logic.repoNotFound(github) && <AlertBar>Repo not found</AlertBar>}
7878
<Wraper>
7979
{reposData.map(repo => (
8080
<InfoBar key={repo.id}>
@@ -101,4 +101,4 @@ class UniversePanelContainer extends React.Component {
101101
}
102102
}
103103

104-
export default inject(selector)(observer(UniversePanelContainer))
104+
export default inject(storeSelector)(observer(UniversePanelContainer))

‎containers/GithubSearchPanel/logic.js‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import SearchService from './Pigeon'
55

66
const debug = makeDebugger('L:UniversePanel')
77

8-
let store = null
8+
let github = null
99
let Pigeon = null
1010

1111
const RLog = x => debug('R log: ', x)
@@ -39,34 +39,34 @@ export const repoNotFound = R.allPass([
3939

4040
export function search(e) {
4141
const inputValue = e.target.value
42-
// store.markState('inputValue', value)
43-
store.markState({
42+
// github.markState('inputValue', value)
43+
github.markState({
4444
inputValue,
4545
searching: true,
4646
})
4747
Pigeon.search(inputValue)
4848
}
4949

5050
export function init(selectedStore) {
51-
store = selectedStore
52-
debug('store', store)
51+
github = selectedStore
52+
debug('github', github)
5353
Pigeon = new SearchService()
5454

5555
Pigeon.get().subscribe(res => {
5656
debug('Pigeon get: ', res)
5757
// debug('washed: ', repoData(res.items))
58-
store.markState({
58+
github.markState({
5959
searching: false,
6060
})
61-
store.replaceRepos(repoData(res))
62-
// store.replaceRepos([])
61+
github.replaceRepos(repoData(res))
62+
// github.replaceRepos([])
6363
})
6464

6565
Pigeon.emptyInput().subscribe(() => {
6666
debug('Pigeon get emptyInput!')
67-
store.markState({
67+
github.markState({
6868
searching: false,
6969
})
70-
store.clearRepos()
70+
github.clearRepos()
7171
})
7272
}

‎containers/IntroBody/index.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ const IntroPage = ({ route, doraemonVisable, curTheme, themeKeys }) => {
4545
}
4646
}
4747

48-
const selector = ({ store }) => ({
48+
const storeSelector = ({ store }) => ({
4949
body: store.body,
5050
})
5151

@@ -81,4 +81,4 @@ class ContentContainer extends React.Component {
8181
}
8282
}
8383

84-
export default inject(selector)(observer(ContentContainer))
84+
export default inject(storeSelector)(observer(ContentContainer))

‎containers/IntroBody/logic.js‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,21 @@ import { makeDebugger } from '../../utils/functions'
33

44
const debug = makeDebugger('L:IntroBody')
55

6-
let store = null
6+
let body = null
77

88
export function openPreview() {
9-
store.openPreview()
9+
body.openPreview()
1010
}
1111

1212
export function changeTheme(name) {
1313
debug('changeTheme', name)
14-
store.changeTheme(name)
14+
body.changeTheme(name)
1515
}
1616

1717
export function changeLocale(lang) {
1818
// debug('changeLocale', lang)
1919

20-
if (!store.isLocaleExist(lang)) {
20+
if (!body.isLocaleExist(lang)) {
2121
debug('process.env.NODE_ENV:', process.env.NODE_ENV)
2222
const localeUrl =
2323
process.env.NODE_ENV === 'development'
@@ -26,18 +26,18 @@ export function changeLocale(lang) {
2626
fetch(localeUrl)
2727
.then(res => res.json())
2828
.then(vals => {
29-
store.setLangMessages(lang, vals)
30-
store.changeLocale(lang)
29+
body.setLangMessages(lang, vals)
30+
body.changeLocale(lang)
3131
})
3232
} else {
33-
store.changeLocale(lang)
33+
body.changeLocale(lang)
3434
}
3535
}
3636

3737
export function openDoraemon() {
38-
store.openDoraemon()
38+
body.openDoraemon()
3939
}
4040

41-
export function init(selectStore) {
42-
store = selectStore
41+
export function init(selectedStore) {
42+
body = selectedStore
4343
}

0 commit comments

Comments
 (0)