@seafile/sdoc-editor 0.4.34 → 0.4.35

package/dist/api/seafile-api.js

@@ -117,6 +117,10 @@ class SeafileAPI {
     const url = 'api/v2.1/seadoc/query-copy-move-progress/' + docUuid + '/?&doc_uuid=' + docUuid + '&task_id=' + taskId;
     return this.req.get(url);
   }
+  searchSdocFiles(docUuid, query, page, per_page) {
+    const url = 'api/v2.1/seadoc/search-filename/' + docUuid + '/?query=' + query + '&page=' + page + '&per_page=' + per_page;
+    return this.req.get(url);
+  }
 
   // participants
   listParticipants(docUuid) {

package/dist/basic-sdk/extension/commons/history-files/index.css

@@ -14,6 +14,7 @@
   padding: 0px;
   color: #212529;
   font-size: 14px;
+  text-decoration: underline;
 }
 
 .sdoc-history-files-wrapper .sdoc-history-files-content .sdoc-history-files-header {
@@ -31,6 +32,10 @@
   overflow-y: scroll;
 }
 
+.sdoc-history-files-wrapper .sdoc-history-files-content .no-header {
+  margin-top: 8px;
+}
+
 .sdoc-history-files-wrapper .sdoc-history-files-content .sdoc-history-files .sdoc-history-files-item {
   font-size: 14px;
   line-height: 32px;

package/dist/basic-sdk/extension/commons/history-files/index.js

@@ -3,9 +3,13 @@ import React, { useCallback, useEffect, useState, useRef } from 'react';
 import { Editor } from '@seafile/slate';
 import { ReactEditor } from '@seafile/slate-react';
 import { withTranslation } from 'react-i18next';
+import classNames from 'classnames';
+import debounce from 'lodash.debounce';
+import toaster from '../../../../components/toast';
 import EventBus from '../../../utils/event-bus';
+import context from '../../../../context';
 import { insertSdocFileLink } from '../../plugins/sdoc-link/helpers';
-import { LocalStorage } from '../../../../utils';
+import { LocalStorage, isEnglish } from '../../../../utils';
 import { INTERNAL_EVENT } from '../../../constants';
 import { EXTERNAL_EVENT } from '../../../../constants';
 import { SDOC_LINK } from '../../constants';
@@ -54,6 +58,13 @@ const HistoryFiles = _ref => {
     const files = LocalStorage.getItem('sdoc-recent-files') || [];
     setFiles(files);
   }, []);
