diff --git a/packages/client/src/tiptap/extensions/attachment.ts b/packages/client/src/tiptap/extensions/attachment.ts index 8f60e424..74fafbaa 100644 --- a/packages/client/src/tiptap/extensions/attachment.ts +++ b/packages/client/src/tiptap/extensions/attachment.ts @@ -1,7 +1,7 @@ import { Node, mergeAttributes } from '@tiptap/core'; import { ReactNodeViewRenderer } from '@tiptap/react'; import { AttachmentWrapper } from '../wrappers/attachment'; -import { getDatasetAttribute } from '../services/dataset'; +import { getDatasetAttribute } from '../utils/dataset'; declare module '@tiptap/core' { interface Commands { diff --git a/packages/client/src/tiptap/extensions/banner.ts b/packages/client/src/tiptap/extensions/banner.ts index 0d8240a9..32ceba59 100644 --- a/packages/client/src/tiptap/extensions/banner.ts +++ b/packages/client/src/tiptap/extensions/banner.ts @@ -1,8 +1,7 @@ -import { Node, Command, mergeAttributes, wrappingInputRule } from '@tiptap/core'; +import { Node, mergeAttributes, wrappingInputRule } from '@tiptap/core'; import { ReactNodeViewRenderer } from '@tiptap/react'; import { BannerWrapper } from '../wrappers/banner'; -import { typesAvailable } from '../services/markdown/markdown-to-html/markdownBanner'; -import { getDatasetAttribute } from '../services/dataset'; +import { getDatasetAttribute } from '../utils/dataset'; declare module '@tiptap/core' { interface Commands { diff --git a/packages/client/src/tiptap/extensions/blockquote.ts b/packages/client/src/tiptap/extensions/blockquote.ts index 71d6c9bc..561611ef 100644 --- a/packages/client/src/tiptap/extensions/blockquote.ts +++ b/packages/client/src/tiptap/extensions/blockquote.ts @@ -1,7 +1,7 @@ import { Blockquote as BuiltInBlockquote } from '@tiptap/extension-blockquote'; import { wrappingInputRule } from '@tiptap/core'; -import { getParents } from '../services/dom'; -import { getMarkdownSource } from '../services/markdown'; +import { getParents } from '../utils/dom'; +import { getMarkdownSource } from '../markdown/markdown-to-prosemirror'; export const Blockquote = BuiltInBlockquote.extend({ addAttributes() { diff --git a/packages/client/src/tiptap/extensions/bullet-list.ts b/packages/client/src/tiptap/extensions/bullet-list.ts index 6f25b8a3..2f245501 100644 --- a/packages/client/src/tiptap/extensions/bullet-list.ts +++ b/packages/client/src/tiptap/extensions/bullet-list.ts @@ -1,5 +1,5 @@ import { BulletList as BuiltInBulletList } from '@tiptap/extension-bullet-list'; -import { getMarkdownSource } from '../services/markdown'; +import { getMarkdownSource } from '../markdown/markdown-to-prosemirror'; export const BulletList = BuiltInBulletList.extend({ addAttributes() { diff --git a/packages/client/src/tiptap/extensions/code-block.ts b/packages/client/src/tiptap/extensions/code-block.ts index 6f0e23bb..607e19e6 100644 --- a/packages/client/src/tiptap/extensions/code-block.ts +++ b/packages/client/src/tiptap/extensions/code-block.ts @@ -2,7 +2,7 @@ import { lowlight } from 'lowlight/lib/all'; import { Node, textblockTypeInputRule, mergeAttributes } from '@tiptap/core'; import { Plugin, PluginKey, TextSelection } from 'prosemirror-state'; import { ReactNodeViewRenderer } from '@tiptap/react'; -import { LowlightPlugin } from '../services/lowlight-plugin'; +import { LowlightPlugin } from '../utils/lowlight-plugin'; import { CodeBlockWrapper } from '../wrappers/code-block'; export interface CodeBlockOptions { diff --git a/packages/client/src/tiptap/extensions/color-highlighter.ts b/packages/client/src/tiptap/extensions/color-highlighter.ts index 6bc2bc55..200a5404 100644 --- a/packages/client/src/tiptap/extensions/color-highlighter.ts +++ b/packages/client/src/tiptap/extensions/color-highlighter.ts @@ -1,6 +1,6 @@ import { Extension } from '@tiptap/core'; import { Plugin } from 'prosemirror-state'; -import { findColors } from '../services/color'; +import { findColors } from '../utils/color'; export const ColorHighlighter = Extension.create({ name: 'colorHighlighter', diff --git a/packages/client/src/tiptap/extensions/countdown.ts b/packages/client/src/tiptap/extensions/countdown.ts index 9133b246..74366367 100644 --- a/packages/client/src/tiptap/extensions/countdown.ts +++ b/packages/client/src/tiptap/extensions/countdown.ts @@ -1,7 +1,7 @@ import { Node, mergeAttributes } from '@tiptap/core'; import { ReactNodeViewRenderer } from '@tiptap/react'; import { CountdownWrapper } from '../wrappers/countdown'; -import { getDatasetAttribute } from '../services/dataset'; +import { getDatasetAttribute } from '../utils/dataset'; declare module '@tiptap/core' { interface Commands { diff --git a/packages/client/src/tiptap/extensions/document-children.ts b/packages/client/src/tiptap/extensions/document-children.ts index f089bc18..28416652 100644 --- a/packages/client/src/tiptap/extensions/document-children.ts +++ b/packages/client/src/tiptap/extensions/document-children.ts @@ -1,7 +1,7 @@ import { Node, mergeAttributes, wrappingInputRule } from '@tiptap/core'; import { ReactNodeViewRenderer } from '@tiptap/react'; import { DocumentChildrenWrapper } from '../wrappers/document-children'; -import { getDatasetAttribute } from '../services/dataset'; +import { getDatasetAttribute } from '../utils/dataset'; declare module '@tiptap/core' { interface Commands { diff --git a/packages/client/src/tiptap/extensions/document-reference.ts b/packages/client/src/tiptap/extensions/document-reference.ts index cf719f33..6d01c781 100644 --- a/packages/client/src/tiptap/extensions/document-reference.ts +++ b/packages/client/src/tiptap/extensions/document-reference.ts @@ -1,7 +1,7 @@ import { Node, mergeAttributes, wrappingInputRule } from '@tiptap/core'; import { ReactNodeViewRenderer } from '@tiptap/react'; import { DocumentReferenceWrapper } from '../wrappers/document-reference'; -import { getDatasetAttribute } from '../services/dataset'; +import { getDatasetAttribute } from '../utils/dataset'; declare module '@tiptap/core' { interface Commands { diff --git a/packages/client/src/tiptap/extensions/html-marks.ts b/packages/client/src/tiptap/extensions/html-marks.ts index 22ad6528..e56292fc 100644 --- a/packages/client/src/tiptap/extensions/html-marks.ts +++ b/packages/client/src/tiptap/extensions/html-marks.ts @@ -1,6 +1,6 @@ import { Mark, mergeAttributes, markInputRule } from '@tiptap/core'; import { PARSE_HTML_PRIORITY_LOWEST } from '../constants'; -import { markInputRegex, extractMarkAttributesFromMatch } from '../services/mark-utils'; +import { markInputRegex, extractMarkAttributesFromMatch } from '../utils/mark-utils'; export const marks = [{ name: 'underline', tag: 'u' }]; diff --git a/packages/client/src/tiptap/extensions/iframe.ts b/packages/client/src/tiptap/extensions/iframe.ts index 93a1f7b1..4892b56e 100644 --- a/packages/client/src/tiptap/extensions/iframe.ts +++ b/packages/client/src/tiptap/extensions/iframe.ts @@ -1,7 +1,7 @@ import { Node, mergeAttributes } from '@tiptap/core'; import { ReactNodeViewRenderer } from '@tiptap/react'; import { IframeWrapper } from '../wrappers/iframe'; -import { getDatasetAttribute } from '../services/dataset'; +import { getDatasetAttribute } from '../utils/dataset'; declare module '@tiptap/core' { interface Commands { diff --git a/packages/client/src/tiptap/extensions/indent.ts b/packages/client/src/tiptap/extensions/indent.ts index 3bbbc666..13c5156e 100644 --- a/packages/client/src/tiptap/extensions/indent.ts +++ b/packages/client/src/tiptap/extensions/indent.ts @@ -1,10 +1,10 @@ import { Command, Extension } from '@tiptap/core'; import { sinkListItem, liftListItem } from 'prosemirror-schema-list'; import { TextSelection, AllSelection, Transaction } from 'prosemirror-state'; -import { isListActive } from '../services/is-active'; -import { clamp } from '../services/clamp'; -import { getNodeType } from '../services/type'; -import { isListNode } from '../services/node'; +import { isListActive } from '../utils/is-active'; +import { clamp } from '../utils/clamp'; +import { getNodeType } from '../utils/type'; +import { isListNode } from '../utils/node'; type IndentOptions = { types: string[]; diff --git a/packages/client/src/tiptap/extensions/mind.ts b/packages/client/src/tiptap/extensions/mind.ts index 14da112b..f5a94a8c 100644 --- a/packages/client/src/tiptap/extensions/mind.ts +++ b/packages/client/src/tiptap/extensions/mind.ts @@ -1,7 +1,7 @@ import { Node, mergeAttributes, nodeInputRule } from '@tiptap/core'; import { ReactNodeViewRenderer } from '@tiptap/react'; import { MindWrapper } from '../wrappers/mind'; -import { getDatasetAttribute } from '../services/dataset'; +import { getDatasetAttribute } from '../utils/dataset'; const DEFAULT_MIND_DATA = { meta: { diff --git a/packages/client/src/tiptap/extensions/ordered-list.ts b/packages/client/src/tiptap/extensions/ordered-list.ts index c2b478e2..9b5fea25 100644 --- a/packages/client/src/tiptap/extensions/ordered-list.ts +++ b/packages/client/src/tiptap/extensions/ordered-list.ts @@ -1,5 +1,5 @@ import { OrderedList as BuiltInOrderedList } from '@tiptap/extension-ordered-list'; -import { getMarkdownSource } from '../services/markdown'; +import { getMarkdownSource } from '../markdown/markdown-to-prosemirror'; export const OrderedList = BuiltInOrderedList.extend({ addAttributes() { diff --git a/packages/client/src/tiptap/extensions/paste.ts b/packages/client/src/tiptap/extensions/paste.ts index c8393bde..b8edc9ee 100644 --- a/packages/client/src/tiptap/extensions/paste.ts +++ b/packages/client/src/tiptap/extensions/paste.ts @@ -1,15 +1,15 @@ import { Extension } from '@tiptap/core'; import { Plugin, PluginKey } from 'prosemirror-state'; import { EXTENSION_PRIORITY_HIGHEST } from '../constants'; -import { handleFileEvent } from '../services/upload'; -import { isInCode, LANGUAGES } from '../services/code'; +import { handleFileEvent } from '../utils/upload'; +import { isInCode, LANGUAGES } from '../utils/code'; import { isMarkdown, normalizePastedMarkdown, markdownToProsemirror, prosemirrorToMarkdown, -} from '../services/markdown'; -import { isTitleNode } from '../services/node'; +} from '../markdown/markdown-to-prosemirror'; +import { isTitleNode } from '../utils/node'; export const Paste = Extension.create({ name: 'paste', diff --git a/packages/client/src/tiptap/extensions/selection.ts b/packages/client/src/tiptap/extensions/selection.ts index 6a3e769f..4dcf59f0 100644 --- a/packages/client/src/tiptap/extensions/selection.ts +++ b/packages/client/src/tiptap/extensions/selection.ts @@ -1,7 +1,7 @@ import { Extension } from '@tiptap/core'; import { Plugin, PluginKey, NodeSelection, TextSelection, Selection, AllSelection } from 'prosemirror-state'; import { Decoration, DecorationSet } from 'prosemirror-view'; -import { getCurrentNode, isInCodeBlock, isInBanner } from '../services/node'; +import { getCurrentNode, isInCodeBlock, isInBanner } from '../utils/node'; import { EXTENSION_PRIORITY_HIGHEST } from '../constants'; export const selectionPluginKey = new PluginKey('selection'); diff --git a/packages/client/src/tiptap/extensions/status.ts b/packages/client/src/tiptap/extensions/status.ts index d97a4a3e..89a35c95 100644 --- a/packages/client/src/tiptap/extensions/status.ts +++ b/packages/client/src/tiptap/extensions/status.ts @@ -1,7 +1,7 @@ import { Node, mergeAttributes } from '@tiptap/core'; import { ReactNodeViewRenderer } from '@tiptap/react'; import { StatusWrapper } from '../wrappers/status'; -import { getDatasetAttribute } from '../services/dataset'; +import { getDatasetAttribute } from '../utils/dataset'; declare module '@tiptap/core' { interface Commands { diff --git a/packages/client/src/tiptap/extensions/table-cell.tsx b/packages/client/src/tiptap/extensions/table-cell.tsx index dde7ac72..f0b38c30 100644 --- a/packages/client/src/tiptap/extensions/table-cell.tsx +++ b/packages/client/src/tiptap/extensions/table-cell.tsx @@ -13,7 +13,7 @@ import { isTableSelected, selectRow, selectTable, -} from '../services/table'; +} from '../utils/table'; import { FloatMenuView } from '../views/float-menu'; export const TableCell = BuiltInTableCell.extend({ diff --git a/packages/client/src/tiptap/extensions/table-header.tsx b/packages/client/src/tiptap/extensions/table-header.tsx index d52e3937..146086a3 100644 --- a/packages/client/src/tiptap/extensions/table-header.tsx +++ b/packages/client/src/tiptap/extensions/table-header.tsx @@ -5,7 +5,7 @@ import { TableHeader as BuiltInTableHeader } from '@tiptap/extension-table-heade import { Tooltip } from 'components/tooltip'; import { Plugin, PluginKey } from 'prosemirror-state'; import { Decoration, DecorationSet } from 'prosemirror-view'; -import { getCellsInRow, isColumnSelected, isTableSelected, selectColumn } from '../services/table'; +import { getCellsInRow, isColumnSelected, isTableSelected, selectColumn } from '../utils/table'; import { FloatMenuView } from '../views/float-menu'; // @flow diff --git a/packages/client/src/tiptap/extensions/title.tsx b/packages/client/src/tiptap/extensions/title.tsx index 5f4265a3..71e2c917 100644 --- a/packages/client/src/tiptap/extensions/title.tsx +++ b/packages/client/src/tiptap/extensions/title.tsx @@ -1,6 +1,6 @@ import { Node, mergeAttributes } from '@tiptap/core'; import { Plugin, PluginKey } from 'prosemirror-state'; -import { isInTitle } from '../services/node'; +import { isInTitle } from '../utils/node'; import { TextSelection } from 'prosemirror-state'; export interface TitleOptions { diff --git a/packages/client/src/tiptap/index.ts b/packages/client/src/tiptap/index.ts index 13d94d77..3ff1a2c4 100644 --- a/packages/client/src/tiptap/index.ts +++ b/packages/client/src/tiptap/index.ts @@ -4,7 +4,7 @@ import { CollaborationCursor } from './collaboration-cursor'; import History from '@tiptap/extension-history'; import { getRandomColor } from 'helpers/color'; import { Document } from './extensions/document'; -export { BaseKit, CommentKit } from './basekit'; +export { BaseKit, CommentKit } from './start-kit'; export { getSchema } from '@tiptap/core'; export * from './menubar'; diff --git a/packages/client/src/tiptap/services/markdown/helpers.ts b/packages/client/src/tiptap/markdown/markdown-to-prosemirror/helpers.ts similarity index 100% rename from packages/client/src/tiptap/services/markdown/helpers.ts rename to packages/client/src/tiptap/markdown/markdown-to-prosemirror/helpers.ts diff --git a/packages/client/src/tiptap/services/markdown/html-to-prosemirror/index.ts b/packages/client/src/tiptap/markdown/markdown-to-prosemirror/html-to-prosemirror/index.ts similarity index 100% rename from packages/client/src/tiptap/services/markdown/html-to-prosemirror/index.ts rename to packages/client/src/tiptap/markdown/markdown-to-prosemirror/html-to-prosemirror/index.ts diff --git a/packages/client/src/tiptap/services/markdown/html-to-prosemirror/marks/bold.ts b/packages/client/src/tiptap/markdown/markdown-to-prosemirror/html-to-prosemirror/marks/bold.ts similarity index 100% rename from packages/client/src/tiptap/services/markdown/html-to-prosemirror/marks/bold.ts rename to packages/client/src/tiptap/markdown/markdown-to-prosemirror/html-to-prosemirror/marks/bold.ts diff --git a/packages/client/src/tiptap/services/markdown/html-to-prosemirror/marks/code.ts b/packages/client/src/tiptap/markdown/markdown-to-prosemirror/html-to-prosemirror/marks/code.ts similarity index 100% rename from packages/client/src/tiptap/services/markdown/html-to-prosemirror/marks/code.ts rename to packages/client/src/tiptap/markdown/markdown-to-prosemirror/html-to-prosemirror/marks/code.ts diff --git a/packages/client/src/tiptap/services/markdown/html-to-prosemirror/marks/italic.ts b/packages/client/src/tiptap/markdown/markdown-to-prosemirror/html-to-prosemirror/marks/italic.ts similarity index 100% rename from packages/client/src/tiptap/services/markdown/html-to-prosemirror/marks/italic.ts rename to packages/client/src/tiptap/markdown/markdown-to-prosemirror/html-to-prosemirror/marks/italic.ts diff --git a/packages/client/src/tiptap/services/markdown/html-to-prosemirror/marks/link.ts b/packages/client/src/tiptap/markdown/markdown-to-prosemirror/html-to-prosemirror/marks/link.ts similarity index 100% rename from packages/client/src/tiptap/services/markdown/html-to-prosemirror/marks/link.ts rename to packages/client/src/tiptap/markdown/markdown-to-prosemirror/html-to-prosemirror/marks/link.ts diff --git a/packages/client/src/tiptap/services/markdown/html-to-prosemirror/marks/mark.ts b/packages/client/src/tiptap/markdown/markdown-to-prosemirror/html-to-prosemirror/marks/mark.ts similarity index 100% rename from packages/client/src/tiptap/services/markdown/html-to-prosemirror/marks/mark.ts rename to packages/client/src/tiptap/markdown/markdown-to-prosemirror/html-to-prosemirror/marks/mark.ts diff --git a/packages/client/src/tiptap/services/markdown/html-to-prosemirror/marks/subscript.ts b/packages/client/src/tiptap/markdown/markdown-to-prosemirror/html-to-prosemirror/marks/subscript.ts similarity index 100% rename from packages/client/src/tiptap/services/markdown/html-to-prosemirror/marks/subscript.ts rename to packages/client/src/tiptap/markdown/markdown-to-prosemirror/html-to-prosemirror/marks/subscript.ts diff --git a/packages/client/src/tiptap/services/markdown/html-to-prosemirror/marks/superscript.ts b/packages/client/src/tiptap/markdown/markdown-to-prosemirror/html-to-prosemirror/marks/superscript.ts similarity index 100% rename from packages/client/src/tiptap/services/markdown/html-to-prosemirror/marks/superscript.ts rename to packages/client/src/tiptap/markdown/markdown-to-prosemirror/html-to-prosemirror/marks/superscript.ts diff --git a/packages/client/src/tiptap/services/markdown/html-to-prosemirror/marks/underline.ts b/packages/client/src/tiptap/markdown/markdown-to-prosemirror/html-to-prosemirror/marks/underline.ts similarity index 100% rename from packages/client/src/tiptap/services/markdown/html-to-prosemirror/marks/underline.ts rename to packages/client/src/tiptap/markdown/markdown-to-prosemirror/html-to-prosemirror/marks/underline.ts diff --git a/packages/client/src/tiptap/services/markdown/html-to-prosemirror/nodes/attachment.ts b/packages/client/src/tiptap/markdown/markdown-to-prosemirror/html-to-prosemirror/nodes/attachment.ts similarity index 100% rename from packages/client/src/tiptap/services/markdown/html-to-prosemirror/nodes/attachment.ts rename to packages/client/src/tiptap/markdown/markdown-to-prosemirror/html-to-prosemirror/nodes/attachment.ts diff --git a/packages/client/src/tiptap/services/markdown/html-to-prosemirror/nodes/banner.ts b/packages/client/src/tiptap/markdown/markdown-to-prosemirror/html-to-prosemirror/nodes/banner.ts similarity index 100% rename from packages/client/src/tiptap/services/markdown/html-to-prosemirror/nodes/banner.ts rename to packages/client/src/tiptap/markdown/markdown-to-prosemirror/html-to-prosemirror/nodes/banner.ts diff --git a/packages/client/src/tiptap/services/markdown/html-to-prosemirror/nodes/blockquote.ts b/packages/client/src/tiptap/markdown/markdown-to-prosemirror/html-to-prosemirror/nodes/blockquote.ts similarity index 100% rename from packages/client/src/tiptap/services/markdown/html-to-prosemirror/nodes/blockquote.ts rename to packages/client/src/tiptap/markdown/markdown-to-prosemirror/html-to-prosemirror/nodes/blockquote.ts diff --git a/packages/client/src/tiptap/services/markdown/html-to-prosemirror/nodes/bullet-list.ts b/packages/client/src/tiptap/markdown/markdown-to-prosemirror/html-to-prosemirror/nodes/bullet-list.ts similarity index 100% rename from packages/client/src/tiptap/services/markdown/html-to-prosemirror/nodes/bullet-list.ts rename to packages/client/src/tiptap/markdown/markdown-to-prosemirror/html-to-prosemirror/nodes/bullet-list.ts diff --git a/packages/client/src/tiptap/services/markdown/html-to-prosemirror/nodes/code-block-wrapper.ts b/packages/client/src/tiptap/markdown/markdown-to-prosemirror/html-to-prosemirror/nodes/code-block-wrapper.ts similarity index 100% rename from packages/client/src/tiptap/services/markdown/html-to-prosemirror/nodes/code-block-wrapper.ts rename to packages/client/src/tiptap/markdown/markdown-to-prosemirror/html-to-prosemirror/nodes/code-block-wrapper.ts diff --git a/packages/client/src/tiptap/services/markdown/html-to-prosemirror/nodes/code-block.ts b/packages/client/src/tiptap/markdown/markdown-to-prosemirror/html-to-prosemirror/nodes/code-block.ts similarity index 100% rename from packages/client/src/tiptap/services/markdown/html-to-prosemirror/nodes/code-block.ts rename to packages/client/src/tiptap/markdown/markdown-to-prosemirror/html-to-prosemirror/nodes/code-block.ts diff --git a/packages/client/src/tiptap/services/markdown/html-to-prosemirror/nodes/countdown.ts b/packages/client/src/tiptap/markdown/markdown-to-prosemirror/html-to-prosemirror/nodes/countdown.ts similarity index 100% rename from packages/client/src/tiptap/services/markdown/html-to-prosemirror/nodes/countdown.ts rename to packages/client/src/tiptap/markdown/markdown-to-prosemirror/html-to-prosemirror/nodes/countdown.ts diff --git a/packages/client/src/tiptap/services/markdown/html-to-prosemirror/nodes/document-children.ts b/packages/client/src/tiptap/markdown/markdown-to-prosemirror/html-to-prosemirror/nodes/document-children.ts similarity index 100% rename from packages/client/src/tiptap/services/markdown/html-to-prosemirror/nodes/document-children.ts rename to packages/client/src/tiptap/markdown/markdown-to-prosemirror/html-to-prosemirror/nodes/document-children.ts diff --git a/packages/client/src/tiptap/services/markdown/html-to-prosemirror/nodes/document-reference.ts b/packages/client/src/tiptap/markdown/markdown-to-prosemirror/html-to-prosemirror/nodes/document-reference.ts similarity index 100% rename from packages/client/src/tiptap/services/markdown/html-to-prosemirror/nodes/document-reference.ts rename to packages/client/src/tiptap/markdown/markdown-to-prosemirror/html-to-prosemirror/nodes/document-reference.ts diff --git a/packages/client/src/tiptap/services/markdown/html-to-prosemirror/nodes/hard-break.ts b/packages/client/src/tiptap/markdown/markdown-to-prosemirror/html-to-prosemirror/nodes/hard-break.ts similarity index 100% rename from packages/client/src/tiptap/services/markdown/html-to-prosemirror/nodes/hard-break.ts rename to packages/client/src/tiptap/markdown/markdown-to-prosemirror/html-to-prosemirror/nodes/hard-break.ts diff --git a/packages/client/src/tiptap/services/markdown/html-to-prosemirror/nodes/heading.ts b/packages/client/src/tiptap/markdown/markdown-to-prosemirror/html-to-prosemirror/nodes/heading.ts similarity index 100% rename from packages/client/src/tiptap/services/markdown/html-to-prosemirror/nodes/heading.ts rename to packages/client/src/tiptap/markdown/markdown-to-prosemirror/html-to-prosemirror/nodes/heading.ts diff --git a/packages/client/src/tiptap/services/markdown/html-to-prosemirror/nodes/horizontal-rule.ts b/packages/client/src/tiptap/markdown/markdown-to-prosemirror/html-to-prosemirror/nodes/horizontal-rule.ts similarity index 100% rename from packages/client/src/tiptap/services/markdown/html-to-prosemirror/nodes/horizontal-rule.ts rename to packages/client/src/tiptap/markdown/markdown-to-prosemirror/html-to-prosemirror/nodes/horizontal-rule.ts diff --git a/packages/client/src/tiptap/services/markdown/html-to-prosemirror/nodes/iframe.ts b/packages/client/src/tiptap/markdown/markdown-to-prosemirror/html-to-prosemirror/nodes/iframe.ts similarity index 100% rename from packages/client/src/tiptap/services/markdown/html-to-prosemirror/nodes/iframe.ts rename to packages/client/src/tiptap/markdown/markdown-to-prosemirror/html-to-prosemirror/nodes/iframe.ts diff --git a/packages/client/src/tiptap/services/markdown/html-to-prosemirror/nodes/image.ts b/packages/client/src/tiptap/markdown/markdown-to-prosemirror/html-to-prosemirror/nodes/image.ts similarity index 100% rename from packages/client/src/tiptap/services/markdown/html-to-prosemirror/nodes/image.ts rename to packages/client/src/tiptap/markdown/markdown-to-prosemirror/html-to-prosemirror/nodes/image.ts diff --git a/packages/client/src/tiptap/services/markdown/html-to-prosemirror/nodes/katex.ts b/packages/client/src/tiptap/markdown/markdown-to-prosemirror/html-to-prosemirror/nodes/katex.ts similarity index 100% rename from packages/client/src/tiptap/services/markdown/html-to-prosemirror/nodes/katex.ts rename to packages/client/src/tiptap/markdown/markdown-to-prosemirror/html-to-prosemirror/nodes/katex.ts diff --git a/packages/client/src/tiptap/services/markdown/html-to-prosemirror/nodes/list-item.ts b/packages/client/src/tiptap/markdown/markdown-to-prosemirror/html-to-prosemirror/nodes/list-item.ts similarity index 100% rename from packages/client/src/tiptap/services/markdown/html-to-prosemirror/nodes/list-item.ts rename to packages/client/src/tiptap/markdown/markdown-to-prosemirror/html-to-prosemirror/nodes/list-item.ts diff --git a/packages/client/src/tiptap/services/markdown/html-to-prosemirror/nodes/mind.ts b/packages/client/src/tiptap/markdown/markdown-to-prosemirror/html-to-prosemirror/nodes/mind.ts similarity index 100% rename from packages/client/src/tiptap/services/markdown/html-to-prosemirror/nodes/mind.ts rename to packages/client/src/tiptap/markdown/markdown-to-prosemirror/html-to-prosemirror/nodes/mind.ts diff --git a/packages/client/src/tiptap/services/markdown/html-to-prosemirror/nodes/node.ts b/packages/client/src/tiptap/markdown/markdown-to-prosemirror/html-to-prosemirror/nodes/node.ts similarity index 100% rename from packages/client/src/tiptap/services/markdown/html-to-prosemirror/nodes/node.ts rename to packages/client/src/tiptap/markdown/markdown-to-prosemirror/html-to-prosemirror/nodes/node.ts diff --git a/packages/client/src/tiptap/services/markdown/html-to-prosemirror/nodes/ordered-list.ts b/packages/client/src/tiptap/markdown/markdown-to-prosemirror/html-to-prosemirror/nodes/ordered-list.ts similarity index 100% rename from packages/client/src/tiptap/services/markdown/html-to-prosemirror/nodes/ordered-list.ts rename to packages/client/src/tiptap/markdown/markdown-to-prosemirror/html-to-prosemirror/nodes/ordered-list.ts diff --git a/packages/client/src/tiptap/services/markdown/html-to-prosemirror/nodes/paragraph.ts b/packages/client/src/tiptap/markdown/markdown-to-prosemirror/html-to-prosemirror/nodes/paragraph.ts similarity index 100% rename from packages/client/src/tiptap/services/markdown/html-to-prosemirror/nodes/paragraph.ts rename to packages/client/src/tiptap/markdown/markdown-to-prosemirror/html-to-prosemirror/nodes/paragraph.ts diff --git a/packages/client/src/tiptap/services/markdown/html-to-prosemirror/nodes/status.ts b/packages/client/src/tiptap/markdown/markdown-to-prosemirror/html-to-prosemirror/nodes/status.ts similarity index 100% rename from packages/client/src/tiptap/services/markdown/html-to-prosemirror/nodes/status.ts rename to packages/client/src/tiptap/markdown/markdown-to-prosemirror/html-to-prosemirror/nodes/status.ts diff --git a/packages/client/src/tiptap/services/markdown/html-to-prosemirror/nodes/table-cell.ts b/packages/client/src/tiptap/markdown/markdown-to-prosemirror/html-to-prosemirror/nodes/table-cell.ts similarity index 100% rename from packages/client/src/tiptap/services/markdown/html-to-prosemirror/nodes/table-cell.ts rename to packages/client/src/tiptap/markdown/markdown-to-prosemirror/html-to-prosemirror/nodes/table-cell.ts diff --git a/packages/client/src/tiptap/services/markdown/html-to-prosemirror/nodes/table-header.ts b/packages/client/src/tiptap/markdown/markdown-to-prosemirror/html-to-prosemirror/nodes/table-header.ts similarity index 100% rename from packages/client/src/tiptap/services/markdown/html-to-prosemirror/nodes/table-header.ts rename to packages/client/src/tiptap/markdown/markdown-to-prosemirror/html-to-prosemirror/nodes/table-header.ts diff --git a/packages/client/src/tiptap/services/markdown/html-to-prosemirror/nodes/table-row.ts b/packages/client/src/tiptap/markdown/markdown-to-prosemirror/html-to-prosemirror/nodes/table-row.ts similarity index 100% rename from packages/client/src/tiptap/services/markdown/html-to-prosemirror/nodes/table-row.ts rename to packages/client/src/tiptap/markdown/markdown-to-prosemirror/html-to-prosemirror/nodes/table-row.ts diff --git a/packages/client/src/tiptap/services/markdown/html-to-prosemirror/nodes/table.ts b/packages/client/src/tiptap/markdown/markdown-to-prosemirror/html-to-prosemirror/nodes/table.ts similarity index 100% rename from packages/client/src/tiptap/services/markdown/html-to-prosemirror/nodes/table.ts rename to packages/client/src/tiptap/markdown/markdown-to-prosemirror/html-to-prosemirror/nodes/table.ts diff --git a/packages/client/src/tiptap/services/markdown/html-to-prosemirror/nodes/task-list-item.ts b/packages/client/src/tiptap/markdown/markdown-to-prosemirror/html-to-prosemirror/nodes/task-list-item.ts similarity index 100% rename from packages/client/src/tiptap/services/markdown/html-to-prosemirror/nodes/task-list-item.ts rename to packages/client/src/tiptap/markdown/markdown-to-prosemirror/html-to-prosemirror/nodes/task-list-item.ts diff --git a/packages/client/src/tiptap/services/markdown/html-to-prosemirror/nodes/task-list.ts b/packages/client/src/tiptap/markdown/markdown-to-prosemirror/html-to-prosemirror/nodes/task-list.ts similarity index 100% rename from packages/client/src/tiptap/services/markdown/html-to-prosemirror/nodes/task-list.ts rename to packages/client/src/tiptap/markdown/markdown-to-prosemirror/html-to-prosemirror/nodes/task-list.ts diff --git a/packages/client/src/tiptap/services/markdown/html-to-prosemirror/nodes/text.ts b/packages/client/src/tiptap/markdown/markdown-to-prosemirror/html-to-prosemirror/nodes/text.ts similarity index 100% rename from packages/client/src/tiptap/services/markdown/html-to-prosemirror/nodes/text.ts rename to packages/client/src/tiptap/markdown/markdown-to-prosemirror/html-to-prosemirror/nodes/text.ts diff --git a/packages/client/src/tiptap/services/markdown/html-to-prosemirror/nodes/title.ts b/packages/client/src/tiptap/markdown/markdown-to-prosemirror/html-to-prosemirror/nodes/title.ts similarity index 100% rename from packages/client/src/tiptap/services/markdown/html-to-prosemirror/nodes/title.ts rename to packages/client/src/tiptap/markdown/markdown-to-prosemirror/html-to-prosemirror/nodes/title.ts diff --git a/packages/client/src/tiptap/services/markdown/html-to-prosemirror/renderer.ts b/packages/client/src/tiptap/markdown/markdown-to-prosemirror/html-to-prosemirror/renderer.ts similarity index 100% rename from packages/client/src/tiptap/services/markdown/html-to-prosemirror/renderer.ts rename to packages/client/src/tiptap/markdown/markdown-to-prosemirror/html-to-prosemirror/renderer.ts diff --git a/packages/client/src/tiptap/services/markdown/html-to-prosemirror/utils.ts b/packages/client/src/tiptap/markdown/markdown-to-prosemirror/html-to-prosemirror/utils.ts similarity index 92% rename from packages/client/src/tiptap/services/markdown/html-to-prosemirror/utils.ts rename to packages/client/src/tiptap/markdown/markdown-to-prosemirror/html-to-prosemirror/utils.ts index 5ee614d0..6648bb33 100644 --- a/packages/client/src/tiptap/services/markdown/html-to-prosemirror/utils.ts +++ b/packages/client/src/tiptap/markdown/markdown-to-prosemirror/html-to-prosemirror/utils.ts @@ -1,4 +1,4 @@ -import { BaseKit } from '../../../basekit'; +import { BaseKit } from '../../../start-kit'; /** * 通过 tiptap extension 的配置从 DOM 节点上获取属性值 @@ -17,11 +17,7 @@ const getAttribute = ( accu[key] = conf.default; if (conf.parseHTML) { - // try { accu[key] = conf.parseHTML(element); - // } catch (e) { - // - // } } return accu; diff --git a/packages/client/src/tiptap/services/markdown/index.tsx b/packages/client/src/tiptap/markdown/markdown-to-prosemirror/index.tsx similarity index 95% rename from packages/client/src/tiptap/services/markdown/index.tsx rename to packages/client/src/tiptap/markdown/markdown-to-prosemirror/index.tsx index 393ab3af..ae4e5a9d 100644 --- a/packages/client/src/tiptap/services/markdown/index.tsx +++ b/packages/client/src/tiptap/markdown/markdown-to-prosemirror/index.tsx @@ -1,6 +1,6 @@ import { htmlToPromsemirror } from './html-to-prosemirror'; import { markdownToHTML } from './markdown-to-html'; -export { prosemirrorToMarkdown } from './prosemirror-to-markdown'; +export { prosemirrorToMarkdown } from '../prosemirror-to-markdown'; export * from './helpers'; export * from './markdown-source-map'; diff --git a/packages/client/src/tiptap/services/markdown/markdown-source-map.ts b/packages/client/src/tiptap/markdown/markdown-to-prosemirror/markdown-source-map.ts similarity index 100% rename from packages/client/src/tiptap/services/markdown/markdown-source-map.ts rename to packages/client/src/tiptap/markdown/markdown-to-prosemirror/markdown-source-map.ts diff --git a/packages/client/src/tiptap/services/markdown/markdown-to-html/index.ts b/packages/client/src/tiptap/markdown/markdown-to-prosemirror/markdown-to-html/index.ts similarity index 100% rename from packages/client/src/tiptap/services/markdown/markdown-to-html/index.ts rename to packages/client/src/tiptap/markdown/markdown-to-prosemirror/markdown-to-html/index.ts diff --git a/packages/client/src/tiptap/services/markdown/markdown-to-html/markdownBanner.ts b/packages/client/src/tiptap/markdown/markdown-to-prosemirror/markdown-to-html/markdownBanner.ts similarity index 100% rename from packages/client/src/tiptap/services/markdown/markdown-to-html/markdownBanner.ts rename to packages/client/src/tiptap/markdown/markdown-to-prosemirror/markdown-to-html/markdownBanner.ts diff --git a/packages/client/src/tiptap/services/markdown/markdown-to-html/markdownItContainer.ts b/packages/client/src/tiptap/markdown/markdown-to-prosemirror/markdown-to-html/markdownItContainer.ts similarity index 92% rename from packages/client/src/tiptap/services/markdown/markdown-to-html/markdownItContainer.ts rename to packages/client/src/tiptap/markdown/markdown-to-prosemirror/markdown-to-html/markdownItContainer.ts index fb9f3a70..a81bdd11 100644 --- a/packages/client/src/tiptap/services/markdown/markdown-to-html/markdownItContainer.ts +++ b/packages/client/src/tiptap/markdown/markdown-to-prosemirror/markdown-to-html/markdownItContainer.ts @@ -1,5 +1,5 @@ import container from 'markdown-it-container'; -import { strToJSON, jsonToDOMDataset } from '../../dataset'; +import { strToJSON, jsonToDOMDataset } from '../../../utils/dataset'; export const createMarkdownContainer = (types: string | Array) => (md) => { if (!Array.isArray(types)) { diff --git a/packages/client/src/tiptap/services/markdown/markdown-to-html/markdownKatex.ts b/packages/client/src/tiptap/markdown/markdown-to-prosemirror/markdown-to-html/markdownKatex.ts similarity index 100% rename from packages/client/src/tiptap/services/markdown/markdown-to-html/markdownKatex.ts rename to packages/client/src/tiptap/markdown/markdown-to-prosemirror/markdown-to-html/markdownKatex.ts diff --git a/packages/client/src/tiptap/services/markdown/markdown-to-html/markdownTable.ts b/packages/client/src/tiptap/markdown/markdown-to-prosemirror/markdown-to-html/markdownTable.ts similarity index 100% rename from packages/client/src/tiptap/services/markdown/markdown-to-html/markdownTable.ts rename to packages/client/src/tiptap/markdown/markdown-to-prosemirror/markdown-to-html/markdownTable.ts diff --git a/packages/client/src/tiptap/services/markdown/markdown-to-html/markdownTaskList.ts b/packages/client/src/tiptap/markdown/markdown-to-prosemirror/markdown-to-html/markdownTaskList.ts similarity index 100% rename from packages/client/src/tiptap/services/markdown/markdown-to-html/markdownTaskList.ts rename to packages/client/src/tiptap/markdown/markdown-to-prosemirror/markdown-to-html/markdownTaskList.ts diff --git a/packages/client/src/tiptap/services/markdown/markdown-to-html/markdownUnderline.ts b/packages/client/src/tiptap/markdown/markdown-to-prosemirror/markdown-to-html/markdownUnderline.ts similarity index 100% rename from packages/client/src/tiptap/services/markdown/markdown-to-html/markdownUnderline.ts rename to packages/client/src/tiptap/markdown/markdown-to-prosemirror/markdown-to-html/markdownUnderline.ts diff --git a/packages/client/src/tiptap/services/markdown/markdown-to-html/markedownSplitMixedList.ts b/packages/client/src/tiptap/markdown/markdown-to-prosemirror/markdown-to-html/markedownSplitMixedList.ts similarity index 100% rename from packages/client/src/tiptap/services/markdown/markdown-to-html/markedownSplitMixedList.ts rename to packages/client/src/tiptap/markdown/markdown-to-prosemirror/markdown-to-html/markedownSplitMixedList.ts diff --git a/packages/client/src/tiptap/services/markdown/prosemirror-to-markdown/helpers.ts b/packages/client/src/tiptap/markdown/prosemirror-to-markdown/helpers.ts similarity index 99% rename from packages/client/src/tiptap/services/markdown/prosemirror-to-markdown/helpers.ts rename to packages/client/src/tiptap/markdown/prosemirror-to-markdown/helpers.ts index c139ad10..e2e8750f 100644 --- a/packages/client/src/tiptap/services/markdown/prosemirror-to-markdown/helpers.ts +++ b/packages/client/src/tiptap/markdown/prosemirror-to-markdown/helpers.ts @@ -1,4 +1,4 @@ -import { jsonToStr } from '../../dataset'; +import { jsonToStr } from '../../utils/dataset'; const uniq = (arr: string[]) => [...new Set(arr)]; diff --git a/packages/client/src/tiptap/services/markdown/prosemirror-to-markdown/index.ts b/packages/client/src/tiptap/markdown/prosemirror-to-markdown/index.ts similarity index 69% rename from packages/client/src/tiptap/services/markdown/prosemirror-to-markdown/index.ts rename to packages/client/src/tiptap/markdown/prosemirror-to-markdown/index.ts index 7c8f2a0c..18597812 100644 --- a/packages/client/src/tiptap/services/markdown/prosemirror-to-markdown/index.ts +++ b/packages/client/src/tiptap/markdown/prosemirror-to-markdown/index.ts @@ -1,39 +1,39 @@ import { MarkdownSerializer as ProseMirrorMarkdownSerializer, defaultMarkdownSerializer } from 'prosemirror-markdown'; -import { Attachment } from '../../../extensions/attachment'; -import { Banner } from '../../../extensions/banner'; -import { Bold } from '../../../extensions/bold'; -import { BulletList } from '../../../extensions/bullet-list'; -import { Code } from '../../../extensions/code'; -import { CodeBlock } from '../../../extensions/code-block'; -import { Countdown } from '../../../extensions/countdown'; -import { DocumentChildren } from '../../../extensions/document-children'; -import { DocumentReference } from '../../../extensions/document-reference'; -import { HardBreak } from '../../../extensions/hard-break'; -import { Heading } from '../../../extensions/heading'; -import { HorizontalRule } from '../../../extensions/horizontal-rule'; -import { marks } from '../../../extensions/html-marks'; -import { Iframe } from '../../../extensions/iframe'; -import { Image } from '../../../extensions/image'; -import { Italic } from '../../../extensions/italic'; -import { Katex } from '../../../extensions/katex'; -import { Link } from '../../../extensions/link'; -import { ListItem } from '../../../extensions/listItem'; -import { Mind } from '../../../extensions/mind'; -import { OrderedList } from '../../../extensions/ordered-list'; -import { Paragraph } from '../../../extensions/paragraph'; -import { Status } from '../../../extensions/status'; -import { Strike } from '../../../extensions/strike'; -import { Subscript } from '../../../extensions/subscript'; -import { Superscript } from '../../../extensions/superscript'; -import { Table } from '../../../extensions/table'; -import { TableCell } from '../../../extensions/table-cell'; -import { TableHeader } from '../../../extensions/table-header'; -import { TableRow } from '../../../extensions/table-row'; -import { Text } from '../../../extensions/text'; -import { TaskItem } from '../../../extensions/task-item'; -import { TaskList } from '../../../extensions/task-list'; -import { TextStyle } from '../../../extensions/text-style'; -import { Title } from '../../../extensions/title'; +import { Attachment } from '../../extensions/attachment'; +import { Banner } from '../../extensions/banner'; +import { Bold } from '../../extensions/bold'; +import { BulletList } from '../../extensions/bullet-list'; +import { Code } from '../../extensions/code'; +import { CodeBlock } from '../../extensions/code-block'; +import { Countdown } from '../../extensions/countdown'; +import { DocumentChildren } from '../../extensions/document-children'; +import { DocumentReference } from '../../extensions/document-reference'; +import { HardBreak } from '../../extensions/hard-break'; +import { Heading } from '../../extensions/heading'; +import { HorizontalRule } from '../../extensions/horizontal-rule'; +import { marks } from '../../extensions/html-marks'; +import { Iframe } from '../../extensions/iframe'; +import { Image } from '../../extensions/image'; +import { Italic } from '../../extensions/italic'; +import { Katex } from '../../extensions/katex'; +import { Link } from '../../extensions/link'; +import { ListItem } from '../../extensions/listItem'; +import { Mind } from '../../extensions/mind'; +import { OrderedList } from '../../extensions/ordered-list'; +import { Paragraph } from '../../extensions/paragraph'; +import { Status } from '../../extensions/status'; +import { Strike } from '../../extensions/strike'; +import { Subscript } from '../../extensions/subscript'; +import { Superscript } from '../../extensions/superscript'; +import { Table } from '../../extensions/table'; +import { TableCell } from '../../extensions/table-cell'; +import { TableHeader } from '../../extensions/table-header'; +import { TableRow } from '../../extensions/table-row'; +import { Text } from '../../extensions/text'; +import { TaskItem } from '../../extensions/task-item'; +import { TaskList } from '../../extensions/task-list'; +import { TextStyle } from '../../extensions/text-style'; +import { Title } from '../../extensions/title'; import { isPlainURL, renderHardBreak, diff --git a/packages/client/src/tiptap/menus/align/index.tsx b/packages/client/src/tiptap/menus/align/index.tsx index 8138277a..44eb2c2c 100644 --- a/packages/client/src/tiptap/menus/align/index.tsx +++ b/packages/client/src/tiptap/menus/align/index.tsx @@ -2,7 +2,7 @@ import React from 'react'; import { Editor } from '@tiptap/core'; import { Button, Dropdown, Tooltip } from '@douyinfe/semi-ui'; import { IconAlignLeft, IconAlignCenter, IconAlignRight, IconAlignJustify } from '@douyinfe/semi-icons'; -import { isTitleActive } from '../../services/is-active'; +import { isTitleActive } from '../../utils/is-active'; export const Align: React.FC<{ editor: Editor }> = ({ editor }) => { const current = (() => { diff --git a/packages/client/src/tiptap/menus/background-color/index.tsx b/packages/client/src/tiptap/menus/background-color/index.tsx index dc4e835f..bad757a6 100644 --- a/packages/client/src/tiptap/menus/background-color/index.tsx +++ b/packages/client/src/tiptap/menus/background-color/index.tsx @@ -3,7 +3,7 @@ import { Editor } from '@tiptap/core'; import { Button } from '@douyinfe/semi-ui'; import { IconMark } from '@douyinfe/semi-icons'; import { Tooltip } from 'components/tooltip'; -import { isTitleActive } from '../../services/is-active'; +import { isTitleActive } from '../../utils/is-active'; import { ColorPicker } from '../_components/color-picker'; export const BackgroundColor: React.FC<{ editor: Editor }> = ({ editor }) => { diff --git a/packages/client/src/tiptap/menus/banner/bubble.tsx b/packages/client/src/tiptap/menus/banner/bubble.tsx index 2cf3084d..b0515ae7 100644 --- a/packages/client/src/tiptap/menus/banner/bubble.tsx +++ b/packages/client/src/tiptap/menus/banner/bubble.tsx @@ -5,7 +5,7 @@ import { Tooltip } from 'components/tooltip'; import { BubbleMenu } from '../../views/bubble-menu'; import { Divider } from '../../divider'; import { Banner } from '../../extensions/banner'; -import { deleteNode } from '../../services/delete-node'; +import { deleteNode } from '../../utils/delete-node'; export const BannerBubbleMenu: React.FC<{ editor: Editor }> = ({ editor }) => { return ( diff --git a/packages/client/src/tiptap/menus/blockquote/index.tsx b/packages/client/src/tiptap/menus/blockquote/index.tsx index 2b079607..9ad0a16a 100644 --- a/packages/client/src/tiptap/menus/blockquote/index.tsx +++ b/packages/client/src/tiptap/menus/blockquote/index.tsx @@ -3,7 +3,7 @@ import { Editor } from '@tiptap/core'; import { Button } from '@douyinfe/semi-ui'; import { Tooltip } from 'components/tooltip'; import { IconQuote } from 'components/icons'; -import { isTitleActive } from '../../services/is-active'; +import { isTitleActive } from '../../utils/is-active'; export const Blockquote: React.FC<{ editor: Editor }> = ({ editor }) => { if (!editor) { diff --git a/packages/client/src/tiptap/menus/bold/index.tsx b/packages/client/src/tiptap/menus/bold/index.tsx index e92d5f51..19ca782d 100644 --- a/packages/client/src/tiptap/menus/bold/index.tsx +++ b/packages/client/src/tiptap/menus/bold/index.tsx @@ -3,7 +3,7 @@ import { Editor } from '@tiptap/core'; import { Button } from '@douyinfe/semi-ui'; import { IconBold } from '@douyinfe/semi-icons'; import { Tooltip } from 'components/tooltip'; -import { isTitleActive } from '../../services/is-active'; +import { isTitleActive } from '../../utils/is-active'; export const Bold: React.FC<{ editor: Editor }> = ({ editor }) => { if (!editor) { diff --git a/packages/client/src/tiptap/menus/bullet-list/index.tsx b/packages/client/src/tiptap/menus/bullet-list/index.tsx index df205be0..59b67f5c 100644 --- a/packages/client/src/tiptap/menus/bullet-list/index.tsx +++ b/packages/client/src/tiptap/menus/bullet-list/index.tsx @@ -3,7 +3,7 @@ import { Editor } from '@tiptap/core'; import { Button } from '@douyinfe/semi-ui'; import { IconList } from 'components/icons'; import { Tooltip } from 'components/tooltip'; -import { isTitleActive } from '../../services/is-active'; +import { isTitleActive } from '../../utils/is-active'; export const BulletList: React.FC<{ editor: Editor }> = ({ editor }) => { if (!editor) { diff --git a/packages/client/src/tiptap/menus/code/index.tsx b/packages/client/src/tiptap/menus/code/index.tsx index 89619854..2c2c61db 100644 --- a/packages/client/src/tiptap/menus/code/index.tsx +++ b/packages/client/src/tiptap/menus/code/index.tsx @@ -3,7 +3,7 @@ import { Editor } from '@tiptap/core'; import { Button } from '@douyinfe/semi-ui'; import { IconCode } from '@douyinfe/semi-icons'; import { Tooltip } from 'components/tooltip'; -import { isTitleActive } from '../../services/is-active'; +import { isTitleActive } from '../../utils/is-active'; export const Code: React.FC<{ editor: Editor }> = ({ editor }) => { if (!editor) { diff --git a/packages/client/src/tiptap/menus/fontsize/index.tsx b/packages/client/src/tiptap/menus/fontsize/index.tsx index 19e97f5c..ae9bddc2 100644 --- a/packages/client/src/tiptap/menus/fontsize/index.tsx +++ b/packages/client/src/tiptap/menus/fontsize/index.tsx @@ -1,7 +1,7 @@ import React, { useCallback } from 'react'; import { Select } from '@douyinfe/semi-ui'; import { Editor } from '@tiptap/core'; -import { isTitleActive } from '../../services/is-active'; +import { isTitleActive } from '../../utils/is-active'; export const FONT_SIZES = [12, 13, 14, 15, 16, 19, 22, 24, 29, 32, 40, 48]; diff --git a/packages/client/src/tiptap/menus/heading/index.tsx b/packages/client/src/tiptap/menus/heading/index.tsx index 8d1a2a48..e9b4b42d 100644 --- a/packages/client/src/tiptap/menus/heading/index.tsx +++ b/packages/client/src/tiptap/menus/heading/index.tsx @@ -1,7 +1,7 @@ import React, { useCallback } from 'react'; import { Editor } from '@tiptap/core'; import { Select } from '@douyinfe/semi-ui'; -import { isTitleActive } from '../../services/is-active'; +import { isTitleActive } from '../../utils/is-active'; const getCurrentCaretTitle = (editor) => { if (editor.isActive('heading', { level: 1 })) return 1; diff --git a/packages/client/src/tiptap/menus/horizontal-rule/index.tsx b/packages/client/src/tiptap/menus/horizontal-rule/index.tsx index 74c4d2b6..85fcd2d5 100644 --- a/packages/client/src/tiptap/menus/horizontal-rule/index.tsx +++ b/packages/client/src/tiptap/menus/horizontal-rule/index.tsx @@ -3,7 +3,7 @@ import { Editor } from '@tiptap/core'; import { Button } from '@douyinfe/semi-ui'; import { Tooltip } from 'components/tooltip'; import { IconHorizontalRule } from 'components/icons'; -import { isTitleActive } from '../../services/is-active'; +import { isTitleActive } from '../../utils/is-active'; export const HorizontalRule: React.FC<{ editor: Editor }> = ({ editor }) => { if (!editor) { diff --git a/packages/client/src/tiptap/menus/ident/index.tsx b/packages/client/src/tiptap/menus/ident/index.tsx index 2a584703..352d4562 100644 --- a/packages/client/src/tiptap/menus/ident/index.tsx +++ b/packages/client/src/tiptap/menus/ident/index.tsx @@ -3,7 +3,7 @@ import { Editor } from '@tiptap/core'; import { Button } from '@douyinfe/semi-ui'; import { IconIndentLeft, IconIndentRight } from '@douyinfe/semi-icons'; import { Tooltip } from 'components/tooltip'; -import { isTitleActive } from '../../services/is-active'; +import { isTitleActive } from '../../utils/is-active'; export const Ident: React.FC<{ editor: Editor }> = ({ editor }) => { if (!editor) { diff --git a/packages/client/src/tiptap/menus/insert/index.tsx b/packages/client/src/tiptap/menus/insert/index.tsx index 8a27da5e..0b27b5dc 100644 --- a/packages/client/src/tiptap/menus/insert/index.tsx +++ b/packages/client/src/tiptap/menus/insert/index.tsx @@ -17,7 +17,7 @@ import { IconCountdown, } from 'components/icons'; import { GridSelect } from 'components/grid-select'; -import { isTitleActive } from '../../services/is-active'; +import { isTitleActive } from '../../utils/is-active'; import { createCountdown } from '../countdown/service'; export const Insert: React.FC<{ editor: Editor }> = ({ editor }) => { diff --git a/packages/client/src/tiptap/menus/italic/index.tsx b/packages/client/src/tiptap/menus/italic/index.tsx index 3888155b..4d338161 100644 --- a/packages/client/src/tiptap/menus/italic/index.tsx +++ b/packages/client/src/tiptap/menus/italic/index.tsx @@ -3,7 +3,7 @@ import { Editor } from '@tiptap/core'; import { Button } from '@douyinfe/semi-ui'; import { IconItalic } from '@douyinfe/semi-icons'; import { Tooltip } from 'components/tooltip'; -import { isTitleActive } from '../../services/is-active'; +import { isTitleActive } from '../../utils/is-active'; export const Italic: React.FC<{ editor: Editor }> = ({ editor }) => { if (!editor) { diff --git a/packages/client/src/tiptap/menus/link/bubble.tsx b/packages/client/src/tiptap/menus/link/bubble.tsx index c6e8f139..014c680e 100644 --- a/packages/client/src/tiptap/menus/link/bubble.tsx +++ b/packages/client/src/tiptap/menus/link/bubble.tsx @@ -5,8 +5,8 @@ import { Tooltip } from 'components/tooltip'; import { Divider } from '../../divider'; import { BubbleMenu } from '../../views/bubble-menu'; import { Link } from '../../extensions/link'; -import { isMarkActive } from '../../services/is-active'; -import { findMarkPosition } from '../../services/find-position'; +import { isMarkActive } from '../../utils/is-active'; +import { findMarkPosition } from '../../utils/find-position'; import { triggerOpenLinkSettingModal } from '../_event'; export const LinkBubbleMenu = ({ editor }) => { diff --git a/packages/client/src/tiptap/menus/link/index.tsx b/packages/client/src/tiptap/menus/link/index.tsx index 603a6412..2482f454 100644 --- a/packages/client/src/tiptap/menus/link/index.tsx +++ b/packages/client/src/tiptap/menus/link/index.tsx @@ -3,7 +3,7 @@ import { Editor } from '@tiptap/core'; import { Button } from '@douyinfe/semi-ui'; import { Tooltip } from 'components/tooltip'; import { IconLink } from 'components/icons'; -import { isTitleActive } from '../../services/is-active'; +import { isTitleActive } from '../../utils/is-active'; import { createOrToggleLink } from './service'; import { LinkBubbleMenu } from './bubble'; import { LinkSettingModal } from './modal'; diff --git a/packages/client/src/tiptap/menus/link/modal.tsx b/packages/client/src/tiptap/menus/link/modal.tsx index bcdc28fe..75153c65 100644 --- a/packages/client/src/tiptap/menus/link/modal.tsx +++ b/packages/client/src/tiptap/menus/link/modal.tsx @@ -3,7 +3,7 @@ import { Form, Modal } from '@douyinfe/semi-ui'; import { FormApi } from '@douyinfe/semi-ui/lib/es/form'; import { Editor } from '@tiptap/core'; import { useToggle } from 'hooks/use-toggle'; -import { isValidURL } from '../../services/valid-url'; +import { isValidURL } from '../../utils/valid-url'; import { event, OPEN_LINK_SETTING_MODAL } from '../_event'; type IProps = { editor: Editor }; diff --git a/packages/client/src/tiptap/menus/link/service.ts b/packages/client/src/tiptap/menus/link/service.ts index c834ed4c..15e005a5 100644 --- a/packages/client/src/tiptap/menus/link/service.ts +++ b/packages/client/src/tiptap/menus/link/service.ts @@ -1,5 +1,5 @@ import { Editor } from '@tiptap/core'; -import { isMarkActive } from '../../services/is-active'; +import { isMarkActive } from '../../utils/is-active'; import { triggerOpenLinkSettingModal } from '../_event'; /** diff --git a/packages/client/src/tiptap/menus/ordered-list/index.tsx b/packages/client/src/tiptap/menus/ordered-list/index.tsx index 23ffdab1..f821c361 100644 --- a/packages/client/src/tiptap/menus/ordered-list/index.tsx +++ b/packages/client/src/tiptap/menus/ordered-list/index.tsx @@ -3,7 +3,7 @@ import { Editor } from '@tiptap/core'; import { Button } from '@douyinfe/semi-ui'; import { IconOrderedList } from 'components/icons'; import { Tooltip } from 'components/tooltip'; -import { isTitleActive } from '../../services/is-active'; +import { isTitleActive } from '../../utils/is-active'; export const OrderedList: React.FC<{ editor: Editor }> = ({ editor }) => { if (!editor) { diff --git a/packages/client/src/tiptap/menus/strike/index.tsx b/packages/client/src/tiptap/menus/strike/index.tsx index f8a74aaf..c1d6da78 100644 --- a/packages/client/src/tiptap/menus/strike/index.tsx +++ b/packages/client/src/tiptap/menus/strike/index.tsx @@ -3,7 +3,7 @@ import { Editor } from '@tiptap/core'; import { Button } from '@douyinfe/semi-ui'; import { IconStrikeThrough } from '@douyinfe/semi-icons'; import { Tooltip } from 'components/tooltip'; -import { isTitleActive } from '../../services/is-active'; +import { isTitleActive } from '../../utils/is-active'; export const Strike: React.FC<{ editor: Editor }> = ({ editor }) => { if (!editor) { diff --git a/packages/client/src/tiptap/menus/subscript/index.tsx b/packages/client/src/tiptap/menus/subscript/index.tsx index 6e8b8980..78eba568 100644 --- a/packages/client/src/tiptap/menus/subscript/index.tsx +++ b/packages/client/src/tiptap/menus/subscript/index.tsx @@ -2,7 +2,7 @@ import React from 'react'; import { Button } from '@douyinfe/semi-ui'; import { IconSub } from 'components/icons'; import { Tooltip } from 'components/tooltip'; -import { isTitleActive } from '../../services/is-active'; +import { isTitleActive } from '../../utils/is-active'; export const Subscript: React.FC<{ editor: any }> = ({ editor }) => { if (!editor) { diff --git a/packages/client/src/tiptap/menus/superscript/index.tsx b/packages/client/src/tiptap/menus/superscript/index.tsx index 331c2704..378c54f2 100644 --- a/packages/client/src/tiptap/menus/superscript/index.tsx +++ b/packages/client/src/tiptap/menus/superscript/index.tsx @@ -2,7 +2,7 @@ import React from 'react'; import { Button } from '@douyinfe/semi-ui'; import { IconSup } from 'components/icons'; import { Tooltip } from 'components/tooltip'; -import { isTitleActive } from '../../services/is-active'; +import { isTitleActive } from '../../utils/is-active'; export const Superscript: React.FC<{ editor: any }> = ({ editor }) => { if (!editor) { diff --git a/packages/client/src/tiptap/menus/task-list/index.tsx b/packages/client/src/tiptap/menus/task-list/index.tsx index 3050c697..b52a85c7 100644 --- a/packages/client/src/tiptap/menus/task-list/index.tsx +++ b/packages/client/src/tiptap/menus/task-list/index.tsx @@ -3,7 +3,7 @@ import { Editor } from '@tiptap/core'; import { Button } from '@douyinfe/semi-ui'; import { Tooltip } from 'components/tooltip'; import { IconTask } from 'components/icons'; -import { isTitleActive } from '../../services/is-active'; +import { isTitleActive } from '../../utils/is-active'; export const TaskList: React.FC<{ editor: Editor }> = ({ editor }) => { if (!editor) { diff --git a/packages/client/src/tiptap/menus/text-color/index.tsx b/packages/client/src/tiptap/menus/text-color/index.tsx index aaa5ca8a..c84b7b94 100644 --- a/packages/client/src/tiptap/menus/text-color/index.tsx +++ b/packages/client/src/tiptap/menus/text-color/index.tsx @@ -3,7 +3,7 @@ import { Editor } from '@tiptap/core'; import { Button } from '@douyinfe/semi-ui'; import { IconFont } from '@douyinfe/semi-icons'; import { Tooltip } from 'components/tooltip'; -import { isTitleActive } from '../../services/is-active'; +import { isTitleActive } from '../../utils/is-active'; import { ColorPicker } from '../_components/color-picker'; export const TextColor: React.FC<{ editor: Editor }> = ({ editor }) => { diff --git a/packages/client/src/tiptap/menus/underline/index.tsx b/packages/client/src/tiptap/menus/underline/index.tsx index 67c7492c..80d63d74 100644 --- a/packages/client/src/tiptap/menus/underline/index.tsx +++ b/packages/client/src/tiptap/menus/underline/index.tsx @@ -3,7 +3,7 @@ import { Editor } from '@tiptap/core'; import { Button } from '@douyinfe/semi-ui'; import { IconUnderline } from '@douyinfe/semi-icons'; import { Tooltip } from 'components/tooltip'; -import { isTitleActive } from '../../services/is-active'; +import { isTitleActive } from '../../utils/is-active'; export const Underline: React.FC<{ editor: Editor }> = ({ editor }) => { if (!editor) { diff --git a/packages/client/src/tiptap/basekit.tsx b/packages/client/src/tiptap/start-kit.tsx similarity index 100% rename from packages/client/src/tiptap/basekit.tsx rename to packages/client/src/tiptap/start-kit.tsx diff --git a/packages/client/src/tiptap/services/clamp.ts b/packages/client/src/tiptap/utils/clamp.ts similarity index 100% rename from packages/client/src/tiptap/services/clamp.ts rename to packages/client/src/tiptap/utils/clamp.ts diff --git a/packages/client/src/tiptap/services/code.ts b/packages/client/src/tiptap/utils/code.ts similarity index 100% rename from packages/client/src/tiptap/services/code.ts rename to packages/client/src/tiptap/utils/code.ts diff --git a/packages/client/src/tiptap/services/color.ts b/packages/client/src/tiptap/utils/color.ts similarity index 100% rename from packages/client/src/tiptap/services/color.ts rename to packages/client/src/tiptap/utils/color.ts diff --git a/packages/client/src/tiptap/services/dataset.ts b/packages/client/src/tiptap/utils/dataset.ts similarity index 100% rename from packages/client/src/tiptap/services/dataset.ts rename to packages/client/src/tiptap/utils/dataset.ts diff --git a/packages/client/src/tiptap/services/delete-node.ts b/packages/client/src/tiptap/utils/delete-node.ts similarity index 100% rename from packages/client/src/tiptap/services/delete-node.ts rename to packages/client/src/tiptap/utils/delete-node.ts diff --git a/packages/client/src/tiptap/services/dom.ts b/packages/client/src/tiptap/utils/dom.ts similarity index 100% rename from packages/client/src/tiptap/services/dom.ts rename to packages/client/src/tiptap/utils/dom.ts diff --git a/packages/client/src/tiptap/services/download.ts b/packages/client/src/tiptap/utils/download.ts similarity index 100% rename from packages/client/src/tiptap/services/download.ts rename to packages/client/src/tiptap/utils/download.ts diff --git a/packages/client/src/tiptap/services/file.ts b/packages/client/src/tiptap/utils/file.ts similarity index 100% rename from packages/client/src/tiptap/services/file.ts rename to packages/client/src/tiptap/utils/file.ts diff --git a/packages/client/src/tiptap/services/find-position.ts b/packages/client/src/tiptap/utils/find-position.ts similarity index 100% rename from packages/client/src/tiptap/services/find-position.ts rename to packages/client/src/tiptap/utils/find-position.ts diff --git a/packages/client/src/tiptap/services/is-active.ts b/packages/client/src/tiptap/utils/is-active.ts similarity index 100% rename from packages/client/src/tiptap/services/is-active.ts rename to packages/client/src/tiptap/utils/is-active.ts diff --git a/packages/client/src/tiptap/services/list-input-rule.ts b/packages/client/src/tiptap/utils/list-input-rule.ts similarity index 100% rename from packages/client/src/tiptap/services/list-input-rule.ts rename to packages/client/src/tiptap/utils/list-input-rule.ts diff --git a/packages/client/src/tiptap/services/lowlight-plugin.ts b/packages/client/src/tiptap/utils/lowlight-plugin.ts similarity index 100% rename from packages/client/src/tiptap/services/lowlight-plugin.ts rename to packages/client/src/tiptap/utils/lowlight-plugin.ts diff --git a/packages/client/src/tiptap/services/mark-utils.ts b/packages/client/src/tiptap/utils/mark-utils.ts similarity index 100% rename from packages/client/src/tiptap/services/mark-utils.ts rename to packages/client/src/tiptap/utils/mark-utils.ts diff --git a/packages/client/src/tiptap/services/node.ts b/packages/client/src/tiptap/utils/node.ts similarity index 100% rename from packages/client/src/tiptap/services/node.ts rename to packages/client/src/tiptap/utils/node.ts diff --git a/packages/client/src/tiptap/services/table.ts b/packages/client/src/tiptap/utils/table.ts similarity index 100% rename from packages/client/src/tiptap/services/table.ts rename to packages/client/src/tiptap/utils/table.ts diff --git a/packages/client/src/tiptap/services/type.ts b/packages/client/src/tiptap/utils/type.ts similarity index 100% rename from packages/client/src/tiptap/services/type.ts rename to packages/client/src/tiptap/utils/type.ts diff --git a/packages/client/src/tiptap/services/upload.ts b/packages/client/src/tiptap/utils/upload.ts similarity index 100% rename from packages/client/src/tiptap/services/upload.ts rename to packages/client/src/tiptap/utils/upload.ts diff --git a/packages/client/src/tiptap/services/valid-url.ts b/packages/client/src/tiptap/utils/valid-url.ts similarity index 100% rename from packages/client/src/tiptap/services/valid-url.ts rename to packages/client/src/tiptap/utils/valid-url.ts diff --git a/packages/client/src/tiptap/wrappers/attachment/file-icon.tsx b/packages/client/src/tiptap/wrappers/attachment/file-icon.tsx index a19a3e65..e2db6ca1 100644 --- a/packages/client/src/tiptap/wrappers/attachment/file-icon.tsx +++ b/packages/client/src/tiptap/wrappers/attachment/file-icon.tsx @@ -1,5 +1,5 @@ import { IconFile, IconSong, IconVideo, IconImage } from '@douyinfe/semi-icons'; -import { normalizeFileType } from '../../services/file'; +import { normalizeFileType } from '../../utils/file'; export const getFileTypeIcon = (fileType: string) => { const type = normalizeFileType(fileType); diff --git a/packages/client/src/tiptap/wrappers/attachment/index.tsx b/packages/client/src/tiptap/wrappers/attachment/index.tsx index e6ca7c07..dd3a3739 100644 --- a/packages/client/src/tiptap/wrappers/attachment/index.tsx +++ b/packages/client/src/tiptap/wrappers/attachment/index.tsx @@ -5,9 +5,9 @@ import { Button, Typography, Spin, Collapsible, Space } from '@douyinfe/semi-ui' import { IconDownload, IconPlayCircle, IconClose } from '@douyinfe/semi-icons'; import { Tooltip } from 'components/tooltip'; import { useToggle } from 'hooks/use-toggle'; -import { download } from '../../services/download'; +import { download } from '../../utils/download'; import { uploadFile } from 'services/file'; -import { normalizeFileSize, extractFileExtension, extractFilename } from '../../services/file'; +import { normalizeFileSize, extractFileExtension, extractFilename } from '../../utils/file'; import { Player } from './player'; import { getFileTypeIcon } from './file-icon'; import styles from './index.module.scss'; diff --git a/packages/client/src/tiptap/wrappers/attachment/player/index.tsx b/packages/client/src/tiptap/wrappers/attachment/player/index.tsx index 4edc5a88..54e9446e 100644 --- a/packages/client/src/tiptap/wrappers/attachment/player/index.tsx +++ b/packages/client/src/tiptap/wrappers/attachment/player/index.tsx @@ -7,7 +7,7 @@ import { extractFilename, normalizeFileType, FileType, -} from '../../../services/file'; +} from '../../../utils/file'; import { PDFPlayer } from './pdf-player'; import styles from './index.module.scss'; diff --git a/packages/client/src/tiptap/wrappers/image/index.tsx b/packages/client/src/tiptap/wrappers/image/index.tsx index 2e3592e7..f093edbe 100644 --- a/packages/client/src/tiptap/wrappers/image/index.tsx +++ b/packages/client/src/tiptap/wrappers/image/index.tsx @@ -5,7 +5,7 @@ import cls from 'classnames'; import { Typography, Spin } from '@douyinfe/semi-ui'; import { useToggle } from 'hooks/use-toggle'; import { uploadFile } from 'services/file'; -import { extractFileExtension, extractFilename, getImageWidthHeight } from '../../services/file'; +import { extractFileExtension, extractFilename, getImageWidthHeight } from '../../utils/file'; import styles from './index.module.scss'; const { Text } = Typography;