From 5ba1e9e565e0f21793d0fcb96a1267f9e661f610 Mon Sep 17 00:00:00 2001 From: Tilman Vatteroth Date: Sun, 16 Oct 2022 23:15:52 +0200 Subject: [PATCH] feat(splitter): add snapping, icon and buttons to splitter Signed-off-by: Tilman Vatteroth --- cypress/e2e/documentTitle.spec.ts | 1 - cypress/e2e/editorMode.spec.ts | 25 - .../editor-page/app-bar/app-bar.tsx | 2 - .../editor-page/app-bar/editor-view-mode.tsx | 54 -- .../document-bar/share/share-modal.tsx | 6 +- .../editor-page/editor-page-content.tsx | 10 +- .../hooks/use-editor-mode-from-url.ts | 24 - .../hooks/use-view-mode-shortcuts.ts | 40 - .../__snapshots__/splitter.test.tsx.snap | 742 ++++++++++++++---- .../use-adjusted-relative-split-value.ts | 30 - .../splitter/hooks/use-keyboard-shortcuts.ts | 38 + .../split-divider/split-divider.module.scss | 59 +- .../splitter/split-divider/split-divider.tsx | 55 +- .../editor-page/splitter/splitter.module.scss | 25 +- .../editor-page/splitter/splitter.test.tsx | 29 +- .../editor-page/splitter/splitter.tsx | 113 ++- src/redux/editor/methods.ts | 12 +- src/redux/editor/reducers.ts | 9 - src/redux/editor/types.ts | 8 - 19 files changed, 822 insertions(+), 460 deletions(-) delete mode 100644 cypress/e2e/editorMode.spec.ts delete mode 100644 src/components/editor-page/app-bar/editor-view-mode.tsx delete mode 100644 src/components/editor-page/hooks/use-editor-mode-from-url.ts delete mode 100644 src/components/editor-page/hooks/use-view-mode-shortcuts.ts delete mode 100644 src/components/editor-page/splitter/hooks/use-adjusted-relative-split-value.ts create mode 100644 src/components/editor-page/splitter/hooks/use-keyboard-shortcuts.ts diff --git a/cypress/e2e/documentTitle.spec.ts b/cypress/e2e/documentTitle.spec.ts index f450237d4..8db4821f7 100644 --- a/cypress/e2e/documentTitle.spec.ts +++ b/cypress/e2e/documentTitle.spec.ts @@ -10,7 +10,6 @@ const title = 'This is a test title' describe('Document Title', () => { beforeEach(() => { cy.visitTestNote() - cy.getByCypressId('view-mode-both').should('exist') }) describe('title should be yaml metadata title', () => { diff --git a/cypress/e2e/editorMode.spec.ts b/cypress/e2e/editorMode.spec.ts deleted file mode 100644 index a1f70adb2..000000000 --- a/cypress/e2e/editorMode.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -/* - * SPDX-FileCopyrightText: 2022 The HedgeDoc developers (see AUTHORS file) - * - * SPDX-License-Identifier: AGPL-3.0-only - */ - -import { PAGE_MODE } from '../support/visit' - -describe('Editor mode from URL parameter is used', () => { - it('mode view', () => { - cy.visitTestNote(PAGE_MODE.EDITOR, 'view') - cy.getByCypressId('editor-pane').should('not.be.visible') - cy.getByCypressId('documentIframe').should('be.visible') - }) - it('mode both', () => { - cy.visitTestNote(PAGE_MODE.EDITOR, 'both') - cy.getByCypressId('editor-pane').should('be.visible') - cy.getByCypressId('documentIframe').should('be.visible') - }) - it('mode edit', () => { - cy.visitTestNote(PAGE_MODE.EDITOR, 'edit') - cy.getByCypressId('editor-pane').should('be.visible') - cy.getByCypressId('documentIframe').should('not.be.visible') - }) -}) diff --git a/src/components/editor-page/app-bar/app-bar.tsx b/src/components/editor-page/app-bar/app-bar.tsx index 9c5d3fbcf..7d8f35b7a 100644 --- a/src/components/editor-page/app-bar/app-bar.tsx +++ b/src/components/editor-page/app-bar/app-bar.tsx @@ -10,7 +10,6 @@ import { ShowIf } from '../../common/show-if/show-if' import { SignInButton } from '../../landing-layout/navigation/sign-in-button' import { UserDropdown } from '../../landing-layout/navigation/user-dropdown' import { DarkModeButton } from './dark-mode-button' -import { EditorViewMode } from './editor-view-mode' import { HelpButton } from './help-button/help-button' import { NavbarBranding } from './navbar-branding' import { SyncScrollButtons } from './sync-scroll-buttons/sync-scroll-buttons' @@ -43,7 +42,6 @@ export const AppBar: React.FC = ({ mode }) => {