Skip to content

Commit

Permalink
Merge branch 'nextui-org:canary' into canary
Browse files Browse the repository at this point in the history
  • Loading branch information
PentSec authored Dec 23, 2024
2 parents 7b6d797 + 5f388fc commit 9cda069
Show file tree
Hide file tree
Showing 58 changed files with 936 additions and 274 deletions.
5 changes: 5 additions & 0 deletions .changeset/angry-boxes-wonder.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@nextui-org/listbox": patch
---

fix listbox section items prop in html element (#4277)
5 changes: 5 additions & 0 deletions .changeset/chilled-files-serve.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@nextui-org/calendar": patch
---

remove unnecessary fragment in calendar (#4358, #4068)
6 changes: 6 additions & 0 deletions .changeset/cyan-donkeys-swim.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@nextui-org/input-otp": patch
"@nextui-org/shared-utils": patch
---

Fix virtual keyboard to display the keys based on allowedKeys(#4408)
5 changes: 5 additions & 0 deletions .changeset/late-doors-rhyme.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@nextui-org/theme": patch
---

Fixing the input in card to not become invisible on hover and making time-input and date-input consistent to other inputs.
7 changes: 7 additions & 0 deletions .changeset/lemon-cheetahs-grow.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
"@nextui-org/use-aria-multiselect": patch
"@nextui-org/select": patch
---

fixed validationBehavior=native showing browser ui error for select component (#3913)
fixed select not committing error message when validationBehavior=native
5 changes: 5 additions & 0 deletions .changeset/nasty-dolls-tease.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@nextui-org/input-otp": patch
---

fixed isRequired not showing error when validationBehavior=native is not explicitly set
6 changes: 6 additions & 0 deletions .changeset/smart-oranges-peel.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@nextui-org/navbar": patch
---


Resolving the issue preventing the navbar from opening(#4345)
2 changes: 1 addition & 1 deletion apps/docs/app/examples/modal/placement/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ export default function Page() {
</p>
</ModalBody>
<ModalFooter>
<Button color="danger" variant="light" onClick={onClose}>
<Button color="danger" variant="light" onPress={onClose}>
Close
</Button>
<Button color="primary" onPress={onClose}>
Expand Down
12 changes: 1 addition & 11 deletions apps/docs/app/examples/navbar/bordered/page.tsx
Original file line number Diff line number Diff line change
@@ -1,16 +1,6 @@
"use client";

import {
Navbar,
NavbarBrand,
NavbarContent,
NavbarItem,
Link as NextUiLink,
LinkProps,
Button,
} from "@nextui-org/react";

const Link = (props: LinkProps) => <NextUiLink {...props} onClick={(e) => e.preventDefault()} />;
import {Navbar, NavbarBrand, NavbarContent, NavbarItem, Link, Button} from "@nextui-org/react";

const AcmeLogo = () => (
<svg fill="none" height="36" viewBox="0 0 32 32" width="36">
Expand Down
5 changes: 1 addition & 4 deletions apps/docs/app/examples/navbar/controlled-menu/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,10 @@ import {
NavbarMenuItem,
NavbarMenuToggle,
Button,
Link as NextUiLink,
LinkProps,
Link,
} from "@nextui-org/react";
import React from "react";

const Link = (props: LinkProps) => <NextUiLink {...props} onClick={(e) => e.preventDefault()} />;

const AcmeLogo = () => (
<svg fill="none" height="36" viewBox="0 0 32 32" width="36">
<path
Expand Down
12 changes: 1 addition & 11 deletions apps/docs/app/examples/navbar/custom-active-item/page.tsx
Original file line number Diff line number Diff line change
@@ -1,16 +1,6 @@
"use client";

import {
Navbar,
NavbarBrand,
NavbarContent,
NavbarItem,
Link as NextUiLink,
LinkProps,
Button,
} from "@nextui-org/react";

const Link = (props: LinkProps) => <NextUiLink {...props} onClick={(e) => e.preventDefault()} />;
import {Navbar, NavbarBrand, NavbarContent, NavbarItem, Link, Button} from "@nextui-org/react";

const AcmeLogo = () => (
<svg fill="none" height="36" viewBox="0 0 32 32" width="36">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,13 @@ import {
NavbarContent,
NavbarItem,
Button,
Link as NextUiLink,
LinkProps,
Link,
NavbarMenu,
NavbarMenuItem,
NavbarMenuToggle,
} from "@nextui-org/react";
import React from "react";

const Link = (props: LinkProps) => <NextUiLink {...props} onClick={(e) => e.preventDefault()} />;

const AcmeLogo = () => (
<svg fill="none" height="36" viewBox="0 0 32 32" width="36">
<path
Expand Down
12 changes: 1 addition & 11 deletions apps/docs/app/examples/navbar/disabled-blur/page.tsx
Original file line number Diff line number Diff line change
@@ -1,16 +1,6 @@
"use client";

import {
Navbar,
NavbarBrand,
NavbarContent,
NavbarItem,
Link as NextUiLink,
LinkProps,
Button,
} from "@nextui-org/react";

const Link = (props: LinkProps) => <NextUiLink {...props} onClick={(e) => e.preventDefault()} />;
import {Navbar, NavbarBrand, NavbarContent, NavbarItem, Link, Button} from "@nextui-org/react";

const AcmeLogo = () => (
<svg fill="none" height="36" viewBox="0 0 32 32" width="36">
Expand Down
12 changes: 1 addition & 11 deletions apps/docs/app/examples/navbar/hide-on-scroll/page.tsx
Original file line number Diff line number Diff line change
@@ -1,16 +1,6 @@
"use client";

import {
Navbar,
NavbarBrand,
NavbarContent,
NavbarItem,
Link as NextUiLink,
LinkProps,
Button,
} from "@nextui-org/react";

const Link = (props: LinkProps) => <NextUiLink {...props} onClick={(e) => e.preventDefault()} />;
import {Navbar, NavbarBrand, NavbarContent, NavbarItem, Link, Button} from "@nextui-org/react";

const AcmeLogo = () => (
<svg fill="none" height="36" viewBox="0 0 32 32" width="36">
Expand Down
12 changes: 1 addition & 11 deletions apps/docs/app/examples/navbar/static/page.tsx
Original file line number Diff line number Diff line change
@@ -1,16 +1,6 @@
"use client";

import {
Navbar,
NavbarBrand,
NavbarContent,
NavbarItem,
Link as NextUiLink,
LinkProps,
Button,
} from "@nextui-org/react";

const Link = (props: LinkProps) => <NextUiLink {...props} onClick={(e) => e.preventDefault()} />;
import {Navbar, NavbarBrand, NavbarContent, NavbarItem, Link, Button} from "@nextui-org/react";

const AcmeLogo = () => (
<svg fill="none" height="36" viewBox="0 0 32 32" width="36">
Expand Down
12 changes: 1 addition & 11 deletions apps/docs/app/examples/navbar/usage/page.tsx
Original file line number Diff line number Diff line change
@@ -1,16 +1,6 @@
"use client";

import {
Navbar,
NavbarBrand,
NavbarContent,
NavbarItem,
Link as NextUiLink,
LinkProps,
Button,
} from "@nextui-org/react";

const Link = (props: LinkProps) => <NextUiLink {...props} onClick={(e) => e.preventDefault()} />;
import {Navbar, NavbarBrand, NavbarContent, NavbarItem, Link, Button} from "@nextui-org/react";

const AcmeLogo = () => (
<svg fill="none" height="36" viewBox="0 0 32 32" width="36">
Expand Down
5 changes: 1 addition & 4 deletions apps/docs/app/examples/navbar/with-avatar/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,14 @@ import {
NavbarBrand,
NavbarContent,
NavbarItem,
Link as NextUiLink,
LinkProps,
Link,
DropdownItem,
DropdownTrigger,
Dropdown,
DropdownMenu,
Avatar,
} from "@nextui-org/react";

const Link = (props: LinkProps) => <NextUiLink {...props} onClick={(e) => e.preventDefault()} />;

const AcmeLogo = () => (
<svg fill="none" height="36" viewBox="0 0 32 32" width="36">
<path
Expand Down
5 changes: 1 addition & 4 deletions apps/docs/app/examples/navbar/with-dropdown-menu/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ import {
NavbarBrand,
NavbarContent,
NavbarItem,
Link as NextUiLink,
LinkProps,
Link,
Button,
DropdownItem,
DropdownTrigger,
Expand All @@ -15,8 +14,6 @@ import {
} from "@nextui-org/react";
import {ChevronDown, Lock, Activity, Flash, Server, TagUser, Scale} from "@nextui-org/shared-icons";

const Link = (props: LinkProps) => <NextUiLink {...props} onClick={(e) => e.preventDefault()} />;

const AcmeLogo = () => (
<svg fill="none" height="36" viewBox="0 0 32 32" width="36">
<path
Expand Down
5 changes: 1 addition & 4 deletions apps/docs/app/examples/navbar/with-menu/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,14 @@ import {
NavbarBrand,
NavbarContent,
NavbarItem,
Link as NextUiLink,
LinkProps,
Link,
Button,
NavbarMenuToggle,
NavbarMenu,
NavbarMenuItem,
} from "@nextui-org/react";
import React from "react";

const Link = (props: LinkProps) => <NextUiLink {...props} onClick={(e) => e.preventDefault()} />;

const AcmeLogo = () => (
<svg fill="none" height="36" viewBox="0 0 32 32" width="36">
<path
Expand Down
5 changes: 1 addition & 4 deletions apps/docs/app/examples/navbar/with-search-input/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ import {
NavbarBrand,
NavbarContent,
NavbarItem,
Link as NextUiLink,
LinkProps,
Link,
Input,
DropdownItem,
DropdownTrigger,
Expand All @@ -15,8 +14,6 @@ import {
Avatar,
} from "@nextui-org/react";

const Link = (props: LinkProps) => <NextUiLink {...props} onClick={(e) => e.preventDefault()} />;

import {SearchLinearIcon} from "@/components/icons";

const AcmeLogo = () => (
Expand Down
46 changes: 46 additions & 0 deletions apps/docs/components/docs/nextui-pro-callout.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
"use client";

import {usePostHog} from "posthog-js/react";
import NextLink from "next/link";

export const NextUIProCallout = () => {
const posthog = usePostHog();

const handleClick = () => {
posthog.capture("NextUI Pro Banner", {
action: "click",
category: "nextui-callout",
});
};

return (
<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">
<div>
<p className="leading-[1.025] tracking-tight text-center text-large font-semibold">
Ship&nbsp;
<span className="bg-clip-text text-transparent bg-gradient-to-b from-[#5EA2EF] to-[#0072F5]">
faster
</span>
<br />
with beautiful
<br />
components
</p>
<p className="text-center text-xs mt-2 px-3 font-medium text-default-500 dark:text-default-400 leading-tight">
Discover 210+ stunning components by NextUI
</p>
</div>
<div className="mt-3 w-fit flex group items-center text-foreground hover:shadow-sm relative overflow-hidden rounded-full p-[2px]">
<span className="absolute inset-[-1000%] bg-[conic-gradient(from_90deg_at_50%_50%,#338EF7_0%,#F54180_50%,#338EF7_100%)]" />
<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">
Explore Components
</div>
</div>
<NextLink
className="absolute inset-0 z-[1]"
href="https://nextui.pro/components?utm_source=nextui.org&utm_medium=callout"
onClick={handleClick}
/>
</div>
);
};
Loading

0 comments on commit 9cda069

Please sign in to comment.