feat!: release v2 (#6545)
Co-authored-by: Artur <145776561+arturict@users.noreply.github.com> Co-authored-by: arturict <arturict@users.noreply.github.com> Co-authored-by: Thomas <thomas@ajnart.fr> Co-authored-by: Afonso Jorge Ramos <afonsojorgeramos@gmail.com> Co-authored-by: Danura30082 <danura30082+github@gmail.com> Co-authored-by: Kushie <122986913+kushiemoon-dev@users.noreply.github.com> Co-authored-by: ajnart <thomas@ajnart.fr> Co-authored-by: ajnart <thomas@ajnart.dev> Co-authored-by: chenjun <chenjun@foxmail.com> Co-authored-by: Wikibear <wikibear@users.noreply.github.com> Co-authored-by: Bergasha <bergasha@gmail.com> Co-authored-by: leafyelin <43306196+leafyelin@users.noreply.github.com> Co-authored-by: Lucas Araujo <lucas.lra@gmail.com> Co-authored-by: GreenMonito <86085570+GreenMonito@users.noreply.github.com> Co-authored-by: Nerdy-Technician <roffo@nerdy-technician.social> Co-authored-by: Jun <34545896+jcstrong@users.noreply.github.com> Co-authored-by: Edmond Abraham <54119952+gitedmond@users.noreply.github.com> Co-authored-by: thrawnx <tight.bulb9384@fastmail.com> Co-authored-by: Chris <58918656+nordada@users.noreply.github.com> Co-authored-by: yi111 <153097222+Yi-111-a@users.noreply.github.com> Co-authored-by: Yanis <naamaneyanis@gmail.com> Co-authored-by: Wikibear <me@sej.de> Co-authored-by: alessiottavo <93441886+alessiottavo@users.noreply.github.com>
This commit is contained in:
3286 files changed
+284386
-139176
No files matched your search
@@ -1,30 +1,198 @@
|
||||
"use client";
|
||||
|
||||
import { Button } from "@mantine/core";
|
||||
import { useEffect, useMemo, useRef, useState } from "react";
|
||||
import {
|
||||
Avatar,
|
||||
Combobox,
|
||||
Group,
|
||||
Loader,
|
||||
PillsInput,
|
||||
ScrollArea,
|
||||
Stack,
|
||||
Text,
|
||||
ThemeIcon,
|
||||
useCombobox,
|
||||
} from "@mantine/core";
|
||||
import { IconCheck, IconLink, IconPlus } from "@tabler/icons-react";
|
||||
|
||||
import { useModalAction } from "@homarr/modals";
|
||||
import type { RouterOutputs } from "@homarr/api";
|
||||
import { clientApi } from "@homarr/api/client";
|
||||
import { useI18n } from "@homarr/translation/client";
|
||||
|
||||
import type { SortableItemListInput } from "../options";
|
||||
import { AppSelectModal } from "./app-select-modal";
|
||||
import { createDirectBookmark, getBookmarkFaviconUrl, splitBookmarkUrls } from "./bookmark-item";
|
||||
import type { BookmarkItem } from "./bookmark-item";
|
||||
|
||||
export const BookmarkAddButton: SortableItemListInput<
|
||||
{
|
||||
name: string;
|
||||
description: string | null;
|
||||
id: string;
|
||||
iconUrl: string;
|
||||
href: string | null;
|
||||
pingUrl: string | null;
|
||||
},
|
||||
string
|
||||
>["AddButton"] = ({ addItem, values }) => {
|
||||
const { openModal } = useModalAction(AppSelectModal);
|
||||
const t = useI18n();
|
||||
type SelectableApp = RouterOutputs["app"]["selectable"][number];
|
||||
export type BookmarkSelectionItem = SelectableApp | BookmarkItem;
|
||||
|
||||
const createOptionValue = "$create-url";
|
||||
|
||||
export const BookmarkAddButton: SortableItemListInput<BookmarkSelectionItem, string>["AddButton"] = ({
|
||||
addItem,
|
||||
migrateItems,
|
||||
values,
|
||||
initialOptions,
|
||||
}) => {
|
||||
const t = useI18n("widget.bookmarks.option.items.apps");
|
||||
const tCommon = useI18n("common");
|
||||
const tSelect = useI18n("app.action.select");
|
||||
const { data: apps = [], isPending, error } = clientApi.app.selectable.useQuery();
|
||||
const [search, setSearch] = useState("");
|
||||
const combobox = useCombobox({
|
||||
onDropdownClose: () => combobox.resetSelectedOption(),
|
||||
onDropdownOpen: () => combobox.updateSelectedOptionIndex("active"),
|
||||
});
|
||||
const selectedValues = useMemo(() => new Set(values), [values]);
|
||||
const migrationStartedRef = useRef(false);
|
||||
const legacyUrls = useMemo(() => {
|
||||
if (!Array.isArray(initialOptions.customUrls)) return [];
|
||||
return initialOptions.customUrls.filter((value): value is string => typeof value === "string");
|
||||
}, [initialOptions.customUrls]);
|
||||
|
||||
useEffect(() => {
|
||||
if (migrationStartedRef.current || legacyUrls.length === 0) return;
|
||||
|
||||
migrationStartedRef.current = true;
|
||||
const legacyItems = legacyUrls.flatMap((url) => createDirectBookmark(url) ?? []);
|
||||
migrateItems(legacyItems, { customUrls: [] });
|
||||
}, [legacyUrls, migrateItems]);
|
||||
|
||||
const normalizedSearch = search.trim().toLowerCase();
|
||||
const filteredApps = apps.filter((app) => {
|
||||
if (selectedValues.has(app.id)) return false;
|
||||
if (normalizedSearch.length === 0) return true;
|
||||
|
||||
return app.name.toLowerCase().includes(normalizedSearch) || app.href?.toLowerCase().includes(normalizedSearch);
|
||||
});
|
||||
const pendingUrl = createDirectBookmark(search);
|
||||
|
||||
const addUrls = (input: string) => {
|
||||
const nextValues = new Set(values);
|
||||
for (const value of splitBookmarkUrls(input)) {
|
||||
const item = createDirectBookmark(value);
|
||||
if (!item || nextValues.has(item.id)) continue;
|
||||
addItem(item);
|
||||
nextValues.add(item.id);
|
||||
}
|
||||
setSearch("");
|
||||
combobox.closeDropdown();
|
||||
};
|
||||
|
||||
const handleOptionSubmit = (value: string) => {
|
||||
if (value === createOptionValue) {
|
||||
addUrls(search);
|
||||
return;
|
||||
}
|
||||
|
||||
const app = apps.find((candidate) => candidate.id === value);
|
||||
if (app) addItem(app);
|
||||
setSearch("");
|
||||
};
|
||||
|
||||
const options = filteredApps.map((app) => (
|
||||
<Combobox.Option value={app.id} key={app.id}>
|
||||
<Group gap="sm" wrap="nowrap">
|
||||
<Avatar src={app.iconUrl} name={app.name} color="gray" size={28} radius="sm">
|
||||
<IconLink size={16} />
|
||||
</Avatar>
|
||||
<Stack gap={0} miw={0} flex={1}>
|
||||
<Text size="sm" fw={600} truncate>
|
||||
{app.name}
|
||||
</Text>
|
||||
<Text size="xs" c="dimmed" truncate>
|
||||
{app.href}
|
||||
</Text>
|
||||
</Stack>
|
||||
<IconPlus size={16} aria-hidden />
|
||||
</Group>
|
||||
</Combobox.Option>
|
||||
));
|
||||
|
||||
return (
|
||||
<Button onClick={() => openModal({ onSelect: addItem, presentAppIds: values })}>
|
||||
{t("widget.bookmarks.option.items.add")}
|
||||
</Button>
|
||||
<Combobox
|
||||
store={combobox}
|
||||
onOptionSubmit={handleOptionSubmit}
|
||||
position="bottom-start"
|
||||
middlewares={{ flip: true, shift: true }}
|
||||
styles={{
|
||||
dropdown: { overflow: "hidden" },
|
||||
option: { borderRadius: "var(--mantine-radius-sm)" },
|
||||
}}
|
||||
>
|
||||
<Combobox.DropdownTarget>
|
||||
<PillsInput
|
||||
label={t("label")}
|
||||
description={t("description")}
|
||||
error={error ? tCommon("error") : undefined}
|
||||
onClick={() => combobox.openDropdown()}
|
||||
leftSection={
|
||||
<ThemeIcon variant="light" size="sm" radius="xl">
|
||||
<IconLink size={14} />
|
||||
</ThemeIcon>
|
||||
}
|
||||
rightSection={isPending ? <Loader size="xs" /> : undefined}
|
||||
styles={{ input: { minHeight: 44 } }}
|
||||
>
|
||||
<Combobox.EventsTarget>
|
||||
<PillsInput.Field
|
||||
value={search}
|
||||
placeholder={t("placeholder")}
|
||||
onFocus={() => combobox.openDropdown()}
|
||||
onBlur={() => combobox.closeDropdown()}
|
||||
onChange={(event) => {
|
||||
setSearch(event.currentTarget.value);
|
||||
combobox.openDropdown();
|
||||
combobox.updateSelectedOptionIndex();
|
||||
}}
|
||||
onPaste={(event) => {
|
||||
const pastedValue = event.clipboardData.getData("text");
|
||||
if (splitBookmarkUrls(pastedValue).length < 2) return;
|
||||
event.preventDefault();
|
||||
addUrls(pastedValue);
|
||||
}}
|
||||
onKeyDown={(event) => {
|
||||
if (event.key !== "Enter") return;
|
||||
if (!pendingUrl) return;
|
||||
event.preventDefault();
|
||||
addUrls(search);
|
||||
}}
|
||||
/>
|
||||
</Combobox.EventsTarget>
|
||||
</PillsInput>
|
||||
</Combobox.DropdownTarget>
|
||||
|
||||
<Combobox.Dropdown>
|
||||
<ScrollArea.Autosize mah={280}>
|
||||
<Combobox.Options>
|
||||
{pendingUrl && !selectedValues.has(pendingUrl.id) ? (
|
||||
<Combobox.Option value={createOptionValue}>
|
||||
<Group gap="sm" wrap="nowrap">
|
||||
<Avatar src={getBookmarkFaviconUrl(pendingUrl.href)} size={28} radius="sm" color="gray">
|
||||
<IconLink size={16} />
|
||||
</Avatar>
|
||||
<Stack gap={0} miw={0} flex={1}>
|
||||
<Text size="sm" fw={600} truncate>
|
||||
{t("addUrl")}
|
||||
</Text>
|
||||
<Text size="xs" c="dimmed" truncate>
|
||||
{pendingUrl.href}
|
||||
</Text>
|
||||
</Stack>
|
||||
<IconCheck size={16} aria-hidden />
|
||||
</Group>
|
||||
</Combobox.Option>
|
||||
) : null}
|
||||
{options}
|
||||
{!pendingUrl && options.length === 0 ? <Combobox.Empty>{tSelect("notFound")}</Combobox.Empty> : null}
|
||||
</Combobox.Options>
|
||||
</ScrollArea.Autosize>
|
||||
<Combobox.Footer>
|
||||
<Text size="xs" c="dimmed">
|
||||
{t("hint")}
|
||||
</Text>
|
||||
</Combobox.Footer>
|
||||
</Combobox.Dropdown>
|
||||
</Combobox>
|
||||
);
|
||||
};
|
||||
@@ -1,109 +0,0 @@
|
||||
"use client";
|
||||
|
||||
import { memo, useState } from "react";
|
||||
import type { SelectProps } from "@mantine/core";
|
||||
import { Group, Loader, Select, Stack } from "@mantine/core";
|
||||
import { IconCheck } from "@tabler/icons-react";
|
||||
|
||||
import type { RouterOutputs } from "@homarr/api";
|
||||
import { clientApi } from "@homarr/api/client";
|
||||
import { useForm } from "@homarr/form";
|
||||
import { createModal, ModalFormFooter, modalSizeForm } from "@homarr/modals";
|
||||
import { useI18n } from "@homarr/translation/client";
|
||||
|
||||
interface InnerProps {
|
||||
presentAppIds: string[];
|
||||
onSelect: (props: RouterOutputs["app"]["selectable"][number]) => void | Promise<void>;
|
||||
confirmLabel?: string;
|
||||
}
|
||||
|
||||
interface AppSelectFormType {
|
||||
id: string;
|
||||
}
|
||||
|
||||
export const AppSelectModal = createModal<InnerProps>(({ actions, innerProps }) => {
|
||||
const t = useI18n();
|
||||
const { data: apps, isPending } = clientApi.app.selectable.useQuery();
|
||||
const [loading, setLoading] = useState(false);
|
||||
const form = useForm<AppSelectFormType>();
|
||||
const handleSubmitAsync = async (values: AppSelectFormType) => {
|
||||
const currentApp = apps?.find((app) => app.id === values.id);
|
||||
if (!currentApp) return;
|
||||
setLoading(true);
|
||||
await innerProps.onSelect(currentApp);
|
||||
|
||||
setLoading(false);
|
||||
actions.closeModal();
|
||||
};
|
||||
|
||||
const confirmLabel = innerProps.confirmLabel ?? t("common.action.add");
|
||||
const currentApp = apps?.find((app) => app.id === form.values.id);
|
||||
|
||||
return (
|
||||
<form onSubmit={form.onSubmit((values) => void handleSubmitAsync(values))}>
|
||||
<Stack>
|
||||
<Select
|
||||
{...form.getInputProps("id")}
|
||||
label={t("app.action.select.label")}
|
||||
searchable
|
||||
clearable
|
||||
data-autofocus
|
||||
leftSection={<MemoizedLeftSection isPending={isPending} currentApp={currentApp} />}
|
||||
nothingFoundMessage={t("app.action.select.notFound")}
|
||||
renderOption={renderSelectOption}
|
||||
limit={5}
|
||||
data={
|
||||
apps
|
||||
?.filter((app) => !innerProps.presentAppIds.includes(app.id))
|
||||
.map((app) => ({
|
||||
label: app.name,
|
||||
value: app.id,
|
||||
iconUrl: app.iconUrl,
|
||||
})) ?? []
|
||||
}
|
||||
/>
|
||||
<ModalFormFooter onCancel={actions.closeModal} submitLabel={confirmLabel} loading={loading} />
|
||||
</Stack>
|
||||
</form>
|
||||
);
|
||||
}).withOptions({
|
||||
defaultTitle: (t) => t("app.action.select.label"),
|
||||
size: modalSizeForm,
|
||||
});
|
||||
|
||||
const iconProps = {
|
||||
stroke: 1.5,
|
||||
color: "currentColor",
|
||||
opacity: 0.6,
|
||||
size: 18,
|
||||
};
|
||||
|
||||
const renderSelectOption: SelectProps["renderOption"] = ({ option, checked }) => (
|
||||
<Group flex="1" gap="xs">
|
||||
{"iconUrl" in option && typeof option.iconUrl === "string" ? (
|
||||
<img width={20} height={20} src={option.iconUrl} alt={option.label} />
|
||||
) : null}
|
||||
{option.label}
|
||||
{checked && <IconCheck style={{ marginInlineStart: "auto" }} {...iconProps} />}
|
||||
</Group>
|
||||
);
|
||||
|
||||
interface LeftSectionProps {
|
||||
isPending: boolean;
|
||||
currentApp: RouterOutputs["app"]["selectable"][number] | undefined;
|
||||
}
|
||||
|
||||
const size = 20;
|
||||
const LeftSection = ({ isPending, currentApp }: LeftSectionProps) => {
|
||||
if (isPending) {
|
||||
return <Loader size={size} />;
|
||||
}
|
||||
|
||||
if (currentApp) {
|
||||
return <img width={size} height={size} src={currentApp.iconUrl} alt={currentApp.name} />;
|
||||
}
|
||||
|
||||
return null;
|
||||
};
|
||||
|
||||
const MemoizedLeftSection = memo(LeftSection);
|
||||
@@ -0,0 +1,66 @@
|
||||
import { getSafeApplicationUrl } from "../common/application-url";
|
||||
|
||||
export const directBookmarkPrefix = "url:";
|
||||
|
||||
export interface BookmarkItem {
|
||||
id: string;
|
||||
name: string;
|
||||
description: string | null;
|
||||
iconUrl?: string;
|
||||
href: string | null;
|
||||
}
|
||||
|
||||
export const normalizeBookmarkUrl = (value: string): string | undefined => {
|
||||
const trimmedValue = value.trim();
|
||||
if (trimmedValue.length === 0) return undefined;
|
||||
|
||||
const directUrl = getSafeApplicationUrl(trimmedValue);
|
||||
if (directUrl) return directUrl;
|
||||
|
||||
if (/^(?:localhost(?::\d+)?|(?:[\w-]+\.)+[\w-]+(?::\d+)?)(?:[/?#].*)?$/i.test(trimmedValue)) {
|
||||
return getSafeApplicationUrl(`https://${trimmedValue}`);
|
||||
}
|
||||
|
||||
return undefined;
|
||||
};
|
||||
|
||||
export const getDirectBookmarkValue = (url: string) => `${directBookmarkPrefix}${url}`;
|
||||
|
||||
export const getDirectBookmarkUrl = (value: string): string | undefined => {
|
||||
if (!value.startsWith(directBookmarkPrefix)) return undefined;
|
||||
return normalizeBookmarkUrl(value.slice(directBookmarkPrefix.length));
|
||||
};
|
||||
|
||||
export const getBookmarkFaviconUrl = (href: string | null): string | undefined => {
|
||||
const safeUrl = getSafeApplicationUrl(href);
|
||||
if (!safeUrl) return undefined;
|
||||
|
||||
const url = new URL(safeUrl);
|
||||
return `${url.origin}/favicon.ico`;
|
||||
};
|
||||
|
||||
export const createDirectBookmark = (url: string): BookmarkItem | undefined => {
|
||||
const href = normalizeBookmarkUrl(url);
|
||||
if (!href) return undefined;
|
||||
|
||||
const parsedUrl = new URL(href);
|
||||
return {
|
||||
id: getDirectBookmarkValue(href),
|
||||
name: parsedUrl.hostname,
|
||||
description: null,
|
||||
href,
|
||||
};
|
||||
};
|
||||
|
||||
export const splitBookmarkUrls = (value: string) =>
|
||||
value.split(/\r?\n+/).flatMap((line) => {
|
||||
const trimmedLine = line.trim();
|
||||
if (trimmedLine.length === 0) return [];
|
||||
|
||||
const commaSeparatedValues = trimmedLine.split(",").map((part) => part.trim());
|
||||
if (commaSeparatedValues.length > 1 && commaSeparatedValues.every((part) => normalizeBookmarkUrl(part))) {
|
||||
return commaSeparatedValues;
|
||||
}
|
||||
|
||||
return [trimmedLine];
|
||||
});
|
||||
@@ -1,15 +0,0 @@
|
||||
.card:hover {
|
||||
background-color: var(--mantine-color-primaryColor-light-hover);
|
||||
}
|
||||
|
||||
[data-mantine-color-scheme="light"] .card-grid {
|
||||
background-color: var(--mantine-color-gray-1);
|
||||
}
|
||||
|
||||
[data-mantine-color-scheme="dark"] .card-grid {
|
||||
background-color: var(--mantine-color-dark-7);
|
||||
}
|
||||
|
||||
.card:hover > div > div.bookmarkIcon {
|
||||
background-color: var(--mantine-color-iconColor-filled-hover);
|
||||
}
|
||||
@@ -0,0 +1,427 @@
|
||||
"use client";
|
||||
|
||||
import type { CSSProperties } from "react";
|
||||
import { useMemo, useState } from "react";
|
||||
import {
|
||||
Avatar,
|
||||
Box,
|
||||
Card,
|
||||
Center,
|
||||
Grid,
|
||||
Group,
|
||||
ScrollArea,
|
||||
SimpleGrid,
|
||||
Stack,
|
||||
Text,
|
||||
ThemeIcon,
|
||||
Tooltip,
|
||||
} from "@mantine/core";
|
||||
import { useReducedMotion } from "@mantine/hooks";
|
||||
import { IconArrowUpRight, IconBookmark, IconLink } from "@tabler/icons-react";
|
||||
|
||||
import { clientApi } from "@homarr/api/client";
|
||||
import { useRequiredBoard } from "@homarr/boards/context";
|
||||
import { useRegisterSpotlightContextResults } from "@homarr/spotlight";
|
||||
import { useI18n } from "@homarr/translation/client";
|
||||
import { iconSizes, zoomCompensatedSize } from "@homarr/ui";
|
||||
|
||||
import { getSafeAppHref, SAFE_NEW_TAB_REL } from "../common/application-url";
|
||||
import { getUsableWidgetQueryData, isInitialWidgetQueryPending } from "../common/query-state";
|
||||
import { WidgetQueryLoadingState } from "../common/query-state-indicator";
|
||||
import type { WidgetComponentProps } from "../definition";
|
||||
import { createDirectBookmark, getBookmarkFaviconUrl, getDirectBookmarkUrl } from "./bookmark-item";
|
||||
import type { BookmarkItem } from "./bookmark-item";
|
||||
import { getBookmarkCardDisplay, getBookmarkDisplayPlan } from "./layout";
|
||||
import type { BookmarkOrientation } from "./layout";
|
||||
|
||||
type BookmarkVariant = WidgetComponentProps<"bookmarks">["options"]["variant"];
|
||||
|
||||
export default function BookmarksWidget({
|
||||
options,
|
||||
itemId,
|
||||
width,
|
||||
height,
|
||||
displayMode,
|
||||
displayScale = 1,
|
||||
}: WidgetComponentProps<"bookmarks">) {
|
||||
const t = useI18n("widget.bookmarks");
|
||||
const board = useRequiredBoard();
|
||||
const advanced = displayMode === "advanced";
|
||||
const appIds = useMemo(() => options.items.filter((value) => !getDirectBookmarkUrl(value)), [options.items]);
|
||||
const appsQuery = clientApi.app.byIds.useQuery(appIds, {
|
||||
select(selectedApps) {
|
||||
return selectedApps;
|
||||
},
|
||||
});
|
||||
const apps = getUsableWidgetQueryData(appsQuery) ?? [];
|
||||
const appsById = new Map(apps.map((app) => [app.id, app]));
|
||||
const configuredItems = options.items.flatMap((value) => {
|
||||
const directUrl = getDirectBookmarkUrl(value);
|
||||
if (directUrl) return createDirectBookmark(directUrl) ?? [];
|
||||
return appsById.get(value) ?? [];
|
||||
});
|
||||
const configuredHrefs = new Set(configuredItems.map((item) => item.href));
|
||||
const legacyItems = options.customUrls.flatMap((url) => {
|
||||
const item = createDirectBookmark(url);
|
||||
if (!item || configuredHrefs.has(item.href)) return [];
|
||||
return [item];
|
||||
});
|
||||
const data = [...configuredItems, ...legacyItems];
|
||||
|
||||
let responsiveWidth = width;
|
||||
let responsiveHeight = height;
|
||||
if (!advanced && Number.isFinite(displayScale) && displayScale > 0) {
|
||||
responsiveWidth *= displayScale;
|
||||
responsiveHeight *= displayScale;
|
||||
}
|
||||
const showTitle = options.showTitle && options.title.length > 0;
|
||||
let titleHeight = 0;
|
||||
if (showTitle) {
|
||||
// Preserve the existing header allowance at 11px and account for the selected line height.
|
||||
titleHeight = 36 + (options.titleSize - 11) * 1.2;
|
||||
}
|
||||
const contentHeight = Math.max(0, responsiveHeight - titleHeight);
|
||||
let layoutWidth = responsiveWidth;
|
||||
if (options.layout === "gridHorizontal") layoutWidth = width;
|
||||
|
||||
useRegisterSpotlightContextResults(
|
||||
`bookmark-${itemId}`,
|
||||
data.flatMap((bookmark) => {
|
||||
const href = getSafeAppHref(bookmark.href);
|
||||
if (!href) return [];
|
||||
|
||||
return [
|
||||
{
|
||||
id: bookmark.id,
|
||||
dedupeKey: appsById.has(bookmark.id) ? `app:${bookmark.id}` : undefined,
|
||||
name: bookmark.name,
|
||||
icon: bookmark.iconUrl ?? IconLink,
|
||||
interaction() {
|
||||
return {
|
||||
type: "link" as const,
|
||||
href,
|
||||
newTab: false,
|
||||
};
|
||||
},
|
||||
},
|
||||
];
|
||||
}),
|
||||
[data],
|
||||
);
|
||||
|
||||
const plan = useMemo(
|
||||
() =>
|
||||
getBookmarkDisplayPlan({
|
||||
advanced,
|
||||
gap: bookmarkSpacingPixels[options.spacing],
|
||||
height: contentHeight,
|
||||
itemCount: data.length,
|
||||
layout: options.layout,
|
||||
width: layoutWidth,
|
||||
}),
|
||||
[advanced, contentHeight, data.length, layoutWidth, options.layout, options.spacing],
|
||||
);
|
||||
|
||||
const cardDisplay = getBookmarkCardDisplay({
|
||||
advanced,
|
||||
hideHostname: options.hideHostname,
|
||||
hideIcon: options.hideIcon,
|
||||
hideTitle: options.hideTitle,
|
||||
plan,
|
||||
});
|
||||
|
||||
const cards = data.map((bookmark) => (
|
||||
<BookmarkCard
|
||||
key={bookmark.id}
|
||||
bookmark={bookmark}
|
||||
advanced={advanced}
|
||||
orientation={cardDisplay.orientation}
|
||||
showHostname={cardDisplay.showHostname}
|
||||
showIcon={cardDisplay.showIcon}
|
||||
showTitle={cardDisplay.showTitle}
|
||||
openNewTab={options.openNewTab}
|
||||
variant={options.variant}
|
||||
withBorder={options.withBorder}
|
||||
radius={board.itemRadius}
|
||||
height={plan.itemHeight}
|
||||
width={plan.horizontalScroll ? plan.itemWidth : undefined}
|
||||
/>
|
||||
));
|
||||
|
||||
if (appIds.length > 0 && isInitialWidgetQueryPending(appsQuery)) return <WidgetQueryLoadingState />;
|
||||
|
||||
const isTight = responsiveHeight < 120;
|
||||
let compactStyle: CSSProperties | undefined;
|
||||
if (!advanced && Number.isFinite(displayScale) && displayScale > 1) {
|
||||
// Low-column boards zoom the canvas above 100%. Keep bookmark controls at their intended physical size.
|
||||
// The spacing and font tokens are rebound here because their inherited values resolve at the canvas level.
|
||||
compactStyle = {
|
||||
"--board-canvas-ui-scale": 1 / displayScale,
|
||||
"--mantine-scale": 1 / displayScale,
|
||||
"--mantine-font-size-xxs": "calc(0.6875rem * var(--board-canvas-ui-scale))",
|
||||
"--mantine-spacing-sm": "calc(0.75rem * var(--board-canvas-ui-scale))",
|
||||
"--mantine-spacing-xs": "calc(0.625rem * var(--board-canvas-ui-scale))",
|
||||
} as CSSProperties;
|
||||
}
|
||||
|
||||
return (
|
||||
<Stack h="100%" mih={0} gap={isTight ? 6 : "sm"} p={isTight ? 6 : "sm"} style={compactStyle}>
|
||||
{showTitle && (
|
||||
<Text fz={options.titleSize} fw={600} px={2} lh={1.2} lineClamp={1} style={{ flexShrink: 0 }}>
|
||||
{options.title}
|
||||
</Text>
|
||||
)}
|
||||
|
||||
{data.length === 0 ? (
|
||||
<Center flex={1}>
|
||||
<Stack align="center" gap={6}>
|
||||
<ThemeIcon variant="light" size="lg" radius="xl">
|
||||
<IconBookmark style={iconSizes.xl} />
|
||||
</ThemeIcon>
|
||||
<Text size="sm" c="dimmed" ta="center">
|
||||
{t("empty")}
|
||||
</Text>
|
||||
</Stack>
|
||||
</Center>
|
||||
) : (
|
||||
<ScrollArea
|
||||
scrollbars={plan.horizontalScroll ? "x" : "y"}
|
||||
style={{ flex: 1, minHeight: 0 }}
|
||||
styles={{ content: { height: "100%" } }}
|
||||
>
|
||||
<Box miw="100%" h="100%" pb={2}>
|
||||
{plan.horizontalScroll ? (
|
||||
<Group gap={plan.itemGap} wrap="nowrap" h="100%" align="center">
|
||||
{cards}
|
||||
</Group>
|
||||
) : options.grow ? (
|
||||
<Grid grow columns={plan.columns} gap={plan.itemGap}>
|
||||
{cards.map((card) => (
|
||||
<Grid.Col key={card.key} span={1}>
|
||||
{card}
|
||||
</Grid.Col>
|
||||
))}
|
||||
</Grid>
|
||||
) : (
|
||||
<SimpleGrid cols={plan.columns} spacing={plan.itemGap} verticalSpacing={plan.itemGap}>
|
||||
{cards}
|
||||
</SimpleGrid>
|
||||
)}
|
||||
</Box>
|
||||
</ScrollArea>
|
||||
)}
|
||||
</Stack>
|
||||
);
|
||||
}
|
||||
|
||||
interface BookmarkCardProps {
|
||||
advanced: boolean;
|
||||
bookmark: BookmarkItem;
|
||||
height: number;
|
||||
openNewTab: boolean;
|
||||
orientation: BookmarkOrientation;
|
||||
radius: string;
|
||||
showHostname: boolean;
|
||||
showIcon: boolean;
|
||||
showTitle: boolean;
|
||||
variant: BookmarkVariant;
|
||||
width?: number;
|
||||
withBorder: boolean;
|
||||
}
|
||||
|
||||
const BookmarkCard = ({
|
||||
advanced,
|
||||
bookmark,
|
||||
height,
|
||||
openNewTab,
|
||||
orientation,
|
||||
radius,
|
||||
showHostname,
|
||||
showIcon,
|
||||
showTitle,
|
||||
variant,
|
||||
width,
|
||||
withBorder,
|
||||
}: BookmarkCardProps) => {
|
||||
const [active, setActive] = useState(false);
|
||||
const reduceMotion = useReducedMotion();
|
||||
const href = getSafeAppHref(bookmark.href);
|
||||
const hostname = bookmark.href ? getBookmarkHostname(bookmark.href) : undefined;
|
||||
const iconUrl = bookmark.iconUrl ?? getBookmarkFaviconUrl(bookmark.href);
|
||||
const iconOnly = orientation === "icon" || (!showTitle && !showHostname);
|
||||
const background = getBookmarkBackground(variant, active);
|
||||
const isUltraDense = height <= 32;
|
||||
const isDense = height <= 48;
|
||||
let avatarSize = 30;
|
||||
if (isDense) avatarSize = 28;
|
||||
if (isUltraDense) avatarSize = 20;
|
||||
if (iconOnly && !isDense) avatarSize = 32;
|
||||
if (advanced) avatarSize = 42;
|
||||
let padding: number | "xs" | "md" = "xs";
|
||||
if (isDense || iconOnly) padding = 6;
|
||||
if (isUltraDense) padding = 4;
|
||||
if (advanced) padding = "md";
|
||||
|
||||
const content =
|
||||
orientation === "vertical" && !advanced ? (
|
||||
<Stack h="100%" align="center" justify="center" gap={6} flex={1}>
|
||||
{showIcon ? <BookmarkAvatar bookmark={bookmark} iconUrl={iconUrl} size={iconOnly ? 34 : 38} /> : null}
|
||||
{showTitle ? (
|
||||
<Text size="xxs" fw={600} lh={1.2} ta="center" lineClamp={2}>
|
||||
{bookmark.name}
|
||||
</Text>
|
||||
) : null}
|
||||
{showHostname ? (
|
||||
<Text fz={9} c="dimmed" ta="center" truncate w="100%">
|
||||
{hostname}
|
||||
</Text>
|
||||
) : null}
|
||||
</Stack>
|
||||
) : (
|
||||
<Group
|
||||
h="100%"
|
||||
gap={advanced ? "sm" : "xs"}
|
||||
wrap="nowrap"
|
||||
justify={iconOnly ? "center" : "flex-start"}
|
||||
align="center"
|
||||
flex={1}
|
||||
>
|
||||
{showIcon ? <BookmarkAvatar bookmark={bookmark} iconUrl={iconUrl} size={avatarSize} /> : null}
|
||||
{!iconOnly ? (
|
||||
<Stack gap={advanced ? 3 : 0} miw={0} flex={1}>
|
||||
{showTitle ? (
|
||||
<Text size={advanced ? "xs" : "xxs"} fw={600} lh={1.2} truncate>
|
||||
{bookmark.name}
|
||||
</Text>
|
||||
) : null}
|
||||
{showHostname ? (
|
||||
<Text fz={advanced ? 10 : 9} c="dimmed" truncate>
|
||||
{hostname}
|
||||
</Text>
|
||||
) : null}
|
||||
{advanced && bookmark.description ? (
|
||||
<Text fz={10} c="dimmed" lineClamp={2}>
|
||||
{bookmark.description}
|
||||
</Text>
|
||||
) : null}
|
||||
</Stack>
|
||||
) : null}
|
||||
{advanced ? (
|
||||
<ThemeIcon
|
||||
variant={active ? "light" : "transparent"}
|
||||
color={active ? "primaryColor" : "gray"}
|
||||
size="sm"
|
||||
radius="xl"
|
||||
style={{
|
||||
opacity: active ? 1 : 0.45,
|
||||
transform: active && !reduceMotion ? "translate(1px, -1px)" : undefined,
|
||||
transition: reduceMotion ? undefined : "opacity 120ms ease, transform 120ms ease",
|
||||
}}
|
||||
>
|
||||
<IconArrowUpRight style={iconSizes.sm} />
|
||||
</ThemeIcon>
|
||||
) : null}
|
||||
</Group>
|
||||
);
|
||||
|
||||
return (
|
||||
<Tooltip
|
||||
label={
|
||||
<Stack gap={0}>
|
||||
<Text size="xs" fw={600}>
|
||||
{bookmark.name}
|
||||
</Text>
|
||||
{hostname ? (
|
||||
<Text size="xs" opacity={0.8}>
|
||||
{hostname}
|
||||
</Text>
|
||||
) : null}
|
||||
</Stack>
|
||||
}
|
||||
openDelay={450}
|
||||
disabled={advanced}
|
||||
withArrow
|
||||
>
|
||||
<Card
|
||||
component={href ? "a" : "div"}
|
||||
href={href}
|
||||
target={href ? (openNewTab ? "_blank" : "_self") : undefined}
|
||||
rel={href && openNewTab ? SAFE_NEW_TAB_REL : undefined}
|
||||
aria-label={bookmark.name}
|
||||
radius={radius}
|
||||
withBorder={withBorder || variant === "outline"}
|
||||
p={padding}
|
||||
h={height}
|
||||
w={width}
|
||||
miw={width}
|
||||
onMouseEnter={() => setActive(true)}
|
||||
onMouseLeave={() => setActive(false)}
|
||||
onFocus={() => setActive(true)}
|
||||
onBlur={() => setActive(false)}
|
||||
styles={{
|
||||
root: {
|
||||
background,
|
||||
borderColor: active
|
||||
? "rgb(from var(--mantine-primary-color-filled) r g b / calc(var(--opacity, 1) * 0.62))"
|
||||
: "rgb(from var(--mantine-color-secondaryColor-filled) r g b / calc(var(--opacity, 1) * 0.38))",
|
||||
boxShadow: active ? "var(--mantine-shadow-sm)" : undefined,
|
||||
color: "var(--mantine-color-text)",
|
||||
cursor: href ? "pointer" : "default",
|
||||
display: "flex",
|
||||
outline: active ? "2px solid var(--mantine-primary-color-light)" : undefined,
|
||||
outlineOffset: -2,
|
||||
overflow: "hidden",
|
||||
textDecoration: "none",
|
||||
transform: active && !reduceMotion ? "translateY(-1px)" : undefined,
|
||||
transition: reduceMotion
|
||||
? undefined
|
||||
: "background-color 120ms ease, border-color 120ms ease, box-shadow 120ms ease, transform 120ms ease",
|
||||
},
|
||||
}}
|
||||
>
|
||||
{content}
|
||||
</Card>
|
||||
</Tooltip>
|
||||
);
|
||||
};
|
||||
|
||||
const BookmarkAvatar = ({ bookmark, iconUrl, size }: { bookmark: BookmarkItem; iconUrl?: string; size: number }) => (
|
||||
<Avatar
|
||||
src={iconUrl}
|
||||
name={bookmark.name}
|
||||
color="gray"
|
||||
radius="sm"
|
||||
size={size}
|
||||
imageProps={{ referrerPolicy: "no-referrer" }}
|
||||
styles={{ image: { objectFit: "contain" } }}
|
||||
>
|
||||
<IconLink style={zoomCompensatedSize(Math.max(14, size / 2))} />
|
||||
</Avatar>
|
||||
);
|
||||
|
||||
const getBookmarkBackground = (variant: BookmarkVariant, active: boolean): string => {
|
||||
if (variant === "plain" || variant === "outline") return "transparent";
|
||||
if (variant === "filled") {
|
||||
const opacity = active ? 0.64 : 0.48;
|
||||
return `rgb(from var(--mantine-color-default-hover) r g b / calc(var(--opacity, 1) * ${opacity}))`;
|
||||
}
|
||||
|
||||
const opacity = active ? 0.14 : 0.08;
|
||||
return `rgb(from var(--mantine-primary-color-filled) r g b / calc(var(--opacity, 1) * ${opacity}))`;
|
||||
};
|
||||
|
||||
const getBookmarkHostname = (href: string): string | undefined => {
|
||||
try {
|
||||
return new URL(href).hostname || undefined;
|
||||
} catch {
|
||||
return undefined;
|
||||
}
|
||||
};
|
||||
|
||||
const bookmarkSpacingPixels = {
|
||||
xs: 10,
|
||||
sm: 12,
|
||||
md: 16,
|
||||
lg: 20,
|
||||
xl: 32,
|
||||
} as const;
|
||||
@@ -1,305 +1,3 @@
|
||||
"use client";
|
||||
|
||||
import { Anchor, Card, Flex, Group, Stack, Text, Title, UnstyledButton } from "@mantine/core";
|
||||
import combineClasses from "clsx";
|
||||
|
||||
import type { RouterOutputs } from "@homarr/api";
|
||||
import { clientApi } from "@homarr/api/client";
|
||||
import { useRequiredBoard } from "@homarr/boards/context";
|
||||
import { useRegisterSpotlightContextResults } from "@homarr/spotlight";
|
||||
import { MaskedOrNormalImage } from "@homarr/ui";
|
||||
|
||||
import type { WidgetComponentProps } from "../definition";
|
||||
import classes from "./bookmark.module.css";
|
||||
|
||||
export default function BookmarksWidget({ options, itemId }: WidgetComponentProps<"bookmarks">) {
|
||||
const board = useRequiredBoard();
|
||||
const { data = [] } = clientApi.app.byIds.useQuery(options.items, {
|
||||
select(data) {
|
||||
return data.toSorted((appA, appB) => options.items.indexOf(appA.id) - options.items.indexOf(appB.id));
|
||||
},
|
||||
});
|
||||
|
||||
useRegisterSpotlightContextResults(
|
||||
`bookmark-${itemId}`,
|
||||
data
|
||||
.filter((app) => app.href !== null)
|
||||
.map((app) => ({
|
||||
id: app.id,
|
||||
name: app.name,
|
||||
icon: app.iconUrl,
|
||||
interaction() {
|
||||
return {
|
||||
type: "link",
|
||||
// We checked above that app.href is defined
|
||||
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
||||
href: app.href!,
|
||||
newTab: false,
|
||||
};
|
||||
},
|
||||
})),
|
||||
[data],
|
||||
);
|
||||
|
||||
return (
|
||||
<Stack h="100%" gap="sm" p="sm">
|
||||
{options.title.length > 0 && (
|
||||
<Title order={4} px="0.25rem">
|
||||
{options.title}
|
||||
</Title>
|
||||
)}
|
||||
{(options.layout === "grid" || options.layout === "gridHorizontal") && (
|
||||
<GridLayout
|
||||
data={data}
|
||||
itemDirection={options.layout === "gridHorizontal" ? "horizontal" : "vertical"}
|
||||
hideTitle={options.hideTitle}
|
||||
hideIcon={options.hideIcon}
|
||||
hideHostname={options.hideHostname}
|
||||
openNewTab={options.openNewTab}
|
||||
withBorder={options.withBorder}
|
||||
hasIconColor={board.iconColor !== null}
|
||||
/>
|
||||
)}
|
||||
{options.layout !== "grid" && options.layout !== "gridHorizontal" && (
|
||||
<FlexLayout
|
||||
data={data}
|
||||
direction={options.layout}
|
||||
hideTitle={options.hideTitle}
|
||||
hideIcon={options.hideIcon}
|
||||
hideHostname={options.hideHostname}
|
||||
openNewTab={options.openNewTab}
|
||||
withBorder={options.withBorder}
|
||||
hasIconColor={board.iconColor !== null}
|
||||
/>
|
||||
)}
|
||||
</Stack>
|
||||
);
|
||||
}
|
||||
|
||||
interface FlexLayoutProps {
|
||||
data: RouterOutputs["app"]["byIds"];
|
||||
direction: "row" | "column";
|
||||
hideTitle: boolean;
|
||||
hideIcon: boolean;
|
||||
hideHostname: boolean;
|
||||
openNewTab: boolean;
|
||||
withBorder: boolean;
|
||||
hasIconColor: boolean;
|
||||
}
|
||||
|
||||
const FlexLayout = ({
|
||||
data,
|
||||
direction,
|
||||
hideTitle,
|
||||
hideIcon,
|
||||
hideHostname,
|
||||
openNewTab,
|
||||
withBorder,
|
||||
hasIconColor,
|
||||
}: FlexLayoutProps) => {
|
||||
const board = useRequiredBoard();
|
||||
return (
|
||||
<Flex direction={direction} gap="0" w="100%">
|
||||
{data.map((app) => (
|
||||
<div key={app.id} style={{ display: "flex", flex: "1", flexDirection: direction }}>
|
||||
<UnstyledButton
|
||||
component="a"
|
||||
href={app.href ?? undefined}
|
||||
target={openNewTab ? "_blank" : "_self"}
|
||||
rel="noopener noreferrer"
|
||||
key={app.id}
|
||||
w="100%"
|
||||
>
|
||||
<Card
|
||||
radius={board.itemRadius}
|
||||
className={classes.card}
|
||||
w="100%"
|
||||
display="flex"
|
||||
p={4}
|
||||
h="100%"
|
||||
withBorder={withBorder}
|
||||
>
|
||||
{direction === "row" ? (
|
||||
<VerticalItem
|
||||
app={app}
|
||||
hideTitle={hideTitle}
|
||||
hideIcon={hideIcon}
|
||||
hideHostname={hideHostname}
|
||||
hasIconColor={hasIconColor}
|
||||
/>
|
||||
) : (
|
||||
<HorizontalItem
|
||||
app={app}
|
||||
hideTitle={hideTitle}
|
||||
hideIcon={hideIcon}
|
||||
hideHostname={hideHostname}
|
||||
hasIconColor={hasIconColor}
|
||||
/>
|
||||
)}
|
||||
</Card>
|
||||
</UnstyledButton>
|
||||
</div>
|
||||
))}
|
||||
</Flex>
|
||||
);
|
||||
};
|
||||
|
||||
interface GridLayoutProps {
|
||||
data: RouterOutputs["app"]["byIds"];
|
||||
hideTitle: boolean;
|
||||
hideIcon: boolean;
|
||||
hideHostname: boolean;
|
||||
openNewTab: boolean;
|
||||
withBorder: boolean;
|
||||
itemDirection: "horizontal" | "vertical";
|
||||
hasIconColor: boolean;
|
||||
}
|
||||
|
||||
const GridLayout = ({
|
||||
data,
|
||||
hideTitle,
|
||||
hideIcon,
|
||||
hideHostname,
|
||||
openNewTab,
|
||||
withBorder,
|
||||
itemDirection,
|
||||
hasIconColor,
|
||||
}: GridLayoutProps) => {
|
||||
const board = useRequiredBoard();
|
||||
|
||||
return (
|
||||
<Flex miw="100%" gap={4} wrap="wrap" style={{ flex: 1 }}>
|
||||
{data.map((app) => (
|
||||
<UnstyledButton
|
||||
component="a"
|
||||
href={app.href ?? undefined}
|
||||
target={openNewTab ? "_blank" : "_self"}
|
||||
rel="noopener noreferrer"
|
||||
key={app.id}
|
||||
flex="1"
|
||||
>
|
||||
<Card
|
||||
h="100%"
|
||||
className={combineClasses(classes.card, classes["card-grid"])}
|
||||
radius={board.itemRadius}
|
||||
withBorder={withBorder}
|
||||
p="xs"
|
||||
>
|
||||
{itemDirection === "horizontal" ? (
|
||||
<HorizontalItem
|
||||
app={app}
|
||||
hideTitle={hideTitle}
|
||||
hideIcon={hideIcon}
|
||||
hideHostname={hideHostname}
|
||||
hasIconColor={hasIconColor}
|
||||
/>
|
||||
) : (
|
||||
<VerticalItem
|
||||
app={app}
|
||||
hideTitle={hideTitle}
|
||||
hideIcon={hideIcon}
|
||||
hideHostname={hideHostname}
|
||||
hasIconColor={hasIconColor}
|
||||
/>
|
||||
)}
|
||||
</Card>
|
||||
</UnstyledButton>
|
||||
))}
|
||||
</Flex>
|
||||
);
|
||||
};
|
||||
|
||||
const VerticalItem = ({
|
||||
app,
|
||||
hideTitle,
|
||||
hideIcon,
|
||||
hideHostname,
|
||||
hasIconColor,
|
||||
}: {
|
||||
app: RouterOutputs["app"]["byIds"][number];
|
||||
hideTitle: boolean;
|
||||
hideIcon: boolean;
|
||||
hideHostname: boolean;
|
||||
hasIconColor: boolean;
|
||||
}) => {
|
||||
return (
|
||||
<Stack h="100%" miw={16} gap="sm" justify={"center"}>
|
||||
{!hideTitle && (
|
||||
<Text fw={700} ta="center" size="xs">
|
||||
{app.name}
|
||||
</Text>
|
||||
)}
|
||||
{!hideIcon && (
|
||||
<MaskedOrNormalImage
|
||||
imageUrl={app.iconUrl}
|
||||
hasColor={hasIconColor}
|
||||
alt={app.name}
|
||||
className={classes.bookmarkIcon}
|
||||
style={{
|
||||
width: hideHostname && hideTitle ? "min(max(100%, 16px), 40px)" : 40,
|
||||
height: hideHostname && hideTitle ? "min(max(100%, 16px), 40px)" : 40,
|
||||
overflow: "auto",
|
||||
flex: "unset",
|
||||
marginLeft: "auto",
|
||||
marginRight: "auto",
|
||||
}}
|
||||
/>
|
||||
)}
|
||||
{!hideHostname && (
|
||||
<Anchor ta="center" component="span" size="xs">
|
||||
{app.href ? new URL(app.href).hostname : undefined}
|
||||
</Anchor>
|
||||
)}
|
||||
</Stack>
|
||||
);
|
||||
};
|
||||
|
||||
const HorizontalItem = ({
|
||||
app,
|
||||
hideTitle,
|
||||
hideIcon,
|
||||
hideHostname,
|
||||
hasIconColor,
|
||||
}: {
|
||||
app: RouterOutputs["app"]["byIds"][number];
|
||||
hideTitle: boolean;
|
||||
hideIcon: boolean;
|
||||
hideHostname: boolean;
|
||||
hasIconColor: boolean;
|
||||
}) => {
|
||||
return (
|
||||
<Group wrap="nowrap" gap="xs" h="100%" justify="start">
|
||||
{!hideIcon && (
|
||||
<MaskedOrNormalImage
|
||||
imageUrl={app.iconUrl}
|
||||
hasColor={hasIconColor}
|
||||
alt={app.name}
|
||||
className={classes.bookmarkIcon}
|
||||
style={{
|
||||
overflow: "auto",
|
||||
width: hideHostname ? 16 : 24,
|
||||
height: hideHostname ? 16 : 24,
|
||||
flex: "unset",
|
||||
}}
|
||||
/>
|
||||
)}
|
||||
{!(hideTitle && hideHostname) && (
|
||||
<>
|
||||
<Stack justify="space-between" gap={0}>
|
||||
{!hideTitle && (
|
||||
<Text fw={700} size="xs" lineClamp={hideHostname ? 2 : 1}>
|
||||
{app.name}
|
||||
</Text>
|
||||
)}
|
||||
|
||||
{!hideHostname && (
|
||||
<Anchor component="span" size="xs">
|
||||
{app.href ? new URL(app.href).hostname : undefined}
|
||||
</Anchor>
|
||||
)}
|
||||
</Stack>
|
||||
</>
|
||||
)}
|
||||
</Group>
|
||||
);
|
||||
};
|
||||
export { default } from "./bookmarks-widget";
|
||||
@@ -1,48 +1,88 @@
|
||||
import { ActionIcon, Avatar, Group, Stack, Text } from "@mantine/core";
|
||||
import { IconBookmark, IconX } from "@tabler/icons-react";
|
||||
import { IconBookmark, IconLink, IconX } from "@tabler/icons-react";
|
||||
import { z } from "zod/v4";
|
||||
|
||||
import type { RouterOutputs } from "@homarr/api";
|
||||
import { clientApi } from "@homarr/api/client";
|
||||
|
||||
import { createWidgetDefinition } from "../definition";
|
||||
import { optionsBuilder } from "../options";
|
||||
import { BookmarkAddButton } from "./add-button";
|
||||
import type { BookmarkSelectionItem } from "./add-button";
|
||||
import { createDirectBookmark, getBookmarkFaviconUrl, getDirectBookmarkUrl } from "./bookmark-item";
|
||||
|
||||
export const { definition, componentLoader } = createWidgetDefinition("bookmarks", {
|
||||
icon: IconBookmark,
|
||||
queryKeys: [[["app", "byIds"]]],
|
||||
supportsAdvancedFocus: true,
|
||||
queryKey: [["app", "byIds"]],
|
||||
createOptions() {
|
||||
return optionsBuilder.from((factory) => ({
|
||||
title: factory.text(),
|
||||
showTitle: factory.switch({ defaultValue: true }),
|
||||
titleSize: factory.slider({
|
||||
defaultValue: 11,
|
||||
validate: z.number().min(8).max(32),
|
||||
step: 1,
|
||||
}),
|
||||
layout: factory.select({
|
||||
options: (["grid", "gridHorizontal", "row", "column"] as const).map((value) => ({
|
||||
options: (["adaptive", "column", "row", "grid", "gridHorizontal", "icons"] as const).map((value) => ({
|
||||
value,
|
||||
label: (t) => t(`widget.bookmarks.option.layout.option.${value}.label`),
|
||||
label: (t) => {
|
||||
if (value === "adaptive") return t("widget.bookmarks.option.layout.option.adaptive.label");
|
||||
if (value === "grid") return t("widget.common.layout.option.grid");
|
||||
if (value === "row") return t("widget.common.layout.option.horizontal");
|
||||
if (value === "column") return t("widget.common.layout.option.vertical");
|
||||
if (value === "icons") return t("widget.bookmarks.option.layout.option.icons.label");
|
||||
return t("widget.bookmarks.option.layout.option.gridHorizontal.label");
|
||||
},
|
||||
})),
|
||||
defaultValue: "column",
|
||||
defaultValue: "adaptive",
|
||||
}),
|
||||
variant: factory.select({
|
||||
options: (["soft", "filled", "outline", "plain"] as const).map((value) => ({
|
||||
value,
|
||||
label: (t) => t(`widget.bookmarks.option.variant.option.${value}.label`),
|
||||
})),
|
||||
defaultValue: "soft",
|
||||
}),
|
||||
spacing: factory.select({
|
||||
options: (["xs", "sm", "md", "lg", "xl"] as const).map((value) => ({
|
||||
value,
|
||||
label: (t) => t(`widget.bookmarks.option.spacing.option.${value}.label`),
|
||||
})),
|
||||
defaultValue: "xs",
|
||||
}),
|
||||
hideTitle: factory.switch({ defaultValue: false }),
|
||||
hideIcon: factory.switch({ defaultValue: false }),
|
||||
hideHostname: factory.switch({ defaultValue: false }),
|
||||
openNewTab: factory.switch({ defaultValue: true }),
|
||||
withBorder: factory.switch({ defaultValue: false }),
|
||||
items: factory.sortableItemList<RouterOutputs["app"]["all"][number], string>({
|
||||
ItemComponent: ({ item, handle: Handle, removeItem, rootAttributes }) => {
|
||||
grow: factory.switch({ defaultValue: false }),
|
||||
customUrls: factory.internal({ defaultValue: [] as string[] }),
|
||||
items: factory.sortableItemList<BookmarkSelectionItem, string>({
|
||||
ItemComponent: ({ item, handle, removeItem, removeLabel, rootAttributes }) => {
|
||||
const iconUrl = item.iconUrl ?? getBookmarkFaviconUrl(item.href);
|
||||
return (
|
||||
<Group {...rootAttributes} tabIndex={0} justify="space-between" wrap="nowrap">
|
||||
<Group wrap="nowrap">
|
||||
<Handle />
|
||||
<Group wrap="nowrap" miw={0}>
|
||||
{handle}
|
||||
|
||||
<Group>
|
||||
<Avatar src={item.iconUrl} alt={item.name} />
|
||||
<Stack gap={0}>
|
||||
<Text>{item.name}</Text>
|
||||
<Group wrap="nowrap" miw={0}>
|
||||
<Avatar src={iconUrl} name={item.name} color="gray" radius="sm">
|
||||
<IconLink size={20} />
|
||||
</Avatar>
|
||||
<Stack gap={0} miw={0}>
|
||||
<Text fw={600} truncate>
|
||||
{item.name}
|
||||
</Text>
|
||||
<Text size="xs" c="dimmed" truncate>
|
||||
{item.href}
|
||||
</Text>
|
||||
</Stack>
|
||||
</Group>
|
||||
</Group>
|
||||
|
||||
<ActionIcon variant="transparent" color="red" onClick={removeItem}>
|
||||
<IconX size={20} />
|
||||
<ActionIcon variant="subtle" color="red" onClick={removeItem} aria-label={removeLabel}>
|
||||
<IconX size="var(--mantine-font-size-xl)" />
|
||||
</ActionIcon>
|
||||
</Group>
|
||||
);
|
||||
@@ -50,7 +90,14 @@ export const { definition, componentLoader } = createWidgetDefinition("bookmarks
|
||||
AddButton: BookmarkAddButton,
|
||||
uniqueIdentifier: (item) => item.id,
|
||||
useData: (initialIds) => {
|
||||
const { data, error, isLoading } = clientApi.app.byIds.useQuery(initialIds);
|
||||
const appIds = initialIds.filter((value) => !getDirectBookmarkUrl(value));
|
||||
const { data: apps, error, isLoading } = clientApi.app.byIds.useQuery(appIds);
|
||||
const appsById = new Map(apps?.map((app) => [app.id, app]));
|
||||
const data = initialIds.flatMap((value) => {
|
||||
const directUrl = getDirectBookmarkUrl(value);
|
||||
if (directUrl) return createDirectBookmark(directUrl) ?? [];
|
||||
return appsById.get(value) ?? [];
|
||||
});
|
||||
|
||||
return {
|
||||
data,
|
||||
|
||||
@@ -0,0 +1,69 @@
|
||||
import { describe, expect, test } from "vitest";
|
||||
|
||||
import { createDirectBookmark, normalizeBookmarkUrl, splitBookmarkUrls } from "./bookmark-item";
|
||||
import { getBookmarkCardDisplay, getBookmarkDisplayPlan } from "./layout";
|
||||
|
||||
describe("bookmark display helpers", () => {
|
||||
test("uses explicit width breakpoints for advanced columns", () => {
|
||||
expect(
|
||||
getBookmarkDisplayPlan({ advanced: true, width: 900, height: 500, itemCount: 8, layout: "adaptive" }),
|
||||
).toMatchObject({
|
||||
columns: 3,
|
||||
orientation: "horizontal",
|
||||
});
|
||||
expect(
|
||||
getBookmarkDisplayPlan({ advanced: true, width: 120, height: 500, itemCount: 8, layout: "adaptive" }),
|
||||
).toMatchObject({
|
||||
columns: 1,
|
||||
orientation: "horizontal",
|
||||
});
|
||||
});
|
||||
|
||||
test("selects an adaptive plan from width and height breakpoints", () => {
|
||||
expect(
|
||||
getBookmarkDisplayPlan({ advanced: false, width: 560, height: 260, itemCount: 4, layout: "adaptive" }),
|
||||
).toMatchObject({
|
||||
columns: 2,
|
||||
itemHeight: 128,
|
||||
orientation: "horizontal",
|
||||
showHostname: true,
|
||||
showTitle: true,
|
||||
});
|
||||
expect(
|
||||
getBookmarkDisplayPlan({ advanced: false, width: 180, height: 80, itemCount: 4, layout: "adaptive" }),
|
||||
).toMatchObject({
|
||||
columns: 1,
|
||||
orientation: "icon",
|
||||
showHostname: false,
|
||||
showTitle: false,
|
||||
});
|
||||
});
|
||||
|
||||
test("keeps compact cards visible when icons are hidden", () => {
|
||||
const plan = getBookmarkDisplayPlan({ advanced: false, width: 180, height: 80, itemCount: 4, layout: "icons" });
|
||||
expect(
|
||||
getBookmarkCardDisplay({ advanced: false, hideHostname: false, hideIcon: true, hideTitle: false, plan }),
|
||||
).toEqual({
|
||||
orientation: "horizontal",
|
||||
showHostname: false,
|
||||
showIcon: false,
|
||||
showTitle: true,
|
||||
});
|
||||
});
|
||||
|
||||
test("creates standalone bookmarks without app records", () => {
|
||||
expect(createDirectBookmark("https://homarr.dev/docs")).toEqual({
|
||||
id: "url:https://homarr.dev/docs",
|
||||
name: "homarr.dev",
|
||||
description: null,
|
||||
href: "https://homarr.dev/docs",
|
||||
});
|
||||
expect(normalizeBookmarkUrl("homarr.dev/docs")).toBe("https://homarr.dev/docs");
|
||||
expect(normalizeBookmarkUrl("javascript:alert(1)")).toBeUndefined();
|
||||
});
|
||||
|
||||
test("splits URL lists without corrupting commas inside a URL", () => {
|
||||
expect(splitBookmarkUrls("https://one.example, two.example")).toEqual(["https://one.example", "two.example"]);
|
||||
expect(splitBookmarkUrls("https://maps.example/@52.5,13.4,15z")).toEqual(["https://maps.example/@52.5,13.4,15z"]);
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,366 @@
|
||||
import type { WidgetComponentProps } from "../definition";
|
||||
|
||||
export type BookmarkLayout = WidgetComponentProps<"bookmarks">["options"]["layout"];
|
||||
export type BookmarkOrientation = "horizontal" | "vertical" | "icon";
|
||||
|
||||
export interface BookmarkDisplayPlan {
|
||||
columns: number;
|
||||
horizontalScroll: boolean;
|
||||
itemGap: number;
|
||||
itemHeight: number;
|
||||
itemWidth: number;
|
||||
orientation: BookmarkOrientation;
|
||||
showHostname: boolean;
|
||||
showTitle: boolean;
|
||||
}
|
||||
|
||||
export interface BookmarkCardDisplay {
|
||||
orientation: BookmarkOrientation;
|
||||
showHostname: boolean;
|
||||
showIcon: boolean;
|
||||
showTitle: boolean;
|
||||
}
|
||||
|
||||
export const getBookmarkCardDisplay = ({
|
||||
advanced,
|
||||
hideHostname,
|
||||
hideIcon,
|
||||
hideTitle,
|
||||
plan,
|
||||
}: {
|
||||
advanced: boolean;
|
||||
hideHostname: boolean;
|
||||
hideIcon: boolean;
|
||||
hideTitle: boolean;
|
||||
plan: BookmarkDisplayPlan;
|
||||
}): BookmarkCardDisplay => {
|
||||
let orientation = plan.orientation;
|
||||
let showTitle = advanced || (!hideTitle && plan.showTitle);
|
||||
if (!advanced && hideIcon && !hideTitle && !showTitle) {
|
||||
orientation = "horizontal";
|
||||
showTitle = true;
|
||||
}
|
||||
let showHostname = advanced || (!hideHostname && plan.showHostname);
|
||||
if (!advanced && plan.itemHeight <= 32 && showTitle) showHostname = false;
|
||||
const showIcon = advanced || !hideIcon || (!showTitle && !showHostname);
|
||||
|
||||
return { orientation, showHostname, showIcon, showTitle };
|
||||
};
|
||||
|
||||
interface BookmarkWidthBreakpoint {
|
||||
adaptiveColumns: number;
|
||||
adaptiveOrientation: BookmarkOrientation;
|
||||
advancedColumns: number;
|
||||
compactColumns: number;
|
||||
gridColumns: number;
|
||||
iconColumns: number;
|
||||
minWidth: number;
|
||||
rowItemWidth: number;
|
||||
showHostname: boolean;
|
||||
showTitle: boolean;
|
||||
}
|
||||
|
||||
const widthBreakpoints = [
|
||||
{
|
||||
minWidth: 900,
|
||||
adaptiveColumns: 4,
|
||||
advancedColumns: 3,
|
||||
compactColumns: 4,
|
||||
gridColumns: 5,
|
||||
iconColumns: 10,
|
||||
rowItemWidth: 180,
|
||||
adaptiveOrientation: "vertical",
|
||||
showHostname: true,
|
||||
showTitle: true,
|
||||
},
|
||||
{
|
||||
minWidth: 720,
|
||||
adaptiveColumns: 3,
|
||||
advancedColumns: 2,
|
||||
compactColumns: 3,
|
||||
gridColumns: 4,
|
||||
iconColumns: 8,
|
||||
rowItemWidth: 172,
|
||||
adaptiveOrientation: "horizontal",
|
||||
showHostname: true,
|
||||
showTitle: true,
|
||||
},
|
||||
{
|
||||
minWidth: 480,
|
||||
adaptiveColumns: 2,
|
||||
advancedColumns: 2,
|
||||
compactColumns: 2,
|
||||
gridColumns: 3,
|
||||
iconColumns: 6,
|
||||
rowItemWidth: 160,
|
||||
adaptiveOrientation: "horizontal",
|
||||
showHostname: true,
|
||||
showTitle: true,
|
||||
},
|
||||
{
|
||||
minWidth: 300,
|
||||
adaptiveColumns: 2,
|
||||
advancedColumns: 1,
|
||||
compactColumns: 1,
|
||||
gridColumns: 2,
|
||||
iconColumns: 4,
|
||||
rowItemWidth: 144,
|
||||
adaptiveOrientation: "horizontal",
|
||||
showHostname: false,
|
||||
showTitle: true,
|
||||
},
|
||||
{
|
||||
minWidth: 180,
|
||||
adaptiveColumns: 1,
|
||||
advancedColumns: 1,
|
||||
compactColumns: 1,
|
||||
gridColumns: 1,
|
||||
iconColumns: 3,
|
||||
rowItemWidth: 136,
|
||||
adaptiveOrientation: "horizontal",
|
||||
showHostname: false,
|
||||
showTitle: true,
|
||||
},
|
||||
{
|
||||
minWidth: 0,
|
||||
adaptiveColumns: 1,
|
||||
advancedColumns: 1,
|
||||
compactColumns: 1,
|
||||
gridColumns: 1,
|
||||
iconColumns: 2,
|
||||
rowItemWidth: 112,
|
||||
adaptiveOrientation: "icon",
|
||||
showHostname: false,
|
||||
showTitle: false,
|
||||
},
|
||||
] as const satisfies readonly BookmarkWidthBreakpoint[];
|
||||
|
||||
interface BookmarkHeightBreakpoint {
|
||||
columnItemHeight: number;
|
||||
itemHeight: number;
|
||||
minHeight: number;
|
||||
orientation: BookmarkOrientation;
|
||||
rowItemHeight: number;
|
||||
showHostname: boolean;
|
||||
showTitle: boolean;
|
||||
}
|
||||
|
||||
const heightBreakpoints = [
|
||||
{
|
||||
minHeight: 300,
|
||||
columnItemHeight: 72,
|
||||
itemHeight: 128,
|
||||
rowItemHeight: 128,
|
||||
orientation: "vertical",
|
||||
showHostname: true,
|
||||
showTitle: true,
|
||||
},
|
||||
{
|
||||
minHeight: 180,
|
||||
columnItemHeight: 64,
|
||||
itemHeight: 128,
|
||||
rowItemHeight: 112,
|
||||
orientation: "horizontal",
|
||||
showHostname: true,
|
||||
showTitle: true,
|
||||
},
|
||||
{
|
||||
minHeight: 110,
|
||||
columnItemHeight: 56,
|
||||
itemHeight: 80,
|
||||
rowItemHeight: 80,
|
||||
orientation: "horizontal",
|
||||
showHostname: false,
|
||||
showTitle: true,
|
||||
},
|
||||
{
|
||||
minHeight: 60,
|
||||
columnItemHeight: 48,
|
||||
itemHeight: 48,
|
||||
rowItemHeight: 56,
|
||||
orientation: "icon",
|
||||
showHostname: false,
|
||||
showTitle: false,
|
||||
},
|
||||
{
|
||||
minHeight: 0,
|
||||
columnItemHeight: 32,
|
||||
itemHeight: 32,
|
||||
rowItemHeight: 40,
|
||||
orientation: "icon",
|
||||
showHostname: false,
|
||||
showTitle: false,
|
||||
},
|
||||
] as const satisfies readonly BookmarkHeightBreakpoint[];
|
||||
|
||||
export const getBookmarkDisplayPlan = ({
|
||||
advanced,
|
||||
gap = 0,
|
||||
height,
|
||||
itemCount,
|
||||
layout,
|
||||
width,
|
||||
}: {
|
||||
advanced: boolean;
|
||||
gap?: number;
|
||||
height: number;
|
||||
itemCount: number;
|
||||
layout: BookmarkLayout;
|
||||
width: number;
|
||||
}): BookmarkDisplayPlan => {
|
||||
const count = Math.max(1, itemCount);
|
||||
const normalizedWidth = Math.max(0, width);
|
||||
const normalizedHeight = Math.max(0, height);
|
||||
const widthSettings = widthBreakpoints.find(({ minWidth }) => normalizedWidth >= minWidth);
|
||||
const heightSettings = heightBreakpoints.find(({ minHeight }) => normalizedHeight >= minHeight);
|
||||
if (!widthSettings || !heightSettings) throw new Error("Bookmark breakpoints must cover all widget sizes");
|
||||
|
||||
if (advanced) {
|
||||
return {
|
||||
columns: Math.min(count, widthSettings.advancedColumns),
|
||||
horizontalScroll: false,
|
||||
itemGap: gap,
|
||||
itemHeight: 104,
|
||||
itemWidth: 260,
|
||||
orientation: "horizontal",
|
||||
showHostname: true,
|
||||
showTitle: true,
|
||||
};
|
||||
}
|
||||
|
||||
if (layout === "row") {
|
||||
let orientation: BookmarkOrientation = "horizontal";
|
||||
if (!widthSettings.showTitle) orientation = "icon";
|
||||
let itemWidth: number = widthSettings.rowItemWidth;
|
||||
if (heightSettings.rowItemHeight <= 56) itemWidth = 112;
|
||||
if (heightSettings.rowItemHeight <= 40) itemWidth = 96;
|
||||
return {
|
||||
columns: count,
|
||||
horizontalScroll: true,
|
||||
itemGap: Math.min(gap, 8),
|
||||
itemHeight: Math.min(heightSettings.rowItemHeight, 64),
|
||||
itemWidth,
|
||||
orientation,
|
||||
showHostname: widthSettings.showHostname && heightSettings.showHostname,
|
||||
showTitle: widthSettings.showTitle,
|
||||
};
|
||||
}
|
||||
|
||||
if (layout === "column") {
|
||||
return {
|
||||
columns: 1,
|
||||
horizontalScroll: false,
|
||||
itemGap: Math.min(gap, 4),
|
||||
itemHeight: 32,
|
||||
itemWidth: width,
|
||||
orientation: "horizontal",
|
||||
showHostname: widthSettings.showHostname,
|
||||
showTitle: widthSettings.showTitle,
|
||||
};
|
||||
}
|
||||
|
||||
if (layout === "icons") {
|
||||
return {
|
||||
columns: Math.min(count, widthSettings.iconColumns),
|
||||
horizontalScroll: false,
|
||||
itemGap: Math.min(gap, 8),
|
||||
itemHeight: 56,
|
||||
itemWidth: 56,
|
||||
orientation: "icon",
|
||||
showHostname: false,
|
||||
showTitle: false,
|
||||
};
|
||||
}
|
||||
|
||||
if (layout === "gridHorizontal") {
|
||||
return {
|
||||
columns: Math.min(count, widthSettings.compactColumns),
|
||||
horizontalScroll: false,
|
||||
itemGap: Math.min(gap, 8),
|
||||
itemHeight: 56,
|
||||
itemWidth: widthSettings.rowItemWidth,
|
||||
orientation: "horizontal",
|
||||
showHostname: widthSettings.showHostname && heightSettings.showHostname,
|
||||
showTitle: widthSettings.showTitle && heightSettings.showTitle,
|
||||
};
|
||||
}
|
||||
|
||||
let columns: number = widthSettings.adaptiveColumns;
|
||||
let orientation: BookmarkOrientation = widthSettings.adaptiveOrientation;
|
||||
if (layout === "grid") {
|
||||
columns = widthSettings.gridColumns;
|
||||
orientation = "vertical";
|
||||
}
|
||||
if (layout === "adaptive") {
|
||||
columns = widthSettings.adaptiveColumns;
|
||||
orientation = widthSettings.adaptiveOrientation;
|
||||
if (heightSettings.orientation === "icon") orientation = "icon";
|
||||
if (heightSettings.orientation === "horizontal" && orientation === "vertical") orientation = "horizontal";
|
||||
}
|
||||
|
||||
const visibleColumns = Math.min(count, columns);
|
||||
const densitySettings = getBookmarkDensitySettings({
|
||||
columns: visibleColumns,
|
||||
gap,
|
||||
height: normalizedHeight,
|
||||
heightProperty: "itemHeight",
|
||||
itemCount: count,
|
||||
preferredSettings: heightSettings,
|
||||
});
|
||||
if (layout === "adaptive" && densitySettings.itemHeight < 80 && orientation === "vertical") {
|
||||
orientation = "horizontal";
|
||||
}
|
||||
|
||||
let showHostname =
|
||||
orientation !== "icon" && widthSettings.showHostname && heightSettings.showHostname && densitySettings.showHostname;
|
||||
let showTitle = orientation !== "icon" && widthSettings.showTitle && heightSettings.showTitle;
|
||||
if (layout === "grid") {
|
||||
showHostname = showHostname && densitySettings.showHostname;
|
||||
showTitle = showTitle && densitySettings.showTitle;
|
||||
if (!showHostname && !showTitle) orientation = "icon";
|
||||
}
|
||||
|
||||
return {
|
||||
columns: visibleColumns,
|
||||
horizontalScroll: false,
|
||||
itemGap: getBookmarkDensityGap(gap, densitySettings),
|
||||
itemHeight: densitySettings.itemHeight,
|
||||
itemWidth: widthSettings.rowItemWidth,
|
||||
orientation,
|
||||
showHostname,
|
||||
showTitle,
|
||||
};
|
||||
};
|
||||
|
||||
type BookmarkHeightProperty = "columnItemHeight" | "itemHeight";
|
||||
type BookmarkHeightSettings = (typeof heightBreakpoints)[number];
|
||||
|
||||
const getBookmarkDensitySettings = ({
|
||||
columns,
|
||||
gap,
|
||||
height,
|
||||
heightProperty,
|
||||
itemCount,
|
||||
preferredSettings,
|
||||
}: {
|
||||
columns: number;
|
||||
gap: number;
|
||||
height: number;
|
||||
heightProperty: BookmarkHeightProperty;
|
||||
itemCount: number;
|
||||
preferredSettings: BookmarkHeightSettings;
|
||||
}): BookmarkHeightSettings => {
|
||||
const rowCount = Math.ceil(itemCount / Math.max(1, columns));
|
||||
const totalGap = Math.max(0, rowCount - 1) * Math.max(0, gap);
|
||||
const preferredIndex = heightBreakpoints.indexOf(preferredSettings);
|
||||
const matchingSettings = heightBreakpoints
|
||||
.slice(preferredIndex)
|
||||
.find((settings) => rowCount * settings[heightProperty] + totalGap <= height);
|
||||
|
||||
return matchingSettings ?? heightBreakpoints[4];
|
||||
};
|
||||
|
||||
const getBookmarkDensityGap = (gap: number, settings: BookmarkHeightSettings) => {
|
||||
if (settings.itemHeight > 32 && settings.columnItemHeight > 32) return gap;
|
||||
return Math.min(gap, 4);
|
||||
};
|
||||
@@ -1,32 +1,43 @@
|
||||
import { createLogger } from "@homarr/core/infrastructure/logs";
|
||||
import { db, inArray } from "@homarr/db";
|
||||
import { apps } from "@homarr/db/schema";
|
||||
|
||||
import type { Prefetch } from "../definition";
|
||||
import type { QueryClient } from "@tanstack/react-query";
|
||||
|
||||
import { createLogger } from "@homarr/core/infrastructure/logs";
|
||||
|
||||
import { createTrpcQueryKey } from "../trpc-query-key";
|
||||
import { getDirectBookmarkUrl } from "./bookmark-item";
|
||||
|
||||
const logger = createLogger({ module: "bookmarksWidgetPrefetch" });
|
||||
|
||||
const prefetchAllAsync: Prefetch<"bookmarks"> = async (queryClient, items) => {
|
||||
const appIds = items.flatMap((item) => item.options.items);
|
||||
const distinctAppIds = [...new Set(appIds)];
|
||||
const getAppIds = (options: Record<string, unknown>) => {
|
||||
if (!Array.isArray(options.items)) return [];
|
||||
return options.items.filter((value): value is string => typeof value === "string" && !getDirectBookmarkUrl(value));
|
||||
};
|
||||
|
||||
const dbApps = await db.query.apps.findMany({
|
||||
where: inArray(apps.id, distinctAppIds),
|
||||
});
|
||||
const prefetchAll = (queryClient: QueryClient, items: { options: Record<string, unknown> }[]) => {
|
||||
const appIds = items.flatMap((item) => getAppIds(item.options));
|
||||
const distinctAppIds = [...new Set(appIds)];
|
||||
if (distinctAppIds.length === 0) return;
|
||||
|
||||
const dbAppsPromise = Promise.resolve(db.query.apps.findMany({ where: inArray(apps.id, distinctAppIds) })).catch(
|
||||
(error: unknown) => {
|
||||
logger.error(new Error("Failed to prefetch apps for bookmarks", { cause: error }));
|
||||
throw error;
|
||||
},
|
||||
);
|
||||
|
||||
for (const item of items) {
|
||||
if (item.options.items.length === 0) {
|
||||
const itemAppIds = getAppIds(item.options);
|
||||
if (itemAppIds.length === 0) {
|
||||
continue;
|
||||
}
|
||||
|
||||
queryClient.setQueryData(
|
||||
createTrpcQueryKey("app.byIds", item.options.items),
|
||||
dbApps.filter((app) => item.options.items.includes(app.id)),
|
||||
);
|
||||
void queryClient.prefetchQuery({
|
||||
queryKey: createTrpcQueryKey("app.byIds", itemAppIds),
|
||||
queryFn: async () => (await dbAppsPromise).filter((app) => itemAppIds.includes(app.id)),
|
||||
});
|
||||
}
|
||||
|
||||
logger.info("Successfully prefetched apps for bookmarks", { count: dbApps.length });
|
||||
};
|
||||
|
||||
export default prefetchAllAsync;
|
||||
export default prefetchAll;
|
||||
Reference in new issue
Block a user