Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix #3747 #3748

Merged
merged 4 commits into from
Aug 31, 2023
Merged

fix #3747 #3748

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8d6f260
fix #3747
mweststrate Aug 31, 2023
436b508
fix
mweststrate Aug 31, 2023
e48ba16
fix 2
mweststrate Aug 31, 2023
60d4072
changelog
mweststrate Aug 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions packages/mobx/__tests__/v5/base/observables.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2505,3 +2505,13 @@ test("state version does not update on observable creation", () => {
check(() => mobx.observable([0], { proxy: true }))
check(() => mobx.computed(() => 0))
})

test("#3747", () => {
mobx.runInAction(() => {
const o = observable.box(0)
const c = computed(() => o.get())
expect(c.get()).toBe(0)
o.set(1)
expect(c.get()).toBe(1) // would fail
})
})
20 changes: 9 additions & 11 deletions packages/mobx/src/core/atom.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,21 +68,19 @@ export class Atom implements IAtom {
* Invoke this method _after_ this method has changed to signal mobx that all its observers should invalidate.
*/
public reportChanged() {
if (globalState.inBatch && this.batchId_ === globalState.batchId) {
// Called from the same batch this atom was created in.
return
if (globalState.inBatch && this.batchId_ !== globalState.batchId) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

!globalState.inBatch || this.batchId_ !== globalState.batchId
If not in batch mutation always updates version immediately.
If in batch only if it's different.

// We could update state version only at the end of batch,
// but we would still have to switch some global flag here to signal a change.
globalState.stateVersion =
globalState.stateVersion < Number.MAX_SAFE_INTEGER
? globalState.stateVersion + 1
: Number.MIN_SAFE_INTEGER
// Avoids the possibility of hitting the same globalState.batchId when it cycled through all integers (necessary?)
this.batchId_ = NaN
}
// Avoids the possibility of hitting the same globalState.batchId when it cycled through all integers (necessary?)
this.batchId_ = NaN

startBatch()
propagateChanged(this)
// We could update state version only at the end of batch,
// but we would still have to switch some global flag here to signal a change.
globalState.stateVersion =
globalState.stateVersion < Number.MAX_SAFE_INTEGER
? globalState.stateVersion + 1
: Number.MIN_SAFE_INTEGER
endBatch()
}

Expand Down
Loading