Skip to content

Commit 9cda069

Browse files
PentSecPentSec
authored
Merge branch 'nextui-org:canary' into canary
2 parents 7b6d797 + 5f388fc commit 9cda069

Some content is hidden

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

58 files changed

+936
-274
lines changed

‎.changeset/angry-boxes-wonder.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@nextui-org/listbox": patch
3+
---
4+
5+
fix listbox section items prop in html element (#4277)

‎.changeset/chilled-files-serve.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@nextui-org/calendar": patch
3+
---
4+
5+
remove unnecessary fragment in calendar (#4358, #4068)

‎.changeset/cyan-donkeys-swim.md

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
"@nextui-org/input-otp": patch
3+
"@nextui-org/shared-utils": patch
4+
---
5+
6+
Fix virtual keyboard to display the keys based on allowedKeys(#4408)

‎.changeset/late-doors-rhyme.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@nextui-org/theme": patch
3+
---
4+
5+
Fixing the input in card to not become invisible on hover and making time-input and date-input consistent to other inputs.

‎.changeset/lemon-cheetahs-grow.md

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
"@nextui-org/use-aria-multiselect": patch
3+
"@nextui-org/select": patch
4+
---
5+
6+
fixed validationBehavior=native showing browser ui error for select component (#3913)
7+
fixed select not committing error message when validationBehavior=native

‎.changeset/nasty-dolls-tease.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@nextui-org/input-otp": patch
3+
---
4+
5+
fixed isRequired not showing error when validationBehavior=native is not explicitly set

‎.changeset/smart-oranges-peel.md

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
"@nextui-org/navbar": patch
3+
---
4+
5+
6+
Resolving the issue preventing the navbar from opening(#4345)

‎apps/docs/app/examples/modal/placement/page.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ export default function Page() {
5858
</p>
5959
</ModalBody>
6060
<ModalFooter>
61-
<Button color="danger" variant="light" onClick={onClose}>
61+
<Button color="danger" variant="light" onPress={onClose}>
6262
Close
6363
</Button>
6464
<Button color="primary" onPress={onClose}>

‎apps/docs/app/examples/navbar/bordered/page.tsx

+1-11
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,6 @@
11
"use client";
22

3-
import {
4-
Navbar,
5-
NavbarBrand,
6-
NavbarContent,
7-
NavbarItem,
8-
Link as NextUiLink,
9-
LinkProps,
10-
Button,
11-
} from "@nextui-org/react";
12-
13-
const Link = (props: LinkProps) => <NextUiLink {...props} onClick={(e) => e.preventDefault()} />;
3+
import {Navbar, NavbarBrand, NavbarContent, NavbarItem, Link, Button} from "@nextui-org/react";
144

155
const AcmeLogo = () => (
166
<svg fill="none" height="36" viewBox="0 0 32 32" width="36">

‎apps/docs/app/examples/navbar/controlled-menu/page.tsx

+1-4
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,10 @@ import {
99
NavbarMenuItem,
1010
NavbarMenuToggle,
1111
Button,
12-
Link as NextUiLink,
13-
LinkProps,
12+
Link,
1413
} from "@nextui-org/react";
1514
import React from "react";
1615

17-
const Link = (props: LinkProps) => <NextUiLink {...props} onClick={(e) => e.preventDefault()} />;
18-
1916
const AcmeLogo = () => (
2017
<svg fill="none" height="36" viewBox="0 0 32 32" width="36">
2118
<path

‎apps/docs/app/examples/navbar/custom-active-item/page.tsx

+1-11
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,6 @@
11
"use client";
22

3-
import {
4-
Navbar,
5-
NavbarBrand,
6-
NavbarContent,
7-
NavbarItem,
8-
Link as NextUiLink,
9-
LinkProps,
10-
Button,
11-
} from "@nextui-org/react";
12-
13-
const Link = (props: LinkProps) => <NextUiLink {...props} onClick={(e) => e.preventDefault()} />;
3+
import {Navbar, NavbarBrand, NavbarContent, NavbarItem, Link, Button} from "@nextui-org/react";
144

155
const AcmeLogo = () => (
166
<svg fill="none" height="36" viewBox="0 0 32 32" width="36">

‎apps/docs/app/examples/navbar/disable-menu-animation/page.tsx

+1-4
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,13 @@ import {
66
NavbarContent,
77
NavbarItem,
88
Button,
9-
Link as NextUiLink,
10-
LinkProps,
9+
Link,
1110
NavbarMenu,
1211
NavbarMenuItem,
1312
NavbarMenuToggle,
1413
} from "@nextui-org/react";
1514
import React from "react";
1615

17-
const Link = (props: LinkProps) => <NextUiLink {...props} onClick={(e) => e.preventDefault()} />;
18-
1916
const AcmeLogo = () => (
2017
<svg fill="none" height="36" viewBox="0 0 32 32" width="36">
2118
<path

‎apps/docs/app/examples/navbar/disabled-blur/page.tsx

+1-11
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,6 @@
11
"use client";
22

3-
import {
4-
Navbar,
5-
NavbarBrand,
6-
NavbarContent,
7-
NavbarItem,
8-
Link as NextUiLink,
9-
LinkProps,
10-
Button,
11-
} from "@nextui-org/react";
12-
13-
const Link = (props: LinkProps) => <NextUiLink {...props} onClick={(e) => e.preventDefault()} />;
3+
import {Navbar, NavbarBrand, NavbarContent, NavbarItem, Link, Button} from "@nextui-org/react";
144

155
const AcmeLogo = () => (
166
<svg fill="none" height="36" viewBox="0 0 32 32" width="36">

‎apps/docs/app/examples/navbar/hide-on-scroll/page.tsx

+1-11
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,6 @@
11
"use client";
22

3-
import {
4-
Navbar,
5-
NavbarBrand,
6-
NavbarContent,
7-
NavbarItem,
8-
Link as NextUiLink,
9-
LinkProps,
10-
Button,
11-
} from "@nextui-org/react";
12-
13-
const Link = (props: LinkProps) => <NextUiLink {...props} onClick={(e) => e.preventDefault()} />;
3+
import {Navbar, NavbarBrand, NavbarContent, NavbarItem, Link, Button} from "@nextui-org/react";
144

155
const AcmeLogo = () => (
166
<svg fill="none" height="36" viewBox="0 0 32 32" width="36">

‎apps/docs/app/examples/navbar/static/page.tsx

+1-11
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,6 @@
11
"use client";
22

3-
import {
4-
Navbar,
5-
NavbarBrand,
6-
NavbarContent,
7-
NavbarItem,
8-
Link as NextUiLink,
9-
LinkProps,
10-
Button,
11-
} from "@nextui-org/react";
12-
13-
const Link = (props: LinkProps) => <NextUiLink {...props} onClick={(e) => e.preventDefault()} />;
3+
import {Navbar, NavbarBrand, NavbarContent, NavbarItem, Link, Button} from "@nextui-org/react";
144

155
const AcmeLogo = () => (
166
<svg fill="none" height="36" viewBox="0 0 32 32" width="36">

‎apps/docs/app/examples/navbar/usage/page.tsx

+1-11
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,6 @@
11
"use client";
22

3-
import {
4-
Navbar,
5-
NavbarBrand,
6-
NavbarContent,
7-
NavbarItem,
8-
Link as NextUiLink,
9-
LinkProps,
10-
Button,
11-
} from "@nextui-org/react";
12-
13-
const Link = (props: LinkProps) => <NextUiLink {...props} onClick={(e) => e.preventDefault()} />;
3+
import {Navbar, NavbarBrand, NavbarContent, NavbarItem, Link, Button} from "@nextui-org/react";
144

155
const AcmeLogo = () => (
166
<svg fill="none" height="36" viewBox="0 0 32 32" width="36">

‎apps/docs/app/examples/navbar/with-avatar/page.tsx

+1-4
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,14 @@ import {
55
NavbarBrand,
66
NavbarContent,
77
NavbarItem,
8-
Link as NextUiLink,
9-
LinkProps,
8+
Link,
109
DropdownItem,
1110
DropdownTrigger,
1211
Dropdown,
1312
DropdownMenu,
1413
Avatar,
1514
} from "@nextui-org/react";
1615

17-
const Link = (props: LinkProps) => <NextUiLink {...props} onClick={(e) => e.preventDefault()} />;
18-
1916
const AcmeLogo = () => (
2017
<svg fill="none" height="36" viewBox="0 0 32 32" width="36">
2118
<path

‎apps/docs/app/examples/navbar/with-dropdown-menu/page.tsx

+1-4
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@ import {
55
NavbarBrand,
66
NavbarContent,
77
NavbarItem,
8-
Link as NextUiLink,
9-
LinkProps,
8+
Link,
109
Button,
1110
DropdownItem,
1211
DropdownTrigger,
@@ -15,8 +14,6 @@ import {
1514
} from "@nextui-org/react";
1615
import {ChevronDown, Lock, Activity, Flash, Server, TagUser, Scale} from "@nextui-org/shared-icons";
1716

18-
const Link = (props: LinkProps) => <NextUiLink {...props} onClick={(e) => e.preventDefault()} />;
19-
2017
const AcmeLogo = () => (
2118
<svg fill="none" height="36" viewBox="0 0 32 32" width="36">
2219
<path

‎apps/docs/app/examples/navbar/with-menu/page.tsx

+1-4
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,14 @@ import {
55
NavbarBrand,
66
NavbarContent,
77
NavbarItem,
8-
Link as NextUiLink,
9-
LinkProps,
8+
Link,
109
Button,
1110
NavbarMenuToggle,
1211
NavbarMenu,
1312
NavbarMenuItem,
1413
} from "@nextui-org/react";
1514
import React from "react";
1615

17-
const Link = (props: LinkProps) => <NextUiLink {...props} onClick={(e) => e.preventDefault()} />;
18-
1916
const AcmeLogo = () => (
2017
<svg fill="none" height="36" viewBox="0 0 32 32" width="36">
2118
<path

‎apps/docs/app/examples/navbar/with-search-input/page.tsx

+1-4
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@ import {
55
NavbarBrand,
66
NavbarContent,
77
NavbarItem,
8-
Link as NextUiLink,
9-
LinkProps,
8+
Link,
109
Input,
1110
DropdownItem,
1211
DropdownTrigger,
@@ -15,8 +14,6 @@ import {
1514
Avatar,
1615
} from "@nextui-org/react";
1716

18-
const Link = (props: LinkProps) => <NextUiLink {...props} onClick={(e) => e.preventDefault()} />;
19-
2017
import {SearchLinearIcon} from "@/components/icons";
2118

2219
const AcmeLogo = () => (

‎apps/docs/components/docs/nextui-pro-callout.tsx

+46
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
"use client";
2+
3+
import {usePostHog} from "posthog-js/react";
4+
import NextLink from "next/link";
5+
6+
export const NextUIProCallout = () => {
7+
const posthog = usePostHog();
8+
9+
const handleClick = () => {
10+
posthog.capture("NextUI Pro Banner", {
11+
action: "click",
12+
category: "nextui-callout",
13+
});
14+
};
15+
16+
return (
17+
<div className="relative w-full max-w-[12rem] flex flex-col items-center border border-default/60 hover:border-default/90 rounded-xl py-6 px-2 cursor-pointer">
18+
<div>
19+
<p className="leading-[1.025] tracking-tight text-center text-large font-semibold">
20+
Ship&nbsp;
21+
<span className="bg-clip-text text-transparent bg-gradient-to-b from-[#5EA2EF] to-[#0072F5]">
22+
faster
23+
</span>
24+
<br />
25+
with beautiful
26+
<br />
27+
components
28+
</p>
29+
<p className="text-center text-xs mt-2 px-3 font-medium text-default-500 dark:text-default-400 leading-tight">
30+
Discover 210+ stunning components by NextUI
31+
</p>
32+
</div>
33+
<div className="mt-3 w-fit flex group items-center text-foreground hover:shadow-sm relative overflow-hidden rounded-full p-[2px]">
34+
<span className="absolute inset-[-1000%] bg-[conic-gradient(from_90deg_at_50%_50%,#338EF7_0%,#F54180_50%,#338EF7_100%)]" />
35+
<div className="inline-flex h-full w-full cursor-pointer items-center justify-center rounded-full bg-background transition-background p-2.5 text-xs font-medium hover:font-semibold text-foreground backdrop-blur-3xl">
36+
Explore Components
37+
</div>
38+
</div>
39+
<NextLink
40+
className="absolute inset-0 z-[1]"
41+
href="https://nextui.pro/components?utm_source=nextui.org&utm_medium=callout"
42+
onClick={handleClick}
43+
/>
44+
</div>
45+
);
46+
};

0 commit comments

Comments
 (0)