@seafile/sdoc-editor 0.5.18 → 0.5.20

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

@@ -1719,49 +1719,82 @@ export const generateDragMoveElement = tipText => {
   const canvasId = 'sdoc-drag-image';
   let canvas = document.getElementById(canvasId);
   if (!canvas) {
+    let dpr = window.devicePixelRatio;
     canvas = document.createElement('canvas');
-    canvas.width = 150;
+    canvas.width = 115;
     canvas.height = 30;
     canvas.id = canvasId;
     document.body.appendChild(canvas);
+    let {
+      width: cssWidth,
+      height: cssHeight
+    } = canvas.getBoundingClientRect();
+    canvas.style.width = canvas.width + 'px';
+    canvas.style.height = canvas.height + 'px';
+    canvas.width = dpr * cssWidth;
+    canvas.height = dpr * cssHeight;
+    canvas.style.position = 'fixed';
   }
   canvas.style.display = 'block';
-  canvas.style.position = 'fixed';
   const context = canvas.getContext('2d');
   context.clearRect(0, 0, canvas.width, canvas.height);
-  context.textAlign = 'center';
-  context.fillStyle = 'rgb(66, 129, 219)';
+  context.fillStyle = 'rgb(241,243,246)';
   context.fillRect(0, 0, canvas.width, canvas.height);
-  context.font = '12px';
+  context.font = '22px Arial';
   context.textBaseline = 'middle';
-  context.fillStyle = 'white';
+  context.textAlign = 'center';
+  context.fillStyle = 'black';
   context.fillText(tipText, canvas.width / 2, canvas.height / 2);
   return canvas;
 };
