@marianmeres/stuic 2.1.15 → 2.1.17

package/dist/components/AlertConfirmPrompt/Current.svelte

@@ -57,12 +57,12 @@
 
 	let current = $derived(acp?.current!);
 
-	let iconFn = $derived.by(() => {
-		let out = current.iconFn;
+	let iconHtml = $derived.by(() => {
+		let fn = current.iconFn as any;
 		if (current.iconFn === true) {
-			out = defaultIcons[current.variant];
+			fn = defaultIcons[current.variant];
 		}
-		return out;
+		return fn?.();
 	});
 
 	let CmpButtonOk = $derived(current.CmpButtonOk ?? Button);
@@ -124,28 +124,24 @@
 
 <div class={twMerge("stuic-acp", _class, classProp)}>
 	<div class={twMerge("wrap", _classWrap, classWrap)}>
-		{#if typeof iconFn === "function"}
-			{@const iconHtml = iconFn()}
-			<!-- fn can return empty -->
-			{#if iconHtml}
-				<div
-					class={twMerge(
-						"icon-box",
-						debug("outline-green-500"),
-						_classIconBox,
-						classIconBox
-					)}
-				>
-					{@html iconFn()}
-				</div>
-			{/if}
+		{#if iconHtml}
+			<div
+				class={twMerge(
+					"icon-box",
+					debug("outline-green-500"),
+					_classIconBox,
+					classIconBox
+				)}
+			>
+				{@html iconHtml}
+			</div>
 		{/if}
 		<div class={twMerge("content-box", _classContentBox, classContentBox)}>
 			<h1
 				class={twMerge(
 					"title",
 					_classTitle,
-					typeof iconFn === "function" && "pt-2",
+					typeof iconHtml === "function" && "pt-2",
 					classTitle
 				)}
 			>

package/dist/components/Notifications/Notifications.svelte

@@ -133,7 +133,7 @@
 
 	let _iconFns = $derived({ ...notificationsDefaultIcons, ...iconFns });
 
-	const maybeIcon = (n: Notification) => n.iconFn ?? _iconFns?.[n.type];
+	const maybeIcon = (n: Notification) => (n.iconFn ?? _iconFns?.[n.type])?.();
 
 	const _classWrapX = `
         fixed z-50 flex flex-row inset-0 
@@ -222,7 +222,7 @@
 		<div class={twMerge("wrap-y", _classWrapY, YMAP_M[yMobile], YMAP[y], classWrapY)}>
 			{#each notifications.stack as n (n.id)}
 				{@const { Cmp, props } = maybeComponent(n)}
-				{@const iconFn = maybeIcon(n)}
+				{@const iconHtml = maybeIcon(n)}
 				{@const showXButton = !noXButton || n.ttl > 1000}
 				{#if Cmp}
 					<Cmp {...props || {}} notification={n} {notifications} />
@@ -247,9 +247,9 @@
 								{n.count}
 							</div>
 						{/if}
-						{#if !noIcons && typeof iconFn === "function"}
+						{#if !noIcons && iconHtml}
 							<div class={twMerge("icon", _classNotifIcon, classNotifIcon)}>
-								{@html iconFn()}
+								{@html iconHtml}
 							</div>
 						{/if}
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@marianmeres/stuic",
-	"version": "2.1.15",
+	"version": "2.1.17",
 	"scripts": {
 		"dev": "vite dev",
 		"build": "vite build && npm run prepack",