@seafile/sdoc-editor 2.0.38-alph-0.0.1 → 2.0.38-alph-1.0.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

@@ -42,9 +42,12 @@ const EditableArticle = _ref => {
   // eslint-disable-next-line react-hooks/exhaustive-deps
   const eventProxy = (0, _react.useMemo)(() => new _eventHandler.default(editor), []);
   const onMouseDown = (0, _react.useCallback)(event => {
+    // console.log(44);
     if (event.button === 0) {
+      // console.log(444)
       const isPreventReset = (0, _helpers.isPreventResetTableSelectedRange)(event);
       if (!isPreventReset) {
+        // console.log(5)
         editor.reSetTableSelectedRange();
         const eventBus = _eventBus.default.getInstance();
         eventBus.dispatch(_constants.INTERNAL_EVENT.CANCEL_TABLE_SELECT_RANGE);

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/commons/menu/menu-item.js

@@ -29,6 +29,7 @@ const MenuItem = _ref => {
   } = (0, _reactI18next.useTranslation)('sdoc-editor');
   const onClick = (0, _react.useCallback)(event => {
     if (disabled) return;
+    console.log(3, type);
     onMouseDown(event, type);
 
     // eslint-disable-next-line react-hooks/exhaustive-deps

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

@@ -0,0 +1 @@
+"use strict";

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

@@ -24,6 +24,8 @@ var _core = require("../../../core");
 var _constants2 = require("../../../constants");
 var _aiIcon = _interopRequireDefault(require("../ai-icon"));
 require("./style.css");
+// import { highlightSelection } from './helpers';
+
 function AIModule(_ref) {
   let {
     editor,
@@ -46,13 +48,20 @@ function AIModule(_ref) {
   const [currentLang, setCurrentLang] = (0, _react.useState)('en');
   const [isShowTipDialog, setIsShowTipDialog] = (0, _react.useState)(false);
   const [selectDom, setSelectDom] = (0, _react.useState)(null);
+  // const [highlightedSpan, setHighlightedSpan] = useState(null);
+  console.log(2, element);
   const toggleAskAI = (0, _react.useCallback)(() => {
+    // const selectionBeforeMark = editor.selection;
+    console.log(0);
+    _slate.Editor.addMark(editor, 'isSelectedInAI', true);
+    console.log(1, editor.selection);
     scrollRef.current = document.querySelector('.sdoc-scroll-container');
     const {
       scrollTop,
       scrollHeight
     } = scrollRef.current;
     if (!element) {
+      console.log(44444);
       const content = window.getSelection().toString();
       if (content) {
         setSelectedValue(content);
@@ -74,15 +83,25 @@ function AIModule(_ref) {
         });
       }
       setTimeout(() => {
-        var _inputRef$current;
+        var _rect, _inputRef$current;
         const aboveNode = (0, _core.getAboveBlockNode)(editor);
+        // console.log(1, aboveNode)
         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');
+        console.log(3, markedSpan);
+        let rect;
+        if (markedSpan.length) {
+          rect = markedSpan[markedSpan.length - 1].getBoundingClientRect();
+          console.log(4, rect, markedSpan);
+        }
+        // const newRect = domRange.getBoundingClientRect();
         const el = aiRef.current;
-        el.style.top = `${newRect.bottom + 8}px`; // top = Current top + Element height
+        // el.style.top = `${newRect.bottom + 8}px`;
+        el.style.top = `${((_rect = rect) === null || _rect === void 0 ? void 0 : _rect.bottom) + 8 - 3}px`; // top = Current top + Element height
         el.style.left = `${slateRect.left}px`;
         el.style.display = 'block';
+        console.log(2, slateDom, slateRect, el, el.style.top);
         setIsShowAIPopover(true);
         (_inputRef$current = inputRef.current) === null || _inputRef$current === void 0 ? void 0 : _inputRef$current.focus();
       }, 500);
@@ -90,6 +109,7 @@ function AIModule(_ref) {
     }
     const slateDom = _slateReact.ReactEditor.toDOMNode(editor, element);
     const slateRect = slateDom.getBoundingClientRect();
+    console.log(555);
     const content = _slate.Node.string(element);
     if (content) {
       setSelectedValue(content);
@@ -120,13 +140,28 @@ function AIModule(_ref) {
   const onCloseClick = (0, _react.useCallback)(() => {
     const element = aiRef.current;
     element.style.display = 'none';
+    console.log(2, element);
+    const markedSpan = document.querySelectorAll('span[data-slate-leaf="true"].isSelectedInAI');
+    if (markedSpan.length) {
+      console.log(1, markedSpan);
+      markedSpan.forEach(dom => {
+        dom.style.removeProperty('padding');
+        dom.style.removeProperty('background');
+        dom.classList.remove('isSelectedInAI');
+      });
+      console.log('Before remove:', _slate.Editor.marks(editor));
+      _slate.Editor.removeMark(editor, 'isSelectedInAI');
+      console.log('after remove:', _slate.Editor.marks(editor));
+      // ReactEditor.focus(editor);
+      console.log(99);
+    }
     const articleDom = document.querySelector('.sdoc-editor__article');
     articleDom.style.removeProperty('padding-bottom');
     setSearchValue('');
     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 +196,19 @@ function AIModule(_ref) {
   }, [onDocumentClick]);
   const onScroll = (0, _react.useCallback)(event => {
     if (!element) {
+      var _rect2;
+      const markedSpan = document.querySelectorAll('span[data-slate-leaf="true"].isSelectedInAI');
+      let rect;
+      if (markedSpan.length) {
+        rect = markedSpan[markedSpan.length - 1].getBoundingClientRect();
+      }
       const newRect = selectDom.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}px`;
+      // el.style.top = `${newRect.bottom + 8 - 3}px`; // top = Current top + Element height
       el.style.left = `${slateRect.left}px`;
       el.style.display = 'block';
     } else {

package/dist/basic-sdk/extension/plugins/text-style/menu/index.js

@@ -61,6 +61,7 @@ const TextStyleMenuList = _ref => {
     });
   }, [editor]);
   const onMouseDown = (0, _react.useCallback)((event, type) => {
+    console.log(2, type);
     event.preventDefault();
     event.stopPropagation();
     if (isDisabled()) return;
@@ -76,12 +77,14 @@ const TextStyleMenuList = _ref => {
     if (active) {
       (0, _helpers2.removeMark)(editor, type);
     } else {
+      console.log(3, type);
       (0, _helpers2.addMark)(editor, type);
     }
     (0, _core.focusEditor)(editor);
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [editor]);
   const setColor = (0, _react.useCallback)((type, color) => {
+    // console.log(1, type, color);
     _slate.Editor.addMark(editor, type, color);
     (0, _core.focusEditor)(editor);
 
@@ -132,6 +135,7 @@ const TextStyleMenuList = _ref => {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [editor, lastUsedFontColor, lastUsedHighlightColor, readonly]);
   let list = getTextStyleList(_constants.TEXT_STYLE);
+  // console.log(3, list);
   const dropdownList = getTextStyleList(_constants.TEXT_STYLE_MORE);
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, list.map((itemProps, index) => {
     const Component = itemProps.isColor ? _commons.ColorMenu : _commons.MenuItem;

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

@@ -1,11 +1,12 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _react = _interopRequireDefault(require("react"));
+var _react = _interopRequireWildcard(require("react"));
 var _caret = _interopRequireDefault(require("./caret"));
 var _constants = require("../../constants");
 var _helpers = require("../font/helpers");
@@ -20,6 +21,24 @@ const renderText = (props, editor) => {
     text,
     ...rest
   } = leaf;
+  console.log(1, leaf);
+
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  // useEffect(() => {
+  //   if (leaf.isSelectedInAI) {
+  //     console.log('origin');
+  //     const markedSpan = document.querySelectorAll('span[data-slate-leaf="true"].isSelectedInAI');
+  //     if (markedSpan.length) {
+  //       console.log(1, markedSpan);
+  //       markedSpan.forEach((dom) => {
+  //         dom.style.removeProperty('padding');
+  //         dom.style.removeProperty('background');
+  //         dom.classList.remove('isSelectedInAI');
+  //       });
+  //     }
+  //   }
+  // }, []);
+
   let markedChildren = /*#__PURE__*/_react.default.cloneElement(children);
   let style = {};
   // The following is a workaround for a Chromium bug where,
@@ -35,6 +54,10 @@ const renderText = (props, editor) => {
     style['display'] = 'inline-block';
     style['minWidth'] = '2px';
   }
+  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/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.0.0",
   "private": false,
   "description": "This is a sdoc editor",
   "main": "dist/index.js",