@seafile/sdoc-editor 2.0.38-alph-0.0.1 → 2.0.38-alph-1.1.0

package/dist/basic-sdk/constants/index.js

@@ -17,7 +17,7 @@ Object.defineProperty(exports, "PLUGIN_DISPLAY_TYPE", {
     return _plugin.PLUGIN_DISPLAY_TYPE;
   }
 });
-exports.Z_INDEX = exports.WIKI_OUTLINE = exports.WIKI_EDITOR_EDIT_AREA_WIDTH = exports.WIKI_EDITOR = exports.SDOC_STORAGE = exports.REVISION_DIFF_VALUE = exports.REVISION_DIFF_KEY = exports.REBASE_TYPES = exports.REBASE_TYPE = exports.REBASE_ORIGIN = exports.REBASE_MARK_KEY = exports.REBASE_MARKS = void 0;
+exports.Z_INDEX = exports.WIKI_OUTLINE = exports.WIKI_EDITOR = exports.SDOC_STORAGE = exports.REVISION_DIFF_VALUE = exports.REVISION_DIFF_KEY = exports.REBASE_TYPES = exports.REBASE_TYPE = exports.REBASE_ORIGIN = exports.REBASE_MARK_KEY = exports.REBASE_MARKS = void 0;
 var Z_INDEX = _interopRequireWildcard(require("./z-index"));
 exports.Z_INDEX = Z_INDEX;
 var _plugin = require("./plugin");
@@ -55,7 +55,6 @@ const REVISION_DIFF_KEY = exports.REVISION_DIFF_KEY = 'diff';
 const REVISION_DIFF_VALUE = exports.REVISION_DIFF_VALUE = '1';
 const PAGE_EDIT_AREA_WIDTH = exports.PAGE_EDIT_AREA_WIDTH = 672; // 672 = 794 - 2[borderLeft + borderRight] - 120[paddingLeft + paddingRight]
 const COMMENT_EDITOR_EDIT_AREA_WIDTH = exports.COMMENT_EDITOR_EDIT_AREA_WIDTH = 364;
-const WIKI_EDITOR_EDIT_AREA_WIDTH = exports.WIKI_EDITOR_EDIT_AREA_WIDTH = 714;
 const COMMENT_EDITOR = exports.COMMENT_EDITOR = 'comment_editor';
 const WIKI_EDITOR = exports.WIKI_EDITOR = 'wiki_editor';
 const DOCUMENT_PLUGIN_EDITOR = exports.DOCUMENT_PLUGIN_EDITOR = 'document_plugin_editor';

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

@@ -25,6 +25,7 @@ var _highlight = require("../highlight");
 var _constants2 = require("../extension/constants");
 var _helpers = require("../extension/plugins/table/helpers");
 var _useForceUpdate = _interopRequireDefault(require("../../basic-sdk/hooks/use-force-update"));
