fix(ui): ability to remove icon from badge

Signed-off-by: Jordan Shatford <[email protected]>
jordanshatford · Mar 14, 2024 · 9010e11 · 9010e11
1 parent de56ac9
commit 9010e11
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 6 deletions.
diff --git a/.changeset/rare-cherries-fix.md b/.changeset/rare-cherries-fix.md
@@ -0,0 +1,5 @@
+---
+"@yd/ui": patch
+---
+
+fix: ability to remove icon from badge
diff --git a/apps/extension/src/lib/components/PopupMain.svelte b/apps/extension/src/lib/components/PopupMain.svelte
@@ -38,11 +38,11 @@
 	</Card>
 	<Card>
 		<div class="flex max-w-full flex-wrap justify-center gap-2 p-2">
-			<Badge variant="success">{options.format.toUpperCase()}</Badge>
-			<Badge variant="success">{options.quality.toUpperCase()}</Badge>
-			<Badge variant={options.embed_metadata ? 'success' : 'error'}>Metadata</Badge>
-			<Badge variant={options.embed_thumbnail ? 'success' : 'error'}>Thumbnail</Badge>
-			<Badge variant={options.embed_subtitles ? 'success' : 'error'}>Subtitles</Badge>
+			<Badge icon={false} variant="success">{options.format.toUpperCase()}</Badge>
+			<Badge icon={false} variant="success">{options.quality.toUpperCase()}</Badge>
+			<Badge icon={false} variant={options.embed_metadata ? 'success' : 'error'}>Metadata</Badge>
+			<Badge icon={false} variant={options.embed_thumbnail ? 'success' : 'error'}>Thumbnail</Badge>
+			<Badge icon={false} variant={options.embed_subtitles ? 'success' : 'error'}>Subtitles</Badge>
 		</div>
 	</Card>
 	{#if $store.currentDownload}

diff --git a/packages/ui/src/lib/components/Badge.svelte b/packages/ui/src/lib/components/Badge.svelte
@@ -69,7 +69,13 @@
 	export let icon: boolean | IconSource = false;
 	export let loading: boolean = false;
 
-	const _icon = typeof icon === 'object' ? icon : toIcon(variant, { loading });
+	let _icon: IconSource | undefined = undefined;
+	// User specified icon
+	if (typeof icon === 'object') {
+		_icon = icon;
+	} else if (icon) {
+		_icon = toIcon(variant, { loading });
+	}
 
 	const { spanClass, iconWrapperClass, iconClass, textClass, buttonClass } = badgeClasses({
 		variant,