Skip to content

Commit a5b3775

Browse files
irsyadadlirsyadadl
authored
Merge pull request #355 from irsyadadl/next
Next
2 parents 94058d9 + 13237c3 commit a5b3775

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+197
-174
lines changed

Diff for: ‎app/(app)/(home)/partials/hero.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ export function Hero() {
2626
<Link
2727
target="_blank"
2828
href={siteConfig.repo}
29-
className="inset-ring inset-ring-fg/10 inline-flex items-center gap-x-2 rounded-full bg-fg/5 px-2.5 py-1.5 font-mono text-[0.65rem]/5 tracking-tight transition data-hovered:inset-ring/fg/15 data-hovered:bg-fg/10"
29+
className="inset-ring inset-ring-fg/10 inline-flex items-center gap-x-2 rounded-full bg-fg/5 px-2.5 py-1.5 font-mono text-[0.65rem]/5 tracking-tight transition hover:inset-ring/fg/15 hover:bg-fg/10"
3030
>
3131
<IconStar className="fill-yellow-500/40 text-yellow-500" />
3232
1.2K Github <IconBrandGithub />

Diff for: ‎app/(app)/(home)/partials/resources.tsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ export function Resources() {
5959
<Link
6060
target="_blank"
6161
href={item.url}
62-
className="group relative bg-bg p-4 data-hovered:bg-overlay sm:p-8 lg:p-10"
62+
className="group relative bg-bg p-4 hover:bg-overlay sm:p-8 lg:p-10"
6363
aria-label={item.name}
6464
key={item.name.toLowerCase().replaceAll(" ", "-")}
6565
>
@@ -96,7 +96,7 @@ export function Resources() {
9696
aria-label="Extra"
9797
>
9898
<Link
99-
className="group relative bg-bg p-4 data-hovered:bg-overlay sm:p-8 lg:p-10"
99+
className="group relative bg-bg p-4 hover:bg-overlay sm:p-8 lg:p-10"
100100
target="_blank"
101101
aria-label={"Justd Blocks"}
102102
rel="noopener noreferrer"
@@ -121,7 +121,7 @@ export function Resources() {
121121
</div>
122122
</Link>
123123
<Link
124-
className="group relative bg-bg p-4 data-hovered:bg-overlay sm:p-8 lg:p-10"
124+
className="group relative bg-bg p-4 hover:bg-overlay sm:p-8 lg:p-10"
125125
target="_blank"
126126
aria-label={"Justd icons"}
127127
rel="noopener noreferrer"

Diff for: ‎app/(app)/colors/(colors)/color-generator.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ export function ColorGenerator() {
128128
textValue={colorValue}
129129
onAction={() => handleCopy(colorValue, shade)}
130130
key={colorValue?.toString()}
131-
className="group relative inset-shadow-white/15 inset-shadow-xs flex h-20 w-1/7 min-w-10 cursor-pointer items-end justify-center gap-x-2 rounded-lg p-2 font-mono text-xs ring-1 ring-white/10 ring-inset focus:outline-hidden data-focused:ring-white/25 *:data-[slot=icon]:absolute *:data-[slot=icon]:top-3 *:data-[slot=icon]:mx-auto *:data-[slot=icon]:hidden *:data-[slot=icon]:size-3.5 *:data-[slot=icon]:opacity-90 *:data-[slot=icon]:group-data-focus-visible:block *:data-[slot=icon]:group-data-hovered:block sm:w-full"
131+
className="group relative inset-shadow-white/15 inset-shadow-xs flex h-20 w-1/7 min-w-10 cursor-pointer items-end justify-center gap-x-2 rounded-lg p-2 font-mono text-xs ring-1 ring-white/10 ring-inset focus:outline-hidden data-focused:ring-white/25 *:data-[slot=icon]:absolute *:data-[slot=icon]:top-3 *:data-[slot=icon]:mx-auto *:data-[slot=icon]:hidden *:data-[slot=icon]:size-3.5 *:data-[slot=icon]:opacity-90 *:data-[slot=icon]:group-hover:block *:data-[slot=icon]:group-data-focus-visible:block sm:w-full"
132132
style={{
133133
color: getTextColor(colorValue),
134134
backgroundColor: colorValue,

Diff for: ‎app/(app)/colors/(colors)/color-item.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ export function ColorItem({ color }: { color: keyof typeof colors }) {
7979
textValue={colorValue}
8080
onAction={() => handleCopy(colorValue, shade)}
8181
key={colorValue?.toString()}
82-
className="group relative inset-shadow-white/15 inset-shadow-xs flex h-20 w-1/7 min-w-10 cursor-pointer items-end justify-center gap-x-2 rounded-lg p-2 font-mono text-xs ring-1 ring-white/10 ring-inset focus:outline-hidden data-focused:ring-white/25 *:data-[slot=icon]:absolute *:data-[slot=icon]:top-3 *:data-[slot=icon]:mx-auto *:data-[slot=icon]:hidden *:data-[slot=icon]:size-3.5 *:data-[slot=icon]:opacity-90 *:data-[slot=icon]:group-data-focus-visible:block *:data-[slot=icon]:group-data-hovered:block sm:w-full"
82+
className="group relative inset-shadow-white/15 inset-shadow-xs flex h-20 w-1/7 min-w-10 cursor-pointer items-end justify-center gap-x-2 rounded-lg p-2 font-mono text-xs ring-1 ring-white/10 ring-inset focus:outline-hidden data-focused:ring-white/25 *:data-[slot=icon]:absolute *:data-[slot=icon]:top-3 *:data-[slot=icon]:mx-auto *:data-[slot=icon]:hidden *:data-[slot=icon]:size-3.5 *:data-[slot=icon]:opacity-90 *:data-[slot=icon]:group-hover:block *:data-[slot=icon]:group-data-focus-visible:block sm:w-full"
8383
style={{
8484
color: getTextColor(colorValue),
8585
backgroundColor: colorValue,

Diff for: ‎app/(app)/docs/[...slug]/page.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ export default async function Page(props: DocPageProps) {
152152
</Card.Header>
153153
</div>
154154

155-
<IconArrowUpRight className="-translate-y-1/2 absolute top-1/2 right-6 hidden size-4 text-blue-500 group-data-hovered:block" />
155+
<IconArrowUpRight className="-translate-y-1/2 absolute top-1/2 right-6 hidden size-4 text-blue-500 group-hover:block" />
156156
</Link>
157157
<Pager className="pt-3" tree={source.pageTree} url={page.url} />
158158
</main>

Diff for: ‎app/(app)/icons/partials/controller/select-size.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ export function SelectSize() {
2929
return (
3030
<Menu aria-label="Select Icon Size">
3131
<Button
32-
className="**:data-[slot=icon]:transition-transform [&[data-pressed]_[data-slot=icon]]:rotate-180"
32+
className="**:data-[slot=icon]:transition-transform [&[pressed]_[data-slot=icon]]:rotate-180"
3333
intent="outline"
3434
>
3535
<span className="inline sm:hidden">

Diff for: ‎app/(app)/icons/partials/styles.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ const styles = tv({
66
item: [
77
"grid size-8 cursor-pointer place-content-center rounded-md text-fg/80 sm:size-14",
88
"data-focused:bg-primary data-focused:text-primary-fg data-focused:outline-hidden",
9-
"data-selected:bg-primary data-selected:text-primary-fg",
9+
"selected:bg-primary selected:text-primary-fg",
1010
"data-[open=true]:bg-primary data-[open=true]:text-primary-fg",
11-
"data-hovered:bg-secondary data-hovered:text-secondary-fg",
11+
"hover:bg-secondary hover:text-secondary-fg",
1212
"data-focus-visible:ring-4 data-focus-visible:ring-primary-fg/15",
1313
],
1414
},

Diff for: ‎app/(app)/showcase/partials/list-sites.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ export function ListSites({ sites }: Props) {
2727
<ListBoxItem
2828
rel="nofollow"
2929
target="_blank"
30-
className="flex items-center gap-x-3 rounded-lg bg-secondary/70 px-3 py-2.5 ring-1 ring-border transition data-hovered:bg-secondary data-focused:outline-hidden data-focus-visible:ring-1 data-focus-visible:ring-ring"
30+
className="flex items-center gap-x-3 rounded-lg bg-secondary/70 px-3 py-2.5 ring-1 ring-border transition hover:bg-secondary data-focused:outline-hidden data-focus-visible:ring-1 data-focus-visible:ring-ring"
3131
textValue={item.name}
3232
href={`${item.url}?ref=getjustd.com/showcase`}
3333
id={getSiteName(item.url)}

Diff for: ‎app/(app)/themes/partials/theme-customizer.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ const ColorSelect = ({
4242
<Select.List>
4343
{filteredKeys.map((key) => (
4444
<Select.Option
45-
className="capitalize data-hovered:**:data-[slot=icon]:inset-ring-fg/30"
45+
className="capitalize hover:**:data-[slot=icon]:inset-ring-fg/30"
4646
textValue={key}
4747
key={key}
4848
id={key}

Diff for: ‎app/blocks/sidebar/sidebar-18/sidebar-header.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ export function SidebarHeader() {
2424
<IconFolderFill className="size-4.5" />
2525
<SidebarLabel className="font-medium text-sm">getjustd.com</SidebarLabel>
2626
</Link>
27-
<div className="-mr-2 flex items-center gap-x-0.5 text-muted-fg **:[button]:text-muted-fg **:[button]:*:data-[slot=icon]:size-3.5 **:[button]:data-hovered:text-fg">
27+
<div className="-mr-2 flex items-center gap-x-0.5 text-muted-fg **:[button]:text-muted-fg **:[button]:hover:text-fg **:[button]:*:data-[slot=icon]:size-3.5">
2828
<Button className="size-7" size="square-petite" intent="plain" aria-label="Collapse">
2929
<IconArrowUp />
3030
</Button>

Diff for: ‎bun.lockb

1.93 KB
Binary file not shown.

Diff for: ‎components/banner.tsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,14 @@ export function Banner() {
3434
<Link
3535
href="https://dub.sh/c4aLqep"
3636
target="_blank"
37-
className="group block w-full border-b bg-muted/80 px-4 pt-1.5 pb-1 text-center text-sm/6 transition data-hovered:bg-muted/60 sm:py-2.5"
37+
className="group block w-full border-b bg-muted/80 px-4 pt-1.5 pb-1 text-center text-sm/6 transition hover:bg-muted/60 sm:py-2.5"
3838
>
39-
<div className="inline-flex items-center rounded-md sm:border sm:border-zinc-300 sm:bg-bg sm:px-2.5 sm:py-1 sm:shadow-xs sm:group-data-hovered:shadow-none sm:dark:border-zinc-800">
39+
<div className="inline-flex items-center rounded-md sm:border sm:border-zinc-300 sm:bg-bg sm:px-2.5 sm:py-1 sm:shadow-xs sm:group-hover:shadow-none sm:dark:border-zinc-800">
4040
<IconBrandJustdBlocks className="-ml-0.5 mr-1 inline" />
4141
<strong className="mr-1 ml-1 font-semibold">Save 15% on all Justd Blocks</strong>
4242
<span className="hidden items-center sm:inline-flex">
4343
for a limited time during the launch!
44-
<IconArrowRight className="ml-2 text-muted-fg transition-transform duration-200 group-data-hovered:translate-x-1 group-data-hovered:text-fg" />
44+
<IconArrowRight className="ml-2 text-muted-fg transition-transform duration-200 group-hover:translate-x-1 group-hover:text-fg" />
4545
</span>
4646
</div>
4747
</Link>

Diff for: ‎components/blocks/menus.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ export function Menus() {
2222
<Wrapper>
2323
<Menu>
2424
<Button className="group" intent="outline">
25-
Account <IconChevronLgDown className="duration-300 group-data-pressed:rotate-180" />
25+
Account <IconChevronLgDown className="duration-300 group-pressed:rotate-180" />
2626
</Button>
2727
<Menu.Content showArrow placement="bottom" className="min-w-64">
2828
<Menu.Section>

Diff for: ‎components/code/block-sandbox.tsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -273,15 +273,15 @@ function Component({ folders, fullscreen, isIframe = false, title, ...props }: P
273273
*/
274274
`)
275275
}}
276-
className="-mr-2 data-hovered:bg-transparent data-hovered:**:data-[slot=icon]:rotate-90 **:data-[slot=icon]:text-muted-fg **:data-[slot=icon]:duration-200"
276+
className="-mr-2 hover:bg-transparent **:data-[slot=icon]:text-muted-fg **:data-[slot=icon]:duration-200 hover:**:data-[slot=icon]:rotate-90"
277277
size="square-petite"
278278
intent="plain"
279279
>
280280
<IconX />
281281
</Button>
282282
<CopyButton
283283
alwaysVisible
284-
className="text-zinc-600 data-hovered:text-zinc-70 dark:text-zinc-400 dark:data-hovered:text-zinc-50"
284+
className="text-zinc-600 hover:text-zinc-70 dark:text-zinc-400 dark:hover:text-zinc-50"
285285
text={code}
286286
/>
287287
</SidebarNav>
@@ -317,7 +317,7 @@ const ToggleDevice = (props: React.ComponentProps<typeof Toggle>) => {
317317
<Toggle
318318
intent="plain"
319319
size="square-petite"
320-
className="relative size-7.5 data-hovered:bg-bg data-selected:bg-bg data-selected:*:data-[slot=icon]:fill-primary/20 data-hovered:*:data-[slot=icon]:text-primary data-selected:*:data-[slot=icon]:text-primary"
320+
className="relative size-7.5 selected:bg-bg hover:bg-bg selected:*:data-[slot=icon]:fill-primary/20 selected:*:data-[slot=icon]:text-primary hover:*:data-[slot=icon]:text-primary"
321321
{...props}
322322
/>
323323
)

Diff for: ‎components/code/copy-button.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ export function CopyButton({
4949
className={composeTailwindRenderProps(
5050
className,
5151
cn(
52-
"ml-auto grid size-8 place-content-center text-muted-fg outline-hidden data-hovered:text-fg group-data-hovered:opacity-100",
52+
"ml-auto grid size-8 place-content-center text-muted-fg outline-hidden hover:text-fg group-hover:opacity-100",
5353
!alwaysVisible ? "opacity-0" : "opacity-100",
5454
isCopied && "opacity-100",
5555
),

Diff for: ‎components/doc-refs.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ export function DocRefs({ references }: { references: string[] }) {
7878
<ListBoxItem
7979
textValue={item.title}
8080
target="_blank"
81-
className="flex items-center rounded-full bg-fg/5 px-4 py-2 font-mono text-xs uppercase ring-1 ring-fg/10 duration-200 data-hovered:bg-fg/10 data-hovered:ring-fg/15"
81+
className="flex items-center rounded-full bg-fg/5 px-4 py-2 font-mono text-xs uppercase ring-1 ring-fg/10 duration-200 hover:bg-fg/10 hover:ring-fg/15"
8282
id={item.url}
8383
href={item.url}
8484
>

Diff for: ‎components/docs/media/carousel-api-demo.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ export default function CarouselDApiDemo() {
5050
className={twJoin(
5151
"rounded-xl transition data-focused:outline-hidden",
5252
current === index + 1
53-
? "h-3 w-5 bg-primary transition-all data-hovered:bg-primary/80"
54-
: "h-3 w-3 bg-fg/10 data-hovered:bg-fg/15",
53+
? "h-3 w-5 bg-primary transition-all hover:bg-primary/80"
54+
: "h-3 w-3 bg-fg/10 hover:bg-fg/15",
5555
)}
5656
aria-label={`Slide ${current} of ${count}`}
5757
onPress={() => handleSelect(index)}

Diff for: ‎components/docs/overlays/modal/modal-triggered-by-menu-demo.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ export default function ModalTriggeredByMenuDemo() {
5252
<Menu>
5353
<Button intent="outline" className="group">
5454
Actions...
55-
<IconChevronLgDown className="decoration-200 transition-transform group-data-pressed:rotate-180" />
55+
<IconChevronLgDown className="decoration-200 transition-transform group-pressed:rotate-180" />
5656
</Button>
5757
<Menu.Content placement="bottom">
5858
<Menu.Item onAction={() => setState("delete")}>

Diff for: ‎components/docs/pickers/select/select-searchable-demo.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
"use client"
22

33
import { useFilter } from "react-aria"
4-
import { UNSTABLE_Autocomplete as Autocomplete } from "react-aria-components"
4+
import { Autocomplete } from "react-aria-components"
55
import { ListBox, PopoverContent, SearchField, Select } from "ui"
66
const languages = [
77
{ id: "en", name: "English" },

Diff for: ‎components/footer.tsx

+4-4
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ export function Footer() {
5050
<li key={item.name}>
5151
<Link
5252
href={item.href}
53-
className="text-muted-fg text-sm leading-6 data-hovered:text-fg"
53+
className="text-muted-fg text-sm leading-6 hover:text-fg"
5454
>
5555
{item.name}
5656
</Link>
@@ -66,7 +66,7 @@ export function Footer() {
6666
<Link
6767
target="_blank"
6868
href={item.href}
69-
className="text-muted-fg text-sm leading-6 data-hovered:text-fg"
69+
className="text-muted-fg text-sm leading-6 hover:text-fg"
7070
>
7171
{item.name}
7272
</Link>
@@ -84,7 +84,7 @@ export function Footer() {
8484
<Link
8585
target="_blank"
8686
href={item.href}
87-
className="text-muted-fg text-sm leading-6 data-hovered:text-fg"
87+
className="text-muted-fg text-sm leading-6 hover:text-fg"
8888
>
8989
{item.name}
9090
</Link>
@@ -100,7 +100,7 @@ export function Footer() {
100100
<Link
101101
target="_blank"
102102
href={item.href}
103-
className="text-muted-fg text-sm leading-6 data-hovered:text-fg"
103+
className="text-muted-fg text-sm leading-6 hover:text-fg"
104104
>
105105
{item.name}
106106
</Link>

Diff for: ‎components/installation.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ export function Installation({ className, ...props }: InstallationProps) {
5454
<p>
5555
If you hit any issues, make sure you check out the installation guide{" "}
5656
<Link
57-
className="not-prose xd2432 text-blue-600 data-hovered:underline dark:text-blue-400"
57+
className="not-prose xd2432 text-blue-600 hover:underline dark:text-blue-400"
5858
intent="primary"
5959
href="/docs/2.x/getting-started/cli"
6060
target="_blank"

Diff for: ‎components/mdx.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ export function Mdx({ code }: { code: MDXContent }) {
4343
Image,
4444
NewTab: (props: React.ComponentProps<typeof Link>) => (
4545
<Link
46-
className="not-prose xd2432 text-blue-600 outline-hidden data-hovered:underline data-focus-visible:ring-1 dark:text-blue-400"
46+
className="not-prose xd2432 text-blue-600 outline-hidden hover:underline data-focus-visible:ring-1 dark:text-blue-400"
4747
target="_blank"
4848
{...props}
4949
>
@@ -55,7 +55,7 @@ export function Mdx({ code }: { code: MDXContent }) {
5555
a: (props: React.ComponentProps<"a">) => (
5656
<a
5757
{...props}
58-
className="not-prose xd2432 text-blue-600 outline-hidden focus-visible:ring-1 data-hovered:underline dark:text-blue-400"
58+
className="not-prose xd2432 text-blue-600 outline-hidden hover:underline focus-visible:ring-1 dark:text-blue-400"
5959
/>
6060
),
6161
SourceCode: SourceCode,

Diff for: ‎components/nav-item.tsx

+4-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import type React from "react"
44

55
import { motion } from "motion/react"
66
import NextLink from "next/link"
7+
import { usePathname } from "next/navigation"
78
import { Link } from "react-aria-components"
89
import { tv } from "tailwind-variants"
910

@@ -28,11 +29,13 @@ interface NavLinkProps {
2829

2930
const NavLink = ({ href, isActive, className, isNextLink, ...props }: NavLinkProps) => {
3031
const El = isNextLink ? NextLink : Link
32+
const pathname = usePathname()
33+
const isCurrent = isActive || href === pathname
3134
return (
3235
<El href={href} className={navLinkStyles({ isActive, className })} {...props}>
3336
<>
3437
{props.children}
35-
{isActive && (
38+
{isCurrent && (
3639
<motion.span
3740
layoutId="current-indicator-navlink"
3841
className="absolute inset-x-0 bottom-[-0.550rem] h-0.5 w-full rounded bg-fg"

Diff for: ‎components/navbar.tsx

+4-4
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ export function Navbar() {
7171
Components
7272
</NavLink>
7373

74-
<NavLink isNextLink isActive={pathname === "/themes"} href="/themes">
74+
<NavLink isNextLink href="/themes">
7575
Themes
7676
</NavLink>
7777

@@ -87,7 +87,7 @@ export function Navbar() {
8787
)}
8888
>
8989
<IconBrandJustdBlocks /> Premium Blocks
90-
<IconChevronLgDown className="size-3 duration-200 group-data-pressed:rotate-180" />
90+
<IconChevronLgDown className="size-3 duration-200 group-pressed:rotate-180" />
9191
</Menu.Trigger>
9292
<Menu.Content
9393
offset={4}
@@ -147,7 +147,7 @@ export function Navbar() {
147147
intent: "outline",
148148
size: "square-petite",
149149
className:
150-
"data-hovered:border-indigo-500/20 data-hovered:bg-indigo-600/10 data-hovered:**:data-[slot=icon]:text-indigo-600 **:data-[slot=icon]:text-indigo-500",
150+
"hover:border-indigo-500/20 hover:bg-indigo-600/10 **:data-[slot=icon]:text-indigo-500 hover:**:data-[slot=icon]:text-indigo-600",
151151
})}
152152
target="_blank"
153153
href={siteConfig.discord}
@@ -172,7 +172,7 @@ export function Navbar() {
172172
intent: "outline",
173173
size: "square-petite",
174174
className:
175-
"data-hovered:border-blue-500/20 data-hovered:bg-blue-600/10 **:data-[slot=icon]:text-fg",
175+
"hover:border-blue-500/20 hover:bg-blue-600/10 **:data-[slot=icon]:text-fg",
176176
})}
177177
target="_blank"
178178
href="https://dub.sh/NfSXJrL"

0 commit comments

Comments
 (0)