diff --git a/rsconcept/frontend/src/app/Navigation/ToggleNavigationButton.tsx b/rsconcept/frontend/src/app/Navigation/ToggleNavigationButton.tsx index 556b1acb..ce564c40 100644 --- a/rsconcept/frontend/src/app/Navigation/ToggleNavigationButton.tsx +++ b/rsconcept/frontend/src/app/Navigation/ToggleNavigationButton.tsx @@ -14,8 +14,9 @@ function ToggleNavigationButton() { tabIndex={-1} className={clsx( 'absolute top-0 right-0 z-navigation flex items-center justify-center', - 'clr-btn-nav', - 'select-none' + 'clr-hover', + 'select-none', + 'min-h-[2rem]' )} onClick={toggleNoNavigation} initial={false} diff --git a/rsconcept/frontend/src/components/RSInput/clickNavigation.ts b/rsconcept/frontend/src/components/RSInput/clickNavigation.ts index 9e26ac92..8379a783 100644 --- a/rsconcept/frontend/src/components/RSInput/clickNavigation.ts +++ b/rsconcept/frontend/src/components/RSInput/clickNavigation.ts @@ -7,7 +7,7 @@ import { findAliasAt } from '@/utils/codemirror'; const navigationProducer = (schema: IRSForm, onOpenEdit: (cstID: ConstituentaID) => void) => { return EditorView.domEventHandlers({ click: (event: MouseEvent, view: EditorView) => { - if (!event.ctrlKey) { + if (!event.ctrlKey && !event.metaKey) { return; } diff --git a/rsconcept/frontend/src/components/RefsInput/clickNavigation.ts b/rsconcept/frontend/src/components/RefsInput/clickNavigation.ts index 3a3a4a14..48cbad4b 100644 --- a/rsconcept/frontend/src/components/RefsInput/clickNavigation.ts +++ b/rsconcept/frontend/src/components/RefsInput/clickNavigation.ts @@ -7,7 +7,7 @@ import { findReferenceAt } from '@/utils/codemirror'; const navigationProducer = (schema: IRSForm, onOpenEdit: (cstID: ConstituentaID) => void) => { return EditorView.domEventHandlers({ click: (event: MouseEvent, view: EditorView) => { - if (!event.ctrlKey) { + if (!event.ctrlKey && !event.metaKey) { return; } diff --git a/rsconcept/frontend/src/pages/LibraryPage/LibraryFolders.tsx b/rsconcept/frontend/src/pages/LibraryPage/LibraryFolders.tsx index 14d58be9..05a407d0 100644 --- a/rsconcept/frontend/src/pages/LibraryPage/LibraryFolders.tsx +++ b/rsconcept/frontend/src/pages/LibraryPage/LibraryFolders.tsx @@ -54,7 +54,7 @@ function LibraryFolders({ folders, currentFolder, setFolder, toggleFolderMode }: (event: CProps.EventMouse, target: FolderNode) => { event.preventDefault(); event.stopPropagation(); - if (event.ctrlKey) { + if (event.ctrlKey || event.metaKey) { navigator.clipboard .writeText(target.getPath()) .then(() => toast.success(information.pathReady)) diff --git a/rsconcept/frontend/src/pages/LibraryPage/SearchPanel.tsx b/rsconcept/frontend/src/pages/LibraryPage/SearchPanel.tsx index 9175f409..89810182 100644 --- a/rsconcept/frontend/src/pages/LibraryPage/SearchPanel.tsx +++ b/rsconcept/frontend/src/pages/LibraryPage/SearchPanel.tsx @@ -5,19 +5,16 @@ import { useCallback } from 'react'; import { LocationIcon, SubscribeIcon, VisibilityIcon } from '@/components/DomainIcons'; import { IconEditor, IconFilterReset, IconFolder, IconFolderTree, IconOwner } from '@/components/Icons'; -import BadgeHelp from '@/components/info/BadgeHelp'; import { CProps } from '@/components/props'; import Dropdown from '@/components/ui/Dropdown'; import DropdownButton from '@/components/ui/DropdownButton'; import MiniButton from '@/components/ui/MiniButton'; -import Overlay from '@/components/ui/Overlay'; import SearchBar from '@/components/ui/SearchBar'; import SelectorButton from '@/components/ui/SelectorButton'; import { useAuth } from '@/context/AuthContext'; import useDropdown from '@/hooks/useDropdown'; import { LocationHead } from '@/models/library'; -import { HelpTopic } from '@/models/miscellaneous'; -import { PARAMETER, prefixes } from '@/utils/constants'; +import { prefixes } from '@/utils/constants'; import { describeLocationHead, labelLocationHead } from '@/utils/labels'; import { tripleToggleColor } from '@/utils/utils'; @@ -90,7 +87,7 @@ function SearchPanel({ const handleFolderClick = useCallback( (event: CProps.EventMouse) => { - if (event.ctrlKey) { + if (event.ctrlKey || event.metaKey) { toggleFolderMode(); } else { headMenu.toggle(); @@ -218,14 +215,6 @@ function SearchPanel({ /> ) : null} - - - ); }