@seafile/sdoc-editor 3.0.220 → 3.0.222

package/dist/extension/plugins/search-replace/helper.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.scrollIntoView = exports.isRangeInNotAllowedType = exports.isNotAllowed = exports.handleReplaceKeyword = exports.getHighlightInfos = exports.drawHighlights = exports.clearCanvas = void 0;
+exports.scrollIntoView = exports.isRangeInNotAllowedType = exports.isNotAllowed = exports.handleReplaceKeyword = exports.getHighlightInfos = exports.generateRangeWhenWrapLine = exports.drawHighlights = exports.clearCanvas = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/slicedToArray"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectSpread2"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/toConsumableArray"));
@@ -108,7 +108,7 @@ var getMatchedTextInfos = function getMatchedTextInfos(editor, node, keyword) {
   }
   return matchedTextNodeEntires;
 };
-var generateRangeWhenWrapLine = function generateRangeWhenWrapLine(editor, path, index, count, domRange, baseHeight) {
+var generateRangeWhenWrapLine = exports.generateRangeWhenWrapLine = function generateRangeWhenWrapLine(editor, path, index, count, domRange, baseHeight) {
   var i = 0;
   var j = 1;
   var isOverrideForwardRange = true;
@@ -126,7 +126,8 @@ var generateRangeWhenWrapLine = function generateRangeWhenWrapLine(editor, path,
     };
     var subRange = _slateReact.ReactEditor.toDOMRange(editor, subSplitRange);
     var subRangeHeight = Math.round(subRange.getBoundingClientRect().height);
-    if (subRangeHeight === baseHeight) {
+    var isSingleCharacterRange = j === i + 1;
+    if (subRangeHeight === baseHeight || isSingleCharacterRange) {
       isOverrideForwardRange && subHighlightInfos.pop();
       if (!isOverrideForwardRange) isOverrideForwardRange = true;
       subHighlightInfos.push({
@@ -362,7 +363,7 @@ var drawHighlights = exports.drawHighlights = function drawHighlights(editor, ra
         splitRangeIndex = 0;
       } else {
         splitRangeIndex = j;
-        canvasIndex = Math.ceil((y - top) / 5000 - 1);
+        canvasIndex = Math.floor((y - top) / 5000);
       }
     }
   } while (rangeIndex < ranges.length);

package/dist/extension/plugins/table/plugin.js

@@ -167,6 +167,14 @@ var withTable = function withTable(editor) {
     if (!selection) {
       return deleteFragment(unit);
     }
+    var collapseSelection = function collapseSelection(point) {
+      if (point && _slate.Editor.hasPath(editor, point.path)) {
+        _slate.Transforms.select(editor, {
+          anchor: point,
+          focus: point
+        });
+      }
+    };
     var match = function match(n) {
       return n.type === _constants2.TABLE;
     };
@@ -228,8 +236,8 @@ var withTable = function withTable(editor) {
           at: selection.focus,
           match: match
         });
-        var _columnLength = focusEntry[0].columns.length;
         if (focusEntry) {
+          var _columnLength = focusEntry[0].columns.length;
           var focus = selection.focus;
           var _isForward = _slate.Range.isForward(selection);
           if (_isForward) {
@@ -242,13 +250,29 @@ var withTable = function withTable(editor) {
               });
 
               // delete other module
-              var newFocus = (0, _core.getEndPoint)(editor, _slate.Path.previous(focusEntry[1]));
-              _slate.Transforms["delete"](editor, {
-                at: (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, selection), {}, {
-                  focus: newFocus
-                })
+              var prevBlockPath = _slate.Path.previous(focusEntry[1]);
+              var newFocus = (0, _core.getEndPoint)(editor, prevBlockPath);
+              var range = (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, selection), {}, {
+                focus: newFocus
               });
-              (0, _core.focusEditor)(editor, focus.path);
+              var targetFocus = {
+                path: focus.path,
+                offset: 0
+              };
+              if (_slate.Range.isCollapsed(range) && _slate.Editor.hasPath(editor, prevBlockPath)) {
+                _slate.Transforms.removeNodes(editor, {
+                  at: prevBlockPath
+                });
+                targetFocus = {
+                  path: prevBlockPath.concat(focus.path.slice(focusEntry[1].length)),
+                  offset: 0
+                };
+              } else {
+                _slate.Transforms["delete"](editor, {
+                  at: range
+                });
+              }
+              collapseSelection(targetFocus);
               return;
             }
           } else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seafile/sdoc-editor",
-  "version": "3.0.220",
+  "version": "3.0.222",
   "main": "dist/index.js",
   "scripts": {
     "test": "jest",
@@ -72,5 +72,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "eb733d7cba898370c67f4790bb78bed769d8c860"
+  "gitHead": "cfbf3cf2a8e0f148292fc1201ca31f86a412459b"
 }