Skip to content

Commit

Permalink
Merge branch 'canary' into feat/month-year-pickers
Browse files Browse the repository at this point in the history
  • Loading branch information
ryo-manba committed Jun 30, 2024
2 parents ce7ee58 + 9daef56 commit ca5c72b
Show file tree
Hide file tree
Showing 70 changed files with 15,979 additions and 12,501 deletions.
5 changes: 5 additions & 0 deletions .changeset/clever-cherries-watch.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@nextui-org/system-rsc": patch
---

fixed `extendVariants` when having `defaultVariants` (#3009)
5 changes: 5 additions & 0 deletions .changeset/cyan-emus-swim.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@nextui-org/date-picker": patch
---

Fix calendar props on date-range-picker
5 changes: 5 additions & 0 deletions .changeset/dry-foxes-melt.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@nextui-org/radio": patch
---

Fix ensure radio input correctly references description (#2932)
6 changes: 6 additions & 0 deletions .changeset/great-avocados-eat.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@nextui-org/chip": patch
"@nextui-org/input": patch
---

Add accessible name to the icon button (#2802, #2808)
6 changes: 6 additions & 0 deletions .changeset/nasty-forks-explode.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@nextui-org/accordion": patch
"@nextui-org/theme": patch
---

Fixed variants for nested accordions (#3285)
4 changes: 3 additions & 1 deletion .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,9 @@ body:
description: |
Please provide the version of NextUI you are using.
You can find the version number in the package.json file.
placeholder: ex. 2.0.10
For global installation, please state the version only. (e.g. 2.4.2)
For individual installation, please state the package name as well. (e.g. @nextui-org/button@2.0.34)
placeholder: ex. 2.4.2
validations:
required: true
- type: textarea
Expand Down
6 changes: 2 additions & 4 deletions .github/common-actions/install/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,10 @@ runs:
using: composite
steps:
- name: Install dependencies
uses: pnpm/action-setup@v2.2.4
with:
version: 8
uses: pnpm/action-setup@v4

- name: Setup Node.js
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version-file: ".nvmrc"
registry-url: "https://registry.npmjs.org"
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/QA.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout branch
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Install
uses: ./.github/common-actions/install
Expand All @@ -24,7 +24,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout branch
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Install
uses: ./.github/common-actions/install
Expand All @@ -37,7 +37,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout branch
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Install
uses: ./.github/common-actions/install
Expand All @@ -50,7 +50,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout branch
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Install
uses: ./.github/common-actions/install
Expand All @@ -63,7 +63,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout branch
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Install
uses: ./.github/common-actions/install
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout branch
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Install
uses: ./.github/common-actions/install
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sync-canary-to-main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0 # Ensure all history is fetched

Expand Down
20 changes: 20 additions & 0 deletions apps/docs/.sponsorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -330,5 +330,25 @@
"twitter": null,
"github": null,
"website": "https://replexica.com/?utm_source=nextui&utm_marketing=oss"
},
{
"MemberId": 571230,
"createdAt": "2024-06-01 18:47",
"type": "ORGANIZATION",
"role": "BACKER",
"tier": "Gold Sponsor 🥇",
"isActive": true,
"totalAmountDonated": 100,
"currency": "USD",
"lastTransactionAt": "2024-06-01 18:47",
"lastTransactionAmount": 100,
"profile": "https://opencollective.com/coderabbit",
"name": "CodeRabbit",
"company": null,
"description": "CodeRabbit is an AI-driven context-aware code reviewer that provides line-by-line feedback and smart chat. ",
"image": "/sponsors/571230.jpg",
"twitter": null,
"github": null,
"website": "https://coderabbit.ai"
}
]
4 changes: 4 additions & 0 deletions apps/docs/app/blog/layout.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import {Image} from "@nextui-org/react";

import {ScriptProviders} from "@/components/scripts/script-providers";

interface DocsLayoutProps {
children: React.ReactNode;
}
Expand All @@ -22,6 +24,8 @@ export default function DocsLayout({children}: DocsLayoutProps) {
>
<Image removeWrapper alt="docs right background" src="/gradients/docs-right.png" />
</div>

<ScriptProviders />
</>
);
}
3 changes: 3 additions & 0 deletions apps/docs/app/docs/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import {Image} from "@nextui-org/react";

import manifest from "@/config/routes.json";
import {DocsSidebar} from "@/components/docs/sidebar";
import {ScriptProviders} from "@/components/scripts/script-providers";

interface DocsLayoutProps {
children: React.ReactNode;
Expand Down Expand Up @@ -30,6 +31,8 @@ export default function DocsLayout({children}: DocsLayoutProps) {
>
<Image removeWrapper alt="docs right background" src="/gradients/docs-right.png" />
</div>

<ScriptProviders />
</>
);
}
3 changes: 3 additions & 0 deletions apps/docs/app/figma/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import {Image} from "@nextui-org/react";

import {Blockquote} from "@/components/docs/components/blockquote";
import {FigmaButton} from "@/components/figma-button";
import {ScriptProviders} from "@/components/scripts/script-providers";

export default function FigmaPage() {
return (
Expand Down Expand Up @@ -43,6 +44,8 @@ export default function FigmaPage() {
>
<Image removeWrapper alt="docs right background" src="/gradients/docs-right.png" />
</div>

<ScriptProviders />
</>
);
}
2 changes: 0 additions & 2 deletions apps/docs/app/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import {fontSans} from "@/config/fonts";
import {Navbar} from "@/components/navbar";
import {Footer} from "@/components/footer";
import {ProBanner} from "@/components/pro-banner";
import {ScriptProviders} from "@/components/scripts/script-providers";

export const metadata: Metadata = {
title: {
Expand Down Expand Up @@ -77,7 +76,6 @@ export default function RootLayout({children}: {children: React.ReactNode}) {
</div>
<Cmdk />
</Providers>
<ScriptProviders />
</body>
</html>
);
Expand Down
6 changes: 3 additions & 3 deletions apps/docs/components/docs/components/package-managers.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -97,9 +97,9 @@ export const PackageManagers = ({
})}
</Tabs>
{showGlobalInstallWarning && (
<Blockquote className="my-2">
No need to install this package if <Code>@nextui-org/react</Code> is already installed
globally.
<Blockquote className="my-2" color="warning">
The above command is for individual installation only. You may skip this step if{" "}
<Code>@nextui-org/react</Code> is already installed globally.
</Blockquote>
)}
</>
Expand Down
4 changes: 0 additions & 4 deletions apps/docs/components/footer.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
"use client";

import dynamic from "next/dynamic";
import {usePathname} from "next/navigation";

import {getCurrentYear} from "@/utils/time";

const VercelCallout = dynamic(() => import("./vercel-callout").then((mod) => mod.VercelCallout));

export const Footer = () => {
const pathname = usePathname();

Expand All @@ -18,7 +15,6 @@ export const Footer = () => {
<footer className="container mx-auto max-w-7xl pb-12 px-12">
<div className="flex flex-col justify-center items-center gap-1">
<p className="text-sm text-default-400">© {getCurrentYear()} NextUI Inc.</p>
<VercelCallout />
</div>
</footer>
);
Expand Down
18 changes: 0 additions & 18 deletions apps/docs/components/icons/social.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -98,23 +98,6 @@ const NextJsIcon: React.FC<IconSvgProps> = ({size = 24, width, height, ...props}
</svg>
);
};
const VercelIcon: React.FC<IconSvgProps> = ({width, height = 44, ...props}) => {
return (
<svg
fill="none"
height={height}
viewBox="0 0 4438 1000"
width={width}
xmlns="http://www.w3.org/2000/svg"
{...props}
>
<path
d="M2223.75 250C2051.25 250 1926.87 362.5 1926.87 531.25C1926.87 700 2066.72 812.5 2239.38 812.5C2343.59 812.5 2435.47 771.25 2492.34 701.719L2372.81 632.656C2341.25 667.188 2293.28 687.344 2239.38 687.344C2164.53 687.344 2100.94 648.281 2077.34 585.781H2515.16C2518.59 568.281 2520.63 550.156 2520.63 531.094C2520.63 362.5 2396.41 250 2223.75 250ZM2076.09 476.562C2095.62 414.219 2149.06 375 2223.75 375C2298.59 375 2352.03 414.219 2371.41 476.562H2076.09ZM2040.78 78.125L1607.81 828.125L1174.69 78.125H1337.03L1607.66 546.875L1878.28 78.125H2040.78ZM577.344 0L1154.69 1000H0L577.344 0ZM3148.75 531.25C3148.75 625 3210 687.5 3305 687.5C3369.38 687.5 3417.66 658.281 3442.5 610.625L3562.5 679.844C3512.81 762.656 3419.69 812.5 3305 812.5C3132.34 812.5 3008.13 700 3008.13 531.25C3008.13 362.5 3132.5 250 3305 250C3419.69 250 3512.66 299.844 3562.5 382.656L3442.5 451.875C3417.66 404.219 3369.38 375 3305 375C3210.16 375 3148.75 437.5 3148.75 531.25ZM4437.5 78.125V796.875H4296.88V78.125H4437.5ZM3906.25 250C3733.75 250 3609.38 362.5 3609.38 531.25C3609.38 700 3749.38 812.5 3921.88 812.5C4026.09 812.5 4117.97 771.25 4174.84 701.719L4055.31 632.656C4023.75 667.188 3975.78 687.344 3921.88 687.344C3847.03 687.344 3783.44 648.281 3759.84 585.781H4197.66C4201.09 568.281 4203.12 550.156 4203.12 531.094C4203.12 362.5 4078.91 250 3906.25 250ZM3758.59 476.562C3778.13 414.219 3831.41 375 3906.25 375C3981.09 375 4034.53 414.219 4053.91 476.562H3758.59ZM2961.25 265.625V417.031C2945.63 412.5 2929.06 409.375 2911.25 409.375C2820.47 409.375 2755 471.875 2755 565.625V796.875H2614.38V265.625H2755V409.375C2755 330 2847.34 265.625 2961.25 265.625Z"
fill="currentColor"
/>
</svg>
);
};

const NpmIcon: React.FC<IconSvgProps> = ({width = "1em", height = "1em", ...props}) => {
return (
Expand Down Expand Up @@ -477,7 +460,6 @@ export {
OpenCollectiveIcon,
PatreonIcon,
NextJsIcon,
VercelIcon,
NpmIcon,
NpmSmallIcon,
PnpmIcon,
Expand Down
Loading

0 comments on commit ca5c72b

Please sign in to comment.