Skip to content

Commit

Permalink
feat: removed debugger and renamed defaultDate to defaultValue
Browse files Browse the repository at this point in the history
  • Loading branch information
Dias, Diego committed Aug 28, 2024
1 parent bf555fd commit c947a5e
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 16 deletions.
12 changes: 6 additions & 6 deletions packages/ui/src/components/Datepicker/Datepicker.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,10 @@ const ControlledTemplate: StoryFn<DatepickerProps> = (args) => {
args.maxDate = new Date(args.maxDate);
}

// update defaultDate based on the range
// update defaultValue based on the range
if (args.minDate && args.maxDate) {
if (args.defaultDate) {
args.defaultDate = getFirstDateInRange(args.defaultDate, args.minDate, args.maxDate);
if (args.defaultValue) {
args.defaultValue = getFirstDateInRange(args.defaultValue, args.minDate, args.maxDate);
}
}

Expand All @@ -67,10 +67,10 @@ const Template: StoryFn<DatepickerProps> = (args) => {
args.maxDate = new Date(args.maxDate);
}

// update defaultDate based on the range
// update defaultValue based on the range
if (args.minDate && args.maxDate) {
if (args.defaultDate) {
args.defaultDate = getFirstDateInRange(args.defaultDate, args.minDate, args.maxDate);
if (args.defaultValue) {
args.defaultValue = getFirstDateInRange(args.defaultValue, args.minDate, args.maxDate);
}
}

Expand Down
18 changes: 9 additions & 9 deletions packages/ui/src/components/Datepicker/Datepicker.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -77,13 +77,13 @@ export interface DatepickerRef {
*/
focus: () => void;
/**
* Clears the datepicker value back to the defaultDate.
* Clears the datepicker value back to the defaultValue.
*/
clear: () => void;
}

export interface DatepickerProps extends Omit<TextInputProps, "theme" | "onChange" | "value"> {
defaultDate?: Date;
export interface DatepickerProps extends Omit<TextInputProps, "theme" | "onChange" | "value" | "defaultValue"> {
defaultValue?: Date;
open?: boolean;
inline?: boolean;
autoHide?: boolean;
Expand Down Expand Up @@ -111,7 +111,7 @@ const DatepickerRender: ForwardRefRenderFunction<DatepickerRef, DatepickerProps>
labelClearButton = "Clear",
showTodayButton = true,
labelTodayButton = "Today",
defaultDate = new Date(),
defaultValue = new Date(),
minDate,
maxDate,
language = "en",
Expand All @@ -128,11 +128,11 @@ const DatepickerRender: ForwardRefRenderFunction<DatepickerRef, DatepickerProps>
const theme = mergeDeep(getTheme().datepicker, customTheme);

const effectiveDefaultValue = useMemo(() => {
return getFirstDateInRange(defaultDate, minDate, maxDate);
return getFirstDateInRange(defaultValue, minDate, maxDate);
}, []);

const effectiveDefaultView = useMemo(() => {
return defaultDate ? getFirstDateInRange(defaultDate, minDate, maxDate) : new Date();
return defaultValue ? getFirstDateInRange(defaultValue, minDate, maxDate) : new Date();
}, []);

const [isOpen, setIsOpen] = useState(open);
Expand All @@ -159,9 +159,9 @@ const DatepickerRender: ForwardRefRenderFunction<DatepickerRef, DatepickerProps>
};

const clearDate = () => {
changeSelectedDate(defaultDate, true);
if (defaultDate) {
setViewDate(defaultDate);
changeSelectedDate(defaultValue, true);
if (defaultValue) {
setViewDate(defaultValue);
}
};

Expand Down
1 change: 0 additions & 1 deletion packages/ui/src/components/Datepicker/helpers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ export const isDateInRange = (date: Date, minDate?: Date, maxDate?: Date): boole
};

export const isDateEqual = (date: Date, selectedDate: Date): boolean => {
debugger
date = new Date(date.getFullYear(), date.getMonth(), date.getDate());
selectedDate = new Date(selectedDate.getFullYear(), selectedDate.getMonth(), selectedDate.getDate());

Expand Down

0 comments on commit c947a5e

Please sign in to comment.