@seafile/sdoc-editor 0.2.31 → 0.3.1

package/dist/basic-sdk/comment/components/elements-comment-count/element-comment-count.js

@@ -6,6 +6,7 @@ import { getNodeById, focusEditor, findPath } from '../../../extension/core';
 import { useScrollContext } from '../../../hooks/use-scroll-context';
 import { getElementCommentCountTop } from '../../helper';
 import { eventStopPropagation } from '../../../utils/mouse-event';
+import { ELEMENT_TYPE } from '../../../extension/constants';
 var ElementCommentCount = function ElementCommentCount(_ref) {
   var elementId = _ref.elementId,
     commentsCount = _ref.commentsCount;
@@ -20,8 +21,9 @@ var ElementCommentCount = function ElementCommentCount(_ref) {
     eventStopPropagation(event);
     var path = findPath(editor, element);
     var endOfFirstNode = Editor.end(editor, path);
+    var startOfFirstNode = Editor.start(editor, path);
     var range = {
-      anchor: endOfFirstNode,
+      anchor: [ELEMENT_TYPE.LIST_ITEM, ELEMENT_TYPE.ORDERED_LIST, ELEMENT_TYPE.UNORDERED_LIST].includes(element.type) ? startOfFirstNode : endOfFirstNode,
       focus: endOfFirstNode
     };
     focusEditor(editor, range);

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

@@ -11,6 +11,8 @@ export var INTERNAL_EVENT = {
   COMMENT_LIST_CLICK: 'comment_list_click',
   UNSEEN_NOTIFICATIONS_COUNT: 'unseen_notifications_count'
 };
+export var REVISION_DIFF_KEY = 'diff';
+export var REVISION_DIFF_VALUE = '1';
 export var PAGE_EDIT_AREA_WIDTH = 672; // 672 = 794 - 2[borderLeft + borderRight] - 120[paddingLeft + paddingRight]
 
 export var MODIFY_TYPE = {

package/dist/basic-sdk/extension/commons/insert-element-dialog/index.js

@@ -47,7 +47,6 @@ var InsertElementDialog = function InsertElementDialog(_ref) {
     return function () {
       toggleDialogSubscribe();
     };
-
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
   var toggleDialog = useCallback(function (_ref2) {

package/dist/basic-sdk/extension/plugins/file-link/helpers.js

@@ -50,7 +50,6 @@ export var getType = function getType(editor) {
 };
 export var insertFileLink = function insertFileLink(editor, text, uuid) {
   if (isMenuDisabled(editor)) return;
-
   // Selection folded or not
   var selection = editor.selection;
   if (selection == null) return;

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

@@ -80,4 +80,26 @@ export var getListType = function getListType(editor, type) {
 };
 export var setListType = function setListType(editor, type) {
   toggleList(editor, type);
+};
+export var getBeforeText = function getBeforeText(editor) {
+  var selection = editor.selection;
+  if (selection == null) return {
+    beforeText: '',
+    range: null
+  };
+  var anchor = selection.anchor;
+  // Find the near text node above the current text
+  var _Editor$above = Editor.above(editor),
+    _Editor$above2 = _slicedToArray(_Editor$above, 2),
+    aboveNodePath = _Editor$above2[1];
+  var aboveNodeStartPoint = Editor.start(editor, aboveNodePath); // The starting position of the text node
+  var range = {
+    anchor: anchor,
+    focus: aboveNodeStartPoint
+  };
+  var beforeText = Editor.string(editor, range) || '';
+  return {
+    beforeText: beforeText,
+    range: range
+  };
 };

package/dist/basic-sdk/extension/plugins/list/plugin/index.js

@@ -2,10 +2,12 @@ import { insertBreakList } from './insert-break-list';
 import { onTabHandle } from './on-tab-handle';
 import { normalizeList } from './normalize-list';
 import { insertFragmentList } from './insert-fragment-list';
+import { handleShortcut } from './shortcut';
 var withList = function withList(editor) {
   var insertBreak = editor.insertBreak,
     deleteBackWord = editor.deleteBackWord,
-    handleTab = editor.handleTab;
+    handleTab = editor.handleTab,
+    insertText = editor.insertText;
   var newEditor = editor;
   newEditor.insertBreak = function () {
     if (insertBreakList(editor)) return;
@@ -31,6 +33,11 @@ var withList = function withList(editor) {
   };
   newEditor.insertFragment = insertFragmentList(newEditor);
   newEditor.normalizeNode = normalizeList(editor);
+  newEditor.insertText = function (text) {
+    var isPreventInsert = handleShortcut(newEditor, text);
+    if (isPreventInsert) return;
+    return insertText(text);
+  };
   return newEditor;
 };
 export default withList;

package/dist/basic-sdk/extension/plugins/list/plugin/shortcut.js

@@ -0,0 +1,79 @@
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+import { Editor, Path, Range, Transforms } from '@seafile/slate';
+import { ORDERED_LIST, PARAGRAPH } from '../../../constants';
+import { getBeforeText, setListType } from '../helpers';
+import { focusEditor, getLastChild, getPreviousPath } from '../../../core';
+import { generateEmptyListItem } from '../model';
+
+/**
+ * @param {Editor} editor
+ * @param {String} text
+ * @returns {Boolean} isPreventInsert
+ */
+export var handleShortcut = function handleShortcut(editor, text) {
+  if (text !== ' ') return false;
+  var selection = editor.selection;
+  if (!Range.isCollapsed(selection)) return false;
+  var _Editor$above = Editor.above(editor),
+    _Editor$above2 = _slicedToArray(_Editor$above, 2),
+    aboveNode = _Editor$above2[0],
+    aboveNodePath = _Editor$above2[1];
+  var aboveNodeRef = Editor.pathRef(editor, aboveNodePath);
+  if (aboveNode.type !== PARAGRAPH) return false;
+  // Match ordered list shortcut
+  var regShortcut = /^\s*[1-9]+\.\s*$/;
+  var _getBeforeText = getBeforeText(editor),
+    beforeText = _getBeforeText.beforeText,
+    range = _getBeforeText.range;
+  var matchResult = beforeText.match(regShortcut);
+  var matchedText = matchResult && matchResult[0];
+  // If the match fails or the match is not at the beginning of the line, it is not a shortcut
+  if (!matchResult || matchResult.index !== 0) return false;
+  var previousNodePath = getPreviousPath(aboveNodePath);
+  var _Editor$node = Editor.node(editor, previousNodePath),
+    _Editor$node2 = _slicedToArray(_Editor$node, 2),
+    previousNode = _Editor$node2[0],
+    previousPath = _Editor$node2[1];
+  // If the previous node is not an ordered list and is not start with `1.`,it is not a shortcut
+  if (previousNode.type !== ORDERED_LIST && matchedText !== '1.') return false;
+  // If the previous node is not an ordered list and is start with `1.`,transforms to ordered list
+  if (previousNode.type !== ORDERED_LIST && matchedText === '1.') {
+    // Delete shortcut key text
+    Transforms.delete(editor, {
+      at: range
+    });
+    setListType(editor, ORDERED_LIST);
+    focusEditor(editor);
+    return;
+  }
+  // Record the order number of the shortcut that will be inserted as a list item
+  var shortcutOrderNum = parseInt(matchResult[0].slice(0, -1));
+
+  // Check If order number is continuous
+  if (previousNode.children.length + 1 !== shortcutOrderNum) return false;
+
+  // Delete shortcut key text
+  Transforms.delete(editor, {
+    at: range
+  });
+  // Update aboveNode after delete shortcut text
+  var _Editor$above3 = Editor.above(editor);
+  var _Editor$above4 = _slicedToArray(_Editor$above3, 1);
+  aboveNode = _Editor$above4[0];
+  var _getLastChild = getLastChild([previousNode, previousPath]),
+    _getLastChild2 = _slicedToArray(_getLastChild, 2),
+    lastListItemPath = _getLastChild2[1];
+  var targetInsertPath = Path.next(lastListItemPath);
+  // Wrap the paragraph in a list item
+  var insertedListItem = generateEmptyListItem();
+  insertedListItem.children.push(aboveNode);
+  Transforms.insertNodes(editor, insertedListItem, {
+    at: targetInsertPath
+  });
+  Transforms.removeNodes(editor, {
+    at: aboveNodeRef.unref()
+  });
+  // Set the selection to the end of the inserted list item
+  Transforms.select(editor, Editor.end(editor, targetInsertPath));
+  return true;
+};

package/dist/basic-sdk/extension/plugins/sdoc-link/helpers.js

@@ -1,11 +1,12 @@
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import { ReactEditor } from '@seafile/slate-react';
-import { Editor, Transforms, Range } from '@seafile/slate';
+import { Editor, Transforms, Range, Text } from '@seafile/slate';
 import slugid from 'slugid';
 import copy from 'copy-to-clipboard';
 import context from '../../../../context';
 import { SDOC_LINK, LINK, INSERT_FILE_DISPLAY_TYPE, CODE_BLOCK, CODE_LINE, PARAGRAPH } from '../../constants';
-import { getNodeType, getSelectedElems } from '../../core';
+import { focusEditor, getNodeType, getSelectedElems } from '../../core';
 export var isMenuDisabled = function isMenuDisabled(editor, readonly) {
   if (readonly) return true;
   if (editor.selection == null) return true;
@@ -26,7 +27,7 @@ export var generateSdocFileNode = function generateSdocFileNode(uuid, text) {
     type: SDOC_LINK,
     doc_uuid: uuid,
     title: text,
-    display_type: INSERT_FILE_DISPLAY_TYPE[0],
+    display_type: INSERT_FILE_DISPLAY_TYPE[1],
     children: [{
       id: slugid.nice(),
       text: text || ''
@@ -50,11 +51,13 @@ export var getType = function getType(editor) {
 };
 export var insertSdocFileLink = function insertSdocFileLink(editor, text, uuid) {
   if (isMenuDisabled(editor)) return;
-
   // Selection folded or not
   var selection = editor.selection;
   if (selection == null) return;
   var isCollapsed = Range.isCollapsed(selection);
+
+  // Remove shortcut symbol,if trigger by shortcut
+  removeShortCutSymbol(editor);
   if (isCollapsed) {
     // Insert Spaces before and after sdoclinks for easy operation
     editor.insertText(' ');
@@ -121,4 +124,58 @@ export var onCopySdocLinkNode = function onCopySdocLinkNode(editor, element) {
       });
     }
   });
+};
+export var getBeforeText = function getBeforeText(editor) {
+  var selection = editor.selection;
+  if (selection == null) return {
+    beforeText: '',
+    range: null
+  };
+  var anchor = selection.anchor;
+  // Find the near text node above the current text
+  var _Editor$nodes3 = Editor.nodes(editor, {
+      match: function match(node) {
+        return Text.isText(node);
+      },
+      mode: 'lowest'
+    }),
+    _Editor$nodes4 = _slicedToArray(_Editor$nodes3, 1),
+    _Editor$nodes4$ = _slicedToArray(_Editor$nodes4[0], 2),
+    beforeNodePath = _Editor$nodes4$[1];
+  var beforeNodeStartPoint = Editor.start(editor, beforeNodePath); // The starting position of the text node
+  var range = {
+    anchor: anchor,
+    focus: beforeNodeStartPoint
+  };
+  var beforeText = Editor.string(editor, range) || '';
+  return {
+    beforeText: beforeText,
+    range: range
+  };
+};
+export var isTriggeredByShortCut = function isTriggeredByShortCut(editor) {
+  var _getBeforeText = getBeforeText(editor),
+    beforeText = _getBeforeText.beforeText;
+  return beforeText.slice(-2) === '[[';
+};
+
+// If insert operation is triggered by shortcut, remove the '[[' symbol
+export var removeShortCutSymbol = function removeShortCutSymbol(editor) {
+  // Check is trigger by short cut
+  var selection = editor.selection;
+  var _getBeforeText2 = getBeforeText(editor),
+    beforeText = _getBeforeText2.beforeText,
+    beforeRange = _getBeforeText2.range;
+  var isTrrigeredByShortCut = beforeText.slice(-3) === '[[ ';
+  isTrrigeredByShortCut && Transforms.delete(editor, {
+    at: {
+      anchor: {
+        path: beforeRange.focus.path,
+        offset: beforeText.length - 3
+      },
+      focus: _objectSpread({}, selection.focus)
+    },
+    voids: true
+  });
+  focusEditor(editor);
 };

package/dist/basic-sdk/extension/plugins/sdoc-link/plugin.js

@@ -1,8 +1,12 @@
 import { Transforms, Node, Editor } from '@seafile/slate';
-import { SDOC_LINK } from '../../constants';
+import { ELEMENT_TYPE, SDOC_LINK } from '../../constants';
+import EventBus from '../../../utils/event-bus';
+import { INTERNAL_EVENT } from '../../../constants';
+import { insertSdocFileLink, isTriggeredByShortCut } from './helpers';
 var withSdocLink = function withSdocLink(editor) {
   var isInline = editor.isInline,
-    deleteBackward = editor.deleteBackward;
+    deleteBackward = editor.deleteBackward,
+    onHotKeyDown = editor.onHotKeyDown;
   var newEditor = editor;
 
   // Rewrite isInline
@@ -35,6 +39,19 @@ var withSdocLink = function withSdocLink(editor) {
     }
     return deleteBackward(unit);
   };
+  newEditor.onHotKeyDown = function (event) {
+    var key = event.key;
+    if (key !== ' ') return onHotKeyDown && onHotKeyDown(event);
+    // If user press whitespace after '[[', open file modal
+    var eventBus = EventBus.getInstance();
+    if (isTriggeredByShortCut(newEditor)) {
+      eventBus.dispatch(INTERNAL_EVENT.INSERT_ELEMENT, {
+        type: ELEMENT_TYPE.SDOC_LINK,
+        insertSdocFileLinkCallback: insertSdocFileLink
+      });
+    }
+    return onHotKeyDown && onHotKeyDown(event);
+  };
   return newEditor;
 };
 export default withSdocLink;

package/dist/components/doc-operations/revision-operations/view-changes/index.js

@@ -1,15 +1,59 @@
-import React, { useCallback } from 'react';
+import _createForOfIteratorHelper from "@babel/runtime/helpers/esm/createForOfIteratorHelper";
+import React, { useCallback, useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
 import Switch from '../../../switch';
 import Tooltip from '../../../tooltip';
+import { REVISION_DIFF_KEY, REVISION_DIFF_VALUE } from '../../../../basic-sdk/constants';
 import './index.css';
 var ViewChanges = function ViewChanges(_ref) {
   var isShowChanges = _ref.isShowChanges,
     propsOnViewChangesToggle = _ref.onViewChangesToggle;
   var _useTranslation = useTranslation(),
     t = _useTranslation.t;
+  useEffect(function () {
+    var url = new URL(window.location.href);
+    var searchParams = new URLSearchParams(url.search);
+    if (!searchParams.has(REVISION_DIFF_KEY)) return;
+    var firstLoadValue = searchParams.get(REVISION_DIFF_KEY);
+    if (firstLoadValue === REVISION_DIFF_VALUE) {
+      propsOnViewChangesToggle(true);
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
   var onViewChangesToggle = useCallback(function () {
-    propsOnViewChangesToggle(!isShowChanges);
+    var nextIsShowChanges = !isShowChanges;
+    var url = new URL(window.location.href);
+    var searchParams = new URLSearchParams(url.search);
+    var newParamsString = '';
+    var _iterator = _createForOfIteratorHelper(searchParams.entries()),
+      _step;
+    try {
+      for (_iterator.s(); !(_step = _iterator.n()).done;) {
+        var item = _step.value;
+        if (item[0] !== REVISION_DIFF_KEY) {
+          if (newParamsString) {
+            newParamsString = newParamsString + "&".concat(item[0], "=").concat(item[1]);
+          } else {
+            newParamsString = "".concat(item[0], "=").concat(item[1]);
+          }
+        }
+      }
+    } catch (err) {
+      _iterator.e(err);
+    } finally {
+      _iterator.f();
+    }
+    if (!searchParams.has(REVISION_DIFF_KEY) && nextIsShowChanges) {
+      if (newParamsString) {
+        newParamsString = newParamsString + "&".concat(REVISION_DIFF_KEY, "=").concat(REVISION_DIFF_VALUE);
+      } else {
+        newParamsString = "".concat(REVISION_DIFF_KEY, "=").concat(REVISION_DIFF_VALUE);
+      }
+    }
+    var validPathName = url.pathname.endsWith('/') ? url.pathname : url.pathname + '/';
+    var newURL = "".concat(url.origin).concat(validPathName).concat(newParamsString ? '?' + newParamsString : '');
+    window.history.replaceState(null, null, newURL);
+    propsOnViewChangesToggle(nextIsShowChanges);
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [isShowChanges, propsOnViewChangesToggle]);
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {

package/package.json

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