diff --git a/.changeset/fix-button-disable-ripple.md b/.changeset/fix-button-disable-ripple.md
deleted file mode 100644
index a388f11328..0000000000
--- a/.changeset/fix-button-disable-ripple.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@heroui/button": patch
----
-
-fix(button): correct `disableRipple` prop precedence to respect explicit `false` value when `disableAnimation` is enabled
diff --git a/.changeset/unlucky-drinks-stare.md b/.changeset/unlucky-drinks-stare.md
deleted file mode 100644
index fa074f0818..0000000000
--- a/.changeset/unlucky-drinks-stare.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@heroui/system-rsc": patch
----
-
-Fix `extendVariants` to correctly inherit variant metadata from the base component & fix rendering of components that use 'as' prop
diff --git a/packages/components/accordion/CHANGELOG.md b/packages/components/accordion/CHANGELOG.md
index af46c0cffa..8c8028ea24 100644
--- a/packages/components/accordion/CHANGELOG.md
+++ b/packages/components/accordion/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @heroui/accordion
 
+## 2.2.28
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @heroui/divider@2.2.23
+  - @heroui/aria-utils@2.2.28
+  - @heroui/framer-utils@2.1.27
+
 ## 2.2.27
 
 ### Patch Changes
diff --git a/packages/components/accordion/package.json b/packages/components/accordion/package.json
index d2a6ada3f0..fb3e318ecc 100644
--- a/packages/components/accordion/package.json
+++ b/packages/components/accordion/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@heroui/accordion",
-  "version": "2.2.27",
+  "version": "2.2.28",
   "description": "Collapse display a list of high-level options that can expand/collapse to reveal more information.",
   "keywords": [
     "react",
diff --git a/packages/components/alert/CHANGELOG.md b/packages/components/alert/CHANGELOG.md
index 2ce1cf6ebd..d86bc4ddfc 100644
--- a/packages/components/alert/CHANGELOG.md
+++ b/packages/components/alert/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @heroui/alert
 
+## 2.2.31
+
+### Patch Changes
+
+- Updated dependencies [[`c92543b`](https://github.com/heroui-inc/heroui/commit/c92543ba7984eff3e0946da46bacc7532af614e8)]:
+  - @heroui/button@2.2.31
+
 ## 2.2.30
 
 ### Patch Changes
diff --git a/packages/components/alert/package.json b/packages/components/alert/package.json
index d96bf75eac..4312207916 100644
--- a/packages/components/alert/package.json
+++ b/packages/components/alert/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@heroui/alert",
-  "version": "2.2.30",
+  "version": "2.2.31",
   "description": "Alerts are temporary notifications that provide concise feedback about an action or event.",
   "keywords": [
     "alert"
diff --git a/packages/components/autocomplete/CHANGELOG.md b/packages/components/autocomplete/CHANGELOG.md
index e946e32148..1b430485cd 100644
--- a/packages/components/autocomplete/CHANGELOG.md
+++ b/packages/components/autocomplete/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @heroui/autocomplete
 
+## 2.3.33
+
+### Patch Changes
+
+- Updated dependencies [[`c92543b`](https://github.com/heroui-inc/heroui/commit/c92543ba7984eff3e0946da46bacc7532af614e8)]:
+  - @heroui/button@2.2.31
+  - @heroui/form@2.1.31
+  - @heroui/popover@2.3.31
+  - @heroui/listbox@2.3.30
+  - @heroui/input@2.4.32
+  - @heroui/scroll-shadow@2.3.19
+  - @heroui/aria-utils@2.2.28
+
 ## 2.3.32
 
 ### Patch Changes
diff --git a/packages/components/autocomplete/package.json b/packages/components/autocomplete/package.json
index 171942690d..53a89a2997 100644
--- a/packages/components/autocomplete/package.json
+++ b/packages/components/autocomplete/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@heroui/autocomplete",
-  "version": "2.3.32",
+  "version": "2.3.33",
   "description": "An autocomplete combines a text input with a listbox, allowing users to filter a list of options to items matching a query.",
   "keywords": [
     "autocomplete"
diff --git a/packages/components/button/CHANGELOG.md b/packages/components/button/CHANGELOG.md
index eedd92cbf8..a7be59e81f 100644
--- a/packages/components/button/CHANGELOG.md
+++ b/packages/components/button/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @heroui/button
 
+## 2.2.31
+
+### Patch Changes
+
+- [#6199](https://github.com/heroui-inc/heroui/pull/6199) [`c92543b`](https://github.com/heroui-inc/heroui/commit/c92543ba7984eff3e0946da46bacc7532af614e8) Thanks [@KMNowak](https://github.com/KMNowak)! - fix(button): correct `disableRipple` prop precedence to respect explicit `false` value when `disableAnimation` is enabled
+
+- Updated dependencies []:
+  - @heroui/spinner@2.2.28
+  - @heroui/ripple@2.2.21
+
 ## 2.2.30
 
 ### Patch Changes
diff --git a/packages/components/button/package.json b/packages/components/button/package.json
index e57a0a3b9a..453fc18892 100644
--- a/packages/components/button/package.json
+++ b/packages/components/button/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@heroui/button",
-  "version": "2.2.30",
+  "version": "2.2.31",
   "description": "Buttons allow users to perform actions and choose with a single tap.",
   "keywords": [
     "button"
diff --git a/packages/components/calendar/CHANGELOG.md b/packages/components/calendar/CHANGELOG.md
index 1c3c8e1c4f..86f555e3bb 100644
--- a/packages/components/calendar/CHANGELOG.md
+++ b/packages/components/calendar/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @heroui/calendar
 
+## 2.2.31
+
+### Patch Changes
+
+- Updated dependencies [[`c92543b`](https://github.com/heroui-inc/heroui/commit/c92543ba7984eff3e0946da46bacc7532af614e8)]:
+  - @heroui/button@2.2.31
+  - @heroui/framer-utils@2.1.27
+
 ## 2.2.30
 
 ### Patch Changes
diff --git a/packages/components/calendar/package.json b/packages/components/calendar/package.json
index a7a2c911a2..a5f39b5cb0 100644
--- a/packages/components/calendar/package.json
+++ b/packages/components/calendar/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@heroui/calendar",
-  "version": "2.2.30",
+  "version": "2.2.31",
   "description": "A calendar displays one or more date grids and allows users to select a single date.",
   "keywords": [
     "calendar"
diff --git a/packages/components/checkbox/CHANGELOG.md b/packages/components/checkbox/CHANGELOG.md
index 78b1cbc670..11dbe84aad 100644
--- a/packages/components/checkbox/CHANGELOG.md
+++ b/packages/components/checkbox/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @heroui/checkbox
 
+## 2.3.31
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @heroui/form@2.1.31
+
 ## 2.3.30
 
 ### Patch Changes
diff --git a/packages/components/checkbox/package.json b/packages/components/checkbox/package.json
index 335cb43bb0..023e16f9fd 100644
--- a/packages/components/checkbox/package.json
+++ b/packages/components/checkbox/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@heroui/checkbox",
-  "version": "2.3.30",
+  "version": "2.3.31",
   "description": "Checkboxes allow users to select multiple items from a list of individual items, or to mark one individual item as selected.",
   "keywords": [
     "checkbox"
diff --git a/packages/components/code/CHANGELOG.md b/packages/components/code/CHANGELOG.md
index fb07446443..aed1022eb2 100644
--- a/packages/components/code/CHANGELOG.md
+++ b/packages/components/code/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @heroui/code
 
+## 2.2.24
+
+### Patch Changes
+
+- Updated dependencies [[`e1b3453`](https://github.com/heroui-inc/heroui/commit/e1b34537ebc8fec0e7ffa45bc43ad8e52a510d18)]:
+  - @heroui/system-rsc@2.3.23
+
 ## 2.2.23
 
 ### Patch Changes
diff --git a/packages/components/code/package.json b/packages/components/code/package.json
index 9d800d4e77..9864e36aa7 100644
--- a/packages/components/code/package.json
+++ b/packages/components/code/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@heroui/code",
-  "version": "2.2.23",
+  "version": "2.2.24",
   "description": "Code is a component used to display inline code.",
   "keywords": [
     "code"
diff --git a/packages/components/date-input/CHANGELOG.md b/packages/components/date-input/CHANGELOG.md
index afa405734b..9bdf0ca238 100644
--- a/packages/components/date-input/CHANGELOG.md
+++ b/packages/components/date-input/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @heroui/date-input
 
+## 2.3.31
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @heroui/form@2.1.31
+
 ## 2.3.30
 
 ### Patch Changes
diff --git a/packages/components/date-input/package.json b/packages/components/date-input/package.json
index fcc8b5a31b..cdf1aae6af 100644
--- a/packages/components/date-input/package.json
+++ b/packages/components/date-input/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@heroui/date-input",
-  "version": "2.3.30",
+  "version": "2.3.31",
   "description": "A date input allows users to enter and edit date and time values using a keyboard.",
   "keywords": [
     "date-field"
diff --git a/packages/components/date-picker/CHANGELOG.md b/packages/components/date-picker/CHANGELOG.md
index 5c1fd83c10..c696caa0b7 100644
--- a/packages/components/date-picker/CHANGELOG.md
+++ b/packages/components/date-picker/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @heroui/date-picker
 
+## 2.3.32
+
+### Patch Changes
+
+- Updated dependencies [[`c92543b`](https://github.com/heroui-inc/heroui/commit/c92543ba7984eff3e0946da46bacc7532af614e8)]:
+  - @heroui/button@2.2.31
+  - @heroui/calendar@2.2.31
+  - @heroui/form@2.1.31
+  - @heroui/popover@2.3.31
+  - @heroui/date-input@2.3.31
+  - @heroui/aria-utils@2.2.28
+
 ## 2.3.31
 
 ### Patch Changes
diff --git a/packages/components/date-picker/package.json b/packages/components/date-picker/package.json
index fbbef21797..0715a7cf57 100644
--- a/packages/components/date-picker/package.json
+++ b/packages/components/date-picker/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@heroui/date-picker",
-  "version": "2.3.31",
+  "version": "2.3.32",
   "description": "A date picker combines a DateInput and a Calendar popover to allow users to enter or select a date and time value.",
   "keywords": [
     "date-picker"
diff --git a/packages/components/divider/CHANGELOG.md b/packages/components/divider/CHANGELOG.md
index 1e1a6806db..ef1d977339 100644
--- a/packages/components/divider/CHANGELOG.md
+++ b/packages/components/divider/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @heroui/divider
 
+## 2.2.23
+
+### Patch Changes
+
+- Updated dependencies [[`e1b3453`](https://github.com/heroui-inc/heroui/commit/e1b34537ebc8fec0e7ffa45bc43ad8e52a510d18)]:
+  - @heroui/system-rsc@2.3.23
+
 ## 2.2.22
 
 ### Patch Changes
diff --git a/packages/components/divider/package.json b/packages/components/divider/package.json
index 7dc1e8e4c8..f701a7d0e5 100644
--- a/packages/components/divider/package.json
+++ b/packages/components/divider/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@heroui/divider",
-  "version": "2.2.22",
+  "version": "2.2.23",
   "description": ". A separator is a visual divider between two groups of content",
   "keywords": [
     "divider"
diff --git a/packages/components/drawer/CHANGELOG.md b/packages/components/drawer/CHANGELOG.md
index 795216e5b5..d2cc51d7eb 100644
--- a/packages/components/drawer/CHANGELOG.md
+++ b/packages/components/drawer/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @heroui/drawer
 
+## 2.2.28
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @heroui/modal@2.2.28
+  - @heroui/framer-utils@2.1.27
+
 ## 2.2.27
 
 ### Patch Changes
diff --git a/packages/components/drawer/package.json b/packages/components/drawer/package.json
index c19c6f5417..1688e4fc3a 100644
--- a/packages/components/drawer/package.json
+++ b/packages/components/drawer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@heroui/drawer",
-  "version": "2.2.27",
+  "version": "2.2.28",
   "description": "Used to render a content that slides in from the side of the screen.",
   "keywords": [
     "drawer"
diff --git a/packages/components/dropdown/CHANGELOG.md b/packages/components/dropdown/CHANGELOG.md
index 8e0ece8645..bbd8119be3 100644
--- a/packages/components/dropdown/CHANGELOG.md
+++ b/packages/components/dropdown/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @heroui/dropdown
 
+## 2.3.31
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @heroui/popover@2.3.31
+  - @heroui/menu@2.2.30
+  - @heroui/aria-utils@2.2.28
+
 ## 2.3.30
 
 ### Patch Changes
diff --git a/packages/components/dropdown/package.json b/packages/components/dropdown/package.json
index 509a403f4c..ebf7e68bfd 100644
--- a/packages/components/dropdown/package.json
+++ b/packages/components/dropdown/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@heroui/dropdown",
-  "version": "2.3.30",
+  "version": "2.3.31",
   "description": "A dropdown displays a list of actions or options that a user can choose.",
   "keywords": [
     "dropdown"
diff --git a/packages/components/form/CHANGELOG.md b/packages/components/form/CHANGELOG.md
index 580b157720..852760cf90 100644
--- a/packages/components/form/CHANGELOG.md
+++ b/packages/components/form/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @heroui/form
 
+## 2.1.31
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @heroui/system@2.4.27
+
 ## 2.1.30
 
 ### Patch Changes
diff --git a/packages/components/form/package.json b/packages/components/form/package.json
index 6c573c460d..f90c2e4932 100644
--- a/packages/components/form/package.json
+++ b/packages/components/form/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@heroui/form",
-  "version": "2.1.30",
+  "version": "2.1.31",
   "description": "A form is a group of inputs that allows users submit data to a server and supports field validation errors.",
   "keywords": [
     "form"
diff --git a/packages/components/input-otp/CHANGELOG.md b/packages/components/input-otp/CHANGELOG.md
index 19f9951350..c4cb37b46d 100644
--- a/packages/components/input-otp/CHANGELOG.md
+++ b/packages/components/input-otp/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @heroui/input-otp
 
+## 2.1.31
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @heroui/form@2.1.31
+
 ## 2.1.30
 
 ### Patch Changes
diff --git a/packages/components/input-otp/package.json b/packages/components/input-otp/package.json
index 5acfd09e2e..1171bc3ca4 100644
--- a/packages/components/input-otp/package.json
+++ b/packages/components/input-otp/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@heroui/input-otp",
-  "version": "2.1.30",
+  "version": "2.1.31",
   "description": "",
   "keywords": [
     "input-otp"
diff --git a/packages/components/input/CHANGELOG.md b/packages/components/input/CHANGELOG.md
index b782fbc141..a4c5b89050 100644
--- a/packages/components/input/CHANGELOG.md
+++ b/packages/components/input/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @heroui/input
 
+## 2.4.32
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @heroui/form@2.1.31
+
 ## 2.4.31
 
 ### Patch Changes
diff --git a/packages/components/input/package.json b/packages/components/input/package.json
index 587b31476c..e685ad0532 100644
--- a/packages/components/input/package.json
+++ b/packages/components/input/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@heroui/input",
-  "version": "2.4.31",
+  "version": "2.4.32",
   "description": "The input component is designed for capturing user input within a text field.",
   "keywords": [
     "input"
diff --git a/packages/components/kbd/CHANGELOG.md b/packages/components/kbd/CHANGELOG.md
index 0d8ac3f70a..b1a8b7fdd3 100644
--- a/packages/components/kbd/CHANGELOG.md
+++ b/packages/components/kbd/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @heroui/kbd
 
+## 2.2.25
+
+### Patch Changes
+
+- Updated dependencies [[`e1b3453`](https://github.com/heroui-inc/heroui/commit/e1b34537ebc8fec0e7ffa45bc43ad8e52a510d18)]:
+  - @heroui/system-rsc@2.3.23
+
 ## 2.2.24
 
 ### Patch Changes
diff --git a/packages/components/kbd/package.json b/packages/components/kbd/package.json
index 8df03c7799..c08f3e2c2e 100644
--- a/packages/components/kbd/package.json
+++ b/packages/components/kbd/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@heroui/kbd",
-  "version": "2.2.24",
+  "version": "2.2.25",
   "description": "The keyboard key components indicates which key or set of keys used to execute a specificv  action",
   "keywords": [
     "kbd"
diff --git a/packages/components/listbox/CHANGELOG.md b/packages/components/listbox/CHANGELOG.md
index 18d5835f8d..87b7038961 100644
--- a/packages/components/listbox/CHANGELOG.md
+++ b/packages/components/listbox/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @heroui/listbox
 
+## 2.3.30
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @heroui/divider@2.2.23
+  - @heroui/aria-utils@2.2.28
+
 ## 2.3.29
 
 ### Patch Changes
diff --git a/packages/components/listbox/package.json b/packages/components/listbox/package.json
index 90d69b1aca..8779870346 100644
--- a/packages/components/listbox/package.json
+++ b/packages/components/listbox/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@heroui/listbox",
-  "version": "2.3.29",
+  "version": "2.3.30",
   "description": "A listbox displays a list of options and allows a user to select one or more of them.",
   "keywords": [
     "listbox"
diff --git a/packages/components/menu/CHANGELOG.md b/packages/components/menu/CHANGELOG.md
index c81c8230fd..8f48000ad0 100644
--- a/packages/components/menu/CHANGELOG.md
+++ b/packages/components/menu/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @heroui/menu
 
+## 2.2.30
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @heroui/divider@2.2.23
+  - @heroui/aria-utils@2.2.28
+
 ## 2.2.29
 
 ### Patch Changes
diff --git a/packages/components/menu/package.json b/packages/components/menu/package.json
index 900346a74c..14407b066d 100644
--- a/packages/components/menu/package.json
+++ b/packages/components/menu/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@heroui/menu",
-  "version": "2.2.29",
+  "version": "2.2.30",
   "description": "A menu displays a list of options and allows a user to select one or more of them.",
   "keywords": [
     "menu"
diff --git a/packages/components/modal/CHANGELOG.md b/packages/components/modal/CHANGELOG.md
index 0cfc8b7eab..490bbd7bb5 100644
--- a/packages/components/modal/CHANGELOG.md
+++ b/packages/components/modal/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @heroui/modal
 
+## 2.2.28
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @heroui/framer-utils@2.1.27
+
 ## 2.2.27
 
 ### Patch Changes
diff --git a/packages/components/modal/package.json b/packages/components/modal/package.json
index 905d464e87..32e2fafdb0 100644
--- a/packages/components/modal/package.json
+++ b/packages/components/modal/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@heroui/modal",
-  "version": "2.2.27",
+  "version": "2.2.28",
   "description": "Displays a dialog with a custom content that requires attention or provides additional information.",
   "keywords": [
     "modal"
diff --git a/packages/components/navbar/CHANGELOG.md b/packages/components/navbar/CHANGELOG.md
index f7c1149c55..b9cac577f8 100644
--- a/packages/components/navbar/CHANGELOG.md
+++ b/packages/components/navbar/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @heroui/navbar
 
+## 2.2.29
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @heroui/framer-utils@2.1.27
+
 ## 2.2.28
 
 ### Patch Changes
diff --git a/packages/components/navbar/package.json b/packages/components/navbar/package.json
index fe1b893ea5..02f798eb34 100644
--- a/packages/components/navbar/package.json
+++ b/packages/components/navbar/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@heroui/navbar",
-  "version": "2.2.28",
+  "version": "2.2.29",
   "description": "A responsive navigation header positioned on top side of your page that includes support for branding, links, navigation, collapse and more.",
   "keywords": [
     "navbar"
diff --git a/packages/components/number-input/CHANGELOG.md b/packages/components/number-input/CHANGELOG.md
index 4e10482845..2e6a8322b3 100644
--- a/packages/components/number-input/CHANGELOG.md
+++ b/packages/components/number-input/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @heroui/number-input
 
+## 2.0.22
+
+### Patch Changes
+
+- Updated dependencies [[`c92543b`](https://github.com/heroui-inc/heroui/commit/c92543ba7984eff3e0946da46bacc7532af614e8)]:
+  - @heroui/button@2.2.31
+  - @heroui/form@2.1.31
+
 ## 2.0.21
 
 ### Patch Changes
diff --git a/packages/components/number-input/package.json b/packages/components/number-input/package.json
index 7f5e435759..42f6f15da3 100644
--- a/packages/components/number-input/package.json
+++ b/packages/components/number-input/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@heroui/number-input",
-  "version": "2.0.21",
+  "version": "2.0.22",
   "description": "The numeric input component is designed for users to enter a number, and increase or decrease the value using stepper buttons",
   "keywords": [
     "input",
diff --git a/packages/components/popover/CHANGELOG.md b/packages/components/popover/CHANGELOG.md
index 626a7c0a66..c1fa084368 100644
--- a/packages/components/popover/CHANGELOG.md
+++ b/packages/components/popover/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @heroui/popover
 
+## 2.3.31
+
+### Patch Changes
+
+- Updated dependencies [[`c92543b`](https://github.com/heroui-inc/heroui/commit/c92543ba7984eff3e0946da46bacc7532af614e8)]:
+  - @heroui/button@2.2.31
+  - @heroui/aria-utils@2.2.28
+  - @heroui/framer-utils@2.1.27
+
 ## 2.3.30
 
 ### Patch Changes
diff --git a/packages/components/popover/package.json b/packages/components/popover/package.json
index 5e0643203d..db2436aa1c 100644
--- a/packages/components/popover/package.json
+++ b/packages/components/popover/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@heroui/popover",
-  "version": "2.3.30",
+  "version": "2.3.31",
   "description": "A popover is an overlay element positioned relative to a trigger.",
   "keywords": [
     "popover"
diff --git a/packages/components/radio/CHANGELOG.md b/packages/components/radio/CHANGELOG.md
index 12a64e13e5..cf5cff3557 100644
--- a/packages/components/radio/CHANGELOG.md
+++ b/packages/components/radio/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @heroui/radio
 
+## 2.3.31
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @heroui/form@2.1.31
+
 ## 2.3.30
 
 ### Patch Changes
diff --git a/packages/components/radio/package.json b/packages/components/radio/package.json
index c8a2354278..bb55796cd2 100644
--- a/packages/components/radio/package.json
+++ b/packages/components/radio/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@heroui/radio",
-  "version": "2.3.30",
+  "version": "2.3.31",
   "description": "Radios allow users to select a single option from a list of mutually exclusive options.",
   "keywords": [
     "radio"
diff --git a/packages/components/select/CHANGELOG.md b/packages/components/select/CHANGELOG.md
index f3ffd63be0..0722b5d51f 100644
--- a/packages/components/select/CHANGELOG.md
+++ b/packages/components/select/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @heroui/select
 
+## 2.4.32
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @heroui/form@2.1.31
+  - @heroui/popover@2.3.31
+  - @heroui/spinner@2.2.28
+  - @heroui/listbox@2.3.30
+  - @heroui/scroll-shadow@2.3.19
+  - @heroui/aria-utils@2.2.28
+
 ## 2.4.31
 
 ### Patch Changes
diff --git a/packages/components/select/package.json b/packages/components/select/package.json
index 5f1bcacf19..e5ee73e5f4 100644
--- a/packages/components/select/package.json
+++ b/packages/components/select/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@heroui/select",
-  "version": "2.4.31",
+  "version": "2.4.32",
   "description": "A select displays a collapsible list of options and allows a user to select one of them.",
   "keywords": [
     "select"
diff --git a/packages/components/slider/CHANGELOG.md b/packages/components/slider/CHANGELOG.md
index a7857b27b7..f6b8e2d126 100644
--- a/packages/components/slider/CHANGELOG.md
+++ b/packages/components/slider/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @heroui/slider
 
+## 2.4.28
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @heroui/tooltip@2.2.28
+
 ## 2.4.27
 
 ### Patch Changes
diff --git a/packages/components/slider/package.json b/packages/components/slider/package.json
index f1407b0931..6db1bc7fe9 100644
--- a/packages/components/slider/package.json
+++ b/packages/components/slider/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@heroui/slider",
-  "version": "2.4.27",
+  "version": "2.4.28",
   "description": "A slider allows a user to select one or more values within a range.",
   "keywords": [
     "slider"
diff --git a/packages/components/snippet/CHANGELOG.md b/packages/components/snippet/CHANGELOG.md
index 78c1964309..b718419cd7 100644
--- a/packages/components/snippet/CHANGELOG.md
+++ b/packages/components/snippet/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @heroui/snippet
 
+## 2.2.32
+
+### Patch Changes
+
+- Updated dependencies [[`c92543b`](https://github.com/heroui-inc/heroui/commit/c92543ba7984eff3e0946da46bacc7532af614e8)]:
+  - @heroui/button@2.2.31
+  - @heroui/tooltip@2.2.28
+
 ## 2.2.31
 
 ### Patch Changes
diff --git a/packages/components/snippet/package.json b/packages/components/snippet/package.json
index 443fec2e19..337629bdc7 100644
--- a/packages/components/snippet/package.json
+++ b/packages/components/snippet/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@heroui/snippet",
-  "version": "2.2.31",
+  "version": "2.2.32",
   "description": "Display a snippet of copyable code for the command line.",
   "keywords": [
     "snippet"
diff --git a/packages/components/spacer/CHANGELOG.md b/packages/components/spacer/CHANGELOG.md
index f024733eec..7ad9840049 100644
--- a/packages/components/spacer/CHANGELOG.md
+++ b/packages/components/spacer/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @heroui/spacer
 
+## 2.2.24
+
+### Patch Changes
+
+- Updated dependencies [[`e1b3453`](https://github.com/heroui-inc/heroui/commit/e1b34537ebc8fec0e7ffa45bc43ad8e52a510d18)]:
+  - @heroui/system-rsc@2.3.23
+
 ## 2.2.23
 
 ### Patch Changes
diff --git a/packages/components/spacer/package.json b/packages/components/spacer/package.json
index a937372684..ab7be6a7f1 100644
--- a/packages/components/spacer/package.json
+++ b/packages/components/spacer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@heroui/spacer",
-  "version": "2.2.23",
+  "version": "2.2.24",
   "description": "A flexible spacer component designed to create consistent spacing and maintain alignment in your layout.",
   "keywords": [
     "spacer"
diff --git a/packages/components/spinner/CHANGELOG.md b/packages/components/spinner/CHANGELOG.md
index 3cc267d33d..9dcb893322 100644
--- a/packages/components/spinner/CHANGELOG.md
+++ b/packages/components/spinner/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @heroui/spinner
 
+## 2.2.28
+
+### Patch Changes
+
+- Updated dependencies [[`e1b3453`](https://github.com/heroui-inc/heroui/commit/e1b34537ebc8fec0e7ffa45bc43ad8e52a510d18)]:
+  - @heroui/system-rsc@2.3.23
+  - @heroui/system@2.4.27
+
 ## 2.2.27
 
 ### Patch Changes
diff --git a/packages/components/spinner/package.json b/packages/components/spinner/package.json
index e29f7f30ef..350b3dd0b6 100644
--- a/packages/components/spinner/package.json
+++ b/packages/components/spinner/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@heroui/spinner",
-  "version": "2.2.27",
+  "version": "2.2.28",
   "description": "Loaders express an unspecified wait time or display the length of a process.",
   "keywords": [
     "loading",
diff --git a/packages/components/table/CHANGELOG.md b/packages/components/table/CHANGELOG.md
index 03594a810c..807b64ab32 100644
--- a/packages/components/table/CHANGELOG.md
+++ b/packages/components/table/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @heroui/table
 
+## 2.2.31
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @heroui/checkbox@2.3.31
+
 ## 2.2.30
 
 ### Patch Changes
diff --git a/packages/components/table/package.json b/packages/components/table/package.json
index 675dce9f86..d0cc5186f4 100644
--- a/packages/components/table/package.json
+++ b/packages/components/table/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@heroui/table",
-  "version": "2.2.30",
+  "version": "2.2.31",
   "description": "Tables are used to display tabular data using rows and columns. ",
   "keywords": [
     "table"
diff --git a/packages/components/tabs/CHANGELOG.md b/packages/components/tabs/CHANGELOG.md
index 528737cfbe..0e665cd2b1 100644
--- a/packages/components/tabs/CHANGELOG.md
+++ b/packages/components/tabs/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @heroui/tabs
 
+## 2.2.28
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @heroui/aria-utils@2.2.28
+
 ## 2.2.27
 
 ### Patch Changes
diff --git a/packages/components/tabs/package.json b/packages/components/tabs/package.json
index 0840a66b4a..eaa94e5c22 100644
--- a/packages/components/tabs/package.json
+++ b/packages/components/tabs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@heroui/tabs",
-  "version": "2.2.27",
+  "version": "2.2.28",
   "description": "Tabs organize content into multiple sections and allow users to navigate between them.",
   "keywords": [
     "tabs"
diff --git a/packages/components/toast/CHANGELOG.md b/packages/components/toast/CHANGELOG.md
index f3e760e076..74ba9f1802 100644
--- a/packages/components/toast/CHANGELOG.md
+++ b/packages/components/toast/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @heroui/toast
 
+## 2.0.21
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @heroui/spinner@2.2.28
+
 ## 2.0.20
 
 ### Patch Changes
diff --git a/packages/components/toast/package.json b/packages/components/toast/package.json
index 369001f721..d74f668704 100644
--- a/packages/components/toast/package.json
+++ b/packages/components/toast/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@heroui/toast",
-  "version": "2.0.20",
+  "version": "2.0.21",
   "description": "Toast are temporary notifications that provide concise feedback about an action or event",
   "keywords": [
     "toast"
diff --git a/packages/components/tooltip/CHANGELOG.md b/packages/components/tooltip/CHANGELOG.md
index ba88426e16..f064ea6613 100644
--- a/packages/components/tooltip/CHANGELOG.md
+++ b/packages/components/tooltip/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @heroui/tooltip
 
+## 2.2.28
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @heroui/aria-utils@2.2.28
+  - @heroui/framer-utils@2.1.27
+
 ## 2.2.27
 
 ### Patch Changes
diff --git a/packages/components/tooltip/package.json b/packages/components/tooltip/package.json
index 23f646b3f7..d9351af4fd 100644
--- a/packages/components/tooltip/package.json
+++ b/packages/components/tooltip/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@heroui/tooltip",
-  "version": "2.2.27",
+  "version": "2.2.28",
   "description": "A React Component for rendering dynamically positioned Tooltips",
   "keywords": [
     "tooltip"
diff --git a/packages/core/react/CHANGELOG.md b/packages/core/react/CHANGELOG.md
index b3c70037e8..126c966b12 100644
--- a/packages/core/react/CHANGELOG.md
+++ b/packages/core/react/CHANGELOG.md
@@ -1,5 +1,59 @@
 # @heroui/react
 
+## 2.8.9
+
+### Patch Changes
+
+- Updated dependencies [[`c92543b`](https://github.com/heroui-inc/heroui/commit/c92543ba7984eff3e0946da46bacc7532af614e8)]:
+  - @heroui/button@2.2.31
+  - @heroui/accordion@2.2.28
+  - @heroui/alert@2.2.31
+  - @heroui/autocomplete@2.3.33
+  - @heroui/breadcrumbs@2.2.24
+  - @heroui/calendar@2.2.31
+  - @heroui/card@2.2.27
+  - @heroui/date-picker@2.3.32
+  - @heroui/drawer@2.2.28
+  - @heroui/dropdown@2.3.31
+  - @heroui/form@2.1.31
+  - @heroui/input-otp@2.1.31
+  - @heroui/modal@2.2.28
+  - @heroui/navbar@2.2.29
+  - @heroui/number-input@2.0.22
+  - @heroui/popover@2.3.31
+  - @heroui/select@2.4.32
+  - @heroui/skeleton@2.2.18
+  - @heroui/snippet@2.2.32
+  - @heroui/table@2.2.31
+  - @heroui/tabs@2.2.28
+  - @heroui/toast@2.0.21
+  - @heroui/tooltip@2.2.28
+  - @heroui/code@2.2.24
+  - @heroui/divider@2.2.23
+  - @heroui/kbd@2.2.25
+  - @heroui/spacer@2.2.24
+  - @heroui/spinner@2.2.28
+  - @heroui/system@2.4.27
+  - @heroui/listbox@2.3.30
+  - @heroui/menu@2.2.30
+  - @heroui/avatar@2.2.25
+  - @heroui/badge@2.2.18
+  - @heroui/checkbox@2.3.31
+  - @heroui/chip@2.2.24
+  - @heroui/date-input@2.3.31
+  - @heroui/image@2.2.19
+  - @heroui/input@2.4.32
+  - @heroui/link@2.2.25
+  - @heroui/pagination@2.2.26
+  - @heroui/progress@2.2.24
+  - @heroui/radio@2.3.31
+  - @heroui/ripple@2.2.21
+  - @heroui/scroll-shadow@2.3.19
+  - @heroui/slider@2.4.28
+  - @heroui/switch@2.2.26
+  - @heroui/user@2.2.25
+  - @heroui/framer-utils@2.1.27
+
 ## 2.8.8
 
 ### Patch Changes
diff --git a/packages/core/react/package.json b/packages/core/react/package.json
index 46063b7be0..3fe984e29c 100644
--- a/packages/core/react/package.json
+++ b/packages/core/react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@heroui/react",
-  "version": "2.8.8",
+  "version": "2.8.9",
   "description": "🚀 Beautiful and modern React UI library.",
   "author": "HeroUI <support@heroui.com>",
   "homepage": "https://heroui.com",
diff --git a/packages/core/system-rsc/CHANGELOG.md b/packages/core/system-rsc/CHANGELOG.md
index d830c2f8b9..8a0f584def 100644
--- a/packages/core/system-rsc/CHANGELOG.md
+++ b/packages/core/system-rsc/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @heroui/system-rsc
 
+## 2.3.23
+
+### Patch Changes
+
+- [#6215](https://github.com/heroui-inc/heroui/pull/6215) [`e1b3453`](https://github.com/heroui-inc/heroui/commit/e1b34537ebc8fec0e7ffa45bc43ad8e52a510d18) Thanks [@ITBoomBKStudio](https://github.com/ITBoomBKStudio)! - Fix `extendVariants` to correctly inherit variant metadata from the base component & fix rendering of components that use 'as' prop
+
 ## 2.3.22
 
 ### Patch Changes
diff --git a/packages/core/system-rsc/package.json b/packages/core/system-rsc/package.json
index 264cba9b20..618630ad26 100644
--- a/packages/core/system-rsc/package.json
+++ b/packages/core/system-rsc/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@heroui/system-rsc",
-  "version": "2.3.22",
+  "version": "2.3.23",
   "description": "HeroUI system primitives compatibles with RSC imports",
   "keywords": [
     "system-rsc"
diff --git a/packages/core/system/CHANGELOG.md b/packages/core/system/CHANGELOG.md
index b9d64a270d..753a988b25 100644
--- a/packages/core/system/CHANGELOG.md
+++ b/packages/core/system/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @heroui/system
 
+## 2.4.27
+
+### Patch Changes
+
+- Updated dependencies [[`e1b3453`](https://github.com/heroui-inc/heroui/commit/e1b34537ebc8fec0e7ffa45bc43ad8e52a510d18)]:
+  - @heroui/system-rsc@2.3.23
+
 ## 2.4.26
 
 ### Patch Changes
diff --git a/packages/core/system/package.json b/packages/core/system/package.json
index 4cf59b8b76..e5aa3842b1 100644
--- a/packages/core/system/package.json
+++ b/packages/core/system/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@heroui/system",
-  "version": "2.4.26",
+  "version": "2.4.27",
   "description": "HeroUI system primitives",
   "keywords": [
     "system"
diff --git a/packages/utilities/aria-utils/CHANGELOG.md b/packages/utilities/aria-utils/CHANGELOG.md
index 9195518483..f045950ff4 100644
--- a/packages/utilities/aria-utils/CHANGELOG.md
+++ b/packages/utilities/aria-utils/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @heroui/aria-utils
 
+## 2.2.28
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @heroui/system@2.4.27
+
 ## 2.2.27
 
 ### Patch Changes
diff --git a/packages/utilities/aria-utils/package.json b/packages/utilities/aria-utils/package.json
index 0cffc34895..46b75810e7 100644
--- a/packages/utilities/aria-utils/package.json
+++ b/packages/utilities/aria-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@heroui/aria-utils",
-  "version": "2.2.27",
+  "version": "2.2.28",
   "description": "A package for managing @react-aria HeroUI utils.",
   "keywords": [
     "aria-utils"
diff --git a/packages/utilities/framer-utils/CHANGELOG.md b/packages/utilities/framer-utils/CHANGELOG.md
index 6becec60fe..622b7accbe 100644
--- a/packages/utilities/framer-utils/CHANGELOG.md
+++ b/packages/utilities/framer-utils/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @heroui/framer-utils
 
+## 2.1.27
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @heroui/system@2.4.27
+
 ## 2.1.26
 
 ### Patch Changes
diff --git a/packages/utilities/framer-utils/package.json b/packages/utilities/framer-utils/package.json
index 8868d7d5c8..82ff832b8f 100644
--- a/packages/utilities/framer-utils/package.json
+++ b/packages/utilities/framer-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@heroui/framer-utils",
-  "version": "2.1.26",
+  "version": "2.1.27",
   "description": "A set of framer motion transitions for react",
   "keywords": [
     "framer-utils"