fix: fixed unmount with vue3 directive and ssr error in mergeData fun…

…ction
ingram-projects · Dec 1, 2021 · 93f58e9 · 93f58e9
1 parent fd11101
commit 93f58e9
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 11 deletions.
diff --git a/packages/vue/src/directives/xyz.js b/packages/vue/src/directives/xyz.js
@@ -10,9 +10,4 @@ export default {
 		updateDirective(...arguments)
 	},
 	update: updateDirective,
-	unbind(el, binding, vnode, oldVnode, isDestroy) {
-		if (!isDestroy) {
-			el.setAttribute('xyz', el._xyzOriginal)
-		}
-	},
 }
diff --git a/packages/vue3/src/directives/xyz.js b/packages/vue3/src/directives/xyz.js
@@ -5,11 +5,9 @@ function updateDirective(el, { value }) {
 }
 
 export default {
-	beforeMount(el, { value }) {
+	beforeMount(el) {
 		el._xyzOriginal = el.getAttribute('xyz')
 		updateDirective(...arguments)
-		el.setAttribute('xyz', clsx(el._xyzOriginal, value))
 	},
 	updated: updateDirective,
-	beforeUnmount: updateDirective,
 }
diff --git a/packages/vue3/src/utils.js b/packages/vue3/src/utils.js
@@ -31,10 +31,10 @@ export function mergeData(data1 = {}, data2 = {}) {
 		...data1,
 		...data2,
 		style: {
-			...data1.style,
-			...data2.style,
+			...data1?.style,
+			...data2?.style,
 		},
-		class: clsx(data1.class, data2.class),
+		class: clsx(data1?.class, data2?.class),
 	}
 }