Skip to content

Commit

Permalink
Merge branch 'canary' into fix/eng-783
Browse files Browse the repository at this point in the history
  • Loading branch information
wingkwong authored Aug 31, 2024
2 parents af061a7 + 59ea6b7 commit d21f0b0
Show file tree
Hide file tree
Showing 379 changed files with 21,188 additions and 13,594 deletions.
5 changes: 0 additions & 5 deletions .changeset/famous-mice-approve.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/giant-maps-bow.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/grumpy-scissors-jam.md

This file was deleted.

5 changes: 5 additions & 0 deletions .changeset/healthy-clouds-refuse.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@nextui-org/navbar": patch
---

Fix navbar menu breaking when a numerical height value is provided. The height value is now converted to pixels if it is a number.
5 changes: 0 additions & 5 deletions .changeset/lazy-comics-crash.md

This file was deleted.

5 changes: 5 additions & 0 deletions .changeset/long-ducks-do.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@nextui-org/input": patch
---

syncs changes to ref value to internal (state) value (#3024, #3436)
5 changes: 5 additions & 0 deletions .changeset/moody-coats-sparkle.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@nextui-org/theme": patch
---

Fix skeleton overflow issue (#3214 #3670)
5 changes: 5 additions & 0 deletions .changeset/nice-beans-thank.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@nextui-org/system-rsc": patch
---

added missing `StringToBoolean<keyof V[K]>[]` (#3530)
5 changes: 5 additions & 0 deletions .changeset/red-ducks-greet.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@nextui-org/link": patch
---

use `@nextui-org/use-aria-link` to suppress onClick deprecation warning (#3196)
5 changes: 5 additions & 0 deletions .changeset/silver-stingrays-brush.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@nextui-org/theme": patch
---

export default-layout in theme
6 changes: 6 additions & 0 deletions .changeset/slow-forks-nail.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@nextui-org/calendar": patch
"@nextui-org/theme": patch
---

fixed arrow keys order when html has dir="rtl" (#3641, #3642)
5 changes: 5 additions & 0 deletions .changeset/sweet-crabs-buy.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@nextui-org/theme": patch
---

fixed the double click need in chrome for checkbox, switch and radiobuttons (#3528)
5 changes: 0 additions & 5 deletions .changeset/thirty-timers-press.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/tough-peaches-live.md

This file was deleted.

5 changes: 5 additions & 0 deletions .changeset/warm-planets-smile.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@nextui-org/dropdown": patch
---

fix(dropdown): respect closeOnSelect prop on DropdownItem (#2290)
3 changes: 2 additions & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@
"prev": ["const", "let", "var"],
"next": ["const", "let", "var"]
}
]
],
"import/consistent-type-specifier-style": ["error", "prefer-top-level"]
}
}
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
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
16.x
20.x
9 changes: 8 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,12 @@
"editor.formatOnSave": false,
"editor.codeActionsOnSave": {
"source.fixAll.eslint": "explicit"
}
},
"tailwindCSS.experimental.configFile": {
"packages/storybook/tailwind.config.js": ["packages/core/theme/**/*", "packages/components/**/*"],
"apps/docs/tailwind.config.js": "apps/docs/**/*"
},
"tailwindCSS.experimental.classRegex": [
["([\"'`][^\"'`]*.*?[\"'`])", "[\"'`]([^\"'`]*).*?[\"'`]"]
]
}
42 changes: 42 additions & 0 deletions apps/docs/.sponsorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -308,5 +308,47 @@
"twitter": null,
"github": null,
"website": "https://encur.me/"
},
{
"MemberId": 569973,
"createdAt": "2024-05-29 17:51",
"type": "USER",
"role": "BACKER",
"tier": "Gold Sponsor 🥇",
"isActive": true,
"totalAmountDonated": 100,
"currency": "USD",
"lastTransactionAt": "2024-05-29 17:51",
"lastTransactionAmount": 100,
"profile": "https://opencollective.com/maxprilutskiy",
"name": "Replexica",
"company": "",
"description": null,
"image": "/sponsors/569973.jpg",
"email": null,
"newsletterOptIn": null,
"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 />
</>
);
}
2 changes: 1 addition & 1 deletion apps/docs/app/examples/perf/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ const usersData = [
age: "29",
avatar: "https://d2u8k2ocievbld.cloudfront.net/memojis/male/3.png",
email: "brian.kim@example.com",
status: "Active",
status: "active",
},
{
id: 7,
Expand Down
2 changes: 1 addition & 1 deletion apps/docs/app/examples/table/custom-styles/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ const users = [
age: "29",
avatar: "https://i.pravatar.cc/150?u=a042581f4e29026024d",
email: "brian.kim@example.com",
status: "Active",
status: "active",
},
{
id: 7,
Expand Down
2 changes: 1 addition & 1 deletion apps/docs/app/examples/table/use-case/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ const users = [
age: "29",
avatar: "https://i.pravatar.cc/150?u=a042581f4e29026024d",
email: "brian.kim@example.com",
status: "Active",
status: "active",
},
{
id: 7,
Expand Down
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
2 changes: 1 addition & 1 deletion apps/docs/components/code-window/code-block.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ export type CodeBlockProps = PreProps & {
* recursively get all text nodes as an array for a given element
*/
function getTextNodes(node: any): any[] {
let childTextNodes = [];
let childTextNodes: React.ReactNode[] = [];

if (!node.hasChildNodes()) return [];

Expand Down
4 changes: 0 additions & 4 deletions apps/docs/components/docs/components/code-demo/code-demo.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ interface CodeDemoProps extends UseCodeDemoProps, WindowResizerProps {
displayMode?: "always" | "visible";
isGradientBox?: boolean;
gradientColor?: GradientBoxProps["color"];
defaultExpanded?: boolean;
previewHeight?: string | number;
overflow?: "auto" | "visible" | "hidden";
className?: string;
Expand All @@ -61,7 +60,6 @@ export const CodeDemo: React.FC<CodeDemoProps> = ({
typescriptStrict = false,
showOpenInCodeSandbox,
isGradientBox = false,
defaultExpanded = false,
previewHeight = "auto",
overflow = "visible",
displayMode = "always",
Expand Down Expand Up @@ -138,7 +136,6 @@ export const CodeDemo: React.FC<CodeDemoProps> = ({

const content = (
<DynamicSandpack
defaultExpanded={defaultExpanded}
files={files}
highlightedLines={highlightedLines}
showEditor={showEditor}
Expand All @@ -155,7 +152,6 @@ export const CodeDemo: React.FC<CodeDemoProps> = ({
isInView,
files,
highlightedLines,
defaultExpanded,
showPreview,
showSandpackPreview,
showOpenInCodeSandbox,
Expand Down
Loading

0 comments on commit d21f0b0

Please sign in to comment.