From bc06d073a1f5ddb585dc3520d744e565755dc12c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Wi=C5=9Bniowski?= Date: Sat, 15 Feb 2025 17:10:15 +0100 Subject: [PATCH] refactor: revert some style changes and clean some code --- .../playwright-ct-svelte/registerSource.mjs | 32 ++++++------------- 1 file changed, 9 insertions(+), 23 deletions(-) diff --git a/packages/playwright-ct-svelte/registerSource.mjs b/packages/playwright-ct-svelte/registerSource.mjs index 1503e03913a2c..e00b689af4211 100644 --- a/packages/playwright-ct-svelte/registerSource.mjs +++ b/packages/playwright-ct-svelte/registerSource.mjs @@ -59,7 +59,7 @@ function extractParams(component) { }) ); - return {props, slots, on}; + return {...props, ...slots, ...on}; } const __pwSvelteComponentKey = Symbol('svelteComponent'); @@ -75,15 +75,9 @@ window.playwrightMount = async (component, rootElement, hooksConfig) => { if (!isObjectComponent(component)) throw new Error('JSX mount notation is not supported'); - let {props, slots, on} = extractParams(component); - super({ target: rootElement, - props: { - ...props, - ...slots, - ...on, - }, + props: extractParams(component), ...options }); } @@ -106,10 +100,9 @@ window.playwrightMount = async (component, rootElement, hooksConfig) => { }; window.playwrightUnmount = async rootElement => { - const svelteComponent = /** @type {SvelteComponent} */ ( - rootElement[__pwSvelteComponentKey] - ); - if (!svelteComponent) throw new Error('Component was not mounted'); + const svelteComponent = /** @type {SvelteComponent} */ (rootElement[__pwSvelteComponentKey]); + if (!svelteComponent) + throw new Error('Component was not mounted'); svelteComponent.$destroy(); delete rootElement[__pwSvelteComponentKey]; }; @@ -118,16 +111,9 @@ window.playwrightUpdate = async (rootElement, component) => { if (!isObjectComponent(component)) throw new Error('JSX mount notation is not supported'); - const svelteComponent = /** @type {SvelteComponent} */ ( - rootElement[__pwSvelteComponentKey] - ); - if (!svelteComponent) throw new Error('Component was not mounted'); - - let {props, slots, on} = extractParams(component); + const svelteComponent = /** @type {SvelteComponent} */ (rootElement[__pwSvelteComponentKey]); + if (!svelteComponent) + throw new Error('Component was not mounted'); - svelteComponent.$set({ - ...props, - ...slots, - ...on, - }); + svelteComponent.$set(extractParams(component)); };