fix(ivy): use devModeEqual in no change mode (#25252)
To avoid the unfamous error `Expression has changed after it was checked.` PR Close #25252
This commit is contained in:
parent
1fb7111da1
commit
b38931b484
|
@ -2739,7 +2739,7 @@ export function bindingUpdated(value: any): boolean {
|
||||||
|
|
||||||
if (bindingIndex >= viewData.length) {
|
if (bindingIndex >= viewData.length) {
|
||||||
viewData[viewData[BINDING_INDEX]++] = value;
|
viewData[viewData[BINDING_INDEX]++] = value;
|
||||||
} else if (isDifferent(viewData[bindingIndex], value)) {
|
} else if (isDifferent(viewData[bindingIndex], value, checkNoChangesMode)) {
|
||||||
throwErrorIfNoChangesMode(creationMode, checkNoChangesMode, viewData[bindingIndex], value);
|
throwErrorIfNoChangesMode(creationMode, checkNoChangesMode, viewData[bindingIndex], value);
|
||||||
viewData[viewData[BINDING_INDEX]++] = value;
|
viewData[viewData[BINDING_INDEX]++] = value;
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -5,15 +5,20 @@
|
||||||
* Use of this source code is governed by an MIT-style license that can be
|
* Use of this source code is governed by an MIT-style license that can be
|
||||||
* found in the LICENSE file at https://angular.io/license
|
* found in the LICENSE file at https://angular.io/license
|
||||||
*/
|
*/
|
||||||
|
import {devModeEqual} from '../change_detection/change_detection';
|
||||||
import {assertLessThan} from './assert';
|
import {assertLessThan} from './assert';
|
||||||
import {LElementNode} from './interfaces/node';
|
import {LElementNode} from './interfaces/node';
|
||||||
import {HEADER_OFFSET, LViewData} from './interfaces/view';
|
import {HEADER_OFFSET, LViewData} from './interfaces/view';
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Must use this method for CD (instead of === ) since NaN !== NaN
|
* Returns wether the values are different from a change detection stand point.
|
||||||
*/
|
*
|
||||||
export function isDifferent(a: any, b: any): boolean {
|
* Constraints are relaxed in checkNoChanges mode. See `devModeEqual` for details.
|
||||||
|
*/
|
||||||
|
export function isDifferent(a: any, b: any, checkNoChangesMode: boolean): boolean {
|
||||||
|
if (ngDevMode && checkNoChangesMode) {
|
||||||
|
return !devModeEqual(a, b);
|
||||||
|
}
|
||||||
// NaN is the only value that is not equal to itself so the first
|
// NaN is the only value that is not equal to itself so the first
|
||||||
// test checks if both a and b are not NaN
|
// test checks if both a and b are not NaN
|
||||||
return !(a !== a && b !== b) && a !== b;
|
return !(a !== a && b !== b) && a !== b;
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
"name": "BLOOM_MASK"
|
"name": "BLOOM_MASK"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "CIRCULAR$1"
|
"name": "CIRCULAR$2"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "CLEANUP"
|
"name": "CLEANUP"
|
||||||
|
|
|
@ -12,25 +12,58 @@ describe('util', () => {
|
||||||
|
|
||||||
describe('isDifferent', () => {
|
describe('isDifferent', () => {
|
||||||
|
|
||||||
it('should mark non-equal arguments as different', () => {
|
describe('checkNoChangeMode = false', () => {
|
||||||
expect(isDifferent({}, {})).toBeTruthy();
|
it('should mark non-equal arguments as different', () => {
|
||||||
expect(isDifferent('foo', 'bar')).toBeTruthy();
|
expect(isDifferent({}, {}, false)).toBeTruthy();
|
||||||
expect(isDifferent(0, 1)).toBeTruthy();
|
expect(isDifferent('foo', 'bar', false)).toBeTruthy();
|
||||||
|
expect(isDifferent(0, 1, false)).toBeTruthy();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should not mark equal arguments as different', () => {
|
||||||
|
const obj = {};
|
||||||
|
expect(isDifferent(obj, obj, false)).toBeFalsy();
|
||||||
|
expect(isDifferent('foo', 'foo', false)).toBeFalsy();
|
||||||
|
expect(isDifferent(1, 1, false)).toBeFalsy();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should not mark NaN as different',
|
||||||
|
() => { expect(isDifferent(NaN, NaN, false)).toBeFalsy(); });
|
||||||
|
|
||||||
|
it('should mark NaN with other values as different', () => {
|
||||||
|
expect(isDifferent(NaN, 'foo', false)).toBeTruthy();
|
||||||
|
expect(isDifferent(5, NaN, false)).toBeTruthy();
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should not mark equal arguments as different', () => {
|
describe('checkNoChangeMode = true', () => {
|
||||||
const obj = {};
|
// Assert relaxed constraint in checkNoChangeMode
|
||||||
expect(isDifferent(obj, obj)).toBeFalsy();
|
it('should not mark non-equal arrays, object and function as different', () => {
|
||||||
expect(isDifferent('foo', 'foo')).toBeFalsy();
|
expect(isDifferent([], [], true)).toBeFalsy();
|
||||||
expect(isDifferent(1, 1)).toBeFalsy();
|
expect(isDifferent(() => 0, () => 0, true)).toBeFalsy();
|
||||||
|
expect(isDifferent({}, {}, true)).toBeFalsy();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should mark non-equal arguments as different', () => {
|
||||||
|
expect(isDifferent('foo', 'bar', true)).toBeTruthy();
|
||||||
|
expect(isDifferent(0, 1, true)).toBeTruthy();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should not mark equal arguments as different', () => {
|
||||||
|
const obj = {};
|
||||||
|
expect(isDifferent(obj, obj, false)).toBeFalsy();
|
||||||
|
expect(isDifferent('foo', 'foo', false)).toBeFalsy();
|
||||||
|
expect(isDifferent(1, 1, false)).toBeFalsy();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should not mark NaN as different',
|
||||||
|
() => { expect(isDifferent(NaN, NaN, false)).toBeFalsy(); });
|
||||||
|
|
||||||
|
it('should mark NaN with other values as different', () => {
|
||||||
|
expect(isDifferent(NaN, 'foo', false)).toBeTruthy();
|
||||||
|
expect(isDifferent(5, NaN, false)).toBeTruthy();
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should not mark NaN as different', () => { expect(isDifferent(NaN, NaN)).toBeFalsy(); });
|
|
||||||
|
|
||||||
it('should mark NaN with other values as different', () => {
|
|
||||||
expect(isDifferent(NaN, 'foo')).toBeTruthy();
|
|
||||||
expect(isDifferent(5, NaN)).toBeTruthy();
|
|
||||||
});
|
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('flatten', () => {
|
describe('flatten', () => {
|
||||||
|
|
Loading…
Reference in New Issue