Skip to content

Commit 96e118e

Browse files
committed
lfg
1 parent 7411abe commit 96e118e

File tree

12 files changed

+46
-37
lines changed

12 files changed

+46
-37
lines changed

components/aside.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -231,8 +231,8 @@ const asideLinkStyles = tv({
231231
base: "relative block group focus:outline-none focus-visible:bg-muted/50 focus-visible:ring-inset focus-visible:ring-1 focus-visible:ring-primary rounded-lg pl-2.5 h-9 text-base transition-colors hover:bg-muted/60 hover:text-fg lg:text-sm",
232232
variants: {
233233
isActive: {
234-
true: "font-medium text-fg",
235-
false: "text-muted-fg"
234+
false: "text-muted-fg forced-colors:text-[Gray] hover:text-fg",
235+
true: "text-fg forced-colors:text-[LinkText]"
236236
}
237237
}
238238
})
@@ -247,7 +247,7 @@ function AsideLink({ indicatorClassName, className, children, ...props }: AsideL
247247
<motion.span
248248
layoutId="current-indicator-sidebar"
249249
className={cn(
250-
"absolute inset-y-1 left-[1rem] w-0.5 rounded-full bg-fg",
250+
"absolute inset-y-1 left-[1rem] w-0.5 rounded-full bg-fg forced-colors:bg-[Highlight]",
251251
indicatorClassName
252252
)}
253253
/>

components/doc-how.tsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ export function DocHow({
4040
codeString = codeString.replace(/function\s+\w+\s*\(/g, "function App(")
4141
const divProps = { ...props } as React.HTMLProps<HTMLDivElement>
4242
return (
43-
<div className={cn("not-prose relative my-4", className)} {...divProps}>
43+
<div className={cn("not-prose forced-color-adjust-non relative my-4", className)} {...divProps}>
4444
<Tabs aria-label="Packages">
4545
<TabsList fullscreenUrl={fullscreenUrl} />
4646
<Tabs.Panel className="w-full" id="preview">
@@ -85,10 +85,10 @@ const tabStyles = tv({
8585
],
8686
variants: {
8787
isSelected: {
88-
false: "text-muted-fg",
89-
true: "text-fg forced-colors:bg-[Highlight] forced-colors:text-[HighlightText]"
88+
false: "text-muted-fg forced-colors:text-[Gray] forced-colors:hover:text-[MenuText]",
89+
true: "text-fg forced-colors:text-[MenuText] forced-colors:hover:text-[MenuText]"
9090
},
91-
isFocused: { false: "ring-0", true: "text-fg" },
91+
isFocused: { false: "ring-0", true: "text-fg forced-colors:text-[MenuText]" },
9292
isDisabled: {
9393
true: "text-muted-fg/50 forced-colors:text-[GrayText] forced-colors:selected:bg-[GrayText] forced-colors:selected:text-[HighlightText]"
9494
}
@@ -114,7 +114,7 @@ const Tab = ({ children, ...props }: TabProps) => {
114114
layoutId="current_indicator"
115115
transition={{ type: "spring", bounce: 0.25, duration: 0.5 }}
116116
className={cn(
117-
"absolute rounded bg-fg",
117+
"absolute rounded bg-fg forced-colors:bg-[ActiveBorder]",
118118
"group-orientation-horizontal:inset-x-0 group-orientation-horizontal:-bottom-px group-orientation-horizontal:h-0.5 group-orientation-horizontal:w-full group-orientation-vertical:left-0 group-orientation-vertical:h-[calc(100%-10%)] group-orientation-vertical:w-0.5 group-orientation-vertical:transform"
119119
)}
120120
/>

components/nav-item.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ const navLinkStyles = tv({
1111
base: "relative flex focus-visible:text-fg items-center gap-x-3 tracking-tight py-2 text-sm text-muted-fg transition-colors focus:outline-none sm:py-3",
1212
variants: {
1313
isActive: {
14-
true: "text-fg",
15-
false: "text-muted-fg hover:text-fg"
14+
false: "text-muted-fg hover:text-fg forced-colors:text-[Gray]",
15+
true: "text-fg forced-colors:text-[WindowText]"
1616
}
1717
}
1818
})

components/table-of-contents.tsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ export function TableOfContents({ className, items }: Props) {
5656
<aside
5757
ref={tocRef}
5858
className={cn(
59-
"not-prose",
59+
"not-prose forced-color-adjust-none",
6060
"xl:sticky no-scrollbar xl:top-[1.75rem] xl:-mr-6 xl:h-[calc(100vh-4.75rem)] xl:flex-none xl:overflow-y-auto xl:py-16 xl:pr-6",
6161
isProBannerVisible ? "top-32" : "top-20",
6262
className
@@ -113,7 +113,9 @@ function TocLink({ item, activeId }: { item: TableOfContentsProps; activeId: str
113113
<Link
114114
className={cn(
115115
"outline-none block no-underline tracking-tight lg:text-[0.885rem] duration-200",
116-
item.url.split("#")[1] === activeId ? "text-fg" : "text-muted-fg/90"
116+
item.url.split("#")[1] === activeId
117+
? "text-fg forced-colors:text-[Highlight]"
118+
: "text-muted-fg/90 forced-colors:text-[GrayText]"
117119
)}
118120
href={item.url}
119121
>

components/ui/calendar.tsx

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,12 @@ import { cr, ctr, focusRing } from "./primitive"
2121

2222
const cellStyles = tv({
2323
extend: focusRing,
24-
base: "flex size-10 sm:size-9 cursor-default tabular-nums items-center justify-center rounded-full lg:text-sm forced-color-adjust-none",
24+
base: "flex size-10 sm:size-9 cursor-default tabular-nums items-center justify-center rounded-full lg:text-sm forced-colors:outline-0",
2525
variants: {
2626
isSelected: {
27-
false: "text-fg hover:bg-secondary-fg/15 pressed:bg-secondary-fg/20",
28-
true: "bg-primary text-primary-fg invalid:bg-danger invalid:text-danger-fg forced-colors:bg-[Highlight] forced-colors:text-[HighlightText] forced-colors:invalid:bg-[Mark]"
27+
false:
28+
"text-fg forced-colors:text-[ButtonText] hover:bg-secondary-fg/15 pressed:bg-secondary-fg/20",
29+
true: "bg-primary text-primary-fg invalid:bg-danger invalid:text-danger-fg forced-colors:bg-[Highlight] forced-colors:text-[Highlight] forced-colors:invalid:bg-[Mark]"
2930
},
3031
isDisabled: {
3132
true: "text-muted-fg/70 forced-colors:text-[GrayText]"

components/ui/command-menu.tsx

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ const commandStyles = tv({
2323
],
2424
list: "overflow-y-auto lg:pb-0 max-h-[calc(100vh-35%)] pb-16 [&:not(:has(.xda32kfseccmd))]:p-2 [&:not(:has(.xda32kfseccmd))_.s3xsprt]:my-2 overflow-x-hidden md:max-h-[456px]",
2525
input: [
26-
"flex w-full rounded-md bg-transparent text-base placeholder:text-muted-fg",
26+
"flex w-full rounded-md forced-colors:focus:outline-0 bg-transparent text-base placeholder:text-muted-fg",
2727
"focus:outline-none",
2828
"disabled:opacity-50 disabled:cursor-not-allowed"
2929
],
@@ -32,7 +32,7 @@ const commandStyles = tv({
3232
"[&_[cmdk-group-heading]]:select-none [&_[cmdk-group-heading]]:ml-[1px] [&_[cmdk-group-heading]]:py-2 [&_[cmdk-group-heading]]:text-[0.8rem] [&_[cmdk-group-heading]]:text-muted-fg"
3333
],
3434
modal: [
35-
"fixed bottom-0 left-[50%] top-auto z-50 grid h-[calc(100vh-35%)] w-full max-w-full translate-x-[-50%] gap-4 overflow-hidden rounded-t-xl bg-overlay text-overlay-fg shadow-lg ring-1 ring-dark/5 dark:ring-border sm:bottom-auto sm:top-[6rem] sm:h-auto sm:w-full sm:max-w-2xl sm:rounded-xl",
35+
"fixed bottom-0 left-[50%] top-auto z-50 grid h-[calc(100vh-35%)] w-full max-w-full translate-x-[-50%] gap-4 overflow-hidden rounded-t-xl bg-overlay text-overlay-fg shadow-lg forced-colors:border ring-1 ring-dark/5 dark:ring-border sm:bottom-auto sm:top-[6rem] sm:h-auto sm:w-full sm:max-w-2xl sm:rounded-xl",
3636
"sm:entering:slide-in-from-bottom-auto entering:duration-300 entering:animate-in entering:fade-in-0 entering:slide-in-from-bottom-1/2 entering:slide-in-from-left-1/2 entering:[transition-timing-function:ease-out] sm:entering:duration-300 sm:entering:slide-in-from-top-[2rem]",
3737
"exiting:duration-300 exiting:animate-out exiting:fade-out-0 exiting:slide-out-to-bottom-1/2 exiting:slide-out-to-left-1/2 exiting:[transition-timing-function:ease] sm:exiting:slide-out-to-top-[4rem]"
3838
],
@@ -45,13 +45,14 @@ const commandStyles = tv({
4545
kbdKeyboard: "lg:block hidden group-data-[selected=true]:opacity-60",
4646
description: "sm:inline hidden text-sm ml-auto",
4747
item: [
48-
"group relative flex cursor-default select-none items-center rounded-lg py-2 text-sm outline-none",
49-
"data-[selected=true]:bg-accent data-[selected=true]:text-accent-fg [&[data-selected=true]_[data-slot=icon]]:text-accent-fg",
48+
"group relative flex forced-colors:outline-0 cursor-default select-none text-fg items-center rounded-lg py-2 text-sm outline-none",
49+
"data-[selected=true]:bg-accent forced-colors:data-[selected=true]:bg-[Highlight] forced-colors:data-[selected=true]:text-[ActiveCaption] forced-colors:text-[WindowText] data-[selected=true]:text-accent-fg [&[data-selected=true]_[data-slot=icon]]:text-accent-fg",
5050
"focus-visible:bg-accent focus-visible:text-accent-fg [&:focus-visible_[data-slot=icon]]:text-accent-fg",
5151
"data-[danger=true]:text-danger data-[danger=true]:data-[selected=true]:bg-danger data-[danger=true]:data-[selected=true]:text-danger-fg",
5252
"data-[disabled=true]:pointer-events-none data-[disabled=true]:opacity-50",
5353
"[&_[data-slot=icon]]:mr-2 [&_[data-slot=icon]]:size-[1.10rem] [&_[data-slot=icon]]:shrink-0 [&_[data-slot=icon]]:text-muted-fg",
54-
"[&_[data-slot=avatar]]:mr-2 [&_[data-slot=avatar]]:size-[1.10rem] [&_[data-slot=avatar]]:shrink-0"
54+
"[&_[data-slot=avatar]]:mr-2 [&_[data-slot=avatar]]:size-[1.10rem] [&_[data-slot=avatar]]:shrink-0",
55+
"forced-colors:[&_[data-slot=icon]]:text-[CanvasText] forced-colors:[&_[data-slot=icon]]:group-data-[focus]:text-[Canvas] "
5556
]
5657
},
5758

components/ui/dropdown.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,22 +19,22 @@ import { cn, cr } from "./primitive"
1919

2020
const dropdownItemStyles = tv({
2121
base: [
22-
"group flex cursor-default select-none items-center gap-x-1.5 rounded-[calc(var(--radius)-1px)] py-2 px-2.5 relative text-base outline outline-0 forced-color-adjust-none lg:text-sm",
22+
"group text-fg forced-colors:text-[LinkText] flex cursor-default forced-color-adjust-none select-none items-center gap-x-1.5 rounded-[calc(var(--radius)-1px)] py-2 px-2.5 relative text-base outline outline-0 forced-color:text-[Highlight] lg:text-sm",
2323
"has-submenu:open:data-[danger=true]:bg-danger/20 has-submenu:open:data-[danger=true]:text-danger",
2424
"has-submenu:open:bg-accent has-submenu:open:text-accent-fg [&[data-has-submenu][data-open]_[data-slot=icon]]:text-accent-fg",
2525
"[&_[data-slot=avatar]]:-mr-0.5 [&_[data-slot=avatar]]:size-6 sm:[&_[data-slot=avatar]]:size-5",
2626
"[&_[data-slot=icon]]:size-4 [&_[data-slot=icon]]:shrink-0 [&_[data-slot=icon]]:text-muted-fg [&[data-hovered]_[data-slot=icon]]:text-accent-fg [&[data-focused]_[data-slot=icon]]:text-accent-fg [&[data-danger]_[data-slot=icon]]:text-danger/60 [&[data-focused][data-danger]_[data-slot=icon]]:text-danger-fg",
27+
"[&_[data-slot=menu-radio]>[data-slot=icon]]:size-3",
2728
"forced-colors:[&_[data-slot=icon]]:text-[CanvasText] forced-colors:[&_[data-slot=icon]]:group-data-[focus]:text-[Canvas] "
2829
],
2930
variants: {
3031
isDisabled: {
31-
false: "text-fg",
3232
true: "text-muted-fg forced-colors:text-[GrayText]"
3333
},
3434
isFocused: {
3535
false: "data-[danger=true]:text-danger",
3636
true: [
37-
"bg-accent text-accent-fg forced-colors:bg-[Highlight] forced-colors:text-[HighlightText]",
37+
"bg-accent text-accent-fg forced-colors:text-[HighlightText] forced-colors:bg-[Highlight]",
3838
"data-[danger=true]:bg-danger data-[danger=true]:text-danger-fg",
3939
"[&_.text-muted-fg]:text-accent-fg/80 [&[data-slot=label]]:text-accent-fg [&[data-slot=description]]:text-accent-fg"
4040
]

components/ui/keyboard.tsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
"use client"
2+
13
import * as React from "react"
24

35
import { Keyboard as KeyboardPrimitive } from "react-aria-components"

components/ui/menu.tsx

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ const MenuHeader = ({ className, separator = false, ...props }: MenuHeaderProps)
155155
)
156156

157157
const MenuSeparator = ({ className, ...props }: SeparatorProps) => (
158-
<Separator className={cn("-mx-1 my-1 h-px ms bg-muted", className)} {...props} />
158+
<Separator className={cn("-mx-1 my-1 h-px border-b border-b-muted", className)} {...props} />
159159
)
160160

161161
const Checkbox = ({ className, children, ...props }: MenuItemProps) => (
@@ -174,16 +174,19 @@ const Checkbox = ({ className, children, ...props }: MenuItemProps) => (
174174
)
175175

176176
const Radio = ({ className, children, ...props }: MenuItemProps) => (
177-
<Item className={cn("pl-8 relative", className)} {...props}>
177+
<Item className={cn("relative", className)} {...props}>
178178
{(values) => (
179179
<>
180+
{typeof children === "function" ? children(values) : children}
181+
180182
{values.isSelected && (
181-
<span className="absolute left-3 flex size-[0.650rem] items-center animate-in justify-center">
182-
<IconBulletFill className="size-[0.650rem]" />
183+
<span
184+
data-slot="menu-radio"
185+
className="absolute right-3 flex items-center animate-in justify-center"
186+
>
187+
<IconBulletFill />
183188
</span>
184189
)}
185-
186-
{typeof children === "function" ? children(values) : children}
187190
</>
188191
)}
189192
</Item>

components/ui/navbar.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ const Section = ({ className, ...props }: React.ComponentProps<"div">) => {
203203

204204
const navItemStyles = tv({
205205
base: [
206-
"relative lg:text-sm px-2 flex items-center gap-x-2 [&>[data-slot=icon]]:-mx-0.5 text-muted-fg outline-none forced-colors:disabled:text-[GrayText] transition-colors",
206+
"relative lg:text-sm px-2 flex forced-colors:outline-0 items-center gap-x-2 [&>[data-slot=icon]]:-mx-0.5 text-muted-fg outline-none forced-colors:disabled:text-[GrayText] forced-colors:transform-none transition-colors",
207207
"hover:text-fg focus:text-fg pressed:text-fg focus-visible:outline-1 focus-visible:outline-primary",
208208
"disabled:opacity-60 disabled:cursor-default",
209209
"[&>[data-slot=icon]]:size-4 [&>[data-slot=icon]]:shrink-0"

0 commit comments

Comments
 (0)