fix(computedWithControl): allow optional oldValue parameter in computedWithControl getter (#4132)

haoyun · web-flow · commit 5725a581dda4 · 2024-08-13T14:16:44.000Z
diff --git a/packages/shared/computedWithControl/index.test.ts b/packages/shared/computedWithControl/index.test.ts
@@ -25,6 +25,23 @@ describe('computedWithControl', () => {
     expect(computed.value).toBe('BAR')
   })
 
+  it.runIf(isVue3)('optional old value', () => {
+    const trigger = ref(0)
+
+    const computed = computedWithControl(trigger, (oldValue?: number) =>
+      oldValue ? oldValue * 2 : 1)
+
+    expect(computed.value).toBe(1)
+
+    trigger.value += 1
+
+    expect(computed.value).toBe(2)
+
+    trigger.value -= 1
+
+    expect(computed.value).toBe(4)
+  })
+
   it.runIf(isVue3)('custom trigger', () => {
     let count = 0
     const computed = computedWithControl(() => {}, () => count)
diff --git a/packages/shared/computedWithControl/index.ts b/packages/shared/computedWithControl/index.ts
@@ -54,7 +54,7 @@ export function computedWithControl<T, S>(
     return {
       get() {
         if (dirty.value) {
-          v = get()
+          v = get(v)
           dirty.value = false
         }
         track()

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ export function computedWithControl<T, S>(`
`54`	`54`	`return {`
`55`	`55`	`get() {`
`56`	`56`	`if (dirty.value) {`
`57`		`- v = get()`
	`57`	`+ v = get(v)`
`58`	`58`	`dirty.value = false`
`59`	`59`	`}`
`60`	`60`	`track()`