@@ -5,7 +5,7 @@ import { isKeyPath } from './key-path'
5
5
import { isGetter , fromKeyPath } from './getter'
6
6
import { toJS } from './immutable-helpers'
7
7
import { isArray , toFactory } from './utils'
8
- import { ReactorState , ObserverStoreMap } from './reactor/records'
8
+ import { ReactorState , ObserverState } from './reactor/records'
9
9
10
10
/**
11
11
* State is stored in NuclearJS Reactors. Reactors
@@ -24,7 +24,7 @@ class Reactor {
24
24
25
25
this . prevReactorState = initialReactorState
26
26
this . reactorState = initialReactorState
27
- this . observerStoreMap = new ObserverStoreMap ( )
27
+ this . observerState = new ObserverState ( )
28
28
29
29
this . ReactMixin = createReactMixin ( this )
30
30
@@ -76,10 +76,10 @@ class Reactor {
76
76
handler = getter
77
77
getter = [ ]
78
78
}
79
- let { observerStoreMap , entry } = fns . addObserver ( this . observerStoreMap , getter , handler )
80
- this . observerStoreMap = observerStoreMap ;
79
+ let { observerState , entry } = fns . addObserver ( this . observerState , getter , handler )
80
+ this . observerState = observerState ;
81
81
return ( ) => {
82
- this . observerStoreMap = fns . removeObserverByEntry ( this . observerStoreMap , entry )
82
+ this . observerState = fns . removeObserverByEntry ( this . observerState , entry )
83
83
}
84
84
}
85
85
@@ -91,7 +91,7 @@ class Reactor {
91
91
throw new Error ( 'Must call unobserve with a Getter' )
92
92
}
93
93
94
- this . observerStoreMap = fns . removeObserver ( this . observerStoreMap , getter , handler )
94
+ this . observerState = fns . removeObserver ( this . observerState , getter , handler )
95
95
}
96
96
97
97
/**
@@ -177,6 +177,7 @@ class Reactor {
177
177
const newState = fns . reset ( this . reactorState )
178
178
this . reactorState = newState
179
179
this . prevReactorState = newState
180
+ this . observerState = new ObserverState ( )
180
181
}
181
182
182
183
/**
@@ -196,10 +197,10 @@ class Reactor {
196
197
197
198
let observerIdsToNotify = Immutable . Set ( ) . withMutations ( set => {
198
199
// notify all observers
199
- set . union ( this . observerStoreMap . get ( 'any' ) )
200
+ set . union ( this . observerState . get ( 'any' ) )
200
201
201
202
dirtyStores . forEach ( id => {
202
- const entries = this . observerStoreMap . getIn ( [ 'stores' , id ] )
203
+ const entries = this . observerState . getIn ( [ 'stores' , id ] )
203
204
if ( ! entries ) {
204
205
return
205
206
}
@@ -208,7 +209,7 @@ class Reactor {
208
209
} )
209
210
210
211
observerIdsToNotify . forEach ( ( observerId ) => {
211
- const entry = this . observerStoreMap . getIn ( [ 'observersMap' , observerId ] )
212
+ const entry = this . observerState . getIn ( [ 'observersMap' , observerId ] )
212
213
if ( ! entry ) {
213
214
// don't notify here in the case a handler called unobserve on another observer
214
215
return
@@ -228,7 +229,7 @@ class Reactor {
228
229
}
229
230
} )
230
231
231
- const nextReactorState = this . reactorState . set ( 'dirtyStores' , Immutable . Set ( ) )
232
+ const nextReactorState = fns . resetDirtyStores ( this . reactorState )
232
233
233
234
this . prevReactorState = nextReactorState
234
235
this . reactorState = nextReactorState
0 commit comments