@seafile/sdoc-editor 0.1.107 → 0.1.110

package/dist/basic-sdk/extension/plugins/code-block/plugin.js

@@ -97,6 +97,13 @@ var withCodeBlock = function withCodeBlock(editor) {
       node = _ref2[0],
       path = _ref2[1];
     var type = getNodeType(node);
+    if (type === 'code-line' && path.length <= 1) {
+      Transforms.setNodes(newEditor, {
+        type: 'paragraph'
+      }, {
+        at: path
+      });
+    }
     if (type === CODE_BLOCK) {
       // code-block is the last node in the editor and needs to be followed by a p node
       var isLast = isLastNode(newEditor, node);
@@ -116,6 +123,17 @@ var withCodeBlock = function withCodeBlock(editor) {
           mode: 'highest'
         });
       }
+      if (node.children.length > 1) {
+        node.children.forEach(function (child, index) {
+          if (child.type !== 'code-line') {
+            Transforms.setNodes(newEditor, {
+              type: 'code-line'
+            }, {
+              at: [].concat(_toConsumableArray(path), [index])
+            });
+          }
+        });
+      }
     }
 
     // Perform default behavior

package/dist/basic-sdk/extension/plugins/table/dialog/custom-table-size-dialog/index.js

@@ -4,7 +4,7 @@ import _inherits from "@babel/runtime/helpers/esm/inherits";
 import _createSuper from "@babel/runtime/helpers/esm/createSuper";
 import React, { Component } from 'react';
 import { withTranslation } from 'react-i18next';
-import { Modal, ModalHeader, ModalBody, ModalFooter, Button, Label } from 'reactstrap';
+import { Modal, ModalHeader, ModalBody, ModalFooter, Button, Label, Alert } from 'reactstrap';
 import { TABLE_MAX_ROWS, TABLE_MAX_COLUMNS } from '../../constants';
 import NumberInput from './number-input';
 import './index.css';
@@ -22,25 +22,33 @@ var CustomTableSizeDialog = /*#__PURE__*/function (_Component) {
       var _this$state = _this.state,
         rows = _this$state.rows,
         cols = _this$state.cols;
+      if (!rows || !cols || parseInt(rows) < 1 || parseInt(rows) > 50 || parseInt(cols) < 1 || parseInt(cols) > 50) {
+        _this.setState({
+          errorMessage: 'Valid_values_for_rows_and_columns'
+        });
+        return;
+      }
       _this.props.submit([parseInt(rows), parseInt(cols)]);
     };
     _this.rowsChange = function (event) {
       var value = event.target.value;
       if (value === _this.state.rows) return;
       _this.setState({
-        rows: value
+        rows: value,
+        errorMessage: ''
       });
     };
     _this.colsChange = function (event) {
       var value = event.target.value;
       if (value === _this.state.cols) return;
       _this.setState({
-        cols: value
+        cols: value,
+        errorMessage: ''
       });
     };
     _this.state = {
-      rows: '0',
-      cols: '0'
+      rows: '1',
+      cols: '5'
     };
     return _this;
   }
