Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
6 changes: 5 additions & 1 deletion apps/storybook/tailwind.config.cjs
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

undo Windows specific changes here.

Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,11 @@ const flowbiteReact = require("flowbite-react/plugin/tailwindcss");
/** @type {import('tailwindcss').Config} */
module.exports = {
darkMode: "class",
content: ["./src/**/*.{ts,tsx}", ".flowbite-react/class-list.json"],
content: [
"./src/**/*.{ts,tsx}",
".flowbite-react/class-list.json",
".flowbite-react\\class-list.json"
],
theme: {
extend: {},
},
Expand Down
1 change: 1 addition & 0 deletions apps/web/tailwind.config.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ module.exports = {
"./data/**/*.{js,jsx,ts,tsx}",
"./examples/**/*.{js,jsx,ts,tsx}",
".flowbite-react/class-list.json",
".flowbite-react\\class-list.json"
],
theme: {
extend: {
Expand Down
2 changes: 1 addition & 1 deletion bun.lock
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@
},
"packages/ui": {
"name": "flowbite-react",
"version": "0.12.13",
"version": "0.12.15",
"bin": {
"flowbite-react": "./dist/cli/bin.js",
},
Expand Down
206 changes: 103 additions & 103 deletions packages/ui/schema.json
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

undo changes

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

for the last time, undo

Original file line number Diff line number Diff line change
Expand Up @@ -9,109 +9,109 @@
"type": "string",
"enum": [
"*",
"Accordion",
"AccordionContent",
"AccordionTitle",
"Alert",
"Avatar",
"AvatarGroup",
"AvatarGroupCounter",
"Badge",
"Banner",
"BannerCollapseButton",
"Blockquote",
"Breadcrumb",
"BreadcrumbItem",
"Button",
"ButtonGroup",
"Card",
"Carousel",
"Checkbox",
"Clipboard",
"ClipboardWithIcon",
"ClipboardWithIconText",
"DarkThemeToggle",
"Datepicker",
"Drawer",
"DrawerHeader",
"DrawerItems",
"Dropdown",
"DropdownDivider",
"DropdownHeader",
"DropdownItem",
"FileInput",
"FloatingLabel",
"Footer",
"FooterBrand",
"FooterCopyright",
"FooterDivider",
"FooterIcon",
"FooterLink",
"FooterLinkGroup",
"FooterTitle",
"HR",
"HRIcon",
"HRSquare",
"HRText",
"HRTrimmed",
"HelperText",
"Kbd",
"Label",
"List",
"ListItem",
"ListGroup",
"ListGroupItem",
"MegaMenu",
"MegaMenuDropdown",
"MegaMenuDropdownToggle",
"Modal",
"ModalBody",
"ModalFooter",
"ModalHeader",
"Navbar",
"NavbarBrand",
"NavbarCollapse",
"NavbarLink",
"NavbarToggle",
"Pagination",
"PaginationButton",
"Popover",
"Progress",
"Radio",
"RangeSlider",
"Rating",
"RatingAdvanced",
"RatingStar",
"Select",
"Sidebar",
"SidebarCTA",
"SidebarCollapse",
"SidebarItem",
"SidebarItemGroup",
"SidebarItems",
"SidebarLogo",
"Spinner",
"Table",
"TableBody",
"TableCell",
"TableHead",
"TableHeadCell",
"TableRow",
"TabItem",
"Tabs",
"TextInput",
"Textarea",
"Timeline",
"TimelineBody",
"TimelineContent",
"TimelineItem",
"TimelinePoint",
"TimelineTime",
"TimelineTitle",
"Toast",
"ToastToggle",
"ToggleSwitch",
"Tooltip"
"src\\components\\Accordion\\Accordion",
"src\\components\\Accordion\\AccordionContent",
"src\\components\\Accordion\\AccordionTitle",
"src\\components\\Alert\\Alert",
"src\\components\\Avatar\\Avatar",
"src\\components\\Avatar\\AvatarGroup",
"src\\components\\Avatar\\AvatarGroupCounter",
"src\\components\\Badge\\Badge",
"src\\components\\Banner\\Banner",
"src\\components\\Banner\\BannerCollapseButton",
"src\\components\\Blockquote\\Blockquote",
"src\\components\\Breadcrumb\\Breadcrumb",
"src\\components\\Breadcrumb\\BreadcrumbItem",
"src\\components\\Button\\Button",
"src\\components\\Button\\ButtonGroup",
"src\\components\\Card\\Card",
"src\\components\\Carousel\\Carousel",
"src\\components\\Checkbox\\Checkbox",
"src\\components\\Clipboard\\Clipboard",
"src\\components\\Clipboard\\ClipboardWithIcon",
"src\\components\\Clipboard\\ClipboardWithIconText",
"src\\components\\DarkThemeToggle\\DarkThemeToggle",
"src\\components\\Datepicker\\Datepicker",
"src\\components\\Drawer\\Drawer",
"src\\components\\Drawer\\DrawerHeader",
"src\\components\\Drawer\\DrawerItems",
"src\\components\\Dropdown\\Dropdown",
"src\\components\\Dropdown\\DropdownDivider",
"src\\components\\Dropdown\\DropdownHeader",
"src\\components\\Dropdown\\DropdownItem",
"src\\components\\FileInput\\FileInput",
"src\\components\\FloatingLabel\\FloatingLabel",
"src\\components\\Footer\\Footer",
"src\\components\\Footer\\FooterBrand",
"src\\components\\Footer\\FooterCopyright",
"src\\components\\Footer\\FooterDivider",
"src\\components\\Footer\\FooterIcon",
"src\\components\\Footer\\FooterLink",
"src\\components\\Footer\\FooterLinkGroup",
"src\\components\\Footer\\FooterTitle",
"src\\components\\HR\\HR",
"src\\components\\HR\\HRIcon",
"src\\components\\HR\\HRSquare",
"src\\components\\HR\\HRText",
"src\\components\\HR\\HRTrimmed",
"src\\components\\HelperText\\HelperText",
"src\\components\\Kbd\\Kbd",
"src\\components\\Label\\Label",
"src\\components\\ListGroup\\ListGroup",
"src\\components\\ListGroup\\ListGroupItem",
"src\\components\\List\\List",
"src\\components\\List\\ListItem",
"src\\components\\MegaMenu\\MegaMenu",
"src\\components\\MegaMenu\\MegaMenuDropdown",
"src\\components\\MegaMenu\\MegaMenuDropdownToggle",
"src\\components\\Modal\\Modal",
"src\\components\\Modal\\ModalBody",
"src\\components\\Modal\\ModalFooter",
"src\\components\\Modal\\ModalHeader",
"src\\components\\Navbar\\Navbar",
"src\\components\\Navbar\\NavbarBrand",
"src\\components\\Navbar\\NavbarCollapse",
"src\\components\\Navbar\\NavbarLink",
"src\\components\\Navbar\\NavbarToggle",
"src\\components\\Pagination\\Pagination",
"src\\components\\Pagination\\PaginationButton",
"src\\components\\Popover\\Popover",
"src\\components\\Progress\\Progress",
"src\\components\\Radio\\Radio",
"src\\components\\RangeSlider\\RangeSlider",
"src\\components\\Rating\\Rating",
"src\\components\\Rating\\RatingAdvanced",
"src\\components\\Rating\\RatingStar",
"src\\components\\Select\\Select",
"src\\components\\Sidebar\\Sidebar",
"src\\components\\Sidebar\\SidebarCTA",
"src\\components\\Sidebar\\SidebarCollapse",
"src\\components\\Sidebar\\SidebarItem",
"src\\components\\Sidebar\\SidebarItemGroup",
"src\\components\\Sidebar\\SidebarItems",
"src\\components\\Sidebar\\SidebarLogo",
"src\\components\\Spinner\\Spinner",
"src\\components\\Table\\Table",
"src\\components\\Table\\TableBody",
"src\\components\\Table\\TableCell",
"src\\components\\Table\\TableHead",
"src\\components\\Table\\TableHeadCell",
"src\\components\\Table\\TableRow",
"src\\components\\Tabs\\TabItem",
"src\\components\\Tabs\\Tabs",
"src\\components\\TextInput\\TextInput",
"src\\components\\Textarea\\Textarea",
"src\\components\\Timeline\\Timeline",
"src\\components\\Timeline\\TimelineBody",
"src\\components\\Timeline\\TimelineContent",
"src\\components\\Timeline\\TimelineItem",
"src\\components\\Timeline\\TimelinePoint",
"src\\components\\Timeline\\TimelineTime",
"src\\components\\Timeline\\TimelineTitle",
"src\\components\\Toast\\Toast",
"src\\components\\Toast\\ToastToggle",
"src\\components\\ToggleSwitch\\ToggleSwitch",
"src\\components\\Tooltip\\Tooltip"
]
},
"uniqueItems": true
Expand Down
8 changes: 7 additions & 1 deletion packages/ui/src/components/Datepicker/Views/Days.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ export interface DatepickerViewsDaysTheme {
selected: string;
disabled: string;
today: string;
outside: string; // ✅ Updated: Added 'outside' key for theme support
};
};
}
Expand Down Expand Up @@ -66,6 +67,9 @@ export function DatepickerViewsDays() {
!isDateInRange(currentDate, minDate, maxDate) || (filterDate && !filterDate(currentDate, Views.Days));
const isToday = isDateToday(currentDate);

// ✅ Logic: Check if the date belongs to the currently displayed month
const isOutOfMonth = currentDate.getMonth() !== viewDate.getMonth();

return (
<button
disabled={isDisabled}
Expand All @@ -76,6 +80,8 @@ export function DatepickerViewsDays() {
isToday && theme.items.item.today,
isSelected && theme.items.item.selected,
isDisabled && theme.items.item.disabled,
// ✅ Logic: Apply 'outside' style only if NOT selected
isOutOfMonth && !isSelected && theme.items.item.outside
)}
onClick={() => {
if (isDisabled) return;
Expand All @@ -92,4 +98,4 @@ export function DatepickerViewsDays() {
);
}

DatepickerViewsDays.displayName = "DatepickerViewsDays";
DatepickerViewsDays.displayName = "DatepickerViewsDays";
3 changes: 2 additions & 1 deletion packages/ui/src/components/Datepicker/theme.ts
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ export const datePickerTheme = createTheme<DatepickerTheme>({
selected: "bg-primary-700 text-white hover:bg-primary-600",
disabled: "text-gray-500",
today: "",
outside: "text-gray-500 opacity-40", // ✅ Added 'outside' property here
},
},
},
Expand Down Expand Up @@ -84,4 +85,4 @@ export const datePickerTheme = createTheme<DatepickerTheme>({
},
},
},
});
});
Loading