@seafile/sdoc-editor 0.5.52 → 0.5.53

package/dist/basic-sdk/editor/comment-article.js

@@ -70,6 +70,7 @@ const CommentArticle = _ref => {
     value: slateValue,
     onChange: updateSlateValue
   }, /*#__PURE__*/React.createElement(Editable, {
+    id: "sdoc-editor",
     scrollSelectionIntoView: handleScrollIntoView,
     cursors: cursors,
     renderElement: props => RenderCommentEditorCustomRenderElement(_objectSpread(_objectSpread({}, props), {}, {

package/dist/basic-sdk/extension/commons/Inline-bug-fix-wrapper/index.js

@@ -0,0 +1,11 @@
+import React from 'react';
+const InlineBugFixer = () => {
+  return /*#__PURE__*/React.createElement("span", {
+    contentEditable: false,
+    style: {
+      fontSize: 0
+    }
+  }, String.fromCodePoint(160) /* Non-breaking space */);
+};
+
+export default InlineBugFixer;

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

@@ -20,7 +20,8 @@ const ImageHoverMenu = _ref => {
     parentNodeEntry,
     imageCaptionInputRef,
     onHideImageHoverMenu,
-    t
+    t,
+    readonly
   } = _ref;
   const {
     data,
@@ -152,7 +153,7 @@ const ImageHoverMenu = _ref => {
     style: menuPosition
   }, /*#__PURE__*/React.createElement("div", {
     className: "hover-menu-container"
-  }, type !== TABLE && /*#__PURE__*/React.createElement("span", {
+  }, type !== TABLE && !readonly && /*#__PURE__*/React.createElement("span", {
     className: "op-group-item"
   }, /*#__PURE__*/React.createElement("span", {
     role: "button",
@@ -166,7 +167,7 @@ const ImageHoverMenu = _ref => {
     className: "mr-1"
   }, t(type === IMAGE_BLOCK ? 'Block' : 'Inline')), /*#__PURE__*/React.createElement("i", {
     className: "sdocfont sdoc-drop-down icon-font"
-  }))), /*#__PURE__*/React.createElement("span", {
+  }))), !readonly && /*#__PURE__*/React.createElement("span", {
     className: "op-group-item"
   }, type === IMAGE_BLOCK && /*#__PURE__*/React.createElement("span", {
     role: "button",

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

@@ -254,12 +254,13 @@ const Image = _ref => {
     onCompositionStart: e => {
       e.stopPropagation();
     }
-  }))), children), isSelected && isShowImageHoverMenu && !readOnly && /*#__PURE__*/React.createElement(ImageHoverMenu, {
+  }))), children), isShowImageHoverMenu && /*#__PURE__*/React.createElement(ImageHoverMenu, {
     editor: editor,
     menuPosition: menuPosition,
     element: element,
     parentNodeEntry: nodeEntry,
     imageCaptionInputRef: imageCaptionInputRef,
+    readonly: readOnly,
     onHideImageHoverMenu: () => {
       setIsShowImageHoverMenu(false);
     }

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

@@ -66,10 +66,6 @@ export const insertLink = function (editor, title, url) {
     }
     const p = generateEmptyElement(ELEMENT_TYPE.PARAGRAPH);
     p.children[1] = linkNode;
-    p.children[2] = {
-      id: slugid.nice(),
-      text: ' '
-    };
     Transforms.insertNodes(editor, p, {
       at: [path[0] + 1]
     });
@@ -85,12 +81,6 @@ export const insertLink = function (editor, title, url) {
   if (isCollapsed) {
     const linkNode = genLinkNode(url, title);
     Transforms.insertNodes(editor, linkNode);
-
-    // Not being able to use insertText directly causes the added Spaces to be added to the linked text, as in the issue above, replaced by insertFragment
-    editor.insertFragment([{
-      id: slugid.nice(),
-      text: ' '
-    }]);
   } else {
     const selectedText = Editor.string(editor, selection); // Selected text
     if (selectedText !== title) {

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

@@ -1,5 +1,4 @@
-import { Transforms, Node, Editor, Range } from '@seafile/slate';
-import slugid from 'slugid';
+import { Transforms, Node, Editor, Range, Element } from '@seafile/slate';
 import isUrl from 'is-url';
 import context from '../../../../context';
 import { insertSdocFileLink } from '../sdoc-link/helpers';
@@ -12,7 +11,6 @@ const withLink = editor => {
     normalizeNode,
     isInline,
     insertData,
-    insertText,
     insertFragment
   } = editor;
   const newEditor = editor;
@@ -27,17 +25,6 @@ const withLink = editor => {
     }
     return isInline(elem);
   };
-  newEditor.insertText = text => {
-    const path = Editor.path(editor, editor.selection);
-    if (Range.isCollapsed(editor.selection) && getSelectedNodeByType(editor, LINK) && Editor.isEnd(editor, editor.selection.focus, path)) {
-      editor.insertFragment([{
-        id: slugid.nice(),
-        text: text
-      }]);
-      return;
-    }
-    return insertText(text);
-  };
   newEditor.insertData = data => {
     // Paste link content
     const text = data.getData('text/plain');
@@ -95,6 +82,20 @@ const withLink = editor => {
     }
     return normalizeNode([node, path]);
   };
+  editor.onCompositionStart = e => {
+    const {
+      selection
+    } = editor;
+    if (Range.isCollapsed(selection)) {
+      const [LinkNodeEntry] = Editor.nodes(editor, {
+        match: n => Element.isElement && n.type === LINK
+      });
+      if (LinkNodeEntry) {
+        e.preventDefault();
+        return true;
+      }
+    }
+  };
   return newEditor;
 };
 export default withLink;

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

@@ -6,6 +6,7 @@ import LinkHover from './hover';
 import EventBus from '../../../utils/event-bus';
 import { INTERNAL_EVENT } from '../../../constants';
 import { ELEMENT_TYPE } from '../../constants';
+import InlineBugFixer from '../../commons/Inline-bug-fix-wrapper';
 class LinkHoverMenuComponent extends React.Component {
   constructor(props) {
     super(props);
@@ -95,7 +96,7 @@ class LinkHoverMenuComponent extends React.Component {
     }), /*#__PURE__*/React.createElement("span", {
       className: "virtual-link",
       title: element.title
-    }, children)), isShowLinkMenu && (this.props.readonly || Range.isCollapsed(editor.selection)) && /*#__PURE__*/React.createElement(LinkHover, {
+    }, /*#__PURE__*/React.createElement(InlineBugFixer, null), children, /*#__PURE__*/React.createElement(InlineBugFixer, null))), isShowLinkMenu && (this.props.readonly || Range.isCollapsed(editor.selection)) && /*#__PURE__*/React.createElement(LinkHover, {
       editor: editor,
       menuPosition: menuPosition,
       element: element,

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

@@ -1878,4 +1878,34 @@ export const getTableColumnSelectedRange = (table, columnIndex) => {
     minColIndex,
     maxColIndex
   };
+};
+export const isTableWidthFitScreen = editor => {
+  const {
+    table
+  } = getSelectedInfo(editor);
+  const tableNode = ReactEditor.toDOMNode(editor, table);
+  if (!tableNode) return;
+  const tableDom = tableNode.querySelector('.sdoc-table-scroll-wrapper');
+  const {
+    width: tableWidth
+  } = tableDom.getBoundingClientRect();
+  const sdocWidth = editor.width;
+  if (tableWidth >= sdocWidth) return true;
+  return false;
+};
+export const fitTableColumnToScreen = editor => {
+  const {
+    table,
+    tablePath
+  } = getSelectedInfo(editor);
+  const colCount = table.columns.length;
+  const columnWidth = Math.max(TABLE_CELL_MIN_WIDTH, parseInt(editor.width / colCount));
+  const columns = table.columns.map(column => _objectSpread(_objectSpread({}, column), {}, {
+    width: columnWidth
+  }));
+  Transforms.setNodes(editor, {
+    columns
+  }, {
+    at: tablePath
+  });
 };

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

@@ -6,7 +6,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, combineCells } from '../../helpers';
+import { insertTableElement, removeTableElement, combineCells, isTableWidthFitScreen, fitTableColumnToScreen } from '../../helpers';
 import InsertTableElement from './insert-table-element';
 import EventBus from '../../../../../utils/event-bus';
 import { INTERNAL_EVENT } from '../../../../../constants';
@@ -66,7 +66,8 @@ class TableContextMenu extends React.Component {
       });
     });
     this.state = {
-      contextStyle: {}
+      contextStyle: {},
+      isDisableFitTableWidthToScreen: false
     };
     this.position = null;
     this.eventBus = EventBus.getInstance();
@@ -97,7 +98,8 @@ class TableContextMenu extends React.Component {
   }
   render() {
     const {
-      contextStyle
+      contextStyle,
+      isDisableFitTableWidthToScreen
     } = this.state;
     const {
       editor,
@@ -118,6 +120,17 @@ class TableContextMenu extends React.Component {
     const enableCombineCell = !ObjectUtils.isSameObject(tableSelectedRange, EMPTY_SELECTED_RANGE);
     const enableSplitCell = !enableCombineCell;
     const isMergedCell = this.isMergedCell();
+
+    // Check if the table width is fit to screen
+    // Use queueMicrotask to resolve the issue that the table cell combined or split, the table width is not updated immediately
+    queueMicrotask(() => {
+      const isDisable = isTableWidthFitScreen(editor);
+      if (isDisableFitTableWidthToScreen !== isDisable) {
+        this.setState({
+          isDisableFitTableWidthToScreen: isTableWidthFitScreen(editor)
+        });
+      }
+    });
     return /*#__PURE__*/React.createElement(ElementPopover, {
       className: "sdoc-context-menu"
     }, /*#__PURE__*/React.createElement("div", {
@@ -160,7 +173,13 @@ class TableContextMenu extends React.Component {
       className: "dropdown-item",
       disabled: !isMergedCell || !enableSplitCell,
       onMouseDown: this.toggleSplitCellSettingDialog
-    }, t('Split_cell'))));
+    }, t('Split_cell')), /*#__PURE__*/React.createElement("div", {
+      className: 'seafile-divider dropdown-divider'
+    }), /*#__PURE__*/React.createElement("button", {
+      className: "dropdown-item",
+      disabled: isDisableFitTableWidthToScreen,
+      onMouseDown: () => fitTableColumnToScreen(editor)
+    }, t('Fit_table_to_page_width'))));
   }
 }
 export default withTranslation('sdoc-editor')(TableContextMenu);

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

