@seafile/sdoc-editor 2.0.42 → 2.0.44

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

@@ -26,6 +26,7 @@ var _basicSdk = require("../../basic-sdk");
 var _constants2 = require("../../constants");
 var _outlineModule = require("../../android/outline-module");
 var _jsBridge = _interopRequireDefault(require("../../android/js-bridge"));
+var _helpers = require("../extension/plugins/ai/ai-module/helpers");
 const SdocEditor = /*#__PURE__*/(0, _react.forwardRef)((_ref, ref) => {
   let {
     editor: propsEditor,
@@ -118,6 +119,16 @@ const SdocEditor = /*#__PURE__*/(0, _react.forwardRef)((_ref, ref) => {
   (0, _react.useEffect)(() => {
     const eventBus = _basicSdk.EventBus.getInstance();
     eventBus.subscribe(_constants2.EXTERNAL_EVENT.REFRESH_DOCUMENT, onRefreshDocument);
+
+    // Remove aiMarks on special conditions like unexpected exit or refresh page using AI
+    const hasAIMark = !_slate.Editor.nodes(validEditor, {
+      at: [],
+      match: n => _slate.Text.isText(n) && n.sdoc_ai === true
+    }).next().done;
+    if (hasAIMark) {
+      (0, _helpers.removeMarks)(validEditor);
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [onRefreshDocument]);
 
   // The parent component can call the method of this component through ref

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

@@ -0,0 +1,22 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.removeMarks = void 0;
+var _slate = require("@seafile/slate");
+const removeMarks = editor => {
+  const {
+    selection
+  } = editor;
+  _slate.Transforms.unsetNodes(editor, 'sdoc_ai', {
+    at: [],
+    match: n => _slate.Text.isText(n) && n.sdoc_ai === true
+  });
+  if (selection) {
+    _slate.Transforms.select(editor, selection);
+  } else {
+    _slate.Transforms.deselect(editor);
+  }
+};
+exports.removeMarks = removeMarks;

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

@@ -23,6 +23,7 @@ var _tipDialog = _interopRequireDefault(require("./tip-dialog"));
 var _core = require("../../../core");
 var _constants2 = require("../../../constants");
 var _aiIcon = _interopRequireDefault(require("../ai-icon"));
+var _helpers = require("./helpers");
 require("./style.css");
 function AIModule(_ref) {
   let {
@@ -45,8 +46,9 @@ function AIModule(_ref) {
   const [searchResult, setSearchResult] = (0, _react.useState)(null);
   const [currentLang, setCurrentLang] = (0, _react.useState)('en');
   const [isShowTipDialog, setIsShowTipDialog] = (0, _react.useState)(false);
-  const [selectDom, setSelectDom] = (0, _react.useState)(null);
   const toggleAskAI = (0, _react.useCallback)(() => {
+    // Add marks for selection
+    _slate.Editor.addMark(editor, 'sdoc_ai', true);
     scrollRef.current = document.querySelector('.sdoc-scroll-container');
     const {
       scrollTop,
@@ -59,7 +61,6 @@ function AIModule(_ref) {
       }
       const domSelection = window.getSelection();
       const domRange = domSelection.getRangeAt(0);
-      setSelectDom(domRange);
       const rect = domRange.getBoundingClientRect();
       const needPaddingBottomHeight = scrollTop + rect.bottom + _constants.AI_MIN_HEIGHT - scrollHeight;
       if (needPaddingBottomHeight > 0) {
@@ -74,13 +75,17 @@ function AIModule(_ref) {
         });
       }
       setTimeout(() => {
-        var _inputRef$current;
+        var _rect, _inputRef$current;
         const aboveNode = (0, _core.getAboveBlockNode)(editor);
         const slateDom = _slateReact.ReactEditor.toDOMNode(editor, aboveNode[0]);
         const slateRect = slateDom.getBoundingClientRect();
-        const newRect = domRange.getBoundingClientRect();
+        const markedSpan = document.querySelectorAll('span[data-slate-leaf="true"].sdoc_ai');
+        let rect;
+        if (markedSpan.length) {
+          rect = markedSpan[markedSpan.length - 1].getBoundingClientRect();
+        }
         const el = aiRef.current;
-        el.style.top = `${newRect.bottom + 8}px`; // top = Current top + Element height
+        el.style.top = `${((_rect = rect) === null || _rect === void 0 ? void 0 : _rect.bottom) + 8 - 3.23}px`; // top = Current top + Element height - Element padding bottom
         el.style.left = `${slateRect.left}px`;
         el.style.display = 'block';
         setIsShowAIPopover(true);
@@ -118,6 +123,7 @@ function AIModule(_ref) {
     }, 500);
   }, [editor, element]);
   const onCloseClick = (0, _react.useCallback)(() => {
+    (0, _helpers.removeMarks)(editor);
     const element = aiRef.current;
     element.style.display = 'none';
     const articleDom = document.querySelector('.sdoc-editor__article');
@@ -126,7 +132,7 @@ function AIModule(_ref) {
     setSearchResult('');
     setIsShowAIPopover(false);
     closeModule();
-  }, [closeModule]);
+  }, [closeModule, editor]);
   const onDocumentClick = (0, _react.useCallback)(event => {
     // not in ai container
     if (aiRef.current && aiRef.current.contains(event.target) && aiRef.current !== event.target) return;
@@ -161,12 +167,17 @@ function AIModule(_ref) {
   }, [onDocumentClick]);
   const onScroll = (0, _react.useCallback)(event => {
     if (!element) {
-      const newRect = selectDom.getBoundingClientRect();
+      var _rect2;
+      const markedSpan = document.querySelectorAll('span[data-slate-leaf="true"].sdoc_ai');
+      let rect;
+      if (markedSpan.length) {
+        rect = markedSpan[markedSpan.length - 1].getBoundingClientRect();
+      }
       const aboveNode = (0, _core.getAboveBlockNode)(editor);
       const slateDom = _slateReact.ReactEditor.toDOMNode(editor, aboveNode[0]);
       const slateRect = slateDom.getBoundingClientRect();
       const el = aiRef.current;
-      el.style.top = `${newRect.bottom + 8}px`; // top = Current top + Element height
+      el.style.top = `${((_rect2 = rect) === null || _rect2 === void 0 ? void 0 : _rect2.bottom) + 8 - 3.23}px`; // top = Current top + Element height - Element padding bottom
       el.style.left = `${slateRect.left}px`;
       el.style.display = 'block';
     } else {
@@ -177,7 +188,7 @@ function AIModule(_ref) {
       el.style.left = `${slateRect.left}px`;
       el.style.display = 'block';
     }
-  }, [editor, element, selectDom]);
+  }, [editor, element]);
   (0, _react.useEffect)(() => {
     let observerRefValue = null;
     if (isShowAIPopover) {

package/dist/basic-sdk/extension/plugins/seatable-column/render-elem.js

@@ -48,7 +48,7 @@ const Column = _ref => {
         setColumnValue(displayValue);
       });
     }
-  }, [editor, element.data, isLongTextColumn]);
+  }, [editor, element.data, isLongTextColumn, editor.currentRowIdx]);
   const [isClicked, setIsClicked] = (0, _react.useState)(false);
   (0, _react.useEffect)(() => {
     if (isSelected && !isReadOnly) {

package/dist/basic-sdk/extension/plugins/text-style/render-elem.js

@@ -9,8 +9,7 @@ var _react = _interopRequireDefault(require("react"));
 var _caret = _interopRequireDefault(require("./caret"));
 var _constants = require("../../constants");
 var _helpers = require("../font/helpers");
-var _InlineBugFixWrapper = _interopRequireDefault(require("../../commons/Inline-bug-fix-wrapper"));
-const renderText = (props, editor) => {
+const renderText = props => {
   const {
     attributes,
     children,
@@ -35,6 +34,12 @@ const renderText = (props, editor) => {
     style['display'] = 'inline-block';
     style['minWidth'] = '2px';
   }
+
+  // Add temporary marks for selection in AI
+  if (leaf.sdoc_ai && leaf.text.trim()) {
+    style['padding'] = '3.23px 0';
+    style['background'] = '#a9c9ed';
+  }
   if (leaf.computed_background_color) {
     style['backgroundColor'] = leaf.computed_background_color;
   }

package/dist/pages/document-plugin-editor.js

@@ -29,6 +29,7 @@ const DocumentPluginEditor = _ref => {
     tableId,
     columns,
     getColumnCellValue,
+    currentRowIdx,
     tables,
     getTableById,
     collaborators,
@@ -55,12 +56,12 @@ const DocumentPluginEditor = _ref => {
     const {
       cursors
     } = document;
-    newEditor.getColumnCellValue = getColumnCellValue;
 
     // insert column
     newEditor.table_id = tableId;
     newEditor.columns = columns || [];
     newEditor.getColumnCellValue = getColumnCellValue;
+    newEditor.currentRowIdx = currentRowIdx;
 
     // insert table
     newEditor.tables = tables || [];
@@ -87,8 +88,9 @@ const DocumentPluginEditor = _ref => {
   (0, _react.useEffect)(() => {
     validEditor.getColumnCellValue = getColumnCellValue ? getColumnCellValue : null;
     validEditor.getArticleStyle = getArticleStyle;
+    validEditor.currentRowIdx = currentRowIdx;
     forceUpdate();
-  }, [forceUpdate, getColumnCellValue, getArticleStyle, validEditor]);
+  }, [forceUpdate, getColumnCellValue, getArticleStyle, validEditor, currentRowIdx]);
   return /*#__PURE__*/_react.default.createElement(_errorBoundary.default, null, !isReadOnly && /*#__PURE__*/_react.default.createElement(_hooks.PluginsProvider, {
     plugins: [],
     showComment: false

package/package.json

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

package/public/locales/zh_CN/sdoc-editor.json

@@ -623,5 +623,6 @@
   "Insert_chart": "插入图表",
   "Edit_chart": "编辑图表",
   "Please_complete_the_chart_configuration_first": "请先完成图表配置",
+  "chart": "图表",
   "Image_is_upload_error": "图片上传失败，请删除后重新尝试"
 }