@worktile/theia 17.1.0 → 17.2.0

package/fesm2022/worktile-theia.mjs

@@ -1579,78 +1579,79 @@ const someNode = (editor, options) => {
     return !!findNode(editor, options);
 };
 
-const queries = {
-    anchorBlock,
-    anchorBlockEntry,
-    anchorInlineEntry,
-    findDescendant,
-    findNode,
-    findPath,
-    getAnchorBlockEntry,
-    getAbove,
-    getAboveByType,
-    getBlockAbove,
-    getBlockCardAbove,
-    getBlockCardCenterCursor,
-    getContainerBlocks,
-    getDirectlyParent,
-    getInsertElementsPath,
+var index$1 = /*#__PURE__*/Object.freeze({
+    __proto__: null,
+    anchorBlock: anchorBlock,
+    anchorBlockEntry: anchorBlockEntry,
+    anchorInlineEntry: anchorInlineEntry,
+    findDescendant: findDescendant,
+    findNode: findNode,
+    findPath: findPath,
+    getAbove: getAbove,
+    getAboveByType: getAboveByType,
+    getAnchorBlockEntry: getAnchorBlockEntry,
+    getBlockAbove: getBlockAbove,
+    getBlockCardAbove: getBlockCardAbove,
+    getBlockCardCenterCursor: getBlockCardCenterCursor,
+    getContainerBlocks: getContainerBlocks,
+    getDirectlyParent: getDirectlyParent,
+    getInsertElementsPath: getInsertElementsPath,
     getLastChild: getLastChild$1,
-    getLastChildPath,
-    getLastNode,
-    getNextSiblingNodes,
-    getNode,
-    getNodes,
-    getNodesByType,
-    getParent,
-    getPlainText,
-    getPluginByToolbarItem,
-    getPointBefore,
-    getPointFromLocation,
-    getPreviousPath,
-    getRangeBefore,
-    getRangeFromBlockStart,
-    getSelectionMarks,
-    getSelectionNodesByType,
-    getText,
-    getToolbarItemDisabled,
-    isAcrossBlocks,
-    isAncestor,
-    isAncestorEmpty,
-    isBlockAboveEmpty,
-    isBlockActive,
-    isBlockCardCursor,
-    isBlockTextEmptyAfterSelection,
-    isCollapsed,
-    isContainNestedType,
-    isContainer,
-    isDescendant,
-    isEmptyContent,
-    isEmptyContentByFilter,
-    isEmptyParagraph,
-    isEmptyParagraphByPath,
-    isEmptyParagraphElement,
-    isFirstChild,
-    isGlobalCollapsed,
-    isIncludeTypes,
-    isLogicEmptyParagraphElement,
-    isNodeType,
-    isNodeTypeIn,
-    isParagraph,
-    isPointAtRoot,
-    isRangeAcrossBlocks,
-    isRangeAtRoot,
-    isStart,
-    someNode,
-    isRootPath
-};
+    getLastChildPath: getLastChildPath,
+    getLastNode: getLastNode,
+    getNextSiblingNodes: getNextSiblingNodes,
+    getNode: getNode,
+    getNodes: getNodes,
+    getNodesByType: getNodesByType,
+    getParent: getParent,
+    getPlainText: getPlainText,
+    getPluginByToolbarItem: getPluginByToolbarItem,
+    getPointBefore: getPointBefore,
+    getPointFromLocation: getPointFromLocation,
+    getPreviousPath: getPreviousPath,
+    getRangeBefore: getRangeBefore,
+    getRangeFromBlockStart: getRangeFromBlockStart,
+    getSelectionMarks: getSelectionMarks,
+    getSelectionNodesByType: getSelectionNodesByType,
+    getText: getText,
+    getToolbarItemDisabled: getToolbarItemDisabled,
+    isAcrossBlocks: isAcrossBlocks,
+    isAncestor: isAncestor,
+    isAncestorEmpty: isAncestorEmpty,
+    isBlockAboveEmpty: isBlockAboveEmpty,
+    isBlockActive: isBlockActive,
+    isBlockCardCursor: isBlockCardCursor,
+    isBlockTextEmptyAfterSelection: isBlockTextEmptyAfterSelection,
+    isCollapsed: isCollapsed,
+    isContainNestedType: isContainNestedType,
+    isContainer: isContainer,
+    isDescendant: isDescendant,
+    isEmptyContent: isEmptyContent,
+    isEmptyContentByFilter: isEmptyContentByFilter,
+    isEmptyParagraph: isEmptyParagraph,
+    isEmptyParagraphByPath: isEmptyParagraphByPath,
+    isEmptyParagraphElement: isEmptyParagraphElement,
+    isFirstChild: isFirstChild,
+    isGlobalCollapsed: isGlobalCollapsed,
+    isIncludeTypes: isIncludeTypes,
+    isLogicEmptyParagraphElement: isLogicEmptyParagraphElement,
+    isNodeType: isNodeType,
+    isNodeTypeIn: isNodeTypeIn,
+    isParagraph: isParagraph,
+    isPointAtRoot: isPointAtRoot,
+    isRangeAcrossBlocks: isRangeAcrossBlocks,
+    isRangeAtRoot: isRangeAtRoot,
+    isRootPath: isRootPath,
+    isStart: isStart,
+    someNode: someNode
+});
 
 const autoFocus = (editor, isFocus) => {
     setTimeout(() => {
         if (editor && editor.children.length > 0 && isFocus) {
             HistoryEditor.withoutMerging(editor, () => {
                 const path = [0];
-                const block = queries.getNode(editor, path);
+                const block = getNode(editor, path);
                 const isBlockCard = editor.isBlockCard(block);
                 if (isBlockCard) {
                     Transforms.select(editor, path);
@@ -2078,11 +2079,11 @@ function insertDataByInvalidType(editor, fragment) {
             const extraInfo = mergeElementOptions(editor.extraElementOptions);
             allElementOptions = Object.values(extraInfo);
         }
-        if (queries.isAcrossBlocks(editor, fragment) || Editor.isVoid(editor, fragment[0])) {
+        if (isAcrossBlocks(editor, fragment) || Editor.isVoid(editor, fragment[0])) {
             const { selection } = editor;
             const [start] = Editor.edges(editor, selection);
             // query whether there is a node to be verified
-            const tryVerifyNode = allElementOptions.find(item => queries.getAboveByType(editor, item.type, { at: start, mode: 'lowest' }));
+            const tryVerifyNode = allElementOptions.find(item => getAboveByType(editor, item.type, { at: start, mode: 'lowest' }));
             let isEndWithBlackCardElement = editor.isBlockCard(fragment[fragment.length - 1]);
             if (tryVerifyNode) {
                 // is exist invalid element type in fragment
@@ -2090,7 +2091,7 @@ function insertDataByInvalidType(editor, fragment) {
                 if (invalidIndex > -1) {
                     const invalidFragmentData = fragment.slice(invalidIndex, fragment.length);
                     const allowParentTypes = getPluginOptions(editor, invalidFragmentData[0].type)?.allowParentTypes || [];
-                    const insertNodePath = queries.getInsertElementsPath(editor, allowParentTypes);
+                    const insertNodePath = getInsertElementsPath(editor, allowParentTypes);
                     if (insertNodePath) {
                         Editor.withoutNormalizing(editor, () => {
                             Transforms.insertNodes(editor, fragment, { at: insertNodePath });
@@ -2098,7 +2099,7 @@ function insertDataByInvalidType(editor, fragment) {
                         });
                         return false;
                     }
-                    const [, anchorBlockPath] = queries.anchorBlockEntry(editor);
+                    const [, anchorBlockPath] = anchorBlockEntry(editor);
                     const nextPath = Path.next([anchorBlockPath[0]]);
                     Transforms.insertNodes(editor, fragment, { at: nextPath });
                     Transforms.select(editor, Editor.start(editor, nextPath));
@@ -2106,11 +2107,11 @@ function insertDataByInvalidType(editor, fragment) {
                 }
             }
             Editor.withoutNormalizing(editor, () => {
-                const isEmptyParagraph = queries.isEmptyParagraph(editor, editor.selection.anchor);
+                const isEmptyParagraph$1 = isEmptyParagraph(editor, editor.selection.anchor);
                 const emptyPath = Path.parent(editor.selection.anchor.path);
                 Transforms.insertNodes(editor, fragment);
                 let targetPath = [];
-                if (isEmptyParagraph) {
+                if (isEmptyParagraph$1) {
                     Transforms.delete(editor, { at: emptyPath });
                     const lastPath = emptyPath.pop();
                     targetPath = [...emptyPath, lastPath + fragment.length - 1];
@@ -2172,19 +2173,19 @@ const isPureEmptyParagraph = (editor, block) => {
 const reSelection = (editor) => {
     let previousRange = THE_EDITOR_PREVIOUS_SELECTION.get(editor);
     let path = [0];
-    let focusNode = queries.getNode(editor, path);
+    let focusNode = getNode(editor, path);
     let focusPath = Editor.start(editor, path);
     if (previousRange) {
         const { selection, rangeRef } = previousRange;
         if (rangeRef.current) {
             path = Editor.path(editor, rangeRef.current);
-            focusNode = queries.getNode(editor, path);
+            focusNode = getNode(editor, path);
             focusPath = rangeRef.unref();
         }
         else {
             const previousPath = Editor.path(editor, selection);
             path = Path.previous([previousPath[0]]);
-            const previousNode = queries.getNode(editor, path);
+            const previousNode = getNode(editor, path);
             if (previousNode) {
                 focusPath = Editor.end(editor, path);
                 focusNode = previousNode;
@@ -2276,6 +2277,63 @@ const updatePopoverPosition = (overlayRef, origin, positions = []) => {
     }
 };
 
+function getDirtyElements(editor, content, result) {
+    const dirtyElements = result || [];
+    content.forEach(value => {
+        if (Element.isElement(value) && value.children.length === 0) {
+            dirtyElements.push(value);
+        }
+        else if (Element.isElement(value)) {
+            getDirtyElements(editor, value.children, dirtyElements);
+        }
+    });
+    return dirtyElements;
+}
+function fixBlockWithoutText(editor, path) {
+    const block = Node.get(editor, path);
+    if (Element.isElement(block) && block.children.length === 0) {
+        Transforms.insertNodes(editor, { text: '' }, { at: path.concat(0) });
+        console.warn(`fix data: `, block);
+    }
+}
+function fixBlockWithoutParagraph(editor, path) {
+    const block = Node.get(editor, path);
+    if (Element.isElement(block) && block.children.length === 0) {
+        Transforms.insertNodes(editor, { type: ElementKinds.paragraph, children: [{ text: '' }] }, { at: path.concat(0) });
+        console.warn(`fix data: `, block);
+    }
+}
+const isLowestType = (kind) => {
+    return kind === ElementKinds.paragraph || kind === ElementKinds.checkItem;
+};
+function normalizeValue(editor, value) {
+    const dirtyElements = getDirtyElements(editor, value);
+    if (dirtyElements && dirtyElements.length > 0) {
+        setTimeout(() => {
+            HistoryEditor.withoutSaving(editor, () => {
+                dirtyElements.forEach((dirtyElement) => {
+                    try {
+                        const dirtyPath = AngularEditor.findPath(editor, dirtyElement);
+                        if (Editor.isBlock(editor, dirtyElement) && isLowestType(dirtyElement.type)) {
+                            fixBlockWithoutText(editor, dirtyPath);
+                        }
+                        if (Editor.isInline(editor, dirtyElement)) {
+                            fixBlockWithoutText(editor, dirtyPath);
+                        }
+                        if (Editor.isBlock(editor, dirtyElement) && !isLowestType(dirtyElement.type)) {
+                            fixBlockWithoutParagraph(editor, dirtyPath);
+                        }
+                    }
+                    catch (error) {
+                        console.error(error);
+                    }
+                    // todo 根据类型配置自定义修复函数
+                });
+            });
+        }, 0);
+    }
+}
+
 const nextToolbarEntity = (toolbarDefinition, toolbarItems) => {
     const entity = {};
     for (const defKey in toolbarDefinition) {
@@ -2356,8 +2414,8 @@ class TheBaseToolbarItem {
                 this.disabled = this._toolbarItem?.disable ? this._toolbarItem?.disable(editor) : false;
             }
             else {
-                const thePlugin = queries.getPluginByToolbarItem(editor, this._toolbarItem);
-                this.disabled = thePlugin && queries.getToolbarItemDisabled(editor, thePlugin.key);
+                const thePlugin = getPluginByToolbarItem(editor, this._toolbarItem);
+                this.disabled = thePlugin && getToolbarItemDisabled(editor, thePlugin.key);
             }
         }
         else {
@@ -3623,6 +3681,27 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.0", ngImpor
                 }]
         }] });
 
+/**
+ * Recursively apply an operation to children nodes with a query.
+ */
+const applyDeepToNodes = ({ node, source, apply, query }) => {
+    const entry = [node, []];
+    if (isNodeType(entry, query)) {
+        if (source instanceof Function) {
+            apply(node, source());
+        }
+        else {
+            apply(node, source);
+        }
+    }
+    if (!isAncestor(node)) {
+        return;
+    }
+    node.children.forEach((child) => {
+        applyDeepToNodes({ node: child, source, apply, query });
+    });
+};
+
 const setMarks = (editor, marks, at) => {
     Transforms.setNodes(editor, marks, {
         at,
@@ -3651,6 +3730,72 @@ const clearMarks = (editor) => {
     }
 };
 
+const closeConversionHint = (editor) => {
+    const hintRef = THE_EDITOR_CONVERSION_HINT_REF.get(editor);
+    if (hintRef) {
+        hintRef.close();
+    }
+};
+
+const deleteElement = (editor, element) => {
+    const at = findPath(editor, element);
+    Transforms.insertNodes(editor, createEmptyParagraph(), { at });
+    AngularEditor.focus(editor);
+    Transforms.select(editor, at);
+    Transforms.removeNodes(editor, { at: Path.next(at) });
+};
+
+const deleteNodeByType = (editor, type) => {
+    const node = getAboveByType(editor, type);
+    const element = node && node[0];
+    if (element) {
+        deleteElement(editor, element);
+    }
+};
+
+const unWrap = (editor, kind) => {
+    Editor.withoutNormalizing(editor, () => {
+        Transforms.setNodes(editor, { type: ElementKinds.paragraph });
+        Transforms.unwrapNodes(editor, {
+            match: n => Element.isElement(n) && n.type === kind,
+            split: true
+        });
+    });
+};
+
+function handleContinualDeleteBackward(editor, aboveResult, type) {
+    const highestBlock = aboveResult[0];
+    const lowestBlock = anchorBlock(editor);
+    const wrapBlockType = highestBlock.type;
+    if (lowestBlock && Editor.isStart(editor, editor.selection.anchor, aboveResult[1])) {
+        if (wrapBlockType === type) {
+            if (highestBlock.children[0] === lowestBlock) {
+                unWrap(editor, wrapBlockType);
+                return true;
+            }
+        }
+    }
+    return false;
+}
+
+function handleContinualInsertBreak(editor, lowestBlock, type) {
+    const isEmpty = Editor.isEmpty(editor, lowestBlock);
+    const isEnd = Editor.isEnd(editor, editor.selection.anchor, editor.selection.focus.path);
+    const aboveResult = Editor.above(editor, {
+        match: n => Element.isElement(n) && n.type === type
+    });
+    if (aboveResult && aboveResult[0] && isEnd && isEmpty) {
+        const wrapBlock = aboveResult[0];
+        if (wrapBlock.type === type) {
+            if (wrapBlock.children[wrapBlock.children.length - 1] === lowestBlock) {
+                unWrap(editor, wrapBlock.type);
+                return true;
+            }
+        }
+    }
+    return false;
+}
+
 const insertElements = (editor, elements) => {
     if (!editor.selection) {
         refocus(editor);
@@ -3660,8 +3805,8 @@ const insertElements = (editor, elements) => {
     }
     const type = !isArray(elements) ? elements.type : elements[0].type; // 后期处理复制粘贴需要修改
     const allowParentTypes = getPluginOptions(editor, type)?.allowParentTypes || [];
-    const insertNodePath = queries.getInsertElementsPath(editor, allowParentTypes);
-    const [anchorBlock, anchorBlockPath] = queries.anchorBlockEntry(editor);
+    const insertNodePath = getInsertElementsPath(editor, allowParentTypes);
+    const [anchorBlock, anchorBlockPath] = anchorBlockEntry(editor);
     let isEmpty = Editor.isEmpty(editor, anchorBlock);
     if (insertNodePath) {
         Editor.withoutNormalizing(editor, () => {
@@ -3684,40 +3829,15 @@ const insertElements = (editor, elements) => {
     }
 };
 
-const setNode = (editor, props, origin) => {
-    Transforms.setNodes(editor, props, { at: queries.findPath(editor, origin) });
+const insertParagraph = (editor, at) => {
+    Transforms.insertNodes(editor, createEmptyParagraph(), { at });
 };
 
 /**
- * Unwrap nodes by type
+ * Recursively merge a source object to children nodes with a query.
  */
-const unwrapNodesByType = (editor, types, options = {}) => {
-    if (!Array.isArray(types)) {
-        types = [types];
-    }
-    Transforms.unwrapNodes(editor, {
-        match: n => Element.isElement(n) && types.includes(n.type),
-        ...options
-    });
-};
-
-const onKeyDownResetBlockType = ({ rules }) => (event, editor) => {
-    let reset;
-    if (editor.selection && isCollapsed(editor.selection)) {
-        rules.forEach(({ types, defaultType, hotkey, predicate, onReset }) => {
-            if (!event || (hotkey && isKeyHotkey(hotkey, event))) {
-                if (predicate(editor) && queries.isNodeTypeIn(editor, types)) {
-                    if (event !== null) {
-                        event.preventDefault();
-                    }
-                    Transforms.setNodes(editor, { type: defaultType });
-                    onReset(editor);
-                    reset = true;
-                }
-            }
-        });
-    }
-    return reset;
+const mergeDeepToNodes = (options) => {
+    applyDeepToNodes({ ...options, apply: defaults });
 };
 
 /**
@@ -3731,7 +3851,7 @@ const moveChildren = (editor, { at, to, match, start = 0 }) => {
         return moved;
     for (let i = parentNode.children.length - 1; i >= start; i--) {
         const childPath = [...parentPath, i];
-        const childNode = queries.getNode(editor, childPath);
+        const childNode = getNode(editor, childPath);
         if (!match || (childNode && match([childNode, childPath]))) {
             Transforms.moveNodes(editor, { at: childPath, to });
             moved++;
@@ -3740,54 +3860,23 @@ const moveChildren = (editor, { at, to, match, start = 0 }) => {
     return moved;
 };
 
-const insertParagraph = (editor, at) => {
-    Transforms.insertNodes(editor, createEmptyParagraph(), { at });
-};
-
-/**
- * Recursively apply an operation to children nodes with a query.
- */
-const applyDeepToNodes = ({ node, source, apply, query }) => {
-    const entry = [node, []];
-    if (queries.isNodeType(entry, query)) {
-        if (source instanceof Function) {
-            apply(node, source());
-        }
-        else {
-            apply(node, source);
-        }
-    }
-    if (!queries.isAncestor(node)) {
-        return;
-    }
-    node.children.forEach((child) => {
-        applyDeepToNodes({ node: child, source, apply, query });
-    });
-};
-
-/**
- * Recursively merge a source object to children nodes with a query.
- */
-const mergeDeepToNodes = (options) => {
-    applyDeepToNodes({ ...options, apply: defaults });
-};
-
-const unWrap = (editor, kind) => {
-    Editor.withoutNormalizing(editor, () => {
-        Transforms.setNodes(editor, { type: ElementKinds.paragraph });
-        Transforms.unwrapNodes(editor, {
-            match: n => Element.isElement(n) && n.type === kind,
-            split: true
+const onKeyDownResetBlockType = ({ rules }) => (event, editor) => {
+    let reset;
+    if (editor.selection && isCollapsed(editor.selection)) {
+        rules.forEach(({ types, defaultType, hotkey, predicate, onReset }) => {
+            if (!event || (hotkey && isKeyHotkey(hotkey, event))) {
+                if (predicate(editor) && isNodeTypeIn(editor, types)) {
+                    if (event !== null) {
+                        event.preventDefault();
+                    }
+                    Transforms.setNodes(editor, { type: defaultType });
+                    onReset(editor);
+                    reset = true;
+                }
+            }
         });
-    });
-};
-
-const deleteElement = (editor, element) => {
-    const at = queries.findPath(editor, element);
-    Transforms.insertNodes(editor, createEmptyParagraph(), { at });
-    AngularEditor.focus(editor);
-    Transforms.select(editor, at);
-    Transforms.removeNodes(editor, { at: Path.next(at) });
+    }
+    return reset;
 };
 
 const setEndSelection = (editor) => {
@@ -3797,83 +3886,53 @@ const setEndSelection = (editor) => {
     AngularEditor.focus(editor);
 };
 
-const closeConversionHint = (editor) => {
-    const hintRef = THE_EDITOR_CONVERSION_HINT_REF.get(editor);
-    if (hintRef) {
-        hintRef.close();
-    }
-};
-
-function handleContinualDeleteBackward(editor, aboveResult, type) {
-    const highestBlock = aboveResult[0];
-    const lowestBlock = queries.anchorBlock(editor);
-    const wrapBlockType = highestBlock.type;
-    if (lowestBlock && Editor.isStart(editor, editor.selection.anchor, aboveResult[1])) {
-        if (wrapBlockType === type) {
-            if (highestBlock.children[0] === lowestBlock) {
-                unWrap(editor, wrapBlockType);
-                return true;
-            }
-        }
-    }
-    return false;
-}
-
-function handleContinualInsertBreak(editor, lowestBlock, type) {
-    const isEmpty = Editor.isEmpty(editor, lowestBlock);
-    const isEnd = Editor.isEnd(editor, editor.selection.anchor, editor.selection.focus.path);
-    const aboveResult = Editor.above(editor, {
-        match: n => Element.isElement(n) && n.type === type
-    });
-    if (aboveResult && aboveResult[0] && isEnd && isEmpty) {
-        const wrapBlock = aboveResult[0];
-        if (wrapBlock.type === type) {
-            if (wrapBlock.children[wrapBlock.children.length - 1] === lowestBlock) {
-                unWrap(editor, wrapBlock.type);
-                return true;
-            }
-        }
-    }
-    return false;
-}
-
-const deleteNodeByType = (editor, type) => {
-    const node = queries.getAboveByType(editor, type);
-    const element = node && node[0];
-    if (element) {
-        deleteElement(editor, element);
-    }
+const setNode = (editor, props, origin) => {
+    Transforms.setNodes(editor, props, { at: findPath(editor, origin) });
 };
 
 const setNodeByType = (editor, props, type) => {
-    const node = queries.getAboveByType(editor, type);
+    const node = getAboveByType(editor, type);
     const path = node && node[1];
     if (path) {
         Transforms.setNodes(editor, props, { at: path });
     }
 };
 
-const transforms = {
-    setMarks,
-    clearMarks,
-    insertElements,
-    insertParagraph,
-    setNode,
-    unwrapNodesByType,
-    onKeyDownResetBlockType,
-    moveChildren,
-    applyDeepToNodes,
-    mergeDeepToNodes,
-    unWrap,
-    deleteElement,
-    setEndSelection,
-    closeConversionHint,
-    handleContinualDeleteBackward,
-    handleContinualInsertBreak,
-    deleteNodeByType,
-    setNodeByType
+/**
+ * Unwrap nodes by type
+ */
+const unwrapNodesByType = (editor, types, options = {}) => {
+    if (!Array.isArray(types)) {
+        types = [types];
+    }
+    Transforms.unwrapNodes(editor, {
+        match: n => Element.isElement(n) && types.includes(n.type),
+        ...options
+    });
 };
 
+var index = /*#__PURE__*/Object.freeze({
+    __proto__: null,
+    applyDeepToNodes: applyDeepToNodes,
+    clearMarks: clearMarks,
+    closeConversionHint: closeConversionHint,
+    deleteElement: deleteElement,
+    deleteNodeByType: deleteNodeByType,
+    handleContinualDeleteBackward: handleContinualDeleteBackward,
+    handleContinualInsertBreak: handleContinualInsertBreak,
+    insertElements: insertElements,
+    insertParagraph: insertParagraph,
+    mergeDeepToNodes: mergeDeepToNodes,
+    moveChildren: moveChildren,
+    onKeyDownResetBlockType: onKeyDownResetBlockType,
+    setEndSelection: setEndSelection,
+    setMarks: setMarks,
+    setNode: setNode,
+    setNodeByType: setNodeByType,
+    unWrap: unWrap,
+    unwrapNodesByType: unwrapNodesByType
+});
+
 const THE_TABLE_COMPONENT_TOKEN = new InjectionToken('the-Table-token');
 const HEADER_CELL_CLASS = 'the-header-cell';
 const STICKY_CELL_CLASS = 'the-sticky-cell';
@@ -4119,7 +4178,7 @@ const calculateRowControls = (editor, element) => {
 };
 const calculateHeaderRowHeight = (editor, element) => {
     const firstRow = element.children[0];
-    if (firstRow.children.some((cell) => cell.rowspan && cell.rowspan > 1)) {
+    if (firstRow.children.some(cell => cell.rowspan && cell.rowspan > 1)) {
         throw new Error('can not calculate header row height');
     }
     const cellDom = AngularEditor.toDOMNode(editor, firstRow.children[0]);
@@ -4717,7 +4776,7 @@ function insertTable(opts, editor, rows = 3, columns = 3, getCellContent) {
     }
     // Create the table node
     const table = createTable(opts, columns, rows, getCellContent);
-    transforms.insertElements(editor, table);
+    insertElements(editor, table);
 }
 
 function getInsertRowState(opts, editor, count = 1, at) {
@@ -5113,7 +5172,7 @@ function mergeCell(editor, selectedCells) {
         selectCellNodes.forEach((cell, index) => {
             const { row, node } = cell;
             if (node) {
-                const cellPath = queries.findPath(editor, node);
+                const cellPath = findPath(editor, node);
                 if (index === 0) {
                     leftTopCellPath = cellPath;
                 }
@@ -5183,7 +5242,7 @@ function resetTableCell(editor, table, cell, cellRow, cellCol) {
         table.children.map((row, rowIndex) => {
             row.children.map((col, colIndex) => {
                 if (rowIndex >= cellRow && rowIndex <= rowSpanIndex && colIndex >= cellCol && colIndex <= colSpanIndex) {
-                    const path = queries.findPath(editor, col);
+                    const path = findPath(editor, col);
                     Transforms.setNodes(editor, { colspan: null, rowspan: null, hidden: null }, { at: path });
                 }
             });
@@ -5293,7 +5352,7 @@ const TableEditor = {
             const equalColumns = columns.map(() => {
                 return { width: sumWidth / columns.length };
             });
-            transforms.setNode(editor, { columns: equalColumns }, tableElement);
+            setNode(editor, { columns: equalColumns }, tableElement);
         }
     },
     clearCellsContent(editor, cells) {
@@ -5318,7 +5377,7 @@ const TableEditor = {
         return !!table;
     },
     getSelectedCellPositions(editor) {
-        const tableNode = queries.getAboveByType(editor, ElementKinds.table);
+        const tableNode = getAboveByType(editor, ElementKinds.table);
         if (tableNode) {
             const tableComponent = ELEMENT_TO_COMPONENT.get(tableNode[0]);
             const selectedCellPositions = tableComponent.tableStore.getSelectedCellPositions();
@@ -5329,7 +5388,7 @@ const TableEditor = {
         return null;
     },
     getSelectedCells(editor, location) {
-        const tableNode = queries.getAboveByType(editor, ElementKinds.table, {
+        const tableNode = getAboveByType(editor, ElementKinds.table, {
             at: location || editor.selection.anchor
         });
         if (tableNode) {
@@ -5351,7 +5410,7 @@ const TableEditor = {
             Transforms.setNodes(editor, { verticalAlign: alignment }, { at: cellPath });
         }, cells);
         if (!isSelected) {
-            const cellEntry = queries.getAboveByType(editor, ElementKinds.tableCell);
+            const cellEntry = getAboveByType(editor, ElementKinds.tableCell);
             if (cellEntry) {
                 const [, cellPath] = cellEntry;
                 Transforms.setNodes(editor, { verticalAlign: alignment }, {
@@ -5368,7 +5427,7 @@ const TableEditor = {
         const cells = TableEditor.getSelectedCellPositions(editor);
         if (cells) {
             const lastCell = cells[cells.length - 1];
-            const tableNode = queries.getAboveByType(editor, ElementKinds.table);
+            const tableNode = getAboveByType(editor, ElementKinds.table);
             const cellPath = [...tableNode[1], lastCell.row, lastCell.col];
             const cell = Node.get(editor, cellPath);
             const { verticalAlign } = cell;
@@ -5378,7 +5437,7 @@ const TableEditor = {
             return verticalAlign === alignment;
         }
         else {
-            const cellElement = queries.getAboveByType(editor, ElementKinds.tableCell);
+            const cellElement = getAboveByType(editor, ElementKinds.tableCell);
             if (cellElement) {
                 const { verticalAlign } = cellElement[0];
                 if (!verticalAlign && alignment === VerticalAlignment.top) {
@@ -5413,12 +5472,12 @@ const TableEditor = {
             MarkProps.forEach(key => {
                 unsetMarks[key] = null;
             });
-            transforms.setMarks(editor, unsetMarks, cellRange);
+            setMarks(editor, unsetMarks, cellRange);
         });
     },
     formatBrush(editor, marks) {
         return TableEditor.handleSelectedCells(editor, (cellPath, cellRange) => {
-            transforms.setMarks(editor, marks, cellRange);
+            setMarks(editor, marks, cellRange);
         });
     },
     handleSelectedCells(editor, handle, cells) {
@@ -5470,7 +5529,7 @@ const TableEditor = {
         return isHeaderRow && isContainHeaderRow;
     },
     hasHeaderColumnCell(editor) {
-        const table = queries.getAboveByType(editor, ElementKinds.table);
+        const table = getAboveByType(editor, ElementKinds.table);
         const selectedCells = TableEditor.getSelectedCellPositions(editor) ?? [];
         sortCell(selectedCells);
         const isContainHeaderColumn = !!selectedCells && selectedCells[0].col === 0;
@@ -5486,7 +5545,7 @@ const TableEditor = {
     },
     handleIndent(editor, indentType) {
         return TableEditor.handleSelectedCells(editor, (cellPath, cellRange) => {
-            const children = queries.getNode(editor, cellPath).children;
+            const children = getNode(editor, cellPath).children;
             if (children.length) {
                 children.forEach((child, index) => {
                     setCellIndent(editor, indentType, child, [...cellPath, index]);
@@ -5501,7 +5560,7 @@ const AlignEditor = {
         if (!editor?.selection) {
             return;
         }
-        const blockElement = queries.anchorBlock(editor);
+        const blockElement = anchorBlock(editor);
         if (blockElement) {
             const { align } = blockElement;
             if (!align && alignment === Alignment.left) {
@@ -5516,7 +5575,7 @@ const AlignEditor = {
     },
     isDisabled(editor) {
         const { richMedia } = editor.options;
-        return queries.getToolbarItemDisabled(editor, PluginKeys.align, richMedia ? [ElementKinds.image] : []);
+        return getToolbarItemDisabled(editor, PluginKeys.align, richMedia ? [ElementKinds.image] : []);
     },
     setAlign(editor, alignment) {
         if (TableEditor.setAlign(editor, alignment)) {
@@ -5534,7 +5593,7 @@ const AlignEditor = {
 
 const BlockquoteEditor = {
     toggleBlockquote(editor) {
-        const isActive = queries.isBlockActive(editor, ElementKinds.blockquote);
+        const isActive = isBlockActive(editor, ElementKinds.blockquote);
         const allowParentTypes = getPluginOptions(editor, PluginKeys.blockquote)?.allowParentTypes || [];
         if (!isActive) {
             Transforms.wrapNodes(editor, { type: ElementKinds.blockquote, children: [] }, {
@@ -5550,10 +5609,10 @@ const BlockquoteEditor = {
 const CodeEditor = {
     setCodeAttribute(editor, props, element) {
         if (!element) {
-            transforms.setNodeByType(editor, props, ElementKinds.code);
+            setNodeByType(editor, props, ElementKinds.code);
         }
         else {
-            const path = queries.findPath(editor, element);
+            const path = findPath(editor, element);
             Transforms.setNodes(editor, props, { at: path });
         }
     },
@@ -5580,7 +5639,7 @@ const CodeEditor = {
                 language: DEFAULT_LANGUAGE.value,
                 children: [{ text: '' }]
             };
-            transforms.insertElements(editor, codeElement);
+            insertElements(editor, codeElement);
         }
         else {
             const codeElement = {
@@ -5589,15 +5648,15 @@ const CodeEditor = {
                 language: DEFAULT_LANGUAGE.value,
                 children: [{ text: '' }]
             };
-            transforms.insertElements(editor, codeElement);
+            insertElements(editor, codeElement);
         }
     },
     removeCode(editor, code) {
         if (code) {
-            transforms.deleteElement(editor, code);
+            deleteElement(editor, code);
         }
         else {
-            transforms.deleteNodeByType(editor, ElementKinds.code);
+            deleteNodeByType(editor, ElementKinds.code);
         }
     }
 };
@@ -5643,15 +5702,15 @@ const HeadingEditor = {
                 split: true
             });
             Transforms.setNodes(editor, { type: heading });
-            const entry = queries.anchorBlockEntry(editor);
+            const entry = anchorBlockEntry(editor);
             const unMarks = {
                 [MarkTypes.fontSize]: null
             };
             if (entry) {
-                transforms.setMarks(editor, unMarks, entry[1]);
+                setMarks(editor, unMarks, entry[1]);
                 return;
             }
-            transforms.setMarks(editor, unMarks, editor.selection);
+            setMarks(editor, unMarks, editor.selection);
         });
     },
     isHeadingActive(editor, heading) {
@@ -5677,7 +5736,7 @@ const HeadingEditor = {
 
 const HrEditor = {
     insertHr(editor) {
-        transforms.insertElements(editor, { type: ElementKinds.hr, children: [{ text: '' }] });
+        insertElements(editor, { type: ElementKinds.hr, children: [{ text: '' }] });
     },
     isHrActive(editor) {
         const [match] = Editor.nodes(editor, {
@@ -5847,7 +5906,7 @@ const ImageEditor = {
             }
         }
         if (imageNodes.length > 0) {
-            transforms.insertElements(editor, imageNodes);
+            insertElements(editor, imageNodes);
         }
     },
     handleBase64ImageElement(editor, image) {
@@ -5908,10 +5967,10 @@ const ImageEditor = {
     },
     setImageNode(editor, props, image) {
         if (!image) {
-            transforms.setNodeByType(editor, props, ElementKinds.image);
+            setNodeByType(editor, props, ElementKinds.image);
         }
         else {
-            const path = queries.findPath(editor, image);
+            const path = findPath(editor, image);
             Transforms.setNodes(editor, props, { at: path });
         }
     },
@@ -5920,10 +5979,10 @@ const ImageEditor = {
     },
     removeImage(editor, image) {
         if (image) {
-            transforms.deleteElement(editor, image);
+            deleteElement(editor, image);
         }
         else {
-            transforms.deleteNodeByType(editor, ElementKinds.image);
+            deleteNodeByType(editor, ElementKinds.image);
         }
     }
 };
@@ -6153,8 +6212,8 @@ const ListEditor = {
     },
     unwrapList(editor) {
         Editor.withoutNormalizing(editor, () => {
-            transforms.unwrapNodesByType(editor, [ElementKinds.bulletedList, ElementKinds.numberedList], { split: true, mode: 'all' });
-            transforms.unwrapNodesByType(editor, [ElementKinds.listItem], { split: true, mode: 'all' });
+            unwrapNodesByType(editor, [ElementKinds.bulletedList, ElementKinds.numberedList], { split: true, mode: 'all' });
+            unwrapNodesByType(editor, [ElementKinds.listItem], { split: true, mode: 'all' });
         });
     },
     wrapList(editor, type) {
@@ -6172,11 +6231,11 @@ const ListEditor = {
         });
     },
     isActive(editor, type) {
-        const [match] = queries.getNodesByType(editor, type);
+        const [match] = getNodesByType(editor, type);
         return !!match;
     },
     getActiveList(editor) {
-        const [match] = queries.getNodesByType(editor, LIST_BLOCK_TYPES);
+        const [match] = getNodesByType(editor, LIST_BLOCK_TYPES);
         return match;
     },
     buildListItem(editor) {
@@ -6250,7 +6309,7 @@ const MentionEditor = {
         Transforms.insertText(editor, ` ${currentMention.trigger}`);
         setTimeout(() => {
             THE_EDITOR_ORIGIN_ANCHOR.set(editor, Editor.before(editor, editor.selection.anchor));
-            const textElement = AngularEditor.toDOMNode(editor, queries.anchorBlockEntry(editor)[0]);
+            const textElement = AngularEditor.toDOMNode(editor, anchorBlockEntry(editor)[0]);
             MentionEditor.openSelectOverlay(editor, type, textElement);
         });
     },
@@ -6262,7 +6321,7 @@ const MentionEditor = {
     openSuggestion(editor, type) {
         const { selection } = editor;
         const elementRef = editor.injector.get(ElementRef);
-        const isParagraphStart = Editor.isStart(editor, selection?.anchor, queries.anchorBlockEntry(editor)[1]);
+        const isParagraphStart = Editor.isStart(editor, selection?.anchor, anchorBlockEntry(editor)[1]);
         const originAnchor = THE_EDITOR_ORIGIN_ANCHOR.get(editor);
         let text = '';
         if (!isParagraphStart) {
@@ -6277,7 +6336,7 @@ const MentionEditor = {
             if (!originAnchor) {
                 THE_EDITOR_ORIGIN_ANCHOR.set(editor, editor.selection.anchor);
             }
-            const textElement = AngularEditor.toDOMNode(editor, queries.anchorBlockEntry(editor)[0]);
+            const textElement = AngularEditor.toDOMNode(editor, anchorBlockEntry(editor)[0]);
             const origin = isParagraphStart ? textElement : elementRef;
             MentionEditor.openSelectOverlay(editor, type, origin, isSoftBreak);
         }
@@ -6370,11 +6429,11 @@ const MentionEditor = {
         editor.insertText(' ');
     },
     isActive(editor, type) {
-        const [match] = queries.getNodesByType(editor, type);
+        const [match] = getNodesByType(editor, type);
         return !!match;
     },
     updatePositionStrategy(editor, isSoftBreak = false) {
-        const textElement = AngularEditor.toDOMNode(editor, queries.anchorBlockEntry(editor)[0]);
+        const textElement = AngularEditor.toDOMNode(editor, anchorBlockEntry(editor)[0]);
         const nativeRange = AngularEditor.toDOMRange(editor, editor.selection);
         const cursorRect = nativeRange.getBoundingClientRect();
         const textElementRect = textElement.getBoundingClientRect();
@@ -6577,7 +6636,7 @@ const QuickInsertEditor = {
 
 const TodoItemEditor = {
     isActive(editor) {
-        const [match] = queries.getNodesByType(editor, ElementKinds.checkItem);
+        const [match] = getNodesByType(editor, ElementKinds.checkItem);
         return !!match;
     },
     insertTodoItem(editor) {
@@ -7245,8 +7304,8 @@ class TheInlineToolbar {
             inlineToolbar.removeAttribute('style');
             return;
         }
-        const anchorBlock = queries.anchorBlock(this.editor);
-        if (!inlineToolbar || !anchorBlock) {
+        const anchorBlock$1 = anchorBlock(this.editor);
+        if (!inlineToolbar || !anchorBlock$1) {
             return;
         }
         const { editor } = this;
@@ -7258,7 +7317,7 @@ class TheInlineToolbar {
             inlineToolbar.removeAttribute('style');
             return;
         }
-        if (!THE_INLINE_TOOLBAR_TYPES.includes(anchorBlock.type)) {
+        if (!THE_INLINE_TOOLBAR_TYPES.includes(anchorBlock$1.type)) {
             return;
         }
         const native = window.getSelection();
@@ -7367,7 +7426,7 @@ class TheConversionHint {
     creatCloseTimer() {
         this.closeTimer = setInterval(() => {
             clearInterval(this.closeTimer);
-            transforms.closeConversionHint(this.editor);
+            closeConversionHint(this.editor);
         }, this.duration);
     }
     clearCloseTimer() {
@@ -7900,7 +7959,7 @@ const withAlign = (editor) => {
     const { deleteBackward } = editor;
     editor.deleteBackward = unit => {
         const { anchor } = editor.selection;
-        const node = queries.anchorBlock(editor);
+        const node = anchorBlock(editor);
         const isVoid = Element.isElement(node) && Editor.isVoid(editor, node);
         const alignTypes = [Alignment.center, Alignment.right];
         const startLine = Editor.start(editor, anchor.path);
@@ -8069,7 +8128,7 @@ const defaultAutoFormatRules = [
         type: ElementKinds.listItem,
         markup: [],
         match: (editor) => {
-            return queries.isParagraph(editor) ? ['*', '-', '+'] : [];
+            return isParagraph(editor) ? ['*', '-', '+'] : [];
         },
         format: (editor) => {
             ListEditor.toggleList(editor, ElementKinds.bulletedList);
@@ -8080,7 +8139,7 @@ const defaultAutoFormatRules = [
         type: ElementKinds.listItem,
         markup: [],
         match: (editor, textFromBlockStart) => {
-            return queries.isParagraph(editor) && /^-?\d+(\.|\))$/.test(textFromBlockStart) ? [textFromBlockStart] : [];
+            return isParagraph(editor) && /^-?\d+(\.|\))$/.test(textFromBlockStart) ? [textFromBlockStart] : [];
         },
         format: (editor, markup) => {
             let startIndex = 1;
@@ -8098,7 +8157,7 @@ const defaultAutoFormatRules = [
         type: ElementKinds.checkItem,
         markup: [],
         match: (editor) => {
-            return queries.isParagraph(editor) ? ['[]'] : [];
+            return isParagraph(editor) ? ['[]'] : [];
         },
         format: (editor) => {
             TodoItemEditor.insertTodoItem(editor);
@@ -8131,14 +8190,14 @@ const autoFormatInline = (editor, { type, between, markup, ignoreTrim, format })
     const endMarkup = between ? between[1] : '';
     let endMarkupPointBefore = selection.anchor;
     if (endMarkup) {
-        endMarkupPointBefore = queries.getPointBefore(editor, selection, {
+        endMarkupPointBefore = getPointBefore(editor, selection, {
             matchString: endMarkup
         });
         if (!endMarkupPointBefore) {
             return false;
         }
     }
-    const startMarkupPointAfter = queries.getPointBefore(editor, endMarkupPointBefore, {
+    const startMarkupPointAfter = getPointBefore(editor, endMarkupPointBefore, {
         matchString: startMarkup,
         skipInvalid: true,
         afterMatch: true
@@ -8152,14 +8211,14 @@ const autoFormatInline = (editor, { type, between, markup, ignoreTrim, format })
         focus: endMarkupPointBefore
     };
     if (!ignoreTrim) {
-        const markupText = queries.getText(editor, markupRange);
+        const markupText = getText(editor, markupRange);
         if (markupText.trim() !== markupText) {
             return false;
         }
     }
     // delete end markup
     if (endMarkup) {
-        endMarkupPointBefore = queries.getPointBefore(editor, selection, {
+        endMarkupPointBefore = getPointBefore(editor, selection, {
             matchString: endMarkup
         });
         Transforms.delete(editor, {
@@ -8169,12 +8228,12 @@ const autoFormatInline = (editor, { type, between, markup, ignoreTrim, format })
             }
         });
     }
-    const startMarkupPointBefore = queries.getPointBefore(editor, selection, {
+    const startMarkupPointBefore = getPointBefore(editor, selection, {
         matchString: startMarkup,
         skipInvalid: true
     });
     if (format) {
-        const markupText = queries.getText(editor, markupRange);
+        const markupText = getText(editor, markupRange);
         format(editor, markupText);
         // delete start to end selection
         Transforms.delete(editor, {
@@ -8219,7 +8278,7 @@ const withAutoFormat = (editor) => {
         let autoFormatRules = getPluginOptions(editor, PluginKeys.autoFormat)?.autoFormatRules;
         const extraRules = mergAutoFormateRules(autoFormatRules);
         autoFormatRules = Object.values(extraRules);
-        if (!queries.isCollapsed(editor.selection)) {
+        if (!isCollapsed(editor.selection)) {
             return insertText(text);
         }
         for (const { query, ...rule } of autoFormatRules) {
@@ -8235,15 +8294,15 @@ const withAutoFormat = (editor) => {
                 let markups = castArray(markup);
                 let markupRange;
                 if (triggerAtBlockStart) {
-                    markupRange = queries.getRangeFromBlockStart(editor);
+                    markupRange = getRangeFromBlockStart(editor);
                     // Don't autoformat if there is void nodes.
-                    const hasVoidNode = queries.someNode(editor, {
+                    const hasVoidNode = someNode(editor, {
                         at: markupRange,
                         match: n => Element.isElement(n) && Editor.isVoid(editor, n)
                     });
                     if (hasVoidNode)
                         continue;
-                    const textFromBlockStart = queries.getText(editor, markupRange);
+                    const textFromBlockStart = getText(editor, markupRange);
                     if (match) {
                         markups = match(editor, textFromBlockStart);
                     }
@@ -8251,13 +8310,13 @@ const withAutoFormat = (editor) => {
                         continue;
                 }
                 else {
-                    markupRange = queries.getRangeBefore(editor, editor.selection, {
+                    markupRange = getRangeBefore(editor, editor.selection, {
                         matchString: markup,
                         skipInvalid: true
                     });
                     if (!markupRange)
                         continue;
-                    const blockAbovePath = queries.getBlockAbove(editor)?.[1];
+                    const blockAbovePath = getBlockAbove(editor)?.[1];
                     if (!blockAbovePath)
                         continue;
                     // If the markup is not at the start, insert break before autoformatting.
@@ -8267,7 +8326,7 @@ const withAutoFormat = (editor) => {
                 }
                 if (!allowSameTypeAbove) {
                     // Don't autoformat if already in a block of the same type.
-                    const isBelowSameBlockType = queries.someNode(editor, { match: { type } });
+                    const isBelowSameBlockType = someNode(editor, { match: { type } });
                     if (isBelowSameBlockType)
                         continue;
                 }
@@ -8335,19 +8394,19 @@ const withBlockquote = (editor) => {
         if (!aboveResult) {
             return deleteBackward(unit);
         }
-        const hasHandled = transforms.handleContinualDeleteBackward(editor, aboveResult, ElementKinds.blockquote);
+        const hasHandled = handleContinualDeleteBackward(editor, aboveResult, ElementKinds.blockquote);
         if (hasHandled) {
             return;
         }
         return deleteBackward(unit);
     };
     editor.insertBreak = () => {
-        const lowestBlock = queries.anchorBlock(editor);
+        const lowestBlock = anchorBlock(editor);
         if (!lowestBlock) {
             insertBreak();
             return;
         }
-        const hasHandled = transforms.handleContinualInsertBreak(editor, lowestBlock, ElementKinds.blockquote);
+        const hasHandled = handleContinualInsertBreak(editor, lowestBlock, ElementKinds.blockquote);
         if (hasHandled) {
             return;
         }
@@ -8373,7 +8432,7 @@ const createBlockquotePlugin = createPluginFactory({
             key: ElementKinds.blockquote,
             icon: 'blockquote',
             name: '引用',
-            active: editor => queries.isBlockActive(editor, ElementKinds.blockquote),
+            active: editor => isBlockActive(editor, ElementKinds.blockquote),
             execute: editor => BlockquoteEditor.toggleBlockquote(editor)
         }
     ],
@@ -8382,7 +8441,7 @@ const createBlockquotePlugin = createPluginFactory({
             key: ElementKinds.blockquote,
             type: ThePluginMenuItemType.group,
             keywords: 'yy,yinyong,quote,引用',
-            active: editor => queries.isBlockActive(editor, ElementKinds.blockquote),
+            active: editor => isBlockActive(editor, ElementKinds.blockquote),
             execute: editor => BlockquoteEditor.toggleBlockquote(editor),
             name: '引用',
             description: '支持引用内容',
@@ -8499,7 +8558,7 @@ class TheCode extends TheBaseElement {
         this.maxHeight = isPrintMode(this.editor) ? 0 : 350 - CODEMIRROR_PADDING_TOP * 2;
     }
     openToolbar() {
-        if (!queries.isGlobalCollapsed(this.editor) || this.isToolbarOpen) {
+        if (!isGlobalCollapsed(this.editor) || this.isToolbarOpen) {
             return;
         }
         this.toolbarPopoverRef = this.thyPopover.open(this.toolbar, {
@@ -8654,8 +8713,8 @@ const withCode = (editor) => {
         setFragmentData(unit);
         const { selection } = editor;
         const [start] = Editor.edges(editor, selection);
-        if (queries.isNodeTypeIn(editor, [ElementKinds.code], { at: start })) {
-            const [codeNode] = queries.getAboveByType(editor, ElementKinds.code);
+        if (isNodeTypeIn(editor, [ElementKinds.code], { at: start })) {
+            const [codeNode] = getAboveByType(editor, ElementKinds.code);
             unit.setData('text/plain', codeNode.content.trim());
             return unit;
         }
@@ -8670,7 +8729,7 @@ const createCodePlugin = createPluginFactory({
             key: ElementKinds.code,
             icon: 'code-syntax',
             name: '代码块',
-            active: editor => queries.isBlockActive(editor, ElementKinds.code),
+            active: editor => isBlockActive(editor, ElementKinds.code),
             execute: editor => CodeEditor.insertCode(editor)
         }
     ],
@@ -8679,7 +8738,7 @@ const createCodePlugin = createPluginFactory({
             key: ElementKinds.code,
             type: ThePluginMenuItemType.group,
             keywords: 'dmk,daimakuai,code,代码块',
-            active: editor => queries.isBlockActive(editor, ElementKinds.code),
+            active: editor => isBlockActive(editor, ElementKinds.code),
             execute: editor => CodeEditor.insertCode(editor),
             name: '代码块',
             description: '支持插入语法高亮的代码',
@@ -8820,7 +8879,7 @@ const withBlockCard = (editor) => {
             const isLeftCursor = isCardLeft(anchorNode);
             const cardEntry = AngularEditor.toSlateCardEntry(editor, anchorNode);
             const cursorRootPath = cardEntry[1];
-            transforms.insertParagraph(editor, isLeftCursor ? cursorRootPath : Path.next(cursorRootPath));
+            insertParagraph(editor, isLeftCursor ? cursorRootPath : Path.next(cursorRootPath));
             if (!isLeftCursor) {
                 Transforms.select(editor, Path.next(cursorRootPath));
             }
@@ -8840,7 +8899,7 @@ const withBlockCard = (editor) => {
                 if (!previousPath) {
                     return;
                 }
-                if (previousPath && queries.isEmptyParagraphByPath(editor, previousPath)) {
+                if (previousPath && isEmptyParagraphByPath(editor, previousPath)) {
                     Transforms.removeNodes(editor, {
                         at: previousPath
                     });
@@ -8852,17 +8911,17 @@ const withBlockCard = (editor) => {
                 return;
             }
             else {
-                transforms.insertParagraph(editor, cursorRootPath);
+                insertParagraph(editor, cursorRootPath);
                 Transforms.select(editor, cursorRootPath);
                 Transforms.removeNodes(editor, { at: Path.next(cursorRootPath) });
                 return;
             }
         }
-        const blockCard = queries.getBlockCardAbove(editor);
+        const blockCard = getBlockCardAbove(editor);
         const beforePoint = Editor.before(editor, editor.selection.anchor);
-        const beforeBlockCard = queries.getBlockCardAbove(editor, { at: beforePoint });
+        const beforeBlockCard = getBlockCardAbove(editor, { at: beforePoint });
         if (!blockCard && beforeBlockCard) {
-            if (queries.isBlockAboveEmpty(editor)) {
+            if (isBlockAboveEmpty(editor)) {
                 const [node, path] = Editor.parent(editor, editor.selection.anchor.path);
                 HistoryEditor.withoutMerging(editor, () => {
                     const rightCursor = { path: beforeBlockCard[1], offset: FAKE_RIGHT_BLOCK_CARD_OFFSET };
@@ -8886,7 +8945,7 @@ const withBlockCard = (editor) => {
             const cardEntry = AngularEditor.toSlateCardEntry(editor, anchorNode);
             const cursorRootPath = cardEntry[1];
             if (isLeftCursor) {
-                transforms.insertParagraph(editor, cursorRootPath);
+                insertParagraph(editor, cursorRootPath);
                 Transforms.select(editor, cursorRootPath);
                 Transforms.removeNodes(editor, { at: Path.next(cursorRootPath) });
                 return;
@@ -8899,11 +8958,11 @@ const withBlockCard = (editor) => {
                 return;
             }
         }
-        const blockCard = queries.getBlockCardAbove(editor);
+        const blockCard = getBlockCardAbove(editor);
         const afterPoint = Editor.after(editor, editor.selection.anchor);
-        const afterBlockCard = queries.getBlockCardAbove(editor, { at: afterPoint });
+        const afterBlockCard = getBlockCardAbove(editor, { at: afterPoint });
         if (!blockCard && afterBlockCard) {
-            if (queries.isBlockAboveEmpty(editor)) {
+            if (isBlockAboveEmpty(editor)) {
                 HistoryEditor.withoutMerging(editor, () => {
                     const leftCursor = { path: afterBlockCard[1], offset: -1 };
                     Transforms.select(editor, { anchor: leftCursor, focus: leftCursor });
@@ -8925,14 +8984,14 @@ const withBlockCard = (editor) => {
         const isMoveUp = hotkeys.isMoveUp(nativeEvent);
         const isMoveDown = hotkeys.isMoveDown(nativeEvent);
         const isCollapsed = selection && Range.isCollapsed(selection);
-        const anchorEntry = queries.anchorBlockEntry(editor);
+        const anchorEntry = anchorBlockEntry(editor);
         // block card cursor
         if (anchorNode && hasBlockCard(domSelection)) {
             const isCardLeftCursor = isCardLeft(anchorNode);
             if (isMoveUp) {
                 const [, path] = AngularEditor.toSlateCardEntry(editor, anchorNode);
                 const previousPath = Path.hasPrevious(path) && Path.previous(path);
-                const previousNode = previousPath && queries.getNode(editor, previousPath);
+                const previousNode = previousPath && getNode(editor, previousPath);
                 if (previousNode && editor.isBlockCard(previousNode)) {
                     AngularEditor.moveBlockCard(editor, previousNode, { direction: isCardLeftCursor ? 'left' : 'right' });
                 }
@@ -8948,7 +9007,7 @@ const withBlockCard = (editor) => {
             if (isMoveDown) {
                 const [, path] = AngularEditor.toSlateCardEntry(editor, anchorNode);
                 const nextPath = Path.next(path);
-                const nextNode = queries.getNode(editor, nextPath);
+                const nextNode = getNode(editor, nextPath);
                 if (nextNode && editor.isBlockCard(nextNode)) {
                     AngularEditor.moveBlockCard(editor, nextNode, { direction: isCardLeftCursor ? 'left' : 'right' });
                 }
@@ -8966,7 +9025,7 @@ const withBlockCard = (editor) => {
                 nativeEvent.preventDefault();
                 const [, path] = AngularEditor.toSlateCardEntry(editor, anchorNode);
                 const nextPath = Path.next(path);
-                const nextNode = queries.getNode(editor, nextPath);
+                const nextNode = getNode(editor, nextPath);
                 if (nextNode && editor.isBlockCard(nextNode)) {
                     event.preventDefault();
                     AngularEditor.moveBlockCard(editor, nextNode, { direction: 'left' });
@@ -8983,7 +9042,7 @@ const withBlockCard = (editor) => {
                 nativeEvent.preventDefault();
                 const [, path] = AngularEditor.toSlateCardEntry(editor, anchorNode);
                 const previousPath = Path.hasPrevious(path) && Path.previous(path);
-                const previousNode = previousPath && queries.getNode(editor, previousPath);
+                const previousNode = previousPath && getNode(editor, previousPath);
                 if (previousNode && editor.isBlockCard(previousNode)) {
                     event.preventDefault();
                     AngularEditor.moveBlockCard(editor, previousNode, { direction: 'right' });
@@ -9170,10 +9229,10 @@ const withGetFragment = (editor) => {
     const elementKinds = getPluginOptions(editor, PluginKeys.getFragment)?.types ?? [];
     editor.getFragment = () => {
         const { selection } = editor;
-        const containerBlocks = [...elementKinds, ...queries.getContainerBlocks(editor)];
+        const containerBlocks = [...elementKinds, ...getContainerBlocks(editor)];
         if (selection && selection.anchor.path[0] === selection.focus.path[0]) {
             const fragmentData = getFragment();
-            const nodes = queries.getSelectionNodesByType(editor, fragmentData, containerBlocks);
+            const nodes = getSelectionNodesByType(editor, fragmentData, containerBlocks);
             return nodes && Element.isElement(nodes) ? nodes.children : fragmentData;
         }
         return getFragment();
@@ -9250,7 +9309,7 @@ const withMoveSelection = (editor) => {
         if (inlineBlockEntry &&
             !(Element.isElement(inlineBlockEntry[0]) && Editor.isVoid(editor, inlineBlockEntry[0])) &&
             selection.anchor.offset === 0) {
-            const beforePoint = queries.getPointBefore(editor, selection.focus);
+            const beforePoint = getPointBefore(editor, selection.focus);
             Transforms.select(editor, beforePoint);
         }
         deleteBackward(unit);
@@ -9263,9 +9322,9 @@ const withMoveSelection = (editor) => {
         }
         const isMoveBackward = hotkeys.isMoveBackward(event);
         const isMoveForward = hotkeys.isMoveForward(event);
-        const isCollapsed = selection && queries.isCollapsed(selection);
+        const isCollapsed$1 = selection && isCollapsed(selection);
         const isInlineNode = isInline(editor);
-        if (isCollapsed && isMoveForward) {
+        if (isCollapsed$1 && isMoveForward) {
             let isInlineCodeBefore = false;
             if (!isInlineNode) {
                 try {
@@ -9282,7 +9341,7 @@ const withMoveSelection = (editor) => {
                 return;
             }
         }
-        if (isCollapsed && isMoveBackward) {
+        if (isCollapsed$1 && isMoveBackward) {
             let isInlineCodeAfter = false;
             if (!isInlineNode) {
                 try {
@@ -9323,16 +9382,16 @@ const withRemoveEmpty = (editor) => {
     const { deleteBackward, deleteForward } = editor;
     editor.deleteBackward = unit => {
         const { selection } = editor;
-        const anchorBlock = queries.anchorBlock(editor);
-        if (!anchorBlock) {
+        const anchorBlock$1 = anchorBlock(editor);
+        if (!anchorBlock$1) {
             deleteBackward(unit);
             return;
         }
         // delete empty paragraphs or empty headings, the default operation is to delete before the void node
         const parentPath = Path.parent(editor.selection.anchor.path);
-        const isEmptyHeading = HEADING_TYPES.includes(anchorBlock.type) && Editor.isEmpty(editor, anchorBlock);
-        const isEmptyParagraph = queries.isEmptyParagraph(editor, editor.selection.anchor);
-        if ((isEmptyParagraph || isEmptyHeading) && parentPath[parentPath.length - 1] > 0) {
+        const isEmptyHeading = HEADING_TYPES.includes(anchorBlock$1.type) && Editor.isEmpty(editor, anchorBlock$1);
+        const isEmptyParagraph$1 = isEmptyParagraph(editor, editor.selection.anchor);
+        if ((isEmptyParagraph$1 || isEmptyHeading) && parentPath[parentPath.length - 1] > 0) {
             const previousNodeOfParent = Node.get(editor, Path.previous(parentPath));
             if (Element.isElement(previousNodeOfParent) && Editor.isVoid(editor, previousNodeOfParent)) {
                 Transforms.delete(editor, { at: editor.selection.anchor.path.slice(0, editor.selection.anchor.path.length - 1) });
@@ -9354,10 +9413,10 @@ const withRemoveEmpty = (editor) => {
         deleteBackward(unit);
     };
     editor.deleteForward = unit => {
-        const anchorBlockEntry = queries.anchorBlockEntry(editor);
-        if (anchorBlockEntry &&
-            queries.isAncestorEmpty(editor, anchorBlockEntry[0]) &&
-            queries.getNode(editor, Path.next(anchorBlockEntry[1]))) {
+        const anchorBlockEntry$1 = anchorBlockEntry(editor);
+        if (anchorBlockEntry$1 &&
+            isAncestorEmpty(editor, anchorBlockEntry$1[0]) &&
+            getNode(editor, Path.next(anchorBlockEntry$1[1]))) {
             const pathRef = Editor.pathRef(editor, Path.parent(editor.selection.anchor.path));
             HistoryEditor.withoutMerging(editor, () => {
                 Transforms.move(editor);
@@ -9377,7 +9436,7 @@ const createRemoveEmptyPlugin = createPluginFactory({
 const withRemoveVoid = (editor) => {
     const { deleteBackward, deleteForward, onKeydown } = editor;
     const deleteBlockVoid = (e) => {
-        const aboveEntry = queries.getAbove(e);
+        const aboveEntry = getAbove(e);
         const canDelete = aboveEntry && Element.isElement(aboveEntry[0]) && Editor.isBlock(e, aboveEntry[0]) && Editor.isVoid(e, aboveEntry[0]);
         if (canDelete) {
             Transforms.insertNodes(e, createEmptyParagraph(), { at: Path.next(aboveEntry[1]) });
@@ -9393,7 +9452,7 @@ const withRemoveVoid = (editor) => {
         deleteBackward(unit);
     };
     editor.onKeydown = event => {
-        const aboveEntry = queries.getAbove(editor);
+        const aboveEntry = getAbove(editor);
         if (aboveEntry &&
             Element.isElement(aboveEntry[0]) &&
             Editor.isVoid(editor, aboveEntry[0]) &&
@@ -9432,7 +9491,7 @@ const withResetType = (editor) => {
     editor.onKeydown = (event) => {
         const { selection } = editor;
         if (IS_SAFARI && selection && Range.isCollapsed(selection) && hotkeys.isDeleteBackward(event)) {
-            const blockEntry = queries.getAboveByType(editor, BLOCK_DELETE_BACKWARD_TYPES);
+            const blockEntry = getAboveByType(editor, BLOCK_DELETE_BACKWARD_TYPES);
             if (blockEntry && blockEntry[0]) {
                 const isStart = Editor.isStart(editor, selection.anchor, blockEntry[1]);
                 if (isStart) {
@@ -9509,7 +9568,7 @@ const createDeserializeHTMLPlugin = createPluginFactory({
 const withDeserializeMd = (editor) => {
     const { insertData, onKeydown } = editor;
     editor.onKeydown = (event) => {
-        transforms.closeConversionHint(editor);
+        closeConversionHint(editor);
         onKeydown(event);
     };
     editor.insertData = (data) => {
@@ -9519,7 +9578,7 @@ const withDeserializeMd = (editor) => {
         const plainFragment = data.getData('text/plain');
         const slateFragment = data.getData(`application/${CLIPBOARD_FORMAT_KEY}`);
         const oldRange = editor.selection;
-        transforms.closeConversionHint(editor);
+        closeConversionHint(editor);
         if (plainFragment && isMarkdownStynx(plainFragment) && !slateFragment) {
             setTimeout(() => {
                 const overlay = editor.injector.get(Overlay);
@@ -9537,7 +9596,7 @@ const withDeserializeMd = (editor) => {
                                 const htmlDom = new DOMParser().parseFromString(html, 'text/html');
                                 const fragment = TheiaConverter.convertToTheia(Array.from(htmlDom.body.children));
                                 if (!isUnformatted(fragment)) {
-                                    transforms.closeConversionHint(editor);
+                                    closeConversionHint(editor);
                                     editor.undo();
                                     setTimeout(() => {
                                         Transforms.select(editor, oldRange);
@@ -9560,11 +9619,11 @@ const withDeserializeMd = (editor) => {
                                     return;
                                 }
                                 else {
-                                    transforms.closeConversionHint(editor);
+                                    closeConversionHint(editor);
                                 }
                             }
                             catch (error) {
-                                transforms.closeConversionHint(editor);
+                                closeConversionHint(editor);
                             }
                         }
                     },
@@ -9632,7 +9691,7 @@ const FontSizeEditor = {
     setFontSize(editor, size) {
         const contextService = editor.injector.get(TheContextService);
         const defaultFontSize = contextService.getDefaultFontSize();
-        const marks = queries.getSelectionMarks(editor);
+        const marks = getSelectionMarks(editor);
         const fontSizeMark = marks[MarkTypes.fontSize];
         const isDefaultFontSize = size === defaultFontSize;
         if (!fontSizeMark && isDefaultFontSize) {
@@ -9660,14 +9719,14 @@ const FontSizeEditor = {
             return;
         }
         // unset paragraph text fontSize
-        transforms.setMarks(editor, {
+        setMarks(editor, {
             [MarkTypes.fontSize]: null
         }, editor.selection);
     },
     isFontSizeActive(editor, size) {
         if (editor.selection) {
-            const anchorBlock = queries.anchorBlock(editor);
-            switch (anchorBlock?.type) {
+            const anchorBlock$1 = anchorBlock(editor);
+            switch (anchorBlock$1?.type) {
                 case ElementKinds.heading_1:
                     return size === FontSizes.fontSize28;
                 case ElementKinds.heading_2:
@@ -9681,7 +9740,7 @@ const FontSizeEditor = {
                 case ElementKinds.heading_6:
                     return size === FontSizes.fontSize14;
                 case ElementKinds.paragraph:
-                    const marks = queries.getSelectionMarks(editor);
+                    const marks = getSelectionMarks(editor);
                     const fontSizeMark = marks[MarkTypes.fontSize];
                     return Number(size) === fontSizeMark;
                 default:
@@ -9722,7 +9781,7 @@ const withHeading = (editor) => {
     const { insertBreak } = editor;
     editor.insertBreak = () => {
         const { selection } = editor;
-        const anchorBlock = queries.getAnchorBlockEntry(editor);
+        const anchorBlock = getAnchorBlockEntry(editor);
         if (anchorBlock && Range.isCollapsed(selection) && anchorBlock[0].type.startsWith('heading')) {
             if (Editor.isStart(editor, selection.anchor, anchorBlock[1])) {
                 insertBreak();
@@ -9760,7 +9819,7 @@ const createHeadingPlugin = createPluginFactory({
             name: '正文',
             styles: { height: '40px' },
             execute: editor => Transforms.setNodes(editor, { type: ElementKinds.paragraph }),
-            active: editor => queries.isParagraph(editor)
+            active: editor => isParagraph(editor)
         },
         {
             key: ElementKinds.heading_1,
@@ -9912,7 +9971,7 @@ const createHrPlugin = createPluginFactory({
             key: ElementKinds.hr,
             icon: 'horizontal-line',
             name: '分割线',
-            active: editor => queries.isBlockActive(editor, ElementKinds.hr),
+            active: editor => isBlockActive(editor, ElementKinds.hr),
             execute: editor => HrEditor.insertHr(editor)
         }
     ],
@@ -9921,7 +9980,7 @@ const createHrPlugin = createPluginFactory({
             key: ElementKinds.hr,
             keywords: 'fengexian,fgx,divider,line,分割线',
             type: ThePluginMenuItemType.group,
-            active: editor => queries.isBlockActive(editor, ElementKinds.hr),
+            active: editor => isBlockActive(editor, ElementKinds.hr),
             execute: editor => HrEditor.insertHr(editor),
             name: '分割线',
             menuIcon: PluginMenuIcons.hr,
@@ -10214,13 +10273,13 @@ class TheImage extends TheBaseElement {
         return (!this?.readonly &&
             richMedia &&
             this.isCollapsedAndNonReadonly &&
-            queries.isGlobalCollapsed(this.editor) &&
+            isGlobalCollapsed(this.editor) &&
             !this.uploading &&
             !this.isOpen);
     }
     isShouldClose() {
         return (this.isOpen &&
-            (this?.readonly || !this.isCollapsedAndNonReadonly || !queries.isGlobalCollapsed(this.editor) || this.uploading));
+            (this?.readonly || !this.isCollapsedAndNonReadonly || !isGlobalCollapsed(this.editor) || this.uploading));
     }
     openLayoutToolbar() {
         if (!this.img) {
@@ -11003,98 +11062,269 @@ const createLinkPlugin = createPluginFactory({
     }
 });
 
-const isList = (n) => {
-    return [...LIST_BLOCK_TYPES].includes(n.type);
-};
+class TheBulletedList extends TheBaseElement {
+    get level() {
+        return this.element?.indent || null;
+    }
+    constructor(elementRef, cdr) {
+        super(elementRef, cdr);
+        this.elementRef = elementRef;
+        this.cdr = cdr;
+    }
+    ngOnInit() {
+        super.ngOnInit();
+    }
+    ngOnDestroy() {
+        super.ngOnDestroy();
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.0", ngImport: i0, type: TheBulletedList, deps: [{ token: i0.ElementRef }, { token: i0.ChangeDetectorRef }], target: i0.ɵɵFactoryTarget.Component }); }
+    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "17.3.0", type: TheBulletedList, isStandalone: true, selector: "ul[theUl]", host: { properties: { "attr.the-level": "this.level" } }, usesInheritance: true, ngImport: i0, template: ``, isInline: true }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.0", ngImport: i0, type: TheBulletedList, decorators: [{
+            type: Component,
+            args: [{
+                    selector: 'ul[theUl]',
+                    template: ``,
+                    standalone: true
+                }]
+        }], ctorParameters: () => [{ type: i0.ElementRef }, { type: i0.ChangeDetectorRef }], propDecorators: { level: [{
+                type: HostBinding,
+                args: ['attr.the-level']
+            }] } });
 
-const isInList = (editor, at = editor.selection) => {
-    return queries.isNodeTypeIn(editor, [ElementKinds.numberedList, ElementKinds.bulletedList], { at });
-};
+class TheListItem extends TheBaseElement {
+    constructor(elementRef, cdr) {
+        super(elementRef, cdr);
+        this.elementRef = elementRef;
+        this.cdr = cdr;
+    }
+    ngOnInit() {
+        super.ngOnInit();
+    }
+    onContextChange() {
+        super.onContextChange();
+        this.addFontSize();
+        this.addMultiDigit();
+    }
+    ngOnDestroy() {
+        super.ngOnDestroy();
+    }
+    addFontSize() {
+        let firstText;
+        for (const entry of Node.descendants(this.element)) {
+            const node = entry[0];
+            if (Text.isText(node) && !firstText) {
+                firstText = node;
+                break;
+            }
+        }
+        if (!firstText) {
+            return;
+        }
+        const { text, ...rest } = firstText;
+        const size = rest[MarkTypes.fontSize];
+        if (size) {
+            const sizeClass = `font-size-${size}`;
+            const isContains = this.elementRef.nativeElement?.classList?.contains(sizeClass);
+            if (isContains) {
+                return;
+            }
+            this.clearFontSize();
+            this.elementRef.nativeElement.classList.add(sizeClass);
+            this.fontSizeClass = sizeClass;
+        }
+        else {
+            this.clearFontSize();
+        }
+    }
+    clearFontSize() {
+        if (this.fontSizeClass) {
+            this.elementRef.nativeElement.classList.remove(this.fontSizeClass);
+            this.fontSizeClass = null;
+        }
+    }
+    getStart() {
+        const parent = this.elementRef.nativeElement.closest('.slate-element-numbered-list');
+        const start = parent?.getAttribute('start') || 1;
+        return Number(start);
+    }
+    getLiIndex() {
+        const path = findPath(this.editor, this.element);
+        const index = path[path.length - 1];
+        return index || 0;
+    }
+    addMultiDigit() {
+        const start = this.getStart();
+        const index = this.getLiIndex();
+        const multiDigit = 'data-multi-digit';
+        // start number + index
+        // when it is greater than 9, it is a multi-digit serial number
+        // exclude Font size >= 20
+        if (start + index > 9) {
+            this.elementRef.nativeElement.setAttribute(multiDigit, true);
+        }
+        else {
+            this.elementRef.nativeElement.removeAttribute(multiDigit);
+        }
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.0", ngImport: i0, type: TheListItem, deps: [{ token: i0.ElementRef }, { token: i0.ChangeDetectorRef }], target: i0.ɵɵFactoryTarget.Component }); }
+    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "17.3.0", type: TheListItem, isStandalone: true, selector: "li[theLi]", usesInheritance: true, ngImport: i0, template: ``, isInline: true }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.0", ngImport: i0, type: TheListItem, decorators: [{
+            type: Component,
+            args: [{
+                    selector: 'li[theLi]',
+                    template: ``,
+                    standalone: true
+                }]
+        }], ctorParameters: () => [{ type: i0.ElementRef }, { type: i0.ChangeDetectorRef }] });
 
-/**
- * Is the list nested, i.e. its parent is a list item.
- */
-const isListNested = (editor, listPath, options) => {
-    const [listParentNode] = Editor.parent(editor, listPath);
-    return listParentNode.type === ElementKinds.listItem;
-};
+class TheNumberedList extends TheBaseElement {
+    get start() {
+        return this.element.start;
+    }
+    get level() {
+        return this.element?.indent || null;
+    }
+    constructor(elementRef, cdr) {
+        super(elementRef, cdr);
+        this.elementRef = elementRef;
+        this.cdr = cdr;
+    }
+    ngOnInit() {
+        super.ngOnInit();
+    }
+    ngOnDestroy() {
+        super.ngOnDestroy();
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.0", ngImport: i0, type: TheNumberedList, deps: [{ token: i0.ElementRef }, { token: i0.ChangeDetectorRef }], target: i0.ɵɵFactoryTarget.Component }); }
+    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "17.3.0", type: TheNumberedList, isStandalone: true, selector: "ol[theOl]", host: { properties: { "attr.start": "this.start", "attr.the-level": "this.level" } }, usesInheritance: true, ngImport: i0, template: ``, isInline: true }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.0", ngImport: i0, type: TheNumberedList, decorators: [{
+            type: Component,
+            args: [{
+                    selector: 'ol[theOl]',
+                    template: ``,
+                    standalone: true
+                }]
+        }], ctorParameters: () => [{ type: i0.ElementRef }, { type: i0.ChangeDetectorRef }], propDecorators: { start: [{
+                type: HostBinding,
+                args: ['attr.start']
+            }], level: [{
+                type: HostBinding,
+                args: ['attr.the-level']
+            }] } });
 
 const getListTypes = () => {
     return [ElementKinds.bulletedList, ElementKinds.numberedList];
 };
 
-/**
- * 获取 List 中 ListItems，过滤掉空列表嵌套
- * @param node
- * @param initialValue
- * @returns
- */
-const getStartListItem = (node, initialValue) => {
-    if (!initialValue) {
-        initialValue = [];
+const normalizeListItem = (editor, { nodeEntry }) => {
+    const [listItemNode, listItemPath] = nodeEntry;
+    const firstChildPath = listItemPath.concat([0]);
+    const firstChild = listItemNode.children?.[0];
+    if (!firstChild) {
+        insertParagraph(editor, firstChildPath);
+        return true;
     }
-    if (node) {
-        return node.reduce((result, current) => {
-            if (current.type === ElementKinds.listItem && !getListTypes().includes(current.children[0].type)) {
-                result.push(current);
-            }
-            else {
-                if (current.children) {
-                    getStartListItem(current.children, result);
-                }
-            }
-            return result;
-        }, initialValue);
+    // Ensure that all lists have a <p> tag as a first element
+    if (Element.isElement(firstChild) && (firstChild.type === ElementKinds.bulletedList || firstChild.type === ElementKinds.numberedList)) {
+        insertParagraph(editor, firstChildPath);
+        return true;
     }
 };
 
-/**
- *
- */
-const hasListInListItem = (listItemNode) => {
-    const sublist = listItemNode.children.find(n => match(n, { type: getListTypes() }));
-    return listItemNode.children.length > 1 && sublist;
-};
-/**
- * p + ul/ol structure
- * @param listItemNode
- */
-const hasStableListInListItem = (listItemNode) => {
-    const sublist = listItemNode.children.find(n => match(n, { type: getListTypes() }));
-    return listItemNode.children.length === 2 && sublist;
+const isList = (n) => {
+    return [...LIST_BLOCK_TYPES].includes(n.type);
 };
-/**
- * li + p structure
- * @param listItemNode
- */
-const hasStableListItem = (listItemNode) => {
-    const type = listItemNode.children[0].type;
-    return listItemNode.children.length === 1 && type === ElementKinds.paragraph;
+
+// 列表续号
+const normalizeNo = (editor, nodeEntry) => {
+    const [listNode, listPath] = nodeEntry;
+    let moved = false;
+    Editor.withoutNormalizing(editor, () => {
+        /**
+         * 获取nextList判断是否为同类型list
+         * 如果为同类型list，则把nextList children移动到当前list的尾部, 并删除nextList
+         */
+        const nextPath = Path.next(listPath);
+        const nextNode = getNode(editor, nextPath);
+        if (nextNode && Element.isElement(nextNode) && Element.isElement(listNode) && nextNode.type === listNode.type) {
+            moveChildren(editor, {
+                at: [nextNode, nextPath],
+                to: listPath.concat(listNode.children.length)
+            });
+            Transforms.removeNodes(editor, { at: nextPath });
+            moved = true;
+        }
+        if (listPath[listPath.length - 1] !== 0) {
+            /**
+             * 获取prevList判断是否为同类型list
+             * 如果为同类型list，则把当前list children移动到prevList的尾部, 并删除当前List
+             */
+            const currentListNode = getNode(editor, listPath);
+            const prevPath = Path.previous(listPath);
+            const prevNode = getNode(editor, prevPath);
+            if (prevNode && Element.isElement(prevNode) && Element.isElement(currentListNode) && prevNode.type === currentListNode.type) {
+                moveChildren(editor, {
+                    at: [currentListNode, listPath],
+                    to: prevPath.concat(prevNode.children.length)
+                });
+                Transforms.removeNodes(editor, { at: listPath });
+                moved = true;
+            }
+        }
+    });
+    return moved;
 };
 
 /**
- * list 中 是否是单个listItem，且listItem没有子列表
+ * Normalize list node to force the ul>li>p+ul structure.
  */
-const isSingleListItem = (list) => {
-    return isNodeTypeList(list) && list.children.length === 1 && !hasListInListItem(list.children[0]);
+const getListNormalizer = (editor, { validLiChildrenTypes }) => {
+    const { normalizeNode } = editor;
+    return ([node, path]) => {
+        // 不是选区, 执行续号检测操作
+        if (isList(node) && !TheHistoryEditor.isUndoing(editor)) {
+            const moved = normalizeNo(editor, [node, path]);
+            if (moved) {
+                return;
+            }
+        }
+        if (match(node, { type: getListTypes() })) {
+            if (Element.isElement(node) && !node.children.length) {
+                return Transforms.removeNodes(editor, { at: path });
+            }
+        }
+        // normalize list item
+        // 1. list-item at least one child
+        // 2. list-item first child is not list
+        if (Element.isElement(node) && node.type === ElementKinds.listItem) {
+            if (normalizeListItem(editor, { nodeEntry: [node, path] })) {
+                // Tree changed - kick off another normalization
+                return;
+            }
+        }
+        normalizeNode([node, path]);
+    };
 };
 
 /**
  * 如果at（默认= selection）位于ul> li> p中，则返回li和ul节点条目。
  */
 const getListItemEntry = (editor, { at = editor.selection } = {}) => {
-    if (at && queries.isNodeTypeIn(editor, ElementKinds.listItem, { at })) {
-        const selectionParent = queries.getParent(editor, at);
+    if (at && isNodeTypeIn(editor, ElementKinds.listItem, { at })) {
+        const selectionParent = getParent(editor, at);
         if (!selectionParent)
             return;
         const [, paragraphPath] = selectionParent;
-        const listItem = queries.getAboveByType(editor, ElementKinds.listItem, { at }) || queries.getParent(editor, paragraphPath);
+        const listItem = getAboveByType(editor, ElementKinds.listItem, { at }) || getParent(editor, paragraphPath);
         if (!listItem)
             return;
         const [listItemNode, listItemPath] = listItem;
         if (listItemNode.type !== ElementKinds.listItem)
             return;
-        const list = queries.getParent(editor, listItemPath);
+        const list = getParent(editor, listItemPath);
         if (!list || !isList(list[0]))
             return;
         return {
@@ -11105,82 +11335,89 @@ const getListItemEntry = (editor, { at = editor.selection } = {}) => {
 };
 
 /**
- * Is the selection focus at the start of its parent block.
+ *
  */
-const isSelectionAtListItemStart = (editor) => {
-    const listItemEntry = queries.getAboveByType(editor, [ElementKinds.listItem]);
-    if (listItemEntry) {
-        return queries.isStart(editor, editor.selection.focus, listItemEntry[1]);
-    }
-    return false;
+const hasListInListItem = (listItemNode) => {
+    const sublist = listItemNode.children.find(n => match(n, { type: getListTypes() }));
+    return listItemNode.children.length > 1 && sublist;
+};
+/**
+ * p + ul/ol structure
+ * @param listItemNode
+ */
+const hasStableListInListItem = (listItemNode) => {
+    const sublist = listItemNode.children.find(n => match(n, { type: getListTypes() }));
+    return listItemNode.children.length === 2 && sublist;
+};
+/**
+ * li + p structure
+ * @param listItemNode
+ */
+const hasStableListItem = (listItemNode) => {
+    const type = listItemNode.children[0].type;
+    return listItemNode.children.length === 1 && type === ElementKinds.paragraph;
 };
 
-const insertListData = (editor, { fromList, toListItemEntry }) => {
-    const { children } = fromList;
-    const [toListItem, toListItemPath] = toListItemEntry;
-    const nextListItemPath = Path.next(toListItemPath);
-    const toListItemIsEmptyParagraph = queries.isEmptyParagraph(editor, editor.selection.anchor);
-    const hasSubList = hasListInListItem(toListItem);
-    let selectPath = [...toListItemPath];
-    const liIndex = selectPath.pop();
-    selectPath = [...selectPath, liIndex + children.length];
-    Editor.withoutNormalizing(editor, () => {
-        if (toListItemIsEmptyParagraph && hasSubList) {
-            Transforms.insertNodes(editor, children, { at: nextListItemPath });
-        }
-        else {
-            const insertListItemPath = toListItemIsEmptyParagraph ? toListItemPath : nextListItemPath;
-            // 如果粘贴目标listItem为空，则先删除listItem
-            if (toListItemIsEmptyParagraph) {
-                Transforms.removeNodes(editor, { at: insertListItemPath });
-                selectPath = Path.previous(selectPath);
-            }
-            Transforms.insertNodes(editor, children, { at: insertListItemPath });
+/**
+ * 将 fromListItem 子列表的列表项移到 toList
+ */
+const moveListItemSublistItemsToList = (editor, { fromListItem, toList, location }) => {
+    const fromListItemSublist = findDescendant(editor, {
+        at: fromListItem[1],
+        match: {
+            type: getListTypes()
         }
-        /**
-         * 粘贴目标lisItem有子列表
-         */
-        if (hasSubList) {
-            const paragraphPath = toListItemPath.concat([0]);
-            const nextSubListPath = Path.next(paragraphPath);
-            // 判断粘贴数据是否是多级
-            if (hasListInListItem(fromList.children[0])) {
-                // 设置粘贴后正确选区
-                Transforms.select(editor, Editor.end(editor, nextListItemPath));
-                // 获取当前选区所在listItem entry
-                const currentListItemEntry = getListItemEntry(editor, {});
-                // 获取粘贴目标listItem中的子列表
-                const { children: subListChildren } = Node.get(editor, nextSubListPath);
-                /**
-                 * 复制子列表数据
-                 * 之所以是复制，而不是移动，因为无法单纯一次性移动子列表的所有listItem（不包含subList本身）到目标位置，
-                 * 需要循环移动才可以
-                 **/
-                Transforms.insertNodes(editor, subListChildren, {
-                    at: Path.next(currentListItemEntry.listItem[1])
-                });
-                // 删除已被复制后无用的listItem/listItem subList
-                Transforms.delete(editor, {
-                    at: toListItemIsEmptyParagraph ? toListItemPath : nextSubListPath
+    });
+    if (!fromListItemSublist)
+        return 0;
+    const [, fromListItemSublistPath] = fromListItemSublist;
+    const lastChildPath = getLastChildPath(toList);
+    let moved;
+    Editor.withoutNormalizing(editor, () => {
+        moved = moveChildren(editor, {
+            at: fromListItemSublistPath,
+            to: location ? toList[1].concat(location) : Path.next(lastChildPath)
+        });
+        // 删除空白列表
+        Transforms.delete(editor, { at: fromListItemSublistPath });
+    });
+    return moved;
+};
+
+const moveListItemDown = (editor, { list, listItem }) => {
+    const [listNode] = list;
+    const [, listItemPath] = listItem;
+    Editor.withoutNormalizing(editor, () => {
+        // 以前的兄弟是新父级
+        const previousSiblingItem = Editor.node(editor, Path.previous(listItemPath));
+        if (previousSiblingItem) {
+            const [previousNode, previousPath] = previousSiblingItem;
+            const lastChildIndexOfPreviousNode = previousNode.children.length - 1;
+            const lastChildOfPreviousNode = previousNode.children[lastChildIndexOfPreviousNode];
+            const newPath = previousPath.concat(isNodeTypeList(lastChildOfPreviousNode)
+                ? [lastChildIndexOfPreviousNode, lastChildOfPreviousNode.children.length]
+                : [previousNode.children.length]);
+            if (!isNodeTypeList(lastChildOfPreviousNode)) {
+                // 创建新子列表
+                const type = listNode.type;
+                Transforms.wrapNodes(editor, { type, children: [] }, {
+                    at: listItemPath
                 });
-                return;
             }
-            Transforms.select(editor, Editor.end(editor, selectPath));
-            // 粘贴数据不是多级
-            const currentListItemEntry = getListItemEntry(editor, {});
+            // 将当前listItem移动到子列表
             Transforms.moveNodes(editor, {
-                at: nextSubListPath,
-                to: currentListItemEntry.listItem[1].concat(1)
+                at: listItemPath,
+                to: newPath
             });
-            if (toListItemIsEmptyParagraph) {
-                Transforms.delete(editor, { at: toListItemPath });
+            const currentListItemEntry = getListItemEntry(editor, {});
+            if (hasListInListItem(currentListItemEntry.listItem[0])) {
+                moveListItemSublistItemsToList(editor, {
+                    fromListItem: currentListItemEntry.listItem,
+                    toList: currentListItemEntry.list
+                });
             }
-            return;
         }
     });
-    // 粘贴目标listItem没有子列表, 设置选区
-    Transforms.select(editor, Editor.end(editor, selectPath));
-    return;
 };
 
 /**
@@ -11190,7 +11427,7 @@ const insertListData = (editor, { fromList, toListItemEntry }) => {
 const moveListItemUp = (editor, { list, listItem }, options) => {
     const [listNode, listPath] = list;
     const [, listItemPath] = listItem;
-    const listParentEntry = queries.getParent(editor, listPath);
+    const listParentEntry = getParent(editor, listPath);
     if (!listParentEntry)
         return;
     const [listParentNode, listParentPath] = listParentEntry;
@@ -11239,8 +11476,8 @@ const moveListItemUp = (editor, { list, listItem }, options) => {
                 type: ElementKinds.listItem,
                 children: []
             }, { at: nextPath });
-            const moveStartPath = queries.findPath(editor, behindNode[0]);
-            const moveEndPath = queries.findPath(editor, behindNode[behindNode.length - 1]);
+            const moveStartPath = findPath(editor, behindNode[0]);
+            const moveEndPath = findPath(editor, behindNode[behindNode.length - 1]);
             const moveRange = Editor.range(editor, moveStartPath, moveEndPath);
             Transforms.moveNodes(editor, {
                 at: moveRange,
@@ -11258,461 +11495,82 @@ const moveListItemUp = (editor, { list, listItem }, options) => {
     return true;
 };
 
-/**
- * Insert list item if selection in li>p.
- */
-const insertListItem = (editor) => {
-    if (editor.selection && !queries.isRangeAtRoot(editor.selection)) {
-        const paragraphEntry = queries.getAboveByType(editor, ElementKinds.paragraph);
-        if (!paragraphEntry) {
-            return;
-        }
-        const [, paragraphPath] = paragraphEntry;
-        const [listItemNode, listItemPath] = Editor.parent(editor, paragraphPath);
-        if (Element.isElement(listItemNode) && listItemNode.type !== ElementKinds.listItem) {
-            return;
-        }
-        if (!Range.isCollapsed(editor.selection)) {
-            Transforms.delete(editor);
-        }
-        const isEnd = queries.isBlockTextEmptyAfterSelection(editor);
-        const nextNodePath = Path.next(paragraphPath);
-        const nextListItemPath = Path.next(listItemPath);
-        const nextEnd = Editor.end(editor, listItemPath);
-        /**
-         * If not end, split nodes, wrap a list item on the new paragraph and move it to the next list item
-         */
-        if (!isEnd) {
-            Editor.withoutNormalizing(editor, () => {
-                Transforms.splitNodes(editor, { at: editor.selection, always: true });
-                Transforms.wrapNodes(editor, {
-                    type: ElementKinds.listItem,
-                    children: []
-                }, { at: nextNodePath });
-                Transforms.moveNodes(editor, {
-                    at: nextNodePath,
-                    to: nextListItemPath
-                });
-            });
-        }
-        else {
-            /**
-             * If end, split nodes
-             */
-            Editor.withoutNormalizing(editor, () => {
-                Transforms.splitNodes(editor, {
-                    always: true,
-                    mode: 'highest',
-                    match: node => {
-                        const path = node && TheEditor.findPath(editor, node);
-                        return path && path.length === nextListItemPath.length;
-                    }
-                });
-            });
+function onKeyDownList(e, editor) {
+    let moved = false;
+    if (e.key === 'Tab') {
+        const res = getListItemEntry(editor, {});
+        if (!res) {
+            return false;
         }
-        /**
-         * If there is a list in the list item, move it to the next list item
-         */
-        if (queries.getNode(editor, nextNodePath)) {
-            Transforms.moveNodes(editor, {
-                at: Editor.range(editor, nextNodePath, nextEnd),
-                to: nextListItemPath.concat(1),
-                match: node => {
-                    // TODO: types
-                    return listItemNode.children.includes(node);
-                }
-            });
-        }
-        return true;
-    }
-};
-
-const unwrapList = (editor) => {
-    Editor.withoutNormalizing(editor, () => {
-        transforms.unwrapNodesByType(editor, ElementKinds.listItem);
-        transforms.unwrapNodesByType(editor, [ElementKinds.bulletedList, ElementKinds.numberedList], { split: true });
-    });
-};
-
-/**
- * 获取 listItem 内的列表(如果存在).
- * 它采用以下结构：ul> li > span + ul
- */
-const getListItemSublist = (listItem, options) => {
-    const [listItemNode, listItemPath] = listItem;
-    if (hasListInListItem(listItemNode)) {
-        return [listItemNode.children[1], listItemPath.concat([1])];
-    }
-};
-
-/**
- * Move fromListItem sublist list items to the end of `toListItem` sublist.
- * If there is no `toListItem` sublist, insert one.
- */
-const moveListItemSublistItemsToListItemSublist = (editor, { fromListItem, toListItem, start }, options) => {
-    const [, fromListItemPath] = fromListItem;
-    const [toListItemNode, toListItemPath] = toListItem;
-    const fromListItemSublist = getListItemSublist(fromListItem, options);
-    if (!fromListItemSublist)
-        return 0;
-    const [, fromListItemSublistPath] = fromListItemSublist;
-    const toListItemSublist = getListItemSublist(toListItem, options);
-    let to;
-    if (!toListItemSublist) {
-        const fromList = queries.getParent(editor, fromListItemPath);
-        if (!fromList)
-            return 0;
-        const [fromListNode] = fromList;
-        const fromListType = fromListNode.type;
-        const toListItemSublistPath = toListItemPath.concat([toListItemNode.children.length]);
-        Transforms.insertNodes(editor, { type: fromListType, children: [] }, { at: toListItemSublistPath });
-        to = toListItemSublistPath.concat([0]);
-    }
-    else if (start) {
-        const [, toListItemSublistPath] = toListItemSublist;
-        to = toListItemSublistPath.concat([0]);
-    }
-    else {
-        to = Path.next(queries.getLastChildPath(toListItemSublist));
-    }
-    const moved = moveChildren(editor, {
-        at: Path.previous(fromListItemSublistPath),
-        to
-    });
-    // Remove the empty list
-    Transforms.delete(editor, { at: fromListItemPath });
-    return moved;
-};
-
-const normalizeListItem = (editor, { nodeEntry }) => {
-    const [listItemNode, listItemPath] = nodeEntry;
-    const firstChildPath = listItemPath.concat([0]);
-    const firstChild = listItemNode.children?.[0];
-    if (!firstChild) {
-        insertParagraph(editor, firstChildPath);
-        return true;
-    }
-    // Ensure that all lists have a <p> tag as a first element
-    if (Element.isElement(firstChild) && (firstChild.type === ElementKinds.bulletedList || firstChild.type === ElementKinds.numberedList)) {
-        insertParagraph(editor, firstChildPath);
-        return true;
-    }
-};
-
-// 列表续号
-const normalizeNo = (editor, nodeEntry) => {
-    const [listNode, listPath] = nodeEntry;
-    let moved = false;
-    Editor.withoutNormalizing(editor, () => {
-        /**
-         * 获取nextList判断是否为同类型list
-         * 如果为同类型list，则把nextList children移动到当前list的尾部, 并删除nextList
-         */
-        const nextPath = Path.next(listPath);
-        const nextNode = queries.getNode(editor, nextPath);
-        if (nextNode && Element.isElement(nextNode) && Element.isElement(listNode) && nextNode.type === listNode.type) {
-            transforms.moveChildren(editor, {
-                at: [nextNode, nextPath],
-                to: listPath.concat(listNode.children.length)
-            });
-            Transforms.removeNodes(editor, { at: nextPath });
-            moved = true;
-        }
-        if (listPath[listPath.length - 1] !== 0) {
-            /**
-             * 获取prevList判断是否为同类型list
-             * 如果为同类型list，则把当前list children移动到prevList的尾部, 并删除当前List
-             */
-            const currentListNode = queries.getNode(editor, listPath);
-            const prevPath = Path.previous(listPath);
-            const prevNode = queries.getNode(editor, prevPath);
-            if (prevNode && Element.isElement(prevNode) && Element.isElement(currentListNode) && prevNode.type === currentListNode.type) {
-                transforms.moveChildren(editor, {
-                    at: [currentListNode, listPath],
-                    to: prevPath.concat(prevNode.children.length)
-                });
-                Transforms.removeNodes(editor, { at: listPath });
-                moved = true;
-            }
-        }
-    });
-    return moved;
-};
-
-/**
- * Normalize list node to force the ul>li>p+ul structure.
- */
-const getListNormalizer = (editor, { validLiChildrenTypes }) => {
-    const { normalizeNode } = editor;
-    return ([node, path]) => {
-        // 不是选区, 执行续号检测操作
-        if (isList(node) && !TheHistoryEditor.isUndoing(editor)) {
-            const moved = normalizeNo(editor, [node, path]);
-            if (moved) {
-                return;
-            }
-        }
-        if (match(node, { type: getListTypes() })) {
-            if (Element.isElement(node) && !node.children.length) {
-                return Transforms.removeNodes(editor, { at: path });
-            }
-        }
-        // normalize list item
-        // 1. list-item at least one child
-        // 2. list-item first child is not list
-        if (Element.isElement(node) && node.type === ElementKinds.listItem) {
-            if (normalizeListItem(editor, { nodeEntry: [node, path] })) {
-                // Tree changed - kick off another normalization
-                return;
-            }
-        }
-        normalizeNode([node, path]);
-    };
-};
-
-/**
- * 将 fromListItem 子列表的列表项移到 toList
- */
-const moveListItemSublistItemsToList = (editor, { fromListItem, toList, location }) => {
-    const fromListItemSublist = queries.findDescendant(editor, {
-        at: fromListItem[1],
-        match: {
-            type: getListTypes()
-        }
-    });
-    if (!fromListItemSublist)
-        return 0;
-    const [, fromListItemSublistPath] = fromListItemSublist;
-    const lastChildPath = queries.getLastChildPath(toList);
-    let moved;
-    Editor.withoutNormalizing(editor, () => {
-        moved = moveChildren(editor, {
-            at: fromListItemSublistPath,
-            to: location ? toList[1].concat(location) : Path.next(lastChildPath)
-        });
-        // 删除空白列表
-        Transforms.delete(editor, { at: fromListItemSublistPath });
-    });
-    return moved;
-};
-
-const moveListItemDown = (editor, { list, listItem }) => {
-    const [listNode] = list;
-    const [, listItemPath] = listItem;
-    Editor.withoutNormalizing(editor, () => {
-        // 以前的兄弟是新父级
-        const previousSiblingItem = Editor.node(editor, Path.previous(listItemPath));
-        if (previousSiblingItem) {
-            const [previousNode, previousPath] = previousSiblingItem;
-            const lastChildIndexOfPreviousNode = previousNode.children.length - 1;
-            const lastChildOfPreviousNode = previousNode.children[lastChildIndexOfPreviousNode];
-            const newPath = previousPath.concat(isNodeTypeList(lastChildOfPreviousNode)
-                ? [lastChildIndexOfPreviousNode, lastChildOfPreviousNode.children.length]
-                : [previousNode.children.length]);
-            if (!isNodeTypeList(lastChildOfPreviousNode)) {
-                // 创建新子列表
-                const type = listNode.type;
-                Transforms.wrapNodes(editor, { type, children: [] }, {
-                    at: listItemPath
-                });
-            }
-            // 将当前listItem移动到子列表
-            Transforms.moveNodes(editor, {
-                at: listItemPath,
-                to: newPath
-            });
-            const currentListItemEntry = getListItemEntry(editor, {});
-            if (hasListInListItem(currentListItemEntry.listItem[0])) {
-                moveListItemSublistItemsToList(editor, {
-                    fromListItem: currentListItemEntry.listItem,
-                    toList: currentListItemEntry.list
-                });
-            }
-        }
-    });
-};
-
-function onKeyDownList(e, editor) {
-    let moved = false;
-    if (e.key === 'Tab') {
-        const res = getListItemEntry(editor, {});
-        if (!res) {
-            return false;
-        }
-        const { list, listItem } = res;
-        const [, listItemPath] = listItem;
-        e.preventDefault();
-        // move up with shift+tab
-        const shiftTab = e.shiftKey;
-        if (shiftTab) {
-            moved = moveListItemUp(editor, { list, listItem });
-            if (moved) {
-                e.preventDefault();
-                return true;
-            }
+        const { list, listItem } = res;
+        const [, listItemPath] = listItem;
+        e.preventDefault();
+        // move up with shift+tab
+        const shiftTab = e.shiftKey;
+        if (shiftTab) {
+            moved = moveListItemUp(editor, { list, listItem });
+            if (moved) {
+                e.preventDefault();
+                return true;
+            }
         }
         // move down with tab
         const tab = !e.shiftKey;
-        if (tab && !queries.isFirstChild(listItemPath)) {
-            moveListItemDown(editor, { list, listItem });
-            return true;
-        }
-        return false;
-    }
-}
-
-class TheNumberedList extends TheBaseElement {
-    get start() {
-        return this.element.start;
-    }
-    get level() {
-        return this.element?.indent || null;
-    }
-    constructor(elementRef, cdr) {
-        super(elementRef, cdr);
-        this.elementRef = elementRef;
-        this.cdr = cdr;
-    }
-    ngOnInit() {
-        super.ngOnInit();
-    }
-    ngOnDestroy() {
-        super.ngOnDestroy();
-    }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.0", ngImport: i0, type: TheNumberedList, deps: [{ token: i0.ElementRef }, { token: i0.ChangeDetectorRef }], target: i0.ɵɵFactoryTarget.Component }); }
-    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "17.3.0", type: TheNumberedList, isStandalone: true, selector: "ol[theOl]", host: { properties: { "attr.start": "this.start", "attr.the-level": "this.level" } }, usesInheritance: true, ngImport: i0, template: ``, isInline: true }); }
-}
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.0", ngImport: i0, type: TheNumberedList, decorators: [{
-            type: Component,
-            args: [{
-                    selector: 'ol[theOl]',
-                    template: ``,
-                    standalone: true
-                }]
-        }], ctorParameters: () => [{ type: i0.ElementRef }, { type: i0.ChangeDetectorRef }], propDecorators: { start: [{
-                type: HostBinding,
-                args: ['attr.start']
-            }], level: [{
-                type: HostBinding,
-                args: ['attr.the-level']
-            }] } });
-
-class TheBulletedList extends TheBaseElement {
-    get level() {
-        return this.element?.indent || null;
-    }
-    constructor(elementRef, cdr) {
-        super(elementRef, cdr);
-        this.elementRef = elementRef;
-        this.cdr = cdr;
-    }
-    ngOnInit() {
-        super.ngOnInit();
-    }
-    ngOnDestroy() {
-        super.ngOnDestroy();
-    }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.0", ngImport: i0, type: TheBulletedList, deps: [{ token: i0.ElementRef }, { token: i0.ChangeDetectorRef }], target: i0.ɵɵFactoryTarget.Component }); }
-    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "17.3.0", type: TheBulletedList, isStandalone: true, selector: "ul[theUl]", host: { properties: { "attr.the-level": "this.level" } }, usesInheritance: true, ngImport: i0, template: ``, isInline: true }); }
-}
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.0", ngImport: i0, type: TheBulletedList, decorators: [{
-            type: Component,
-            args: [{
-                    selector: 'ul[theUl]',
-                    template: ``,
-                    standalone: true
-                }]
-        }], ctorParameters: () => [{ type: i0.ElementRef }, { type: i0.ChangeDetectorRef }], propDecorators: { level: [{
-                type: HostBinding,
-                args: ['attr.the-level']
-            }] } });
-
-class TheListItem extends TheBaseElement {
-    constructor(elementRef, cdr) {
-        super(elementRef, cdr);
-        this.elementRef = elementRef;
-        this.cdr = cdr;
-    }
-    ngOnInit() {
-        super.ngOnInit();
-    }
-    onContextChange() {
-        super.onContextChange();
-        this.addFontSize();
-        this.addMultiDigit();
-    }
-    ngOnDestroy() {
-        super.ngOnDestroy();
-    }
-    addFontSize() {
-        let firstText;
-        for (const entry of Node.descendants(this.element)) {
-            const node = entry[0];
-            if (Text.isText(node) && !firstText) {
-                firstText = node;
-                break;
-            }
-        }
-        if (!firstText) {
-            return;
-        }
-        const { text, ...rest } = firstText;
-        const size = rest[MarkTypes.fontSize];
-        if (size) {
-            const sizeClass = `font-size-${size}`;
-            const isContains = this.elementRef.nativeElement?.classList?.contains(sizeClass);
-            if (isContains) {
-                return;
-            }
-            this.clearFontSize();
-            this.elementRef.nativeElement.classList.add(sizeClass);
-            this.fontSizeClass = sizeClass;
-        }
-        else {
-            this.clearFontSize();
-        }
-    }
-    clearFontSize() {
-        if (this.fontSizeClass) {
-            this.elementRef.nativeElement.classList.remove(this.fontSizeClass);
-            this.fontSizeClass = null;
-        }
-    }
-    getStart() {
-        const parent = this.elementRef.nativeElement.closest('.slate-element-numbered-list');
-        const start = parent?.getAttribute('start') || 1;
-        return Number(start);
-    }
-    getLiIndex() {
-        const path = queries.findPath(this.editor, this.element);
-        const index = path[path.length - 1];
-        return index || 0;
-    }
-    addMultiDigit() {
-        const start = this.getStart();
-        const index = this.getLiIndex();
-        const multiDigit = 'data-multi-digit';
-        // start number + index
-        // when it is greater than 9, it is a multi-digit serial number
-        // exclude Font size >= 20
-        if (start + index > 9) {
-            this.elementRef.nativeElement.setAttribute(multiDigit, true);
-        }
-        else {
-            this.elementRef.nativeElement.removeAttribute(multiDigit);
+        if (tab && !isFirstChild(listItemPath)) {
+            moveListItemDown(editor, { list, listItem });
+            return true;
         }
+        return false;
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.0", ngImport: i0, type: TheListItem, deps: [{ token: i0.ElementRef }, { token: i0.ChangeDetectorRef }], target: i0.ɵɵFactoryTarget.Component }); }
-    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "17.3.0", type: TheListItem, isStandalone: true, selector: "li[theLi]", usesInheritance: true, ngImport: i0, template: ``, isInline: true }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.0", ngImport: i0, type: TheListItem, decorators: [{
-            type: Component,
-            args: [{
-                    selector: 'li[theLi]',
-                    template: ``,
-                    standalone: true
-                }]
-        }], ctorParameters: () => [{ type: i0.ElementRef }, { type: i0.ChangeDetectorRef }] });
+
+/**
+ * 获取 List 中 ListItems，过滤掉空列表嵌套
+ * @param node
+ * @param initialValue
+ * @returns
+ */
+const getStartListItem = (node, initialValue) => {
+    if (!initialValue) {
+        initialValue = [];
+    }
+    if (node) {
+        return node.reduce((result, current) => {
+            if (current.type === ElementKinds.listItem && !getListTypes().includes(current.children[0].type)) {
+                result.push(current);
+            }
+            else {
+                if (current.children) {
+                    getStartListItem(current.children, result);
+                }
+            }
+            return result;
+        }, initialValue);
+    }
+};
+
+const isInList = (editor, at = editor.selection) => {
+    return isNodeTypeIn(editor, [ElementKinds.numberedList, ElementKinds.bulletedList], { at });
+};
+
+/**
+ * Is the list nested, i.e. its parent is a list item.
+ */
+const isListNested = (editor, listPath, options) => {
+    const [listParentNode] = Editor.parent(editor, listPath);
+    return listParentNode.type === ElementKinds.listItem;
+};
+
+/**
+ * Is the selection focus at the start of its parent block.
+ */
+const isSelectionAtListItemStart = (editor) => {
+    const listItemEntry = getAboveByType(editor, [ElementKinds.listItem]);
+    if (listItemEntry) {
+        return isStart(editor, editor.selection.focus, listItemEntry[1]);
+    }
+    return false;
+};
 
 /**
  * Is the selection in same li
@@ -11728,6 +11586,207 @@ const isSelectionInSameListItem = (editor) => {
     return startListItemEntry && endListItemEntry && Path.equals(startListItemEntry[1], endListItemEntry[1]);
 };
 
+/**
+ * list 中 是否是单个listItem，且listItem没有子列表
+ */
+const isSingleListItem = (list) => {
+    return isNodeTypeList(list) && list.children.length === 1 && !hasListInListItem(list.children[0]);
+};
+
+const insertListData = (editor, { fromList, toListItemEntry }) => {
+    const { children } = fromList;
+    const [toListItem, toListItemPath] = toListItemEntry;
+    const nextListItemPath = Path.next(toListItemPath);
+    const toListItemIsEmptyParagraph = isEmptyParagraph(editor, editor.selection.anchor);
+    const hasSubList = hasListInListItem(toListItem);
+    let selectPath = [...toListItemPath];
+    const liIndex = selectPath.pop();
+    selectPath = [...selectPath, liIndex + children.length];
+    Editor.withoutNormalizing(editor, () => {
+        if (toListItemIsEmptyParagraph && hasSubList) {
+            Transforms.insertNodes(editor, children, { at: nextListItemPath });
+        }
+        else {
+            const insertListItemPath = toListItemIsEmptyParagraph ? toListItemPath : nextListItemPath;
+            // 如果粘贴目标listItem为空，则先删除listItem
+            if (toListItemIsEmptyParagraph) {
+                Transforms.removeNodes(editor, { at: insertListItemPath });
+                selectPath = Path.previous(selectPath);
+            }
+            Transforms.insertNodes(editor, children, { at: insertListItemPath });
+        }
+        /**
+         * 粘贴目标lisItem有子列表
+         */
+        if (hasSubList) {
+            const paragraphPath = toListItemPath.concat([0]);
+            const nextSubListPath = Path.next(paragraphPath);
+            // 判断粘贴数据是否是多级
+            if (hasListInListItem(fromList.children[0])) {
+                // 设置粘贴后正确选区
+                Transforms.select(editor, Editor.end(editor, nextListItemPath));
+                // 获取当前选区所在listItem entry
+                const currentListItemEntry = getListItemEntry(editor, {});
+                // 获取粘贴目标listItem中的子列表
+                const { children: subListChildren } = Node.get(editor, nextSubListPath);
+                /**
+                 * 复制子列表数据
+                 * 之所以是复制，而不是移动，因为无法单纯一次性移动子列表的所有listItem（不包含subList本身）到目标位置，
+                 * 需要循环移动才可以
+                 **/
+                Transforms.insertNodes(editor, subListChildren, {
+                    at: Path.next(currentListItemEntry.listItem[1])
+                });
+                // 删除已被复制后无用的listItem/listItem subList
+                Transforms.delete(editor, {
+                    at: toListItemIsEmptyParagraph ? toListItemPath : nextSubListPath
+                });
+                return;
+            }
+            Transforms.select(editor, Editor.end(editor, selectPath));
+            // 粘贴数据不是多级
+            const currentListItemEntry = getListItemEntry(editor, {});
+            Transforms.moveNodes(editor, {
+                at: nextSubListPath,
+                to: currentListItemEntry.listItem[1].concat(1)
+            });
+            if (toListItemIsEmptyParagraph) {
+                Transforms.delete(editor, { at: toListItemPath });
+            }
+            return;
+        }
+    });
+    // 粘贴目标listItem没有子列表, 设置选区
+    Transforms.select(editor, Editor.end(editor, selectPath));
+    return;
+};
+
+/**
+ * Insert list item if selection in li>p.
+ */
+const insertListItem = (editor) => {
+    if (editor.selection && !isRangeAtRoot(editor.selection)) {
+        const paragraphEntry = getAboveByType(editor, ElementKinds.paragraph);
+        if (!paragraphEntry) {
+            return;
+        }
+        const [, paragraphPath] = paragraphEntry;
+        const [listItemNode, listItemPath] = Editor.parent(editor, paragraphPath);
+        if (Element.isElement(listItemNode) && listItemNode.type !== ElementKinds.listItem) {
+            return;
+        }
+        if (!Range.isCollapsed(editor.selection)) {
+            Transforms.delete(editor);
+        }
+        const isEnd = isBlockTextEmptyAfterSelection(editor);
+        const nextNodePath = Path.next(paragraphPath);
+        const nextListItemPath = Path.next(listItemPath);
+        const nextEnd = Editor.end(editor, listItemPath);
+        /**
+         * If not end, split nodes, wrap a list item on the new paragraph and move it to the next list item
+         */
+        if (!isEnd) {
+            Editor.withoutNormalizing(editor, () => {
+                Transforms.splitNodes(editor, { at: editor.selection, always: true });
+                Transforms.wrapNodes(editor, {
+                    type: ElementKinds.listItem,
+                    children: []
+                }, { at: nextNodePath });
+                Transforms.moveNodes(editor, {
+                    at: nextNodePath,
+                    to: nextListItemPath
+                });
+            });
+        }
+        else {
+            /**
+             * If end, split nodes
+             */
+            Editor.withoutNormalizing(editor, () => {
+                Transforms.splitNodes(editor, {
+                    always: true,
+                    mode: 'highest',
+                    match: node => {
+                        const path = node && TheEditor.findPath(editor, node);
+                        return path && path.length === nextListItemPath.length;
+                    }
+                });
+            });
+        }
+        /**
+         * If there is a list in the list item, move it to the next list item
+         */
+        if (getNode(editor, nextNodePath)) {
+            Transforms.moveNodes(editor, {
+                at: Editor.range(editor, nextNodePath, nextEnd),
+                to: nextListItemPath.concat(1),
+                match: node => {
+                    // TODO: types
+                    return listItemNode.children.includes(node);
+                }
+            });
+        }
+        return true;
+    }
+};
+
+/**
+ * 获取 listItem 内的列表(如果存在).
+ * 它采用以下结构：ul> li > span + ul
+ */
+const getListItemSublist = (listItem, options) => {
+    const [listItemNode, listItemPath] = listItem;
+    if (hasListInListItem(listItemNode)) {
+        return [listItemNode.children[1], listItemPath.concat([1])];
+    }
+};
+
+/**
+ * Move fromListItem sublist list items to the end of `toListItem` sublist.
+ * If there is no `toListItem` sublist, insert one.
+ */
+const moveListItemSublistItemsToListItemSublist = (editor, { fromListItem, toListItem, start }, options) => {
+    const [, fromListItemPath] = fromListItem;
+    const [toListItemNode, toListItemPath] = toListItem;
+    const fromListItemSublist = getListItemSublist(fromListItem, options);
+    if (!fromListItemSublist)
+        return 0;
+    const [, fromListItemSublistPath] = fromListItemSublist;
+    const toListItemSublist = getListItemSublist(toListItem, options);
+    let to;
+    if (!toListItemSublist) {
+        const fromList = getParent(editor, fromListItemPath);
+        if (!fromList)
+            return 0;
+        const [fromListNode] = fromList;
+        const fromListType = fromListNode.type;
+        const toListItemSublistPath = toListItemPath.concat([toListItemNode.children.length]);
+        Transforms.insertNodes(editor, { type: fromListType, children: [] }, { at: toListItemSublistPath });
+        to = toListItemSublistPath.concat([0]);
+    }
+    else if (start) {
+        const [, toListItemSublistPath] = toListItemSublist;
+        to = toListItemSublistPath.concat([0]);
+    }
+    else {
+        to = Path.next(getLastChildPath(toListItemSublist));
+    }
+    const moved = moveChildren(editor, {
+        at: Path.previous(fromListItemSublistPath),
+        to
+    });
+    // Remove the empty list
+    Transforms.delete(editor, { at: fromListItemPath });
+    return moved;
+};
+
+const unwrapList = (editor) => {
+    Editor.withoutNormalizing(editor, () => {
+        unwrapNodesByType(editor, ElementKinds.listItem);
+        unwrapNodesByType(editor, [ElementKinds.bulletedList, ElementKinds.numberedList], { split: true });
+    });
+};
+
 const withList = (editor) => {
     const { insertBreak, deleteBackward, onKeydown, insertData, setFragmentData, renderElement } = editor;
     const validLiChildrenTypes = getPluginOptions(editor, PluginKeys.list)?.validLiChildrenTypes ?? [];
@@ -11737,7 +11796,7 @@ const withList = (editor) => {
         onReset: (_editor) => unwrapList(_editor)
     };
     editor.insertBreak = () => {
-        const node = queries.anchorBlock(editor);
+        const node = anchorBlock(editor);
         if (!node) {
             insertBreak();
             return;
@@ -11778,16 +11837,16 @@ const withList = (editor) => {
                 }
             }
             // 如果选择的listItem为空则将其向上移动
-            if (isStart && queries.isBlockAboveEmpty(editor)) {
+            if (isStart && isBlockAboveEmpty(editor)) {
                 moved = moveListItemUp(editor, { list, listItem });
                 if (moved)
                     return;
             }
-            const didReset = transforms.onKeyDownResetBlockType({
+            const didReset = onKeyDownResetBlockType({
                 rules: [
                     {
                         ...resetBlockTypesListRule,
-                        predicate: () => !moved && isStart && queries.isBlockAboveEmpty(editor)
+                        predicate: () => !moved && isStart && isBlockAboveEmpty(editor)
                     }
                 ]
             })(null, editor);
@@ -11849,17 +11908,17 @@ const withList = (editor) => {
             const { list, listItem } = res;
             const [, listPath] = list;
             const [listItemNode, listItemPath] = listItem;
-            const previousListItemPath = queries.getPreviousPath(listItemPath);
+            const previousListItemPath = getPreviousPath(listItemPath);
             if (previousListItemPath) {
                 const beforePoint = Editor.before(editor, listItemPath);
                 const parentPath = Path.parent(beforePoint.path);
                 const parentNode = Node.get(editor, parentPath);
                 if (Element.isElement(parentNode) && Editor.isVoid(editor, parentNode)) {
                     Editor.withoutNormalizing(editor, () => {
-                        transforms.unwrapNodesByType(editor, [ElementKinds.bulletedList, ElementKinds.numberedList], {
+                        unwrapNodesByType(editor, [ElementKinds.bulletedList, ElementKinds.numberedList], {
                             split: true
                         });
-                        transforms.unwrapNodesByType(editor, ElementKinds.listItem);
+                        unwrapNodesByType(editor, ElementKinds.listItem);
                     });
                     return;
                 }
@@ -11883,7 +11942,7 @@ const withList = (editor) => {
                     const beforePoint = Editor.before(editor, listItemPath);
                     const startPoint = Editor.start(editor, listItemPath);
                     const endPoint = Editor.end(editor, listItemPath);
-                    const isInFirstChild = !isListNested(editor, listPath) && queries.isFirstChild(listItemPath);
+                    const isInFirstChild = !isListNested(editor, listPath) && isFirstChild(listItemPath);
                     const to = isInFirstChild ? listPath : Path.next(Path.parent(beforePoint.path));
                     Transforms.moveNodes(editor, {
                         at: Editor.range(editor, startPoint, endPoint),
@@ -11898,7 +11957,7 @@ const withList = (editor) => {
                 return;
             }
             // deprecated
-            if (!isListNested(editor, listPath) && queries.isFirstChild(listItemPath)) {
+            if (!isListNested(editor, listPath) && isFirstChild(listItemPath)) {
                 unwrapList(editor);
                 return;
             }
@@ -12123,7 +12182,7 @@ const withNodeID = (e) => {
         if (operation.type === 'insert_node') {
             const newFilter = (entry) => {
                 const [_node] = entry;
-                return filter(entry) && filterText ? Element.isElement(_node) : queries.isDescendant(_node);
+                return filter(entry) && filterText ? Element.isElement(_node) : isDescendant(_node);
             };
             // fix can not find path by orign node
             let node = operation.node;
@@ -12131,7 +12190,7 @@ const withNodeID = (e) => {
                 node = cloneDeep(node);
             }
             // it will not overwrite ids once it's set as it's read-only
-            transforms.mergeDeepToNodes({
+            mergeDeepToNodes({
                 node,
                 source: idPropsCreator,
                 query: {
@@ -12185,7 +12244,7 @@ const withInsertParagraphNodes = (editor) => {
     editor.normalizeNode = ([currentNode, currentPath]) => {
         if (Text.isText(currentNode) && currentPath.length) {
             const [node] = Editor.parent(editor, currentPath);
-            const containerBlocks = [...types, ...queries.getContainerBlocks(editor)];
+            const containerBlocks = [...types, ...getContainerBlocks(editor)];
             if (Element.isElement(node) && containerBlocks.includes(node.type)) {
                 const paragraph = createEmptyParagraph();
                 paragraph.children[0].text = currentNode.text;
@@ -12208,9 +12267,9 @@ const withTrailingNode = (editor) => {
     const { type, level, ...query } = options;
     editor.normalizeNode = ([currentNode, currentPath]) => {
         if (!currentPath.length) {
-            const entry = queries.getLastNode(editor, level);
+            const entry = getLastNode(editor, level);
             const [lastNode, lastPath] = entry;
-            if (Element.isElement(lastNode) && lastNode.type !== type && queries.isNodeType(entry, query)) {
+            if (Element.isElement(lastNode) && lastNode.type !== type && isNodeType(entry, query)) {
                 Transforms.insertNodes(editor, {
                     type,
                     children: [{ text: '' }]
@@ -12232,16 +12291,16 @@ const createTrailingNodePlugin = createPluginFactory({
 
 const PaintFormatEditor = {
     formatBrush(editor, marks) {
-        const block = queries.anchorBlock(editor);
+        const block = anchorBlock(editor);
         if (block && Range.isCollapsed(editor.selection)) {
             // TODO:: 在撤销时有bug, 临时使用withoutSaving处理
             HistoryEditor.withoutSaving(editor, () => {
                 const path = TheEditor.findPath(editor, block);
-                transforms.setMarks(editor, marks, path);
+                setMarks(editor, marks, path);
             });
         }
         else {
-            transforms.setMarks(editor, marks);
+            setMarks(editor, marks);
         }
         PaintFormatEditor.cancelFormatBrushStatus(editor);
     },
@@ -12257,7 +12316,7 @@ const PaintFormatEditor = {
         }
         contextService.paintFormatStatus = {
             isActive: true,
-            marks: queries.getSelectionMarks(editor)
+            marks: getSelectionMarks(editor)
         };
         const element = EDITOR_TO_ELEMENT.get(editor);
         element.classList.add('pointer-paint');
@@ -12337,7 +12396,7 @@ const createPaintFormatPlugin = createPluginFactory({
                     MarkProps.forEach(key => {
                         unsetMarks[key] = null;
                     });
-                    transforms.setMarks(editor, unsetMarks);
+                    setMarks(editor, unsetMarks);
                 }
             }
         }
@@ -12447,9 +12506,9 @@ const withSoftBreak = (editor) => {
     const { onKeydown } = editor;
     const rules = getPluginOptions(editor, PluginKeys.softBreak)?.rules ?? [];
     editor.onKeydown = (event) => {
-        const entry = queries.getBlockAbove(editor);
+        const entry = getBlockAbove(editor);
         rules.forEach(({ hotkey, query }) => {
-            if (isKeyHotkey(hotkey, event) && queries.isNodeType(entry, query)) {
+            if (isKeyHotkey(hotkey, event) && isNodeType(entry, query)) {
                 event.preventDefault();
                 editor.insertText('\n');
             }
@@ -13592,7 +13651,7 @@ class TheTableToolbar {
         this.selectedColor = cell ? cell.backgroundColor : '';
         const path = TheEditor.findPath(this.editor, this.tableElement);
         this.tableChangeSubscriber = this.tableStore.tableChange().subscribe(() => {
-            const columns = queries.getNode(this.editor, path).columns;
+            const columns = getNode(this.editor, path).columns;
             this.isColumnEqual = columns?.every(col => columns[0].width === col.width) ?? true;
         });
     }
@@ -13805,7 +13864,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.0", ngImpor
 
 function calculateAnchorPositionInCell(editor, at) {
     at = at || editor.selection.anchor;
-    const entry = queries.anchorBlockEntry(editor, at);
+    const entry = anchorBlockEntry(editor, at);
     const [block, blockPath] = entry;
     const blockDom = AngularEditor.toDOMNode(editor, block);
     const valueRangeRect = blockDom.getBoundingClientRect();
@@ -13867,7 +13926,7 @@ const moveSelectionFromCell = (editor, e) => {
             const cellStartPath = Editor.start(editor, cellPath).path;
             const cellEndPath = Editor.end(editor, cellPath).path;
             const { isFirstLine, isLastLine } = calculateAnchorPositionInCell(editor, cursor);
-            const [, anchorBlockPath] = queries.anchorBlockEntry(editor, cursor);
+            const [, anchorBlockPath] = anchorBlockEntry(editor, cursor);
             const anchorPosition = createTablePosition(editor, selection.anchor.path);
             const startCellPosition = createTablePosition(editor, cellStartPath);
             const endCellPosition = createTablePosition(editor, cellEndPath);
@@ -14497,7 +14556,7 @@ class TheTable extends TheBaseElement {
             // Editor container width changes, resulting in column widths no longer valid #WIK-6766
             const warning = this.element.columns.some((col, index) => col.width !== columns[index]?.width);
             if (warning) {
-                transforms.setNode(this.editor, { columns }, this.element);
+                setNode(this.editor, { columns }, this.element);
             }
         }
         else {
@@ -14507,24 +14566,24 @@ class TheTable extends TheBaseElement {
                     width: Number((this.tableWrapperWidth / tr.children.length - tr.children.length).toFixed(2))
                 };
             });
-            transforms.setNode(this.editor, { columns }, this.element);
+            setNode(this.editor, { columns }, this.element);
         }
     }
     initializeRows() {
-        this.element.children.map((row, index) => {
+        this.element.children.map((row, index$1) => {
             if (!row.height) {
                 const element = TheEditor.toDOMNode(this.editor, row);
                 let height = getElementHeight(element);
-                transforms.setNode(this.editor, { height }, row);
+                setNode(this.editor, { height }, row);
             }
         });
     }
     transformRowHeight() {
         const rowElements = this.nativeElement.querySelector('tbody').children;
         if (rowElements) {
-            [...rowElements].map((row, index) => {
+            [...rowElements].map((row, index$1) => {
                 let height = getElementHeight(row);
-                transforms.setNode(this.editor, { height }, this.element.children[index]);
+                setNode(this.editor, { height }, this.element.children[index$1]);
             });
         }
     }
@@ -14533,7 +14592,7 @@ class TheTable extends TheBaseElement {
         const columns = cols.map(col => {
             return { width: getElementWidth(col) };
         });
-        transforms.setNode(this.editor, { columns }, this.element);
+        setNode(this.editor, { columns }, this.element);
     }
     onColMousedown(event, index) {
         event.stopPropagation();
@@ -15045,7 +15104,7 @@ class TheTd extends TheBaseElement {
     }
     // 聚焦
     useFocus() {
-        if (this.isCollapsedAndNonReadonly && queries.isGlobalCollapsed(this.editor)) {
+        if (this.isCollapsedAndNonReadonly && isGlobalCollapsed(this.editor)) {
             this.renderer.addClass(this.elementRef.nativeElement, 'focused-cell');
         }
         else {
@@ -15706,8 +15765,8 @@ const withTable = (editor) => {
         if (startBlockPath.length <= startPosition.cellEntry[1].length + 1 &&
             startBlockPath.pop() === 0 &&
             selection.anchor.offset === 0 &&
-            queries.isStart(editor, selection.anchor, startBlockPath) &&
-            !Editor.isVoid(editor, queries.anchorBlock(editor))) {
+            isStart(editor, selection.anchor, startBlockPath) &&
+            !Editor.isVoid(editor, anchorBlock(editor))) {
             return;
         }
         deleteBackward(unit);
@@ -15765,11 +15824,11 @@ const withTable = (editor) => {
                 const { isFirstLine, isLastLine } = calculateAnchorPositionInCell(editor);
                 startPath.pop();
                 endPath.pop();
-                if ((queries.anchorBlockEntry(editor)[1].toString() !== startPath.toString() || !isFirstLine) && isMoveUp) {
+                if ((anchorBlockEntry(editor)[1].toString() !== startPath.toString() || !isFirstLine) && isMoveUp) {
                     onKeydown(event);
                     return;
                 }
-                if ((queries.anchorBlockEntry(editor)[1].toString() !== endPath.toString() || !isLastLine) && isMoveDown) {
+                if ((anchorBlockEntry(editor)[1].toString() !== endPath.toString() || !isLastLine) && isMoveDown) {
                     onKeydown(event);
                     return;
                 }
@@ -15992,7 +16051,7 @@ const withTable = (editor) => {
             if (isTable) {
                 setTimeout(() => {
                     Editor.withoutNormalizing(editor, () => {
-                        const [, currentPath] = queries.findNode(editor, {
+                        const [, currentPath] = findNode(editor, {
                             match: n => Element.isElement(n) && n.type === ElementKinds.table
                         });
                         const nextPath = Path.next(currentPath);
@@ -16231,7 +16290,7 @@ class TheTodoItem extends TheBaseElement {
         if (this.readonly && !this.editableWithReadonly) {
             return false;
         }
-        transforms.setNode(this.editor, { checked }, this.element);
+        setNode(this.editor, { checked }, this.element);
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.0", ngImport: i0, type: TheTodoItem, deps: [{ token: i0.ElementRef }, { token: i0.ChangeDetectorRef }], target: i0.ɵɵFactoryTarget.Component }); }
     static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "17.3.0", type: TheTodoItem, isStandalone: true, selector: "div[theTodoItem]", host: { properties: { "class.the-check-item": "this.checkItemClass", "class.the-todo-item-selectable": "this.checkItemSelectable", "attr.the-level": "this.level" } }, viewQueries: [{ propertyName: "childrenOutlet", first: true, predicate: ["childrenOutlet"], descendants: true, read: ElementRef, static: true }], usesInheritance: true, ngImport: i0, template: `
@@ -16277,7 +16336,7 @@ const withTodoItem = (editor) => {
             });
             if (match) {
                 const [, path] = match;
-                const block = queries.anchorBlock(editor);
+                const block = anchorBlock(editor);
                 if (block && Editor.isStart(editor, selection.anchor, path) && Editor.isEmpty(editor, block)) {
                     Transforms.setNodes(editor, {
                         type: ElementKinds.default,
@@ -16290,8 +16349,8 @@ const withTodoItem = (editor) => {
             }
         }
         insertBreak();
-        const anchorBlock = queries.anchorBlock(editor);
-        if (anchorBlock && anchorBlock.type === ElementKinds.checkItem) {
+        const anchorBlock$1 = anchorBlock(editor);
+        if (anchorBlock$1 && anchorBlock$1.type === ElementKinds.checkItem) {
             Transforms.setNodes(editor, { checked: false });
         }
     };
@@ -16457,7 +16516,7 @@ class TheQuickInsert {
         return false;
     }
     hasExcludeAttribute() {
-        const marks = queries.getSelectionMarks(this.editor);
+        const marks = getSelectionMarks(this.editor);
         const fontSizeMark = marks[MarkTypes.fontSize];
         return fontSizeMark;
     }
@@ -16562,6 +16621,7 @@ class TheEditorComponent {
         this.elementToHtml = new WeakMap();
         this.onChangeCallback = () => { };
         this.onTouchedCallback = () => { };
+        this.isFirstWriteValue = true;
         this.scrollSelectionIntoView = (e, domRange) => {
             const { neededScrollIntoView } = e.options;
             if (neededScrollIntoView && !neededScrollIntoView(this.editor)) {
@@ -16712,6 +16772,7 @@ class TheEditorComponent {
     }
     initializeOptions(theOptions) {
         const presetMode = this.presetConfig?.options?.mode;
+        const presetAutoNormalize = this.presetConfig?.options?.autoNormalize;
         const presetInlineToolbarVisible = this.presetConfig?.options?.inlineToolbarVisible;
         const presetMenu = this.presetConfig?.options?.menu;
         const presetToolbarAlign = this.presetConfig?.options?.toolbar?.align;
@@ -16723,6 +16784,7 @@ class TheEditorComponent {
             readonly: false,
             neededScrollIntoView: () => true,
             ...theOptions,
+            autoNormalize: theOptions?.autoNormalize ?? presetAutoNormalize ?? false,
             mode: theOptions?.mode ?? presetMode ?? TheDataMode.html,
             inlineToolbarVisible: theOptions?.inlineToolbarVisible ?? presetInlineToolbarVisible,
             menu: theOptions?.menu ?? presetMenu ?? DefaultPluginMenu,
@@ -16803,21 +16865,26 @@ class TheEditorComponent {
         }
     }
     writeValue(value) {
-        const firstNil = value === null && !this.editorValue;
-        if (firstNil) {
+        if (this.isFirstWriteValue) {
+            this.isFirstWriteValue = false;
             return;
         }
         const data = dataDeserialize(this.editor.options?.mode, value);
         // data-deserialize
         this.editorValue = data;
         this.cdr.markForCheck();
-        setTimeout(() => {
-            if (!this.options.readonly && AngularEditor.isFocused(this.editor) && this.editor.selection) {
-                const selection = this.editor.selection;
-                Transforms.deselect(this.editor);
-                Transforms.select(this.editor, selection);
+        if (!this.options.readonly) {
+            setTimeout(() => {
+                if (AngularEditor.isFocused(this.editor) && this.editor.selection) {
+                    const selection = this.editor.selection;
+                    Transforms.deselect(this.editor);
+                    Transforms.select(this.editor, selection);
+                }
+            });
+            if (this.options.autoNormalize) {
+                normalizeValue(this.editor, data);
             }
-        });
+        }
     }
     registerOnChange(fn) {
         this.onChangeCallback = fn;
@@ -16839,7 +16906,7 @@ class TheEditorComponent {
         const mode = this.options?.mode;
         if (mode === TheDataMode.html) {
             let htmlValue = '';
-            const isEmptyContent = queries.isEmptyContent(value);
+            const isEmptyContent$1 = isEmptyContent(value);
             value.forEach((element) => {
                 let elementHtml = this.elementToHtml.get(element);
                 if (elementHtml === undefined) {
@@ -16851,7 +16918,7 @@ class TheEditorComponent {
                 }
                 htmlValue += elementHtml;
             });
-            return isEmptyContent ? '' : htmlValue;
+            return isEmptyContent$1 ? '' : htmlValue;
         }
         return value;
     }
@@ -16881,13 +16948,13 @@ class TheEditorComponent {
     handleSelectAll() {
         let node;
         if (!this.editor.selection) {
-            transforms.setEndSelection(this.editor);
+            setEndSelection(this.editor);
         }
         const [start, end] = Range.edges(this.editor.selection);
         const selectionRange = Editor.range(this.editor, start, end);
-        const containerBlocks = queries.getContainerBlocks(this.editor);
+        const containerBlocks = getContainerBlocks(this.editor);
         for (let i = 0; i < containerBlocks.length; i++) {
-            [node] = queries.getNodesByType(this.editor, containerBlocks[i]);
+            [node] = getNodesByType(this.editor, containerBlocks[i]);
             if (node) {
                 const [, path] = node;
                 const isStartParent = Path.equals(path, start.path.slice(0, path.length));
@@ -17257,5 +17324,5 @@ const withTestPlugin = (plugins, initValue) => {
  * Generated bundle index. Do not edit.
  */
 
-export { ALIGN_BLOCK_TYPES, A_TAG_REL_ATTR, AlignEditor, Alignment, BLOCK_DELETE_BACKWARD_TYPES, BasicTest, BlockquoteEditor, CLIPBOARD_FORMAT_KEY, CODEMIRROR_PADDING_TOP, CODE_MODES, CONTAINER_BLOCKS, CONTROL_KEY, CodeEditor, ColorEditor, ColumnResizeNotifierSource, ColumnResizingStore, DEFAULT_LANGUAGE, DEFAULT_SCROLL_CONTAINER, DISABLED_OPERATE_TYPES, DataTransferFaker, DefaultElementOptions, DefaultGlobalToolbarDefinition, DefaultInlineToolbarDefinition, DefaultPluginMenu, DropdownMode, ELEMENT_UNIQUE_ID, EditorPresetConfigFactoryMock, ElementKinds, ErrorCodes, FontSizeTypes, FontSizes, HEADING_TYPES, HeadingEditor, HoveredCellInfo, HrEditor, IS_MAC, ImageEditor, IndentEditor, Indents, InlineCodeEditor, LINK_DEFAULT_TEXT, LIST_BLOCK_TYPES, LayoutTypes, LinkEditor, ListEditor, MarkEditor, MarkProps, MarkTypes, MentionEditor, PICTURE_ACCEPTED_UPLOAD_MIME, PICTURE_ACCEPTED_UPLOAD_SIZE, PluginKeys, PluginMenuIcons, PluginMenuSvgs, Position, QuickInsertEditor, ResizeRef, SLA_TABLE_CELL_SELECTOR, SLA_TABLE_SELECTOR, STANDARD_HEADING_TYPES, ScrollDirection, SpecialBackgroundColor, TAB_SPACE, THE_EDITOR_BG_COLOR, THE_EDITOR_COLOR, THE_EDITOR_CONVERSION_HINT_REF, THE_EDITOR_ORIGIN_ANCHOR, THE_EDITOR_POPOVER_REF, THE_EDITOR_PREVIOUS_SELECTION, THE_EDITOR_UUID, THE_INLINE_TOOLBAR_TYPES, THE_LISTBOX_PARENT_GROUP_TOKEN, THE_LISTBOX_PARENT_OPTION_TOKEN, THE_LISTBOX_TOKEN, THE_MODE_PROVIDER, THE_MODE_TOKEN, THE_PLUGIN_MENU_REF, THE_PRESET_CONFIG_TOKEN, THE_UPLOAD_SERVICE_TOKEN, TableCellEventDispatcher, TableEditor, TableHeaderBackgroundColor, TablePosition, TheBaseElement, TheBaseSuggestion, TheBaseToolbarDropdown, TheBaseToolbarItem, TheColumnResizeDirective, TheColumnResizeOverlayHandle, TheContextMenu, TheContextService, TheConversionHint, TheDataMode, TheDefaultElement, TheEditor, TheEditorComponent, TheImage, TheInlineToolbar, TheListboxDirective, TheListboxGroupDirective, TheListboxOptionDirective, TheMode, TheModeConfig, ThePluginMenu, ThePluginMenuComponent, ThePluginMenuItemType, ThePreventDefaultDirective, queries as TheQueries, TheTableSelect, TheTemplate, TheText, TheToolbarComponent, TheToolbarDropdown, TheToolbarGroup, TheToolbarGroupToken, TheToolbarItem, TheToolbarService, transforms as TheTransforms, TodoItemEditor, ToolbarActionTypes, ToolbarAlignment, ToolbarItemType, ToolbarMoreGroup, VOID_BLOCK_TYPES, VerticalAlignEditor, VerticalAlignment, ZERO_WIDTH_CHAR, autoFocus, base64toBlob, bottomLeftPosition, buildPluginMenu, buildPluginMenuItemMap, calcPrintColumnWidth, calcSpanForColumn, calcSpanForRow, calculateHeaderRowHeight, calculateRowControls, coercePixelsFromCssValue, combinePlugins, copyNode, copyNodeForSafari, createCell, createEmptyContent, createEmptyParagraph, createMentionPlugin, createPluginFactory, createRow, createTable, createTablePosition, createTest1Plugin, createTestPlugin, createToolbar, createVerticalAlignPlugin, customPluginMock, customPluginMockKey, dataDeserialize, dataSerializing, deleteElementKey, errorImageUrlMock, extractFragment, filterTextFormat, flattenDeepPlugins, getCellPositionsFromRange, getColsTotalWidth, getColumnsWidth, getEditorUUID, getElementClassByPrefix, getElementHeight, getElementWidth, getEndBlock, getGridColumns, getMode, getNextCell, getOriginCell, getPlugin, getPluginOptions, getPlugins, getRowsTotalHeight, getSelectCellNode, getSelectedCellPositions, getStartBlock, getTableByCell, getTableByRow, getToolbarClass, hasHeaderRow, headingOptions, htmlToTheia, idCreator, inValidTypes, initializeDefaultMenuIcons, insertDataByInvalidType, internalPlugins, isCleanEmptyParagraph, isColorIndicator, isColorInput, isColorPanel, isDirectionKeydown, isInside, isMobileMode, isPrintMode, isPureEmptyParagraph, isRangeInTable, isRectangularInTableCells, isSelectedAllCell, isSelectionInTable, isVirtualKey, matchOptions, mergeArray, mergeDeepPlugins, mergeElementOptions, mergeOptions, nestedStructureByKey, originOptions, plainToTheia, pluginKey, pluginKey1, pluginsByKey, reSelection, recursionNodes, refocus, scrollIntoView, setEditorUUID, theTethysIconRegistryFaker, topLeftPosition, uniqueCellPosition, updatePopoverPosition, useElementStyle, withMention, withTestPlugin, withTheia };
+export { ALIGN_BLOCK_TYPES, A_TAG_REL_ATTR, AlignEditor, Alignment, BLOCK_DELETE_BACKWARD_TYPES, BasicTest, BlockquoteEditor, CLIPBOARD_FORMAT_KEY, CODEMIRROR_PADDING_TOP, CODE_MODES, CONTAINER_BLOCKS, CONTROL_KEY, CodeEditor, ColorEditor, ColumnResizeNotifierSource, ColumnResizingStore, DEFAULT_LANGUAGE, DEFAULT_SCROLL_CONTAINER, DISABLED_OPERATE_TYPES, DataTransferFaker, DefaultElementOptions, DefaultGlobalToolbarDefinition, DefaultInlineToolbarDefinition, DefaultPluginMenu, DropdownMode, ELEMENT_UNIQUE_ID, EditorPresetConfigFactoryMock, ElementKinds, ErrorCodes, FontSizeTypes, FontSizes, HEADING_TYPES, HeadingEditor, HoveredCellInfo, HrEditor, IS_MAC, ImageEditor, IndentEditor, Indents, InlineCodeEditor, LINK_DEFAULT_TEXT, LIST_BLOCK_TYPES, LayoutTypes, LinkEditor, ListEditor, MarkEditor, MarkProps, MarkTypes, MentionEditor, PICTURE_ACCEPTED_UPLOAD_MIME, PICTURE_ACCEPTED_UPLOAD_SIZE, PluginKeys, PluginMenuIcons, PluginMenuSvgs, Position, QuickInsertEditor, ResizeRef, SLA_TABLE_CELL_SELECTOR, SLA_TABLE_SELECTOR, STANDARD_HEADING_TYPES, ScrollDirection, SpecialBackgroundColor, TAB_SPACE, THE_EDITOR_BG_COLOR, THE_EDITOR_COLOR, THE_EDITOR_CONVERSION_HINT_REF, THE_EDITOR_ORIGIN_ANCHOR, THE_EDITOR_POPOVER_REF, THE_EDITOR_PREVIOUS_SELECTION, THE_EDITOR_UUID, THE_INLINE_TOOLBAR_TYPES, THE_LISTBOX_PARENT_GROUP_TOKEN, THE_LISTBOX_PARENT_OPTION_TOKEN, THE_LISTBOX_TOKEN, THE_MODE_PROVIDER, THE_MODE_TOKEN, THE_PLUGIN_MENU_REF, THE_PRESET_CONFIG_TOKEN, THE_UPLOAD_SERVICE_TOKEN, TableCellEventDispatcher, TableEditor, TableHeaderBackgroundColor, TablePosition, TheBaseElement, TheBaseSuggestion, TheBaseToolbarDropdown, TheBaseToolbarItem, TheColumnResizeDirective, TheColumnResizeOverlayHandle, TheContextMenu, TheContextService, TheConversionHint, TheDataMode, TheDefaultElement, TheEditor, TheEditorComponent, TheImage, TheInlineToolbar, TheListboxDirective, TheListboxGroupDirective, TheListboxOptionDirective, TheMode, TheModeConfig, ThePluginMenu, ThePluginMenuComponent, ThePluginMenuItemType, ThePreventDefaultDirective, index$1 as TheQueries, TheTableSelect, TheTemplate, TheText, TheToolbarComponent, TheToolbarDropdown, TheToolbarGroup, TheToolbarGroupToken, TheToolbarItem, TheToolbarService, index as TheTransforms, TodoItemEditor, ToolbarActionTypes, ToolbarAlignment, ToolbarItemType, ToolbarMoreGroup, VOID_BLOCK_TYPES, VerticalAlignEditor, VerticalAlignment, ZERO_WIDTH_CHAR, autoFocus, base64toBlob, bottomLeftPosition, buildPluginMenu, buildPluginMenuItemMap, calcPrintColumnWidth, calcSpanForColumn, calcSpanForRow, calculateHeaderRowHeight, calculateRowControls, coercePixelsFromCssValue, combinePlugins, copyNode, copyNodeForSafari, createCell, createEmptyContent, createEmptyParagraph, createMentionPlugin, createPluginFactory, createRow, createTable, createTablePosition, createTest1Plugin, createTestPlugin, createToolbar, createVerticalAlignPlugin, customPluginMock, customPluginMockKey, dataDeserialize, dataSerializing, deleteElementKey, errorImageUrlMock, extractFragment, filterTextFormat, fixBlockWithoutParagraph, fixBlockWithoutText, flattenDeepPlugins, getCellPositionsFromRange, getColsTotalWidth, getColumnsWidth, getDirtyElements, getEditorUUID, getElementClassByPrefix, getElementHeight, getElementWidth, getEndBlock, getGridColumns, getMode, getNextCell, getOriginCell, getPlugin, getPluginOptions, getPlugins, getRowsTotalHeight, getSelectCellNode, getSelectedCellPositions, getStartBlock, getTableByCell, getTableByRow, getToolbarClass, hasHeaderRow, headingOptions, htmlToTheia, idCreator, inValidTypes, initializeDefaultMenuIcons, insertDataByInvalidType, internalPlugins, isCleanEmptyParagraph, isColorIndicator, isColorInput, isColorPanel, isDirectionKeydown, isInside, isMobileMode, isPrintMode, isPureEmptyParagraph, isRangeInTable, isRectangularInTableCells, isSelectedAllCell, isSelectionInTable, isVirtualKey, matchOptions, mergeArray, mergeDeepPlugins, mergeElementOptions, mergeOptions, nestedStructureByKey, normalizeValue, originOptions, plainToTheia, pluginKey, pluginKey1, pluginsByKey, reSelection, recursionNodes, refocus, scrollIntoView, setEditorUUID, theTethysIconRegistryFaker, topLeftPosition, uniqueCellPosition, updatePopoverPosition, useElementStyle, withMention, withTestPlugin, withTheia };
 //# sourceMappingURL=worktile-theia.mjs.map