diff --git a/packages/slate-editor/src/modules/editor-v4/plugins/withSlatePasting.ts b/packages/slate-editor/src/modules/editor-v4/plugins/withSlatePasting.ts index 3f6f17ad7..6fd68cec1 100644 --- a/packages/slate-editor/src/modules/editor-v4/plugins/withSlatePasting.ts +++ b/packages/slate-editor/src/modules/editor-v4/plugins/withSlatePasting.ts @@ -1,11 +1,11 @@ /* eslint-disable no-param-reassign */ import { decodeSlateFragment } from '@prezly/slate-commons'; -import { isFragment } from '@prezly/slate-types'; import { Editor } from 'slate'; import { ReactEditor } from 'slate-react'; import { createDataTransfer } from '../lib'; +import { isFragment } from '../types'; const withoutSlateFragment = (data: DataTransfer): DataTransfer => { const types = data.types.filter((type) => type !== 'application/x-slate-fragment'); diff --git a/packages/slate-types/src/nodes/Fragment.ts b/packages/slate-editor/src/modules/editor-v4/types/Fragment.ts similarity index 60% rename from packages/slate-types/src/nodes/Fragment.ts rename to packages/slate-editor/src/modules/editor-v4/types/Fragment.ts index 2a5e2f4da..41f8e49b7 100644 --- a/packages/slate-types/src/nodes/Fragment.ts +++ b/packages/slate-editor/src/modules/editor-v4/types/Fragment.ts @@ -1,29 +1,46 @@ -import { Element, Node } from 'slate'; - -import AttachmentNode, { isAttachmentNode } from './AttachmentNode'; -import BlockNode, { isBlockNode } from './BlockNode'; -import ContactNode, { isContactNode } from './ContactNode'; -import CoverageNode, { isCoverageNode } from './CoverageNode'; -import DividerNode, { isDividerNode } from './DividerNode'; -import DocumentNode, { isDocumentNode } from './DocumentNode'; -import EmbedNode, { isEmbedNode } from './EmbedNode'; -import GalleryNode, { isGalleryNode } from './GalleryNode'; -import HeadingNode, { isHeadingNode } from './HeadingNode'; -import ImageNode, { isImageNode } from './ImageNode'; -import InlineNode, { isInlineNode } from './InlineNode'; -import LinkNode, { isLinkNode } from './LinkNode'; -import ListNode, { +import { + AttachmentNode, + isAttachmentNode, + BlockNode, + isBlockNode, + ContactNode, + isContactNode, + CoverageNode, + isCoverageNode, + DividerNode, + isDividerNode, + DocumentNode, + isDocumentNode, + EmbedNode, + isEmbedNode, + GalleryNode, + isGalleryNode, + HeadingNode, + isHeadingNode, + ImageNode, + isImageNode, + InlineNode, + isInlineNode, + LinkNode, + isLinkNode, + ListNode, isListNode, isListItemNode, isListItemTextNode, ListItemNode, ListItemTextNode, -} from './ListNode'; -import MentionNode, { isMentionNode } from './MentionNode'; -import ParagraphNode, { isParagraphNode } from './ParagraphNode'; -import PlaceholderNode, { isPlaceholderNode } from './PlaceholderNode'; -import QuoteNode, { isQuoteNode } from './QuoteNode'; -import TextNode, { isTextNode } from './TextNode'; + MentionNode, + isMentionNode, + ParagraphNode, + isParagraphNode, + PlaceholderNode, + isPlaceholderNode, + QuoteNode, + isQuoteNode, + TextNode, + isTextNode, +} from '@prezly/slate-types'; +import { Element, Node } from 'slate'; const validators = [ isAttachmentNode, diff --git a/packages/slate-editor/src/modules/editor-v4/types.ts b/packages/slate-editor/src/modules/editor-v4/types/index.ts similarity index 65% rename from packages/slate-editor/src/modules/editor-v4/types.ts rename to packages/slate-editor/src/modules/editor-v4/types/index.ts index e2b8b6771..1f90714a6 100644 --- a/packages/slate-editor/src/modules/editor-v4/types.ts +++ b/packages/slate-editor/src/modules/editor-v4/types/index.ts @@ -3,17 +3,17 @@ import { CSSProperties, KeyboardEvent, ReactNode, RefObject } from 'react'; import { Node } from 'slate'; import { ReactEditor } from 'slate-react'; -import { CoverageExtensionParameters } from '../../modules/editor-v4-coverage'; -import { EmbedExtensionParameters } from '../../modules/editor-v4-embed/types'; -import { EditorEventMap } from '../../modules/editor-v4-events'; -import { FileAttachmentExtensionParameters } from '../../modules/editor-v4-file-attachment'; -import { FloatingAddMenuExtensionParameters } from '../../modules/editor-v4-floating-add-menu'; -import { GalleriesExtensionParameters } from '../../modules/editor-v4-galleries'; -import { ImageExtensionParameters } from '../../modules/editor-v4-image'; -import { PlaceholderMentionsExtensionParameters } from '../../modules/editor-v4-placeholder-mentions'; -import { PressContactsExtensionParameters } from '../../modules/editor-v4-press-contacts'; -import { RichFormattingExtensionParameters } from '../../modules/editor-v4-rich-formatting'; -import { UserMentionsExtensionParameters } from '../../modules/editor-v4-user-mentions'; +import { CoverageExtensionParameters } from '../../../modules/editor-v4-coverage'; +import { EmbedExtensionParameters } from '../../../modules/editor-v4-embed/types'; +import { EditorEventMap } from '../../../modules/editor-v4-events'; +import { FileAttachmentExtensionParameters } from '../../../modules/editor-v4-file-attachment'; +import { FloatingAddMenuExtensionParameters } from '../../../modules/editor-v4-floating-add-menu'; +import { GalleriesExtensionParameters } from '../../../modules/editor-v4-galleries'; +import { ImageExtensionParameters } from '../../../modules/editor-v4-image'; +import { PlaceholderMentionsExtensionParameters } from '../../../modules/editor-v4-placeholder-mentions'; +import { PressContactsExtensionParameters } from '../../../modules/editor-v4-press-contacts'; +import { RichFormattingExtensionParameters } from '../../../modules/editor-v4-rich-formatting'; +import { UserMentionsExtensionParameters } from '../../../modules/editor-v4-user-mentions'; export interface EditorRef { events: Events; @@ -69,3 +69,5 @@ interface EmbedParameters { video?: boolean; }; } + +export { default as Fragment, isFragment } from './Fragment'; diff --git a/packages/slate-types/package.json b/packages/slate-types/package.json index 8644df0bf..bf6659465 100644 --- a/packages/slate-types/package.json +++ b/packages/slate-types/package.json @@ -17,9 +17,6 @@ "build": "tsc --project .", "clean": "rimraf build/ node_modules/" }, - "peerDependencies": { - "slate": ">=0.50.0" - }, "dependencies": { "@prezly/sdk": "^2.2.1" } diff --git a/packages/slate-types/src/nodes/index.ts b/packages/slate-types/src/nodes/index.ts index 918884dcb..eed56ee48 100644 --- a/packages/slate-types/src/nodes/index.ts +++ b/packages/slate-types/src/nodes/index.ts @@ -14,8 +14,6 @@ export { default as ElementNode } from './ElementNode'; export * from './ElementNode'; export { default as EmbedNode } from './EmbedNode'; export * from './EmbedNode'; -export { default as Fragment } from './Fragment'; -export * from './Fragment'; export { default as GalleryNode } from './GalleryNode'; export * from './GalleryNode'; export { default as HeadingNode } from './HeadingNode';