Skip to content

The Open Standard for Generative UI

Calender (#40)

Ankit Dasb56e01a4e81d
diff --git a/js/packages/react-ui/package.json b/js/packages/react-ui/package.json
index 82b0d0fe6..3957f1ff3 100644
--- a/js/packages/react-ui/package.json
+++ b/js/packages/react-ui/package.json
@@ -79,7 +79,6 @@
"sass": "^1.83.4"
},
"devDependencies": {
- "postcss-remove-duplicate-values": "^1.0.0",
"@chromatic-com/storybook": "^3.2.4",
"@storybook/addon-essentials": "^8.5.3",
"@storybook/addon-interactions": "^8.5.3",
@@ -103,6 +102,7 @@
"eslint-plugin-unused-imports": "^3.1.0",
"postcss": "^8.5.1",
"postcss-js": "^4.0.1",
+ "postcss-remove-duplicate-values": "^1.0.0",
"prettier-plugin-organize-imports": "^3.2.4",
"prop-types": "^15.8.1",
"storybook": "^8.5.3",
diff --git a/js/packages/react-ui/src/components/Calendar/Calendar.tsx b/js/packages/react-ui/src/components/Calendar/Calendar.tsx
new file mode 100644
index 000000000..a386ac325
--- /dev/null
+++ b/js/packages/react-ui/src/components/Calendar/Calendar.tsx
@@ -0,0 +1,44 @@
+import React, { forwardRef, useRef } from "react";
+import { DayPicker } from "react-day-picker";
+import { useLayoutContext } from "../../context/LayoutContext";
+import { useMultipleRefs } from "../../hooks/useMultipleRefs";
+import { MonthsDropdown, YearsDropdown } from "./components/helperComponents";
+import { getDayPickerStyles } from "./utils/styles";
+
+export type CalendarProps = React.ComponentProps<typeof DayPicker>;
+
+export const Calendar = forwardRef<HTMLDivElement, CalendarProps>(
+ ({ className, classNames, ...props }, ref) => {
+ const { layout } = useLayoutContext();
+ const { DateSingleClasses, DateRangeClasses } = getDayPickerStyles(layout);
+ const containerRef = useRef<HTMLDivElement>(null);
+ const assignRef = useMultipleRefs(ref, containerRef);
+
+ const commonProps = {
+ captionLayout: "dropdown" as const,
+ components: {
+ MonthsDropdown: (props: any) => (
+ <MonthsDropdown {...props} container={containerRef.current} />
+ ),
+ YearsDropdown: (props: any) => (
+ <YearsDropdown {...props} container={containerRef.current} />
+ ),
+ },
+ };
+
+ return (
+ <div ref={assignRef} className={className}>
+ <DayPicker
+ {...commonProps}
+ {...props}
+ classNames={{
+ ...(props.mode === "single" || props.mode === "multiple"
+ ? DateSingleClasses
+ : DateRangeClasses),
+ ...classNames,
+ }}
+ />
+ </div>
+ );
+ },
+);
diff --git a/js/packages/react-ui/src/components/Calendar/calendar.scss b/js/packages/react-ui/src/components/Calendar/calendar.scss
new file mode 100644
index 000000000..c256b8e93
--- /dev/null
+++ b/js/packages/react-ui/src/components/Calendar/calendar.scss
@@ -0,0 +1,2 @@
+@forward "./components/calendarHelperComponents.scss";
+@forward "./utils/calendarBaseStyle.scss";
diff --git a/js/packages/react-ui/src/components/Calendar/components/calendarHelperComponents.scss b/js/packages/react-ui/src/components/Calendar/components/calendarHelperComponents.scss
new file mode 100644
index 000000000..cdcb0b195
--- /dev/null
+++ b/js/packages/react-ui/src/components/Calendar/components/calendarHelperComponents.scss
@@ -0,0 +1,39 @@
+@use "sass:map";
+@use "../../../cssUtils" as cssUtils;
+
+.crayon-calendar-select-content-months {
+ padding: map.get(cssUtils.$spacing, "2xs") 0;
+ background-color: map.get(cssUtils.$colors, "fills", "container");
+ box-shadow: none;
+}
+
+.crayon-calendar-select-content-years {
+ max-height: 295px;
+ min-width: 362px;
+ padding: map.get(cssUtils.$spacing, "2xs") 0;
+ background-color: map.get(cssUtils.$colors, "fills", "container");
+ box-shadow: none;
+ .crayon-calendar-select-viewport {
+ display: grid;
+ grid-template-columns: repeat(3, 1fr);
+ gap: 4px;
+
+ &-mobile {
+ grid-template-columns: repeat(2, 1fr);
+ }
+ }
+
+ .crayon-calendar-select-item {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ align-self: center;
+ justify-self: center;
+ border-radius: map.get(cssUtils.$radius, "s");
+ padding: map.get(cssUtils.$spacing, "s");
+
+ &:hover {
+ background-color: map.get(cssUtils.$colors, "fills", "container-hover");
+ }
+ }
+}
diff --git a/js/packages/react-ui/src/components/Calendar/components/helperComponents.tsx b/js/packages/react-ui/src/components/Calendar/components/helperComponents.tsx
new file mode 100644
index 000000000..2db384eea
--- /dev/null
+++ b/js/packages/react-ui/src/components/Calendar/components/helperComponents.tsx
@@ -0,0 +1,217 @@
+import * as SelectPrimitive from "@radix-ui/react-select";
+import clsx from "clsx";
+import debounce from "lodash-es/debounce";
+import { DetailedHTMLProps, forwardRef, SelectHTMLAttributes, useEffect, useState } from "react";
+import { ClassNames, CustomComponents, DropdownOption } from "react-day-picker";
+import "react-day-picker/style.css";
+import { Select, SelectItem, SelectTrigger, SelectValue } from "../../Select";
+import { getMonthName, getMonthNumber } from "../utils/helperFn";
+
+// this component is overriding the default SelectContent component to allow for a container prop we do not wish to give to the user
+const SelectContent = forwardRef<
+ React.ComponentRef<typeof SelectPrimitive.Content>,
+ React.ComponentPropsWithoutRef<typeof SelectPrimitive.Content> & {
+ container?: HTMLDivElement | null;
+ viewportClassName?: string;
+ }
+>(({ className, children, position = "popper", viewportClassName, container, ...props }, ref) => (
+ <SelectPrimitive.Portal container={container || document.body}>
+ <SelectPrimitive.Content
+ ref={ref}
+ className={clsx("crayon-select-content", className)}
+ position={position}
+ {...props}
+ >
+ <SelectPrimitive.Viewport
+ className={clsx("crayon-select-viewport", viewportClassName)}
+ data-position={position}
+ >
+ {children}
+ </SelectPrimitive.Viewport>
+ </SelectPrimitive.Content>
+ </SelectPrimitive.Portal>
+));
+
+export const MonthsDropdown = (
+ props: {
+ classNames: ClassNames;
+ components: CustomComponents;
+ options?: DropdownOption[];
+ } & Omit<
+ DetailedHTMLProps<SelectHTMLAttributes<HTMLSelectElement>, HTMLSelectElement>,
+ "children"
+ > & {
+ container?: HTMLDivElement | null;
+ },
+) => {
+ const {
+ className,
+ disabled,
+ onChange,
+ options,
+ value,
+ key,
+ "aria-label": ariaLabel,
+ container,
+ } = props;
+
+ const [containerWidth, setContainerWidth] = useState(0);
+ const [containerHeight, setContainerHeight] = useState(0);
+
+ useEffect(() => {
+ if (!container) return;
+
+ const targetElement = container.children[0]?.children[0];
+ if (!targetElement) return;
+
+ const resizeObserver = new ResizeObserver(
+ debounce((entries) => {
+ const { width, height } = entries[0]?.contentRect || {};
+ setContainerWidth(width || 0);
+ setContainerHeight(height || 0);
+ }, 100),
+ );
+
+ resizeObserver.observe(targetElement);
+
+ return () => {
+ resizeObserver.disconnect();
+ };
+ }, [container]);
+
+ return (
+ <Select
+ onValueChange={(value) =>
+ onChange?.({
+ target: { value: getMonthNumber(value) },
+ } as any)
+ }
+ value={getMonthName(Number(value))}
+ disabled={disabled}
+ key={key}
+ aria-label={ariaLabel}
+ >
+ <SelectTrigger className={className}>
+ <SelectValue placeholder={"Select a month"} />
+ </SelectTrigger>
+ <SelectContent
+ container={container}
+ className="crayon-calendar-select-content-months"
+ sideOffset={12}
+ alignOffset={0}
+ style={{
+ maxHeight: `${containerHeight - 45}px`,
+ minWidth: `${containerWidth}px`,
+ border: "none",
+ }}
+ >
+ {options?.map((option) => (
+ <SelectItem
+ key={option.value}
+ value={getMonthName(option.value)}
+ disabled={option.disabled}
+ >
+ {option.label}
+ </SelectItem>
+ ))}
+ </SelectContent>
+ </Select>
+ );
+};
+
+export const YearsDropdown = (
+ props: {
+ classNames: ClassNames;
+ components: CustomComponents;
+ options?: DropdownOption[];
+ } & Omit<
+ DetailedHTMLProps<SelectHTMLAttributes<HTMLSelectElement>, HTMLSelectElement>,
+ "children"
+ > & {
+ container?: HTMLDivElement | null;
+ botType: "mobile" | "fullscreen" | "tray" | "copilot";
+ },
+) => {
+ const {
+ className,
+ disabled,
+ onChange,
+ options,
+ value,
+ key,
+ "aria-label": ariaLabel,
+ container,
+ botType,
+ } = props;
+
+ const [containerWidth, setContainerWidth] = useState(0);
+ const [containerHeight, setContainerHeight] = useState(0);
+
+ useEffect(() => {
+ if (!container) return;
+
+ const targetElement = container.children[0]?.children[0];
+ if (!targetElement) return;
+
+ const resizeObserver = new ResizeObserver(
+ debounce((entries) => {
+ const { width, height } = entries[0]?.contentRect || {};
+ setContainerWidth(width || 0);
+ setContainerHeight(height || 0);
+ }, 100),
+ );
+
+ resizeObserver.observe(targetElement);
+
+ return () => {
+ resizeObserver.disconnect();
+ };
+ }, [container]);
+
+ return (
+ <Select
+ onValueChange={(value) =>
+ onChange?.({
+ target: { value: Number(value) },
+ } as any)
+ }
+ value={String(value)}
+ disabled={disabled}
+ key={key}
+ aria-label={ariaLabel}
+ >
+ <SelectTrigger className={className}>
+ <SelectValue placeholder={"Select a month"} />
+ </SelectTrigger>
+ <SelectContent
+ container={container}
+ className="crayon-calendar-select-content-years"
+ viewportClassName={clsx(
+ "crayon-calendar-select-viewport",
+ botType === "mobile" && "crayon-calendar-select-viewport-mobile",
+ )}
+ sideOffset={12}
+ alignOffset={-95}
+ style={{
+ minHeight: `${containerHeight - 45}px`,
+ maxHeight: `${containerHeight - 45}px`,
+ minWidth: `${containerWidth + 10}px`,
+ maxWidth: `${containerWidth + 10}px`,
+ border: "none",
+ }}
+ >
+ {options?.map((option) => (
+ <SelectItem
+ key={option.value}
+ value={String(option.value)}
+ disabled={option.disabled}
+ showTick={false}
+ className="crayon-calendar-select-item"
+ >
+ {option.label}
+ </SelectItem>
+ ))}
+ </SelectContent>
+ </Select>
+ );
+};
diff --git a/js/packages/react-ui/src/components/Calendar/index.ts b/js/packages/react-ui/src/components/Calendar/index.ts
new file mode 100644
index 000000000..0acdf2fe1
--- /dev/null
+++ b/js/packages/react-ui/src/components/Calendar/index.ts
@@ -0,0 +1 @@
+export * from "./Calendar";
diff --git a/js/packages/react-ui/src/components/Calendar/stories/Calendar.stories.tsx b/js/packages/react-ui/src/components/Calendar/stories/Calendar.stories.tsx
new file mode 100644
index 000000000..3fb8592f5
--- /dev/null
+++ b/js/packages/react-ui/src/components/Calendar/stories/Calendar.stories.tsx
@@ -0,0 +1,88 @@
+import type { Meta, StoryObj } from "@storybook/react";
+import { Calendar } from "../Calendar";
+
+const meta: Meta<typeof Calendar> = {
+ title: "Components/Calendar",
+ component: Calendar,
+ parameters: {
+ layout: "centered",
+ docs: {
+ description: {
+ component: `
+A flexible \`calendar\` component built on top of [react-day-picker](https://react-day-picker.js.org/).
+
+\`\`\`tsx
+import { Calendar } from '@crayon-ui/react-ui';
+\`\`\`
+`,
+ },
+ },
+ },
+ decorators: [
+ (Story) => (
+ <div
+ style={{
+ width: "350px",
+ }}
+ >
+ <Story />
+ </div>
+ ),
+ ],
+ argTypes: {
+ mode: {
+ description: "Selection mode for the calendar",
+ control: {
+ type: "radio",
+ },
+ options: ["single", "multiple", "range"],
+ defaultValue: "single",
+ table: {
+ defaultValue: { summary: "single" },
+ },
+ },
+ },
+ tags: ["autodocs", "!dev"],
+};
+
+export default meta;
+type Story = StoryObj<typeof Calendar>;
+
+export const SingleDate: Story = {
+ args: {
+ mode: "single",
+ },
+};
+
+export const MultipleDate: Story = {
+ args: {
+ mode: "multiple",
+ selected: [new Date(), new Date(Date.now() + 86400000)], // Today and tomorrow
+ },
+};
+
+export const DateRange: Story = {
+ args: {
+ mode: "range",
+ selected: {
+ from: new Date(),
+ to: new Date(Date.now() + 86400000 * 7), // Today to 7 days later
+ },
+ },
+};
+
+export const Disabled: Story = {
+ args: {
+ mode: "single",
+ disabled: true,
+ },
+};
+
+export const WithDisabledDays: Story = {
+ args: {
+ mode: "single",
+ disabled: [
+ { from: new Date(), to: new Date(Date.now() + 86400000 * 3) }, // Disable next 3 days
+ ],
+ },
+};
diff --git a/js/packages/react-ui/src/components/Calendar/utils/calendarBaseStyle.scss b/js/packages/react-ui/src/components/Calendar/utils/calendarBaseStyle.scss
new file mode 100644
index 000000000..f27fcd904
--- /dev/null
+++ b/js/packages/react-ui/src/components/Calendar/utils/calendarBaseStyle.scss
@@ -0,0 +1,179 @@
+@use "sass:map";
+@use "../../../cssUtils" as cssUtils;
+
+/* Base styles for all calendar components range or single */
+/* ------------------------------------------------------------ */
+
+.crayon-calendar-root {
+ @include cssUtils.typography(primary, default);
+ background-color: map.get(cssUtils.$colors, "fills", "container");
+ padding: map.get(cssUtils.$spacing, "l");
+ width: fit-content;
+ height: fit-content;
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: center;
+ border-radius: map.get(cssUtils.$radius, "xl");
+}
+
+.crayon-calendar-nav {
+ &-mobile {
+ gap: map.get(cssUtils.$spacing, "s");
+ }
+ &-fullscreen {
+ gap: map.get(cssUtils.$spacing, "m");
+ }
+ &-tray {
+ gap: map.get(cssUtils.$spacing, "m");
+ }
+ &-copilot {
+ gap: map.get(cssUtils.$spacing, "m");
+ }
+}
+
+.crayon-calendar-dropdowns {
+ &-mobile {
+ gap: map.get(cssUtils.$spacing, "2xs");
+ }
+ &-fullscreen {
+ gap: map.get(cssUtils.$spacing, "s");
+ }
+ &-tray {
+ gap: map.get(cssUtils.$spacing, "s");
+ }
+ &-copilot {
+ gap: map.get(cssUtils.$spacing, "s");
+ }
+ &-copilot {
+ gap: map.get(cssUtils.$spacing, "s");
+ }
+}
+
+.crayon-calendar-month-grid {
+ table-layout: fixed;
+ width: 100%;
+ border-collapse: collapse;
+ max-width: 308px;
+}
+
+.crayon-calendar-button-next {
+ display: none;
+}
+
+.crayon-calendar-button-previous {
+ display: none;
+}
+
+.crayon-calendar-today {
+ &[data-today]:not([aria-selected]) {
+ background-color: map.get(cssUtils.$colors, "fills", "sunk");
+ border-radius: map.get(cssUtils.$radius, "m");
+ }
+}
+
+.crayon-calendar-disabled {
+ cursor: not-allowed;
+ color: map.get(cssUtils.$colors, "text", "disabled");
+}
+
+.crayon-calendar-weekdays {
+ color: map.get(cssUtils.$colors, "text", "primary");
+}
+
+.crayon-calendar-chevron {
+ fill: map.get(cssUtils.$colors, "fills", "brand-el");
+}
+
+.crayon-calendar-month {
+ color: map.get(cssUtils.$colors, "text", "primary");
+}
+
+.crayon-calendar-month-dropdown {
+ cursor: pointer;
+}
+
+.crayon-calendar-year-dropdown {
+ cursor: pointer;
+}
+
+.crayon-calendar-footer {
+ color: map.get(cssUtils.$colors, "text", "primary");
+ @include cssUtils.typography(primary, default);
+}
+
+/* Base styles for all calendar components single */
+/* ------------------------------------------------------------ */
+
+.crayon-calendar-single-day-button {
+ cursor: pointer;
+ background: transparent;
+ border: 1px solid transparent;
+ padding: 0;
+ margin: 0;
+ font: inherit;
+ color: inherit;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ width: 100%;
+ height: 100%;
+ aspect-ratio: 1/1;
+}
+
+.crayon-calendar-single-day {
+ width: 100%;
+ height: 100%;
+ aspect-ratio: 1/1;
+}
+
+.crayon-calendar-single-day-selected {
+ background: map.get(cssUtils.$colors, "fills", "brand-el");
+ color: map.get(cssUtils.$colors, "text", "brand");
+ border-radius: map.get(cssUtils.$radius, "m");
+}
+
+/* Base styles for all calendar components range */
+/* ------------------------------------------------------------ */
+
+.crayon-calendar-range-start {
+ color: map.get(cssUtils.$colors, "text", "brand");
+ background: map.get(cssUtils.$colors, "fills", "brand-el");
+ border-top-left-radius: map.get(cssUtils.$radius, "m");
+ border-bottom-left-radius: map.get(cssUtils.$radius, "m");
+}
+
+.crayon-calendar-range-middle {
+ background: map.get(cssUtils.$colors, "fills", "sunk");
+}
+
+.crayon-calendar-range-end {
+ color: map.get(cssUtils.$colors, "text", "brand");
+ background: map.get(cssUtils.$colors, "fills", "brand-el");
+ border-top-right-radius: map.get(cssUtils.$radius, "m");
+ border-bottom-right-radius: map.get(cssUtils.$radius, "m");
+}
+
+.crayon-calendar-range-day-button {
+ cursor: pointer;
+ background: transparent;
+ padding: 0;
+ margin: 0;
+ font: inherit;
+ color: inherit;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ border: 1px solid transparent;
+ width: 100%;
+ height: 100%;
+ aspect-ratio: 1/1;
+}
+
+.crayon-calendar-range-day {
+ width: 100%;
+ height: 100%;
+ min-height: 100%;
+ min-width: 100%;
+ aspect-ratio: 1/1;
+}
diff --git a/js/packages/react-ui/src/components/Calendar/utils/helperFn.tsx b/js/packages/react-ui/src/components/Calendar/utils/helperFn.tsx
new file mode 100644
index 000000000..727c5db34
--- /dev/null
+++ b/js/packages/react-ui/src/components/Calendar/utils/helperFn.tsx
@@ -0,0 +1,61 @@
+export const getMonthName = (monthNumber: number): string => {
+ switch (monthNumber) {
+ case 0:
+ return "January";
+ case 1:
+ return "February";
+ case 2:
+ return "March";
+ case 3:
+ return "April";
+ case 4:
+ return "May";
+ case 5:
+ return "June";
+ case 6:
+ return "July";
+ case 7:
+ return "August";
+ case 8:
+ return "September";
+ case 9:
+ return "October";
+ case 10:
+ return "November";
+ case 11:
+ return "December";
+ default:
+ return "Invalid Month";
+ }
+};
+
+export const getMonthNumber = (monthName: string): number => {
+ switch (monthName) {
+ case "January":
+ return 0;
+ case "February":
+ return 1;
+ case "March":
+ return 2;
+ case "April":
+ return 3;
+ case "May":
+ return 4;
+ case "June":
+ return 5;
+ case "July":
+ return 6;
+ case "August":
+ return 7;
+ case "September":
+ return 8;
+ case "October":
+ return 9;
+ case "November":
+ return 10;
+ case "December":
+ return 11;
+ default:
+ return -1;
+ }
+};
diff --git a/js/packages/react-ui/src/components/Calendar/utils/styles.tsx b/js/packages/react-ui/src/components/Calendar/utils/styles.tsx
new file mode 100644
index 000000000..f091bd3b9
--- /dev/null
+++ b/js/packages/react-ui/src/components/Calendar/utils/styles.tsx
@@ -0,0 +1,59 @@
+import { ClassNames, getDefaultClassNames } from "react-day-picker";
+
+type BotType = "mobile" | "fullscreen" | "tray" | "copilot";
+export const getDayPickerStyles = (botType: BotType) => {
+ const defaultClassNames = getDefaultClassNames();
+
+ const botTypeMapNav: Record<BotType, string> = {
+ mobile: "crayon-calendar-nav-mobile",
+ fullscreen: "crayon-calendar-nav-fullscreen",
+ tray: "crayon-calendar-nav-tray",
+ copilot: "crayon-calendar-nav-copilot",
+ };
+
+ const botTypeMapDropdowns: Record<BotType, string> = {
+ mobile: "crayon-calendar-dropdowns-mobile",
+ fullscreen: "crayon-calendar-dropdowns-fullscreen",
+ tray: "crayon-calendar-dropdowns-tray",
+ copilot: "crayon-calendar-dropdowns-copilot",
+ };
+
+ const commonClassNames: Partial<ClassNames> = {
+ root: `${defaultClassNames.root} crayon-calendar-root`,
+ nav: `${defaultClassNames.nav} ${botTypeMapNav[botType]}`,
+ dropdowns: `${defaultClassNames.dropdowns} ${botTypeMapDropdowns[botType]}`,
+ month_grid: `crayon-calendar-month-grid`,
+ button_next: `crayon-calendar-button-next `,
+ button_previous: `crayon-calendar-button-previous `,
+ today: `crayon-calendar-today`,
+ disabled: `crayon-calendar-disabled`,
+ weekdays: `crayon-calendar-weekdays`,
+ chevron: `crayon-calendar-chevron`,
+ month: `crayon-calendar-month`,
+ months_dropdown: `crayon-calendar-months-dropdown`,
+ years_dropdown: `crayon-calendar-years-dropdown`,
+ footer: `crayon-calendar-footer`,
+ };
+
+ const DateSingleClasses: Partial<ClassNames> = {
+ ...commonClassNames,
+ day_button: "crayon-calendar-single-day-button",
+ day: "crayon-calendar-single-day",
+ selected: "crayon-calendar-single-day-selected",
+ };
+
+ const DateRangeClasses: Partial<ClassNames> = {
+ ...commonClassNames,
+ selected: "",
+ range_start: "crayon-calendar-range-start",
+ range_middle: "crayon-calendar-range-middle",
+ range_end: "crayon-calendar-range-end",
+ day_button: "crayon-calendar-range-day-button",
+ day: "crayon-calendar-range-day",
+ };
+
+ return {
+ DateSingleClasses,
+ DateRangeClasses,
+ };
+};
diff --git a/js/packages/react-ui/src/components/DatePicker/DatePicker.tsx b/js/packages/react-ui/src/components/DatePicker/DatePicker.tsx
index e6518fdf8..f1d84aa30 100644
--- a/js/packages/react-ui/src/components/DatePicker/DatePicker.tsx
+++ b/js/packages/react-ui/src/components/DatePicker/DatePicker.tsx
@@ -1,13 +1,11 @@
import { useState } from "react";
import { DateRange } from "react-day-picker";
import { useLayoutContext } from "../../context/LayoutContext";
-import { DatepickerRenderer } from "./helpers/components/DatePickerRenderer";
import { FloatingDatePickerRenderer } from "./helpers/components/FloatingDatePickerRenderer";
import { DatePickerProvider } from "./helpers/context/DatePickerContext";
export interface DatePickerProps {
mode?: "single" | "range";
- variant?: "docked" | "popover";
selectedSingleDate?: Date;
selectedRangeDates?: DateRange;
setSelectedSingleDate?: (date?: Date) => void;
@@ -21,7 +19,6 @@ const DatePicker = (props: DatePickerProps) => {
const {
mode = "single",
- variant = "docked",
selectedSingleDate,
selectedRangeDates,
setSelectedSingleDate,
@@ -73,11 +70,7 @@ const DatePicker = (props: DatePickerProps) => {
setSelectedDateFromParent={selectedDateHandler}
setSelectedRangeFromParent={selectedRangeHandler}
>
- {variant === "docked" ? (
- <DatepickerRenderer className={className} style={style} />
- ) : (
- <FloatingDatePickerRenderer className={className} style={style} />
- )}
+ <FloatingDatePickerRenderer className={className} style={style} />
</DatePickerProvider>
);
};
diff --git a/js/packages/react-ui/src/components/DatePicker/helpers/components/FloatingDatePickerRenderer.tsx b/js/packages/react-ui/src/components/DatePicker/helpers/components/FloatingDatePickerRenderer.tsx
index 5ac638bfa..b3e2657f3 100644
--- a/js/packages/react-ui/src/components/DatePicker/helpers/components/FloatingDatePickerRenderer.tsx
+++ b/js/packages/react-ui/src/components/DatePicker/helpers/components/FloatingDatePickerRenderer.tsx
@@ -1,7 +1,7 @@
import { autoUpdate, flip, offset, useFloating } from "@floating-ui/react-dom";
import clsx from "clsx";
import { ChevronDown } from "lucide-react";
-import { forwardRef, useEffect, useLayoutEffect, useRef, useState } from "react";
+import { forwardRef, useEffect, useRef } from "react";
import { createPortal } from "react-dom";
import { useMultipleRefs } from "../../../../hooks/useMultipleRefs";
import { useDatePicker } from "../context/DatePickerContext";
@@ -42,12 +42,6 @@ const FloatingDateInput = () => {
const FloatingDatePicker = forwardRef<HTMLDivElement>((_, ref) => {
const { isOpen } = useDatePicker();
const menuPositionDivRef = useRef<HTMLDivElement>(null);
- const [width, setWidth] = useState(0);
-
- useLayoutEffect(() => {
- if (!menuPositionDivRef.current || !isOpen) return;
- setWidth(menuPositionDivRef.current.offsetWidth);
- }, [isOpen]);
const {
refs: { setFloating, setReference },
@@ -72,7 +66,7 @@ const FloatingDatePicker = forwardRef<HTMLDivElement>((_, ref) => {
{createPortal(
<div
ref={floatingRef}
- style={{ ...floatingStyles, width: `${width}px` }}
+ style={{ ...floatingStyles, width: "fit-content" }}
className="crayon-date-picker-renderer-floating-content"
>
<div className="crayon-date-picker-renderer-floating-menu">
diff --git a/js/packages/react-ui/src/components/DatePicker/helpers/components/floatingDatePickerRenderer.scss b/js/packages/react-ui/src/components/DatePicker/helpers/components/floatingDatePickerRenderer.scss
index 7a0779a15..9e1bc187d 100644
--- a/js/packages/react-ui/src/components/DatePicker/helpers/components/floatingDatePickerRenderer.scss
+++ b/js/packages/react-ui/src/components/DatePicker/helpers/components/floatingDatePickerRenderer.scss
@@ -28,6 +28,7 @@
color: map.get(cssUtils.$colors, "text", "primary");
cursor: pointer;
box-shadow: map.get(cssUtils.$shadow, "s");
+ width: 100%;
&:disabled {
color: map.get(cssUtils.$colors, "text", "disabled");
@@ -81,8 +82,6 @@
.crayon-date-picker-renderer-floating-menu {
background: map.get(cssUtils.$colors, "fills", "container");
- border: 1px solid map.get(cssUtils.$colors, "strokes", "default");
border-radius: map.get(cssUtils.$radius, "m");
box-shadow: map.get(cssUtils.$shadow, "s");
- padding: map.get(cssUtils.$spacing, "m");
}
diff --git a/js/packages/react-ui/src/components/DatePicker/helpers/utils/datePickerBaseStyle.scss b/js/packages/react-ui/src/components/DatePicker/helpers/utils/datePickerBaseStyle.scss
index a9b5ec09d..dc40842f3 100644
--- a/js/packages/react-ui/src/components/DatePicker/helpers/utils/datePickerBaseStyle.scss
+++ b/js/packages/react-ui/src/components/DatePicker/helpers/utils/datePickerBaseStyle.scss
@@ -7,14 +7,13 @@
@include cssUtils.typography(primary, default);
background-color: map.get(cssUtils.$colors, "fills", "container");
padding: map.get(cssUtils.$spacing, "l");
- width: 100%;
+ width: fit-content;
height: 100%;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
border-radius: map.get(cssUtils.$radius, "xl");
- border: 1px solid map.get(cssUtils.$colors, "strokes", "default");
}
.crayon-date-picker-nav {
@@ -58,19 +57,11 @@
}
.crayon-date-picker-button-next {
- cursor: pointer;
-
- &-mobile {
- display: none;
- }
+ display: none !important;
}
.crayon-date-picker-button-previous {
- cursor: pointer;
-
- &-mobile {
- display: none;
- }
+ display: none !important;
}
.crayon-date-picker-today {
diff --git a/js/packages/react-ui/src/components/DatePicker/helpers/utils/styles.tsx b/js/packages/react-ui/src/components/DatePicker/helpers/utils/styles.tsx
index 6c1f3e420..a4d214470 100644
--- a/js/packages/react-ui/src/components/DatePicker/helpers/utils/styles.tsx
+++ b/js/packages/react-ui/src/components/DatePicker/helpers/utils/styles.tsx
@@ -18,27 +18,13 @@ export const getDayPickerStyles = (botType: BotType) => {
copilot: "crayon-date-picker-dropdowns-copilot",
};
- const botTypeMapButtonNext: Record<BotType, string> = {
- mobile: "crayon-date-picker-button-next-mobile",
- fullscreen: "crayon-date-picker-button-next-fullscreen",
- tray: "crayon-date-picker-button-next-tray",
- copilot: "crayon-date-picker-button-next-copilot",
- };
-
- const botTypeMapButtonPrevious: Record<BotType, string> = {
- mobile: "crayon-date-picker-button-previous-mobile",
- fullscreen: "crayon-date-picker-button-previous-fullscreen",
- tray: "crayon-date-picker-button-previous-tray",
- copilot: "crayon-date-picker-button-previous-copilot",
- };
-
const commonClassNames: Partial<ClassNames> = {
root: `${defaultClassNames.root} crayon-date-picker-root`,
nav: `${defaultClassNames.nav} ${botTypeMapNav[botType]}`,
dropdowns: `${defaultClassNames.dropdowns} ${botTypeMapDropdowns[botType]}`,
month_grid: `crayon-date-picker-month-grid`,
- button_next: `crayon-date-picker-button-next ${botTypeMapButtonNext[botType]}`,
- button_previous: `crayon-date-picker-button-previous ${botTypeMapButtonPrevious[botType]}`,
+ button_next: `crayon-date-picker-button-next`,
+ button_previous: `crayon-date-picker-button-previous`,
today: `crayon-date-picker-today`,
disabled: `crayon-date-picker-disabled`,
weekdays: `crayon-date-picker-weekdays`,
diff --git a/js/packages/react-ui/src/components/DatePicker/stories/DatePicker.stories.tsx b/js/packages/react-ui/src/components/DatePicker/stories/DatePicker.stories.tsx
index fd3dc5232..fd3b15d72 100644
--- a/js/packages/react-ui/src/components/DatePicker/stories/DatePicker.stories.tsx
+++ b/js/packages/react-ui/src/components/DatePicker/stories/DatePicker.stories.tsx
@@ -18,7 +18,7 @@ const meta: Meta<typeof DatePicker> = {
(Story) => (
<div
style={{
- width: "350px",
+ width: "400px",
}}
>
<Story />
@@ -38,18 +38,6 @@ const meta: Meta<typeof DatePicker> = {
defaultValue: { summary: "single" },
},
},
- variant: {
- control: "radio",
- options: ["docked", "popover"],
- description: "The visual presentation style of the date picker",
- table: {
- category: "Appearance",
- type: {
- summary: "'docked' | 'popover'",
- },
- defaultValue: { summary: "docked" },
- },
- },
selectedSingleDate: {
control: false,
description: "The currently selected date (for single mode)",
@@ -121,12 +109,9 @@ type Story = StoryObj<typeof meta>;
// Basic single date picker with docked variant
export const SinglePicker: Story = {
- render: (args) => (
- <DatePicker style={{ width: args.variant === "docked" ? "unset" : "350px" }} {...args} />
- ),
+ render: (args) => <DatePicker {...args} style={{ width: "400px" }} />,
args: {
mode: "single",
- variant: "docked",
},
};
@@ -134,7 +119,6 @@ export const SinglePicker: Story = {
export const RangePicker: Story = {
args: {
mode: "range",
- variant: "docked",
},
parameters: {
docs: {
@@ -150,7 +134,6 @@ export const FloatingPicker: Story = {
render: (args) => <DatePicker {...args} style={{ width: "350px" }} />,
args: {
mode: "single",
- variant: "popover",
},
};
@@ -161,7 +144,6 @@ export const ControlledSingle: Story = {
<div>
<DatePicker
mode={args.mode}
- variant={args.variant}
selectedSingleDate={selectedDate}
setSelectedSingleDate={setSelectedDate}
/>
@@ -171,7 +153,6 @@ export const ControlledSingle: Story = {
},
args: {
mode: "single",
- variant: "docked",
},
parameters: {
docs: {
@@ -184,7 +165,6 @@ const ControlledDatePickerExample = () => {
<div>
<DatePicker
mode="single"
- variant="docked"
selectedSingleDate={selectedDate}
setSelectedSingleDate={setSelectedDate}
/>
@@ -209,7 +189,6 @@ const ControlledRangePicker = () => {
<div>
<DatePicker
mode="range"
- variant="docked"
selectedRangeDates={dateRange}
setSelectedRangeDates={setDateRange}
/>
@@ -236,7 +215,6 @@ const ControlledRangePicker = () => {
<div>
<DatePicker
mode="range"
- variant="docked"
selectedRangeDates={dateRange}
setSelectedRangeDates={setDateRange}
/>
diff --git a/js/packages/react-ui/src/components/index.scss b/js/packages/react-ui/src/components/index.scss
index f96f5a198..f27440047 100644
--- a/js/packages/react-ui/src/components/index.scss
+++ b/js/packages/react-ui/src/components/index.scss
@@ -1,7 +1,8 @@
@forward "./Accordion/accordion.scss";
@forward "./Button/button.scss";
-@forward "./Card/card.scss";
@forward "./Buttons/buttons.scss";
+@forward "./Calendar/calendar.scss";
+@forward "./Card/card.scss";
@forward "./CardHeader/cardHeader.scss";
@forward "./Carousel/carousel.scss";
@forward "./Charts/charts.scss";
diff --git a/js/packages/react-ui/src/hooks/useMultipleRefs.ts b/js/packages/react-ui/src/hooks/useMultipleRefs.ts
index f5cc6cada..fa0bb0bb7 100644
--- a/js/packages/react-ui/src/hooks/useMultipleRefs.ts
+++ b/js/packages/react-ui/src/hooks/useMultipleRefs.ts
@@ -1,5 +1,5 @@
import { useCallback } from "react";
-import { assignRef } from "../utils/ref";
+import { assignRef } from "../internalUtils/ref";
type RefType<T> = React.Ref<T> | React.RefObject<T> | React.ForwardedRef<T>;
diff --git a/js/packages/react-ui/src/index.ts b/js/packages/react-ui/src/index.ts
index c32209cc8..3ebb9a257 100644
--- a/js/packages/react-ui/src/index.ts
+++ b/js/packages/react-ui/src/index.ts
@@ -1,6 +1,7 @@
export * from "./components/Accordion";
export * from "./components/Button";
export * from "./components/Buttons";
+export * from "./components/Calendar";
export * from "./components/Card";
export * from "./components/CardHeader";
export * from "./components/Carousel";
diff --git a/js/packages/react-ui/src/utils/ref.ts b/js/packages/react-ui/src/internalUtils/ref.ts
similarity index 100%
rename from js/packages/react-ui/src/utils/ref.ts
rename to js/packages/react-ui/src/internalUtils/ref.ts
diff --git a/js/packages/react-ui/src/utils/DatePickerUtils.ts b/js/packages/react-ui/src/utils/DatePickerUtils.ts
new file mode 100644
index 000000000..ec0c79682
--- /dev/null
+++ b/js/packages/react-ui/src/utils/DatePickerUtils.ts
@@ -0,0 +1,30 @@
+import { format } from "date-fns";
+import { DateRange } from "react-day-picker";
+
+export const formatDateRange = (range: DateRange | undefined): string => {
+ if (!range) return "Select a range";
+
+ const { from, to } = range;
+
+ if (!from) return "Select a range";
+
+ if (!to) {
+ return format(from, "MMM d, yyyy");
+ }
+
+ if (from.toDateString() === to.toDateString()) {
+ return format(from, "MMM d, yyyy");
+ }
+
+ return `${format(from, "MMM d, yyyy")} - ${format(to, "MMM d, yyyy")}`;
+};
+
+export const formatSingleDate = (date: Date | undefined): string => {
+ if (!date) return "Select a date";
+ return format(date, "MMM d, yyyy");
+};
+
+export const formatMultipleDates = (dates: Date[] | undefined): string => {
+ if (!dates) return "Select dates";
+ return dates.map((date) => format(date, "MMM d, yyyy")).join(", ");
+};
diff --git a/js/packages/react-ui/src/utils/index.ts b/js/packages/react-ui/src/utils/index.ts
new file mode 100644
index 000000000..1bdcdfd84
--- /dev/null
+++ b/js/packages/react-ui/src/utils/index.ts
@@ -0,0 +1 @@
+export * from "./DatePickerUtils";
diff --git a/js/packages/react-ui/tsconfig.json b/js/packages/react-ui/tsconfig.json
index fd30bea7f..2f0f71078 100644
--- a/js/packages/react-ui/tsconfig.json
+++ b/js/packages/react-ui/tsconfig.json
@@ -7,13 +7,6 @@
"module": "ESNext",
"outDir": "./dist",
"rootDir": "./src",
- "types": ["./src/types.d.ts", "node"],
- "paths": {
- "@/*": ["./src/*"],
- "@/utils/*": ["./src/utils/*"],
- "@/hooks/*": ["./src/hooks/*"],
- "@/components/*": ["./src/components/*"],
- "@/context/*": ["./src/context/*"]
- }
+ "types": ["./src/types.d.ts", "node"]
}
}
diff --git a/js/pnpm-lock.yaml b/js/pnpm-lock.yaml
index 48586ec29..e8c1f687e 100644
--- a/js/pnpm-lock.yaml
+++ b/js/pnpm-lock.yaml
@@ -58,7 +58,7 @@ importers:
version: 2.6.0
tailwindcss-animate:
specifier: ^1.0.7
- version: 1.0.7([email protected])
+ version: 1.0.7
tiny-invariant:
specifier: ^1.3.3
version: 1.3.3
@@ -6543,6 +6543,8 @@ snapshots:
+
dependencies:
tailwindcss: 3.4.17