From 48fe6a980cc6246d50cbd9f7c63541453ea1e0c3 Mon Sep 17 00:00:00 2001 From: Carlos Valente Date: Fri, 20 Jun 2025 20:37:12 +0200 Subject: [PATCH] refactor: improvements to navigation --- .../components/navigation-menu/ViewNavigationMenu.tsx | 3 +++ .../view-params-editor/ViewParamsSection.module.scss | 4 ---- e2e/tests/002-view-navigation.spec.ts | 11 ++++------- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/apps/client/src/common/components/navigation-menu/ViewNavigationMenu.tsx b/apps/client/src/common/components/navigation-menu/ViewNavigationMenu.tsx index 454d540cc..a10fed16f 100644 --- a/apps/client/src/common/components/navigation-menu/ViewNavigationMenu.tsx +++ b/apps/client/src/common/components/navigation-menu/ViewNavigationMenu.tsx @@ -1,5 +1,6 @@ import { memo } from 'react'; import { useDisclosure } from '@chakra-ui/react'; +import { useHotkeys } from '@mantine/hooks'; import FloatingNavigation from './FloatingNavigation'; import NavigationMenu from './NavigationMenu'; @@ -18,6 +19,8 @@ function ViewNavigationMenu(props: ViewNavigationMenuProps) { const toggleMenu = () => (isMenuOpen ? onMenuClose() : onMenuOpen()); + useHotkeys([['mod + ,', () => toggleMenu()]]); + if (isViewLocked) { return ; } diff --git a/apps/client/src/common/components/view-params-editor/ViewParamsSection.module.scss b/apps/client/src/common/components/view-params-editor/ViewParamsSection.module.scss index 7959d3254..f58b04a74 100644 --- a/apps/client/src/common/components/view-params-editor/ViewParamsSection.module.scss +++ b/apps/client/src/common/components/view-params-editor/ViewParamsSection.module.scss @@ -11,10 +11,6 @@ &.collapsible { cursor: pointer; - - &:hover { - border-bottom: 1px solid $white-10; - } } } diff --git a/e2e/tests/002-view-navigation.spec.ts b/e2e/tests/002-view-navigation.spec.ts index 3a1b011ba..b93f83330 100644 --- a/e2e/tests/002-view-navigation.spec.ts +++ b/e2e/tests/002-view-navigation.spec.ts @@ -1,6 +1,6 @@ -import { expect, test } from '@playwright/test'; +import { expect, type Page, test } from '@playwright/test'; -test.describe.fixme('test view navigation feature', () => { +test.describe('test view navigation feature', () => { test.beforeEach(async ({ page }) => { await page.goto('http://localhost:4001/'); page.locator('data-test-id=timer-view'); @@ -71,9 +71,6 @@ test.describe.fixme('test view navigation feature', () => { }); }); -async function openNavigationMenu(page) { - // await page.mouse.move(Math.random() * 100, Math.random() * 100); FIXME: mouse.move dose not work in github actions - await page.keyboard.press('T'); - await page.getByRole('button', { name: 'toggle menu' }).click(); - page.locator('data-test-id=navigation__menu'); +async function openNavigationMenu(page: Page) { + await page.keyboard.press('ControlOrMeta + ,'); }