@seafile/sdoc-editor 0.3.13 → 0.3.14

package/dist/basic-sdk/extension/plugins/callout/helper.js

@@ -1,4 +1,4 @@
-import { Editor, Path, Transforms } from '@seafile/slate';
+import { Editor, Node, Path, Transforms } from '@seafile/slate';
 import { CALL_OUT } from '../../constants/element-type';
 import { findPath, focusEditor, generateEmptyElement, getSelectedElems, isRangeAcrossBlocks } from '../../core';
 import { CALLOUT_ALLOWED_INSIDE_TYPES, CALLOUT_COLOR_MAP } from './constant';
@@ -100,10 +100,10 @@ export const isFocusOnElement = (editor, element) => {
   const isSelectOnElement = Path.isAncestor(elementPath, editor === null || editor === void 0 ? void 0 : (_editor$selection = editor.selection) === null || _editor$selection === void 0 ? void 0 : (_editor$selection$anc = _editor$selection.anchor) === null || _editor$selection$anc === void 0 ? void 0 : _editor$selection$anc.path);
   return isSelectOnElement;
 };
-export const isCalloutContentEmpty = (editor, calloutEntry) => {
-  const [, calloutPath] = calloutEntry;
-  const contentString = Editor.string(editor, calloutPath);
-  return contentString.length === 0;
+export const isCalloutContentEmpty = calloutEntry => {
+  const [calloutNode] = calloutEntry;
+  const contentString = Node.string(calloutNode);
+  return calloutNode.children.length === 1 && contentString.length === 0;
 };
 
 // Insert a new element at new line in callout after current path

package/dist/basic-sdk/extension/plugins/callout/plugin.js

@@ -1,5 +1,5 @@
 import isHotkey from 'is-hotkey';
-import { PARAGRAPH, INSERT_POSITION } from '../../constants';
+import { PARAGRAPH, INSERT_POSITION, CODE_BLOCK } from '../../constants';
 import { isSelectionAtBlockStart } from '../../core';
 import { getCalloutEntry, isCalloutContentEmpty, unwrapCallout } from './helper';
 import { insertElement } from '../../toolbar/side-toolbar/helpers';
@@ -15,23 +15,39 @@ const withCallout = editor => {
   const {
     insertFragment,
     deleteBackward,
-    onHotKeyDown
+    onHotKeyDown,
+    insertData
   } = editor;
   const newEditor = editor;
   newEditor.deleteBackward = unit => {
     const calloutEntry = getCalloutEntry(editor);
     if (calloutEntry) {
-      if (isSelectionAtBlockStart(editor) && isCalloutContentEmpty(editor, calloutEntry)) return;
+      if (isSelectionAtBlockStart(editor) && isCalloutContentEmpty(calloutEntry)) {
+        unwrapCallout(editor);
+        return;
+      }
     }
     return deleteBackward(unit);
   };
+  newEditor.insertData = data => {
+    if (getCalloutEntry(newEditor)) {
+      if (data.types.includes('text/code-block')) {
+        const eventBus = EventBus.getInstance();
+        eventBus.dispatch(INTERNAL_EVENT.DISPLAY_CALLOUT_UNSUPPORT_ALERT, CODE_BLOCK);
+        return;
+      }
+    }
+    return insertData(data);
+  };
   newEditor.insertFragment = data => {
-    var _data$find;
-    const eventBus = EventBus.getInstance();
-    const unsupportType = (_data$find = data.find(node => !CALLOUT_ALLOWED_INSIDE_TYPES.includes(node.type))) === null || _data$find === void 0 ? void 0 : _data$find.type;
-    if (unsupportType) {
-      eventBus.dispatch(INTERNAL_EVENT.DISPLAY_CALLOUT_UNSUPPORT_ALERT, unsupportType);
-      return;
+    if (getCalloutEntry(editor)) {
+      var _data$find;
+      const eventBus = EventBus.getInstance();
+      const unsupportType = (_data$find = data.find(node => !CALLOUT_ALLOWED_INSIDE_TYPES.includes(node.type))) === null || _data$find === void 0 ? void 0 : _data$find.type;
+      if (unsupportType) {
+        eventBus.dispatch(INTERNAL_EVENT.DISPLAY_CALLOUT_UNSUPPORT_ALERT, unsupportType);
+        return;
+      }
     }
     return insertFragment(data);
   };
@@ -40,16 +56,6 @@ const withCallout = editor => {
       insertElement(newEditor, PARAGRAPH, INSERT_POSITION.AFTER);
       return true;
     }
-    if (isHotkey('enter', event)) {
-      const calloutEntry = getCalloutEntry(editor);
-      if (calloutEntry) {
-        if (isCalloutContentEmpty(editor, calloutEntry)) {
-          unwrapCallout(editor);
-          event.preventDefault();
-          return true;
-        }
-      }
-    }
     return onHotKeyDown && onHotKeyDown(event);
   };
   return newEditor;

package/dist/basic-sdk/extension/plugins/callout/render-elem/color-selector.js

@@ -26,8 +26,10 @@ const ColorSelector = (_ref, ref) => {
   }, []);
   return /*#__PURE__*/React.createElement("div", {
     ref: selectorRef,
-    className: "sdoc-callout-color-selector-container",
+    className: "sdoc-selector-gap-filler",
     contentEditable: false
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "sdoc-callout-color-selector-container"
   }, /*#__PURE__*/React.createElement("ul", {
     className: "sdoc-color-selector-list"
   }, Object.values(CALLOUT_COLOR_MAP).map((_ref2, index) => {
@@ -46,6 +48,6 @@ const ColorSelector = (_ref, ref) => {
     }, isShowCheckedIcon(element, background_color) && /*#__PURE__*/React.createElement("i", {
       className: "sdoc-callout-color-checked-icon sdocfont sdoc-check-mark"
     }));
-  })));
+  }))));
 };
 export default forwardRef(ColorSelector);