+var _helpers2 = require("../extension/plugins/ai/ai-module/helpers");
 const EditableArticle = _ref => {
   let {
     showComment = true,

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,
@@ -60,6 +61,7 @@ const SdocEditor = /*#__PURE__*/(0, _react.forwardRef)((_ref, ref) => {
     setSlateValue(document.elements);
   }, [document.elements]);
   (0, _react.useEffect)(() => {
+    console.log(22);
     validEditor.readonly = false;
     return () => {
       validEditor.selection = null;
@@ -116,8 +118,18 @@ const SdocEditor = /*#__PURE__*/(0, _react.forwardRef)((_ref, ref) => {
 
   // useMount: refresh document
   (0, _react.useEffect)(() => {
+    console.log(44343);
     const eventBus = _basicSdk.EventBus.getInstance();
     eventBus.subscribe(_constants2.EXTERNAL_EVENT.REFRESH_DOCUMENT, onRefreshDocument);
+    const hasAIMark = !_slate.Editor.nodes(validEditor, {
+      at: [],
+      match: n => _slate.Text.isText(n) && n.isSelectedInAI === true
+    }).next().done;
+    if (hasAIMark) {
+      console.log(999);
+      (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
@@ -190,6 +202,7 @@ const SdocEditor = /*#__PURE__*/(0, _react.forwardRef)((_ref, ref) => {
     }))));
   }
   const isShowComment = typeof showComment === 'boolean' ? showComment : true;
+  console.log(2, validEditor, slateValue, onValueChange, isShowComment);
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_layout.EditorContainer, {
     editor: validEditor
   }, /*#__PURE__*/_react.default.createElement(_useColorContext.ColorProvider, null, isShowHeaderToolbar && /*#__PURE__*/_react.default.createElement(_extension.HeaderToolbar, {

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

@@ -47,7 +47,7 @@ const WikiEditor = /*#__PURE__*/(0, _react.forwardRef)((_ref, ref) => {
       cursors
     } = document;
     newEditor.cursors = cursors || {};
-    newEditor.width = _constants.WIKI_EDITOR_EDIT_AREA_WIDTH; // default width
+    newEditor.width = _constants.PAGE_EDIT_AREA_WIDTH; // default width
     return newEditor;
 
     // eslint-disable-next-line react-hooks/exhaustive-deps

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, 'isSelectedInAI', {
+    at: [],
+    match: n => _slate.Text.isText(n) && n.isSelectedInAI === 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, 'isSelectedInAI', 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"].isSelectedInAI');
+        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"].isSelectedInAI');
+      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/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.isSelectedInAI && leaf.text.trim()) {
+    style['padding'] = '3.23px 0';
+    style['background'] = '#a9c9ed';
+  }
   if (leaf.computed_background_color) {
     style['backgroundColor'] = leaf.computed_background_color;
   }

package/dist/basic-sdk/extension/toolbar/side-toolbar/helpers.js

@@ -63,20 +63,22 @@ const onSetNodeType = (editor, element, type) => {
       // Callout, List-item, Blockquote in multi_column
       if ([_constants.CALL_OUT].includes(currentNodeInColumn.type)) {
         (0, _helper.unwrapCallout)(editor);
+        return;
       }
       if ([_constants.ORDERED_LIST, _constants.UNORDERED_LIST].includes(currentNodeInColumn.type)) {
         (0, _transforms.toggleList)(editor, currentNodeInColumn.type);
         if ([..._constants.HEADERS].includes(type)) {
           (0, _helpers5.setHeaderType)(editor, type);
         }
+        return;
       }
       if ([_constants.BLOCKQUOTE].includes(currentNodeInColumn.type)) {
         if ([..._constants.HEADERS].includes(type)) {
           (0, _helpers5.setHeaderType)(editor, type);
         }
         (0, _helpers4.setBlockQuoteType)(editor, true);
+        return;
       }
-      return;
     } else {
       // List-item, blockquote, callout is top node
       if ([_constants.ORDERED_LIST, _constants.UNORDERED_LIST].includes(topNodeType)) {
@@ -84,17 +86,19 @@ const onSetNodeType = (editor, element, type) => {
         if ([..._constants.HEADERS].includes(type)) {
           (0, _helpers5.setHeaderType)(editor, type);
         }
+        return;
       }
       if ([_constants.BLOCKQUOTE].includes(topNodeType)) {
         if ([..._constants.HEADERS].includes(type)) {
           (0, _helpers5.setHeaderType)(editor, type);
         }
         (0, _helpers4.setBlockQuoteType)(editor, true);
+        return;
       }
       if ([_constants.CALL_OUT].includes(topNodeType)) {
         (0, _helper.unwrapCallout)(editor);
+        return;
       }
-      return;
     }
   }
   if (type === _constants.CHECK_LIST_ITEM) {

package/dist/basic-sdk/layout/article-container.js

@@ -13,6 +13,8 @@ var _localStorageUtils = _interopRequireDefault(require("../../utils/local-stora
 var _fullWidthMode = require("../utils/full-width-mode");
 var _defaultMode = require("../utils/default-mode");
 var _constants = require("../constants");
+var _slate = require("@seafile/slate");
+var _helpers = require("../extension/plugins/ai/ai-module/helpers");
 function ArticleContainer(_ref) {
   let {
     editor,
@@ -25,6 +27,19 @@ function ArticleContainer(_ref) {
     editor.width = articleRef.current.children[0].clientWidth;
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
+
+  // useEffect(() => {
+  //   const hasAIMark = !Editor.nodes(editor, {
+  //     at: [],
+  //     match: n => Text.isText(n) && n.isSelectedInAI === true,
+  //   }).next().done;
+
+  //   if (hasAIMark) {
+  //     removeMarks(editor);
+  //   }
+  // // eslint-disable-next-line react-hooks/exhaustive-deps
+  // }, []);
+
   const handleWindowResize = (0, _react.useCallback)(function () {
     let {
       scrollIntoArticle = false,

package/dist/pages/sdoc-wiki-editor.js

@@ -42,7 +42,7 @@ const SdocWikiEditor = _ref => {
       cursors
     } = document;
     newEditor.cursors = cursors || {};
-    newEditor.width = _constants.WIKI_EDITOR_EDIT_AREA_WIDTH; // default width
+    newEditor.width = _constants.PAGE_EDIT_AREA_WIDTH; // default width
     newEditor.editorType = _constants.WIKI_EDITOR;
     return newEditor;
 

package/package.json

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