gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-12-06 23:44:25 +01:00
Code Issues Actions 28 Packages Projects Releases Wiki Activity

fix(launch_bar): calendar dropdown hiding on month selection

Browse Source
This commit is contained in:
Elian Doran 2025-12-05 15:43:44 +02:00
parent 74fcf8270d
commit 66620aabe2
No known key found for this signature in database
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
apps/client/src/widgets/react/Dropdown.tsx
View File

@ -16,6 +16,7 @@ export interface DropdownProps extends Pick<HTMLProps<HTMLDivElement>, "id" | "c
title?: string; title?: string;
dropdownContainerStyle?: CSSProperties; dropdownContainerStyle?: CSSProperties;
dropdownContainerClassName?: string; dropdownContainerClassName?: string;
dropdownContainerRef?: MutableRef<HTMLDivElement | null>;
hideToggleArrow?: boolean; hideToggleArrow?: boolean;
/** If set to true, then the dropdown button will be considered an icon action (without normal border and sized for icons only). */ /** If set to true, then the dropdown button will be considered an icon action (without normal border and sized for icons only). */
iconAction?: boolean; iconAction?: boolean;
@ -32,7 +33,7 @@ export interface DropdownProps extends Pick<HTMLProps<HTMLDivElement>, "id" | "c
titleOptions?: Partial<Tooltip.Options>; titleOptions?: Partial<Tooltip.Options>;
} }
export default function Dropdown({ id, className, buttonClassName, isStatic, children, title, text, dropdownContainerStyle, dropdownContainerClassName, hideToggleArrow, iconAction, disabled, noSelectButtonStyle, noDropdownListStyle, forceShown, onShown: externalOnShown, onHidden: externalOnHidden, dropdownOptions, buttonProps, dropdownRef, titlePosition, titleOptions }: DropdownProps) { export default function Dropdown({ id, className, buttonClassName, isStatic, children, title, text, dropdownContainerStyle, dropdownContainerClassName, dropdownContainerRef: externalContainerRef, hideToggleArrow, iconAction, disabled, noSelectButtonStyle, noDropdownListStyle, forceShown, onShown: externalOnShown, onHidden: externalOnHidden, dropdownOptions, buttonProps, dropdownRef, titlePosition, titleOptions }: DropdownProps) {
const containerRef = useRef<HTMLDivElement | null>(null); const containerRef = useRef<HTMLDivElement | null>(null);
const triggerRef = useRef<HTMLButtonElement | null>(null); const triggerRef = useRef<HTMLButtonElement | null>(null);
const { showTooltip, hideTooltip } = useTooltip(containerRef, { const { showTooltip, hideTooltip } = useTooltip(containerRef, {
@ -71,10 +72,15 @@ export default function Dropdown({ id, className, buttonClassName, isStatic, chi
useEffect(() => { useEffect(() => {
if (!containerRef.current) return; if (!containerRef.current) return;
if (externalContainerRef) externalContainerRef.current = containerRef.current;
const $dropdown = $(containerRef.current); const $dropdown = $(containerRef.current);
$dropdown.on("show.bs.dropdown", onShown); $dropdown.on("show.bs.dropdown", onShown);
$dropdown.on("hide.bs.dropdown", onHidden); $dropdown.on("hide.bs.dropdown", (e) => {
// Stop propagation causing multiple hides for nested dropdowns.
e.stopPropagation();
onHidden();
});
// Add proper cleanup // Add proper cleanup
return () => { return () => {