@seafile/sdoc-editor 0.3.21 → 0.3.22

package/dist/basic-sdk/assets/css/sdoc-editor-plugins.css

@@ -28,6 +28,10 @@
   padding-left: 1.2em !important;
 }
 
+.sdoc-editor-container .article .list-container .sdoc-li-blod::marker {
+  font-weight: bold;
+}
+
 /* check list  */
 .sdoc-editor-container .article .sdoc-checkbox-container {
   padding: 0px 2px;

package/dist/basic-sdk/extension/plugins/list/render-elem.js

@@ -1,4 +1,5 @@
 import React from 'react';
+import classnames from 'classnames';
 import { ORDERED_LIST } from '../../constants';
 const renderList = (props, editor) => {
   const {
@@ -33,11 +34,14 @@ const renderListItem = (props, editor) => {
     default:
       className = '';
   }
+  const isBlod = element.children[0].children.every(item => item.bold === true);
   return /*#__PURE__*/React.createElement("li", Object.assign({
     "data-id": element.id,
     "data-root": "true"
   }, attributes, {
-    className: className
+    className: classnames(className, {
+      'sdoc-li-blod': isBlod
+    })
   }), children);
 };
 const renderListLic = (props, editor) => {

package/dist/basic-sdk/extension/plugins/table/constants/index.js

@@ -36,4 +36,6 @@ export const TABLE_ALTERNATE_HIGHLIGHT_CLASS_MAP = {
   '#2367f2': 'sdoc-table-2367f2',
   '#f77d21': 'sdoc-table-f77d21',
   '#0099f4': 'sdoc-table-0099f4'
-};
+};
+export const INHERIT_CELL_STYLE_WHEN_SELECT_SINGLE = ['background_color'];
+export const INHERIT_CELL_STYLE_WHEN_SELECT_MULTIPLE = ['background_color', 'text_align'];

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

@@ -1,11 +1,11 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import slugid from 'slugid';
-import { Editor, Range, Transforms, Point, Node } from '@seafile/slate';
+import { Editor, Range, Transforms, Point, Node, Path } from '@seafile/slate';
 import { ReactEditor } from '@seafile/slate-react';
 import deepCopy from 'deep-copy';
-import { getNodeType, getParentNode, getSelectedNodeByType, isTextNode, getSelectedElems, focusEditor, getNode, findPath, replaceNodeChildren, replaceNode } from '../../core';
+import { getNodeType, getParentNode, getSelectedNodeByType, isTextNode, getSelectedElems, focusEditor, getNode, findPath, replaceNodeChildren, replaceNode, getSelectedNodeEntryByType, getAboveBlockNode } from '../../core';
 import { ELEMENT_TYPE, KEYBOARD, CLIPBOARD_FORMAT_KEY, INSERT_POSITION } from '../../constants';
-import { TABLE_MAX_ROWS, TABLE_MAX_COLUMNS, EMPTY_SELECTED_RANGE, TABLE_ROW_MIN_HEIGHT, TABLE_CELL_MIN_WIDTH, TABLE_ELEMENT, TABLE_ELEMENT_POSITION, TABLE_ROW_STYLE } from './constants';
+import { TABLE_MAX_ROWS, TABLE_MAX_COLUMNS, EMPTY_SELECTED_RANGE, TABLE_ROW_MIN_HEIGHT, TABLE_CELL_MIN_WIDTH, TABLE_ELEMENT, TABLE_ELEMENT_POSITION, TABLE_ROW_STYLE, INHERIT_CELL_STYLE_WHEN_SELECT_MULTIPLE, INHERIT_CELL_STYLE_WHEN_SELECT_SINGLE } from './constants';
 import EventBus from '../../../utils/event-bus';
 import { INTERNAL_EVENT, PAGE_EDIT_AREA_WIDTH } from '../../../constants';
 import ObjectUtils from '../../../utils/object-utils';
@@ -54,20 +54,28 @@ export const isCombineCellsDisabled = (editor, readonly) => {
   }
   return true;
 };
-export const generateTableCell = () => {
+export const generateTableCell = (editor, rowIndex, cellIndex) => {
+  let style = {};
+  const tableNodeEntry = getSelectedNodeEntryByType(editor, ELEMENT_TYPE.TABLE);
+  if (tableNodeEntry && rowIndex !== undefined && cellIndex !== undefined) {
+    const [, tablePath] = tableNodeEntry;
+    style = getCellInheritStyles(editor, tablePath, rowIndex, cellIndex);
+  }
   return {
     id: slugid.nice(),
     type: ELEMENT_TYPE.TABLE_CELL,
     children: [{
       text: '',
       id: slugid.nice()
-    }]
+    }],
+    style,
+    inherit_style: style
   };
 };
