From 71cca3fe9d77456a9ad33a6a3cc71073ceb4902f Mon Sep 17 00:00:00 2001
From: singh-pk <pksn1111@gmail.com>
Date: Tue, 13 May 2025 14:28:00 +0530
Subject: [PATCH 1/2] fix: Error prop not overriding for date-picker

---
 packages/raystack/v1/components/calendar/date-picker.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/raystack/v1/components/calendar/date-picker.tsx b/packages/raystack/v1/components/calendar/date-picker.tsx
index 9bbbc85a9..0444e0fc1 100644
--- a/packages/raystack/v1/components/calendar/date-picker.tsx
+++ b/packages/raystack/v1/components/calendar/date-picker.tsx
@@ -165,7 +165,6 @@ export function DatePicker({
       size="small"
       placeholder="Select date"
       trailingIcon={showCalendarIcon ? <CalendarIcon /> : undefined}
-      {...inputFieldProps}
       defaultValue={formattedDate}
       onChange={handleInputChange}
       onFocus={handleInputFocus}
@@ -173,6 +172,7 @@ export function DatePicker({
       error={error}
       onKeyUp={handleKeyUp}
       className={styles.datePickerInput}
+      {...inputFieldProps}
     />
   );
 

From 82c173f081d8e4acf6069b79c156aa7349fa8eb7 Mon Sep 17 00:00:00 2001
From: singh-pk <pksn1111@gmail.com>
Date: Tue, 13 May 2025 15:11:32 +0530
Subject: [PATCH 2/2] fix: Error prop not overriding for date-picker

---
 packages/raystack/v1/components/calendar/date-picker.tsx  | 8 ++++----
 packages/raystack/v1/components/calendar/range-picker.tsx | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/raystack/v1/components/calendar/date-picker.tsx b/packages/raystack/v1/components/calendar/date-picker.tsx
index 0444e0fc1..a1c63e94c 100644
--- a/packages/raystack/v1/components/calendar/date-picker.tsx
+++ b/packages/raystack/v1/components/calendar/date-picker.tsx
@@ -161,18 +161,18 @@ export function DatePicker({
 
   const defaultTrigger = (
     <InputField
-      ref={inputFieldRef}
       size="small"
       placeholder="Select date"
+      error={error}
+      className={styles.datePickerInput}
       trailingIcon={showCalendarIcon ? <CalendarIcon /> : undefined}
+      {...inputFieldProps}
+      ref={inputFieldRef}
       defaultValue={formattedDate}
       onChange={handleInputChange}
       onFocus={handleInputFocus}
       onBlur={handleInputBlur}
-      error={error}
       onKeyUp={handleKeyUp}
-      className={styles.datePickerInput}
-      {...inputFieldProps}
     />
   );
 
diff --git a/packages/raystack/v1/components/calendar/range-picker.tsx b/packages/raystack/v1/components/calendar/range-picker.tsx
index ee99232f6..178a070a8 100644
--- a/packages/raystack/v1/components/calendar/range-picker.tsx
+++ b/packages/raystack/v1/components/calendar/range-picker.tsx
@@ -59,14 +59,14 @@ export function RangePicker({
     ? dayjs(selectedRange.to).format(dateFormat)
     : "";
 
-  // Ensures two months are visible even when 
+  // Ensures two months are visible even when
   // current month is the last allowed month (endMonth).
   const computedDefaultMonth = useMemo(() => {
     let month = currentMonth;
     if (calendarProps?.endMonth) {
       const endMonth = dayjs(calendarProps.endMonth);
       const fromMonth = dayjs(currentMonth);
-      
+
       if (fromMonth.isSame(endMonth, 'month')) {
         month = endMonth.subtract(1, 'month').toDate();
       }
@@ -127,9 +127,9 @@ export function RangePicker({
         size='small'
         placeholder="Select start date"
         trailingIcon={showCalendarIcon ? <CalendarIcon /> : undefined}
+        className={styles.datePickerInput}
         {...(inputFieldsProps.startDate ?? {})}
         value={startDate}
-        className={styles.datePickerInput}
         readOnly
       />
 
@@ -137,9 +137,9 @@ export function RangePicker({
         size='small'
         placeholder="Select end date"
         trailingIcon={showCalendarIcon ? <CalendarIcon /> : undefined}
+        className={styles.datePickerInput}
         {...(inputFieldsProps.endDate ?? {})}
         value={endDate}
-        className={styles.datePickerInput}
         readOnly
       />
     </Flex>