2
0
mirror of https://github.com/inventree/InvenTree.git synced 2025-08-09 21:30:54 +00:00

fix spotlight

This commit is contained in:
Matthias Mair
2024-04-15 18:40:33 +02:00
parent f9ff5e611d
commit 80bec8617b
4 changed files with 26 additions and 30 deletions

View File

@@ -1,14 +1,15 @@
import { t } from '@lingui/macro'; import { t } from '@lingui/macro';
import { ActionIcon } from '@mantine/core'; import { ActionIcon } from '@mantine/core';
import { spotlight } from '@mantine/spotlight';
import { IconCommand } from '@tabler/icons-react'; import { IconCommand } from '@tabler/icons-react';
import { firstSpotlight } from '../nav/Layout';
/** /**
* A button which opens the quick command modal * A button which opens the quick command modal
*/ */
export function SpotlightButton() { export function SpotlightButton() {
return ( return (
<ActionIcon onClick={() => spotlight.open()} title={t`Open spotlight`}> <ActionIcon onClick={() => firstSpotlight.open()} title={t`Open spotlight`}>
<IconCommand /> <IconCommand />
</ActionIcon> </ActionIcon>
); );

View File

@@ -1,8 +1,7 @@
import { t } from '@lingui/macro'; import { t } from '@lingui/macro';
import { Container, Flex, Space } from '@mantine/core'; import { Container, Flex, Space } from '@mantine/core';
import { Spotlight } from '@mantine/spotlight'; import { Spotlight, createSpotlight } from '@mantine/spotlight';
import { IconSearch } from '@tabler/icons-react'; import { IconSearch } from '@tabler/icons-react';
import { useEffect, useState } from 'react';
import { Navigate, Outlet, useLocation, useNavigate } from 'react-router-dom'; import { Navigate, Outlet, useLocation, useNavigate } from 'react-router-dom';
import { getActions } from '../../defaults/actions'; import { getActions } from '../../defaults/actions';
@@ -25,24 +24,11 @@ export const ProtectedRoute = ({ children }: { children: JSX.Element }) => {
return children; return children;
}; };
export const [firstStore, firstSpotlight] = createSpotlight();
export default function LayoutComponent() { export default function LayoutComponent() {
const navigate = useNavigate(); const navigate = useNavigate();
const location = useLocation();
const defaultactions = getActions(navigate); const defaultactions = getActions(navigate);
const [actions, setActions] = useState(defaultactions);
const [customActions, setCustomActions] = useState<boolean>(false);
function actionsAreChanging(change: []) {
if (change.length > defaultactions.length) setCustomActions(true);
setActions(change);
}
useEffect(() => {
if (customActions) {
setActions(defaultactions);
setCustomActions(false);
}
}, [location]);
return ( return (
<ProtectedRoute> <ProtectedRoute>
@@ -54,10 +40,14 @@ export default function LayoutComponent() {
<Space h="xl" /> <Space h="xl" />
<Footer /> <Footer />
<Spotlight <Spotlight
actions={actions} actions={defaultactions}
store={firstStore}
//onActionsChange={actionsAreChanging} //onActionsChange={actionsAreChanging}
//searchIcon={<IconSearch size="1.2rem" />} highlightQuery
//searchPlaceholder={t`Search...`} searchProps={{
leftSection: <IconSearch size="1.2rem" />,
placeholder: t`Search...`
}}
shortcut={['mod + K', '/']} shortcut={['mod + K', '/']}
nothingFound={t`Nothing found...`} nothingFound={t`Nothing found...`}
/> />

View File

@@ -93,7 +93,9 @@ export const subLink = style({
// : vars.colors.gray[0] // : vars.colors.gray[0]
// }) // })
':active': vars.activeStyles ':active': {
color: vars.colors.defaultHover
}
}); });
export const docHover = style({ export const docHover = style({

View File

@@ -2,13 +2,13 @@ import { Trans } from '@lingui/macro';
import { Button, Card, Stack, TextInput } from '@mantine/core'; import { Button, Card, Stack, TextInput } from '@mantine/core';
import { Group, Text } from '@mantine/core'; import { Group, Text } from '@mantine/core';
import { Accordion } from '@mantine/core'; import { Accordion } from '@mantine/core';
import { spotlight } from '@mantine/spotlight';
import { IconAlien } from '@tabler/icons-react'; import { IconAlien } from '@tabler/icons-react';
import { ReactNode, useMemo, useState } from 'react'; import { ReactNode, useMemo, useState } from 'react';
import { OptionsApiForm } from '../../components/forms/ApiForm'; import { OptionsApiForm } from '../../components/forms/ApiForm';
import { PlaceholderPill } from '../../components/items/Placeholder'; import { PlaceholderPill } from '../../components/items/Placeholder';
import { StylishText } from '../../components/items/StylishText'; import { StylishText } from '../../components/items/StylishText';
import { firstSpotlight } from '../../components/nav/Layout';
import { StatusRenderer } from '../../components/render/StatusRenderer'; import { StatusRenderer } from '../../components/render/StatusRenderer';
import { ApiEndpoints } from '../../enums/ApiEndpoints'; import { ApiEndpoints } from '../../enums/ApiEndpoints';
import { ModelType } from '../../enums/ModelType'; import { ModelType } from '../../enums/ModelType';
@@ -18,6 +18,7 @@ import {
useCreateApiFormModal, useCreateApiFormModal,
useEditApiFormModal useEditApiFormModal
} from '../../hooks/UseForm'; } from '../../hooks/UseForm';
import { useSpotlightState } from '../../states/SpotlightState';
// Generate some example forms using the modal API forms interface // Generate some example forms using the modal API forms interface
const fields = partCategoryFields({}); const fields = partCategoryFields({});
@@ -175,25 +176,27 @@ function SpotlighPlayground() {
<Button <Button
variant="outline" variant="outline"
onClick={() => { onClick={() => {
spotlight.registerActions([ const setAdditionalActions =
useSpotlightState.getState().setAdditionalActions;
setAdditionalActions([
{ {
id: 'secret-action-1', id: 'secret-action-1',
title: 'Secret action', title: 'Secret action',
description: 'It was registered with a button click', description: 'It was registered with a button click',
icon: <IconAlien size="1.2rem" />, leftSection: <IconAlien size="1.2rem" />,
onTrigger: () => console.log('Secret') onClick: () => console.log('Secret')
}, },
{ {
id: 'secret-action-2', id: 'secret-action-2',
title: 'Another secret action', title: 'Another secret action',
description: description:
'You can register multiple actions with just one command', 'You can register multiple actions with just one command',
icon: <IconAlien size="1.2rem" />, leftSection: <IconAlien size="1.2rem" />,
onTrigger: () => console.log('Secret') onClick: () => console.log('Secret')
} }
]); ]);
console.log('registed'); console.log('registed');
spotlight.open(); firstSpotlight.open();
}} }}
> >
Register extra actions Register extra actions