Skip to content

Commit d21f0b0

Browse files
wingkwongwingkwong
authored
Merge branch 'canary' into fix/eng-783
2 parents af061a7 + 59ea6b7 commit d21f0b0

File tree

379 files changed

+21188
-13594
lines changed

Some content is hidden

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

379 files changed

+21188
-13594
lines changed

‎.changeset/famous-mice-approve.md

-5
This file was deleted.

‎.changeset/giant-maps-bow.md

-5
This file was deleted.

‎.changeset/grumpy-scissors-jam.md

-5
This file was deleted.

‎.changeset/healthy-clouds-refuse.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@nextui-org/navbar": patch
3+
---
4+
5+
Fix navbar menu breaking when a numerical height value is provided. The height value is now converted to pixels if it is a number.

‎.changeset/lazy-comics-crash.md

-5
This file was deleted.

‎.changeset/long-ducks-do.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@nextui-org/input": patch
3+
---
4+
5+
syncs changes to ref value to internal (state) value (#3024, #3436)

‎.changeset/moody-coats-sparkle.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@nextui-org/theme": patch
3+
---
4+
5+
Fix skeleton overflow issue (#3214 #3670)

‎.changeset/nice-beans-thank.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@nextui-org/system-rsc": patch
3+
---
4+
5+
added missing `StringToBoolean<keyof V[K]>[]` (#3530)

‎.changeset/red-ducks-greet.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@nextui-org/link": patch
3+
---
4+
5+
use `@nextui-org/use-aria-link` to suppress onClick deprecation warning (#3196)

‎.changeset/silver-stingrays-brush.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@nextui-org/theme": patch
3+
---
4+
5+
export default-layout in theme

‎.changeset/slow-forks-nail.md

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
"@nextui-org/calendar": patch
3+
"@nextui-org/theme": patch
4+
---
5+
6+
fixed arrow keys order when html has dir="rtl" (#3641, #3642)

‎.changeset/sweet-crabs-buy.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@nextui-org/theme": patch
3+
---
4+
5+
fixed the double click need in chrome for checkbox, switch and radiobuttons (#3528)

‎.changeset/thirty-timers-press.md

-5
This file was deleted.

‎.changeset/tough-peaches-live.md

-5
This file was deleted.

‎.changeset/warm-planets-smile.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@nextui-org/dropdown": patch
3+
---
4+
5+
fix(dropdown): respect closeOnSelect prop on DropdownItem (#2290)

‎.eslintrc.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@
8787
"prev": ["const", "let", "var"],
8888
"next": ["const", "let", "var"]
8989
}
90-
]
90+
],
91+
"import/consistent-type-specifier-style": ["error", "prefer-top-level"]
9192
}
9293
}

‎.github/ISSUE_TEMPLATE/bug_report.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,9 @@ body:
2828
description: |
2929
Please provide the version of NextUI you are using.
3030
You can find the version number in the package.json file.
31-
placeholder: ex. 2.0.10
31+
For global installation, please state the version only. (e.g. 2.4.2)
32+
For individual installation, please state the package name as well. (e.g. @nextui-org/button@2.0.34)
33+
placeholder: ex. 2.4.2
3234
validations:
3335
required: true
3436
- type: textarea

‎.github/common-actions/install/action.yml

+2-4
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,10 @@ runs:
55
using: composite
66
steps:
77
- name: Install dependencies
8-
uses: pnpm/action-setup@v2.2.4
9-
with:
10-
version: 8
8+
uses: pnpm/action-setup@v4
119

1210
- name: Setup Node.js
13-
uses: actions/setup-node@v3
11+
uses: actions/setup-node@v4
1412
with:
1513
node-version-file: ".nvmrc"
1614
registry-url: "https://registry.npmjs.org"

‎.github/workflows/QA.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- name: Checkout branch
14-
uses: actions/checkout@v3
14+
uses: actions/checkout@v4
1515

1616
- name: Install
1717
uses: ./.github/common-actions/install
@@ -24,7 +24,7 @@ jobs:
2424
runs-on: ubuntu-latest
2525
steps:
2626
- name: Checkout branch
27-
uses: actions/checkout@v3
27+
uses: actions/checkout@v4
2828

2929
- name: Install
3030
uses: ./.github/common-actions/install
@@ -37,7 +37,7 @@ jobs:
3737
runs-on: ubuntu-latest
3838
steps:
3939
- name: Checkout branch
40-
uses: actions/checkout@v3
40+
uses: actions/checkout@v4
4141

4242
- name: Install
4343
uses: ./.github/common-actions/install
@@ -50,7 +50,7 @@ jobs:
5050
runs-on: ubuntu-latest
5151
steps:
5252
- name: Checkout branch
53-
uses: actions/checkout@v3
53+
uses: actions/checkout@v4
5454

5555
- name: Install
5656
uses: ./.github/common-actions/install
@@ -63,7 +63,7 @@ jobs:
6363
runs-on: ubuntu-latest
6464
steps:
6565
- name: Checkout branch
66-
uses: actions/checkout@v3
66+
uses: actions/checkout@v4
6767

6868
- name: Install
6969
uses: ./.github/common-actions/install

‎.github/workflows/release.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
runs-on: ubuntu-latest
1818
steps:
1919
- name: Checkout branch
20-
uses: actions/checkout@v3
20+
uses: actions/checkout@v4
2121

2222
- name: Install
2323
uses: ./.github/common-actions/install

‎.github/workflows/sync-canary-to-main.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
runs-on: ubuntu-latest
1313
steps:
1414
- name: Checkout code
15-
uses: actions/checkout@v3
15+
uses: actions/checkout@v4
1616
with:
1717
fetch-depth: 0 # Ensure all history is fetched
1818

‎.nvmrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
16.x
1+
20.x

‎.vscode/settings.json

+8-1
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,12 @@
33
"editor.formatOnSave": false,
44
"editor.codeActionsOnSave": {
55
"source.fixAll.eslint": "explicit"
6-
}
6+
},
7+
"tailwindCSS.experimental.configFile": {
8+
"packages/storybook/tailwind.config.js": ["packages/core/theme/**/*", "packages/components/**/*"],
9+
"apps/docs/tailwind.config.js": "apps/docs/**/*"
10+
},
11+
"tailwindCSS.experimental.classRegex": [
12+
["([\"'`][^\"'`]*.*?[\"'`])", "[\"'`]([^\"'`]*).*?[\"'`]"]
13+
]
714
}

