From 4cc7ed4b983a61e12f4bd6595d794847ed782af9 Mon Sep 17 00:00:00 2001
From: "shrinidhi.upadhyaya" <shrinidhi.upadhyaya@stud.uni-bamberg.de>
Date: Mon, 29 Apr 2024 00:18:17 +0200
Subject: [PATCH 1/5] fix(range-calendar): hide only dates outside the month
 #2890

---
 .changeset/nasty-pillows-travel.md                 | 5 +++++
 packages/components/calendar/src/calendar-cell.tsx | 2 +-
 packages/core/theme/src/components/calendar.ts     | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 .changeset/nasty-pillows-travel.md

diff --git a/.changeset/nasty-pillows-travel.md b/.changeset/nasty-pillows-travel.md
new file mode 100644
index 0000000000..74690c77b4
--- /dev/null
+++ b/.changeset/nasty-pillows-travel.md
@@ -0,0 +1,5 @@
+---
+"@nextui-org/calendar": patch
+---
+
+Fixed hiding of Unvavailable dates in RangeCalendar (#2890)
diff --git a/packages/components/calendar/src/calendar-cell.tsx b/packages/components/calendar/src/calendar-cell.tsx
index 351fcb212c..7de61e6ce2 100644
--- a/packages/components/calendar/src/calendar-cell.tsx
+++ b/packages/components/calendar/src/calendar-cell.tsx
@@ -42,7 +42,7 @@ export function CalendarCell(originalProps: CalendarCellProps) {
     ref,
   );
 
-  const isUnavailable = state.isCellUnavailable(props.date) && !isDisabled;
+  const isUnavailable = state.isCellUnavailable(props.date);
   const isLastSelectedBeforeDisabled =
     !isDisabled && !isInvalid && state.isCellUnavailable(props.date.add({days: 1}));
   const isFirstSelectedAfterDisabled =
diff --git a/packages/core/theme/src/components/calendar.ts b/packages/core/theme/src/components/calendar.ts
index 5ebf37514f..01af7127bf 100644
--- a/packages/core/theme/src/components/calendar.ts
+++ b/packages/core/theme/src/components/calendar.ts
@@ -106,7 +106,7 @@ const calendar = tv({
     },
     hideDisabledDates: {
       true: {
-        cellButton: "data-[disabled=true]:opacity-0",
+        cellButton: "data-[disabled=true]:data-[outside-month=true]:opacity-0",
       },
       false: {},
     },

From 1b2137440d80b929e0014ce34f38d81e6955df3a Mon Sep 17 00:00:00 2001
From: "shrinidhi.upadhyaya" <shrinidhi.upadhyaya@stud.uni-bamberg.de>
Date: Mon, 29 Apr 2024 00:40:58 +0200
Subject: [PATCH 2/5] fix(range-calendar): corrected spelling mistake in
 changeset description

---
 .changeset/nasty-pillows-travel.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.changeset/nasty-pillows-travel.md b/.changeset/nasty-pillows-travel.md
index 74690c77b4..182b3fba51 100644
--- a/.changeset/nasty-pillows-travel.md
+++ b/.changeset/nasty-pillows-travel.md
@@ -2,4 +2,4 @@
 "@nextui-org/calendar": patch
 ---
 
-Fixed hiding of Unvavailable dates in RangeCalendar (#2890)
+Fixed hiding of Unavailable dates in RangeCalendar (#2890)

From 29ef6e4e714a35703b754cb5f0002477a4ba6156 Mon Sep 17 00:00:00 2001
From: "shrinidhi.upadhyaya" <shrinidhi.upadhyaya@stud.uni-bamberg.de>
Date: Mon, 29 Apr 2024 00:47:19 +0200
Subject: [PATCH 3/5] fix(range-calendar): corrected capitalization in
 changeset description

---
 .changeset/nasty-pillows-travel.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.changeset/nasty-pillows-travel.md b/.changeset/nasty-pillows-travel.md
index 182b3fba51..ec06fbb625 100644
--- a/.changeset/nasty-pillows-travel.md
+++ b/.changeset/nasty-pillows-travel.md
@@ -2,4 +2,4 @@
 "@nextui-org/calendar": patch
 ---
 
-Fixed hiding of Unavailable dates in RangeCalendar (#2890)
+Fixed hiding of unavailable dates in RangeCalendar (#2890)

From 11941760750793d907bc0eb129f17def3bae9972 Mon Sep 17 00:00:00 2001
From: "shrinidhi.upadhyaya" <shrinidhi.upadhyaya@stud.uni-bamberg.de>
Date: Mon, 6 May 2024 23:37:58 +0200
Subject: [PATCH 4/5] fix(input): added hover and focus to input when label
 placement is outside-left #2328

---
 .changeset/lucky-schools-travel.md          |  5 +++++
 packages/components/input/src/use-input.ts  | 24 +++++++++++++++------
 packages/core/theme/src/components/input.ts |  2 +-
 3 files changed, 24 insertions(+), 7 deletions(-)
 create mode 100644 .changeset/lucky-schools-travel.md

diff --git a/.changeset/lucky-schools-travel.md b/.changeset/lucky-schools-travel.md
new file mode 100644
index 0000000000..b736c9c07e
--- /dev/null
+++ b/.changeset/lucky-schools-travel.md
@@ -0,0 +1,5 @@
+---
+"@nextui-org/input": patch
+---
+
+Fixed hover and focus of input when label placement is outside-left (#2328)
diff --git a/packages/components/input/src/use-input.ts b/packages/components/input/src/use-input.ts
index 32b61841b3..cd5b523b91 100644
--- a/packages/components/input/src/use-input.ts
+++ b/packages/components/input/src/use-input.ts
@@ -185,6 +185,10 @@ export function useInput<T extends HTMLInputElement | HTMLTextAreaElement = HTML
 
   const {isHovered, hoverProps} = useHover({isDisabled: !!originalProps?.isDisabled});
 
+  const {isHovered: isLabelHovered, hoverProps: labelHoverProps} = useHover({
+    isDisabled: !!originalProps?.isDisabled,
+  });
+
   const {focusProps: clearFocusProps, isFocusVisible: isClearButtonFocusVisible} = useFocusRing();
 
   const {focusWithinProps} = useFocusWithin({
@@ -259,7 +263,7 @@ export function useInput<T extends HTMLInputElement | HTMLTextAreaElement = HTML
         "data-focus-visible": dataAttr(isFocusVisible),
         "data-readonly": dataAttr(originalProps.isReadOnly),
         "data-focus": dataAttr(isFocused),
-        "data-hover": dataAttr(isHovered),
+        "data-hover": dataAttr(isHovered || isLabelHovered),
         "data-required": dataAttr(originalProps.isRequired),
         "data-invalid": dataAttr(isInvalid),
         "data-disabled": dataAttr(originalProps.isDisabled),
@@ -277,6 +281,7 @@ export function useInput<T extends HTMLInputElement | HTMLTextAreaElement = HTML
       isFilled,
       isFocused,
       isHovered,
+      isLabelHovered,
       isInvalid,
       hasHelper,
       hasLabel,
@@ -299,11 +304,10 @@ export function useInput<T extends HTMLInputElement | HTMLTextAreaElement = HTML
       return {
         "data-slot": "label",
         className: slots.label({class: classNames?.label}),
-        ...labelProps,
-        ...props,
+        ...mergeProps(labelProps, props, labelHoverProps),
       };
     },
-    [slots, labelProps, classNames?.label],
+    [slots, isLabelHovered, labelProps, classNames?.label],
   );
 
   const getInputProps: PropGetter = useCallback(
@@ -356,7 +360,7 @@ export function useInput<T extends HTMLInputElement | HTMLTextAreaElement = HTML
       return {
         ref: inputWrapperRef,
         "data-slot": "input-wrapper",
-        "data-hover": dataAttr(isHovered),
+        "data-hover": dataAttr(isHovered || isLabelHovered),
         "data-focus-visible": dataAttr(isFocusVisible),
         "data-focus": dataAttr(isFocused),
         className: slots.inputWrapper({
@@ -374,7 +378,15 @@ export function useInput<T extends HTMLInputElement | HTMLTextAreaElement = HTML
         },
       };
     },
-    [slots, isHovered, isFocusVisible, isFocused, inputValue, classNames?.inputWrapper],
+    [
+      slots,
+      isHovered,
+      isLabelHovered,
+      isFocusVisible,
+      isFocused,
+      inputValue,
+      classNames?.inputWrapper,
+    ],
   );
 
   const getInnerWrapperProps: PropGetter = useCallback(
diff --git a/packages/core/theme/src/components/input.ts b/packages/core/theme/src/components/input.ts
index 7ac7b19e82..bf55aef95b 100644
--- a/packages/core/theme/src/components/input.ts
+++ b/packages/core/theme/src/components/input.ts
@@ -172,7 +172,7 @@ const input = tv({
         base: "flex-row items-center flex-nowrap data-[has-helper=true]:items-start",
         inputWrapper: "flex-1",
         mainWrapper: "flex flex-col",
-        label: "relative text-foreground pr-2 rtl:pr-0 rtl:pl-2",
+        label: "relative text-foreground pr-2 rtl:pr-0 rtl:pl-2 pointer-events-auto",
       },
       inside: {
         label: "text-tiny cursor-text",

From 45bdab4174291b8c7e3dea57ce40168c787c15f5 Mon Sep 17 00:00:00 2001
From: "shrinidhi.upadhyaya" <shrinidhi.upadhyaya@stud.uni-bamberg.de>
Date: Sun, 12 May 2024 22:05:02 +0200
Subject: [PATCH 5/5] fix(input): label props mergeProps precedence change

---
 packages/components/input/src/use-input.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/components/input/src/use-input.ts b/packages/components/input/src/use-input.ts
index cd5b523b91..4363331509 100644
--- a/packages/components/input/src/use-input.ts
+++ b/packages/components/input/src/use-input.ts
@@ -304,7 +304,7 @@ export function useInput<T extends HTMLInputElement | HTMLTextAreaElement = HTML
       return {
         "data-slot": "label",
         className: slots.label({class: classNames?.label}),
-        ...mergeProps(labelProps, props, labelHoverProps),
+        ...mergeProps(labelProps, labelHoverProps, props),
       };
     },
     [slots, isLabelHovered, labelProps, classNames?.label],