Skip to content

Build your personal knowledge base with Trilium Notes

refactor(quick_search): start Preact rewrite with an empty shell

Elian Dorana481f24f54ae
diff --git a/apps/client/src/layouts/desktop_layout.tsx b/apps/client/src/layouts/desktop_layout.tsx
index 5554baafa5..806a87485a 100644
--- a/apps/client/src/layouts/desktop_layout.tsx
+++ b/apps/client/src/layouts/desktop_layout.tsx
@@ -37,7 +37,7 @@ import NoteTreeWidget from "../widgets/note_tree.js";
import NoteWrapperWidget from "../widgets/note_wrapper.js";
import NoteDetail from "../widgets/NoteDetail.jsx";
import PromotedAttributes from "../widgets/PromotedAttributes.jsx";
-import QuickSearchWidget from "../widgets/quick_search.js";
+import QuickSearch from "../widgets/quick_search.jsx";
import ReadOnlyNoteInfoBar from "../widgets/ReadOnlyNoteInfoBar.jsx";
import { FixedFormattingToolbar } from "../widgets/ribbon/FormattingToolbar.jsx";
import LazyComponent from "../widgets/react/LazyComponent.jsx";
@@ -101,7 +101,7 @@ export default class DesktopLayout {
.optChild(!launcherPaneIsHorizontal, launcherPane)
.child(
new LeftPaneContainer()
- .optChild(!launcherPaneIsHorizontal, new QuickSearchWidget())
+ .optChild(!launcherPaneIsHorizontal, <QuickSearch />)
.child(appContext.noteTreeWidget)
.child(...this.customWidgets.get("left-pane"))
)
diff --git a/apps/client/src/layouts/mobile_layout.tsx b/apps/client/src/layouts/mobile_layout.tsx
index d1bdfefb22..303ab05001 100644
--- a/apps/client/src/layouts/mobile_layout.tsx
+++ b/apps/client/src/layouts/mobile_layout.tsx
@@ -23,7 +23,7 @@ import NoteIconWidget from "../widgets/note_icon.jsx";
import NoteTitleWidget from "../widgets/note_title.js";
import NoteWrapperWidget from "../widgets/note_wrapper.js";
import NoteDetail from "../widgets/NoteDetail.jsx";
-import QuickSearchWidget from "../widgets/quick_search.js";
+import QuickSearch from "../widgets/quick_search.jsx";
import ScrollPadding from "../widgets/scroll_padding";
import SearchResult from "../widgets/search_result.jsx";
import MobileEditorToolbar from "../widgets/type_widgets/text/mobile_editor_toolbar.jsx";
@@ -51,7 +51,7 @@ export default class MobileLayout {
new FlexContainer("column")
.filling()
.id("mobile-sidebar-wrapper")
- .child(new QuickSearchWidget())
+ .child(<QuickSearch />)
.child(<MobileNoteNavigator />)
)
)
diff --git a/apps/client/src/widgets/launch_bar/LauncherDefinitions.tsx b/apps/client/src/widgets/launch_bar/LauncherDefinitions.tsx
index 8f292bbdbe..5aaae7e1a5 100644
--- a/apps/client/src/widgets/launch_bar/LauncherDefinitions.tsx
+++ b/apps/client/src/widgets/launch_bar/LauncherDefinitions.tsx
@@ -1,4 +1,4 @@
-import { useCallback, useContext, useEffect, useMemo, useState } from "preact/hooks";
+import { useCallback, useContext, useEffect, useState } from "preact/hooks";
import appContext, { CommandNames } from "../../components/app_context";
import FNote from "../../entities/fnote";
@@ -9,7 +9,7 @@ import toast from "../../services/toast";
import { getErrorMessage, isMobile } from "../../services/utils";
import BasicWidget from "../basic_widget";
import NoteContextAwareWidget from "../note_context_aware_widget";
-import QuickSearchWidget from "../quick_search";
+import QuickSearch from "../quick_search";
import { useGlobalShortcut, useLegacyWidget, useNoteLabel, useNoteRelationTarget } from "../react/hooks";
import { ParentComponent } from "../react/react_utils";
import { CustomNoteLauncher } from "./GenericButtons";
@@ -96,14 +96,13 @@ export function TodayLauncher({ launcherNote }: LauncherNoteProps) {
export function QuickSearchLauncherWidget({ launcherNote }: LauncherNoteProps) {
const { isHorizontalLayout } = useContext(LaunchBarContext);
- const widget = useMemo(() => new QuickSearchWidget(), []);
const parentComponent = useContext(ParentComponent) as BasicWidget | null;
const isEnabled = isHorizontalLayout && !isMobile();
parentComponent?.contentSized();
return (
<div onContextMenu={launcherContextMenuHandler(launcherNote)}>
- {isEnabled && <LegacyWidgetRenderer widget={widget} />}
+ {isEnabled && <QuickSearch />}
</div>
);
}
diff --git a/apps/client/src/widgets/quick_search.tsx b/apps/client/src/widgets/quick_search.tsx
new file mode 100644
index 0000000000..fb2185b8dd
--- /dev/null
+++ b/apps/client/src/widgets/quick_search.tsx
@@ -0,0 +1,3 @@
+export default function QuickSearch() {
+ return <div className="quick-search">Hello world</div>;
+}
diff --git a/apps/client/src/widgets/quick_search.spec.ts b/apps/client/src/widgets/quick_search_old.spec.ts
similarity index 99%
rename from apps/client/src/widgets/quick_search.spec.ts
rename to apps/client/src/widgets/quick_search_old.spec.ts
index 03ecc434a7..f33fbd57bc 100644
--- a/apps/client/src/widgets/quick_search.spec.ts
+++ b/apps/client/src/widgets/quick_search_old.spec.ts
@@ -4,7 +4,7 @@ import appContext from "../components/app_context.js";
import froca from "../services/froca.js";
import linkService from "../services/link.js";
import server from "../services/server.js";
-import QuickSearchWidget from "./quick_search.js";
+import QuickSearchWidget from "./quick_search_old.js";
// The completions fetch attribute names and values through the server; nothing here opens the popup.
vi.mock("./ribbon/search_completions", () => ({
diff --git a/apps/client/src/widgets/quick_search.ts b/apps/client/src/widgets/quick_search_old.ts
similarity index 100%
rename from apps/client/src/widgets/quick_search.ts
rename to apps/client/src/widgets/quick_search_old.ts