@seafile/sdoc-editor 2.0.126 → 2.0.127

package/dist/assets/css/link-cursor.css

@@ -0,0 +1,48 @@
+.sdoc-editor__article {
+  position: relative;
+  overflow: auto;
+}
+
+.slate-content.hide-native-cursor {
+  caret-color: transparent;
+}
+
+.custom-cursor {
+  position: absolute;
+  width: 1px;
+  height: 1.2em;
+  background-color: blue;
+  animation: blink 1s infinite;
+}
+
+.custom-cursor.link-start::after,
+.custom-cursor.next-start::after {
+  content: '';
+  position: absolute;
+  bottom: 0;
+  left: 0;
+  width: 4px;
+  height: 1px;
+  background-color: blue;
+}
+
+.custom-cursor.link-end::after,
+.custom-cursor.prev-end::after {
+  content: '';
+  position: absolute;
+  bottom: 0;
+  right: 0;
+  width: 4px;
+  height: 1px;
+  background-color: blue;
+}
+
+@keyframes blink {
+  0%, 100% {
+    opacity: 1;
+  }
+
+  50% {
+    opacity: 0;
+  }
+}

package/dist/comment/reducer/notification-reducer.js

@@ -26,7 +26,7 @@ var notificationReducer = exports.notificationReducer = function notificationRed
       {
         var notifications = action.payload;
         var notificationsMap = {};
-        notifications.forEach(function (n) {
+        notifications === null || notifications === void 0 ? void 0 : notifications.forEach(function (n) {
           var newNotification = new _model.Notification(n);
           notificationsMap[newNotification.key] = newNotification;
         });

package/dist/editor/editable-article.js

@@ -7,6 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectSpread2"));
+var _createForOfIteratorHelper2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/createForOfIteratorHelper"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
 var _slate = require("@seafile/slate");
@@ -28,6 +29,7 @@ var _commonUtils = require("../utils/common-utils");
 var _domUtils = require("../utils/dom-utils");
 var _eventBus = _interopRequireDefault(require("../utils/event-bus"));
 var _eventHandler = _interopRequireDefault(require("../utils/event-handler"));
+require("../assets/css/link-cursor.css");
 var EditableArticle = function EditableArticle(_ref) {
   var _ref$showComment = _ref.showComment,
     showComment = _ref$showComment === void 0 ? true : _ref$showComment,
@@ -38,6 +40,14 @@ var EditableArticle = function EditableArticle(_ref) {
     cursors = _useCursors.cursors;
   var decorate = (0, _decorates.usePipDecorate)(editor);
   var forceUpdate = (0, _useForceUpdate["default"])();
+  var _useState = (0, _react.useState)({
+      top: 0,
+      left: 0,
+      type: null // 'link-start' | 'link-end' | 'next-start' | 'prev-end'
+    }),
+    _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
+    cursorState = _useState2[0],
+    setCursorState = _useState2[1];
 
   // init eventHandler
   // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -67,6 +77,113 @@ var EditableArticle = function EditableArticle(_ref) {
     };
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
+  (0, _react.useEffect)(function () {
+    var selection = editor.selection;
+    if (!selection || !_slate.Range.isCollapsed(selection)) {
+      setCursorState({
+        top: 0,
+        left: 0,
+        type: null
+      });
+      return;
+    }
+    var domSelection = window.getSelection();
+    if (!domSelection || domSelection.rangeCount === 0) {
+      setCursorState({
+        top: 0,
+        left: 0,
+        type: null
+      });
+      return;
+    }
+    var range = domSelection.getRangeAt(0);
+    var rect = range.getBoundingClientRect();
+    var editorEl = document.querySelector('.sdoc-editor__article');
+    if (!editorEl) {
+      setCursorState({
+        top: 0,
+        left: 0,
+        type: null
+      });
+      return;
+    }
+    var editorRect = editorEl.getBoundingClientRect();
+    var top = rect.top - editorRect.top + editorEl.scrollTop;
+    var left = rect.left - editorRect.left + editorEl.scrollLeft;
+    var _Editor$node = _slate.Editor.node(editor, selection.anchor.path),
+      _Editor$node2 = (0, _slicedToArray2["default"])(_Editor$node, 2),
+      node = _Editor$node2[0],
+      path = _Editor$node2[1];
+    if (!_slate.Text.isText(node)) {
+      setCursorState({
+        top: 0,
+        left: 0,
+        type: null
+      });
+      return;
+    }
+    var isInLink = false;
+    var _iterator = (0, _createForOfIteratorHelper2["default"])(_slate.Node.ancestors(editor, path)),
+      _step;
+    try {
+      for (_iterator.s(); !(_step = _iterator.n()).done;) {
+        var _step$value = (0, _slicedToArray2["default"])(_step.value, 1),
+          ancestor = _step$value[0];
+        if (ancestor.type === 'link') {
+          isInLink = true;
+          break;
+        }
+      }
+    } catch (err) {
+      _iterator.e(err);
+    } finally {
+      _iterator.f();
+    }
+    if (isInLink) {
+      var offset = selection.anchor.offset;
+      var isStart = offset === 0;
+      var isEnd = offset === node.text.length;
+      if (!isStart && !isEnd) {
+        setCursorState({
+          top: 0,
+          left: 0,
+          type: null
+        });
+        return;
+      }
+      setCursorState({
+        top: top,
+        left: left,
+        type: isStart ? 'link-start' : 'link-end'
+      });
+    } else {
+      var parent = _slate.Node.parent(editor, path);
+      var index = path[path.length - 1];
+      var nextSibling = index < parent.children.length - 1 ? parent.children[index + 1] : null;
+      var prevSibling = index > 0 ? parent.children[index - 1] : null;
+      var isLeftNeighborEnd = nextSibling && _slate.Element.isElement(nextSibling) && nextSibling.type === 'link' && selection.anchor.offset === node.text.length;
+      var isRightNeighborStart = prevSibling && _slate.Element.isElement(prevSibling) && prevSibling.type === 'link' && selection.anchor.offset === 0;
+      if (isLeftNeighborEnd) {
+        setCursorState({
+          top: top,
+          left: left,
+          type: 'prev-end'
+        });
+      } else if (isRightNeighborStart) {
+        setCursorState({
+          top: top,
+          left: left,
+          type: 'next-start'
+        });
+      } else {
+        setCursorState({
+          top: 0,
+          left: 0,
+          type: null
+        });
+      }
+    }
+  }, [editor.selection]);
   var onKeyDown = (0, _react.useCallback)(function (event) {
     var _scrollRef$current = scrollRef.current,
       scrollTop = _scrollRef$current.scrollTop,
@@ -254,7 +371,14 @@ var EditableArticle = function EditableArticle(_ref) {
     onCopy: eventProxy.onCopy,
     onCompositionStart: eventProxy.onCompositionStart,
     id: "sdoc-editor",
-    "aria-label": "textbox"
+    "aria-label": "textbox",
+    className: "slate-content ".concat(cursorState.type ? 'hide-native-cursor' : '')
+  }), cursorState.type && /*#__PURE__*/_react["default"].createElement("div", {
+    className: "custom-cursor ".concat(cursorState.type),
+    style: {
+      top: cursorState.top,
+      left: cursorState.left
+    }
   })), /*#__PURE__*/_react["default"].createElement(_extension.SideToolbar, null), showComment && /*#__PURE__*/_react["default"].createElement(_comment["default"], {
     editor: editor,
     type: "editor"

package/dist/extension/plugins/ai/ai-module/index.js

@@ -95,7 +95,13 @@ function AIModule(_ref) {
             _content += (0, _slateToMd["default"])(item);
           });
         }
-        setSelectedValue(_content);
+
+        // Add paragraph symbol for selected content
+        var newContent = _content;
+        if (_content.includes('\n')) {
+          newContent = _content.replace(/\n/g, '\n\n');
+        }
+        setSelectedValue(newContent);
       }
       var domSelection = window.getSelection();
       var domRange = domSelection.getRangeAt(0);
@@ -144,7 +150,11 @@ function AIModule(_ref) {
     var slateRect = slateDom.getBoundingClientRect();
     var content = _slate.Node.string(element);
     if (content) {
-      setSelectedValue(content);
+      var _newContent = content;
+      if (content.includes('\n')) {
+        _newContent = content.replace(/\n/g, '\n\n');
+      }
+      setSelectedValue(_newContent);
     }
     var needPaddingBottomHeight = scrollTop + slateRect.bottom + _constants2.AI_MIN_HEIGHT - scrollHeight;
     if (needPaddingBottomHeight > 0) {

package/dist/extension/plugins/ai/ai-module/style.css

@@ -142,7 +142,7 @@
 }
 
 .md-rendered-html p {
-  padding-bottom: 5px;
-  line-height: 1.6;
+  padding: 5px 0;
+  line-height: 1.5;
   margin-bottom: 0 !important;
 }

package/dist/extension/toolbar/insert-element-toolbar/index.js

@@ -396,9 +396,9 @@ var QuickInsertBlockMenu = function QuickInsertBlockMenu(_ref) {
   }, []);
   var onHandleInputFocus = (0, _react.useCallback)(function (isFocus) {
     if (inputWrapperRef.current) {
-      queueMicrotask(function () {
+      setTimeout(function () {
         isFocus ? inputWrapperRef.current.focus() : inputWrapperRef.current.blur();
-      });
+      }, 50);
     }
   }, []);
   (0, _react.useEffect)(function () {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seafile/sdoc-editor",
-  "version": "2.0.126",
+  "version": "2.0.127",
   "main": "dist/index.js",
   "scripts": {
     "test": "jest",
@@ -70,5 +70,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7af77d5a5fda5e6aaa76145cf4547f5bc66cb4b1"
+  "gitHead": "fadcfb916d934dc56ea439ca0221f9ff08e59563"
 }