@@ -50,7 +58,8 @@ var CustomTableSizeDialog = /*#__PURE__*/function (_Component) {
       var t = this.props.t;
       var _this$state2 = this.state,
         rows = _this$state2.rows,
-        cols = _this$state2.cols;
+        cols = _this$state2.cols,
+        errorMessage = _this$state2.errorMessage;
       return /*#__PURE__*/React.createElement(Modal, {
         isOpen: true,
         toggle: this.toggle,
@@ -66,6 +75,7 @@ var CustomTableSizeDialog = /*#__PURE__*/function (_Component) {
       }, /*#__PURE__*/React.createElement(Label, {
         className: "mb-2"
       }, t('Rows')), /*#__PURE__*/React.createElement(NumberInput, {
+        min: 1,
         max: TABLE_MAX_ROWS,
         value: rows,
         onChange: this.rowsChange
@@ -74,10 +84,14 @@ var CustomTableSizeDialog = /*#__PURE__*/function (_Component) {
       }, /*#__PURE__*/React.createElement(Label, {
         className: "mb-2"
       }, t('Columns')), /*#__PURE__*/React.createElement(NumberInput, {
+        min: 1,
         max: TABLE_MAX_COLUMNS,
         value: cols,
         onChange: this.colsChange
-      })))), /*#__PURE__*/React.createElement(ModalFooter, null, /*#__PURE__*/React.createElement(Button, {
+      }))), errorMessage && /*#__PURE__*/React.createElement(Alert, {
+        className: "mt-2 mb-0",
+        color: "danger"
+      }, t(errorMessage))), /*#__PURE__*/React.createElement(ModalFooter, null, /*#__PURE__*/React.createElement(Button, {
         color: "secondary",
         onClick: this.toggle
       }, t('Cancel')), /*#__PURE__*/React.createElement(Button, {

package/dist/basic-sdk/extension/plugins/table/dialog/custom-table-size-dialog/number-input.js

@@ -11,7 +11,7 @@ function NumberInput(props) {
   return /*#__PURE__*/React.createElement(Input, {
     type: "number",
     className: className,
-    value: value || '0',
+    value: value,
     min: min,
     step: step,
     max: max,

package/dist/basic-sdk/socket/socket-manager.js

@@ -48,6 +48,9 @@ var SocketManager = /*#__PURE__*/_createClass(function SocketManager(editor, doc
       // Put the failed operation into the pending list and re-execute it
       _this.pendingOperationList.unshift(operations);
       _this.sendNextOperations();
+    } else if (error_type === 'document_content_load_failed') {
+      // After a short-term reconnection, the content of the document fails to load
+      _this.dispatchConnectState(error_type);
     } else if (error_type === 'operation_exec_error') {
       _this.editor.isRemote = true;
       revertOperationList(_this.editor, [operations]);

package/dist/components/doc-operations/index.js

@@ -6,6 +6,7 @@ import HistoryOperation from './history-operation';
 import CollaboratorsOperation from './collaborators-operation';
 import MoreOperations from './more-operations';
 import CommentsOperation from './comments-operation';
+import ShareOperation from './share-operation';
 import './style.css';
 var DocOperations = function DocOperations(_ref) {
   var isShowChanges = _ref.isShowChanges,
@@ -16,10 +17,6 @@ var DocOperations = function DocOperations(_ref) {
   }, /*#__PURE__*/React.createElement(RevisionOperations, {
     isShowChanges: isShowChanges,
     toggleViewChanges: toggleViewChanges
-  }), /*#__PURE__*/React.createElement(CommentsOperation, null), !isSdocRevision && /*#__PURE__*/React.createElement("span", {
-    className: "op-item"
-  }, /*#__PURE__*/React.createElement("i", {
-    className: "sdocfont sdoc-share"
-  })), /*#__PURE__*/React.createElement(HistoryOperation, null), /*#__PURE__*/React.createElement(CollaboratorsOperation, null), !isSdocRevision && /*#__PURE__*/React.createElement(MoreOperations, null));
+  }), /*#__PURE__*/React.createElement(CommentsOperation, null), !isSdocRevision && /*#__PURE__*/React.createElement(ShareOperation, null), /*#__PURE__*/React.createElement(HistoryOperation, null), /*#__PURE__*/React.createElement(CollaboratorsOperation, null), !isSdocRevision && /*#__PURE__*/React.createElement(MoreOperations, null));
 };
 export default withTranslation('sdoc-editor')(DocOperations);

package/dist/components/doc-operations/share-operation/index.js

@@ -0,0 +1,15 @@
+import React, { useCallback } from 'react';
+import { EventBus } from '../../../basic-sdk';
+import { EXTERNAL_EVENT } from '../../../constants';
+export default function ShareOperation() {
+  var onShareToggle = useCallback(function () {
+    var eventBus = EventBus.getInstance();
+    eventBus.dispatch(EXTERNAL_EVENT.SHARE_SDOC);
+  }, []);
+  return /*#__PURE__*/React.createElement("span", {
+    className: "op-item",
+    onClick: onShareToggle
+  }, /*#__PURE__*/React.createElement("i", {
+    className: "sdocfont sdoc-share"
+  }));
+}

package/dist/components/tip-message/index.js

@@ -22,6 +22,14 @@ var TipMessage = /*#__PURE__*/function (_React$Component) {
         duration: null
       });
     };
+    _this.onDocumentLoadError = function () {
+      var t = _this.props.t;
+      var message = t('Document_content_load_failed');
+      toaster.danger(message, {
+        hasCloseButton: true,
+        duration: null
+      });
+    };
     _this.onDisconnect = function () {
       var _this$props = _this.props,
         t = _this$props.t,
@@ -111,12 +119,14 @@ var TipMessage = /*#__PURE__*/function (_React$Component) {
 
       // op execute error
       this.unsubscribeOpExecError = eventBus.subscribe('operation_exec_error', this.onOperationExecuteError);
+      this.unsubscribeDocumentLoadError = eventBus.subscribe('document_content_load_failed', this.onDocumentLoadError);
     }
   }, {
     key: "componentWillUnmount",
     value: function componentWillUnmount() {
       this.unsubscribeSavingEvent();
       this.unsubscribeSavedEvent();
+      this.unsubscribeDocumentLoadError();
       clearTimeout(this.saveTimer);
     }
   }]);

