diff --git a/apps/client/src/widgets/launch_bar/CalendarWidget.tsx b/apps/client/src/widgets/launch_bar/CalendarWidget.tsx index 26a25e0b1..6dfa7c3b0 100644 --- a/apps/client/src/widgets/launch_bar/CalendarWidget.tsx +++ b/apps/client/src/widgets/launch_bar/CalendarWidget.tsx @@ -134,9 +134,7 @@ function CalendarMonthSelector({ date, setDate }: CalendarHeaderProps) { { - - }} + onChange={(index) => setDate(date.set("month", parseInt(index, 10)))} buttonProps={{ "data-calendar-input": "month" }} dropdownOptions={{ popperConfig: { placement: "bottom" } }} /> diff --git a/apps/client/src/widgets/react/Dropdown.tsx b/apps/client/src/widgets/react/Dropdown.tsx index 4b334f394..98947b04f 100644 --- a/apps/client/src/widgets/react/Dropdown.tsx +++ b/apps/client/src/widgets/react/Dropdown.tsx @@ -75,7 +75,11 @@ export default function Dropdown({ id, className, buttonClassName, isStatic, chi if (externalContainerRef) externalContainerRef.current = containerRef.current; const $dropdown = $(containerRef.current); - $dropdown.on("show.bs.dropdown", onShown); + $dropdown.on("show.bs.dropdown", (e) => { + // Stop propagation causing multiple shows for nested dropdowns. + e.stopPropagation(); + onShown(); + }); $dropdown.on("hide.bs.dropdown", (e) => { // Stop propagation causing multiple hides for nested dropdowns. e.stopPropagation();