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,22 +1,32 @@
|
||||
import { Center, Loader } from "@mantine/core";
|
||||
import { useWindowEvent } from "@mantine/hooks";
|
||||
import { Center } from "@mantine/core";
|
||||
|
||||
import type { TranslationObject } from "@homarr/translation";
|
||||
import { useI18n } from "@homarr/translation/client";
|
||||
|
||||
import type { SearchGroup } from "../../lib/group";
|
||||
import type { inferSearchInteractionOptions } from "../../lib/interaction";
|
||||
import { SpotlightNoResults } from "../no-results";
|
||||
import type { SpotlightMode } from "../../open";
|
||||
import { SpotlightGroupActionItem } from "./items/group-action-item";
|
||||
|
||||
interface GroupActionsProps<TOption extends Record<string, unknown>> {
|
||||
group: SearchGroup<TOption>;
|
||||
query: string;
|
||||
setQuery: (query: string) => void;
|
||||
setMode: (mode: keyof TranslationObject["search"]["mode"]) => void;
|
||||
setMode: (mode: SpotlightMode) => void;
|
||||
setChildrenOptions: (options: inferSearchInteractionOptions<"children">) => void;
|
||||
}
|
||||
|
||||
const getUniqueOptions = <TOption extends Record<string, unknown>>(options: TOption[], keyPath: keyof TOption) => {
|
||||
const optionKeys = new Set<unknown>();
|
||||
|
||||
return options.filter((option) => {
|
||||
const optionKey = option[keyPath];
|
||||
if (optionKeys.has(optionKey)) return false;
|
||||
|
||||
optionKeys.add(optionKey);
|
||||
return true;
|
||||
});
|
||||
};
|
||||
|
||||
export const SpotlightGroupActions = <TOption extends Record<string, unknown>>({
|
||||
group,
|
||||
query,
|
||||
@@ -30,28 +40,26 @@ export const SpotlightGroupActions = <TOption extends Record<string, unknown>>({
|
||||
const options = useOptions(query);
|
||||
const t = useI18n();
|
||||
|
||||
useWindowEvent("keydown", (event) => {
|
||||
const optionsArray = Array.isArray(options) ? options : (options.data ?? []);
|
||||
group.onKeyDown?.(event, optionsArray, query, { setChildrenOptions });
|
||||
});
|
||||
|
||||
if (Array.isArray(options)) {
|
||||
if (options.length === 0) {
|
||||
return null;
|
||||
}
|
||||
|
||||
const filteredOptions = options
|
||||
.filter((option) => ("filter" in group ? group.filter(query, option) : false))
|
||||
.sort((optionA, optionB) => {
|
||||
if ("sort" in group) {
|
||||
return group.sort?.(query, [optionA, optionB]) ?? 0;
|
||||
}
|
||||
const filteredOptions = getUniqueOptions(
|
||||
options
|
||||
.filter((option) => ("filter" in group ? group.filter(query, option) : false))
|
||||
.sort((optionA, optionB) => {
|
||||
if ("sort" in group) {
|
||||
return group.sort?.(query, [optionA, optionB]) ?? 0;
|
||||
}
|
||||
|
||||
return 0;
|
||||
});
|
||||
return 0;
|
||||
}),
|
||||
group.keyPath,
|
||||
);
|
||||
|
||||
if (filteredOptions.length === 0) {
|
||||
return <SpotlightNoResults />;
|
||||
return null;
|
||||
}
|
||||
|
||||
return filteredOptions.map((option) => (
|
||||
@@ -68,15 +76,15 @@ export const SpotlightGroupActions = <TOption extends Record<string, unknown>>({
|
||||
}
|
||||
|
||||
if (options.isLoading) {
|
||||
return (
|
||||
<Center w="100%" py="sm">
|
||||
<Loader size="sm" />
|
||||
</Center>
|
||||
);
|
||||
return <span hidden data-search-pending />;
|
||||
}
|
||||
|
||||
if (options.isError) {
|
||||
return <Center py="sm">{t("search.error.fetch")}</Center>;
|
||||
return (
|
||||
<Center py="sm" data-search-status>
|
||||
{t("search.error.fetch")}
|
||||
</Center>
|
||||
);
|
||||
}
|
||||
|
||||
if (!options.data) {
|
||||
@@ -84,10 +92,10 @@ export const SpotlightGroupActions = <TOption extends Record<string, unknown>>({
|
||||
}
|
||||
|
||||
if (options.data.length === 0) {
|
||||
return <SpotlightNoResults />;
|
||||
return null;
|
||||
}
|
||||
|
||||
return options.data.map((option) => (
|
||||
return getUniqueOptions(options.data, group.keyPath).map((option) => (
|
||||
<SpotlightGroupActionItem
|
||||
key={option[group.keyPath] as never}
|
||||
option={option}
|
||||
|
||||
@@ -1,18 +1,18 @@
|
||||
import { Spotlight } from "@mantine/spotlight";
|
||||
|
||||
import type { TranslationObject } from "@homarr/translation";
|
||||
import { translateIfNecessary } from "@homarr/translation";
|
||||
import { useI18n } from "@homarr/translation/client";
|
||||
|
||||
import type { SearchGroup } from "../../../lib/group";
|
||||
import type { inferSearchInteractionOptions } from "../../../lib/interaction";
|
||||
import type { SpotlightMode } from "../../../open";
|
||||
import { SpotlightGroupActions } from "../group-actions";
|
||||
|
||||
interface SpotlightActionGroupsProps {
|
||||
groups: SearchGroup[];
|
||||
query: string;
|
||||
setQuery: (query: string) => void;
|
||||
setMode: (mode: keyof TranslationObject["search"]["mode"]) => void;
|
||||
setMode: (mode: SpotlightMode) => void;
|
||||
setChildrenOptions: (options: inferSearchInteractionOptions<"children">) => void;
|
||||
}
|
||||
|
||||
@@ -23,6 +23,8 @@ export const SpotlightActionGroups = ({ groups, ...others }: SpotlightActionGrou
|
||||
<Spotlight.ActionsGroup
|
||||
key={`${translateIfNecessary(t, group.title)}::${String(group.keyPath)}`}
|
||||
label={translateIfNecessary(t, group.title)}
|
||||
data-search-source={group.source?.kind ?? "local"}
|
||||
data-remote-source={group.source?.kind === "remote" ? group.source.source : undefined}
|
||||
>
|
||||
{/*eslint-disable-next-line @typescript-eslint/no-explicit-any */}
|
||||
<SpotlightGroupActions<any> group={group} {...others} />
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
import { Spotlight } from "@mantine/spotlight";
|
||||
|
||||
import { getSafeAppHref, SAFE_NEW_TAB_REL } from "@homarr/common";
|
||||
import { Link } from "@homarr/ui";
|
||||
|
||||
import type { inferSearchInteractionOptions } from "../../../lib/interaction";
|
||||
@@ -15,10 +16,18 @@ interface ChildrenActionItemProps {
|
||||
export const ChildrenActionItem = ({ childrenOptions, action, query, setChildrenOptions }: ChildrenActionItemProps) => {
|
||||
const interaction = action.useInteraction(childrenOptions.option, query);
|
||||
|
||||
const safeHref = interaction.type === "link" ? getSafeAppHref(interaction.href) : undefined;
|
||||
const renderRoot =
|
||||
interaction.type === "link"
|
||||
interaction.type === "link" && safeHref
|
||||
? (props: Record<string, unknown>) => {
|
||||
return <Link href={interaction.href} target={interaction.newTab ? "_blank" : undefined} {...props} />;
|
||||
return (
|
||||
<Link
|
||||
href={safeHref}
|
||||
target={interaction.newTab ? "_blank" : undefined}
|
||||
rel={interaction.newTab ? SAFE_NEW_TAB_REL : undefined}
|
||||
{...props}
|
||||
/>
|
||||
);
|
||||
}
|
||||
: undefined;
|
||||
|
||||
|
||||
@@ -1,10 +1,11 @@
|
||||
import { Spotlight } from "@mantine/spotlight";
|
||||
|
||||
import type { TranslationObject } from "@homarr/translation";
|
||||
import { getSafeAppHref, SAFE_NEW_TAB_REL } from "@homarr/common";
|
||||
import { Link } from "@homarr/ui";
|
||||
|
||||
import type { SearchGroup } from "../../../lib/group";
|
||||
import type { inferSearchInteractionOptions } from "../../../lib/interaction";
|
||||
import type { SpotlightMode } from "../../../open";
|
||||
import { selectAction, spotlightStore } from "../../../spotlight-store";
|
||||
import classes from "./action-item.module.css";
|
||||
|
||||
@@ -12,7 +13,7 @@ interface SpotlightGroupActionItemProps<TOption extends Record<string, unknown>>
|
||||
option: TOption;
|
||||
query: string;
|
||||
setQuery: (query: string) => void;
|
||||
setMode: (mode: keyof TranslationObject["search"]["mode"]) => void;
|
||||
setMode: (mode: SpotlightMode) => void;
|
||||
setChildrenOptions: (options: inferSearchInteractionOptions<"children">) => void;
|
||||
group: SearchGroup<TOption>;
|
||||
}
|
||||
@@ -26,18 +27,29 @@ export const SpotlightGroupActionItem = <TOption extends Record<string, unknown>
|
||||
option,
|
||||
}: SpotlightGroupActionItemProps<TOption>) => {
|
||||
const interaction = group.useInteraction(option, query);
|
||||
const unavailable = "unavailable" in option && option.unavailable === true;
|
||||
// Avoid passing React's special `key` prop via spread
|
||||
|
||||
const { key: _reactKey, ...optionProps } = option as unknown as { key?: unknown } & Record<string, unknown>;
|
||||
|
||||
const safeHref = interaction.type === "link" ? getSafeAppHref(interaction.href) : undefined;
|
||||
const renderRoot =
|
||||
interaction.type === "link"
|
||||
interaction.type === "link" && safeHref && !unavailable
|
||||
? (props: Record<string, unknown>) => {
|
||||
return <Link href={interaction.href} target={interaction.newTab ? "_blank" : undefined} {...props} />;
|
||||
return (
|
||||
<Link
|
||||
href={safeHref}
|
||||
target={interaction.newTab ? "_blank" : undefined}
|
||||
rel={interaction.newTab ? SAFE_NEW_TAB_REL : undefined}
|
||||
{...props}
|
||||
/>
|
||||
);
|
||||
}
|
||||
: undefined;
|
||||
|
||||
const handleClickAsync = async () => {
|
||||
if (unavailable) return;
|
||||
|
||||
if (interaction.type === "javaScript") {
|
||||
await interaction.onSelect();
|
||||
} else if (interaction.type === "setQuery") {
|
||||
@@ -65,6 +77,8 @@ export const SpotlightGroupActionItem = <TOption extends Record<string, unknown>
|
||||
(interaction.type !== "javaScript" || interaction.closeSpotlightOnTrigger !== false)
|
||||
}
|
||||
className={classes.spotlightAction}
|
||||
aria-disabled={unavailable || undefined}
|
||||
disabled={unavailable}
|
||||
>
|
||||
<group.Component {...(optionProps as TOption)} />
|
||||
</Spotlight.Action>
|
||||
|
||||
@@ -0,0 +1,80 @@
|
||||
import { Group, Kbd, ScrollArea, Text, UnstyledButton } from "@mantine/core";
|
||||
import {
|
||||
IconApps,
|
||||
IconCommand,
|
||||
IconMovie,
|
||||
IconRobot,
|
||||
IconSearch,
|
||||
IconSettings,
|
||||
IconUsers,
|
||||
IconWorldSearch,
|
||||
} from "@tabler/icons-react";
|
||||
|
||||
import { useSession } from "@homarr/auth/client";
|
||||
|
||||
import type { SpotlightMode } from "../open";
|
||||
import classes from "./spotlight.module.css";
|
||||
|
||||
interface ModeRailEntry {
|
||||
ariaLabel: string;
|
||||
character?: string;
|
||||
label: string;
|
||||
mode: SpotlightMode;
|
||||
}
|
||||
|
||||
interface SpotlightModeRailProps {
|
||||
activeMode: SpotlightMode;
|
||||
entries: ModeRailEntry[];
|
||||
navigationLabel: string;
|
||||
onModeChange: (mode: SpotlightMode) => void;
|
||||
}
|
||||
|
||||
const modeIcons: Record<SpotlightMode, typeof IconSearch> = {
|
||||
search: IconSearch,
|
||||
apps: IconApps,
|
||||
command: IconCommand,
|
||||
preferences: IconSettings,
|
||||
assistant: IconRobot,
|
||||
external: IconWorldSearch,
|
||||
media: IconMovie,
|
||||
userGroup: IconUsers,
|
||||
};
|
||||
|
||||
export const SpotlightModeRail = ({ activeMode, entries, navigationLabel, onModeChange }: SpotlightModeRailProps) => {
|
||||
const { data: session } = useSession();
|
||||
const canManageUsers = session?.user.permissions.includes("admin") ?? false;
|
||||
|
||||
return (
|
||||
<ScrollArea type="never" scrollbarSize={0} className={classes.modeRailViewport}>
|
||||
<Group component="nav" aria-label={navigationLabel} wrap="nowrap" gap={4} className={classes.modeRail}>
|
||||
{entries.map((entry) => {
|
||||
if (entry.mode === "userGroup" && !canManageUsers) return null;
|
||||
const Icon = modeIcons[entry.mode];
|
||||
const active = entry.mode === activeMode;
|
||||
|
||||
return (
|
||||
<UnstyledButton
|
||||
type="button"
|
||||
key={entry.mode}
|
||||
className={classes.modeButton}
|
||||
data-active={active || undefined}
|
||||
aria-pressed={active}
|
||||
aria-label={entry.ariaLabel}
|
||||
onClick={() => onModeChange(entry.mode)}
|
||||
>
|
||||
<Icon size={15} stroke={1.7} />
|
||||
<Text component="span" size="xs" fw={600} className={classes.modeLabel}>
|
||||
{entry.label}
|
||||
</Text>
|
||||
{entry.character ? (
|
||||
<Kbd size="xs" className={classes.modeKey}>
|
||||
{entry.character}
|
||||
</Kbd>
|
||||
) : null}
|
||||
</UnstyledButton>
|
||||
);
|
||||
})}
|
||||
</Group>
|
||||
</ScrollArea>
|
||||
);
|
||||
};
|
||||
@@ -2,8 +2,8 @@ import { Spotlight } from "@mantine/spotlight";
|
||||
|
||||
import { useI18n } from "@homarr/translation/client";
|
||||
|
||||
export const SpotlightNoResults = () => {
|
||||
export const SpotlightNoResults = ({ className }: { className?: string }) => {
|
||||
const t = useI18n();
|
||||
|
||||
return <Spotlight.Empty>{t("search.nothingFound")}</Spotlight.Empty>;
|
||||
return <Spotlight.Empty className={className}>{t("search.nothingFound")}</Spotlight.Empty>;
|
||||
};
|
||||
@@ -0,0 +1,106 @@
|
||||
.content {
|
||||
overflow: hidden;
|
||||
border: 1px solid light-dark(var(--mantine-color-gray-3), var(--mantine-color-dark-4));
|
||||
box-shadow: var(--mantine-shadow-xl);
|
||||
}
|
||||
|
||||
.search {
|
||||
border-bottom: 1px solid light-dark(var(--mantine-color-gray-2), var(--mantine-color-dark-5));
|
||||
}
|
||||
|
||||
.modeRailViewport {
|
||||
border-bottom: 1px solid light-dark(var(--mantine-color-gray-2), var(--mantine-color-dark-5));
|
||||
}
|
||||
|
||||
.modeRail {
|
||||
min-width: max-content;
|
||||
padding: var(--mantine-spacing-xs);
|
||||
}
|
||||
|
||||
.modeButton {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 4px;
|
||||
min-height: 30px;
|
||||
padding-inline: 6px;
|
||||
border-radius: var(--mantine-radius-sm);
|
||||
color: var(--mantine-color-dimmed);
|
||||
transition:
|
||||
color 100ms ease,
|
||||
background-color 100ms ease;
|
||||
}
|
||||
|
||||
.modeKey {
|
||||
min-width: 0;
|
||||
padding: 0;
|
||||
border: 0;
|
||||
background: transparent;
|
||||
color: inherit;
|
||||
font-size: 10px;
|
||||
}
|
||||
|
||||
.modeButton:hover {
|
||||
color: var(--mantine-color-text);
|
||||
background: light-dark(var(--mantine-color-gray-1), var(--mantine-color-dark-6));
|
||||
}
|
||||
|
||||
.modeButton[data-active] {
|
||||
color: var(--mantine-primary-color-filled);
|
||||
background: var(--mantine-primary-color-light);
|
||||
}
|
||||
|
||||
.modeButton:focus-visible {
|
||||
outline: 2px solid var(--mantine-primary-color-filled);
|
||||
outline-offset: -2px;
|
||||
}
|
||||
|
||||
.actionsList {
|
||||
padding-block: 4px;
|
||||
}
|
||||
|
||||
.actionsList [data-search-source="fallback"] {
|
||||
margin-top: var(--mantine-spacing-xs);
|
||||
padding-top: var(--mantine-spacing-xs);
|
||||
border-top: 1px dashed light-dark(var(--mantine-color-gray-3), var(--mantine-color-dark-4));
|
||||
}
|
||||
|
||||
.actionsList > [data-search-source="fallback"]:first-child {
|
||||
margin-top: 0;
|
||||
padding-top: 0;
|
||||
border-top: 0;
|
||||
}
|
||||
|
||||
.actionsList:has([data-action]) .emptyState,
|
||||
.actionsList:has([data-search-pending]) .emptyState,
|
||||
.actionsList:has([data-search-status]) .emptyState {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.actionsList [data-search-source]:has([data-search-pending]) {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.footer {
|
||||
min-height: 42px;
|
||||
border-top: 1px solid light-dark(var(--mantine-color-gray-2), var(--mantine-color-dark-5));
|
||||
}
|
||||
|
||||
.footerHint {
|
||||
color: light-dark(var(--mantine-color-gray-7), var(--mantine-color-gray-4));
|
||||
}
|
||||
|
||||
@media (max-width: 48em) {
|
||||
.modeLabel {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.footerSecondary {
|
||||
display: none;
|
||||
}
|
||||
}
|
||||
|
||||
@media (prefers-reduced-motion: reduce) {
|
||||
.modeButton {
|
||||
transition: none;
|
||||
}
|
||||
}
|
||||
@@ -2,13 +2,12 @@
|
||||
|
||||
import type { Dispatch, SetStateAction } from "react";
|
||||
import { useCallback, useEffect, useMemo, useRef, useState } from "react";
|
||||
import { ActionIcon, Center, Group, Kbd } from "@mantine/core";
|
||||
import { ActionIcon, Center, Group, Kbd, Text } from "@mantine/core";
|
||||
import { Spotlight as MantineSpotlight } from "@mantine/spotlight";
|
||||
import { IconArrowLeft, IconSearch, IconX } from "@tabler/icons-react";
|
||||
import { IconArrowDown, IconArrowLeft, IconArrowUp, IconCornerDownLeft, IconSearch, IconX } from "@tabler/icons-react";
|
||||
import { useSetAtom } from "jotai";
|
||||
|
||||
import { hotkeys } from "@homarr/definitions";
|
||||
import type { TranslationObject } from "@homarr/translation";
|
||||
import { translateIfNecessary } from "@homarr/translation";
|
||||
import { useI18n } from "@homarr/translation/client";
|
||||
|
||||
import {
|
||||
@@ -17,73 +16,142 @@ import {
|
||||
mediaRequestSearchEvent,
|
||||
spotlightOpenEvent,
|
||||
} from "../open";
|
||||
import type { OpenMediaRequestSearchOptions } from "../open";
|
||||
import type { OpenMediaRequestSearchOptions, SpotlightMode, SpotlightOpenIntent } from "../open";
|
||||
import type { inferSearchInteractionOptions } from "../lib/interaction";
|
||||
import type { SearchMode } from "../lib/mode";
|
||||
import { useSpotlightCatalogs } from "../lib/catalog";
|
||||
import { searchModes } from "../modes";
|
||||
import { useHomeEmptyGroupsWithPreferences } from "../modes/help/home-empty-groups";
|
||||
import { mediaRequestSearchScopeAtom, selectAction, spotlightActions, spotlightStore } from "../spotlight-store";
|
||||
import { SpotlightChildrenActions } from "./actions/children-actions";
|
||||
import { SpotlightActionGroups } from "./actions/groups/action-group";
|
||||
import { SpotlightModeRail } from "./mode-rail";
|
||||
import { SpotlightNoResults } from "./no-results";
|
||||
import classes from "./spotlight.module.css";
|
||||
|
||||
type SearchModeKey = keyof TranslationObject["search"]["mode"];
|
||||
type ChildrenOptions = inferSearchInteractionOptions<"children">;
|
||||
|
||||
const defaultMode = "home";
|
||||
export const Spotlight = () => {
|
||||
const searchModeState = useState<SearchModeKey>(defaultMode);
|
||||
const queryState = useState("");
|
||||
const mode = searchModeState[0];
|
||||
const activeMode = useMemo(() => searchModes.find((searchMode) => searchMode.modeKey === mode), [mode]);
|
||||
const defaultMode: SpotlightMode = "search";
|
||||
|
||||
if (!activeMode) {
|
||||
return null;
|
||||
}
|
||||
const resetSelection = () => {
|
||||
requestAnimationFrame(() => selectAction(0, spotlightStore));
|
||||
};
|
||||
|
||||
export const Spotlight = () => {
|
||||
useSpotlightCatalogs();
|
||||
|
||||
const [mode, setMode] = useState<SpotlightMode>(defaultMode);
|
||||
const [query, setQuery] = useState("");
|
||||
const setMediaRequestSearchScope = useSetAtom(mediaRequestSearchScopeAtom);
|
||||
const activeMode = useMemo(() => searchModes.find((searchMode) => searchMode.mode === mode), [mode]);
|
||||
|
||||
const applyOpenOptions = useCallback(
|
||||
(options: SpotlightOpenIntent) => {
|
||||
setMode(options.mode);
|
||||
setQuery(options.query ?? "");
|
||||
if (options.mode !== "media") setMediaRequestSearchScope({});
|
||||
spotlightActions.open();
|
||||
resetSelection();
|
||||
},
|
||||
[setMediaRequestSearchScope],
|
||||
);
|
||||
|
||||
useEffect(() => {
|
||||
const handleOpen = (event: Event) => {
|
||||
const pendingOptions = consumePendingSpotlightOpen();
|
||||
const eventOptions = (event as CustomEvent<SpotlightOpenIntent>).detail;
|
||||
applyOpenOptions(eventOptions ?? pendingOptions ?? { mode: defaultMode });
|
||||
};
|
||||
|
||||
window.addEventListener(spotlightOpenEvent, handleOpen);
|
||||
const pendingOptions = consumePendingSpotlightOpen();
|
||||
if (pendingOptions) applyOpenOptions(pendingOptions);
|
||||
return () => window.removeEventListener(spotlightOpenEvent, handleOpen);
|
||||
}, [applyOpenOptions]);
|
||||
|
||||
useEffect(() => {
|
||||
const applyMediaRequestSearch = ({ integrationIds, query: mediaQuery }: OpenMediaRequestSearchOptions) => {
|
||||
setMediaRequestSearchScope({ integrationIds });
|
||||
applyOpenOptions({ mode: "media", query: mediaQuery });
|
||||
};
|
||||
|
||||
const handleMediaRequestSearch = (event: Event) => {
|
||||
const pendingOptions = consumePendingMediaRequestSearch();
|
||||
const eventOptions = (event as CustomEvent<OpenMediaRequestSearchOptions>).detail;
|
||||
applyMediaRequestSearch(eventOptions ?? pendingOptions ?? {});
|
||||
};
|
||||
|
||||
window.addEventListener(mediaRequestSearchEvent, handleMediaRequestSearch);
|
||||
const pendingOptions = consumePendingMediaRequestSearch();
|
||||
if (pendingOptions) applyMediaRequestSearch(pendingOptions);
|
||||
return () => window.removeEventListener(mediaRequestSearchEvent, handleMediaRequestSearch);
|
||||
}, [applyOpenOptions, setMediaRequestSearchScope]);
|
||||
|
||||
if (!activeMode) return null;
|
||||
|
||||
return (
|
||||
<SpotlightWithActiveMode key={mode} modeState={searchModeState} queryState={queryState} activeMode={activeMode} />
|
||||
<SpotlightWithActiveMode
|
||||
key={mode}
|
||||
mode={mode}
|
||||
setMode={setMode}
|
||||
query={query}
|
||||
setQuery={setQuery}
|
||||
activeMode={activeMode}
|
||||
/>
|
||||
);
|
||||
};
|
||||
|
||||
interface SpotlightWithActiveModeProps {
|
||||
modeState: [SearchModeKey, Dispatch<SetStateAction<SearchModeKey>>];
|
||||
queryState: [string, Dispatch<SetStateAction<string>>];
|
||||
mode: SpotlightMode;
|
||||
setMode: Dispatch<SetStateAction<SpotlightMode>>;
|
||||
query: string;
|
||||
setQuery: Dispatch<SetStateAction<string>>;
|
||||
activeMode: SearchMode;
|
||||
}
|
||||
|
||||
const SpotlightWithActiveMode = ({ modeState, queryState, activeMode }: SpotlightWithActiveModeProps) => {
|
||||
const [query, setQuery] = queryState;
|
||||
const [mode, setMode] = modeState;
|
||||
const SpotlightWithActiveMode = ({ mode, setMode, query, setQuery, activeMode }: SpotlightWithActiveModeProps) => {
|
||||
const [childrenStack, setChildrenStack] = useState<ChildrenOptions[]>([]);
|
||||
const childrenOptions = childrenStack.at(-1) ?? null;
|
||||
const t = useI18n();
|
||||
const inputRef = useRef<HTMLInputElement>(null);
|
||||
const setMediaRequestSearchScope = useSetAtom(mediaRequestSearchScopeAtom);
|
||||
const useGroups = "groups" in activeMode ? () => activeMode.groups : activeMode.useGroups;
|
||||
const groups = useGroups();
|
||||
const homeEmptyGroups = useHomeEmptyGroupsWithPreferences();
|
||||
const hasModeCharacter = activeMode.modeKey !== defaultMode && activeMode.character !== undefined;
|
||||
const hasModeCharacter = activeMode.character !== undefined;
|
||||
const activeModeLabel = translateIfNecessary(t, activeMode.label) ?? activeMode.mode;
|
||||
const placeholder = translateIfNecessary(t, activeMode.placeholder) ?? t("search.placeholder");
|
||||
const modeRailEntries = searchModes.map((searchMode) => {
|
||||
const label = translateIfNecessary(t, searchMode.label) ?? searchMode.mode;
|
||||
return {
|
||||
mode: searchMode.mode,
|
||||
character: searchMode.character,
|
||||
label,
|
||||
ariaLabel: t("search.modePicker.modeAriaLabel", { mode: label }),
|
||||
};
|
||||
});
|
||||
|
||||
useEffect(() => {
|
||||
const handleOpen = () => {
|
||||
consumePendingSpotlightOpen();
|
||||
spotlightActions.open();
|
||||
};
|
||||
|
||||
window.addEventListener(spotlightOpenEvent, handleOpen);
|
||||
if (consumePendingSpotlightOpen()) spotlightActions.open();
|
||||
return () => window.removeEventListener(spotlightOpenEvent, handleOpen);
|
||||
requestAnimationFrame(() => inputRef.current?.focus());
|
||||
}, []);
|
||||
|
||||
const clearChildrenStack = useCallback(() => {
|
||||
setChildrenStack([]);
|
||||
}, []);
|
||||
|
||||
const changeMode = useCallback(
|
||||
(nextMode: SpotlightMode, preserveQuery = true) => {
|
||||
setMode(nextMode);
|
||||
clearChildrenStack();
|
||||
if (!preserveQuery) setQuery("");
|
||||
resetSelection();
|
||||
requestAnimationFrame(() => inputRef.current?.focus());
|
||||
},
|
||||
[clearChildrenStack, setMode, setQuery],
|
||||
);
|
||||
|
||||
const pushChildrenOptions = useCallback(
|
||||
(options: ChildrenOptions) => {
|
||||
setChildrenStack((currentStack) => [...currentStack, options]);
|
||||
setQuery("");
|
||||
setTimeout(() => selectAction(0, spotlightStore));
|
||||
resetSelection();
|
||||
},
|
||||
[setQuery],
|
||||
);
|
||||
@@ -91,44 +159,22 @@ const SpotlightWithActiveMode = ({ modeState, queryState, activeMode }: Spotligh
|
||||
const popChildrenOptions = useCallback(() => {
|
||||
setChildrenStack((currentStack) => currentStack.slice(0, -1));
|
||||
setQuery("");
|
||||
setTimeout(() => selectAction(0, spotlightStore));
|
||||
resetSelection();
|
||||
}, [setQuery]);
|
||||
|
||||
useEffect(() => {
|
||||
const applyMediaRequestSearch = ({ integrationIds, query: searchQuery }: OpenMediaRequestSearchOptions) => {
|
||||
setMediaRequestSearchScope({ integrationIds });
|
||||
setMode("media");
|
||||
clearChildrenStack();
|
||||
setQuery(searchQuery ?? "");
|
||||
spotlightActions.open();
|
||||
setTimeout(() => selectAction(0, spotlightStore));
|
||||
};
|
||||
|
||||
const handleMediaRequestSearch = (event: Event) => {
|
||||
consumePendingMediaRequestSearch();
|
||||
const { integrationIds, query: searchQuery } = (event as CustomEvent<OpenMediaRequestSearchOptions>).detail ?? {};
|
||||
applyMediaRequestSearch({ integrationIds, query: searchQuery });
|
||||
};
|
||||
|
||||
window.addEventListener(mediaRequestSearchEvent, handleMediaRequestSearch);
|
||||
const pendingSearch = consumePendingMediaRequestSearch();
|
||||
if (pendingSearch) applyMediaRequestSearch(pendingSearch);
|
||||
return () => {
|
||||
window.removeEventListener(mediaRequestSearchEvent, handleMediaRequestSearch);
|
||||
};
|
||||
}, [setMediaRequestSearchScope, setMode, setQuery, clearChildrenStack]);
|
||||
|
||||
useEffect(() => {
|
||||
if (mode !== "media") {
|
||||
setMediaRequestSearchScope({});
|
||||
}
|
||||
}, [mode, setMediaRequestSearchScope]);
|
||||
|
||||
return (
|
||||
<MantineSpotlight.Root
|
||||
shortcut={hotkeys.openSpotlight}
|
||||
yOffset={8}
|
||||
overlayProps={{ blur: 2, backgroundOpacity: 0.2 }}
|
||||
shortcut={null}
|
||||
size={760}
|
||||
yOffset={64}
|
||||
scrollable
|
||||
maxHeight="min(62vh, 560px)"
|
||||
overlayProps={{ blur: 3, backgroundOpacity: 0.24 }}
|
||||
attributes={{ content: { "aria-label": t("search.modePicker.dialogAriaLabel", { mode: activeModeLabel }) } }}
|
||||
classNames={{ content: classes.content }}
|
||||
onSpotlightOpen={() => {
|
||||
requestAnimationFrame(() => inputRef.current?.focus());
|
||||
}}
|
||||
onSpotlightClose={() => {
|
||||
setMode(defaultMode);
|
||||
clearChildrenStack();
|
||||
@@ -139,22 +185,24 @@ const SpotlightWithActiveMode = ({ modeState, queryState, activeMode }: Spotligh
|
||||
const sanitizedQuery = mode === "external" && nextQuery.startsWith("!") ? nextQuery.slice(1) : nextQuery;
|
||||
setQuery(sanitizedQuery);
|
||||
|
||||
if (sanitizedQuery.length !== 1) return;
|
||||
if (sanitizedQuery.length === 1) {
|
||||
const modeToActivate = searchModes.find((searchMode) => searchMode.character === sanitizedQuery);
|
||||
if (modeToActivate) {
|
||||
changeMode(modeToActivate.mode, false);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
const modeToActivate = searchModes.find((searchMode) => searchMode.character === sanitizedQuery);
|
||||
if (!modeToActivate) return;
|
||||
|
||||
setMode(modeToActivate.modeKey);
|
||||
clearChildrenStack();
|
||||
setQuery("");
|
||||
setTimeout(() => selectAction(0, spotlightStore));
|
||||
resetSelection();
|
||||
}}
|
||||
store={spotlightStore}
|
||||
>
|
||||
<MantineSpotlight.Search
|
||||
data-homarr-dev-benchmark-spotlight
|
||||
placeholder={`${t("search.placeholder")}...`}
|
||||
aria-label={placeholder}
|
||||
placeholder={placeholder}
|
||||
ref={inputRef}
|
||||
className={classes.search}
|
||||
leftSectionWidth={hasModeCharacter ? 80 : 48}
|
||||
leftSection={
|
||||
<Group align="center" wrap="nowrap" gap="xs" w="100%" h="100%">
|
||||
@@ -164,11 +212,7 @@ const SpotlightWithActiveMode = ({ modeState, queryState, activeMode }: Spotligh
|
||||
{hasModeCharacter ? <Kbd size="sm">{activeMode.character}</Kbd> : null}
|
||||
</Group>
|
||||
}
|
||||
styles={{
|
||||
section: {
|
||||
pointerEvents: "all",
|
||||
},
|
||||
}}
|
||||
styles={{ section: { pointerEvents: "all" } }}
|
||||
rightSection={
|
||||
mode === defaultMode && childrenStack.length === 0 ? null : (
|
||||
<ActionIcon
|
||||
@@ -184,9 +228,7 @@ const SpotlightWithActiveMode = ({ modeState, queryState, activeMode }: Spotligh
|
||||
return;
|
||||
}
|
||||
|
||||
setMode(defaultMode);
|
||||
clearChildrenStack();
|
||||
inputRef.current?.focus();
|
||||
changeMode(defaultMode, true);
|
||||
}}
|
||||
variant="subtle"
|
||||
aria-label={
|
||||
@@ -208,20 +250,28 @@ const SpotlightWithActiveMode = ({ modeState, queryState, activeMode }: Spotligh
|
||||
return;
|
||||
}
|
||||
|
||||
if (mode !== defaultMode) {
|
||||
setMode(defaultMode);
|
||||
clearChildrenStack();
|
||||
}
|
||||
if (mode !== defaultMode) changeMode(defaultMode, true);
|
||||
}}
|
||||
/>
|
||||
|
||||
<SpotlightModeRail
|
||||
activeMode={mode}
|
||||
entries={modeRailEntries}
|
||||
navigationLabel={t("search.modePicker.navigationLabel")}
|
||||
onModeChange={changeMode}
|
||||
/>
|
||||
|
||||
{childrenOptions ? (
|
||||
<Group key={childrenStack.length}>
|
||||
<childrenOptions.DetailComponent options={childrenOptions.option as never} />
|
||||
</Group>
|
||||
) : null}
|
||||
|
||||
<MantineSpotlight.ActionsList>
|
||||
<MantineSpotlight.ActionsList
|
||||
component="section"
|
||||
className={classes.actionsList}
|
||||
aria-label={t("search.modePicker.resultsAriaLabel", { mode: activeModeLabel })}
|
||||
>
|
||||
{childrenOptions ? (
|
||||
<SpotlightChildrenActions
|
||||
key={childrenStack.length}
|
||||
@@ -232,19 +282,46 @@ const SpotlightWithActiveMode = ({ modeState, queryState, activeMode }: Spotligh
|
||||
) : (
|
||||
<SpotlightActionGroups
|
||||
setQuery={setQuery}
|
||||
setMode={(nextMode) => {
|
||||
setMode(nextMode);
|
||||
clearChildrenStack();
|
||||
setTimeout(() => selectAction(0, spotlightStore));
|
||||
}}
|
||||
setChildrenOptions={(options) => {
|
||||
pushChildrenOptions(options);
|
||||
}}
|
||||
setMode={(nextMode) => changeMode(nextMode, true)}
|
||||
setChildrenOptions={pushChildrenOptions}
|
||||
query={query}
|
||||
groups={mode === defaultMode && query.length === 0 ? [...homeEmptyGroups] : groups}
|
||||
groups={groups}
|
||||
/>
|
||||
)}
|
||||
<SpotlightNoResults className={classes.emptyState} />
|
||||
</MantineSpotlight.ActionsList>
|
||||
|
||||
<MantineSpotlight.Footer className={classes.footer} px="md" py="xs">
|
||||
<Group justify="space-between" wrap="nowrap">
|
||||
<Group gap="xs" wrap="nowrap">
|
||||
<Group gap={4} wrap="nowrap">
|
||||
<Kbd size="xs">
|
||||
<IconArrowUp size={11} />
|
||||
</Kbd>
|
||||
<Kbd size="xs">
|
||||
<IconArrowDown size={11} />
|
||||
</Kbd>
|
||||
<Text size="xs" className={classes.footerHint}>
|
||||
{t("search.modePicker.footer.navigate")}
|
||||
</Text>
|
||||
</Group>
|
||||
<Group gap={4} wrap="nowrap">
|
||||
<Kbd size="xs">
|
||||
<IconCornerDownLeft size={11} />
|
||||
</Kbd>
|
||||
<Text size="xs" className={classes.footerHint}>
|
||||
{t("search.modePicker.footer.open")}
|
||||
</Text>
|
||||
</Group>
|
||||
</Group>
|
||||
<Group gap={4} wrap="nowrap" className={classes.footerSecondary}>
|
||||
<Kbd size="xs">esc</Kbd>
|
||||
<Text size="xs" className={classes.footerHint}>
|
||||
{t("search.modePicker.footer.close")}
|
||||
</Text>
|
||||
</Group>
|
||||
</Group>
|
||||
</MantineSpotlight.Footer>
|
||||
</MantineSpotlight.Root>
|
||||
);
|
||||
};
|
||||
Reference in new issue
Block a user