Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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
86 changes: 85 additions & 1 deletion src/components/QuickSwitcherSettings.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import {
Dialog,
FormGroup,
InputGroup,
Switch,
Tag,
TextArea,
} from "@blueprintjs/core";
Expand All @@ -12,7 +13,10 @@ import PageInput from "roamjs-components/components/PageInput";
import { render as renderToast } from "roamjs-components/components/Toast";
import getPageTitleByPageUid from "roamjs-components/queries/getPageTitleByPageUid";
import getPageUidByPageTitle from "roamjs-components/queries/getPageUidByPageTitle";
import type { QuickSwitcherBookmark } from "~/types/quickSwitcher";
import type {
QuickSwitcherBookmark,
QuickSwitcherQuerySource,
} from "~/types/quickSwitcher";
import {
buildRoamPageUrl,
createBookmarkId,
Expand All @@ -26,8 +30,10 @@ import {

type QuickSwitcherSettingsDependencies = {
initialBookmarks: QuickSwitcherBookmark[];
initialQuerySource: QuickSwitcherQuerySource;
isMac: boolean;
onBookmarksChange: (bookmarks: QuickSwitcherBookmark[]) => void;
onQuerySourceChange: (querySource: QuickSwitcherQuerySource) => void;
};

type ToastIntent = "none" | "primary" | "success" | "warning" | "danger";
Expand All @@ -54,12 +60,22 @@ const isPageUrlInput = ({ entry }: { entry: string }): boolean =>

export const createQuickSwitcherSettingsComponent = ({
initialBookmarks,
initialQuerySource,
isMac,
onBookmarksChange,
onQuerySourceChange,
}: QuickSwitcherSettingsDependencies): React.FC => {
const QuickSwitcherSettings = (): React.ReactElement => {
const [bookmarks, setBookmarks] =
useState<QuickSwitcherBookmark[]>(initialBookmarks);
const [savedQuerySource, setSavedQuerySource] =
useState<QuickSwitcherQuerySource>(initialQuerySource);
const [querySourceEnabled, setQuerySourceEnabled] = useState(
initialQuerySource.enabled,
);
const [querySourceRef, setQuerySourceRef] = useState(
initialQuerySource.queryRef,
);
const [isManageDialogOpen, setIsManageDialogOpen] = useState(false);
const [pageTitle, setPageTitle] = useState("");
const [shortcut, setShortcut] = useState("");
Expand All @@ -75,6 +91,9 @@ export const createQuickSwitcherSettingsComponent = ({
: "",
[isMac, shortcut],
);
const isQuerySourceDirty =
querySourceEnabled !== savedQuerySource.enabled ||
querySourceRef.trim() !== savedQuerySource.queryRef;

const setAndPersistBookmarks = ({
nextBookmarks,
Expand All @@ -94,10 +113,16 @@ export const createQuickSwitcherSettingsComponent = ({
setBulkPages("");
};

const resetQuerySource = (): void => {
setQuerySourceEnabled(savedQuerySource.enabled);
setQuerySourceRef(savedQuerySource.queryRef);
};

const closeManageDialog = (): void => {
setIsManageDialogOpen(false);
clearForm();
clearBulkPages();
resetQuerySource();
};

const onShortcutKeyDown = (
Expand Down Expand Up @@ -280,6 +305,28 @@ export const createQuickSwitcherSettingsComponent = ({
});
};

const saveQuerySource = (): void => {
const normalizedQueryRef = querySourceRef.trim();
if (querySourceEnabled && !normalizedQueryRef) {
showToast({
content: "Add a Query Builder query reference first",
intent: "warning",
});
return;
}

const nextQuerySource = {
enabled: querySourceEnabled,
queryRef: normalizedQueryRef,
};
setSavedQuerySource(nextQuerySource);
onQuerySourceChange(nextQuerySource);
showToast({
content: "Query Builder source saved",
intent: "success",
});
};

return (
<div className="flex flex-col gap-3">
<div className="flex items-center justify-end">
Expand Down Expand Up @@ -387,6 +434,43 @@ export const createQuickSwitcherSettingsComponent = ({
<Button minimal onClick={clearBulkPages} text="Clear Bulk" />
</div>

<div className="rounded border border-slate-200 p-3">
<Switch
checked={querySourceEnabled}
label="Include Query Builder pages"
onChange={(event: React.ChangeEvent<HTMLInputElement>): void =>
setQuerySourceEnabled(event.target.checked)
}
/>
<FormGroup
helperText="Use a query page title, query block label, block UID, or block reference."
label="Query Builder Source"
>
<InputGroup
disabled={!querySourceEnabled}
onChange={(
event: React.ChangeEvent<HTMLInputElement>,
): void => setQuerySourceRef(event.target.value)}
placeholder="Active Projects, queries/Active Projects, or ((abc123def))"
value={querySourceRef}
/>
</FormGroup>
<div className="flex flex-wrap gap-2">
<Button
disabled={!isQuerySourceDirty}
icon="floppy-disk"
onClick={saveQuerySource}
text="Save Source"
/>
<Button
disabled={!isQuerySourceDirty}
minimal
onClick={resetQuerySource}
text="Reset"
/>
</div>
</div>

<div className="flex flex-col gap-2">
{bookmarks.length ? (
bookmarks.map((bookmark, index) => (
Expand Down
4 changes: 3 additions & 1 deletion src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,14 @@ export default runExtension(async ({ extensionAPI }) => {
const quickSwitcher = initializeQuickSwitcher({ extensionAPI });
const settingsComponent = createQuickSwitcherSettingsComponent({
initialBookmarks: quickSwitcher.getBookmarks(),
initialQuerySource: quickSwitcher.getQuerySource(),
isMac: /mac|iphone|ipad|ipod/i.test(
typeof navigator === "undefined"
? ""
: `${navigator.platform} ${navigator.userAgent}`,
),
onBookmarksChange: quickSwitcher.setBookmarks,
onQuerySourceChange: quickSwitcher.setQuerySource,
});

extensionAPI.settings.panel.create({
Expand All @@ -32,7 +34,7 @@ export default runExtension(async ({ extensionAPI }) => {
id: "bookmarked-pages",
name: "Bookmarked Pages",
description:
"Add Roam pages with optional shortcuts. These bookmarks are the only pages searchable in the dialog.",
"Add Roam pages with optional shortcuts and optional Query Builder pages.",
action: {
type: "reactComponent",
component: settingsComponent,
Expand Down
Loading
Loading