‎apps/docs/.sponsorsrc

+42
Original file line numberDiff line numberDiff line change
@@ -308,5 +308,47 @@
308308
"twitter": null,
309309
"github": null,
310310
"website": "https://encur.me/"
311+
},
312+
{
313+
"MemberId": 569973,
314+
"createdAt": "2024-05-29 17:51",
315+
"type": "USER",
316+
"role": "BACKER",
317+
"tier": "Gold Sponsor 🥇",
318+
"isActive": true,
319+
"totalAmountDonated": 100,
320+
"currency": "USD",
321+
"lastTransactionAt": "2024-05-29 17:51",
322+
"lastTransactionAmount": 100,
323+
"profile": "https://opencollective.com/maxprilutskiy",
324+
"name": "Replexica",
325+
"company": "",
326+
"description": null,
327+
"image": "/sponsors/569973.jpg",
328+
"email": null,
329+
"newsletterOptIn": null,
330+
"twitter": null,
331+
"github": null,
332+
"website": "https://replexica.com/?utm_source=nextui&utm_marketing=oss"
333+
},
334+
{
335+
"MemberId": 571230,
336+
"createdAt": "2024-06-01 18:47",
337+
"type": "ORGANIZATION",
338+
"role": "BACKER",
339+
"tier": "Gold Sponsor 🥇",
340+
"isActive": true,
341+
"totalAmountDonated": 100,
342+
"currency": "USD",
343+
"lastTransactionAt": "2024-06-01 18:47",
344+
"lastTransactionAmount": 100,
345+
"profile": "https://opencollective.com/coderabbit",
346+
"name": "CodeRabbit",
347+
"company": null,
348+
"description": "CodeRabbit is an AI-driven context-aware code reviewer that provides line-by-line feedback and smart chat. ",
349+
"image": "/sponsors/571230.jpg",
350+
"twitter": null,
351+
"github": null,
352+
"website": "https://coderabbit.ai"
311353
}
312354
]

‎apps/docs/app/blog/layout.tsx

+4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
import {Image} from "@nextui-org/react";
22

3+
import {ScriptProviders} from "@/components/scripts/script-providers";
4+
35
interface DocsLayoutProps {
46
children: React.ReactNode;
57
}
@@ -22,6 +24,8 @@ export default function DocsLayout({children}: DocsLayoutProps) {
2224
>
2325
<Image removeWrapper alt="docs right background" src="/gradients/docs-right.png" />
2426
</div>
27+
28+
<ScriptProviders />
2529
</>
2630
);
2731
}

