@seafile/sdoc-editor 2.0.72 → 2.0.73

package/dist/basic-sdk/comment/components/editor-comment.js

@@ -16,7 +16,6 @@ var _useSelectionUpdate = _interopRequireDefault(require("../../hooks/use-select
 var _eventBus = _interopRequireDefault(require("../../utils/event-bus"));
 var _helper = require("../helper");
 var _useCommentContext = require("../hooks/comment-hooks/use-comment-context");
-var _index = require("../utils/index");
 var _commentList = _interopRequireDefault(require("./comment-list"));
 var _elementsCommentCount = _interopRequireDefault(require("./elements-comment-count"));
 const EditorComment = _ref => {

package/dist/basic-sdk/comment/provider/participants-content-provider.js

@@ -8,12 +8,12 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _reactI18next = require("react-i18next");
-var _basicSdk = require("../../../basic-sdk");
 var _toast = _interopRequireDefault(require("../../../components/toast"));
 var _constants = require("../../../constants");
 var _context = _interopRequireDefault(require("../../../context"));
 var _model = require("../../../model");
 var _utils = require("../../../utils");
+var _eventBus = _interopRequireDefault(require("../../utils/event-bus"));
 var _useParticipants = require("../hooks/use-participants");
 const ParticipantsProvider = _ref => {
   let {
@@ -77,7 +77,7 @@ const ParticipantsProvider = _ref => {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
   (0, _react.useEffect)(() => {
-    const eventBus = _basicSdk.EventBus.getInstance();
+    const eventBus = _eventBus.default.getInstance();
     const unsubscribeParticipantAdded = eventBus.subscribe(_constants.EXTERNAL_EVENT.PARTICIPANT_ADDED, updateLocalParticipants);
     const unsubscribeParticipantRemoved = eventBus.subscribe(_constants.EXTERNAL_EVENT.PARTICIPANT_REMOVED, deleteLocalParticipant);
     return () => {

package/dist/basic-sdk/editor/editable-article.js

@@ -10,7 +10,6 @@ var _react = _interopRequireWildcard(require("react"));
 var _slate = require("@seafile/slate");
 var _slateReact = require("@seafile/slate-react");
 var _scrollIntoViewIfNeeded = _interopRequireDefault(require("scroll-into-view-if-needed"));
-var _useForceUpdate = _interopRequireDefault(require("../../basic-sdk/hooks/use-force-update"));
 var _comment = _interopRequireDefault(require("../comment"));
 var _constants = require("../constants");
 var _useCursors = require("../cursor/use-cursors");
@@ -20,6 +19,7 @@ var _constants2 = require("../extension/constants");
 var _core = require("../extension/core");
 var _helpers = require("../extension/plugins/table/helpers");
 var _highlight = require("../highlight");
+var _useForceUpdate = _interopRequireDefault(require("../hooks/use-force-update"));
 var _useScrollContext = require("../hooks/use-scroll-context");
 var _layout = require("../layout");
 var _domUtils = require("../utils/dom-utils");

package/dist/basic-sdk/editor/sdoc-comment-editor.js

@@ -9,7 +9,6 @@ exports.default = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _slate = require("@seafile/slate");
 var _deepCopy = _interopRequireDefault(require("deep-copy"));
-var _basicSdk = require("../../basic-sdk");
 var _commonLoading = _interopRequireDefault(require("../../components/common-loading"));
 var _constants = require("../../constants");
 var _context = _interopRequireDefault(require("../../context"));
@@ -22,6 +21,7 @@ var _useScrollContext = require("../hooks/use-scroll-context");
 var _layout = require("../layout");
 var _nodeId = _interopRequireDefault(require("../node-id"));
 var _socket = require("../socket");
+var _eventBus = _interopRequireDefault(require("../utils/event-bus"));
 var _commentArticle = _interopRequireDefault(require("./comment-article"));
 const SdocCommentEditor = /*#__PURE__*/(0, _react.forwardRef)((_ref, ref) => {
   let {
@@ -77,7 +77,7 @@ const SdocCommentEditor = /*#__PURE__*/(0, _react.forwardRef)((_ref, ref) => {
 
   // useMount: refresh document
   (0, _react.useEffect)(() => {
-    const eventBus = _basicSdk.EventBus.getInstance();
+    const eventBus = _eventBus.default.getInstance();
     eventBus.subscribe(_constants.EXTERNAL_EVENT.REFRESH_DOCUMENT, onRefreshDocument);
   }, [onRefreshDocument]);
 

package/dist/basic-sdk/editor/sdoc-editor.js

@@ -12,7 +12,6 @@ var _deepCopy = _interopRequireDefault(require("deep-copy"));
 var _isHotkey = _interopRequireDefault(require("is-hotkey"));
 var _jsBridge = _interopRequireDefault(require("../../android/js-bridge"));
 var _outlineModule = require("../../android/outline-module");
-var _basicSdk = require("../../basic-sdk");
 var _commonLoading = _interopRequireDefault(require("../../components/common-loading"));
 var _constants = require("../../constants");
 var _context = _interopRequireDefault(require("../../context"));
@@ -26,6 +25,7 @@ var _useColorContext = require("../hooks/use-color-context");
 var _layout = require("../layout");
 var _nodeId = _interopRequireDefault(require("../node-id"));
 var _socket = require("../socket");
+var _eventBus = _interopRequireDefault(require("../utils/event-bus"));
 var _readonlyArticle = _interopRequireDefault(require("../views/readonly-article"));
 var _editableArticle = _interopRequireDefault(require("./editable-article"));
 const SdocEditor = /*#__PURE__*/(0, _react.forwardRef)((_ref, ref) => {
@@ -119,7 +119,7 @@ const SdocEditor = /*#__PURE__*/(0, _react.forwardRef)((_ref, ref) => {
 
   // useMount: refresh document
   (0, _react.useEffect)(() => {
-    const eventBus = _basicSdk.EventBus.getInstance();
+    const eventBus = _eventBus.default.getInstance();
     eventBus.subscribe(_constants.EXTERNAL_EVENT.REFRESH_DOCUMENT, onRefreshDocument);
 
     // Remove Marks on special conditions like unexpected exit or refresh page using AI or context comment
@@ -143,7 +143,7 @@ const SdocEditor = /*#__PURE__*/(0, _react.forwardRef)((_ref, ref) => {
     }
   }, []);
   (0, _react.useEffect)(() => {
-    const eventBus = _basicSdk.EventBus.getInstance();
+    const eventBus = _eventBus.default.getInstance();
     const unsubscribePresentationFullScreen = eventBus.subscribe(_constants.EXTERNAL_EVENT.TOGGLE_PRESENTATION_MODE, handleFullScreenPresentation);
     return () => {
       unsubscribePresentationFullScreen();
@@ -193,7 +193,7 @@ const SdocEditor = /*#__PURE__*/(0, _react.forwardRef)((_ref, ref) => {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }), [document, validEditor, slateValue]);
   const onValueChange = value => {
-    const eventBus = _basicSdk.EventBus.getInstance();
+    const eventBus = _eventBus.default.getInstance();
     setSlateValue(value);
     // After the content is updated, update the search content
     setTimeout(() => {

package/dist/basic-sdk/editor/wiki-editor.js

@@ -10,7 +10,6 @@ var _react = _interopRequireWildcard(require("react"));
 var _slate = require("@seafile/slate");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _deepCopy = _interopRequireDefault(require("deep-copy"));
-var _basicSdk = require("../../basic-sdk");
 var _commonLoading = _interopRequireDefault(require("../../components/common-loading"));
 var _constants = require("../../constants");
 var _context = _interopRequireDefault(require("../../context"));
@@ -25,6 +24,7 @@ var _layout = require("../layout");
 var _nodeId = _interopRequireDefault(require("../node-id"));
 var _wikiOutline = _interopRequireDefault(require("../outline/wiki-outline"));
 var _socket = require("../socket");
+var _eventBus = _interopRequireDefault(require("../utils/event-bus"));
 var _readonlyArticle = _interopRequireDefault(require("../views/readonly-article"));
 var _editableArticle = _interopRequireDefault(require("./editable-article"));
 const WikiEditor = /*#__PURE__*/(0, _react.forwardRef)((_ref, ref) => {
@@ -109,7 +109,7 @@ const WikiEditor = /*#__PURE__*/(0, _react.forwardRef)((_ref, ref) => {
 
   // useMount: refresh document
   (0, _react.useEffect)(() => {
-    const eventBus = _basicSdk.EventBus.getInstance();
+    const eventBus = _eventBus.default.getInstance();
     eventBus.subscribe(_constants.EXTERNAL_EVENT.REFRESH_DOCUMENT, onRefreshDocument);
   }, [onRefreshDocument]);
 
@@ -134,7 +134,7 @@ const WikiEditor = /*#__PURE__*/(0, _react.forwardRef)((_ref, ref) => {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }), [document, validEditor, slateValue]);
   const onValueChange = value => {
-    const eventBus = _basicSdk.EventBus.getInstance();
+    const eventBus = _eventBus.default.getInstance();
     // After the content is updated, update the search content
     setTimeout(() => {
       eventBus.dispatch(_constants2.INTERNAL_EVENT.UPDATE_SEARCH_REPLACE_HIGHLIGHT, value);

package/dist/basic-sdk/extension/plugins/ai/ai-module/helpers.js

@@ -3,8 +3,10 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.removeMarks = void 0;
+exports.removeMarks = exports.markdownTableRenderer = exports.insertHtmlTransferredNodes = void 0;
 var _slate = require("@seafile/slate");
+var _constants = require("../../../constants");
+var _core = require("../../../core");
 const removeMarks = editor => {
   const {
     selection
@@ -23,4 +25,46 @@ const removeMarks = editor => {
     _slate.Transforms.deselect(editor);
   }
 };
-exports.removeMarks = removeMarks;
+exports.removeMarks = removeMarks;
+const markdownTableRenderer = searchResult => {
+  if (!searchResult) return '';
+  return /*#__PURE__*/React.createElement("div", {
+    className: "md-rendered-html",
+    dangerouslySetInnerHTML: {
+      __html: searchResult
+    }
+  });
+};
+exports.markdownTableRenderer = markdownTableRenderer;
+const insertHtmlTransferredNodes = (slateNodeList, nextPath, editor) => {
+  slateNodeList.forEach(childNode => {
+    // Insert paragraph nodes
+    if (childNode.type === _constants.PARAGRAPH) {
+      if (childNode.children.length > 1) {
+        childNode.children.forEach((textNode, index) => {
+          if (!textNode.text.trim()) return;
+          const p = (0, _core.generateEmptyElement)(_constants.PARAGRAPH);
+          p.children.push(textNode);
+          _slate.Transforms.insertNodes(editor, p, {
+            at: nextPath
+          });
+          nextPath = _slate.Path.next(nextPath);
+        });
+      } else {
+        _slate.Transforms.insertNodes(editor, childNode, {
+          at: nextPath
+        });
+        nextPath = _slate.Path.next(nextPath);
+      }
+    }
+
+    // Insert non-paragraph nodes
+    if (childNode.type !== _constants.PARAGRAPH) {
+      _slate.Transforms.insertNodes(editor, childNode, {
+        at: nextPath
+      });
+      nextPath = _slate.Path.next(nextPath);
+    }
+  });
+};
+exports.insertHtmlTransferredNodes = insertHtmlTransferredNodes;

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

@@ -14,6 +14,8 @@ var _copyToClipboard = _interopRequireDefault(require("copy-to-clipboard"));
 var _isHotkey = _interopRequireDefault(require("is-hotkey"));
 var _toast = _interopRequireDefault(require("../../../../../components/toast"));
 var _context = _interopRequireDefault(require("../../../../../context"));
+var _mdToHtml = _interopRequireDefault(require("../../../../../slate-convert/md-to-html"));
+var _mdToSlate = _interopRequireDefault(require("../../../../../slate-convert/md-to-slate"));
 var _commons = require("../../../commons");
 var _dropdownMenuItem = _interopRequireDefault(require("../../../commons/dropdown-menu-item"));
 var _constants = require("../../../constants");
@@ -217,6 +219,11 @@ function AIModule(_ref) {
     if (value === searchValue) return;
     setSearchValue(value);
   }, [searchValue]);
+  const transferHtml = async mdString => {
+    const htmlString = await _mdToHtml.default.process(mdString);
+    const formatHtml = String(htmlString).trim();
+    setSearchResult(formatHtml);
+  };
   const onEnter = (0, _react.useCallback)(event => {
     if (!searchValue) return;
     setOpType(_constants2.OPERATION_TYPES.DEFAULT);
@@ -228,10 +235,10 @@ function AIModule(_ref) {
       return;
     }
     _context.default.writingAssistant(defaultContent, 'ask', custom_prompt).then(res => {
-      const {
+      let {
         content
       } = res.data;
-      setSearchResult(content);
+      transferHtml(content);
       setIsGenerating(false);
       setSearchValue('');
       setOldSearchValue(searchValue);
@@ -265,7 +272,7 @@ function AIModule(_ref) {
       const {
         content
       } = res.data;
-      setSearchResult(content);
+      transferHtml(content);
       setIsGenerating(false);
     }).catch(err => {
       setIsGenerating(false);
@@ -284,7 +291,7 @@ function AIModule(_ref) {
       const {
         content
       } = res.data;
-      setSearchResult(content);
+      transferHtml(content);
       setIsGenerating(false);
     }).catch(err => {
       setIsGenerating(false);
@@ -303,7 +310,7 @@ function AIModule(_ref) {
       const {
         content
       } = res.data;
-      setSearchResult(content);
+      transferHtml(content);
       setIsGenerating(false);
     }).catch(err => {
       setIsGenerating(false);
@@ -322,7 +329,7 @@ function AIModule(_ref) {
       const {
         content
       } = res.data;
-      setSearchResult(content);
+      transferHtml(content);
       setIsGenerating(false);
     }).catch(err => {
       setIsGenerating(false);
@@ -341,7 +348,7 @@ function AIModule(_ref) {
       const {
         content
       } = res.data;
-      setSearchResult(content);
+      transferHtml(content);
       setIsGenerating(false);
     }).catch(err => {
       setIsGenerating(false);
@@ -362,7 +369,7 @@ function AIModule(_ref) {
       const {
         translation
       } = res.data;
-      setSearchResult(translation);
+      transferHtml(translation);
       setIsGenerating(false);
     }).catch(err => {
       setIsGenerating(false);
@@ -392,19 +399,13 @@ function AIModule(_ref) {
       nextPath = _slate.Path.next(path);
     }
 
-    // Prevent '\\n' from being pre-wrapped
-    const tempResult = searchResult.replace(/\\n/g, '\v');
-    const paragraphs = tempResult.split('\n').map(line => line.replace(/\v/g, '\\n')).filter(line => line.trim() !== '');
-    const p = (0, _core.generateEmptyElement)(_constants.PARAGRAPH);
-    paragraphs.forEach((line, index) => {
-      p.children[0].text = line;
-      _slate.Transforms.insertNodes(editor, p, {
-        at: nextPath
-      });
-      if (index < paragraphs.length - 1) {
-        nextPath = _slate.Path.next(nextPath);
-      }
-    });
+    // Transfer markdown search result to slate
+    // If codeMd，keep all; otherwise，delete \n and empty area
+    const optimizedSearchResult = searchResult.replace(/<pre[\s\S]*?<\/pre>|>\s+</g, match => {
+      return match.startsWith('<pre') ? match : '><';
+    }).trim();
+    const slateNodeList = (0, _mdToSlate.default)(optimizedSearchResult);
+    (0, _helpers.insertHtmlTransferredNodes)(slateNodeList, nextPath, editor);
     onCloseClick();
     focusToEndPath(nextPath);
   }, [editor, element, focusToEndPath, onCloseClick, searchResult]);
@@ -440,7 +441,19 @@ function AIModule(_ref) {
     if (!element) {
       editor.deleteFragment();
       if (searchResult) {
-        editor.insertText(searchResult);
+        const optimizedSearchResult = searchResult.replace(/<pre[\s\S]*?<\/pre>|>\s+</g, match => {
+          return match.startsWith('<pre') ? match : '><';
+        }).trim();
+        const slateNodeList = (0, _mdToSlate.default)(optimizedSearchResult);
+        // Insert selection as text if result node is one paragraph nodes; otherwise, insert below
+        if (slateNodeList.length === 1 && slateNodeList[0].type === _constants.PARAGRAPH && slateNodeList[0].children.length <= 1) {
+          const text = slateNodeList[0].children[0].text;
+          editor.insertText(text);
+        } else {
+          const topBlockNode = (0, _core.getTopLevelBlockNode)(editor);
+          const nextPath = _slate.Path.next(topBlockNode[1]);
+          (0, _helpers.insertHtmlTransferredNodes)(slateNodeList, nextPath, editor);
+        }
       }
       onCloseClick();
       const end = _slate.Range.end(editor.selection);
@@ -542,9 +555,7 @@ function AIModule(_ref) {
     className: "sdoc-ai-result"
   }, /*#__PURE__*/_react.default.createElement("div", {
     className: "sdoc-ai-result-content"
-  }, isGenerating ? t('Processing_message') : searchResult.split('\n').map((paragraph, index) => /*#__PURE__*/_react.default.createElement("p", {
-    key: index
-  }, paragraph)))), /*#__PURE__*/_react.default.createElement("div", {
+  }, isGenerating ? t('Processing_message') : (0, _helpers.markdownTableRenderer)(searchResult))), /*#__PURE__*/_react.default.createElement("div", {
     className: "sdoc-ai-search"
   }, /*#__PURE__*/_react.default.createElement(_aiIcon.default, null), /*#__PURE__*/_react.default.createElement("input", {
     placeholder: t('Ask_AI_anything'),

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

@@ -90,12 +90,6 @@
   overflow-y: auto;
 }
 
-.sdoc-ai-module-container .sdoc-ai-result .sdoc-ai-result-content p {
-  line-height: 1.6;
-  padding: 5px 0;
-  margin-bottom: 0 !important;
-}
-
 .sdoc-ai-module-container .sdoc-ai-result .sdoc-ai-result-header {
   display: flex;
   justify-content: space-between;
@@ -134,3 +128,21 @@
   box-shadow: 0 0 10px #ccc;
   background-color: #fff;
 }
+
+.md-rendered-html table {
+  border-collapse: collapse;
+  border: 1px solid #ccc;
+}
+
+.md-rendered-html th,
+.md-rendered-html tr,
+.md-rendered-html td {
+  padding: 6px;
+  border: 1px solid #ccc;
+}
+
+.md-rendered-html p {
+  padding-bottom: 5px;
+  line-height: 1.6;
+  margin-bottom: 0 !important;
+}

package/dist/basic-sdk/layout/editor-content.js

@@ -8,8 +8,8 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _classnames = _interopRequireDefault(require("classnames"));
-var _constants = require("../../basic-sdk/constants");
 var _provider = _interopRequireDefault(require("../comment/provider"));
+var _constants = require("../constants");
 var _useScrollContext = require("../hooks/use-scroll-context");
 var _outline = _interopRequireDefault(require("../outline"));
 var _rightPanel = _interopRequireDefault(require("../right-panel"));

package/dist/basic-sdk/utils/diff.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.getTopLevelChanges = exports.getMergedChanges = exports.getIdDiffs = exports.getDiff = exports.generateIdMapAndIds = void 0;
 var _slugid = _interopRequireDefault(require("slugid"));
-var _constants = require("../../basic-sdk/extension/constants");
+var _constants = require("../extension/constants");
 var _diffText = _interopRequireDefault(require("./diff-text"));
 var _documentUtils = require("./document-utils");
 var _objectUtils = _interopRequireDefault(require("./object-utils"));

package/dist/basic-sdk/utils/document-utils.js

@@ -6,9 +6,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.setOriginSdocKey = exports.normalizeCopyNodes = exports.normalizeChildren = exports.getSlateFragmentAttribute = exports.generateDefaultDocContent = void 0;
 var _deepCopy = _interopRequireDefault(require("deep-copy"));
-var _index = require("../../basic-sdk/extension/core/utils/index");
 var _context = _interopRequireDefault(require("../../context"));
 var _constants = require("../extension/constants");
+var _index = require("../extension/core/utils/index");
 var _helpers = require("../extension/plugins/table/helpers");
 var _objectUtils = _interopRequireDefault(require("./object-utils"));
 const normalizeChildren = children => {

package/dist/slate-convert/html-to-slate/rules/code-block.js

@@ -73,7 +73,7 @@ const codeBlockRule = (element, parseChild) => {
         }]
       };
     }
-    const codes = content.slugid('\n').filter(Boolean);
+    const codes = content.split('\n').filter(Boolean);
     return codes.map(item => {
       return {
         id: _slugid.default.nice(),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seafile/sdoc-editor",
-  "version": "2.0.72",
+  "version": "2.0.73",
   "private": false,
   "description": "This is a sdoc editor",
   "main": "dist/index.js",