Skip to content

Commit

Permalink
Merge branch 'canary' into ci/update-versions
Browse files Browse the repository at this point in the history
  • Loading branch information
wingkwong authored Sep 8, 2024
2 parents 4262476 + f0eb7a6 commit 75ceb62
Show file tree
Hide file tree
Showing 926 changed files with 60,965 additions and 21,619 deletions.
5 changes: 5 additions & 0 deletions .changeset/clean-dryers-notice.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@nextui-org/select": patch
---

Fixed toggle issue while clicking on label of select component unexpectedly open and close the model instantly. The removal of code block containing `group-data-[filled=true]:pointer-events-auto` prevent from any unwanted user interactions and resolve the flickering issue (#3558)
2 changes: 1 addition & 1 deletion .changeset/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"fixed": [],
"linked": [],
"access": "public",
"baseBranch": "main",
"baseBranch": "canary",
"updateInternalDependencies": "patch",
"___experimentalUnsafeOptions_WILL_CHANGE_IN_PATCH": {
"onlyUpdatePeerDependentsWhenOutOfRange": true
Expand Down
5 changes: 5 additions & 0 deletions .changeset/five-teachers-refuse.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@nextui-org/theme": patch
---

fixed the shadow clipping of card inside listbox or menubox item (#3480)
14 changes: 14 additions & 0 deletions .changeset/happy-socks-hug.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
---
"@nextui-org/autocomplete": patch
"@nextui-org/date-picker": patch
"@nextui-org/dropdown": patch
"@nextui-org/modal": patch
"@nextui-org/popover": patch
"@nextui-org/select": patch
"@nextui-org/use-aria-modal-overlay": patch
"@nextui-org/use-aria-multiselect": patch
"@nextui-org/use-aria-overlay": patch
"@nextui-org/aria-utils": patch
---

Refactor overlays to reduce its complexity, while improving stability.
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: 5 additions & 0 deletions .changeset/lucky-schools-travel.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@nextui-org/input": patch
---

Fixed hover and focus of input when label placement is outside-left (#2328)
6 changes: 6 additions & 0 deletions .changeset/metal-jars-rhyme.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@nextui-org/autocomplete": patch
"@nextui-org/theme": patch
---

Improve clear button pointer events, keyboard reopen issue on mobile
6 changes: 0 additions & 6 deletions .changeset/metal-weeks-vanish.md

This file was deleted.

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: 0 additions & 5 deletions .changeset/orange-waves-speak.md

This file was deleted.

5 changes: 5 additions & 0 deletions .changeset/popular-baboons-pull.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@nextui-org/listbox": patch
---

Fix item highlighting in `AutocompleteSection` during keyboard navigation (#3713)
5 changes: 5 additions & 0 deletions .changeset/real-cows-lie.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@nextui-org/popover": patch
---

Use `usePreventScroll` instead of `react-remove-scroll`; Add `shouldBlockScroll` prop to `Tooltip` (#3474).
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)
7 changes: 7 additions & 0 deletions .changeset/selfish-spies-visit.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
"@nextui-org/use-clipboard": patch
"@nextui-org/use-real-shape": patch
"@nextui-org/use-ref-state": patch
---

ensure exposed functions wrap by `useCallback`
5 changes: 0 additions & 5 deletions .changeset/selfish-ties-enjoy.md

This file was deleted.

6 changes: 6 additions & 0 deletions .changeset/seven-apricots-happen.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@nextui-org/modal": patch
"@nextui-org/theme": patch
---

adjust modal position when keyboard appears (#2837)
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/soft-wombats-wash.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@nextui-org/input": patch
---

disable clear button when input is read-only
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: 5 additions & 0 deletions .changeset/tall-walls-sell.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@nextui-org/theme": patch
---

The color of the selected value in SELECT component was `text-foreground-500` instead of `text-default-foreground`. Also label slot in SELECT component's UNDERLINE had no effect of color variant. The change includes the fix for the mentioned issues (#3659).
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)
5 changes: 5 additions & 0 deletions .changeset/wild-apples-cheer.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@nextui-org/shared-utils": patch
---

fixed gregorian year offset for persian (#3602)
5 changes: 0 additions & 5 deletions .changeset/wise-snails-sing.md

This file was deleted.

22 changes: 22 additions & 0 deletions .coderabbit.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
language: "en"
early_access: false
reviews:
high_level_summary: true
poem: false
review_status: true
collapse_walkthrough: false
auto_review:
enabled: true
ignore_title_keywords:
- "WIP"
- "DO NOT MERGE"
- 'ci(changesets)'
drafts: false
base_branches:
- "main"
- "canary"
- "fix/.*"
- "chore/.*"
- "feat/.*"
chat:
auto_reply: true
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
2 changes: 0 additions & 2 deletions .github/common-actions/install/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ runs:
steps:
- name: Install dependencies
uses: pnpm/action-setup@v4
with:
version: 9.1.0

- name: Setup Node.js
uses: actions/setup-node@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/QA.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: QA
on:
pull_request:
branches:
- main
- canary

jobs:
build:
Expand Down
19 changes: 14 additions & 5 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
- ".changeset/**"
- "packages/**"
branches:
- main
- canary

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
Expand Down Expand Up @@ -41,12 +41,21 @@ jobs:
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Create @dev release
- name: Sync files from canary to main branch if a publish happens
if: steps.changesets.outputs.published == 'true'
run: |
curl -X POST \
-H "Accept: application/vnd.github.v3+json" \
-H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \
https://api.github.com/repos/owner/repo/dispatches \
-d '{"event_type":"sync-canary-to-main"}'
- name: Create canary release
if: steps.changesets.outputs.published != 'true'
run: |
git checkout main
pnpm version:dev
pnpm release:dev
git checkout canary
pnpm version:canary
pnpm release:canary
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
43 changes: 43 additions & 0 deletions .github/workflows/sync-canary-to-main.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
name: Sync Canary to Main

on:
# triggered manually in Github
workflow_dispatch:
# triggered by the type "sync-canary-to-main" (e.g. from release action after publishing)
repository_dispatch:
types: [sync-canary-to-main]

jobs:
create_pull_request:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v4
with:
fetch-depth: 0 # Ensure all history is fetched

- name: Create Pull Request
uses: repo-sync/pull-request@v2
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
source_branch: "canary"
destination_branch: "main"
pr_title: "Auto-sync Canary to Main"
pr_body: |
## Automated: Sync from Canary to Main
This Pull Request is automatically generated to sync the changes from the Canary branch to the Main branch. Below are the included updates:
### Triggered by a Direct Push to Canary:
- Please check the recent commits on the Canary branch directly as this sync may include multiple changes.
### Triggered by a Pull Request Merge:
- Merged Pull Request: [PR#${{ github.event.pull_request.number }}](${{ github.event.pull_request.html_url }}) - ${{ github.event.pull_request.title }}
- PR Description: ${{ github.event.pull_request.body }}
- Merged by: ${{ github.event.pull_request.merged_by.login }}
### Action Required:
- Please review the changes carefully.
- Approve and merge the Pull Request if everything is in order.
Thank you for maintaining the Main branch updated and clean.
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20.x
v20.16.0
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": [
["([\"'`][^\"'`]*.*?[\"'`])", "[\"'`]([^\"'`]*).*?[\"'`]"]
]
}
Loading

0 comments on commit 75ceb62

Please sign in to comment.