Skip to content

fix: Error prop not overriding for date-picker #402

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
paanSinghCoder merged 3 commits into from
May 13, 2025
Merged

fix: Error prop not overriding for date-picker #402

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
71cca3f
fix: Error prop not overriding for date-picker
singh-pk May 13, 2025
82c173f
fix: Error prop not overriding for date-picker
singh-pk May 13, 2025
34f7d94
Merge branch 'main' into pk/date-picker-props-issue
paanSinghCoder May 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions packages/raystack/v1/components/calendar/date-picker.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
/>
);

Expand Down
8 changes: 4 additions & 4 deletions packages/raystack/v1/components/calendar/range-picker.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
Expand Down Expand Up @@ -127,19 +127,19 @@ export function RangePicker({
size='small'
placeholder="Select start date"
trailingIcon={showCalendarIcon ? <CalendarIcon /> : undefined}
className={styles.datePickerInput}
{...(inputFieldsProps.startDate ?? {})}
value={startDate}
className={styles.datePickerInput}
readOnly
/>

<InputField
size='small'
placeholder="Select end date"
trailingIcon={showCalendarIcon ? <CalendarIcon /> : undefined}
className={styles.datePickerInput}
{...(inputFieldsProps.endDate ?? {})}
value={endDate}
className={styles.datePickerInput}
readOnly
/>
</Flex>
Expand Down