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.

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

Fixed stack overflow for @computed on RN, fixes #1777 #1826

Merged
merged 1 commit into from
Dec 3, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion src/api/computed.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,9 @@ export const computedDecorator = createPropDecorator(
const { get, set } = descriptor // initialValue is the descriptor for get / set props
// Optimization: faster on decorator target or instance? Assuming target
// Optimization: find out if declaring on instance isn't just faster. (also makes the property descriptor simpler). But, more memory usage..
// Forcing instance now, fixes hot reloadig issues on React Native:
const options = decoratorArgs[0] || {}
asObservableObject(instance).addComputedProp(decoratorTarget, propertyName, {
asObservableObject(instance).addComputedProp(instance, propertyName, {
get,
set,
context: instance,
Expand Down
28 changes: 12 additions & 16 deletions test/base/babel-tests.js
Original file line number Diff line number Diff line change
Expand Up @@ -574,7 +574,7 @@ test("enumerability", () => {
@computed
get b() {
return this.a
} // non-enumerable, on proto
} // non-enumerable, (and, ideally, on proto)
@action
m() {} // non-enumerable, on proto
@action m2 = () => {} // non-enumerable, on self
Expand All @@ -587,17 +587,15 @@ test("enumerability", () => {
let props = []
for (var key in a) props.push(key)

expect(ownProps).toEqual(
[
// should have a, not supported yet in babel...
]
)
expect(ownProps).toEqual([
// should have a, not supported yet in babel...
])

expect(props).toEqual(["a", "a2"])

expect("a" in a).toBe(true)
expect(a.hasOwnProperty("a")).toBe(false) // true would better..
expect(a.hasOwnProperty("b")).toBe(false)
expect(a.hasOwnProperty("a")).toBe(false)
expect(a.hasOwnProperty("b")).toBe(false) // true would be more consistent, see below
expect(a.hasOwnProperty("m")).toBe(false)
expect(a.hasOwnProperty("m2")).toBe(true)

Expand All @@ -624,7 +622,7 @@ test("enumerability", () => {
expect("a" in a).toBe(true)
expect(a.hasOwnProperty("a")).toBe(true)
expect(a.hasOwnProperty("a2")).toBe(true)
expect(a.hasOwnProperty("b")).toBe(false) // true would also be ok-ish. see: #1398
expect(a.hasOwnProperty("b")).toBe(true) // true would better.. but, #1777
expect(a.hasOwnProperty("m")).toBe(false)
expect(a.hasOwnProperty("m2")).toBe(true)
})
Expand All @@ -636,7 +634,7 @@ test("enumerability - workaround", () => {
@computed
get b() {
return this.a
} // non-enumerable, on proto
} // non-enumerable, (and, ideally, on proto)
@action
m() {} // non-enumerable, on proto
@action m2 = () => {} // non-enumerable, on self
Expand All @@ -663,7 +661,7 @@ test("enumerability - workaround", () => {
expect("a" in a).toBe(true)
expect(a.hasOwnProperty("a")).toBe(true)
expect(a.hasOwnProperty("a2")).toBe(true)
expect(a.hasOwnProperty("b")).toBe(false) // true would also be ok-ish. see: #1398
expect(a.hasOwnProperty("b")).toBe(true) // ideally, false, but #1777
expect(a.hasOwnProperty("m")).toBe(false)
expect(a.hasOwnProperty("m2")).toBe(true)
})
Expand Down Expand Up @@ -701,11 +699,9 @@ test("verify object assign (babel)", () => {
}

const todo = new Todo()
expect(Object.assign({}, todo)).toEqual(
{
// Should be: title: "test"!
}
)
expect(Object.assign({}, todo)).toEqual({
// Should be: title: "test"!
})

todo.title // lazy initialization :'(

Expand Down
6 changes: 3 additions & 3 deletions test/base/typescript-tests.ts
Original file line number Diff line number Diff line change
Expand Up @@ -802,7 +802,7 @@ test("enumerability", () => {
@computed
get b() {
return this.a
} // non-enumerable, on proto
} // non-enumerable, (and, ideally, on proto)
@action
m() {} // non-enumerable, on proto
@action m2 = () => {} // non-enumerable, on self
Expand All @@ -826,7 +826,7 @@ test("enumerability", () => {

t.equal("a" in a, true)
t.equal(a.hasOwnProperty("a"), true)
t.equal(a.hasOwnProperty("b"), false) // ok also ok-ish
t.equal(a.hasOwnProperty("b"), true) // false would be slightly better, true also ok-ish, and, see #1777
t.equal(a.hasOwnProperty("m"), false)
t.equal(a.hasOwnProperty("m2"), true)

Expand All @@ -849,7 +849,7 @@ test("enumerability", () => {

t.equal("a" in a, true)
t.equal(a.hasOwnProperty("a"), true)
t.equal(a.hasOwnProperty("b"), false) // true would also be ok-ish, see: #1398
t.equal(a.hasOwnProperty("b"), true) // false would be slightly better, true also ok-ish, and, see #1777
t.equal(a.hasOwnProperty("m"), false)
t.equal(a.hasOwnProperty("m2"), true)
})
Expand Down