diff --git a/ui/packages/editor/src/extensions/indent/index.ts b/ui/packages/editor/src/extensions/indent/index.ts index 74d61c332..b822e9b70 100644 --- a/ui/packages/editor/src/extensions/indent/index.ts +++ b/ui/packages/editor/src/extensions/indent/index.ts @@ -4,8 +4,8 @@ import { type KeyboardShortcutCommand, Extension, isList, - Editor, -} from "@/tiptap/vue-3"; + CoreEditor, +} from "@/tiptap"; import { TextSelection, Transaction } from "@/tiptap/pm"; declare module "@/tiptap" { @@ -104,7 +104,6 @@ const Indent = Extension.create({ return { Tab: getIndent(), "Shift-Tab": getOutdent(false), - Backspace: getOutdent(true), "Mod-]": getIndent(), "Mod-[": getOutdent(false), }; @@ -196,7 +195,7 @@ const isTextIndent = (tr: Transaction, currNodePos: number) => { return false; }; -const isListActive = (editor: Editor) => { +const isListActive = (editor: CoreEditor) => { return ( editor.isActive("bulletList") || editor.isActive("orderedList") || @@ -204,7 +203,7 @@ const isListActive = (editor: Editor) => { ); }; -const isFilterActive = (editor: Editor) => { +const isFilterActive = (editor: CoreEditor) => { return editor.isActive("table") || editor.isActive("columns"); }; @@ -232,11 +231,11 @@ export const getOutdent: ( if (outdentOnlyAtHead && editor.state.selection.$head.parentOffset > 0) { return false; } - // @ts-ignore + if (isFilterActive(editor)) { return false; } - // @ts-ignore + if (isListActive(editor)) { const name = editor.can().liftListItem("listItem") ? "listItem" diff --git a/ui/packages/editor/src/styles/base.scss b/ui/packages/editor/src/styles/base.scss index 4f53933e4..3e671da45 100644 --- a/ui/packages/editor/src/styles/base.scss +++ b/ui/packages/editor/src/styles/base.scss @@ -73,7 +73,7 @@ } ul { - @apply list-disc; + list-style-type: revert-layer; } code br {