@wangeditor-next/editor 5.3.0 → 5.3.2

package/CHANGELOG.md

@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [5.3.2](https://github.com/cycleccc/wangEditor/compare/@wangeditor-next/editor@5.3.1...@wangeditor-next/editor@5.3.2) (2024-07-08)
+
+**Note:** Version bump only for package @wangeditor-next/editor
+
+
+
+
+
+## [5.3.1](https://github.com/cycleccc/wangEditor/compare/@wangeditor-next/editor@5.3.0...@wangeditor-next/editor@5.3.1) (2024-06-29)
+
+**Note:** Version bump only for package @wangeditor-next/editor
+
+
+
+
+
 # [5.3.0](https://github.com/cycleccc/wangEditor/compare/@wangeditor-next/editor@5.2.8...@wangeditor-next/editor@5.3.0) (2024-06-24)
 
 

package/dist/index.esm.js

@@ -19040,7 +19040,7 @@ var withDOM = function (editor) {
         Transforms.deselect(e);
         IS_FOCUSED.set(e, false);
     };
-    // 手动更新试图
+    // 手动更新视图
     e.updateView = function () {
         var textarea = DomEditor.getTextarea(e);
         textarea.changeViewState();
@@ -22332,6 +22332,15 @@ function handleCompositionStart(e, textarea, editor) {
         // 记录下 dom range startContainer
         EDITOR_TO_START_CONTAINER.set(editor, startContainer);
     }
+    if (selection && Range.isExpanded(selection)) {
+        // 记录下 dom text ，以便触发 maxLength 时使用
+        var domRange = DomEditor.toDOMRange(editor, selection);
+        var startContainer = domRange.startContainer;
+        var curText = startContainer.textContent || '';
+        EDITOR_TO_TEXT.set(editor, curText);
+        // 记录下 dom range startContainer
+        EDITOR_TO_START_CONTAINER.set(editor, startContainer);
+    }
     textarea.isComposing = true;
     // 隐藏 placeholder
     hidePlaceholder(textarea, editor);
@@ -22402,6 +22411,15 @@ function handleCompositionEnd(e, textarea, editor) {
         }
     }
     else {
+        // 拼音输入，当选区的边缘在两个 text node 之间时 需要重置为 domselction 的 选区
+        var root = DomEditor.findDocumentOrShadowRoot(editor);
+        var domSelection = root.getSelection();
+        if (domSelection && areBothTextNodes(editor, selection)) {
+            editor.selection = DomEditor.toSlateRange(editor, domSelection, {
+                exactMatch: false,
+                suppressThrow: false,
+            });
+        }
         Editor.insertText(editor, data);
     }
     // 检查拼音输入是否夸 DOM 节点了，解决 wangEditor-v5/issues/47
@@ -22422,6 +22440,25 @@ function handleCompositionEnd(e, textarea, editor) {
             oldStartContainer.textContent = EDITOR_TO_TEXT.get(editor) || '';
         });
     }