@@ -16,6 +16,14 @@ const renderText = (props, editor) => {
     rest = _objectWithoutProperties(leaf, _excluded);
   let markedChildren = React.cloneElement(children);
   let style = {};
+  // The following is a workaround for a Chromium bug where,
+  // if you have an inline at the end of a block,
+  // clicking the end of a block puts the cursor inside the inline
+  // instead of inside the final {text: ''} node
+  // https://github.com/ianstormtaylor/slate/issues/4704#issuecomment-1006696364
+  if (!text.length) {
+    style['paddingLeft'] = '0.1px';
+  }
   if (leaf.isCaret) {
     style['position'] = 'relative';
     style['display'] = 'inline-block';

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

@@ -19,12 +19,13 @@ const generatorDiffTextElement = function (textElement, diffType) {
 };
 export const getTopLevelChanges = changes => {
   const topLevelChanges = [];
+  const articleEl = document.getElementById('sdoc-editor');
   changes.forEach(item => {
     let dom = document.querySelectorAll("[data-id=\"".concat(item, "\"]"))[0];
     if (!dom) return [];
-    while (((_dom = dom) === null || _dom === void 0 ? void 0 : (_dom$dataset = _dom.dataset) === null || _dom$dataset === void 0 ? void 0 : _dom$dataset.root) !== 'true') {
-      var _dom, _dom$dataset, _dom2;
-      if (!((_dom2 = dom) === null || _dom2 === void 0 ? void 0 : _dom2.parentNode) || dom instanceof Document) break;
+    while (((_dom = dom) === null || _dom === void 0 ? void 0 : (_dom$dataset = _dom.dataset) === null || _dom$dataset === void 0 ? void 0 : _dom$dataset.root) !== 'true' || ((_dom2 = dom) === null || _dom2 === void 0 ? void 0 : _dom2.parentNode) !== articleEl) {
+      var _dom, _dom$dataset, _dom2, _dom3;
+      if (!((_dom3 = dom) === null || _dom3 === void 0 ? void 0 : _dom3.parentNode) || dom instanceof Document) break;
       const parentNode = dom.parentNode;
       if (parentNode instanceof Document) {
         break;

package/dist/basic-sdk/views/readonly-article.js

@@ -18,6 +18,7 @@ const ReadOnlyArticle = _ref => {
   }, /*#__PURE__*/React.createElement(ArticleContainer, {
     editor: editor
   }, /*#__PURE__*/React.createElement(Fragment, null, /*#__PURE__*/React.createElement(SetNodeToDecorations, null), /*#__PURE__*/React.createElement(Editable, {
+    id: "sdoc-editor",
     readOnly: true,
     placeholder: "",
     renderElement: renderElement,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seafile/sdoc-editor",
-  "version": "0.5.52",
+  "version": "0.5.53",
   "private": false,
   "description": "This is a sdoc editor",
   "main": "dist/index.js",
@@ -47,7 +47,7 @@
   "scripts": {
     "clean": "rm -rf dist && mkdir dist",
     "start.bak": "node scripts/start.js",
-    "start": "export NODE_ENV=development LOG_ENV=rc && node dev-server.js",
+    "start": "cross-env NODE_ENV=development node dev-server.js",
     "build": "node scripts/build.js",
     "pub:dist": "export BABEL_ENV=production && ./node_modules/.bin/babel src --out-dir dist --copy-files",
     "push-translate": "tx push -s",
@@ -92,6 +92,7 @@
     "case-sensitive-paths-webpack-plugin": "2.2.0",
     "clean-webpack-plugin": "4.0.0",
     "core-js": "2.6.12",
+    "cross-env": "^7.0.3",
     "css-loader": "^6.5.1",
     "css-minimizer-webpack-plugin": "5.0.1",
     "dotenv": "6.2.0",

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

@@ -456,5 +456,6 @@
   "Print": "Print",
   "Enter_more_character_start_search": "Enter more characters to start search",
   "Create_file_name_sdoc": "Create {{file_name_sdoc}}",
-  "Source_document_changed_tip": "Original document has concurrent modifications. Do you like to merge these modifications to the revision?"
+  "Source_document_changed_tip": "Original document has concurrent modifications. Do you like to merge these modifications to the revision?",
+  "Fit_table_to_page_width": "Fit table to page width"
 }

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

@@ -456,5 +456,6 @@
   "Print": "打印",
   "Enter_more_character_start_search": "输入更多字符开始搜索",
   "Create_file_name_sdoc": "新建 {{file_name_sdoc}}",
-  "Source_document_changed_tip": "源文档有并发的改动。你需要合并这些改动到修订稿吗?"
+  "Source_document_changed_tip": "源文档有并发的改动。你需要合并这些改动到修订稿吗?",
+  "Fit_table_to_page_width": "自动适应页面宽度"
 }