Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions components.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,8 @@ declare module 'vue' {
TabButtons: typeof import('./src/components/TabButtons/TabButtons.vue')['default']
'TabButtons.story': typeof import('./src/components/TabButtons/TabButtons.story.vue')['default']
Table2: typeof import('./src/components/TextEditor/icons/table-2.vue')['default']
TableActionMenu: typeof import('./src/components/TextEditor/extensions/table/TableActionMenu.vue')['default']
TableCellActionHandle: typeof import('./src/components/TextEditor/extensions/table/TableCellActionHandle.vue')['default']
TabList: typeof import('./src/components/Tabs/TabList.vue')['default']
TabPanel: typeof import('./src/components/Tabs/TabPanel.vue')['default']
Tabs: typeof import('./src/components/Tabs/Tabs.vue')['default']
Expand Down
10 changes: 7 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
"@tailwindcss/line-clamp": "^0.4.4",
"@tailwindcss/typography": "^0.5.16",
"@tiptap/core": "^2.26.1",
"@tiptap/extension-bubble-menu": "^3.10.5",
"@tiptap/extension-code": "^2.26.1",
"@tiptap/extension-code-block": "^2.26.1",
"@tiptap/extension-code-block-lowlight": "^2.26.1",
Expand All @@ -61,6 +62,7 @@
"@tiptap/suggestion": "^2.26.1",
"@tiptap/vue-3": "^2.26.1",
"@vueuse/core": "^10.4.1",
"date-fns": "^4.1.0",
"dayjs": "^1.11.13",
"dompurify": "^3.2.6",
"echarts": "^5.6.0",
Expand All @@ -73,16 +75,18 @@
"marked": "^15.0.12",
"ora": "5.4.1",
"prettier": "^3.3.2",
"prosemirror-state": "^1.4.4",
"prosemirror-tables": "^1.8.1",
"prosemirror-utils": "^1.2.2",
"radix-vue": "^1.5.3",
"reka-ui": "^2.5.0",
"slugify": "^1.6.6",
"socket.io-client": "^4.5.1",
"tippy.js": "^6.3.7",
"typescript": "^5.0.2",
"unplugin-auto-import": "^19.3.0",
"unplugin-icons": "^22.1.0",
"unplugin-vue-components": "^28.4.1",
"date-fns": "^4.1.0",
"slugify": "^1.6.6"
"unplugin-vue-components": "^28.4.1"
},
"peerDependencies": {
"vue": ">=3.5.0",
Expand Down
95 changes: 55 additions & 40 deletions src/components/TextEditor/TextEditor.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template>
<div
v-if="editor"
class="relative w-full prose"
class="relative w-full"
:class="attrsClass"
:style="attrsStyle"
v-bind="attrsWithoutClassStyle"
Expand All @@ -12,7 +12,25 @@
class="w-full overflow-x-auto rounded-t-lg border border-outline-gray-modals"
:buttons="fixedMenu"
/>
<TextEditorFloatingMenu :buttons="floatingMenu" />
<TextEditorFloatingMenu :buttons="floatingMenu" />
<TableBorderMenu
:show="showTableBorderMenu"
:axis="tableBorderAxis"
:position="tableBorderMenuPos"
:cell-info="tableCellInfo"
:can-merge-cells="canMergeCells"
@add-row-before="addRowBefore"
@add-row-after="addRowAfter"
@delete-row="deleteRow"
@add-column-before="addColumnBefore"
@add-column-after="addColumnAfter"
@delete-column="deleteColumn"
@merge-cells="mergeCells"
@toggle-header="toggleHeader"
@set-background-color="setBackgroundColor"
@set-border-color="setBorderColor"
@set-border-width="setBorderWidth"
/>
<slot name="top" :editor />
<slot name="editor" :editor="editor">
<EditorContent :editor="editor" />
Expand Down Expand Up @@ -41,10 +59,6 @@ import { Editor, EditorContent } from '@tiptap/vue-3'
import StarterKit from '@tiptap/starter-kit'
import Placeholder from '@tiptap/extension-placeholder'
import TextAlign from '@tiptap/extension-text-align'
import Table from '@tiptap/extension-table'
import TableCell from '@tiptap/extension-table-cell'
import TableHeader from '@tiptap/extension-table-header'
import TableRow from '@tiptap/extension-table-row'
import { ImageExtension } from './extensions/image'
import ImageViewerExtension from './image-viewer-extension'
import { VideoExtension } from './video-extension'
Expand All @@ -58,7 +72,7 @@ import NamedColorExtension from './extensions/color'
import NamedHighlightExtension from './extensions/highlight'
import StyleClipboardExtension from './extensions/copy-styles'
import improvedList from './extensions/list-extension'

import TableExtension from './extensions/tables/table-extension'
import { MentionExtension } from './extensions/mention'
import TextEditorFixedMenu from './TextEditorFixedMenu.vue'
import TextEditorBubbleMenu from './TextEditorBubbleMenu.vue'
Expand All @@ -72,6 +86,12 @@ import { ImageGroup } from './extensions/image-group/image-group-extension'
import { ExtendedCode, ExtendedCodeBlock } from './extensions/code-block'
import { useFileUpload } from '../../utils/useFileUpload'
import { TextEditorEmits, TextEditorProps } from './types'
import TableCellExtension from './extensions/tables/table-cell-extension'
import TableHeaderExtension from './extensions/tables/table-header-extension'
import TableRowExtension from './extensions/tables/table-row-extension'
import TableBorderMenu from './extensions/tables/TableBorderMenu.vue'
import { useTableMenu } from './extensions/tables/use-table-menu'
import { TableCommandsExtension } from './extensions/tables/table-selection-extension'

function defaultUploadFunction(file: File) {
// useFileUpload is frappe specific
Expand Down Expand Up @@ -99,6 +119,25 @@ const emit = defineEmits<TextEditorEmits>()

const editor = ref<Editor | null>(null)

const {
showTableBorderMenu,
tableBorderAxis,
tableBorderMenuPos,
tableCellInfo,
canMergeCells,
addRowBefore,
addRowAfter,
deleteRow,
addColumnBefore,
addColumnAfter,
deleteColumn,
mergeCells,
toggleHeader,
setBackgroundColor,
setBorderColor,
setBorderWidth
} = useTableMenu(editor)

const attrs = useAttrs()
const attrsClass = computed(() => normalizeClass(attrs.class))
const attrsStyle = computed(() => normalizeStyle(attrs.style))
Expand All @@ -112,7 +151,7 @@ const editorProps = computed(() => {
return {
attributes: {
class: normalizeClass([
'prose-table:table-fixed prose-td:p-2 prose-th:p-2 prose-td:border prose-th:border prose-td:border-outline-gray-2 prose-th:border-outline-gray-2 prose-td:relative prose-th:relative prose-th:bg-surface-gray-2',
'prose prose-table:table-fixed prose-td:p-2 prose-th:p-2 prose-td:border prose-th:border prose-td:relative prose-th:relative prose-th:bg-surface-gray-2',
props.editorClass,
]),
},
Expand Down Expand Up @@ -180,13 +219,17 @@ onMounted(() => {
Table.configure({
resizable: true,
}),
TableExtension.configure({
resizable: true,
}),
TableCellExtension,
TableHeaderExtension,
TableRowExtension,
TableCommandsExtension,
TaskList,
TaskItem.configure({
nested: true,
}),
TableRow,
TableHeader,
TableCell,
Typography,
TextAlign.configure({
types: ['heading', 'paragraph'],
Expand Down Expand Up @@ -275,6 +318,7 @@ defineExpose({
<style>
@import './extensions/color/color-styles.css';
@import './extensions/highlight/highlight-styles.css';
@import './extensions/tables/table-styles.css';

.ProseMirror {
outline: none;
Expand All @@ -301,35 +345,6 @@ img.ProseMirror-selectednode {
outline: 2px solid var(--outline-gray-2);
}

/* Table styles */
.prose table p {
margin: 0;
}

/* Prosemirror specific table styles */
.ProseMirror table .selectedCell:after {
z-index: 2;
position: absolute;
content: '';
left: 0;
right: 0;
top: 0;
bottom: 0;
pointer-events: none;
background: theme('colors.blue.200');
opacity: 0.3;
}

.ProseMirror table .column-resize-handle {
position: absolute;
right: -1px;
top: 0;
bottom: -2px;
width: 4px;
background-color: theme('colors.blue.200');
pointer-events: none;
}

.ProseMirror ul[data-type='taskList'] {
list-style: none;
padding: 0;
Expand Down
3 changes: 2 additions & 1 deletion src/components/TextEditor/commands.js
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,8 @@ export default {
FontColor: {
label: 'Font Color',
icon: FontColor,
isActive: (editor) => editor.getAttributes('textStyle')?.color || editor.isActive('highlight'),
isActive: (editor) =>
editor.getAttributes('textStyle')?.color || editor.isActive('highlight'),
component: defineAsyncComponent(() => import('./FontColor.vue')),
},
Blockquote: {
Expand Down
Loading