Skip to content

Commit

Permalink
Merge branch 'main' into fix/macos_tap
Browse files Browse the repository at this point in the history
  • Loading branch information
ericfabreu committed Apr 22, 2024
2 parents c55031d + 1cc5215 commit 67a97c9
Show file tree
Hide file tree
Showing 627 changed files with 33,265 additions and 8,738 deletions.
5 changes: 0 additions & 5 deletions .changeset/chatty-singers-remember.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/chilled-horses-type.md

This file was deleted.

5 changes: 5 additions & 0 deletions .changeset/clever-bugs-prove.md
@@ -0,0 +1,5 @@
---
"@nextui-org/table": patch
---

Add missing export of TableRowProps type
5 changes: 0 additions & 5 deletions .changeset/dirty-beans-repair.md

This file was deleted.

6 changes: 0 additions & 6 deletions .changeset/eleven-maps-admire.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/empty-eels-compare.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/famous-owls-kick.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/four-turtles-move.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/four-walls-rescue.md

This file was deleted.

5 changes: 5 additions & 0 deletions .changeset/gentle-pigs-admire.md
@@ -0,0 +1,5 @@
---
"@nextui-org/date-picker": patch
---

Fixed missing aria labels in date range picker (#2804)
5 changes: 0 additions & 5 deletions .changeset/heavy-berries-sniff.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/hot-rivers-move.md

This file was deleted.

5 changes: 5 additions & 0 deletions .changeset/large-dogs-sip.md
@@ -0,0 +1,5 @@
---
"@nextui-org/use-aria-accordion": patch
---

Fixes ctrl+a keyboard shortcut enabled inside Accordion with `selectionMode="multiple"` (#2055)
5 changes: 5 additions & 0 deletions .changeset/lemon-kiwis-shop.md
@@ -0,0 +1,5 @@
---
"@nextui-org/theme": patch
---

Improved styling for radio button labels, including adjustments for different screen sizes and support for right-to-left (RTL) languages. (#2507)
7 changes: 0 additions & 7 deletions .changeset/long-mayflies-film.md

This file was deleted.

5 changes: 5 additions & 0 deletions .changeset/long-pets-matter.md
@@ -0,0 +1,5 @@
---
"@nextui-org/theme": patch
---

Fixed slider component vertical mark y position focus (#2658)
7 changes: 0 additions & 7 deletions .changeset/lovely-snakes-approve.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/metal-peas-act.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/mighty-hornets-destroy.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/nervous-geckos-visit.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/new-paws-remain.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/nice-rockets-watch.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/old-cameras-sip.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/poor-years-help.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/purple-keys-dance.md

This file was deleted.

7 changes: 0 additions & 7 deletions .changeset/rare-ants-ring.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/rare-needles-study.md

This file was deleted.

6 changes: 0 additions & 6 deletions .changeset/rare-plums-speak.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/real-parrots-act.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/serious-sheep-promise.md

This file was deleted.

5 changes: 5 additions & 0 deletions .changeset/short-trainers-dance.md
@@ -0,0 +1,5 @@
---
"@nextui-org/theme": patch
---

Fix custom slot styling with twMerge set to true (#2153)
5 changes: 0 additions & 5 deletions .changeset/silly-pants-type.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/silly-seas-tie.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/six-donuts-breathe.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/six-seas-shout.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/slimy-panthers-swim.md

This file was deleted.

6 changes: 0 additions & 6 deletions .changeset/spicy-coats-exist.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/spotty-pens-stare.md

This file was deleted.

6 changes: 0 additions & 6 deletions .changeset/thin-rice-smile.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/thirty-bugs-beg.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/three-tools-whisper.md

This file was deleted.

8 changes: 0 additions & 8 deletions .changeset/tough-spies-tease.md

This file was deleted.

5 changes: 5 additions & 0 deletions .changeset/two-bananas-dance.md
@@ -0,0 +1,5 @@
---
"@nextui-org/input": patch
---

Fix #2069 keep input component's position steady
11 changes: 0 additions & 11 deletions .changeset/warm-zoos-fry.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/wild-rockets-check.md

This file was deleted.

7 changes: 6 additions & 1 deletion apps/docs/app/blog/[slug]/page.tsx
Expand Up @@ -7,6 +7,7 @@ import {format, parseISO} from "date-fns";
import NextLink from "next/link";
import {Balancer} from "react-wrap-balancer";

import {__DEV__, __PREVIEW__} from "@/utils";
import {MDXContent} from "@/components/mdx-content";
import {siteConfig} from "@/config/site";
import {Route} from "@/libs/docs/page";
Expand All @@ -18,6 +19,8 @@ interface BlogPostProps {
};
}

const isDraftVisible = __DEV__ || __PREVIEW__;

async function getBlogPostFromParams({params}: BlogPostProps) {
const slug = params.slug || "";
const post = allBlogPosts.find((post) => post.slugAsParams === slug);
Expand Down Expand Up @@ -78,7 +81,7 @@ export async function generateStaticParams(): Promise<BlogPostProps["params"][]>
export default async function DocPage({params}: BlogPostProps) {
const {post} = await getBlogPostFromParams({params});

if (!post) {
if (!post || (post.draft && !isDraftVisible)) {
notFound();
}

Expand All @@ -96,6 +99,7 @@ export default async function DocPage({params}: BlogPostProps) {
<ChevronRightLinearIcon className="rotate-180 inline-block mr-1" size={15} />
Back to blog
</Link>

<time className="block text-small mb-2 text-default-500" dateTime={post.date}>
{format(parseISO(post.date), "LLLL d, yyyy")}
</time>
Expand All @@ -119,6 +123,7 @@ export default async function DocPage({params}: BlogPostProps) {
</div>
<h1 className="mb-2 font-bold text-4xl">
<Balancer>{post.title}</Balancer>
<strong className="text-default-300">{post?.draft && " (Draft)"}</strong>
</h1>
<MDXContent code={post.body.code} />
</div>
Expand Down
13 changes: 12 additions & 1 deletion apps/docs/app/blog/page.tsx
Expand Up @@ -2,9 +2,20 @@ import {allBlogPosts} from "contentlayer/generated";
import {compareDesc} from "date-fns";

import {BlogPostList} from "@/components/blog-post";
import {__DEV__, __PREVIEW__} from "@/utils";

const isDraftVisible = __DEV__ || __PREVIEW__;

export default function Blog() {
const posts = allBlogPosts.sort((a, b) => compareDesc(new Date(a.date), new Date(b.date)));
const posts = allBlogPosts
.sort((a, b) => compareDesc(new Date(a.date), new Date(b.date)))
?.filter((post) => {
if (post.draft && !isDraftVisible) {
return false;
}

return true;
});

return (
<div className="w-full lg:px-16 mt-12">
Expand Down
6 changes: 3 additions & 3 deletions apps/docs/app/examples/perf/page.tsx
Expand Up @@ -124,15 +124,15 @@ const MyInput = extendVariants(Input, {
},
size: {
xs: {
inputWrapper: "h-unit-6 min-h-unit-6 px-1",
inputWrapper: "h-6 min-h-6 px-1",
input: "text-tiny",
},
md: {
inputWrapper: "h-unit-10 min-h-unit-10",
inputWrapper: "h-10 min-h-10",
input: "text-small",
},
xl: {
inputWrapper: "h-unit-14 min-h-unit-14",
inputWrapper: "h-14 min-h-14",
input: "text-medium",
},
},
Expand Down
2 changes: 1 addition & 1 deletion apps/docs/components/blog-post.tsx
Expand Up @@ -57,7 +57,7 @@ const BlogPostCard = (post: BlogPost) => {
</CardBody>
<CardFooter className="flex justify-between items-center">
<time className="block text-small text-default-500" dateTime={post.date}>
{format(parseISO(post.date), "LLLL d, yyyy")}
{format(parseISO(post.date), "LLLL d, yyyy")} {post?.draft && " (Draft)"}
</time>
<Avatar size="sm" src={post.author?.avatar} />
</CardFooter>
Expand Down

0 comments on commit 67a97c9

Please sign in to comment.