From 2be4ec7f227be80ae84eaf35f0156fb2960d719c Mon Sep 17 00:00:00 2001 From: ilya-bkv Date: Sun, 26 Mar 2023 10:19:36 +0300 Subject: [PATCH] revert edior form --- .../EditorBubbleMenu/EditorBubbleMenu.tsx | 2 - .../LinkForm/LinkForm.module.scss | 38 --------- .../EditorBubbleMenu/LinkForm/LinkForm.tsx | 78 ------------------- .../Editor/EditorBubbleMenu/LinkForm/index.ts | 1 - src/components/Editor/EditorFloatingMenu.tsx | 1 + 5 files changed, 1 insertion(+), 119 deletions(-) delete mode 100644 src/components/Editor/EditorBubbleMenu/LinkForm/LinkForm.module.scss delete mode 100644 src/components/Editor/EditorBubbleMenu/LinkForm/LinkForm.tsx delete mode 100644 src/components/Editor/EditorBubbleMenu/LinkForm/index.ts diff --git a/src/components/Editor/EditorBubbleMenu/EditorBubbleMenu.tsx b/src/components/Editor/EditorBubbleMenu/EditorBubbleMenu.tsx index 2aec84bf..8de91a56 100644 --- a/src/components/Editor/EditorBubbleMenu/EditorBubbleMenu.tsx +++ b/src/components/Editor/EditorBubbleMenu/EditorBubbleMenu.tsx @@ -5,7 +5,6 @@ import { Icon } from '../../_shared/Icon' import { clsx } from 'clsx' import { createEditorTransaction } from 'solid-tiptap' import { useLocalize } from '../../../context/localize' -import { LinkForm } from './LinkForm' import validateUrl from '../../../utils/validateUrl' type BubbleMenuProps = { @@ -92,7 +91,6 @@ export const EditorBubbleMenu = (props: BubbleMenuProps) => { <> - {/**/}
{ - const { t } = useLocalize() - const [editorOpen, setEditorOpen] = createSignal(props.editorOpen) - const [url, setUrl] = createSignal('') - const [linkError, setLinkError] = createSignal(null) - - createSignal(() => { - setEditorOpen(props.editorOpen) - }) - const currentUrl = createEditorTransaction( - () => props.editor, - (editor) => { - return (editor && editor.getAttributes('link').href) || '' - } - ) - - const clearLinkForm = () => { - if (currentUrl()) { - props.editor.chain().focus().unsetLink().run() - } - setUrl('') - setEditorOpen(false) - } - - const handleUrlChange = (value) => { - setUrl(value) - } - - const handleSubmitLink = () => { - if (validateUrl(url())) { - props.editor.chain().focus().setLink({ href: url() }).run() - setEditorOpen(false) - } else { - setLinkError(t('Invalid url format')) - } - } - - const handleKeyPress = (event) => { - const key = event.key - if (key === 'Enter') handleSubmitLink() - if (key === 'Esc') clearLinkForm() - } - - return ( -
-
- handleKeyPress(e)} - onChange={(e) => handleUrlChange(e.currentTarget.value)} - /> - - -
- {linkError() &&
{linkError()}
} -
- ) -} diff --git a/src/components/Editor/EditorBubbleMenu/LinkForm/index.ts b/src/components/Editor/EditorBubbleMenu/LinkForm/index.ts deleted file mode 100644 index 43fe9b0d..00000000 --- a/src/components/Editor/EditorBubbleMenu/LinkForm/index.ts +++ /dev/null @@ -1 +0,0 @@ -export { LinkForm } from './LinkForm' diff --git a/src/components/Editor/EditorFloatingMenu.tsx b/src/components/Editor/EditorFloatingMenu.tsx index 16eda00c..edf216fd 100644 --- a/src/components/Editor/EditorFloatingMenu.tsx +++ b/src/components/Editor/EditorFloatingMenu.tsx @@ -1,6 +1,7 @@ import type { Editor } from '@tiptap/core' import styles from './EditorFloatingMenu.module.scss' import { Icon } from '../_shared/Icon' +import { createSignal } from 'solid-js' type FloatingMenuProps = { editor: Editor