package/dist/components/toast/toastManager.js

@@ -17,7 +17,7 @@ var wrapperClass = css({
   left: 0,
   right: 0,
   position: 'fixed',
-  zIndex: 30
+  zIndex: 120
 });
 var hasCustomId = function hasCustomId(settings) {
   return Object.hasOwnProperty.call(settings, 'id');

package/dist/constants/index.js

@@ -2,6 +2,7 @@ export var EXTERNAL_EVENT = {
   INTERNAL_LINK_CLICK: 'internal_link_click',
   TOGGLE_STAR: 'toggle_star',
   UNMARK_AS_DRAFT: 'unmark_as_draft',
+  SHARE_SDOC: 'share_sdoc',
   CANCEL_TABLE_SELECT_RANGE: 'cancel_table_select_range',
   SET_TABLE_SELECT_RANGE: 'set_table_select_range'
 };

package/package.json

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

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

@@ -25,6 +25,7 @@
   "Code_block": "Code block",
   "Insert_link": "Insert link",
   "Insert_table": "Insert table",
+  "Valid_values_for_rows_and_columns": "Valid values for the number of rows and columns are 0 to 50",
   "Save": "Save",
   "More": "More",
   "Invalid_url": "Invalid URL",
@@ -338,5 +339,6 @@
   "Reduce_font_size": "Reduce font size",
   "Font": "Font",
   "All_fonts": "All fonts",
-  "Default_font": "Default font"
+  "Default_font": "Default font",
+  "Document_content_load_failed": "Document content failed to load, please refresh the page to try again"
 }

package/public/locales/zh-CN/sdoc-editor.json

@@ -25,6 +25,7 @@
   "Code_block": "代码块",
   "Insert_link": "添加链接",
   "Insert_table": "添加表格",
+  "Valid_values_for_rows_and_columns": "行数和列数的有效值为 0 到 50",
   "Save": "保存",
   "More": "更多",
   "Invalid_url": "无效链接",
@@ -340,5 +341,6 @@
   "Reduce_font_size": "减小字号",
   "Font": "字体",
   "All_fonts": "所有字体",
-  "Default_font": "默认字体"
+  "Default_font": "默认字体",
+  "Document_content_load_failed": "文档内容加载失败, 请刷新页面重新访问"
 }