@seafile/sdoc-editor 2.0.166 → 2.0.167

package/dist/extension/plugins/header/helpers.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.setHeaderType = exports.isSelectionInHeader = exports.isNextChildIsImage = exports.isMenuDisabled = exports.getHeaderType = void 0;
+exports.setHeaderType = exports.isSelectionInHeader = exports.isMenuDisabled = exports.isHasImage = exports.getHeaderType = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/slicedToArray"));
 var _slate = require("@seafile/slate");
 var _constants = require("../../constants");
@@ -72,21 +72,9 @@ var setHeaderType = exports.setHeaderType = function setHeaderType(editor, type)
     type: type
   });
 };
-var isNextChildIsImage = exports.isNextChildIsImage = function isNextChildIsImage(editor, headerNode) {
-  var selection = editor.selection;
-  var children = headerNode.children;
-  if (children.length === 1) return false;
-  var _selection$anchor = selection.anchor,
-    path = _selection$anchor.path,
-    offset = _selection$anchor.offset;
-  var _path$slice = path.slice(-1),
-    _path$slice2 = (0, _slicedToArray2["default"])(_path$slice, 1),
-    nodeIndex = _path$slice2[0];
-  if (nodeIndex + 1 > children.length) return false;
-  var beforeText = children[nodeIndex].text ? children[nodeIndex].text : '';
-  if (beforeText.length === 0) return false;
-  if (beforeText.length !== offset) return false;
-  var nextNode = children[nodeIndex + 1];
-  if (nextNode.type === 'image' && _slate.Node.string(headerNode).length === offset) return true;
-  return false;
+var isHasImage = exports.isHasImage = function isHasImage(node) {
+  return node.children.some(function (item) {
+    if (item.type === 'image') return true;
+    return false;
+  });
 };

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

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/toConsumableArray"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/slicedToArray"));
 var _slate = require("@seafile/slate");
 var _isHotkey = _interopRequireDefault(require("is-hotkey"));
@@ -24,7 +25,8 @@ var withHeader = function withHeader(editor) {
   var insertBreak = editor.insertBreak,
     insertFragment = editor.insertFragment,
     insertText = editor.insertText,
-    deleteBackward = editor.deleteBackward;
+    deleteBackward = editor.deleteBackward,
+    normalizeNode = editor.normalizeNode;
   var newEditor = editor;
 
   // Utility function to check if selection is inside multi-column node
@@ -57,10 +59,10 @@ var withHeader = function withHeader(editor) {
     if ((0, _core.isCursorAtBlockStart)(newEditor)) {
       var _match = (0, _slicedToArray2["default"])(match, 2),
         currentNode = _match[0],
-        _path = _match[1];
+        path = _match[1];
       var newNode = (0, _core.generateEmptyElement)(currentNode.type);
       _slate.Transforms.insertNodes(editor, newNode, {
-        at: _path
+        at: path
       });
       return;
     }
@@ -68,25 +70,12 @@ var withHeader = function withHeader(editor) {
     var nextNode = _slate.Editor.next(editor, {
       at: match[1]
     });
-    var _match2 = (0, _slicedToArray2["default"])(match, 2),
-      headerNode = _match2[0],
-      path = _match2[1];
-    if ((0, _helpers2.isNextChildIsImage)(editor, headerNode)) {
-      insertBreak();
-      var nextPath = _slate.Path.next(path);
-      _slate.Transforms.setNodes(editor, {
-        type: _constants.PARAGRAPH
-      }, {
-        at: nextPath
-      });
-      return;
-    }
     if (isAtLineEnd && nextNode && editor.children.length === 2) {
       var _nextNode = (0, _slicedToArray2["default"])(nextNode, 2),
         node = _nextNode[0],
-        _path2 = _nextNode[1];
+        _path = _nextNode[1];
       if (node && node.children[0].text === '') {
-        _slate.Transforms.select(editor, _path2);
+        _slate.Transforms.select(editor, _path);
         return;
       }
     }
@@ -151,6 +140,40 @@ var withHeader = function withHeader(editor) {
     (0, _helpers2.setHeaderType)(newEditor, headerType);
     return true;
   };
+  newEditor.normalizeNode = function (_ref) {
+    var _ref2 = (0, _slicedToArray2["default"])(_ref, 2),
+      node = _ref2[0],
+      path = _ref2[1];
+    var type = (0, _core.getNodeType)(node);
+    if (_constants.HEADERS.includes(type) && (0, _helpers2.isHasImage)(node)) {
+      var imagePaths = [];
+      var imageNodes = [];
+      node.children.forEach(function (item, index) {
+        if (item.type === 'image') {
+          var imgPath = [].concat((0, _toConsumableArray2["default"])(path), [index]);
+          imagePaths.push(imgPath);
+          imageNodes.push(item);
+        }
+      });
+      if (imagePaths.length > 0) {
+        _slate.Editor.withoutNormalizing(editor, function () {
+          imagePaths.reverse().forEach(function (path) {
+            _slate.Transforms.removeNodes(editor, {
+              at: path
+            });
+          });
+          var p = (0, _core.generateDefaultParagraph)();
+          p.children = imageNodes;
+          var newPath = _slate.Path.next(path);
+          _slate.Transforms.insertNodes(editor, p, {
+            at: newPath
+          });
+        });
+        return;
+      }
+    }
+    return normalizeNode([node, path]);
+  };
   return newEditor;
 };
 var _default = exports["default"] = withHeader;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seafile/sdoc-editor",
-  "version": "2.0.166",
+  "version": "2.0.167",
   "main": "dist/index.js",
   "scripts": {
     "test": "jest",
@@ -71,5 +71,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "6dc46fa6f9dd24cf662a49a9704ff1df8179bf17"
+  "gitHead": "3aeaf24f2dc672bc32a6dc6d962542adb53a6f73"
 }