Merge branch 'huntabyte:main' into main

huntabyte · Sep 25, 2023 · 0461f14 · 0461f14
2 parents 8c8572c + cbbea4f
commit 0461f14
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/apps/www/src/lib/registry/default/example/checkbox-disabled.svelte b/apps/www/src/lib/registry/default/example/checkbox-disabled.svelte
@@ -7,7 +7,7 @@
 	<Checkbox id="terms" disabled />
 	<Label
 		for="terms2"
-		class="text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70"
+		class="text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70 peer-data-[disabled=true]:cursor-not-allowed peer-data-[disabled=true]:opacity-70"
 	>
 		Accept terms and conditions
 	</Label>

diff --git a/apps/www/src/lib/registry/default/ui/checkbox/checkbox.svelte b/apps/www/src/lib/registry/default/ui/checkbox/checkbox.svelte
@@ -12,11 +12,11 @@
 </script>
 
 <CheckboxPrimitive.Root
-	bind:checked
 	class={cn(
-		"peer h-4 w-4 shrink-0 rounded-sm border border-primary ring-offset-background focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 data-[state=checked]:bg-primary data-[state=checked]:text-primary-foreground",
+		"peer h-4 w-4 shrink-0 rounded-sm border border-primary ring-offset-background focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 data-[state=checked]:bg-primary data-[state=checked]:text-primary-foreground data-[disabled=true]:cursor-not-allowed data-[disabled=true]:opacity-50",
 		className
 	)}
+	bind:checked
 	{...$$restProps}
 	on:click
 >

diff --git a/apps/www/src/lib/registry/new-york/example/checkbox-disabled.svelte b/apps/www/src/lib/registry/new-york/example/checkbox-disabled.svelte
@@ -7,7 +7,7 @@
 	<Checkbox id="terms" disabled />
 	<Label
 		for="terms2"
-		class="text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70"
+		class="text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70 peer-data-[disabled=true]:cursor-not-allowed peer-data-[disabled=true]:opacity-70"
 	>
 		Accept terms and conditions
 	</Label>

diff --git a/apps/www/src/lib/registry/new-york/ui/checkbox/checkbox.svelte b/apps/www/src/lib/registry/new-york/ui/checkbox/checkbox.svelte
@@ -13,7 +13,7 @@
 
 <CheckboxPrimitive.Root
 	class={cn(
-		"peer h-4 w-4 shrink-0 rounded-sm border border-primary shadow focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:cursor-not-allowed disabled:opacity-50 data-[state=checked]:bg-primary data-[state=checked]:text-primary-foreground",
+		"peer h-4 w-4 shrink-0 rounded-sm border border-primary shadow focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:cursor-not-allowed disabled:opacity-50 data-[state=checked]:bg-primary data-[state=checked]:text-primary-foreground data-[disabled=true]:cursor-not-allowed data-[disabled=true]:opacity-50",
 		className
 	)}
 	bind:checked