Fixed a bug when a new value to set is equal by a link with the previous

V4Fire · Sep 18, 2020 · dc61102 · dc61102
1 parent 32ab235
commit dc61102
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 5 deletions.
diff --git a/src/core/object/watch/CHANGELOG.md b/src/core/object/watch/CHANGELOG.md
@@ -9,6 +9,12 @@ Changelog
 > - :house:      [Internal]
 > - :nail_care:  [Polish]
 
+## v3.27.2 (2020-09-18)
+
+#### :bug: Bug Fix
+
+* Fixed a bug when a new value to set is equal by a link with the previous
+
 ## v3.22.5 (2020-07-31)
 
 #### :bug: Bug Fix

diff --git a/src/core/object/watch/engines/accessors.ts b/src/core/object/watch/engines/accessors.ts
@@ -447,11 +447,12 @@ export function setWatchAccessors(
 
 			set(val: unknown): void {
 				let
-					fromProto = opts?.fromProto ?? false;
-
-				const
+					fromProto = opts?.fromProto ?? false,
 					oldVal = obj[key];
 
+				val = unwrap(val) ?? val;
+				oldVal = unwrap(oldVal) ?? oldVal;
+
 				if (oldVal !== val) {
 					try {
 						obj[key] = val;

diff --git a/src/core/object/watch/engines/proxy.ts b/src/core/object/watch/engines/proxy.ts
@@ -262,6 +262,8 @@ export function watch<T extends object>(
 				return false;
 			}
 
+			val = unwrap(val) ?? val;
+
 			const
 				isArray = Object.isArray(target),
 				isCustomObj = isArray || Object.isCustomObject(target),
@@ -275,8 +277,8 @@ export function watch<T extends object>(
 				key = Number(key);
 			}
 
-			const
-				oldVal = Reflect.get(target, key, isCustomObj ? receiver : target);
+			let oldVal = Reflect.get(target, key, isCustomObj ? receiver : target);
+			oldVal = unwrap(oldVal) ?? oldVal;
 
 			if (oldVal !== val && set()) {
 				if (!opts!.withProto && (fromProto || !isArray && !Object.hasOwnProperty(target, <string>key))) {

diff --git a/src/core/object/watch/spec.js b/src/core/object/watch/spec.js
@@ -94,6 +94,10 @@ describe('core/object/watch', () => {
 				spy(value, oldValue);
 			});
 
+			// eslint-disable-next-line no-self-assign
+			proxy.a = proxy.a;
+			expect(spy).not.toHaveBeenCalled();
+
 			proxy.a.b = [1, 2, 3];
 			expect(spy).toHaveBeenCalledWith([1, 2, 3], []);