fix: merge conflicts

.changeset/cold-dolls-vanish.md

@@ -0,0 +1,6 @@
+---
+"@nextui-org/drawer": patch
+"@nextui-org/modal": patch
+---
+
+Drawer styles and transition improved

.changeset/config.json

@@ -8,7 +8,7 @@
   "fixed": [],
   "linked": [],
   "access": "public",
-  "baseBranch": "canary",
+  "baseBranch": "main",
   "updateInternalDependencies": "patch",
   "___experimentalUnsafeOptions_WILL_CHANGE_IN_PATCH": {
     "onlyUpdatePeerDependentsWhenOutOfRange": true

.changeset/empty-helper-wrapper-div.md

@@ -0,0 +1,6 @@
+---
+"@nextui-org/select": patch
+"@nextui-org/input": patch
+---
+
+- Fixed a UI sliding issue caused by the helper wrapper being rendered when `isInvalid` was false but `errorMessage` was present

.changeset/famous-experts-buy.md

@@ -0,0 +1,86 @@
+---
+"@nextui-org/accordion": patch
+"@nextui-org/alert": patch
+"@nextui-org/autocomplete": patch
+"@nextui-org/avatar": patch
+"@nextui-org/badge": patch
+"@nextui-org/breadcrumbs": patch
+"@nextui-org/button": patch
+"@nextui-org/calendar": patch
+"@nextui-org/card": patch
+"@nextui-org/checkbox": patch
+"@nextui-org/chip": patch
+"@nextui-org/code": patch
+"@nextui-org/date-input": patch
+"@nextui-org/date-picker": patch
+"@nextui-org/divider": patch
+"@nextui-org/drawer": patch
+"@nextui-org/dropdown": patch
+"@nextui-org/image": patch
+"@nextui-org/input": patch
+"@nextui-org/kbd": patch
+"@nextui-org/link": patch
+"@nextui-org/listbox": patch
+"@nextui-org/menu": patch
+"@nextui-org/modal": patch
+"@nextui-org/navbar": patch
+"@nextui-org/pagination": patch
+"@nextui-org/popover": patch
+"@nextui-org/progress": patch
+"@nextui-org/radio": patch
+"@nextui-org/ripple": patch
+"@nextui-org/scroll-shadow": patch
+"@nextui-org/select": patch
+"@nextui-org/skeleton": patch
+"@nextui-org/slider": patch
+"@nextui-org/snippet": patch
+"@nextui-org/spacer": patch
+"@nextui-org/spinner": patch
+"@nextui-org/switch": patch
+"@nextui-org/table": patch
+"@nextui-org/tabs": patch
+"@nextui-org/tooltip": patch
+"@nextui-org/user": patch
+"@nextui-org/react": patch
+"@nextui-org/system": patch
+"@nextui-org/system-rsc": patch
+"@nextui-org/theme": patch
+"@nextui-org/use-aria-accordion": patch
+"@nextui-org/use-aria-accordion-item": patch
+"@nextui-org/use-aria-button": patch
+"@nextui-org/use-aria-link": patch
+"@nextui-org/use-aria-menu": patch
+"@nextui-org/use-aria-modal-overlay": patch
+"@nextui-org/use-aria-multiselect": patch
+"@nextui-org/use-aria-toggle-button": patch
+"@nextui-org/use-callback-ref": patch
+"@nextui-org/use-clipboard": patch
+"@nextui-org/use-data-scroll-overflow": patch
+"@nextui-org/use-disclosure": patch
+"@nextui-org/use-draggable": patch
+"@nextui-org/use-image": patch
+"@nextui-org/use-infinite-scroll": patch
+"@nextui-org/use-intersection-observer": patch
+"@nextui-org/use-is-mobile": patch
+"@nextui-org/use-is-mounted": patch
+"@nextui-org/use-measure": patch
+"@nextui-org/use-pagination": patch
+"@nextui-org/use-real-shape": patch
+"@nextui-org/use-ref-state": patch
+"@nextui-org/use-resize": patch
+"@nextui-org/use-safe-layout-effect": patch
+"@nextui-org/use-scroll-position": patch
+"@nextui-org/use-ssr": patch
+"@nextui-org/use-theme": patch
+"@nextui-org/use-update-effect": patch
+"@nextui-org/aria-utils": patch
+"@nextui-org/dom-animation": patch
+"@nextui-org/framer-utils": patch
+"@nextui-org/react-rsc-utils": patch
+"@nextui-org/react-utils": patch
+"@nextui-org/shared-icons": patch
+"@nextui-org/shared-utils": patch
+"@nextui-org/test-utils": patch
+---
+
+Test new runner

.changeset/few-jars-flow.md

@@ -0,0 +1,65 @@
+---
+"@nextui-org/table": minor
+"@nextui-org/accordion": minor
+"@nextui-org/alert": minor
+"@nextui-org/autocomplete": minor
+"@nextui-org/avatar": minor
+"@nextui-org/badge": minor
+"@nextui-org/breadcrumbs": minor
+"@nextui-org/button": minor
+"@nextui-org/calendar": minor
+"@nextui-org/card": minor
+"@nextui-org/checkbox": minor
+"@nextui-org/chip": minor
+"@nextui-org/date-input": minor
+"@nextui-org/date-picker": minor
+"@nextui-org/dropdown": minor
+"@nextui-org/input": minor
+"@nextui-org/code": minor
+"@nextui-org/divider": minor
+"@nextui-org/image": minor
+"@nextui-org/drawer": minor
+"@nextui-org/kbd": minor
+"@nextui-org/link": minor
+"@nextui-org/listbox": minor
+"@nextui-org/menu": minor
+"@nextui-org/modal": minor
+"@nextui-org/navbar": minor
+"@nextui-org/pagination": minor
+"@nextui-org/popover": minor
+"@nextui-org/progress": minor
+"@nextui-org/radio": minor
+"@nextui-org/scroll-shadow": minor
+"@nextui-org/ripple": minor
+"@nextui-org/select": minor
+"@nextui-org/slider": minor
+"@nextui-org/skeleton": minor
+"@nextui-org/spacer": minor
+"@nextui-org/spinner": minor
+"@nextui-org/snippet": minor
+"@nextui-org/switch": minor
+"@nextui-org/tabs": minor
+"@nextui-org/tooltip": minor
+"@nextui-org/user": minor
+"@nextui-org/react": minor
+"@nextui-org/system": minor
+"@nextui-org/theme": minor
+"@nextui-org/system-rsc": minor
+"@nextui-org/use-aria-accordion": minor
+"@nextui-org/use-aria-accordion-item": minor
+"@nextui-org/use-aria-button": minor
+"@nextui-org/use-aria-link": minor
+"@nextui-org/use-aria-menu": minor
+"@nextui-org/use-aria-modal-overlay": minor
+"@nextui-org/use-aria-multiselect": minor
+"@nextui-org/use-aria-toggle-button": minor
+"@nextui-org/use-disclosure": minor
+"@nextui-org/use-intersection-observer": minor
+"@nextui-org/use-is-mobile": minor
+"@nextui-org/use-pagination": minor
+"@nextui-org/aria-utils": minor
+"@nextui-org/use-ssr": minor
+"@nextui-org/use-theme": minor
+---
+
+update react-aria version

.changeset/gentle-needles-rescue.md

@@ -0,0 +1,5 @@
+---
+"@nextui-org/use-image": patch
+---
+
+use-image hook logic restore to the previous one to avoid nextjs hydration issues

.changeset/grumpy-mayflies-rhyme.md

@@ -0,0 +1,5 @@
+---
+"@nextui-org/theme": patch
+---
+
+bump `tailwind-merge` version (#3614)

.changeset/happy-parrots-search.md

@@ -0,0 +1,5 @@
+---
+"@nextui-org/theme": patch
+---
+
+apply tw nested group (#3544, #2324, #2959)

.changeset/kind-cobras-travel.md

@@ -0,0 +1,6 @@
+---
+"@nextui-org/calendar": patch
+"@nextui-org/date-picker": patch
+---
+
+Add month and year picker to DateRangePicker and RangeCalendar (#3089, #3090)

.changeset/kind-insects-end.md

@@ -0,0 +1,5 @@
+---
+"@nextui-org/use-image": patch
+---
+
+server validation added to the use-image hook

.changeset/light-needles-behave.md

@@ -0,0 +1,5 @@
+---
+"@nextui-org/use-theme": patch
+---
+
+introduce `use-theme` hook

.changeset/mean-mangos-occur.md

@@ -0,0 +1,8 @@
+---
+"@nextui-org/calendar": patch
+"@nextui-org/theme": patch
+"@nextui-org/use-infinite-scroll": patch
+"@nextui-org/shared-utils": patch
+---
+
+replaced lodash with native approaches

.changeset/moody-rabbits-shop.md

@@ -0,0 +1,7 @@
+---
+"@nextui-org/calendar": patch
+"@nextui-org/tabs": patch
+"@nextui-org/shared-utils": patch
+---
+
+support inert value with boolean type for react 19 (#4038)

.changeset/neat-donkeys-accept.md

@@ -0,0 +1,6 @@
+---
+"@nextui-org/date-picker": patch
+"@nextui-org/theme": patch
+---
+
+Add support for selectorButtonPlacement property (#3015)

.changeset/new-cougars-collect.md

@@ -0,0 +1,6 @@
+---
+"@nextui-org/alert": patch
+"@nextui-org/theme": patch
+---
+
+Alert styles improved

.changeset/pink-beans-sit.md

@@ -0,0 +1,6 @@
+---
+"@nextui-org/use-image": patch
+"@nextui-org/test-utils": patch
+---
+
+fix cached image flashing due to use-image always returning pending initially. The fix was to check if the image is loaded instantly through HTMLImageElement.complete attribute and use that to initialize the state.

.changeset/plenty-scissors-love.md

@@ -0,0 +1,77 @@
+---
+"@nextui-org/accordion": patch
+"@nextui-org/alert": patch
+"@nextui-org/autocomplete": patch
+"@nextui-org/avatar": patch
+"@nextui-org/badge": patch
+"@nextui-org/breadcrumbs": patch
+"@nextui-org/button": patch
+"@nextui-org/calendar": patch
+"@nextui-org/card": patch
+"@nextui-org/checkbox": patch
+"@nextui-org/chip": patch
+"@nextui-org/code": patch
+"@nextui-org/date-input": patch
+"@nextui-org/date-picker": patch
+"@nextui-org/divider": patch
+"@nextui-org/drawer": patch
+"@nextui-org/dropdown": patch
+"@nextui-org/image": patch
+"@nextui-org/input": patch
+"@nextui-org/kbd": patch
+"@nextui-org/link": patch
+"@nextui-org/listbox": patch
+"@nextui-org/menu": patch
+"@nextui-org/modal": patch
+"@nextui-org/navbar": patch
+"@nextui-org/pagination": patch
+"@nextui-org/popover": patch
+"@nextui-org/progress": patch
+"@nextui-org/radio": patch
+"@nextui-org/ripple": patch
+"@nextui-org/scroll-shadow": patch
+"@nextui-org/select": patch
+"@nextui-org/skeleton": patch
+"@nextui-org/slider": patch
+"@nextui-org/snippet": patch
+"@nextui-org/spacer": patch
+"@nextui-org/spinner": patch
+"@nextui-org/switch": patch
+"@nextui-org/table": patch
+"@nextui-org/tabs": patch
+"@nextui-org/tooltip": patch
+"@nextui-org/user": patch
+"@nextui-org/react": patch
+"@nextui-org/system": patch
+"@nextui-org/system-rsc": patch
+"@nextui-org/theme": patch
+"@nextui-org/use-aria-accordion": patch
+"@nextui-org/use-aria-accordion-item": patch
+"@nextui-org/use-aria-button": patch
+"@nextui-org/use-aria-link": patch
+"@nextui-org/use-aria-menu": patch
+"@nextui-org/use-aria-modal-overlay": patch
+"@nextui-org/use-aria-multiselect": patch
+"@nextui-org/use-aria-toggle-button": patch
+"@nextui-org/use-clipboard": patch
+"@nextui-org/use-data-scroll-overflow": patch
+"@nextui-org/use-disclosure": patch
+"@nextui-org/use-draggable": patch
+"@nextui-org/use-image": patch
+"@nextui-org/use-infinite-scroll": patch
+"@nextui-org/use-intersection-observer": patch
+"@nextui-org/use-is-mobile": patch
+"@nextui-org/use-pagination": patch
+"@nextui-org/use-real-shape": patch
+"@nextui-org/use-ref-state": patch
+"@nextui-org/use-theme": patch
+"@nextui-org/aria-utils": patch
+"@nextui-org/dom-animation": patch
+"@nextui-org/framer-utils": patch
+"@nextui-org/react-utils": patch
+"@nextui-org/shared-icons": patch
+"@nextui-org/shared-utils": patch
+"@nextui-org/test-utils": patch
+---
+
+Beta 1

.changeset/poor-moose-double.md

@@ -0,0 +1,5 @@
+---
+"@nextui-org/theme": patch
+---
+
+added stripe color gradients for progress (#1933)

.changeset/poor-sheep-repair.md

@@ -0,0 +1,6 @@
+---
+"@nextui-org/alert": patch
+"@nextui-org/theme": patch
+---
+
+introduced Alert component (#2250)