@seafile/sdoc-editor 3.0.1 → 3.0.3

package/dist/extension/toolbar/side-toolbar/index.js

@@ -328,6 +328,7 @@ var SideToolbar = function SideToolbar() {
     }
     var _getNodeEntry3 = (0, _helpers2.getNodeEntry)(editor, targetElement),
       _getNodeEntry4 = (0, _slicedToArray2["default"])(_getNodeEntry3, 2),
+      targetNode = _getNodeEntry4[0],
       targetPath = _getNodeEntry4[1];
     // Drag multiple list_items nodes
     if (draggedSourcePaths.current) {
@@ -394,7 +395,7 @@ var SideToolbar = function SideToolbar() {
     }
 
     // Dragging into a list is not supported
-    if ([_constants2.CODE_BLOCK, _constants2.TABLE, _constants2.BLOCKQUOTE, _constants2.CHECK_LIST_ITEM].includes(sourceNode.type) && (0, _helpers2.isList)(editor, targetPath)) {
+    if ([_constants2.CALL_OUT, _constants2.TABLE, _constants2.BLOCKQUOTE, _constants2.CHECK_LIST_ITEM].includes(sourceNode.type) && (0, _helpers2.isList)(editor, targetPath)) {
       return;
     }
 
@@ -409,8 +410,19 @@ var SideToolbar = function SideToolbar() {
       return;
     }
 
+    // Drag out codeblock from list into non-list nodes
+    if ((0, _helpers2.isList)(editor, sourcePath) && sourceNode.type === _constants2.CODE_BLOCK && !(0, _helpers2.isList)(editor, targetPath)) {
+      var codeblockPath = (0, _core.findPath)(editor, sourceNode);
+      var toPath = _slate.Path.next(targetPath);
+      _slate.Transforms.moveNodes(editor, {
+        at: codeblockPath,
+        to: toPath
+      });
+      return;
+    }
+
     // Drag list
-    if ((0, _helpers2.isList)(editor, sourcePath)) {
+    if ((0, _helpers2.isList)(editor, sourcePath) && sourceNode !== _constants2.CODE_BLOCK) {
       // ordinary list items
       if (!(0, _helpers2.isBlockquote)(editor, [sourcePath[0]])) {
         // Drag ordinary list items to places other than list and quoteBlock
@@ -498,39 +510,51 @@ var SideToolbar = function SideToolbar() {
 
     // Handling drag situations including non-multi_column or non-list item dragged from multiColumn
     if (!isInMultiColumn || isInMultiColumn && ![_constants2.ORDERED_LIST, _constants2.UNORDERED_LIST].includes(currentSourceNode.type)) {
+      // Special situation: drag codeblock into list nodes
+      if ((0, _helpers2.isList)(editor, targetPath) && [_constants2.CODE_BLOCK].includes(sourceNode.type)) {
+        var childrenPath = (0, _core.findPath)(editor, targetNode);
+        var _codeblockPath = (0, _core.findPath)(editor, sourceNode);
+        var _toPath = _slate.Path.next(childrenPath);
+        _slate.Transforms.moveNodes(editor, {
+          at: _codeblockPath,
+          to: _toPath
+        });
+        return;
+      }
+
       // Drag backward
       if (_slate.Path.isAfter(targetPath, sourcePath)) {
-        var toPath = targetPath.slice(0);
+        var _toPath2 = targetPath.slice(0);
 
         // Drag elements outside the quoteBlock into the quoteBlock
         if (!(0, _helpers2.isBlockquote)(editor, [sourcePath[0]]) && (0, _helpers2.isBlockquote)(editor, [targetPath[0]]) && targetPath.length > 1) {
-          toPath = _slate.Path.next(targetPath);
+          _toPath2 = _slate.Path.next(targetPath);
         }
 
-        // Drag into list
-        if ((0, _helpers2.isList)(editor, targetPath)) {
-          toPath = _slate.Path.next(targetPath);
+        // Drag non-codeblock into list
+        if ((0, _helpers2.isList)(editor, targetPath) && ![_constants2.CODE_BLOCK].includes(currentSourceNode.type)) {
+          _toPath2 = _slate.Path.next(targetPath);
         }
         _slate.Transforms.moveNodes(editor, {
           at: sourcePath,
-          to: toPath
+          to: _toPath2
         });
       }
 
       // Drag forward
       if (_slate.Path.isBefore(targetPath, sourcePath)) {
-        var _toPath = _slate.Path.next(targetPath);
+        var _toPath3 = _slate.Path.next(targetPath);
         _slate.Transforms.moveNodes(editor, {
           at: sourcePath,
-          to: _toPath
+          to: _toPath3
         });
       }
     }
     var selectedSourcePath = sourcePath;
     // Handling drag forward situation for multi_column update
     if (_slate.Path.isBefore(targetPath, sourcePath)) {
-      var targetNode = _slate.Editor.node(editor, [targetPath[0]])[0];
-      if (![_constants2.ORDERED_LIST, _constants2.UNORDERED_LIST].includes(targetNode.type)) {
+      var _targetNode = _slate.Editor.node(editor, [targetPath[0]])[0];
+      if (![_constants2.ORDERED_LIST, _constants2.UNORDERED_LIST].includes(_targetNode.type)) {
         selectedSourcePath[0] += 1;
       }
     }

package/dist/extension/toolbar/side-toolbar/insert-block-menu.js

@@ -6,8 +6,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectSpread2"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/toConsumableArray"));
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectSpread2"));
 var _react = _interopRequireWildcard(require("react"));
 var _reactI18next = require("react-i18next");
 var _reactstrap = require("reactstrap");
@@ -142,7 +142,21 @@ var InsertBlockMenu = function InsertBlockMenu(_ref) {
     var newInsertPosition = slateNode.type === _constants2.ELEMENT_TYPE.LIST_ITEM ? _constants2.INSERT_POSITION.AFTER : insertPosition;
     (0, _helper2.insertMultiColumn)(editor, editor.selection, newInsertPosition, type);
   }, [editor, insertPosition, slateNode]);
-  return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, [_constants2.SIDE_INSERT_MENUS_CONFIG[_constants2.ELEMENT_TYPE.PARAGRAPH]].concat((0, _toConsumableArray2["default"])(_constants2.SIDE_INSERT_MENUS_CONFIG[_constants2.ELEMENT_TYPE.HEADER])).map(function (item) {
+  var insertFileView = (0, _react.useCallback)(function () {
+    var eventBus = _eventBus["default"].getInstance();
+    eventBus.dispatch(_constants.INTERNAL_EVENT.INSERT_ELEMENT, {
+      type: _constants2.ELEMENT_TYPE.FILE_VIEW,
+      insertPosition: insertPosition,
+      slateNode: slateNode
+    });
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [insertPosition]);
+  console.log(editor.editorType);
+  return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, editor.editorType === _constants.WIKI_EDITOR && /*#__PURE__*/_react["default"].createElement(_dropdownMenuItem["default"], {
+    isHidden: !insertMenuSearchMap[_constants2.ELEMENT_TYPE.FILE_VIEW],
+    menuConfig: (0, _objectSpread2["default"])({}, _constants2.SIDE_INSERT_MENUS_CONFIG[_constants2.ELEMENT_TYPE.FILE_VIEW]),
+    onClick: insertFileView
+  }), [_constants2.SIDE_INSERT_MENUS_CONFIG[_constants2.ELEMENT_TYPE.PARAGRAPH]].concat((0, _toConsumableArray2["default"])(_constants2.SIDE_INSERT_MENUS_CONFIG[_constants2.ELEMENT_TYPE.HEADER])).map(function (item) {
     return /*#__PURE__*/_react["default"].createElement(_dropdownMenuItem["default"], {
       isHidden: !insertMenuSearchMap[item.type],
       disabled: isNodeEmpty && item.type === _constants2.PARAGRAPH,

package/dist/node-id/index.js

@@ -1,5 +1,6 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault")["default"];
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -7,6 +8,7 @@ exports["default"] = void 0;
 var _slate = require("@seafile/slate");
 var _constants = require("../extension/constants");
 var _documentUtils = require("../utils/document-utils");
+var _localStorageUtils = _interopRequireDefault(require("../utils/local-storage-utils"));
 var _helpers = require("./helpers");
 var withNodeId = function withNodeId(editor) {
   var apply = editor.apply,
@@ -65,6 +67,7 @@ var withNodeId = function withNodeId(editor) {
       var cleaned = (0, _helpers.removeCommentMarks)(parsed);
       var newData = (0, _helpers.replacePastedDataId)(cleaned);
       var normalizeNewData = (0, _documentUtils.normalizeCopyNodes)(newEditor, newData);
+      _localStorageUtils["default"].setItem(_constants.RECENT_COPY_CONTENT, normalizeNewData);
       newEditor.insertFragment(normalizeNewData);
       return newEditor;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seafile/sdoc-editor",
-  "version": "3.0.1",
+  "version": "3.0.3",
   "main": "dist/index.js",
   "scripts": {
     "test": "jest",
@@ -71,5 +71,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "f4690d913506d3dd6108d97248323e1b9b06ee32"
+  "gitHead": "0a7ebc1042c83af89889893429b3b1a6b1a13431"
 }