@seafile/sdoc-editor 3.0.224 → 3.0.225

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

@@ -11,13 +11,30 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm
 var _slate = require("@seafile/slate");
 var _slateReact = require("@seafile/slate-react");
 var _isHotkey = _interopRequireDefault(require("is-hotkey"));
+var _isUrl = _interopRequireDefault(require("is-url"));
 var _constants = require("../../../constants");
+var _helpers = require("../../../node-id/helpers");
 var _eventBus = _interopRequireDefault(require("../../../utils/event-bus"));
 var _objectUtils = _interopRequireDefault(require("../../../utils/object-utils"));
 var _constants2 = require("../../constants");
 var _core = require("../../core");
+var _utils = require("../../utils");
 var _constants3 = require("./constants");
-var _helpers = require("./helpers");
+var _helpers2 = require("./helpers");
+var INLINE_LINK_TYPES = [_constants2.ELEMENT_TYPE.LINK, _constants2.ELEMENT_TYPE.SDOC_LINK, _constants2.ELEMENT_TYPE.FILE_LINK];
+var getInlineLinkNodes = function getInlineLinkNodes(nodes) {
+  if (!Array.isArray(nodes) || nodes.length !== 1 || nodes[0].type !== _constants2.PARAGRAPH) return null;
+  var children = nodes[0].children;
+  if (!Array.isArray(children)) return null;
+  var linkNodes = children.filter(function (node) {
+    return INLINE_LINK_TYPES.includes(node.type);
+  });
+  var hasOnlyOneLink = linkNodes.length === 1;
+  var hasOnlyEmptyTextAndLink = children.every(function (node) {
+    return INLINE_LINK_TYPES.includes(node.type) || Object.prototype.hasOwnProperty.call(node, 'text') && node.text === '';
+  });
+  return hasOnlyOneLink && hasOnlyEmptyTextAndLink ? linkNodes : null;
+};
 var withTable = function withTable(editor) {
   var insertBreak = editor.insertBreak,
     deleteBackward = editor.deleteBackward,
@@ -37,7 +54,7 @@ var withTable = function withTable(editor) {
     // Handle special keyboard events
     if ((0, _isHotkey["default"])('mod+a', event)) {
       event.preventDefault();
-      var _getSelectedInfo = (0, _helpers.getSelectedInfo)(newEditor),
+      var _getSelectedInfo = (0, _helpers2.getSelectedInfo)(newEditor),
         table = _getSelectedInfo.table,
         tableSize = _getSelectedInfo.tableSize;
       var allTableRange = {
@@ -50,16 +67,16 @@ var withTable = function withTable(editor) {
       eventBus.dispatch(_constants.INTERNAL_EVENT.SET_TABLE_SELECT_RANGE, table, allTableRange);
     }
     if ((0, _isHotkey["default"])(_constants2.KEYBOARD.UP, event)) {
-      (0, _helpers.focusCell)(newEditor, event, _constants2.KEYBOARD.UP);
+      (0, _helpers2.focusCell)(newEditor, event, _constants2.KEYBOARD.UP);
     }
     if ((0, _isHotkey["default"])(_constants2.KEYBOARD.RIGHT, event)) {
-      (0, _helpers.focusCell)(newEditor, event, _constants2.KEYBOARD.RIGHT);
+      (0, _helpers2.focusCell)(newEditor, event, _constants2.KEYBOARD.RIGHT);
     }
     if ((0, _isHotkey["default"])(_constants2.KEYBOARD.DOWN, event)) {
-      (0, _helpers.focusCell)(newEditor, event, _constants2.KEYBOARD.DOWN);
+      (0, _helpers2.focusCell)(newEditor, event, _constants2.KEYBOARD.DOWN);
     }
     if ((0, _isHotkey["default"])(_constants2.KEYBOARD.LEFT, event)) {
-      (0, _helpers.focusCell)(newEditor, event, _constants2.KEYBOARD.LEFT);
+      (0, _helpers2.focusCell)(newEditor, event, _constants2.KEYBOARD.LEFT);
     }
     if ((0, _isHotkey["default"])('tab', event)) {
       event.preventDefault();
@@ -83,17 +100,17 @@ var withTable = function withTable(editor) {
     insertBreak();
   };
   newEditor.deleteBackward = function (unit) {
-    var deleteType = (0, _helpers.deleteHandler)(newEditor);
+    var deleteType = (0, _helpers2.deleteHandler)(newEditor);
     if (deleteType === 'table') {
-      var _getSelectedInfo2 = (0, _helpers.getSelectedInfo)(editor),
+      var _getSelectedInfo2 = (0, _helpers2.getSelectedInfo)(editor),
         tablePath = _getSelectedInfo2.tablePath;
-      (0, _helpers.removeTable)(editor, tablePath);
+      (0, _helpers2.removeTable)(editor, tablePath);
       return;
     }
 
     // range selection delete
     if (deleteType === 'range') {
-      (0, _helpers.deleteTableRangeData)(newEditor);
+      (0, _helpers2.deleteTableRangeData)(newEditor);
       return;
     }
     if (deleteType === 'default') return;
@@ -101,8 +118,8 @@ var withTable = function withTable(editor) {
     if (selection) {
       var before = _slate.Editor.before(newEditor, selection);
       if (before) {
-        var isTableOnBeforeLocation = (0, _helpers.isTableLocation)(newEditor, before);
-        var isTableOnCurSelection = (0, _helpers.isTableLocation)(newEditor, selection);
+        var isTableOnBeforeLocation = (0, _helpers2.isTableLocation)(newEditor, before);
+        var isTableOnCurSelection = (0, _helpers2.isTableLocation)(newEditor, selection);
         // If the current is not a table and the previous one is a table.
         if (isTableOnBeforeLocation && !isTableOnCurSelection) {
           var _Editor$nodes = _slate.Editor.nodes(editor, {
@@ -194,7 +211,7 @@ var withTable = function withTable(editor) {
           if (!(0, _core.isStartPoint)(editor, anchor, anchorEntry[1])) {
             // delete table cells
             var endPoint = (0, _core.getEndPoint)(editor, anchorEntry[1]);
-            (0, _helpers.deleteTableSelectCells)(editor, {
+            (0, _helpers2.deleteTableSelectCells)(editor, {
               start: anchor.path,
               end: endPoint.path,
               columnLength: columnLength
@@ -214,7 +231,7 @@ var withTable = function withTable(editor) {
           if (!(0, _core.isEndPoint)(editor, anchor, anchorEntry[1])) {
             // delete table cells
             var startPoint = (0, _core.getStartPoint)(editor, anchorEntry[1]);
-            (0, _helpers.deleteTableSelectCells)(editor, {
+            (0, _helpers2.deleteTableSelectCells)(editor, {
               start: startPoint.path,
               end: anchor.path,
               columnLength: columnLength
@@ -243,7 +260,7 @@ var withTable = function withTable(editor) {
           if (_isForward) {
             if (!(0, _core.isEndPoint)(editor, focus, focusEntry[1])) {
               var _startPoint = (0, _core.getStartPoint)(editor, focusEntry[1]);
-              (0, _helpers.deleteTableSelectCells)(editor, {
+              (0, _helpers2.deleteTableSelectCells)(editor, {
                 start: _startPoint.path,
                 end: focus.path,
                 columnLength: _columnLength
@@ -278,7 +295,7 @@ var withTable = function withTable(editor) {
           } else {
             if (!(0, _core.isEndPoint)(editor, focus, focusEntry[1])) {
               var _endPoint = (0, _core.getEndPoint)(editor, focusEntry[1]);
-              (0, _helpers.deleteTableSelectCells)(editor, {
+              (0, _helpers2.deleteTableSelectCells)(editor, {
                 start: focus.path,
                 end: _endPoint.path,
                 columnLength: _columnLength
@@ -298,7 +315,7 @@ var withTable = function withTable(editor) {
         }
       }
     }
-    if (_slate.Range.isRange(selection) && (0, _helpers.isAllInTable)(editor) && !(0, _helpers.isInTableSameCell)(editor)) {
+    if (_slate.Range.isRange(selection) && (0, _helpers2.isAllInTable)(editor) && !(0, _helpers2.isInTableSameCell)(editor)) {
       var _getTopLevelBlockNode = (0, _core.getTopLevelBlockNode)(editor),
         _getTopLevelBlockNode2 = (0, _slicedToArray2["default"])(_getTopLevelBlockNode, 1),
         node = _getTopLevelBlockNode2[0];
@@ -371,24 +388,24 @@ var withTable = function withTable(editor) {
     if (_objectUtils["default"].isSameObject(tableSelectedRange, _constants3.EMPTY_SELECTED_RANGE)) {
       return setFragmentData(dataTransfer);
     }
-    return (0, _helpers.setTableFragmentData)(newEditor, dataTransfer);
+    return (0, _helpers2.setTableFragmentData)(newEditor, dataTransfer);
   };
   newEditor.cut = function (event) {
     var selectedNode = (0, _core.getSelectedNodeByType)(newEditor, _constants2.ELEMENT_TYPE.TABLE);
     var tableSelectedRange = newEditor.tableSelectedRange;
     if (selectedNode && !_objectUtils["default"].isSameObject(tableSelectedRange, _constants3.EMPTY_SELECTED_RANGE)) {
-      (0, _helpers.setTableFragmentData)(newEditor, event.clipboardData);
-      var deleteType = (0, _helpers.deleteHandler)(newEditor);
+      (0, _helpers2.setTableFragmentData)(newEditor, event.clipboardData);
+      var deleteType = (0, _helpers2.deleteHandler)(newEditor);
       if (deleteType === 'table') {
-        var _getSelectedInfo3 = (0, _helpers.getSelectedInfo)(editor),
+        var _getSelectedInfo3 = (0, _helpers2.getSelectedInfo)(editor),
           tablePath = _getSelectedInfo3.tablePath;
-        (0, _helpers.removeTable)(editor, tablePath);
+        (0, _helpers2.removeTable)(editor, tablePath);
         return;
       }
 
       // range selection delete
       if (deleteType === 'range') {
-        (0, _helpers.deleteTableRangeData)(newEditor);
+        (0, _helpers2.deleteTableRangeData)(newEditor);
         return;
       }
       return;
@@ -412,13 +429,23 @@ var withTable = function withTable(editor) {
         var tableElement = parsedData.find(function (item) {
           return item.type === _constants2.ELEMENT_TYPE.TABLE;
         });
-        (0, _helpers.insertMultipleRowsAndColumns)(newEditor, tableElement.children, tableElement.columns);
+        (0, _helpers2.insertMultipleRowsAndColumns)(newEditor, tableElement.children, tableElement.columns);
         return;
       }
+      var linkNodes = getInlineLinkNodes(parsedData);
+      if (linkNodes && (0, _helpers2.isInTableSameCell)(newEditor)) {
+        var cleanedLinkNodes = (0, _helpers.removeCommentMarks)(linkNodes);
+        return _slate.Transforms.insertNodes(newEditor, (0, _helpers.replacePastedDataId)(cleanedLinkNodes));
+      }
     }
     var text = data.getData('text/plain');
     if (!text) return;
-    _slate.Editor.insertText(newEditor, text);
+
+    // Keep URL paste behavior consistent with normal text while preserving multi-cell paste behavior.
+    if ((0, _isUrl["default"])(text) && !(0, _utils.isImage)(text) && (0, _helpers2.isInTableSameCell)(newEditor)) {
+      return insertData(data);
+    }
+    return _slate.Editor.insertText(newEditor, text);
   };
   newEditor.insertFragment = function (data) {
     if (data.type === _constants2.ELEMENT_TYPE.TABLE) {
@@ -444,7 +471,7 @@ var withTable = function withTable(editor) {
       selectAll();
       return;
     }
-    var _getSelectedInfo4 = (0, _helpers.getSelectedInfo)(newEditor),
+    var _getSelectedInfo4 = (0, _helpers2.getSelectedInfo)(newEditor),
       table = _getSelectedInfo4.table,
       tableSize = _getSelectedInfo4.tableSize;
     eventBus.dispatch(_constants.INTERNAL_EVENT.SET_TABLE_SELECT_RANGE, table, {
@@ -589,12 +616,12 @@ var withTable = function withTable(editor) {
     }
 
     // Add row to the last cell
-    if ((0, _helpers.isLastTableCell)(newEditor, above)) {
-      var _getSelectedInfo5 = (0, _helpers.getSelectedInfo)(newEditor),
+    if ((0, _helpers2.isLastTableCell)(newEditor, above)) {
+      var _getSelectedInfo5 = (0, _helpers2.getSelectedInfo)(newEditor),
         tablePath = _getSelectedInfo5.tablePath,
         tableSize = _getSelectedInfo5.tableSize;
       if (tableSize[0] === _constants3.TABLE_MAX_ROWS) return;
-      (0, _helpers.insertTableElement)(newEditor, _constants3.TABLE_ELEMENT.ROW, _constants3.TABLE_ELEMENT_POSITION.AFTER);
+      (0, _helpers2.insertTableElement)(newEditor, _constants3.TABLE_ELEMENT.ROW, _constants3.TABLE_ELEMENT_POSITION.AFTER);
       _slate.Transforms.select(newEditor, [].concat((0, _toConsumableArray2["default"])(tablePath), [tableSize[0], 0]));
       return;
     }
@@ -603,7 +630,7 @@ var withTable = function withTable(editor) {
     // The default behavior, the cursor is in the middle of the text, and the current text content is selected
     // Change to jump to next cell
     if (selection.anchor.offset === selection.focus.offset) {
-      var _getSelectedInfo6 = (0, _helpers.getSelectedInfo)(newEditor),
+      var _getSelectedInfo6 = (0, _helpers2.getSelectedInfo)(newEditor),
         _tableSize = _getSelectedInfo6.tableSize,
         _tablePath = _getSelectedInfo6.tablePath,
         rowIndex = _getSelectedInfo6.rowIndex,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seafile/sdoc-editor",
-  "version": "3.0.224",
+  "version": "3.0.225",
   "main": "dist/index.js",
   "scripts": {
     "test": "jest",
@@ -49,7 +49,7 @@
     "remark-rehype": "11.0.0",
     "remark-stringify": "11.0.0",
     "slugid": "3.2.0",
-    "socket.io-client": "4.8.3",
+    "socket.io-client": "^4.8.3",
     "type-of": "2.0.1",
     "unified": "11.0.3",
     "url-join": "4.0.1",
@@ -71,5 +71,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "923e8c34d37ea42d33014cfbd5e785ecc9626526"
+  "gitHead": "8da759c5eb27c940bde666a47ea8dcb762442d05"
 }