Skip to content

Open-source manufacturing ERP, MES and QMS. Quoting, MRP, inventory, shop floor, quality and lot/serial traceability on one Postgres schema, with a REST API and MCP server. Self-host or use Carbon Cloud.

feat(react): mark days in the date picker calendar

naveenkash43fb4c97192e
diff --git a/packages/react/src/Date/DatePicker.tsx b/packages/react/src/Date/DatePicker.tsx
index e25157c213..580bd2046f 100644
--- a/packages/react/src/Date/DatePicker.tsx
+++ b/packages/react/src/Date/DatePicker.tsx
@@ -33,6 +33,8 @@ const DatePicker = (
helperText?: string;
closeOnSelect?: boolean;
size?: "sm" | "md" | "lg";
+ /** Days to flag with a dot in the calendar, e.g. days that have work due. */
+ isDateMarked?: (date: CalendarDate) => boolean;
}
) => {
const state = useDatePickerState({
@@ -142,7 +144,7 @@ const DatePicker = (
)}
</HStack>
<PopoverContent align="end" {...dialogProps}>
- <Calendar {...calendarProps} />
+ <Calendar {...calendarProps} isDateMarked={props.isDateMarked} />
<PopoverFooter>
<Button onClick={() => state.setValue(null)} variant="secondary">
Clear
diff --git a/packages/react/src/Date/components/Calendar.tsx b/packages/react/src/Date/components/Calendar.tsx
index 05a5cb586f..b80fe2e623 100644
--- a/packages/react/src/Date/components/Calendar.tsx
+++ b/packages/react/src/Date/components/Calendar.tsx
@@ -14,7 +14,13 @@ import { Heading } from "../../Heading";
import { CalendarButton } from "./Button";
import { CalendarGrid } from "./CalendarGrid";
-export const Calendar = (props: CalendarProps<DateValue>) => {
+export const Calendar = ({
+ isDateMarked,
+ ...props
+}: CalendarProps<DateValue> & {
+ /** Days to flag with a dot, e.g. days that have work due. */
+ isDateMarked?: (date: CalendarDate) => boolean;
+}) => {
const { locale } = useLocale();
const state = useCalendarState({
...props,
@@ -53,7 +59,7 @@ export const Calendar = (props: CalendarProps<DateValue>) => {
aria-label="Next"
/>
</div>
- <CalendarGrid state={state} />
+ <CalendarGrid state={state} isDateMarked={isDateMarked} />
</div>
);
};
diff --git a/packages/react/src/Date/components/CalendarCell.tsx b/packages/react/src/Date/components/CalendarCell.tsx
index 20f95e6fe6..7215060ce7 100644
--- a/packages/react/src/Date/components/CalendarCell.tsx
+++ b/packages/react/src/Date/components/CalendarCell.tsx
@@ -21,11 +21,13 @@ import { Td } from "../../Table";
export const CalendarCell = ({
state,
date,
- currentMonth
+ currentMonth,
+ isMarked = false
}: {
state: CalendarState | RangeCalendarState;
date: CalendarDate;
currentMonth: CalendarDate;
+ isMarked?: boolean;
}) => {
const ref = useRef<HTMLButtonElement>(null);
const {
@@ -67,16 +69,25 @@ export const CalendarCell = ({
>
{formattedDate}
</Button>
- {isToday && !isOutsideMonth && (
- <span
- className={clsx(
- "absolute w-1 h-1 bottom-1 rounded-full left-1/2 transform -translate-x-1/2",
- {
- "bg-primary-foreground": isSelected,
- "bg-primary": !isSelected
- }
+ {(isToday || isMarked) && !isOutsideMonth && (
+ <span className="absolute bottom-1 left-1/2 flex -translate-x-1/2 gap-0.5 pointer-events-none">
+ {isToday && (
+ <span
+ className={clsx("w-1 h-1 rounded-full", {
+ "bg-primary-foreground": isSelected,
+ "bg-primary": !isSelected
+ })}
+ />
)}
- />
+ {isMarked && (
+ <span
+ className={clsx("w-1 h-1 rounded-full", {
+ "bg-primary-foreground/70": isSelected,
+ "bg-muted-foreground": !isSelected
+ })}
+ />
+ )}
+ </span>
)}
</Td>
);
diff --git a/packages/react/src/Date/components/CalendarGrid.tsx b/packages/react/src/Date/components/CalendarGrid.tsx
index e73d8cd5f1..34b77cb9b1 100644
--- a/packages/react/src/Date/components/CalendarGrid.tsx
+++ b/packages/react/src/Date/components/CalendarGrid.tsx
@@ -78,6 +78,7 @@ export const CalendarGrid = ({
state={state as CalendarState}
date={date}
currentMonth={startDate}
+ isMarked={isDateMarked?.(date) ?? false}
/>
)
) : (