+  const onInsertLink = useCallback(params => {
+    const {
+      insertSdocFileLinkCallback
+    } = insertLinkCallback;
+    insertSdocFileLinkCallback(editor, params.data.obj_name, params.data.doc_uuid);
+    closeDialog();
+  }, [closeDialog, editor, insertLinkCallback]);
   useEffect(() => {
     getPosition();
     getHistoryFiles();
@@ -62,41 +73,73 @@ const HistoryFiles = _ref => {
     }, 0);
     const sdocScrollContainer = document.getElementById('sdoc-scroll-container');
     sdocScrollContainer.addEventListener('scroll', onScroll);
+    const eventBus = EventBus.getInstance();
+    const unsubscribeInsertLink = eventBus.subscribe(EXTERNAL_EVENT.INSERT_LINK, onInsertLink);
     document.addEventListener('click', onClick);
     return () => {
       sdocScrollContainer.removeEventListener('scroll', onScroll);
+      unsubscribeInsertLink();
       document.removeEventListener('click', onClick);
     };
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
-  const onSearch = useCallback(e => {
-    let newFiles = LocalStorage.getItem('sdoc-recent-files') || [];
-    if (e.target.value) {
-      newFiles = newFiles.filter(item => item.file_name.includes(e.target.value));
-      if (newFiles.length === 0) {
-        setHeader(t('The_document_does_not_exist'));
-        setNewFileName(e.target.value);
-      } else {
-        setHeader(t('Recent_previews'));
-        setNewFileName('');
-      }
-      setFiles(newFiles);
+  const onCompositionStart = e => {
+    e.stopPropagation();
+    historyFilesInputRef.current.typing = true;
+  };
+  const onCompositionEnd = e => {
+    e.stopPropagation();
+    historyFilesInputRef.current.typing = false;
+    onSearch(e);
+  };
+  const onSearch = useCallback(async e => {
+    // Ignore when entering Chinese
+    if (historyFilesInputRef.current.typing) return;
+
+    // Show history files when search is empty
+    if (e.target.value.trim().length === 0) {
+      setHeader(t('Recent_previews'));
+      setNewFileName('');
+      getHistoryFiles();
       return;
     }
-    setHeader(t('Recent_previews'));
-    setNewFileName('');
-    setFiles(newFiles);
+
+    // Cannot be found if the search is less than three characters.
+    if (isEnglish(e.target.value.trim()) && e.target.value.length < 3) {
+      setFiles([]);
+      setHeader(t('The_document_does_not_exist'));
+      setNewFileName(e.target.value);
+      return;
+    }
+    try {
+      var _res$data;
+      const res = await context.searchSdocFiles(e.target.value, 1, 10);
+      if (res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.results) {
+        let newFiles = res.data.results;
+        if (newFiles.length === 0) {
+          setHeader(t('The_document_does_not_exist'));
+          setNewFileName(e.target.value);
+        } else {
+          setHeader('');
+          setNewFileName('');
+        }
+        setFiles(newFiles);
+        return;
+      }
+    } catch (error) {
+      toaster.danger(error.message);
+    }
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
   const onSelect = useCallback(fileInfo => {
     const {
-      file_uuid,
-      file_name
+      doc_uuid,
+      name
     } = fileInfo;
     const {
       insertSdocFileLinkCallback
     } = insertLinkCallback;
-    insertSdocFileLinkCallback(editor, file_name, file_uuid);
+    insertSdocFileLinkCallback(editor, name, doc_uuid);
     closeDialog();
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
@@ -112,8 +155,7 @@ const HistoryFiles = _ref => {
     eventBus.dispatch(EXTERNAL_EVENT.CREATE_SDOC_FILE, {
       newFileName: newFileName.trim()
     });
-    closeDialog();
-  }, [closeDialog, newFileName]);
+  }, [newFileName]);
   return /*#__PURE__*/React.createElement("div", {
     ref: historyFilesRef,
     className: "sdoc-history-files-wrapper popover",
@@ -123,26 +165,27 @@ const HistoryFiles = _ref => {
     className: "sdoc-history-files-search-input",
     ref: historyFilesInputRef,
     autoComplete: "off",
-    onChange: onSearch,
-    onCompositionStart: e => {
-      e.stopPropagation();
-    }
+    onChange: debounce(onSearch, 200),
+    onCompositionStart: onCompositionStart,
+    onCompositionEnd: onCompositionEnd
   }), /*#__PURE__*/React.createElement("div", {
     className: "sdoc-history-files-content"
-  }, /*#__PURE__*/React.createElement("div", {
+  }, header.length !== 0 && /*#__PURE__*/React.createElement("div", {
     className: "sdoc-history-files-header"
   }, header), /*#__PURE__*/React.createElement("div", {
-    className: "sdoc-history-files"
+    className: classNames('sdoc-history-files', {
+      'no-header': header.length === 0
+    })
   }, files.map(item => {
     return /*#__PURE__*/React.createElement("div", {
-      key: item.file_uuid,
+      key: item.doc_uuid,
       className: "sdoc-history-files-item",
       onClick: () => {
         onSelect(item);
       }
     }, /*#__PURE__*/React.createElement("i", {
       className: "sdocfont sdoc-document"
-    }), /*#__PURE__*/React.createElement("span", null, item.file_name));
+    }), /*#__PURE__*/React.createElement("span", null, item.name));
   }), /*#__PURE__*/React.createElement("div", {
     className: "sdoc-history-files-item",
     onClick: onShowMore

package/dist/basic-sdk/extension/commons/select-file-dialog/local-files/index.css

@@ -25,6 +25,8 @@
 }
 
 .sdoc-files-tree .sdoc-file-info .sdoc-file-icon-container {
+  display: flex;
+  align-items: center;
   width: 2.8rem;
   height: 100%;
   padding-left: 1.5rem;

package/dist/basic-sdk/extension/plugins/code-block/helpers.js

@@ -125,7 +125,8 @@ export const changeToPlainText = editor => {
 };
 export const setClipboardCodeBlockData = value => {
   // Insert text into the clipboard for use on other pages
-  const text = value.children.map(line => Node.string(line)).join('\n');
+  // Empty string cannot apply in `copy`
+  const text = value.children.map(line => Node.string(line)).join('\n') || ' ';
   copy(text, {
     format: 'text/plain',
     onCopy: data => {

package/dist/basic-sdk/extension/plugins/table/helpers.js

@@ -1512,4 +1512,25 @@ export const getHighlightClass = (editor, cellPath) => {
   const rowIndex = cellPath[cellPath.length - 2];
   const className = getCellHighlightClassName(alternate_highlight_color, rowIndex);
   return className;
+};
+
+// Correct the selected range when combined cell are selected
+export const adjustCombinedCellRange = (table, range) => {
+  const {
+    minRowIndex,
+    maxRowIndex,
+    minColIndex,
+    maxColIndex
+  } = range;
+  const firstCell = table.children[minRowIndex].children[minColIndex];
+  const {
+    colspan = 0,
+    rowspan = 0
+  } = firstCell;
+  if (rowspan > 1 || colspan > 1) {
+    const isRowCombined = minRowIndex + rowspan === maxRowIndex + 1;
+    const isColCombined = minColIndex + colspan === maxColIndex + 1;
+    if (isRowCombined && isColCombined) return EMPTY_SELECTED_RANGE;
+  }
+  return range;
 };

package/dist/basic-sdk/extension/plugins/table/render/index.js

@@ -2,13 +2,13 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import React, { useRef, useState, useEffect, useCallback } from 'react';
 import classnames from 'classnames';
 import throttle from 'lodash.throttle';
-import { useSelected, useSlateStatic, useReadOnly } from '@seafile/slate-react';
+import { useSelected, useSlateStatic, useReadOnly, ReactEditor } from '@seafile/slate-react';
 import { Transforms, Editor } from '@seafile/slate';
 import { EMPTY_SELECTED_RANGE } from '../constants';
 import { ResizeHandlersContext, TableSelectedRangeContext, SettingSelectRangeContext } from './hooks';
 import EventBus from '../../../../utils/event-bus';
 import { INTERNAL_EVENT } from '../../../../constants';
-import { getTableColumns, setTableSelectedRange, getFirstTableCell, getRowHeight } from '../helpers';
+import { getTableColumns, setTableSelectedRange, getFirstTableCell, getRowHeight, adjustCombinedCellRange } from '../helpers';
 import ObjectUtils from '../../../../utils/object-utils';
 import ResizeHandlers from './resize-handlers';
 import { registerResizeEvents, unregisterResizeEvents } from '../../../../utils/mouse-event';
@@ -102,12 +102,14 @@ const Table = _ref => {
         const cellData = tableCell.style.gridArea.split(' / ');
         const endRowSpan = Number(cellData[2].split(' ')[1]);
         const endColSpan = Number(cellData[3].split(' ')[1]);
-        const newSelectedRange = {
+        const tableSlateNode = ReactEditor.toSlateNode(editor, table.current);
+        let newSelectedRange = {
           minRowIndex: Math.min(startRowIndex, endRowIndex),
           maxRowIndex: startRowIndex < endRowIndex ? endRowIndex + endRowSpan - 1 : startRowIndex + startRowSpan - 1,
           minColIndex: Math.min(startColIndex, endColIndex),
           maxColIndex: startColIndex < endColIndex ? endColIndex + endColSpan - 1 : startColIndex + startColSpan - 1
         };
+        newSelectedRange = adjustCombinedCellRange(tableSlateNode, newSelectedRange);
         if (!ObjectUtils.isSameObject(selectedRange, EMPTY_SELECTED_RANGE)) {
           event.preventDefault();
           Editor.withoutNormalizing(editor, () => {

package/dist/basic-sdk/extension/toolbar/side-toolbar/transform-menus.js

@@ -3,7 +3,7 @@ import { UncontrolledPopover } from 'reactstrap';
 import { withTranslation } from 'react-i18next';
 import { ReactEditor, useSlateStatic } from '@seafile/slate-react';
 import { onSetNodeType } from './helpers';
-import { SIDE_TRANSFORM_MENUS_CONFIG, LIST_ITEM_SUPPORTED_TRANSFORMATION, LIST_ITEM_CORRELATION_TYPE, BLOCKQUOTE, CALL_OUT } from '../../constants';
+import { SIDE_TRANSFORM_MENUS_CONFIG, LIST_ITEM_SUPPORTED_TRANSFORMATION, LIST_ITEM_CORRELATION_TYPE, BLOCKQUOTE, CALL_OUT, HEADERS } from '../../constants';
 import DropdownMenuItem from '../../commons/dropdown-menu-item';
 const TransformMenus = _ref => {
   let {
@@ -24,11 +24,18 @@ const TransformMenus = _ref => {
       newSideMenusConfig = SIDE_TRANSFORM_MENUS_CONFIG.filter(item => LIST_ITEM_SUPPORTED_TRANSFORMATION.includes(item.type));
     }
     const path = ReactEditor.findPath(editor, slateNode);
-    if (path && path.length > 1) {
+    if (path) {
       const nodeIndex = path[0];
       const highestNode = editor.children[nodeIndex];
-      if (highestNode.type === BLOCKQUOTE) {
-        newSideMenusConfig = SIDE_TRANSFORM_MENUS_CONFIG.filter(item => item.type !== CALL_OUT);
+      if (path.length > 1) {
+        if (highestNode.type === BLOCKQUOTE) {
+          newSideMenusConfig = SIDE_TRANSFORM_MENUS_CONFIG.filter(item => item.type !== CALL_OUT);
+        }
+      }
+
+      // headers can't be nested by quote block
+      if (HEADERS.includes(highestNode.type)) {
+        newSideMenusConfig = SIDE_TRANSFORM_MENUS_CONFIG.filter(item => item.type !== BLOCKQUOTE);
       }
     }
     return newSideMenusConfig;

package/dist/constants/index.js

@@ -17,7 +17,8 @@ export const EXTERNAL_EVENT = {
   NEW_NOTIFICATION: 'new_notification',
   PARTICIPANT_ADDED: 'participant-added',
   PARTICIPANT_REMOVED: 'participant-removed',
-  CREATE_SDOC_FILE: 'create_sdoc_file'
+  CREATE_SDOC_FILE: 'create_sdoc_file',
+  INSERT_LINK: 'insert_link'
 };
 export const TIP_TYPE = {
   DELETE_NO_CHANGES_REVISION: 'delete_no_changes_revision',

package/dist/context.js

@@ -204,6 +204,10 @@ class Context {
     const docUuid = this.getSetting('docUuid');
     return this.api.getCopyMoveProgressView(docUuid, taskId);
   }
+  searchSdocFiles(query, page, per_page) {
+    const docUuid = this.getSetting('docUuid');
+    return this.api.searchSdocFiles(docUuid, query, page, per_page);
+  }
 
   // participants
   listParticipants() {

package/dist/layout/layout.js

@@ -2,12 +2,38 @@ import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutPr
 const _excluded = ["children", "className"];
 import React, { useEffect } from 'react';
 import classnames from 'classnames';
+import context from '../context';
+import { LocalStorage } from '../utils';
 const Layout = _ref => {
   let {
       children,
       className
     } = _ref,
     restProps = _objectWithoutProperties(_ref, _excluded);
+  const cacheHistoryfiles = () => {
+    const docUuid = context.getSetting('docUuid');
+    const docName = context.getSetting('docName');
+    const rencentFiles = LocalStorage.getItem('sdoc-recent-files', []);
+    let arr = [];
+    const newFile = {
+      doc_uuid: docUuid,
+      name: docName
+    };
+    if (rencentFiles.length > 0) {
+      const isExist = rencentFiles.find(item => item.doc_uuid === docUuid);
+      if (isExist) return;
+      if (!isExist) {
+        let newRencentFiles = rencentFiles.slice(0);
+        if (rencentFiles.length === 10) {
+          newRencentFiles.shift();
+        }
+        arr = [newFile, ...newRencentFiles];
+      }
+    } else {
+      arr.push(newFile);
+    }
+    LocalStorage.setItem('sdoc-recent-files', arr);
+  };
   useEffect(() => {
     setTimeout(() => {
       const url = window.location.href;
@@ -17,6 +43,7 @@ const Layout = _ref => {
         element && element.scrollIntoView(true);
       }
     }, 500);
+    cacheHistoryfiles();
   }, []);
   return /*#__PURE__*/React.createElement("div", Object.assign({
     className: classnames('sdoc-editor-page-wrapper', className)

package/dist/utils/index.js

@@ -109,4 +109,11 @@ export const getSelectionCoords = () => {
     y: y
   };
 };
+export const isEnglish = str => {
+  const pattern = new RegExp('[A-Za-z]+');
+  if (pattern.test(str)) {
+    return true;
+  }
+  return false;
+};
 export { DateUtils, LocalStorage, getEventTransfer, Hotkey };

package/package.json

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