-export const generateTableRow = colsCount => {
+export const generateTableRow = (editor, colsCount, rowIndex) => {
   let children = [];
   for (let i = 0; i < colsCount; i++) {
-    const tableCell = generateTableCell();
+    const tableCell = generateTableCell(editor, rowIndex, i);
     children.push(tableCell);
   }
   return {
@@ -97,7 +105,7 @@ export const generateEmptyTable = (editor, tableProps) => {
   const colsCount = size[1];
   let children = [];
   for (let i = 0; i < rowsCount; i++) {
-    const tableRow = generateTableRow(colsCount);
+    const tableRow = generateTableRow(editor, colsCount, i);
     children.push(tableRow);
   }
   const columnWidth = Math.max(TABLE_CELL_MIN_WIDTH, parseInt(editor.width / colsCount));
@@ -133,16 +141,10 @@ export const insertTable = function (editor, size, selection) {
   });
   const validSelection = selection || editor.selection;
   const path = Editor.path(editor, validSelection);
-  if (position === INSERT_POSITION.AFTER) {
-    Transforms.insertNodes(editor, tableNode, {
-      at: [path[0] + 1]
-    });
-    return;
-  }
-  Transforms.insertNodes(editor, tableNode, {
-    at: [path[0]]
-  });
+  handleInsertTable(editor, position, path, tableNode);
 };
+
+// tableSize [tableHeight, tableWidth]
 export const getSelectedInfo = editor => {
   const currentTable = getSelectedNodeByType(editor, ELEMENT_TYPE.TABLE);
   const currentRow = getSelectedNodeByType(editor, ELEMENT_TYPE.TABLE_ROW);
@@ -175,6 +177,7 @@ export const isAllInTable = editor => {
 };
 
 export const setCellStyle = (editor, style) => {
+  // Select single cell
   if (ObjectUtils.isSameObject(editor.tableSelectedRange, EMPTY_SELECTED_RANGE)) {
     const selectedNodes = getSelectedElems(editor);
     let firstTableCellNodePath;
@@ -184,7 +187,8 @@ export const setCellStyle = (editor, style) => {
         if (path) {
           firstTableCellNodePath = firstTableCellNodePath ? firstTableCellNodePath : path;
           Transforms.setNodes(editor, {
-            style: _objectSpread(_objectSpread({}, node.style), style)
+            style: _objectSpread(_objectSpread({}, node.style), style),
+            inherit_style: generateInheritStyle(INHERIT_CELL_STYLE_WHEN_SELECT_SINGLE, style, node)
           }, {
             at: path
           });
@@ -202,6 +206,7 @@ export const setCellStyle = (editor, style) => {
     }
     return;
   }
+  // Select multiple cells
   const {
     minColIndex,
     maxColIndex,
@@ -216,7 +221,8 @@ export const setCellStyle = (editor, style) => {
       const path = [...tablePath, i, j];
       const node = getNode(editor, path);
       Transforms.setNodes(editor, {
-        style: _objectSpread(_objectSpread({}, node.style), style)
+        style: _objectSpread(_objectSpread({}, node.style), style),
+        inherit_style: generateInheritStyle(INHERIT_CELL_STYLE_WHEN_SELECT_MULTIPLE, style, node)
       }, {
         at: path
       });
@@ -228,7 +234,7 @@ export const insertTableRow = function (editor, table, rowIndex) {
   const tableRowCount = table.children.length;
   if (tableRowCount >= TABLE_MAX_ROWS) return;
   const tableColumnCount = table.children[0].children.length;
-  const row = generateTableRow(tableColumnCount);
+  const row = generateTableRow(editor, tableColumnCount, rowIndex);
   const tablePath = findPath(editor, table);
   const targetPath = position === TABLE_ELEMENT_POSITION.AFTER ? [...tablePath, rowIndex + 1] : [...tablePath, rowIndex];
   Transforms.insertNodes(editor, row, {
@@ -303,7 +309,7 @@ export const insertTableColumn = function (editor, table, columnIndex) {
   const tableRowCount = table.children.length;
   for (let i = 0; i < tableRowCount; i++) {
     const newCellPath = [...tablePath, i, newCellIndex];
-    const newCell = generateTableCell();
+    const newCell = generateTableCell(editor, i, columnIndex);
     Transforms.insertNodes(editor, newCell, {
       at: newCellPath
     });
@@ -382,7 +388,7 @@ export const insertTableElement = function (editor, type) {
     const targetPath = position === TABLE_ELEMENT_POSITION.AFTER ? [...tablePath, rowIndex + 1] : [...tablePath, rowIndex];
     const validCount = Math.min(TABLE_MAX_ROWS - tableSize[0], count);
     for (let i = 0; i < validCount; i++) {
-      const row = generateTableRow(tableSize[1]);
+      const row = generateTableRow(editor, tableSize[1], rowIndex);
       Transforms.insertNodes(editor, row, {
         at: targetPath
       });
@@ -406,7 +412,7 @@ export const insertTableElement = function (editor, type) {
     for (let j = 0; j < validCount; j++) {
       for (let i = 0; i < tableSize[0]; i++) {
         const newCellPath = [...tablePath, i, newCellIndex];
-        const newCell = generateTableCell();
+        const newCell = generateTableCell(editor, i, cellIndex);
         Transforms.insertNodes(editor, newCell, {
           at: newCellPath
         });
@@ -450,7 +456,7 @@ export const combineCells = editor => {
     }
   }
   const targetCellPath = [...tablePath, minRowIndex, minColIndex];
-  const newCell = generateTableCell();
+  const newCell = generateTableCell(editor);
   newCell.children = newCellContent;
   newCell.rowspan = maxRowIndex - minRowIndex + 1;
   newCell.colspan = maxColIndex - minColIndex + 1;
@@ -494,7 +500,7 @@ export const splitCell = (editor, rowNumber, columnNumber) => {
     let newRowSpan = rowspanBase + (i + 1 <= rowspanLeft ? 1 : 0);
     let colspanSum = 0;
     for (let j = 0; j < columnNumber; j++) {
-      const newCell = generateTableCell();
+      const newCell = generateTableCell(editor);
       let startIndex = (i * columnNumber + j) * dataBlockNumber;
       if (startIndex < cell.children.length) {
         let endIndex = Math.min(startIndex + dataBlockNumber, cell.children.length);
@@ -661,7 +667,7 @@ export const handleCombinedCellsBeforeDeleteTableRow = (editor, tablePath, table
     } else {
       if (rowspan > 1) {
         const targetCellPath = [...tablePath, rowIndex + 1, i];
-        const newCell = generateTableCell();
+        const newCell = generateTableCell(editor);
         newCell.rowspan = rowspan - 1;
         newCell.colspan = colspan;
         Transforms.removeNodes(editor, {
@@ -701,7 +707,7 @@ export const handleCombinedCellsBeforeDeleteTableColumn = (editor, tablePath, ta
     } else {
       if (colspan > 1) {
         const targetCellPath = [...tablePath, i, columnIndex + 1];
-        const newCell = generateTableCell();
+        const newCell = generateTableCell(editor);
         newCell.rowspan = rowspan;
         newCell.colspan = colspan - 1;
         Transforms.removeNodes(editor, {
@@ -878,7 +884,7 @@ export const insertMultipleRowsAndColumns = (editor, rows, columns) => {
   const validInsertColumns = insertColumns.slice(0, Math.min(TABLE_MAX_COLUMNS - tableSize[1], columns.length));
   for (let i = 0; i < validInsertRows.length; i++) {
     const insertRow = validInsertRows[i];
-    const row = generateTableRow(tableSize[1]);
+    const row = generateTableRow(editor, tableSize[1], rowIndex);
     row.style = insertRow.style;
     newTable.children.push(row);
   }
@@ -887,7 +893,7 @@ export const insertMultipleRowsAndColumns = (editor, rows, columns) => {
   }
   for (let j = 0; j < validInsertColumns.length; j++) {
     for (let i = 0; i < tableSize[0] + validInsertRows.length; i++) {
-      const newCell = generateTableCell();
+      const newCell = generateTableCell(editor);
       newTable.children[i].children.push(newCell);
     }
   }
@@ -1244,8 +1250,8 @@ export const getRowHeight = (element, rowIndex) => {
   const rowHeight = style[TABLE_ROW_STYLE.MIN_HEIGHT] || TABLE_ROW_MIN_HEIGHT;
   return rowIndex === 0 ? rowHeight + 1 : rowHeight;
 };
-const normalizeTableCell = cell => {
-  if (!cell) return generateTableCell();
+const normalizeTableCell = (editor, cell) => {
+  if (!cell) return generateTableCell(editor);
   let newCell = _objectSpread({
     children: [{
       text: '',
@@ -1300,7 +1306,7 @@ export const normalizeTableELement = (editor, element) => {
   for (let i = 0; i < element.children.length; i++) {
     const row = newElement.children[i];
     for (let j = 0; j < row.children.length; j++) {
-      row.children[j] = normalizeTableCell(row.children[j]);
+      row.children[j] = normalizeTableCell(editor, row.children[j]);
     }
     newElement.children[i] = row;
   }
@@ -1314,7 +1320,73 @@ export const insertTableByTemplate = (editor, alternateColor) => {
     alternate_highlight: true
   });
   const path = Editor.path(editor, editor.selection);
-  Transforms.insertNodes(editor, tableNode, {
-    at: [path[0]]
+  const insertPosition = getInsertPosition(editor);
+  handleInsertTable(editor, insertPosition, path, tableNode);
+};
+
+/**
+ * @param {Editor} editor
+ * @param {InsertPosition} insertPosition
+ * @param {Path} path
+ * @param {Node} tableNode
+ * Insert table by insertPosition
+ */
+export const handleInsertTable = (editor, insertPosition, path, tableNode) => {
+  const {
+    selection
+  } = editor;
+  if (insertPosition === INSERT_POSITION.BEFORE) {
+    const insertPath = [path[0]];
+    Transforms.insertNodes(editor, tableNode, {
+      at: insertPath
+    });
+  } else if (insertPosition === INSERT_POSITION.AFTER) {
+    const insertPath = [path[0] + 1];
+    Transforms.insertNodes(editor, tableNode, {
+      at: insertPath
+    });
+  } else if (insertPosition === INSERT_POSITION.CURRENT) {
+    Transforms.splitNodes(editor, {
+      at: selection,
+      always: true
+    });
+    Transforms.insertNodes(editor, tableNode, {
+      at: selection.anchor
+    });
+  }
+};
+export const getInsertPosition = editor => {
+  const {
+    selection
+  } = editor;
+  if (!selection) return INSERT_POSITION.CURRENT;
+  if (!Range.isCollapsed(selection)) return INSERT_POSITION.CURRENT;
+  const aboveNodeEntry = getAboveBlockNode(editor);
+  if (!aboveNodeEntry) return INSERT_POSITION.CURRENT;
+  const isAtStart = Editor.isStart(editor, selection.anchor, aboveNodeEntry[1]);
+  if (isAtStart) return INSERT_POSITION.BEFORE;
+  const isAtEnd = Editor.isEnd(editor, selection.anchor, aboveNodeEntry[1]);
+  if (isAtEnd) return INSERT_POSITION.AFTER;
+  return INSERT_POSITION.CURRENT;
+};
+export const generateInheritStyle = (allowedInheritStyleList, style, cell) => {
+  const inheritStyle = _objectSpread({}, cell['inherit_style']) || {};
+  for (const key in style) {
+    if (Object.hasOwnProperty.call(style, key) && allowedInheritStyleList.includes(key)) {
+      inheritStyle[key] = style[key];
+    }
+  }
+  return inheritStyle;
+};
+export const getCellInheritStyles = (editor, tablePath, rowIndex, colIndex) => {
+  var _table$children$rowIn, _tableCell$inherit_st;
+  const [tableNodeEntry] = Editor.nodes(editor, {
+    match: n => n.type === ELEMENT_TYPE.TABLE,
+    at: tablePath
   });
+  if (!tableNodeEntry) return {};
+  const table = tableNodeEntry[0];
+  const tableCell = (_table$children$rowIn = table.children[rowIndex]) === null || _table$children$rowIn === void 0 ? void 0 : _table$children$rowIn.children[colIndex];
+  if (!tableCell) return {};
+  return (_tableCell$inherit_st = tableCell['inherit_style']) !== null && _tableCell$inherit_st !== void 0 ? _tableCell$inherit_st : {};
 };

package/dist/basic-sdk/extension/plugins/table/menu/table-context-menu/index.js

@@ -5,7 +5,7 @@ import { ElementPopover } from '../../../../commons';
 import { ELEMENT_TYPE } from '../../../../constants';
 import { getSelectedNodeByType } from '../../../../core';
 import { TABLE_MAX_COLUMNS, TABLE_MAX_ROWS, TABLE_ELEMENT, TABLE_ELEMENT_POSITION, EMPTY_SELECTED_RANGE } from '../../constants';
-import { insertTableElement, removeTableElement, getSelectedInfo, combineCells } from '../../helpers';
+import { insertTableElement, removeTableElement, combineCells } from '../../helpers';
 import InsertTableElement from './insert-table-element';
 import EventBus from '../../../../../utils/event-bus';
 import { INTERNAL_EVENT } from '../../../../../constants';
@@ -84,6 +84,16 @@ class TableContextMenu extends React.Component {
   componentWillUnmount() {
     this.menu = null;
   }
+  isMergedCell() {
+    const {
+      editor
+    } = this.props;
+    const {
+      colspan,
+      rowspan
+    } = getSelectedNodeByType(editor, ELEMENT_TYPE.TABLE_CELL);
+    return colspan > 1 || rowspan > 1;
+  }
   render() {
     const {
       contextStyle
@@ -106,6 +116,7 @@ class TableContextMenu extends React.Component {
     const canAddColsCount = currentColumnsCount + selectedCols > TABLE_MAX_COLUMNS ? TABLE_MAX_COLUMNS - currentColumnsCount : selectedCols;
     const enableCombineCell = !ObjectUtils.isSameObject(tableSelectedRange, EMPTY_SELECTED_RANGE);
     const enableSplitCell = !enableCombineCell;
+    const isMergedCell = this.isMergedCell();
     return /*#__PURE__*/React.createElement(ElementPopover, {
       className: "sdoc-context-menu"
     }, /*#__PURE__*/React.createElement("div", {
@@ -146,7 +157,7 @@ class TableContextMenu extends React.Component {
       onMouseDown: this.combineCells
     }, t('Combine_cell')), /*#__PURE__*/React.createElement("button", {
       className: "dropdown-item",
-      disabled: !enableSplitCell,
+      disabled: !isMergedCell || !enableSplitCell,
       onMouseDown: this.toggleSplitCellSettingDialog
     }, t('Split_cell'))));
   }

package/dist/basic-sdk/extension/plugins/table/menu/table-menu/index.js

@@ -1,6 +1,6 @@
 import React, { useCallback } from 'react';
 import { withTranslation } from 'react-i18next';
-import { insertTable, isTableMenuDisabled } from '../../helpers';
+import { getInsertPosition, insertTable, isTableMenuDisabled } from '../../helpers';
 import { MENUS_CONFIG_MAP, ELEMENT_TYPE, INSERT_POSITION } from '../../../../constants';
 import TableSizePopover from '../../popover/table-size-popover';
 import ElementDropdownMenuItem from '../../../../commons/dropdown-menu-item';
@@ -13,7 +13,8 @@ const TableMenu = _ref => {
   const disabled = isTableMenuDisabled(editor, readonly);
   const menuConfig = MENUS_CONFIG_MAP[ELEMENT_TYPE.TABLE];
   const createTable = useCallback(size => {
-    insertTable(editor, size, editor.selection, INSERT_POSITION.CURRENT);
+    const insertPosition = getInsertPosition(editor, INSERT_POSITION.AFTER);
+    insertTable(editor, size, editor.selection, insertPosition);
   }, [editor]);
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(ElementDropdownMenuItem, {
     disabled: disabled,

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

@@ -26,7 +26,6 @@ const withTable = editor => {
   const eventBus = EventBus.getInstance();
   newEditor.tableOnKeyDown = event => {
     // Handle special keyboard events
-
     if (isHotkey('mod+a', event)) {
       event.preventDefault();
       const {

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

@@ -7,7 +7,7 @@ import ObjectUtils from '../../../../utils/object-utils';
 import { findPath, focusEditor } from '../../../core';
 import { useResizeHandlersContext, useTableSelectedRangeContext } from './hooks';
 import { EMPTY_SELECTED_RANGE, SELECTED_TABLE_CELL_BACKGROUND_COLOR, TABLE_CELL_STYLE } from '../constants';
-import { getTableColumns, getCellColumn, colorBlend } from '../helpers';
+import { getTableColumns, colorBlend } from '../helpers';
 const TableCell = _ref => {
   let {
     attributes,
@@ -67,6 +67,9 @@ const TableCell = _ref => {
     colspan = 1
   } = element;
   style.gridArea = "".concat(rowIndex + 1, " / ").concat(cellIndex + 1, " / span ").concat(rowspan, " / span ").concat(colspan);
+  if (element.style) {
+    style = _objectSpread(_objectSpread({}, element.style), style);
+  }
   return /*#__PURE__*/React.createElement("div", Object.assign({}, attributes, {
     style: _objectSpread(_objectSpread({}, element.style), style),
     className: classnames('table-cell', attributes.className, {

package/dist/components/tooltip/index.css

@@ -1,3 +1,7 @@
+.sdoc-tooltip {
+  pointer-events: none;
+}
+
 .sdoc-tooltip .tooltip-inner {
   font-weight: lighter;
   text-align: start;

package/package.json

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