@hyvor/design 1.0.10 → 1.0.11

package/dist/components/Dropdown/DropdownContent.svelte

@@ -90,11 +90,11 @@
 		}
 	}
 
-	run(() => {
-		if (position || align) {
-			positionWrap();
-		}
-	});
+	$effect(() => {
+		position;
+		align;
+		positionWrap();
+	})
 
 	function debouncedPosition() {
 		debounce(positionWrap, 10)();
@@ -110,6 +110,10 @@
 			subtree: true,
 			childList: true
 		});
+
+		return () => {
+			mutationObserver.disconnect();
+		};
 	});
 
 	function slideIn(node: any) {

package/dist/components/HyvorBar/Notice/BarLicense.svelte

@@ -5,32 +5,48 @@
 
 	let { name } = $props();
 
-	function remainingTrialDays(endsAt: number | undefined | null) {
-		if (!endsAt) {
-			return 1;
-		}
-
-		const endsAtDate = new Date(endsAt * 1000);
+	function daysDiff(unix: number) {
+		const date = new Date(unix * 1000);
 		const now = new Date();
 
-		const diffTime = endsAtDate.valueOf() - now.valueOf();
+		const diffTime = date.valueOf() - now.valueOf();
 		const diffDays = Math.ceil(diffTime / (1000 * 60 * 60 * 24));
 
 		return Math.max(diffDays, 1);
 	}
 
+	function remainingTrialDays(endsAt: number | undefined | null) {
+		if (!endsAt) {
+			return 1;
+		}
+		return daysDiff(endsAt);
+	}
+
+	function remainingCancelAtDAys(cancelAt: number | undefined | null) : null | number {
+		if (!cancelAt) {
+			return null;
+		}
+		return daysDiff(cancelAt);
+	}
+
 	let trialDays = $derived(remainingTrialDays($barLicense?.trial_ends_at));
+	let cancelAtDays = $derived(remainingCancelAtDAys($barLicense?.subscription?.cancel_at));
 </script>
 
 {#if $barLicense}
 	<a class="wrap" href="/console/billing">
 		{#if $barLicense.type === 'subscription'}
 			<Tooltip
-				text="Your current subscription plan for {name}. Click to manage it."
 				position="bottom"
 			>
+				{#snippet tooltip()}
+					Your current subscription plan for {name}. Click to manage it.
+				{/snippet}
 				<Tag color="blue" size="small">
-					{$barLicense.plan}
+					{$barLicense.subscription!.plan_readable}
+					{#if cancelAtDays}
+						(until {cancelAtDays}d)
+					{/if}
 				</Tag>
 			</Tooltip>
 		{:else if $barLicense.type === 'custom'}

package/dist/components/HyvorBar/bar.d.ts

@@ -21,14 +21,18 @@ export interface BarUpdate {
     url?: string;
 }
 export type BarUpdateType = 'company' | 'core' | 'talk' | 'blogs' | 'fortguard';
-export interface BarLicense {
+export interface BarResolvedLicense {
     type: 'subscription' | 'trial' | 'custom' | 'expired';
-    plan: string | null;
-    trial_ends_at: number | null;
+    license: Record<string, number | boolean> | null;
+    subscription: null | {
+        plan_readable: string;
+        cancel_at: null | number;
+    };
+    trial_ends_at: null | number;
 }
 export declare const barUser: import("svelte/store").Writable<BarUser | null>;
 export declare const barUnreadUpdates: import("svelte/store").Writable<number>;
-export declare const barLicense: import("svelte/store").Writable<BarLicense | null>;
+export declare const barLicense: import("svelte/store").Writable<BarResolvedLicense | null>;
 export declare const barHasFailedInvoices: import("svelte/store").Writable<boolean>;
 export declare function loadBarUser(instance: string, product: BarProduct): void;
 export declare class UnreadUpdatesTimeLocalStorage {

package/package.json

@@ -59,5 +59,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"version": "1.0.10"
+	"version": "1.0.11"
 }