@seafile/seafile-editor 1.0.34 → 1.0.36

package/dist/editors/simple-slate-editor /index.js

@@ -38,6 +38,7 @@ function SimpleSlateEditor(_ref) {
   const decorate = (0, _extension.useHighlight)(editor);
   const onChange = (0, _react.useCallback)(value => {
     setSlateValue(value);
+    if (editor.forceNormalize) return;
     const operations = editor.operations;
     const modifyOps = operations.filter(o => o.type !== 'set_selection');
     if (modifyOps.length > 0) {
@@ -45,14 +46,16 @@ function SimpleSlateEditor(_ref) {
     }
     const eventBus = _eventBus.default.getInstance();
     eventBus.dispatch('change');
-  }, [editor.operations, onContentChanged]);
+  }, [editor, onContentChanged]);
 
   // useMount: focus editor
   (0, _react.useEffect)(() => {
+    editor.forceNormalize = true;
     _slate.Editor.normalize(editor, {
       force: true
     });
     const timer = setTimeout(() => {
+      editor.forceNormalize = false;
       const [firstNode] = editor.children;
       if (firstNode) {
         const [firstNodeFirstChild] = firstNode.children;
@@ -67,6 +70,7 @@ function SimpleSlateEditor(_ref) {
       }
     }, 300);
     return () => {
+      editor.forceNormalize = false;
       clearTimeout(timer);
     };
     // eslint-disable-next-line react-hooks/exhaustive-deps

package/dist/editors/slate-editor/index.js

@@ -43,6 +43,7 @@ function SlateEditor(_ref) {
   const decorate = (0, _extension.useHighlight)(editor);
   const onChange = (0, _react.useCallback)(value => {
     setSlateValue(value);
+    if (editor.forceNormalize) return;
     const operations = editor.operations;
     const modifyOps = operations.filter(o => o.type !== 'set_selection');
     if (modifyOps.length > 0) {
@@ -50,14 +51,16 @@ function SlateEditor(_ref) {
     }
     const eventBus = _eventBus.default.getInstance();
     eventBus.dispatch('change');
-  }, [editor.operations, onContentChanged]);
+  }, [editor.forceNormalize, editor.operations, onContentChanged]);
 
   // useMount: focus editor
   (0, _react.useEffect)(() => {
+    editor.forceNormalize = true;
     _slate.Editor.normalize(editor, {
       force: true
     });
     const timer = setTimeout(() => {
+      editor.forceNormalize = false;
       const [firstNode] = editor.children;
       if (firstNode) {
         const [firstNodeFirstChild] = firstNode.children;
@@ -72,6 +75,7 @@ function SlateEditor(_ref) {
       }
     }, 300);
     return () => {
+      editor.forceNormalize = false;
       clearTimeout(timer);
     };
     // eslint-disable-next-line react-hooks/exhaustive-deps

package/dist/extension/plugins/header/menu/index.js

@@ -13,8 +13,8 @@ var _helper = require("../helper");
 var _tooltip = _interopRequireDefault(require("../../../commons/tooltip"));
 var _keyboard = require("../../../constants/keyboard");
 var _constants = require("../../../constants");
-require("./style.css");
 var _constants2 = require("../../../../constants");
+require("./style.css");
 const headerPopoverShowerList = [_constants.ELementTypes.PARAGRAPH, ..._constants.HEADERS];
 const HeaderMenu = _ref => {
   let {

package/dist/extension/plugins/image/menu/index.js

@@ -26,20 +26,19 @@ const ImageMenu = _ref => {
     isShowImagePopover ? registerEventHandler() : unregisterEventHandler();
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [isShowImagePopover]);
+  const handleChangePopoverDisplayed = (0, _react.useCallback)(() => {
+    setIsShowImagePopover(!isShowImagePopover);
+  }, [isShowImagePopover]);
   const onMousedown = (0, _react.useCallback)(e => {
     e.stopPropagation();
     handleChangePopoverDisplayed();
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
+  }, [handleChangePopoverDisplayed]);
   const registerEventHandler = () => {
     return window.addEventListener('click', handleChangePopoverDisplayed);
   };
   const unregisterEventHandler = () => {
     return window.removeEventListener('click', handleChangePopoverDisplayed);
   };
-  const handleChangePopoverDisplayed = (0, _react.useCallback)(() => {
-    setIsShowImagePopover(!isShowImagePopover);
-  }, [isShowImagePopover]);
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_commons.MenuItem, Object.assign({
     type: Image,
     isRichEditor: isRichEditor,

package/dist/extension/plugins/image/render-element/style.css

@@ -36,6 +36,7 @@
   background-color: #fff;
   user-select: none !important;
   z-index: 1000;
+  cursor: pointer;
 }
 
 .sf-image-wrapper .full-screen:hover {

package/dist/extension/plugins/link/render-elem/style.css

@@ -54,6 +54,7 @@
 
 .sf-link-op-icon .iconfont {
   font-size: 12px;
+  cursor: pointer;
 }
 
 .sf-link-op-icon:hover {

package/dist/extension/plugins/list/plugin/index.js

@@ -13,11 +13,15 @@ var _insertFragmentList = require("./insert-fragment-list");
 var _normalizeList = require("./normalize-list");
 var _constant = require("../constant");
 var _shortcut = require("./shortcut");
+var _queries = require("../queries");
+var _core = require("../../../core");
+var _transforms = require("../transforms");
+var _elementTypes = require("../../../constants/element-types");
 const withList = editor => {
   const {
     insertBreak,
     onHotKeyDown,
-    deleteBackWord,
+    deleteBackward,
     insertText
   } = editor;
   const newEditor = editor;
@@ -26,16 +30,28 @@ const withList = editor => {
     insertBreak();
     return;
   };
-  newEditor.deleteBackWord = unit => {
+  newEditor.deleteBackward = unit => {
     const {
       selection
     } = newEditor;
     if (selection === null) {
-      deleteBackWord(unit);
+      deleteBackward(unit);
       return;
     }
+    const res = (0, _queries.getListItemEntry)(editor, {});
+    if (res && (0, _core.isSelectionAtBlockStart)(editor, {
+      match: node => node.type === _elementTypes.LIST_ITEM
+    })) {
+      const {
+        list,
+        listItem
+      } = res;
+      if ((0, _core.isFirstNode)(list[0], listItem[0]) && !(0, _queries.isListNested)(editor, list[1])) {
+        (0, _transforms.unwrapList)(editor);
+      }
+    }
     // nothing todo
-    deleteBackWord(unit);
+    deleteBackward(unit);
   };
   newEditor.insertText = text => {
     const isPreventInsert = (0, _shortcut.handleShortcut)(newEditor, text);

package/dist/extension/plugins/list/plugin/shortcut.js

@@ -49,9 +49,12 @@ const handleShortcut = (editor, text) => {
     if (matchOrderListResult.index !== 0) return false;
     if (matchedOrderListText !== '1.') return false;
     const previousNodePath = (0, _core.getPreviousPath)(aboveNodePath);
-    const [previousNode] = _slate.Editor.node(editor, previousNodePath);
+    let previousNodeEntry = null;
+    if (previousNodePath) {
+      previousNodeEntry = _slate.Editor.node(editor, previousNodePath);
+    }
     // If the previous node is not an ordered list and is start with `1.`,transforms to ordered list
-    if (previousNode.type !== _elementTypes.ORDERED_LIST) {
+    if (!previousNodePath || previousNodeEntry[0].type !== _elementTypes.ORDERED_LIST) {
       // Delete shortcut key text
       _slate.Transforms.delete(editor, {
         at: range

package/dist/extension/plugins/table/menu/index.js

@@ -25,25 +25,26 @@ const TableMenu = _ref => {
   // eslint-disable-next-line react-hooks/exhaustive-deps
   const disabled = (0, _react.useMemo)(() => (0, _helper.isDisabled)(editor, readonly), [editor.selection, readonly]);
   const isActive = (0, _helper.isInTable)(editor);
-  const onSelectorHide = (0, _react.useCallback)(() => {
+  const onHideSelector = (0, _react.useCallback)(() => {
     setIsOpenTableSizeSelector(false);
     unregisterEvent();
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [setIsOpenTableSizeSelector]);
   const registerEvent = (0, _react.useCallback)(() => {
-    window.addEventListener('click', onSelectorHide);
+    window.addEventListener('click', onHideSelector);
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
   const unregisterEvent = (0, _react.useCallback)(() => {
-    window.removeEventListener('click', onSelectorHide);
+    window.removeEventListener('click', onHideSelector);
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
   const onMouseDown = (0, _react.useCallback)(e => {
     e.stopPropagation();
     e.preventDefault();
-    setIsOpenTableSizeSelector(true);
-    registerEvent();
-  }, [setIsOpenTableSizeSelector, registerEvent]);
+    const newState = !isOpenTableSizeSelector;
+    setIsOpenTableSizeSelector(newState);
+    newState ? registerEvent() : unregisterEvent();
+  }, [isOpenTableSizeSelector, registerEvent, unregisterEvent]);
   return /*#__PURE__*/_react.default.createElement("div", {
     className: "sf-table-menu-item"
   }, /*#__PURE__*/_react.default.createElement(_menuItem.default, Object.assign({

package/dist/pages/email-editor-dialog/index.js

@@ -103,6 +103,10 @@ function EmailEditorDialog(_ref) {
     event.stopPropagation();
     onHotKey(event);
   };
+  const onEmailContainerClick = event => {
+    event.stopPropagation();
+    event.nativeEvent.stopImmediatePropagation();
+  };
   const headerClass = (0, _classnames.default)('longtext-header-container', {
     'longtext-header-container-border': readOnly || isWindowsWechat
   });
@@ -133,6 +137,7 @@ function EmailEditorDialog(_ref) {
     isWindowsWechat: isWindowsWechat
   })), /*#__PURE__*/_react.default.createElement("div", {
     onKeyDown: onContainerKeyDown,
+    onClick: onEmailContainerClick,
     className: contentClass
   }, /*#__PURE__*/_react.default.createElement(_seatableEditor.default, {
     ref: editorRef,

package/dist/pages/longtext-editor-dialog/style.css

@@ -112,6 +112,10 @@
   box-shadow: none;
 }
 
+.longtext-content-container .sf-slate-editor-content {
+  height: calc(100% - 34px);
+}
+
 .longtext-content-container .sf-slate-editor-toolbar .sf-menu-group {
   padding: 4px 0 4px 8px;
 }
@@ -150,6 +154,7 @@
   padding: 16px;
   height: auto;
   min-height: 100% !important;
+  margin: 0 !important;
 }
 
 .longtext-content-container .sf-simple-slate-editor-container .article > div[role="textbox"] > :first-child {
@@ -166,4 +171,32 @@
 
 .longtext-content-container .sf-slate-editor-toolbar button:focus {
   outline: none;
-}
+}
+
+.longtext-content-container .sf-image-wrapper .full-screen {
+  position: absolute;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  height: 28px;
+  width: 28px;
+  line-height: 28px;
+  top: 10px;
+  right: 10px;
+  padding: 0px;
+  box-shadow: none;
+  border-radius: 3px;
+  border: none;
+  background-color: rgba(0, 0, 0, 0.5);
+  user-select: none !important;
+  z-index: 1000;
+}
+
+.longtext-content-container .sf-image-wrapper .full-screen .iconfont {
+  color: #fff;
+}
+
+.longtext-content-container .sf-image-wrapper .full-screen:hover {
+  display: flex;
+  background-color: rgba(0, 0, 0, 0.5);
+}

package/dist/pages/markdown-preview/index.js

@@ -8,8 +8,8 @@ exports.default = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/defineProperty"));
 var _react = _interopRequireDefault(require("react"));
 var _loading = _interopRequireDefault(require("../../containers/loading"));
-var _markdownView = _interopRequireDefault(require("../markdown-view"));
 var _slateConvert = require("../../slate-convert");
+var _slateViewer = _interopRequireDefault(require("../../editors/slate-viewer"));
 require("./style.css");
 // Windows old Wechat (3.0 or earlier) inner core is chrome 53 and don't support ECMA6, can't use seafile-editor markdownViewer
 // Windows new Wechat (lastest version 3.3.5) support seafile-editor markdownViewer
@@ -57,8 +57,8 @@ class MarkdownPreview extends _react.default.PureComponent {
       dangerouslySetInnerHTML: {
         __html: this.state.innerHtml
       }
-    }), !isWindowsWechat && /*#__PURE__*/_react.default.createElement(_markdownView.default, {
-      value: value,
+    }), !isWindowsWechat && /*#__PURE__*/_react.default.createElement(_slateViewer.default, {
+      value: (0, _slateConvert.mdStringToSlate)(value),
       isShowOutline: isShowOutline
     }));
   }

package/dist/utils/get-preview-content.js

@@ -54,6 +54,10 @@ const getPreviewText = (content, previewContent) => {
 };
 const getTextOfNode = node => {
   let text = '';
+  if (node.type === 'check_list_item') {
+    text += '';
+    return text;
+  }
   for (let index = 0; index < node.children.length; index++) {
     const currentNode = node.children[index];
     const {
@@ -61,12 +65,6 @@ const getTextOfNode = node => {
     } = currentNode;
     if (type === 'link') {
       text += '';
-    } else if (type === 'check_list_item') {
-      if (Reflect.has(currentNode, 'checked')) {
-        text += '';
-      } else {
-        text += _slate.Node.string(currentNode) + ' ';
-      }
     } else {
       text += _slate.Node.string(currentNode) + ' ';
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seafile/seafile-editor",
-  "version": "1.0.34",
+  "version": "1.0.36",
   "description": "",
   "main": "dist/index.js",
   "scripts": {