-export const isHideDragHandlerLine = (editor, displayType, table, cellPath) => {
+export const isHideDragHandlerLine = (editor, displayType, table, cellPath, isDragOverCellHalf) => {
   const pathLength = cellPath.length;
-  const rowIndex = cellPath[pathLength - 2];
-  const cellIndex = cellPath[pathLength - 1];
+  let rowIndex = cellPath[pathLength - 2];
+  let cellIndex = cellPath[pathLength - 1];
+
+  // Check is above cell selected
+  let currentCellDom = ReactEditor.toDOMNode(editor, table.children[rowIndex].children[cellIndex]);
+  let isCurrentCellSelected = currentCellDom.classList.contains(CELL_SELECTED);
+  if (isCurrentCellSelected) return true;
+  if (isDragOverCellHalf) {
+    if (displayType === DRAG_HANDLER_COLUMN) {
+      cellIndex = cellIndex + 1;
+    } else {
+      rowIndex = rowIndex + 1;
+    }
+  }
+  const isEndOfRowOrColumn = displayType === DRAG_HANDLER_COLUMN && cellIndex === table.columns.length || displayType === DRAG_HANDLER_ROW && rowIndex === table.children.length;
+  if (isEndOfRowOrColumn) return false;
   let preCellDom = null;
-  if (displayType === DRAG_HANDLER_COLUMN && cellIndex > 1) {
+  if (displayType === DRAG_HANDLER_COLUMN && cellIndex > 0) {
     const prevCell = table.children[rowIndex].children[cellIndex - 1];
     preCellDom = ReactEditor.toDOMNode(editor, prevCell);
-  } else if (displayType === DRAG_HANDLER_ROW && rowIndex > 1) {
+  } else if (displayType === DRAG_HANDLER_ROW && rowIndex > 0) {
     const prevCell = table.children[rowIndex - 1].children[cellIndex];
     preCellDom = ReactEditor.toDOMNode(editor, prevCell);
   }
-  const isPrevCellSelected = preCellDom ? preCellDom.classList.contains(CELL_SELECTED) : false;
+
+  // Check is above cell selected
+  currentCellDom = ReactEditor.toDOMNode(editor, table.children[rowIndex].children[cellIndex]);
+  isCurrentCellSelected = currentCellDom.classList.contains(CELL_SELECTED);
+  if (isCurrentCellSelected) return true;
 
   // Check if the previous cell is selected
+  const isPrevCellSelected = preCellDom && preCellDom.classList.contains(CELL_SELECTED);
   if (isPrevCellSelected) return true;
-
+  let isCombined = false;
   // Check if the combined cell
   if (displayType === DRAG_HANDLER_COLUMN) {
-    const isCombined = table.children.some(row => row.children[cellIndex].is_combined);
-    return isCombined;
+    isCombined = table.children.some(row => row.children[cellIndex - isDragOverCellHalf].is_combined);
   } else {
-    const isCombined = table.children[rowIndex].children.some(cell => cell.is_combined);
-    return isCombined;
+    isCombined = table.children[rowIndex - isDragOverCellHalf].children.some(cell => cell.is_combined);
+  }
+  if (isCombined) return true;
+
+  // Check is the last column
+  if (displayType === DRAG_HANDLER_COLUMN) {
+    const isLastColumn = cellIndex === table.columns.length - 1;
+    if (isLastColumn) return false;
   }
 };
 export const getTableRowSelectedRange = (table, rowIndex) => {

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

@@ -14,7 +14,7 @@ const DragHandlers = _ref => {
   });
   const [displayType, setDisplayType] = useState('');
   const tableID = table.id;
-  const handleShowResizeHandler = useCallback(_ref2 => {
+  const handleShowDragHandler = useCallback(_ref2 => {
     let {
       displayType,
       left,
@@ -31,11 +31,11 @@ const DragHandlers = _ref => {
   }, [tableID]);
   useEffect(() => {
     const eventBus = EventBus.getInstance();
-    const unsubscribe = eventBus.subscribe(INTERNAL_EVENT.TABLE_SHOW_DRAG_HANDLER, handleShowResizeHandler);
+    const unsubscribe = eventBus.subscribe(INTERNAL_EVENT.TABLE_SHOW_DRAG_HANDLER, handleShowDragHandler);
     return () => {
       unsubscribe();
     };
-  }, [handleShowResizeHandler]);
+  }, [handleShowDragHandler]);
   return /*#__PURE__*/React.createElement(React.Fragment, null, displayType === DRAG_HANDLER_ROW && /*#__PURE__*/React.createElement(RowDragHandler, {
     top: linePosition.top
   }), displayType === DRAG_HANDLER_COLUMN && /*#__PURE__*/React.createElement(ColumnDragHandler, {

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

@@ -40,6 +40,7 @@ const TableCell = _ref => {
   const eventBus = EventBus.getInstance();
   const tableId = tableEntry[0].id;
   const canDrop = useRef(false);
+  const isDragOverHalfCell = useRef(false);
   const onContextMenu = useCallback(event => {
     const path = findPath(editor, element);
     focusEditor(editor, path);
@@ -100,7 +101,34 @@ const TableCell = _ref => {
       mouseDownEvent: event,
       tableId
     });
-    const isHideHandleLine = isHideDragHandlerLine(editor, displayType, table, cellPath);
+    if (cellInfo.displayType === DRAG_HANDLER_COLUMN) {
+      const offsetX = cellInfo.mouseDownEvent.nativeEvent.offsetX;
+      const cellWidth = cellInfo.width;
+      const cellIndex = cellInfo.cellIndex;
+      // To avoid the drag handler line being covered by the table border
+      if (cellIndex === 0) cellInfo.left += 1;
+      if (cellIndex === table.children[0].children.length - 1) cellInfo.left -= 2;
+      if (offsetX >= cellWidth / 2) {
+        cellInfo.left = cellInfo.left + cellWidth;
+        isDragOverHalfCell.current = true;
+      } else {
+        isDragOverHalfCell.current = false;
+      }
+    } else {
+      const offsetY = cellInfo.mouseDownEvent.nativeEvent.offsetY;
+      const cellHeight = cellInfo.height;
+      const rowIndex = cellInfo.rowIndex;
+      // To avoid the drag handler line being covered by the table border
+      if (rowIndex === 0) cellInfo.top += 1;
+      if (rowIndex === table.children.length - 1) cellInfo.top -= 2;
+      if (offsetY >= cellHeight / 2) {
+        cellInfo.top = cellInfo.top + cellHeight;
+        isDragOverHalfCell.current = true;
+      } else {
+        isDragOverHalfCell.current = false;
+      }
+    }
+    const isHideHandleLine = isHideDragHandlerLine(editor, displayType, table, cellPath, isDragOverHalfCell.current);
     canDrop.current = !isHideHandleLine;
     if (target.classList.contains(CELL_SELECTED) || isHideHandleLine) {
       cellInfo.top = -9999;
@@ -120,6 +148,7 @@ const TableCell = _ref => {
     if (!dragDataJson) return;
     const dragData = JSON.parse(dragDataJson);
     if (dragData) {
+      const offset = isDragOverHalfCell.current ? 1 : 0;
       const {
         tableId: dragTableId,
         startIndex,
@@ -127,8 +156,8 @@ const TableCell = _ref => {
         dragType
       } = dragData;
       if (dragTableId !== tableId) return;
-      dragType === DRAG_HANDLER_COLUMN ? moveColumns(editor, cellIndex, startIndex, endIndex) : moveRows(editor, rowIndex, startIndex, endIndex);
-      const range = dragType === DRAG_HANDLER_COLUMN ? getTableSelectedRangeAfterDrag(tableEntry[0], dragType, cellIndex, startIndex, endIndex) : getTableSelectedRangeAfterDrag(tableEntry[0], dragType, rowIndex, startIndex, endIndex);
+      dragType === DRAG_HANDLER_COLUMN ? moveColumns(editor, cellIndex + offset, startIndex, endIndex) : moveRows(editor, rowIndex + offset, startIndex, endIndex);
+      const range = dragType === DRAG_HANDLER_COLUMN ? getTableSelectedRangeAfterDrag(tableEntry[0], dragType, cellIndex + offset, startIndex, endIndex) : getTableSelectedRangeAfterDrag(tableEntry[0], dragType, rowIndex + offset, startIndex, endIndex);
       eventBus.dispatch(INTERNAL_EVENT.SET_TABLE_SELECT_RANGE, tableEntry[0], range);
     }
   }, [cellIndex, editor, eventBus, rowIndex, tableEntry, tableId]);

package/package.json

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

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

@@ -18,8 +18,8 @@
   "Unordered_list": "Neseřazený seznam",
   "Check_list_item": "Check list item",
   "Insert_image": "Insert image",
-  "Insert_formula": "Insert formula",
-  "Formula": "Formula",
+  "Insert_formula": "Vložit vzorec",
+  "Formula": "Vzorec",
   "Insert_file": "Insert file",
   "Code": "Řádkový kód",
   "Code_block": "Code block",
@@ -42,8 +42,8 @@
   "Delete_table": "Delete table",
   "Delete_row": "Delete row",
   "Delete_column": "Delete column",
-  "Insert_row": "Insert row",
-  "Insert_column": "Insert column",
+  "Insert_row": "Vložit řádek",
+  "Insert_column": "Vložit sloupec",
   "Set_align": "Nastavit zarovnání",
   "Left": "Vlevo",
   "Center": "Střed",
@@ -140,10 +140,10 @@
   "Insert_library_image": "Vložit obrázek knihovny",
   "Size": "Velikost",
   "Location": "Umístění",
-  "Last_update": "Last update",
+  "Last_update": "Poslední aktualizace",
   "Tags": "Štítky",
   "Add_participants": "Přidat účastníky",
-  "Clear_format": "Clear format",
+  "Clear_format": "Jasný formát",
   "MarkdownLint": {
     "missing_h1": {
       "description": "V dokumentu není žádný h1",
@@ -158,7 +158,7 @@
       "issue": "Problém s úrovní nadpisu"
     }
   },
-  "Shortcut_help": "Shortcut help",
+  "Shortcut_help": "Zkratka nápovědy",
   "User_help": {
     "title": "Klávesové zkratky",
     "userHelpData": [
@@ -209,7 +209,7 @@
       {
         "shortcutType": "Zkratky vzorečku",
         "shortcutData": {
-          "Insert_Formula": "Insert Formula"
+          "Insert_Formula": "Vložit vzorec"
         }
       },
       {
@@ -448,5 +448,7 @@
   "Create": "Vytvořit",
   "Top_align": "Top",
   "Center_align": "Middle",
-  "Bottom_align": "Bottom"
+  "Bottom_align": "Bottom",
+  "Move_column_count": "Moving {{count}} column(s)",
+  "Move_row_count": "Moving {{count}} row(s)"
 }

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

@@ -18,7 +18,7 @@
   "Unordered_list": "Ungeordnete Liste",
   "Check_list_item": "Check list item",
   "Insert_image": "Insert image",
-  "Insert_formula": "Insert formula",
+  "Insert_formula": "Formel einfügen",
   "Formula": "Formel",
   "Insert_file": "Insert file",
   "Code": "Inline-Code",
@@ -42,8 +42,8 @@
   "Delete_table": "Delete table",
   "Delete_row": "Delete row",
   "Delete_column": "Delete column",
-  "Insert_row": "Insert row",
-  "Insert_column": "Insert column",
+  "Insert_row": "Zeile einfügen",
+  "Insert_column": "Spalte einfügen",
   "Set_align": "Ausrichtung festlegen",
   "Left": "Links",
   "Center": "Zentrieren",
@@ -140,10 +140,10 @@
   "Insert_library_image": "Bild aus Bibliothek einfügen",
   "Size": "Größe",
   "Location": "Ort",
-  "Last_update": "Last update",
+  "Last_update": "Letzte Änderung",
   "Tags": "Tags",
   "Add_participants": "Teilnehmer hinzufügen",
-  "Clear_format": "Clear format",
+  "Clear_format": "Formatierung löschen",
   "MarkdownLint": {
     "missing_h1": {
       "description": "Es gibt keine Hauptüberschrift (h1) in dem Text",
@@ -288,7 +288,7 @@
   "Load_doc_content_error": "Load doc content error",
   "Sdoc_format_invalid": "The content of the document does not conform to the sdoc specification",
   "Draft": "Entwurf",
-  "Unmark_as_draft": "Unmark as draft",
+  "Unmark_as_draft": "Entwurfsmarkierung entfernen",
   "Background_color": "Background color",
   "No_color": "No color",
   "Standard_color": "Standard color",
@@ -367,10 +367,10 @@
   "Table": "Tabelle",
   "Link": "Link",
   "Transform_to": "Transform to",
-  "Last_modification": "Last modification",
-  "Next_modification": "Next modification",
+  "Last_modification": "Letzte Änderung",
+  "Next_modification": "Nächste Änderung",
   "Changes": "Änderungen",
-  "No_changes": "No changes",
+  "No_changes": "Keine Änderungen",
   "Title": "Titel",
   "Subtitle": "Subtitle",
   "Link_sdoc": "Link sdoc",
@@ -402,10 +402,10 @@
   "No_collaborators_available": "No_collaborators_available",
   "Find_a_collaborator": "Find a collaborator",
   "Doc_comments": "Document comments",
-  "Tag_not_found": "Tag not found",
+  "Tag_not_found": "Der Tag wurde nicht gefunden",
   "Create_a_new_tag": "Neues Tag erstellen",
   "Search_tags": "Search tags",
-  "No_options_available": "Tag not found",
+  "No_options_available": "Der Tag wurde nicht gefunden",
   "Add_option": "Neues Tag erstellen",
   "Find_an_option": "Search tags",
   "Copy_link_of_section": "Copy link of section",
@@ -448,5 +448,7 @@
   "Create": "Erstellen",
   "Top_align": "Top",
   "Center_align": "Middle",
-  "Bottom_align": "Bottom"
+  "Bottom_align": "Bottom",
+  "Move_column_count": "Moving {{count}} column(s)",
+  "Move_row_count": "Moving {{count}} row(s)"
 }

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

@@ -448,5 +448,7 @@
   "Create": "Crear",
   "Top_align": "Top",
   "Center_align": "Middle",
-  "Bottom_align": "Bottom"
+  "Bottom_align": "Bottom",
+  "Move_column_count": "Moving {{count}} column(s)",
+  "Move_row_count": "Moving {{count}} row(s)"
 }

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

@@ -448,5 +448,7 @@
   "Create": "Créer",
   "Top_align": "Top",
   "Center_align": "Middle",
-  "Bottom_align": "Bottom"
+  "Bottom_align": "Bottom",
+  "Move_column_count": "Moving {{count}} column(s)",
+  "Move_row_count": "Moving {{count}} row(s)"
 }

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

@@ -448,5 +448,7 @@
   "Create": "Crea",
   "Top_align": "Top",
   "Center_align": "Middle",
-  "Bottom_align": "Bottom"
+  "Bottom_align": "Bottom",
+  "Move_column_count": "Moving {{count}} column(s)",
+  "Move_row_count": "Moving {{count}} row(s)"
 }

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

@@ -446,7 +446,9 @@
   "The_document_does_not_exist": "Документ не существует",
   "Create_a_new_sdoc_file": "Создать новый файл sdoc",
   "Create": "Создать",
-  "Top_align": "Top",
-  "Center_align": "Middle",
-  "Bottom_align": "Bottom"
+  "Top_align": "Верх",
+  "Center_align": "Середина",
+  "Bottom_align": "Низ",
+  "Move_column_count": "Перемещение {{count}} столбцов",
+  "Move_row_count": "Перемещение {{count}} строк"
 }

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

@@ -449,6 +449,6 @@
   "Top_align": "顶端对齐",
   "Center_align": "居中对齐",
   "Bottom_align": "底端对齐",
-  "Move_column_count": "正在移动{{count}}列",
-  "Move_row_count": "正在移动{{count}}行"
+  "Move_column_count": "移动{{count}}列",
+  "Move_row_count": "移动{{count}}行"
 }