‎apps/docs/app/docs/layout.tsx

+3
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import {Image} from "@nextui-org/react";
22

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

67
interface DocsLayoutProps {
78
children: React.ReactNode;
@@ -30,6 +31,8 @@ export default function DocsLayout({children}: DocsLayoutProps) {
3031
>
3132
<Image removeWrapper alt="docs right background" src="/gradients/docs-right.png" />
3233
</div>
34+
35+
<ScriptProviders />
3336
</>
3437
);
3538
}

‎apps/docs/app/examples/perf/page.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ const usersData = [
246246
age: "29",
247247
avatar: "https://d2u8k2ocievbld.cloudfront.net/memojis/male/3.png",
248248
email: "brian.kim@example.com",
249-
status: "Active",
249+
status: "active",
250250
},
251251
{
252252
id: 7,

‎apps/docs/app/examples/table/custom-styles/page.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ const users = [
112112
age: "29",
113113
avatar: "https://i.pravatar.cc/150?u=a042581f4e29026024d",
114114
email: "brian.kim@example.com",
115-
status: "Active",
115+
status: "active",
116116
},
117117
{
118118
id: 7,

‎apps/docs/app/examples/table/use-case/page.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ const users = [
112112
age: "29",
113113
avatar: "https://i.pravatar.cc/150?u=a042581f4e29026024d",
114114
email: "brian.kim@example.com",
115-
status: "Active",
115+
status: "active",
116116
},
117117
{
118118
id: 7,

‎apps/docs/app/figma/page.tsx

+3
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import {Image} from "@nextui-org/react";
22

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

67
export default function FigmaPage() {
78
return (
@@ -43,6 +44,8 @@ export default function FigmaPage() {
4344
>
4445
<Image removeWrapper alt="docs right background" src="/gradients/docs-right.png" />
4546
</div>
47+
48+
<ScriptProviders />
4649
</>
4750
);
4851
}

‎apps/docs/app/layout.tsx

-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import {fontSans} from "@/config/fonts";
1212
import {Navbar} from "@/components/navbar";
1313
import {Footer} from "@/components/footer";
1414
import {ProBanner} from "@/components/pro-banner";
15-
import {ScriptProviders} from "@/components/scripts/script-providers";
1615

1716
export const metadata: Metadata = {
1817
title: {
@@ -77,7 +76,6 @@ export default function RootLayout({children}: {children: React.ReactNode}) {
7776
</div>
7877
<Cmdk />
7978
</Providers>
80-
<ScriptProviders />
8179
</body>
8280
</html>
8381
);

‎apps/docs/components/code-window/code-block.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ export type CodeBlockProps = PreProps & {
3939
* recursively get all text nodes as an array for a given element
4040
*/
4141
function getTextNodes(node: any): any[] {
42-
let childTextNodes = [];
42+
let childTextNodes: React.ReactNode[] = [];
4343

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

‎apps/docs/components/docs/components/code-demo/code-demo.tsx

-4
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ interface CodeDemoProps extends UseCodeDemoProps, WindowResizerProps {
4040
displayMode?: "always" | "visible";
4141
isGradientBox?: boolean;
4242
gradientColor?: GradientBoxProps["color"];
43-
defaultExpanded?: boolean;
4443
previewHeight?: string | number;
4544
overflow?: "auto" | "visible" | "hidden";
4645
className?: string;
@@ -61,7 +60,6 @@ export const CodeDemo: React.FC<CodeDemoProps> = ({
6160
typescriptStrict = false,
6261
showOpenInCodeSandbox,
6362
isGradientBox = false,
64-
defaultExpanded = false,
6563
previewHeight = "auto",
6664
overflow = "visible",
6765
displayMode = "always",
@@ -138,7 +136,6 @@ export const CodeDemo: React.FC<CodeDemoProps> = ({
138136

139137
const content = (
140138
<DynamicSandpack
141-
defaultExpanded={defaultExpanded}
142139
files={files}
143140
highlightedLines={highlightedLines}
144141
showEditor={showEditor}
@@ -155,7 +152,6 @@ export const CodeDemo: React.FC<CodeDemoProps> = ({
155152
isInView,
156153
files,
157154
highlightedLines,
158-
defaultExpanded,
159155
showPreview,
160156
showSandpackPreview,
161157
showOpenInCodeSandbox,

0 commit comments

Comments
 (0)