fix: components losing props

Apply a fix, but the bug is due to: sveltejs/svelte#9177
BearToCode · Feb 16, 2024 · 8c06fd2 · 8c06fd2
1 parent b6954a4
commit 8c06fd2
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/packages/core/src/lib/components/layout/SidePanel.svelte b/packages/core/src/lib/components/layout/SidePanel.svelte
@@ -64,13 +64,16 @@
 								style="height: {linesHeights[lineIndex]}px;"
 								class="msm__line-number {component.type}"
 							>
-								{#if lineIndex == 0 && !disableMerging && component.sideAction}
+								{#if lineIndex == 0 && !disableMerging && component.sideAction && dispatch !== undefined}
 									<svelte:component
 										this={component.sideAction.component}
-										{...component.sideAction.props}
-										{component}
-										{dispatch}
+										{...{ ...component.sideAction.props, dispatch, component }}
 									/>
+									<!-- 
+										☝️ The weird spread is needed due to a Svelte bug affecting the use of 
+										`<svelte:component>` with spread props and normal ones in v4.
+										See here for more details: https://github.com/sveltejs/svelte/issues/9177	
+									-->
 								{/if}
 
 								<pre>{startingLineNumber + lineIndex}</pre>

diff --git a/packages/core/src/lib/components/layout/View.svelte b/packages/core/src/lib/components/layout/View.svelte
@@ -110,9 +110,13 @@
 			{#each sideComponents as blockComponent}
 				<svelte:component
 					this={blockComponent.component}
-					component={blockComponent}
-					{...blockComponent.props}
+					{...{ ...blockComponent.props, component: blockComponent }}
 				/>
+				<!-- 
+					☝️ The weird spread is needed due to a Svelte bug affecting the use of 
+					`<svelte:component>` with spread props and normal ones in v4.
+					See here for more details: https://github.com/sveltejs/svelte/issues/9177	
+				-->
 			{/each}
 		</div>