+}
+function areBothTextNodes(editor, selection) {
+    if (Range.isCollapsed(selection)) {
+        var anchor = selection.anchor, focus_1 = selection.focus;
+        if (anchor.path.length === 2 &&
+            focus_1.path.length === 2 &&
+            (anchor.offset === 0 || focus_1.path.offset === 0)) {
+            var nowEntry = Editor.node(editor, anchor.path);
+            var nowPath = anchor.offset === 0 ? anchor.path : focus_1.path;
+            var prePath = [nowPath[0], nowPath[1] - 1];
+            if (nowPath[1] === 0) {
+                return false;
+            }
+            var preEntry = Editor.node(editor, prePath);
+            if (Text.isText(preEntry[0]) && Text.isText(nowEntry[0])) {
+                return true;
+            }
+        }
+    }
 }
 
 /**
@@ -29485,7 +29522,7 @@ function genLinkNode(url, text) {
  */
 function insertLink(editor, text, url) {
     return __awaiter$2(this, void 0, void 0, function () {
-        var checkRes, parsedUrl, selection, isCollapsed, linkNode, selectedText, linkNode, linkNode;
+        var checkRes, parsedUrl, selection, isCollapsed, leftLength, linkNode, selectedText, leftLength, linkNode, linkNode;
         return __generator$2(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -29513,8 +29550,17 @@ function insertLink(editor, text, url) {
                     isCollapsed = Range.isCollapsed(selection);
                     // 执行：插入链接
                     if (isCollapsed) {
+                        leftLength = DomEditor.getLeftLengthOfMaxLength(editor);
+                        if (leftLength <= 0) {
+                            // 已经触发 maxLength ，不再输入文字
+                            return [2 /*return*/];
+                        }
                         // 链接前后插入空格，方便操作
                         editor.insertText(' ');
+                        if (leftLength < text.length + 1) {
+                            // 剩余长度小于 text 长度，则截取 text
+                            text = text.slice(0, leftLength - 1);
+                        }
                         linkNode = genLinkNode(parsedUrl, text);
                         Transforms.insertNodes(editor, linkNode);
                         // https://github.com/wangeditor-team/wangEditor/issues/332
@@ -29525,7 +29571,15 @@ function insertLink(editor, text, url) {
                         selectedText = Editor.string(editor, selection) // 选中的文字
                         ;
                         if (selectedText !== text) {
-                            // 选中的文字和输入的文字不一样，则删掉文字，插入链接
+                            leftLength = DomEditor.getLeftLengthOfMaxLength(editor);
+                            if (leftLength <= 0) {
+                                // 已经触发 maxLength ，不再输入文字
+                                return [2 /*return*/];
+                            }
+                            if (leftLength < selectedText.length - text.length) {
+                                // 剩余长度小于 text 长度，则截取 text
+                                text = text.slice(0, leftLength);
+                            }
                             editor.deleteFragment();
                             linkNode = genLinkNode(parsedUrl, text);
                             Transforms.insertNodes(editor, linkNode);
@@ -37293,7 +37347,7 @@ var zhResources$2 = {
         videoPosterPlaceHolder: '封面图片 url',
         ok: '确定',
         editSize: '修改尺寸',
-        edit: '编辑 视频',
+        edit: '编辑视频',
         width: '宽度',
         height: '高度',
     },
@@ -38411,7 +38465,7 @@ var uploadVideoMenuConf = {
     // 创建编辑器时，可通过 editorConfig.MENU_CONF[key] = {...} 来修改
     config: genUploadVideoMenuConfig(),
 };
-var editorVideSizeMenuConf = {
+var editorVideoSizeMenuConf = {
     key: 'editVideoSize',
     factory: function () {
         return new EditorVideoSizeMenu();
@@ -38440,7 +38494,12 @@ var video = {
     elemsToHtml: [videoToHtmlConf],
     preParseHtml: [preParseHtmlConf],
     parseElemsHtml: [parseHtmlConf],
-    menus: [insertVideoMenuConf, uploadVideoMenuConf, editorVideSizeMenuConf, editorVideoSrcMenuConf],
+    menus: [
+        insertVideoMenuConf,
+        uploadVideoMenuConf,
+        editorVideoSizeMenuConf,
+        editorVideoSrcMenuConf,
+    ],
     editorPlugin: withVideo,
 };
 

package/dist/index.js

@@ -23233,7 +23233,7 @@
             slate.Transforms.deselect(e);
             IS_FOCUSED.set(e, false);
         };
-        // 手动更新试图
+        // 手动更新视图
         e.updateView = function () {
             var textarea = DomEditor.getTextarea(e);
             textarea.changeViewState();
@@ -26547,6 +26547,15 @@
             // 记录下 dom range startContainer
             EDITOR_TO_START_CONTAINER.set(editor, startContainer);
         }
+        if (selection && slate.Range.isExpanded(selection)) {
+            // 记录下 dom text ，以便触发 maxLength 时使用
+            var domRange = DomEditor.toDOMRange(editor, selection);
+            var startContainer = domRange.startContainer;
+            var curText = startContainer.textContent || '';
+            EDITOR_TO_TEXT.set(editor, curText);
+            // 记录下 dom range startContainer
+            EDITOR_TO_START_CONTAINER.set(editor, startContainer);
+        }
         textarea.isComposing = true;
         // 隐藏 placeholder
         hidePlaceholder(textarea, editor);
@@ -26617,6 +26626,15 @@
             }
         }
         else {
+            // 拼音输入，当选区的边缘在两个 text node 之间时 需要重置为 domselction 的 选区
+            var root = DomEditor.findDocumentOrShadowRoot(editor);
+            var domSelection = root.getSelection();
+            if (domSelection && areBothTextNodes(editor, selection)) {
+                editor.selection = DomEditor.toSlateRange(editor, domSelection, {
+                    exactMatch: false,
+                    suppressThrow: false,
+                });
+            }
             slate.Editor.insertText(editor, data);
         }
         // 检查拼音输入是否夸 DOM 节点了，解决 wangEditor-v5/issues/47
@@ -26637,6 +26655,25 @@
                 oldStartContainer.textContent = EDITOR_TO_TEXT.get(editor) || '';
             });
         }
+    }
+    function areBothTextNodes(editor, selection) {
+        if (slate.Range.isCollapsed(selection)) {
+            var anchor = selection.anchor, focus_1 = selection.focus;
+            if (anchor.path.length === 2 &&
+                focus_1.path.length === 2 &&
+                (anchor.offset === 0 || focus_1.path.offset === 0)) {
+                var nowEntry = slate.Editor.node(editor, anchor.path);
+                var nowPath = anchor.offset === 0 ? anchor.path : focus_1.path;
+                var prePath = [nowPath[0], nowPath[1] - 1];
+                if (nowPath[1] === 0) {
+                    return false;
+                }
+                var preEntry = slate.Editor.node(editor, prePath);
+                if (slate.Text.isText(preEntry[0]) && slate.Text.isText(nowEntry[0])) {
+                    return true;
+                }
+            }
+        }
     }
 
     /**
@@ -33816,7 +33853,7 @@
      */
     function insertLink(editor, text, url) {
         return __awaiter(this, void 0, void 0, function () {
-            var checkRes, parsedUrl, selection, isCollapsed, linkNode, selectedText, linkNode, linkNode;
+            var checkRes, parsedUrl, selection, isCollapsed, leftLength, linkNode, selectedText, leftLength, linkNode, linkNode;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -33844,8 +33881,17 @@
                         isCollapsed = slate.Range.isCollapsed(selection);
                         // 执行：插入链接
                         if (isCollapsed) {
+                            leftLength = core.DomEditor.getLeftLengthOfMaxLength(editor);
+                            if (leftLength <= 0) {
+                                // 已经触发 maxLength ，不再输入文字
+                                return [2 /*return*/];
+                            }
                             // 链接前后插入空格，方便操作
                             editor.insertText(' ');
+                            if (leftLength < text.length + 1) {
+                                // 剩余长度小于 text 长度，则截取 text
+                                text = text.slice(0, leftLength - 1);
+                            }
                             linkNode = genLinkNode(parsedUrl, text);
                             slate.Transforms.insertNodes(editor, linkNode);
                             // https://github.com/wangeditor-team/wangEditor/issues/332
@@ -33856,7 +33902,15 @@
                             selectedText = slate.Editor.string(editor, selection) // 选中的文字
                             ;
                             if (selectedText !== text) {
-                                // 选中的文字和输入的文字不一样，则删掉文字，插入链接
+                                leftLength = core.DomEditor.getLeftLengthOfMaxLength(editor);
+                                if (leftLength <= 0) {
+                                    // 已经触发 maxLength ，不再输入文字
+                                    return [2 /*return*/];
+                                }
+                                if (leftLength < selectedText.length - text.length) {
+                                    // 剩余长度小于 text 长度，则截取 text
+                                    text = text.slice(0, leftLength);
+                                }
                                 editor.deleteFragment();
                                 linkNode = genLinkNode(parsedUrl, text);
                                 slate.Transforms.insertNodes(editor, linkNode);
@@ -41682,7 +41736,7 @@
             videoPosterPlaceHolder: '封面图片 url',
             ok: '确定',
             editSize: '修改尺寸',
-            edit: '编辑 视频',
+            edit: '编辑视频',
             width: '宽度',
             height: '高度',
         },
@@ -42800,7 +42854,7 @@
         // 创建编辑器时，可通过 editorConfig.MENU_CONF[key] = {...} 来修改
         config: genUploadVideoMenuConfig(),
     };
-    var editorVideSizeMenuConf = {
+    var editorVideoSizeMenuConf = {
         key: 'editVideoSize',
         factory: function () {
             return new EditorVideoSizeMenu();
@@ -42829,7 +42883,12 @@
         elemsToHtml: [videoToHtmlConf],
         preParseHtml: [preParseHtmlConf],
         parseElemsHtml: [parseHtmlConf],
-        menus: [insertVideoMenuConf, uploadVideoMenuConf, editorVideSizeMenuConf, editorVideoSrcMenuConf],
+        menus: [
+            insertVideoMenuConf,
+            uploadVideoMenuConf,
+            editorVideoSizeMenuConf,
+            editorVideoSrcMenuConf,
+        ],
         editorPlugin: withVideo,
     };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wangeditor-next/editor",
-  "version": "5.3.0",
+  "version": "5.3.2",
   "description": "Web rich text editor, Web 富文本编辑器",
   "keywords": [
     "wangeditor",
@@ -50,9 +50,9 @@
   "dependencies": {
     "@uppy/core": "^2.1.1",
     "@uppy/xhr-upload": "^2.0.3",
-    "@wangeditor-next/basic-modules": "^1.2.6",
+    "@wangeditor-next/basic-modules": "^1.2.7",
     "@wangeditor-next/code-highlight": "^1.2.1",
-    "@wangeditor-next/core": "^1.4.1",
+    "@wangeditor-next/core": "^1.4.2",
     "@wangeditor-next/list-module": "^1.1.1",
     "@wangeditor-next/table-module": "^1.2.1",
     "@wangeditor-next/upload-image-module": "^1.1.1",
@@ -70,5 +70,5 @@
     "slate": "^0.72.0",
     "snabbdom": "^3.1.0"
   },
-  "gitHead": "a735e4fce203ca5ff50da97c5c49480a47e83ed9"
+  "gitHead": "25ed7e7ad11c7572f3457355ba860eb1a27e2503"
 }