From bb82205bcee377fd0f66ed61b53ad059ad95963e Mon Sep 17 00:00:00 2001
From: skirtle <65301168+skirtles-code@users.noreply.github.com>
Date: Fri, 18 Nov 2022 07:24:43 +0000
Subject: [PATCH] Fix merging of ref props in addProps (#3)

---
 src/__tests__/vue-vnode-utils.spec.ts | 44 +++++++++++++++++++++++++++
 src/vue-vnode-utils.ts                |  2 +-
 2 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/src/__tests__/vue-vnode-utils.spec.ts b/src/__tests__/vue-vnode-utils.spec.ts
index addfd8b..ec00767 100644
--- a/src/__tests__/vue-vnode-utils.spec.ts
+++ b/src/__tests__/vue-vnode-utils.spec.ts
@@ -10,6 +10,7 @@ import {
   Fragment,
   h,
   isVNode,
+  ref,
   Text,
   type VNode,
   type VNodeArrayChildren,
@@ -422,6 +423,49 @@ describe('addProps', () => {
     expect(fragment[0]).toBe(spanNode)
     expect(spanNode.props).toBe(null)
   })
+
+  it('addProps - 8259', () => {
+    let count = 0
+
+    const spanRef = ref()
+    const otherRef = ref()
+    const spanNode = h('span', { ref: spanRef, class: 'bold', style: 'color: red' })
+    const startNodes = [spanNode]
+
+    const nodes = addProps(startNodes, () => {
+      count++
+
+      return {
+        ref: otherRef,
+        class: 'large',
+        style: 'line-height: 1'
+      }
+    })
+
+    expect(count).toBe(1)
+
+    expect(nodes).toHaveLength(1)
+
+    const newNode = nodes[0] as VNode
+    const props = newNode.props
+
+    expect(props?.class).toBe('bold large')
+    expect(props?.style.color).toBe('red')
+    expect(props?.style['line-height']).toBe('1')
+
+    const mergedRef = newNode.ref
+
+    expect(Array.isArray(mergedRef)).toBe(true)
+    expect(mergedRef).toHaveLength(2)
+
+    // Keep TS happy...
+    if (Array.isArray(mergedRef)) {
+      const refs = mergedRef.map(({ r }) => r)
+
+      expect(refs.includes(spanRef)).toBe(true)
+      expect(refs.includes(otherRef)).toBe(true)
+    }
+  })
 })
 
 describe('replaceChildren', () => {
diff --git a/src/vue-vnode-utils.ts b/src/vue-vnode-utils.ts
index 2dbd75a..eac9b52 100644
--- a/src/vue-vnode-utils.ts
+++ b/src/vue-vnode-utils.ts
@@ -232,7 +232,7 @@ export const addProps = (
     }
 
     if (props && !isEmptyObject(props)) {
-      return cloneVNode(vnode, props)
+      return cloneVNode(vnode, props, true)
     }
   }, options)
 }