package/dist/basic-sdk/extension/plugins/callout/render-elem/index.css

@@ -18,13 +18,21 @@
   pointer-events: none;
 }
 
-.sdoc-callout-color-selector-container {
+.sdoc-selector-gap-filler {
+  position: absolute;
+  left: 0;
+  top: -40px;
+  width: 300px;
+  height: 100%;
+  z-index: 100;
+}
+
+.sdoc-selector-gap-filler .sdoc-callout-color-selector-container {
   position: absolute;
   padding: 10px;
-  top: -39px;
+  top: -5px;
   left: 5px;
   background-color: #fff;
-  box-shadow: -2px 0px 8px 2px #d0cfcf;
   border: 1px solid #eee;
   border-radius: 3px;
 }

package/package.json

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

package/public/locales/cs/sdoc-editor.json

@@ -414,5 +414,8 @@
   "New": "Nový",
   "Table_template": "Table template",
   "Jump_to_original_doc": "Jump to the original document",
-  "Freezed": "Freezed"
+  "Freezed": "Freezed",
+  "Callout": "Callout",
+  "The_current_location_does_not_support_pasting": "The current location does not support pasting ",
+  "Please_enter...": "Please enter..."
 }

package/public/locales/de/sdoc-editor.json

@@ -414,5 +414,8 @@
   "New": "Erstellen",
   "Table_template": "Table template",
   "Jump_to_original_doc": "Jump to the original document",
-  "Freezed": "Freezed"
+  "Freezed": "Freezed",
+  "Callout": "Callout",
+  "The_current_location_does_not_support_pasting": "The current location does not support pasting ",
+  "Please_enter...": "Please enter..."
 }

package/public/locales/es/sdoc-editor.json

@@ -414,5 +414,8 @@
   "New": "Nuevo",
   "Table_template": "Table template",
   "Jump_to_original_doc": "Jump to the original document",
-  "Freezed": "Freezed"
+  "Freezed": "Freezed",
+  "Callout": "Callout",
+  "The_current_location_does_not_support_pasting": "The current location does not support pasting ",
+  "Please_enter...": "Please enter..."
 }

package/public/locales/fr/sdoc-editor.json

@@ -414,5 +414,8 @@
   "New": "Créer",
   "Table_template": "Table template",
   "Jump_to_original_doc": "Jump to the original document",
-  "Freezed": "Freezed"
+  "Freezed": "Freezed",
+  "Callout": "Callout",
+  "The_current_location_does_not_support_pasting": "The current location does not support pasting ",
+  "Please_enter...": "Please enter..."
 }

package/public/locales/it/sdoc-editor.json

@@ -414,5 +414,8 @@
   "New": "Nuovo",
   "Table_template": "Table template",
   "Jump_to_original_doc": "Jump to the original document",
-  "Freezed": "Freezed"
+  "Freezed": "Freezed",
+  "Callout": "Callout",
+  "The_current_location_does_not_support_pasting": "The current location does not support pasting ",
+  "Please_enter...": "Please enter..."
 }

package/public/locales/ru/sdoc-editor.json

@@ -281,7 +281,7 @@
   "Revision": "Пересмотр",
   "Error": "Ошибка",
   "Start_revise": "Начать пересмотр",
-  "Revise": "Revise",
+  "Revise": "Пересмотр",
   "Failed_to_execute_operation_on_server": "Не удалось выполнить операцию на сервере, текущая операция отменена.",
   "Start_revise_tip": "Создайте временный документ и внесите в него изменения, объедините его обратно после просмотра изменений",
   "Load_doc_content_error": "Ошибка загрузки содержимого документа",
@@ -414,5 +414,8 @@
   "New": "Новый",
   "Table_template": "Шаблон таблицы",
   "Jump_to_original_doc": "Перейти к исходному документу",
-  "Freezed": "Freezed"
+  "Freezed": "Заморожено",
+  "Callout": "Callout",
+  "The_current_location_does_not_support_pasting": "The current location does not support pasting ",
+  "Please_enter...": "Please enter..."
 }