Skip to content

Build your personal knowledge base with Trilium Notes

refactor(dropdown): type the refs handed to `dropdownRef` as `DropdownHandle`

Elian Doran8ac2101bdea7
diff --git a/apps/client/src/widgets/launch_bar/CalendarWidget.tsx b/apps/client/src/widgets/launch_bar/CalendarWidget.tsx
index d3f11d2523..523c064d51 100644
--- a/apps/client/src/widgets/launch_bar/CalendarWidget.tsx
+++ b/apps/client/src/widgets/launch_bar/CalendarWidget.tsx
@@ -7,11 +7,11 @@ import "./CalendarWidget.css";
import Calendar, { CalendarArgs } from "./Calendar";
import ActionButton from "../react/ActionButton";
import { t } from "../../services/i18n";
+import type { DropdownHandle } from "../react/Dropdown";
import FormDropdownList from "../react/FormDropdownList";
import FormTextBox from "../react/FormTextBox";
import toast from "../../services/toast";
import date_notes from "../../services/date_notes";
-import { Dropdown } from "bootstrap";
import search from "../../services/search";
import server from "../../services/server";
@@ -34,7 +34,7 @@ export default function CalendarWidget({ launcherNote }: LauncherNoteProps) {
const { title, icon } = useLauncherIconAndTitle(launcherNote);
const [ calendarArgs, setCalendarArgs ] = useState<Pick<CalendarArgs, "activeDate" | "todaysDate">>();
const [ date, setDate ] = useState<Dayjs>();
- const dropdownRef = useRef<Dropdown>(null);
+ const dropdownRef = useRef<DropdownHandle>(null);
const [ enableWeekNotes, setEnableWeekNotes ] = useState(false);
const [ weekNotes, setWeekNotes ] = useState<string[]>([]);
const calendarRootRef = useRef<FNote>();
diff --git a/apps/client/src/widgets/layout/StatusBar.tsx b/apps/client/src/widgets/layout/StatusBar.tsx
index c33873003d..543e011e0f 100644
--- a/apps/client/src/widgets/layout/StatusBar.tsx
+++ b/apps/client/src/widgets/layout/StatusBar.tsx
@@ -1,7 +1,6 @@
import "./StatusBar.css";
import { Locale, NOTE_TYPE_ICONS, NoteType } from "@triliumnext/commons";
-import { Dropdown as BootstrapDropdown } from "bootstrap";
import clsx from "clsx";
import { type ComponentChildren, RefObject } from "preact";
import { createPortal } from "preact/compat";
@@ -19,7 +18,7 @@ import server from "../../services/server";
import { openInAppHelpFromUrl } from "../../services/utils";
import { formatDateTime } from "../../utils/formatters";
import { BacklinksWidget, useBacklinkCount } from "../FloatingButtonsDefinitions";
-import Dropdown, { DropdownPanel, type DropdownPanelProps } from "../react/Dropdown";
+import Dropdown, { type DropdownHandle, DropdownPanel, type DropdownPanelProps } from "../react/Dropdown";
import { FormDropdownDivider, FormListHeader, FormListItem } from "../react/FormList";
import HelpDropdown from "../react/HelpDropdown";
import { useActiveNoteContext, useLegacyImperativeHandlers, useNoteLabel, useNoteLabelInt, useNoteLabelOptionalBool, useNoteProperty, useStaticTooltip, useTriliumEvent, useTriliumEvents, useTriliumOptionBool, useTriliumOptionInt, useAttachments } from "../react/hooks";
@@ -250,7 +249,7 @@ interface NoteInfoContext extends StatusBarContext {
}
export function NoteInfoBadge(context: NoteInfoContext) {
- const dropdownRef = useRef<BootstrapDropdown>(null);
+ const dropdownRef = useRef<DropdownHandle>(null);
const [ dropdownShown, setDropdownShown ] = useState(false);
const { note, similarNotesShown, setSimilarNotesShown } = context;
const noteType = useNoteProperty(note, "type");
@@ -277,7 +276,7 @@ export function NoteInfoBadge(context: NoteInfoContext) {
}
export function NoteInfoContent({ note, noteType, dropdownRef, setSimilarNotesShown }: Pick<NoteInfoContext, "note" | "setSimilarNotesShown"> & {
- dropdownRef?: RefObject<BootstrapDropdown>;
+ dropdownRef?: RefObject<DropdownHandle>;
noteType: NoteType;
}) {
const { metadata, ...sizeProps } = useNoteMetadata(note);
@@ -474,7 +473,7 @@ function AttributesPane({ note, noteContext, attributesShown, setAttributesShown
* sidebar's connections tab holds, which stays the place to keep it open beside the note.
*/
function NotePaths({ note, hoistedNoteId, notePath }: StatusBarContext) {
- const dropdownRef = useRef<BootstrapDropdown>(null);
+ const dropdownRef = useRef<DropdownHandle>(null);
const sortedNotePaths = useSortedNotePaths(note, hoistedNoteId);
const count = sortedNotePaths?.length ?? 0;
diff --git a/apps/client/src/widgets/mobile_widgets/mobile_detail_menu.tsx b/apps/client/src/widgets/mobile_widgets/mobile_detail_menu.tsx
index a98c75f2e8..e9e9136a88 100644
--- a/apps/client/src/widgets/mobile_widgets/mobile_detail_menu.tsx
+++ b/apps/client/src/widgets/mobile_widgets/mobile_detail_menu.tsx
@@ -1,6 +1,5 @@
import "./mobile_detail_menu.css";
-import { Dropdown as BootstrapDropdown } from "bootstrap";
import { createPortal, useRef, useState } from "preact/compat";
import FNote, { NotePathRecord } from "../../entities/fnote";
@@ -10,6 +9,7 @@ import server from "../../services/server";
import { BacklinksWidget, useBacklinkCount } from "../FloatingButtonsDefinitions";
import { getLocaleName, NoteInfoContent } from "../layout/StatusBar";
import ActionButton from "../react/ActionButton";
+import type { DropdownHandle } from "../react/Dropdown";
import { FormDropdownDivider, FormDropdownSubmenu, FormListItem } from "../react/FormList";
import { useNoteContext, useNoteProperty } from "../react/hooks";
import Modal from "../react/Modal";
@@ -21,7 +21,7 @@ import SimilarNotesTab from "../ribbon/SimilarNotesTab";
import { useProcessedLocales } from "../type_widgets/options/components/LocaleSelector";
export default function MobileDetailMenu() {
- const dropdownRef = useRef<BootstrapDropdown | null>(null);
+ const dropdownRef = useRef<DropdownHandle | null>(null);
const { note, noteContext, parentComponent, ntxId, viewScope, hoistedNoteId } = useNoteContext();
const subContexts = noteContext?.getMainContext().getSubContexts() ?? [];
const isMainContext = noteContext?.isMainContext();
diff --git a/apps/client/src/widgets/react/IconPicker.tsx b/apps/client/src/widgets/react/IconPicker.tsx
index 26003cd60f..175f780310 100644
--- a/apps/client/src/widgets/react/IconPicker.tsx
+++ b/apps/client/src/widgets/react/IconPicker.tsx
@@ -1,7 +1,7 @@
import "./IconPicker.css";
import { IconRegistry } from "@triliumnext/commons";
-import { Dropdown as BootstrapDropdown, Tooltip } from "bootstrap";
+import type { Tooltip } from "bootstrap";
import clsx from "clsx";
import { CSSProperties } from "preact";
import { createPortal } from "preact/compat";
@@ -13,7 +13,7 @@ import { t } from "../../services/i18n";
import server from "../../services/server";
import { isDesktop, isMobile } from "../../services/utils";
import ActionButton from "./ActionButton";
-import Dropdown, { DropdownPanel } from "./Dropdown";
+import Dropdown, { type DropdownHandle, DropdownPanel } from "./Dropdown";
import { FormDropdownDivider, FormListItem } from "./FormList";
import FormTextBox from "./FormTextBox";
import { useStaticTooltip, useWindowSize } from "./hooks";
@@ -165,7 +165,7 @@ export function IconPickerButton({ className, ...props }: IconPickerButtonProps)
function IconPickerDropdownButton({
icon, title, className, disabled, onSelect, onReset, resetText, onOpened, onClosed, backdrop
}: IconPickerButtonProps) {
- const dropdownRef = useRef<BootstrapDropdown>(null);
+ const dropdownRef = useRef<DropdownHandle>(null);
const [ pickerShown, setPickerShown ] = useState(false);
return (
diff --git a/apps/client/src/widgets/ribbon/NoteActions.tsx b/apps/client/src/widgets/ribbon/NoteActions.tsx
index 67f9eff54b..d064f50f6a 100644
--- a/apps/client/src/widgets/ribbon/NoteActions.tsx
+++ b/apps/client/src/widgets/ribbon/NoteActions.tsx
@@ -1,7 +1,6 @@
import "./NoteActions.css";
import { ConvertToAttachmentResponse } from "@triliumnext/commons";
-import { Dropdown as BootstrapDropdown } from "bootstrap";
import { ComponentChildren, RefObject } from "preact";
import { useContext, useEffect, useRef } from "preact/hooks";
@@ -24,7 +23,7 @@ import MovePaneButton from "../buttons/move_pane_button";
import { showImageCompressionDialog } from "../dialogs/image_compression/image_compression_dialog";
import { isAlwaysFullWidthByType } from "../note_wrapper";
import ActionButton from "../react/ActionButton";
-import Dropdown from "../react/Dropdown";
+import Dropdown, { type DropdownHandle } from "../react/Dropdown";
import { FormDropdownDivider, FormDropdownSubmenu, FormListHeader, FormListItem, FormListToggleableItem } from "../react/FormList";
import { useIsNoteReadOnly, useNoteContext, useNoteLabel, useNoteLabelBoolean, useNoteLabelOptionalBool, useNoteProperty, useSyncedRef, useTriliumEvent, useTriliumOption } from "../react/hooks";
import { ParentComponent } from "../react/react_utils";
@@ -72,9 +71,9 @@ export function NoteContextMenu({ note, noteContext, itemsAtStart, itemsNearNote
noteContext?: NoteContext,
itemsAtStart?: ComponentChildren;
itemsNearNoteSettings?: ComponentChildren;
- dropdownRef?: RefObject<BootstrapDropdown>;
+ dropdownRef?: RefObject<DropdownHandle>;
}) {
- const dropdownRef = useSyncedRef<BootstrapDropdown>(externalDropdownRef, null);
+ const dropdownRef = useSyncedRef<DropdownHandle>(externalDropdownRef, null);
const parentComponent = useContext(ParentComponent);
const noteType = useNoteProperty(note, "type") ?? "";
const [viewType] = useNoteLabel(note, "viewType");
diff --git a/apps/client/src/widgets/sidebar/SidebarChat.tsx b/apps/client/src/widgets/sidebar/SidebarChat.tsx
index f902ba054e..b5861dac26 100644
--- a/apps/client/src/widgets/sidebar/SidebarChat.tsx
+++ b/apps/client/src/widgets/sidebar/SidebarChat.tsx
@@ -1,7 +1,6 @@
import "./SidebarChat.css";
import type { SaveLlmChatResponse } from "@triliumnext/commons";
-import type { Dropdown as BootstrapDropdown } from "bootstrap";
import { useCallback, useEffect, useRef, useState } from "preact/hooks";
import appContext from "../../components/app_context.js";
@@ -13,7 +12,7 @@ import { randomString } from "../../services/utils.js";
import ws from "../../services/ws.js";
import { formatDateTime } from "../../utils/formatters";
import ActionButton from "../react/ActionButton.js";
-import Dropdown from "../react/Dropdown.js";
+import Dropdown, { type DropdownHandle } from "../react/Dropdown.js";
import { FormDropdownDivider, FormListItem } from "../react/FormList.js";
import { useActiveNoteContext, useNote, useNoteLabelBoolean, useNoteProperty, useSpacedUpdate } from "../react/hooks.js";
import { useChatContextMenu } from "../type_widgets/llm_chat/chat_context_menu.js";
@@ -38,7 +37,7 @@ import RightPanelWidget from "./RightPanelWidget.js";
export default function SidebarChat() {
const [chatNoteId, setChatNoteId] = useState<string | null>(null);
const [recentChats, setRecentChats] = useState<RecentLlmChat[]>([]);
- const historyDropdownRef = useRef<BootstrapDropdown | null>(null);
+ const historyDropdownRef = useRef<DropdownHandle | null>(null);
// Get the current active note context
const { noteId: activeNoteId, note: activeNote } = useActiveNoteContext();
diff --git a/apps/client/src/widgets/type_widgets/options/shortcuts.tsx b/apps/client/src/widgets/type_widgets/options/shortcuts.tsx
index a4c464adce..59ed7c52be 100644
--- a/apps/client/src/widgets/type_widgets/options/shortcuts.tsx
+++ b/apps/client/src/widgets/type_widgets/options/shortcuts.tsx
@@ -1,7 +1,6 @@
import "./shortcuts.css";
import { ActionKeyboardShortcut, KeyboardShortcut, OptionNames } from "@triliumnext/commons";
-import { Dropdown as BootstrapDropdown } from "bootstrap";
import { ComponentChildren, RefObject } from "preact";
import { useCallback, useEffect, useMemo, useRef, useState } from "preact/hooks";
@@ -17,7 +16,7 @@ import ActionButton from "../../react/ActionButton";
import { Badge } from "../../react/Badge";
import Button from "../../react/Button";
import { Card, OptionCardSection } from "../../react/Card";
-import Dropdown from "../../react/Dropdown";
+import Dropdown, { type DropdownHandle } from "../../react/Dropdown";
import { FormDropdownDivider, FormListItem } from "../../react/FormList";
import FormTextBox from "../../react/FormTextBox";
import { useStaticTooltip, useTriliumEvent } from "../../react/hooks";
@@ -29,7 +28,7 @@ export default function ShortcutSettings() {
const [ keyboardShortcuts, setKeyboardShortcuts ] = useState<KeyboardShortcut[]>([]);
const [ filter, setFilter ] = useState<string>();
const [ activeFilter, setActiveFilter ] = useState<ShortcutFilter>(null);
- const filterDropdownRef = useRef<BootstrapDropdown>(null);
+ const filterDropdownRef = useRef<DropdownHandle>(null);
const selectFilter = useCallback((value: ShortcutFilter) => {
setActiveFilter(value);