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

Commit 2383871

Browse files
committed
new markState syntax, like setState now
1 parent 19fe090 commit 2383871

File tree

4 files changed

+41
-37
lines changed

4 files changed

+41
-37
lines changed

containers/Sidebar/logic.js

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,30 +5,18 @@ const debug = makeDebugger('L:sidebar')
55

66
let sidebar = null
77

8-
/*
9-
export const enterSidebar2 = debounce(() => {
10-
debug('enterSidebar <--<: ')
11-
sidebar.toggleOpen()
12-
}, 200)
13-
14-
export const leaveSidebar2 = debounce(() => {
15-
debug('leaveSidebar >-->: ')
16-
sidebar.toggleOpen()
17-
}, 100)
18-
*/
19-
208
export function pin() {
219
debug('pin: ', !sidebar.pin)
22-
sidebar.markState('pin', !sidebar.pin)
10+
sidebar.markState({ pin: !sidebar.pin })
2311
}
2412

2513
export function enterSidebar() {
26-
sidebar.markState('open', true)
14+
sidebar.markState({ open: true })
2715
}
2816

2917
export function leaveSidebar() {
3018
if (!sidebar.pin) {
31-
sidebar.markState('open', false)
19+
sidebar.markState({ open: false })
3220
}
3321
}
3422

containers/UniversePanel/logic.js

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -24,22 +24,15 @@ export const repoNotFound = R.allPass([
2424
isNotSearching,
2525
])
2626

27-
/*
28-
export function repoNotFound() {
29-
return (
30-
R.isEmpty(store.reposData) &&
31-
!store.searching &&
32-
!R.isEmpty(store.inputValue)
33-
)
34-
}
35-
*/
36-
3727
export function search(e) {
3828
// console.log('search: ', val)
39-
const value = e.target.value
40-
store.markState('inputValue', value)
41-
store.markState('searching', true)
42-
Pigeon.search(value)
29+
const inputValue = e.target.value
30+
// store.markState('inputValue', value)
31+
store.markState({
32+
inputValue,
33+
searching: true,
34+
})
35+
Pigeon.search(inputValue)
4336
}
4437

4538
export function init(selectedStore) {
@@ -50,13 +43,17 @@ export function init(selectedStore) {
5043
Pigeon.get().subscribe(res => {
5144
debug('Pigeon get: ', res)
5245
// debug('washed: ', repoData(res.items))
53-
store.markState('searching', false)
46+
store.markState({
47+
searching: false,
48+
})
5449
store.replaceRepos(repoData(res.items))
5550
})
5651

5752
Pigeon.emptyInput().subscribe(() => {
5853
debug('Pigeon get emptyInput!')
59-
store.markState('searching', false)
54+
store.markState({
55+
searching: false,
56+
})
6057
store.clearRepos()
6158
})
6259
}

stores/GithubEampleStore/index.js

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
*/
55

66
import { types as t, getParent } from 'mobx-state-tree'
7+
import R from 'ramda'
8+
9+
import { isObject } from '../../utils'
710
// import { makeDebugger } from '../../utils/debug'
811

912
// const debug = makeDebugger('S:GithubEampleStore')
@@ -45,7 +48,17 @@ const GithubEampleStore = t
4548
clearRepos() {
4649
self.repos = []
4750
},
48-
markState(key, val) {
51+
52+
markState(sobj) {
53+
if (!isObject(sobj)) {
54+
throw new Error('markState get no object params')
55+
}
56+
R.forEachObjIndexed((val, key) => {
57+
self[key] = val
58+
}, sobj)
59+
},
60+
61+
markState2(key, val) {
4962
self[key] = val
5063
},
5164
}))

stores/SidebarStore/index.js

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@
44
*/
55

66
import { types as t, getParent } from 'mobx-state-tree'
7+
import R from 'ramda'
78
import { makeDebugger } from '../../utils/debug'
8-
9+
import { isObject } from '../../utils'
910
import MenuItem from './MenuItemStore'
1011
import fakeMenuItems from './fake_menu_items'
1112

@@ -44,8 +45,8 @@ const SidebarStore = t
4445
},
4546
}))
4647
.actions(self => ({
47-
loadAllMenuItem() {
48-
debug('loadAllMenuItem ...')
48+
loadMenuItem() {
49+
debug('loadMenuItem ...')
4950
self.menuItems = fakeMenuItems
5051
},
5152

@@ -54,8 +55,13 @@ const SidebarStore = t
5455
self.loading = !self.loading
5556
},
5657

57-
markState(key, val) {
58-
self[key] = val
58+
markState(sobj) {
59+
if (!isObject(sobj)) {
60+
throw new Error('markState get no object params')
61+
}
62+
R.forEachObjIndexed((val, key) => {
63+
self[key] = val
64+
}, sobj)
5965
},
6066

6167
addOne() {

0 commit comments

Comments
 (0)