[fix](@svelteui/core): failing test for Input

svelteuidev · Jul 28, 2023 · c6be295 · c6be295
1 parent ef64c79
commit c6be295
Showing 1 changed file with 16 additions and 17 deletions.
diff --git a/packages/svelteui-core/src/components/Input/Input.svelte b/packages/svelteui-core/src/components/Input/Input.svelte
@@ -120,23 +120,6 @@ Base component to create custom inputs
 
 <!-- svelte-ignore a11y-autofocus -->
 <Box {...wrapperProps} class={cx(classes.root, getStyles({ css: override }))} {...$$restProps}>
-	<!-- @TODO: This is a workaround for current limitations of slot forwarding, see comment above -->
-	<span bind:this={iconElement} class={cx({ [classes.iconWrapper]: !!icon || isIconSlotUsed })}>
-		<slot name="icon">
-			{#if icon}
-				<div class={classes.icon}>
-					<IconRenderer {icon} {iconProps} iconSize={16} />
-				</div>
-			{/if}
-		</slot>
-	</span>
-	<!-- @TODO: This is a workaround for current limitations of slot forwarding, see comment above -->
-	{#if icon && !isIconSlotUsed}
-		<div class={cx(classes.icon, classes.iconWrapper)}>
-			<IconRenderer {icon} {iconProps} iconSize={16} />
-		</div>
-	{/if}
-
 	{#if isHTMLElement && root === 'input'}
 		<input
 			{value}
@@ -225,6 +208,22 @@ Base component to create custom inputs
 			<slot />
 		</svelte:component>
 	{/if}
+	<!-- @TODO: This is a workaround for current limitations of slot forwarding, see comment above -->
+	<span bind:this={iconElement} class={cx({ [classes.iconWrapper]: !!icon || isIconSlotUsed })}>
+		<slot name="icon">
+			{#if icon}
+				<div class={classes.icon}>
+					<IconRenderer {icon} {iconProps} iconSize={16} />
+				</div>
+			{/if}
+		</slot>
+	</span>
+	<!-- @TODO: This is a workaround for current limitations of slot forwarding, see comment above -->
+	{#if icon && $$slots.icon && !isIconSlotUsed}
+		<div class={cx(classes.icon, classes.iconWrapper)}>
+			<IconRenderer {icon} {iconProps} iconSize={16} />
+		</div>
+	{/if}
 	{#if showRightSection}
 		<div {...rightSectionProps} class={classes.rightSection}>
 			<slot name="rightSection" />