@seafile/sdoc-editor 0.1.142-beta → 0.1.143

package/dist/basic-sdk/editor/rebase-editor/index.js

@@ -1,276 +0,0 @@
-import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import React, { useCallback, useEffect } from 'react';
-import deepCopy from 'deep-copy';
-import { useTranslation } from 'react-i18next';
-import { Transforms } from '@seafile/slate';
-import { renderElement } from '../../extension';
-import { focusEditor, findPath, getNode, replaceNode, generateEmptyElement, deleteNodeMark } from '../../extension/core';
-import { REBASE_TYPE, REBASE_MARKS } from '../../constants';
-import context from '../../../context';
-import toaster from '../../../components/toast';
-import { ELEMENT_TYPE } from '../../extension/constants';
-import { replaceNodeId } from '../../node-id/helpers';
-import { EditorContainer, EditorContent } from '../../layout';
-import SlateEditor from '../slate-editor';
-import './index.css';
-var SDocRebaseEditor = function SDocRebaseEditor(_ref) {
-  var slateValue = _ref.slateValue,
-    editor = _ref.editor,
-    version = _ref.version,
-    updateSlateValue = _ref.updateSlateValue,
-    toggleViewChanges = _ref.toggleViewChanges;
-  var _useTranslation = useTranslation(),
-    t = _useTranslation.t;
-
-  // useMount: focus editor
-  useEffect(function () {
-    var timer = setTimeout(function () {
-      focusEditor(editor);
-    }, 300);
-    return function () {
-      clearTimeout(timer);
-    };
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
-  var onChange = useCallback(function (slateValue) {
-    updateSlateValue(slateValue);
-    if (slateValue.filter(function (item) {
-      return item.rebaseType;
-    }).length === 0) {
-      var user = context.getUserInfo();
-      context.rebaseSdocRevision().then(function (res) {
-        return context.saveDocContentByRebase({
-          children: slateValue,
-          version: version + 1,
-          last_modify_user: user.username
-        });
-      }).then(function (res) {
-        toaster.success(t('Successfully_rebase_'));
-        toggleViewChanges(false, true);
-      }).catch(function (error) {
-        toaster.danger(t('Error'));
-      });
-    }
-
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [version, toggleViewChanges]);
-  var updateParentNodeByPath = useCallback(function (path) {
-    var parentPath = path.slice(0, -1);
-    var parentNode = getNode(editor, parentPath);
-    if (parentNode.children.filter(function (item) {
-      return item.rebaseType;
-    }).length === 0) {
-      var newParentElement = _objectSpread({}, parentNode);
-      newParentElement['rebaseType'] && delete newParentElement['rebaseType'];
-      newParentElement['oldElement'] && delete newParentElement['oldElement'];
-      newParentElement['origin'] && delete newParentElement['origin'];
-      newParentElement['children'] = newParentElement['children'].map(function (item) {
-        item['rebaseType'] && delete item['rebaseType'];
-        item['oldElement'] && delete item['oldElement'];
-        item['origin'] && delete item['origin'];
-        return item;
-      });
-      replaceNode(editor, {
-        at: parentPath,
-        nodes: newParentElement
-      });
-    }
-
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [editor]);
-  var deleteElement = useCallback(function (element) {
-    var path = findPath(editor, element);
-    Transforms.removeNodes(editor, {
-      at: path
-    });
-    if (element.type === ELEMENT_TYPE.LIST_ITEM) {
-      updateParentNodeByPath(path);
-    }
-
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [slateValue, editor]);
-  var deleteMark = useCallback(function (element) {
-    var path = findPath(editor, element);
-    deleteNodeMark(editor, path, element, REBASE_MARKS);
-    if (element.type === ELEMENT_TYPE.LIST_ITEM) {
-      updateParentNodeByPath(path);
-    }
-
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [slateValue, editor]);
-  var addDeletedElement = useCallback(function (element) {
-    var path = findPath(editor, element);
-    deleteNodeMark(editor, path, element, REBASE_MARKS);
-    if (element.type !== ELEMENT_TYPE.LIST_ITEM) {
-      var emptyNode = generateEmptyElement(ELEMENT_TYPE.PARAGRAPH);
-      Transforms.insertNodes(editor, emptyNode, {
-        at: [path[0]]
-      });
-    } else {
-      var _emptyNode = generateEmptyElement(ELEMENT_TYPE.LIST_ITEM);
-      _emptyNode.children[0] = generateEmptyElement(ELEMENT_TYPE.LIST_LIC);
-      var parentPath = path.slice(0, -1);
-      var parentNode = getNode(editor, parentPath);
-      var newChildren = _toConsumableArray(parentNode.children);
-      var index = path[path.length - 1];
-      newChildren.splice(index, 0, _emptyNode);
-      replaceNode(editor, {
-        at: parentPath,
-        nodes: _objectSpread(_objectSpread({}, parentNode), {}, {
-          children: newChildren
-        })
-      });
-    }
-    if (element.type === ELEMENT_TYPE.LIST_ITEM) {
-      updateParentNodeByPath(path);
-    }
-
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [slateValue, editor]);
-  var useMasterChanges = useCallback(function (element) {
-    var path = findPath(editor, element);
-    deleteNodeMark(editor, path, element, REBASE_MARKS);
-    var nextElementPath = _toConsumableArray(path);
-    nextElementPath[path.length - 1] = path[path.length - 1] + 1;
-    Transforms.removeNodes(editor, {
-      at: nextElementPath
-    });
-    if (element.type === ELEMENT_TYPE.LIST_ITEM) {
-      updateParentNodeByPath(path);
-    }
-
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [slateValue, editor]);
-  var useCurrentChanges = useCallback(function (element) {
-    var path = findPath(editor, element);
-    var currentElementPath = _toConsumableArray(path);
-    currentElementPath[path.length - 1] = path[path.length - 1] + 1;
-    var currentElement = getNode(editor, currentElementPath);
-    var newCurrentElement = deepCopy(currentElement);
-    deleteNodeMark(editor, currentElementPath, newCurrentElement, REBASE_MARKS);
-    Transforms.removeNodes(editor, {
-      at: path
-    });
-    if (element.type === ELEMENT_TYPE.LIST_ITEM) {
-      updateParentNodeByPath(path);
-    }
-
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [slateValue, editor]);
-  var useBothChanges = useCallback(function (element) {
-    // delete element marks
-    var path = findPath(editor, element);
-    deleteNodeMark(editor, path, element, REBASE_MARKS);
-
-    // delete next element marks
-    var nextElementPath = [].concat(_toConsumableArray(path.slice(0, -1)), [path[path.length - 1] + 1]);
-    var nextElement = getNode(editor, nextElementPath);
-    var newNextElement = replaceNodeId(deepCopy(nextElement));
-    deleteNodeMark(editor, nextElementPath, newNextElement, REBASE_MARKS);
-    if (element.type === ELEMENT_TYPE.LIST_ITEM) {
-      updateParentNodeByPath(path);
-    }
-
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [slateValue, editor]);
-  var renderRebaseElement = useCallback(function (props) {
-    var element = props.element;
-    if (!element.rebaseType) {
-      return renderElement(props);
-    }
-    if (element.rebaseType === REBASE_TYPE.DELETE_MODIFY) {
-      return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
-        className: "w-100 d-flex sdoc-rebase-btn-group",
-        contentEditable: false
-      }, /*#__PURE__*/React.createElement("div", {
-        className: "sdoc-rebase-btn",
-        onClick: function onClick() {
-          return deleteElement(element);
-        }
-      }, t('Keep_my_modification')), /*#__PURE__*/React.createElement("div", {
-        className: "mr-2 ml-2"
-      }, '|'), /*#__PURE__*/React.createElement("div", {
-        className: "sdoc-rebase-btn",
-        onClick: function onClick() {
-          return deleteMark(element);
-        }
-      }, t('Keep_other_modification')), /*#__PURE__*/React.createElement("div", {
-        className: "mr-2 ml-2"
-      }, '|'), /*#__PURE__*/React.createElement("div", {
-        className: "sdoc-rebase-btn",
-        onClick: function onClick() {
-          return addDeletedElement(element);
-        }
-      }, t('Keep_both_modification'))), /*#__PURE__*/React.createElement("div", {
-        className: "w-100 sdoc-rebase-current-changes-start",
-        contentEditable: false
-      }, '<<<<<<<'), /*#__PURE__*/React.createElement("div", {
-        className: "w-100",
-        contentEditable: false
-      }, '======='), /*#__PURE__*/React.createElement("div", {
-        className: "w-100 sdoc-rebase-incoming-changes"
-      }, renderElement(props)), /*#__PURE__*/React.createElement("div", {
-        className: "w-100 sdoc-rebase-incoming-changes-end",
-        contentEditable: false
-      }, '>>>>>>>'));
-    }
-    if (element.rebaseType === REBASE_TYPE.MODIFY_MODIFY) {
-      if (element.origin === 'master') {
-        return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
-          className: "w-100 d-flex sdoc-rebase-btn-group",
-          contentEditable: false
-        }, /*#__PURE__*/React.createElement("div", {
-          className: "sdoc-rebase-btn",
-          onClick: function onClick() {
-            return useMasterChanges(element);
-          }
-        }, t('Keep_my_modification')), /*#__PURE__*/React.createElement("div", {
-          className: "mr-2 ml-2"
-        }, '|'), /*#__PURE__*/React.createElement("div", {
-          className: "sdoc-rebase-btn",
-          onClick: function onClick() {
-            return useCurrentChanges(element);
-          }
-        }, t('Keep_other_modification')), /*#__PURE__*/React.createElement("div", {
-          className: "mr-2 ml-2"
-        }, '|'), /*#__PURE__*/React.createElement("div", {
-          className: "sdoc-rebase-btn",
-          onClick: function onClick() {
-            return useBothChanges(element);
-          }
-        }, t('Keep_both_modification'))), /*#__PURE__*/React.createElement("div", {
-          className: "w-100 sdoc-rebase-current-changes-start",
-          contentEditable: false
-        }, '<<<<<<<'), /*#__PURE__*/React.createElement("div", {
-          className: "w-100 sdoc-rebase-current-changes"
-        }, renderElement(props)));
-      }
-      return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
-        className: "w-100",
-        contentEditable: false
-      }, '======='), /*#__PURE__*/React.createElement("div", {
-        className: "w-100 sdoc-rebase-incoming-changes"
-      }, renderElement(props)), /*#__PURE__*/React.createElement("div", {
-        className: "w-100 sdoc-rebase-incoming-changes-end",
-        contentEditable: false
-      }, '>>>>>>>'));
-    }
-    return renderElement(props);
-
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
-  return /*#__PURE__*/React.createElement(EditorContainer, {
-    editor: editor
-  }, /*#__PURE__*/React.createElement(EditorContent, {
-    docValue: slateValue,
-    showOutline: true
-  }, /*#__PURE__*/React.createElement(SlateEditor, {
-    isShowComment: false,
-    editor: editor,
-    slateValue: slateValue,
-    setSlateValue: onChange,
-    renderElement: renderRebaseElement
-  })));
-};
-export default SDocRebaseEditor;

package/dist/basic-sdk/utils/rebase.js

@@ -1,193 +0,0 @@
-import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import { generateIdMapAndIds, getIdDiffs } from './diff';
-import ObjectUtils from './object-utils';
-import { MODIFY_TYPE, REBASE_TYPE } from '../constants';
-import { ELEMENT_TYPE } from '../extension/constants';
-var getRevisionChanges = function getRevisionChanges(masterContent, currentContent) {
-  var _generateIdMapAndIds = generateIdMapAndIds(currentContent.children),
-    currentContentMap = _generateIdMapAndIds.map,
-    currentIds = _generateIdMapAndIds.ids;
-  var _generateIdMapAndIds2 = generateIdMapAndIds(masterContent.children),
-    masterContentMap = _generateIdMapAndIds2.map,
-    masterIds = _generateIdMapAndIds2.ids;
-  var idDiffs = getIdDiffs(masterIds, currentIds);
-  var content = [];
-  idDiffs.forEach(function (idDiff) {
-    var value = idDiff.value,
-      added = idDiff.added,
-      removed = idDiff.removed;
-    if (added) {
-      var addedList = value.map(function (item) {
-        return _objectSpread(_objectSpread({}, currentContentMap[item]), {}, {
-          modifyType: MODIFY_TYPE.ADD
-        });
-      });
-      content.push.apply(content, _toConsumableArray(addedList));
-    } else if (removed) {
-      var deletedList = value.map(function (item) {
-        return _objectSpread(_objectSpread({}, masterContentMap[item]), {}, {
-          modifyType: MODIFY_TYPE.DELETE
-        });
-      });
-      content.push.apply(content, _toConsumableArray(deletedList));
-    } else {
-      value.forEach(function (elementId) {
-        if (ObjectUtils.isSameObject(masterContentMap[elementId], currentContentMap[elementId])) {
-          content.push(currentContentMap[elementId]);
-        } else {
-          var oldElement = masterContentMap[elementId];
-          var currentElement = currentContentMap[elementId];
-          var newElement = _objectSpread(_objectSpread({}, currentElement), {}, {
-            modifyType: MODIFY_TYPE.MODIFY,
-            oldElement: oldElement
-          });
-          if (currentElement.type === oldElement.type) {
-            var elementType = currentElement.type;
-            if ([ELEMENT_TYPE.UNORDERED_LIST, ELEMENT_TYPE.ORDERED_LIST].includes(elementType)) {
-              var listContent = getRevisionChanges(oldElement, currentElement);
-              newElement['modifyType'] = MODIFY_TYPE.CHILDREN_MODIFY;
-              newElement['children'] = listContent;
-            }
-          }
-          content.push(newElement);
-        }
-      });
-    }
-  });
-  return content;
-};
-var getMasterChanges = function getMasterChanges(masterContent, revisionChanges) {
-  var canMerge = true;
-  var _generateIdMapAndIds3 = generateIdMapAndIds(revisionChanges),
-    currentContentMap = _generateIdMapAndIds3.map,
-    currentIds = _generateIdMapAndIds3.ids;
-  var _generateIdMapAndIds4 = generateIdMapAndIds(masterContent.children),
-    masterContentMap = _generateIdMapAndIds4.map,
-    masterIds = _generateIdMapAndIds4.ids;
-  var idDiffs = getIdDiffs(masterIds, currentIds);
-  var content = [];
-  idDiffs.forEach(function (idDiff) {
-    var value = idDiff.value,
-      added = idDiff.added,
-      removed = idDiff.removed;
-    if (added) {
-      value.forEach(function (elementId) {
-        var element = currentContentMap[elementId];
-        var newElement = {
-          id: element.id,
-          children: element.children,
-          type: element.type
-        };
-        // The content has been deleted from the master, but this branch has been modified. At this time, rebase is required, and the user needs to confirm the selected content
-        // ==> delete ｜ use modification
-        if (element.modifyType === MODIFY_TYPE.MODIFY) {
-          newElement['rebaseType'] = REBASE_TYPE.DELETE_MODIFY;
-          content.push(newElement);
-          canMerge = false;
-        } else {
-          // new direct append
-          content.push(newElement);
-        }
-      });
-    } else if (removed) {
-      var deletedList = value.map(function (item) {
-        return _objectSpread({}, masterContentMap[item]);
-      });
-      content.push.apply(content, _toConsumableArray(deletedList));
-    } else {
-      value.forEach(function (elementId) {
-        var currentElement = currentContentMap[elementId];
-        var masterElement = masterContentMap[elementId];
-
-        // Unchanged
-        if (ObjectUtils.isSameObject(masterElement, currentElement)) {
-          content.push(currentElement);
-
-          // The content of the master branch is modified in the current branch, but the content of the master branch is the same as that of origin
-        } else if (ObjectUtils.isSameObject(masterElement, currentElement.oldElement)) {
-          var newElement = _objectSpread({}, currentElement);
-          newElement['oldElement'] && delete newElement['oldElement'];
-          newElement['modifyType'] && delete newElement['modifyType'];
-          content.push(newElement);
-
-          // Modify at the same time
-        } else if (currentElement.modifyType === MODIFY_TYPE.MODIFY) {
-          content.push(_objectSpread(_objectSpread({}, masterElement), {}, {
-            rebaseType: REBASE_TYPE.MODIFY_MODIFY,
-            origin: 'master'
-          }));
-          var _newElement = _objectSpread(_objectSpread({}, currentElement), {}, {
-            rebaseType: REBASE_TYPE.MODIFY_MODIFY,
-            origin: 'current'
-          });
-          _newElement['modifyType'] && delete _newElement['modifyType'];
-          _newElement['oldElement'] && delete _newElement['oldElement'];
-          content.push(_newElement);
-          canMerge = false;
-
-          // children modify
-        } else if (currentElement.modifyType === MODIFY_TYPE.CHILDREN_MODIFY) {
-          canMerge = false;
-          if (currentElement.type === masterElement.type) {
-            var _getMasterChanges = getMasterChanges(masterElement, currentElement.children),
-              childrenContent = _getMasterChanges.content;
-            content.push(_objectSpread(_objectSpread({}, masterElement), {}, {
-              children: childrenContent,
-              rebaseType: REBASE_TYPE.CHILDREN_MODIFY
-            }));
-          } else {
-            content.push(_objectSpread(_objectSpread({}, masterElement), {}, {
-              rebaseType: REBASE_TYPE.MODIFY_MODIFY,
-              origin: 'master'
-            }));
-            var _newElement2 = _objectSpread(_objectSpread({}, currentElement.oldElement), {}, {
-              rebaseType: REBASE_TYPE.MODIFY_MODIFY,
-              origin: 'current'
-            });
-            content.push(_newElement2);
-          }
-        } else {
-          var _newElement3 = _objectSpread({}, currentElement);
-          _newElement3['oldElement'] && delete _newElement3['oldElement'];
-          _newElement3['modifyType'] && delete _newElement3['modifyType'];
-          content.push(_newElement3);
-        }
-      });
-    }
-  });
-  return {
-    content: content,
-    canMerge: canMerge
-  };
-};
-export var getRebase = function getRebase(masterContent, revisionMasterContent, revisionCurrentContent) {
-  // master no changes, merged directly
-  if (masterContent.version === revisionMasterContent.version) {
-    return {
-      canMerge: true,
-      isNeedReplaceMaster: true,
-      value: revisionCurrentContent
-    };
-  }
-
-  // The revision content has not changed
-  if (revisionMasterContent.version === revisionCurrentContent.version) {
-    return {
-      canMerge: true,
-      isNeedReplaceMaster: false,
-      value: masterContent
-    };
-  }
-  var revisionChanges = getRevisionChanges(revisionMasterContent, revisionCurrentContent);
-  var _getMasterChanges2 = getMasterChanges(masterContent, revisionChanges),
-    canMerge = _getMasterChanges2.canMerge,
-    content = _getMasterChanges2.content;
-  return {
-    canMerge: canMerge,
-    isNeedReplaceMaster: true,
-    value: _objectSpread(_objectSpread({}, revisionCurrentContent), {}, {
-      children: content
-    })
-  };
-};

package/dist/components/tip-dialog/index.js

@@ -1,45 +0,0 @@
-import React, { useCallback } from 'react';
-import { useTranslation } from 'react-i18next';
-import { Modal, ModalHeader, ModalBody, ModalFooter, Button } from 'reactstrap';
-import classnames from 'classnames';
-import './index.css';
-var TipDialog = function TipDialog(_ref) {
-  var title = _ref.title,
-    children = _ref.children,
-    className = _ref.className,
-    toggle = _ref.toggle,
-    submit = _ref.submit;
-  var _useTranslation = useTranslation(),
-    t = _useTranslation.t;
-  var closeDialog = useCallback(function () {
-    toggle && toggle(false);
-
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
-  var confirmTip = useCallback(function () {
-    submit && submit();
-
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
-  return /*#__PURE__*/React.createElement(Modal, {
-    isOpen: true,
-    autoFocus: false,
-    zIndex: 1071,
-    returnFocusAfterClose: false,
-    className: classnames('sdoc-tip-dialog', className),
-    contentClassName: "sdoc-tip-modal"
-  }, /*#__PURE__*/React.createElement(ModalHeader, {
-    toggle: closeDialog
-  }, title), /*#__PURE__*/React.createElement(ModalBody, {
-    className: "sdoc-tip-body"
-  }, children), /*#__PURE__*/React.createElement(ModalFooter, null, /*#__PURE__*/React.createElement(Button, {
-    color: "secondary",
-    className: "mr-2",
-    onClick: closeDialog
-  }, t('Cancel')), /*#__PURE__*/React.createElement(Button, {
-    color: "primary",
-    className: "highlight-bg-color",
-    onClick: confirmTip
-  }, t('Confirm'))));
-};
-export default TipDialog;