@seafile/sdoc-editor 3.0.68 → 3.0.69

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

@@ -96,7 +96,7 @@
 .sdoc-editor__article .sdoc-image-wrapper {
   position: relative;
   display: inline-block;
-  margin: 5px 0.15em;
+  margin: 5px 0;
   caret-color: transparent;
   max-width: 99%;
 }
@@ -136,7 +136,7 @@
 .sdoc-editor__article .sdoc-image-inner {
   position: relative;
   display: inline-block;
-  margin: 0 3px;
+  margin: 0;
 }
 
 .sdoc-editor__article .sdoc-image-content {

package/dist/extension/plugins/image/helpers.js

@@ -90,7 +90,9 @@ var insertImage = exports.insertImage = function insertImage(editor, imgInfos, s
   });
   var validSelection = selection || editor.selection;
   var path = _slate.Editor.path(editor, validSelection);
-  if (position === _constants2.INSERT_POSITION.AFTER) {
+  // Insert image inside into multi-column node
+  var topNodeEntry = (0, _core.getTopLevelBlockNode)(editor);
+  if (position === _constants2.INSERT_POSITION.AFTER && topNodeEntry[0].type !== _constants2.MULTI_COLUMN) {
     var p = (0, _core.generateEmptyElement)(_constants2.ELEMENT_TYPE.PARAGRAPH);
     imageNodes.forEach(function (item, index) {
       p.children[index] = item;

package/dist/extension/plugins/list/plugin/index.js

@@ -24,8 +24,7 @@ var withList = function withList(editor) {
   var insertBreak = editor.insertBreak,
     handleTab = editor.handleTab,
     insertText = editor.insertText,
-    deleteBackward = editor.deleteBackward,
-    onHotKeyDown = editor.onHotKeyDown;
+    deleteBackward = editor.deleteBackward;
   var newEditor = editor;
   newEditor.insertBreak = function () {
     if ((0, _insertBreakList.insertBreakList)(editor)) return;

package/dist/extension/plugins/multi-column/constants/index.js

@@ -3,5 +3,8 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.COLUMN_MIN_WIDTH = void 0;
-var COLUMN_MIN_WIDTH = exports.COLUMN_MIN_WIDTH = 80;
+exports.LAST_COLUMN_MARGIN_RIGHT_WIDTH = exports.COLUMN_MIN_WIDTH = void 0;
+var COLUMN_MIN_WIDTH = exports.COLUMN_MIN_WIDTH = 80;
+
+// Distance between the last column and handler
+var LAST_COLUMN_MARGIN_RIGHT_WIDTH = exports.LAST_COLUMN_MARGIN_RIGHT_WIDTH = 50;

package/dist/extension/plugins/multi-column/helper.js

@@ -45,7 +45,7 @@ var generateEmptyMultiColumn = exports.generateEmptyMultiColumn = function gener
     default:
       break;
   }
-  var currentPageWidth = getCurrentPageWidth(editor);
+  var currentPageWidth = getCurrentPageWidth(editor) + _constants3.LAST_COLUMN_MARGIN_RIGHT_WIDTH;
   var initialColumnWidth = Math.max(_constants3.COLUMN_MIN_WIDTH, parseInt(currentPageWidth / multiColumnNumber));
   var _loop = function _loop() {
     var columnWidthKey = _slugid["default"].nice();

package/dist/extension/plugins/multi-column/plugin.js

@@ -14,7 +14,8 @@ var _helper = require("./helper");
 var withMultiColumn = function withMultiColumn(editor) {
   var normalizeNode = editor.normalizeNode,
     deleteBackward = editor.deleteBackward,
-    deleteForward = editor.deleteForward;
+    deleteForward = editor.deleteForward,
+    insertFragment = editor.insertFragment;
   var newEditor = editor;
   newEditor.normalizeNode = function (_ref) {
     var _ref2 = (0, _slicedToArray2["default"])(_ref, 2),
@@ -144,6 +145,20 @@ var withMultiColumn = function withMultiColumn(editor) {
     }
     deleteForward(unit);
   };
+  newEditor.insertFragment = function (data) {
+    var selection = editor.selection;
+    if (!selection) return insertFragment(data);
+    // If inserting multi-column node, extract all children nodes from every column and insert them one by one
+    if (data[0].type === _constants.MULTI_COLUMN) {
+      var childrenNodes = [];
+      data[0].children.forEach(function (col) {
+        childrenNodes = childrenNodes.concat(col.children);
+      });
+      insertFragment(childrenNodes);
+      return;
+    }
+    insertFragment(data);
+  };
   return newEditor;
 };
 var _default = exports["default"] = withMultiColumn;

package/dist/extension/plugins/multi-column/render/index.js

@@ -11,6 +11,7 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm
 var _react = _interopRequireWildcard(require("react"));
 var _slateReact = require("@seafile/slate-react");
 var _classnames = _interopRequireDefault(require("classnames"));
+var _constants = require("../constants");
 var _helper = require("../helper");
 var _resizeHandlers = _interopRequireDefault(require("../resize-handlers"));
 var _multiColumnRoot = _interopRequireDefault(require("./multi-column-root"));
@@ -48,10 +49,10 @@ var MultiColumn = function MultiColumn(_ref) {
       var newPageWidth = (_entries$ = entries[0]) === null || _entries$ === void 0 ? void 0 : _entries$.contentRect.width;
       // Check if sdocPageWidth changes
       if (pageWidth && newPageWidth !== pageWidth) {
-        var scaleFactor = newPageWidth / pageWidth;
+        var scaleFactor = (newPageWidth + _constants.LAST_COLUMN_MARGIN_RIGHT_WIDTH) / (pageWidth + _constants.LAST_COLUMN_MARGIN_RIGHT_WIDTH);
         var updatedColumns = element.column.map(function (item) {
           return (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, item), {}, {
-            width: Math.round(item.width * scaleFactor)
+            width: item.width * scaleFactor
           });
         });
         var columnWidthList = updatedColumns.map(function (item) {

package/dist/extension/plugins/multi-column/resize-handlers/index.js

@@ -38,7 +38,7 @@ var ResizeHandlers = function ResizeHandlers(_ref) {
     _useState8 = (0, _slicedToArray2["default"])(_useState7, 2),
     resizeInfo = _useState8[0],
     setResizeInfo = _useState8[1];
-  var _useState9 = (0, _react.useState)(column.map(function () {
+  var _useState9 = (0, _react.useState)((element.column || []).map(function () {
       return false;
     })),
     _useState0 = (0, _slicedToArray2["default"])(_useState9, 2),
@@ -73,7 +73,7 @@ var ResizeHandlers = function ResizeHandlers(_ref) {
     var onMouseMove = function onMouseMove(event) {
       event.preventDefault();
       // Let resize handler show when mouse is close to right edge of column at range of 20 px
-      var nearBorder = column.map(function (col, colIndex) {
+      var nearBorder = (column || []).map(function (col, colIndex) {
         var child = childNodes[colIndex];
         if (!child) return false;
         var childRect = child.getBoundingClientRect();
@@ -137,10 +137,11 @@ var ResizeHandlers = function ResizeHandlers(_ref) {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [handleResizeColumn, column, isDraggingResizeHandler, isMouseNearBorder]);
   var leftAccumulator = 0;
+  var columns = Array.isArray(column) ? column : [];
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: "column-resize-handler",
     contentEditable: false
-  }, column.map(function (column, index) {
+  }, columns.map(function (column, index) {
     leftAccumulator += column.width;
     var left = leftAccumulator;
     return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seafile/sdoc-editor",
-  "version": "3.0.68",
+  "version": "3.0.69",
   "main": "dist/index.js",
   "scripts": {
     "test": "jest",
@@ -72,5 +72,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "881cbedba9666bf8f81433bcf7df07011a1690c6"
+  "gitHead": "cb6d75dd7ae425cf1c4b2dcc7db63f62f809488c"
 }