@seafile/sdoc-editor 3.0.225 → 3.0.227

package/dist/assets/css/diff-viewer.css

@@ -4,12 +4,12 @@
   overflow: hidden;
 }
 
-.sdoc-editor__article .sdoc-image-wrapper.sdoc-diff-image-deleted img {
+#sdoc-editor[data-diff-view='true'] .sdoc-image-wrapper.sdoc-diff-image-deleted img {
   opacity: 0.55;
   filter: grayscale(100%);
 }
 
-.sdoc-editor__article .sdoc-image-wrapper.sdoc-diff-image-deleted .sdoc-image-content > span:first-child::after {
+#sdoc-editor[data-diff-view='true'] .sdoc-image-wrapper.sdoc-diff-image-deleted .sdoc-image-content>span:first-child::after {
   content: '';
   position: absolute;
   top: 50%;

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

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

package/dist/extension/plugins/image/hover-menu/index.css

@@ -48,6 +48,19 @@
   background: #EFEFEF;
 }
 
+.sdoc-image-hover-menu-container .hover-menu-container .op-item.disabled {
+  color: #999;
+  cursor: not-allowed;
+}
+
+.sdoc-image-hover-menu-container .hover-menu-container .op-item.disabled:hover {
+  background: transparent;
+}
+
+.sdoc-image-hover-menu-container .hover-menu-container .op-item.disabled .sdocfont {
+  color: #999;
+}
+
 .sdoc-image-hover-menu-container .hover-menu-container .active {
   background: #EFEFEF;
 }

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

@@ -69,6 +69,13 @@ var ImageHoverMenu = function ImageHoverMenu(_ref) {
     setIsShowTooltip = _useState8[1];
   var isWiki = editor.editorType === _constants.WIKI_EDITOR;
   var currentHref = data.href;
+  var imagePath = _slateReact.ReactEditor.findPath(editor, element);
+  var isInListItem = !!_slate.Editor.above(editor, {
+    at: imagePath,
+    match: function match(node) {
+      return node.type === _constants2.LIST_ITEM;
+    }
+  });
   (0, _react.useEffect)(function () {
     setIsShowTooltip(true);
   }, []);
@@ -236,17 +243,19 @@ var ImageHoverMenu = function ImageHoverMenu(_ref) {
     className: "op-group-item"
   }, /*#__PURE__*/_react["default"].createElement("span", {
     role: "button",
+    "aria-disabled": isInListItem,
     className: (0, _classnames["default"])('op-item', {
-      'active': popoverState.displayPopover
+      'active': popoverState.displayPopover,
+      'disabled': isInListItem
     }),
-    onClick: function onClick(e) {
+    onClick: isInListItem ? undefined : function (e) {
       onShowProver(e, 'displayPopover');
     }
   }, /*#__PURE__*/_react["default"].createElement("span", {
     className: "mr-1"
   }, t(type === _constants2.IMAGE_BLOCK ? 'Block' : 'Inline')), /*#__PURE__*/_react["default"].createElement("i", {
     className: "sdocfont sdoc-arrow-down"
-  }), popoverState.displayPopover && /*#__PURE__*/_react["default"].createElement("div", {
+  }), !isInListItem && popoverState.displayPopover && /*#__PURE__*/_react["default"].createElement("div", {
     className: "sdoc-image-popover sdoc-dropdown-menu"
   }, _constants3.IMAGE_DISPLAY_TYPE.map(function (item) {
     return /*#__PURE__*/_react["default"].createElement("div", {

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

@@ -5,8 +5,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/slicedToArray"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/toConsumableArray"));
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/slicedToArray"));
 var _slate = require("@seafile/slate");
 var _toast = _interopRequireDefault(require("../../../components/toast"));
 var _constants = require("../../../constants");
@@ -23,7 +23,8 @@ var withImage = function withImage(editor) {
     insertData = editor.insertData,
     deleteBackward = editor.deleteBackward,
     insertFragment = editor.insertFragment,
-    insertBreak = editor.insertBreak;
+    insertBreak = editor.insertBreak,
+    normalizeNode = editor.normalizeNode;
   var newEditor = editor;
 
   // rewrite isInline
@@ -43,6 +44,23 @@ var withImage = function withImage(editor) {
     }
     return isVoid(elem);
   };
+  newEditor.normalizeNode = function (_ref) {
+    var _ref2 = (0, _slicedToArray2["default"])(_ref, 2),
+      node = _ref2[0],
+      path = _ref2[1];
+    var imageCount = node.type === _constants2.IMAGE_BLOCK ? node.children.filter(function (child) {
+      return child.type === _constants2.IMAGE;
+    }).length : 0;
+    if (imageCount >= 2) {
+      _slate.Transforms.setNodes(editor, {
+        type: _constants2.PARAGRAPH
+      }, {
+        at: path
+      });
+      return;
+    }
+    return normalizeNode([node, path]);
+  };
   newEditor.insertData = function (data) {
     var fragment = data.getData("application/".concat(_constants2.CLIPBOARD_FORMAT_KEY)) || (0, _documentUtils.getSlateFragmentAttribute)(data);
     var originSdocUuid = data.getData("text/".concat(_constants2.CLIPBOARD_ORIGIN_SDOC_KEY));

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

@@ -486,15 +486,17 @@ function renderImage(props, editor) {
   var element = props.element,
     leaf = props.leaf;
   var style = (0, _objectSpread2["default"])({}, props.style);
+  var isAdded = !!element.add;
+  var isDeleted = !isAdded && !!element["delete"];
   var diffImageClassName = (0, _classnames["default"])(props.className, {
-    'sdoc-diff-image-added': !!element.add,
-    'sdoc-diff-image-deleted': !!element["delete"]
+    'sdoc-diff-image-added': isAdded,
+    'sdoc-diff-image-deleted': isDeleted
   });
   if (leaf && leaf.computed_background_color) {
     style['backgroundColor'] = leaf.computed_background_color;
   }
-  if (element.add || element["delete"]) {
-    style = Object.assign({}, style, element.add ? _constants2.ADDED_STYLE : _constants2.DELETED_STYLE);
+  if (isAdded || isDeleted) {
+    style = Object.assign({}, style, isAdded ? _constants2.ADDED_STYLE : _constants2.DELETED_STYLE);
     if (style.computed_background_color) {
       style['backgroundColor'] = style.computed_background_color;
     }

package/dist/views/published-revision-diff-viewer.js

@@ -70,7 +70,8 @@ var PublishedRevisionDiffViewer = function PublishedRevisionDiffViewer(_ref) {
     document: document,
     showToolbar: true,
     showOutline: true,
-    showComment: false
+    showComment: false,
+    isDiffView: isShowChanges
   });
 };
 var _default = exports["default"] = PublishedRevisionDiffViewer;

package/dist/views/readonly-article.js

@@ -19,7 +19,9 @@ var ReadOnlyArticle = function ReadOnlyArticle(_ref) {
     slateValue = _ref.slateValue,
     updateSlateValue = _ref.updateSlateValue,
     _ref$showComment = _ref.showComment,
-    showComment = _ref$showComment === void 0 ? false : _ref$showComment;
+    showComment = _ref$showComment === void 0 ? false : _ref$showComment,
+    _ref$isDiffView = _ref.isDiffView,
+    isDiffView = _ref$isDiffView === void 0 ? false : _ref$isDiffView;
   var decorate = (0, _decorates.usePipDecorate)(editor);
   var _useState = (0, _react.useState)(0),
     _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
@@ -42,6 +44,7 @@ var ReadOnlyArticle = function ReadOnlyArticle(_ref) {
     editor: editor
   }, /*#__PURE__*/_react["default"].createElement(_react.Fragment, null, /*#__PURE__*/_react["default"].createElement(_highlight.SetNodeToDecorations, null), /*#__PURE__*/_react["default"].createElement(_slateReact.Editable, {
     id: "sdoc-editor",
+    "data-diff-view": isDiffView ? 'true' : undefined,
     readOnly: true,
     placeholder: "",
     renderElement: _extension.renderElement,

package/dist/views/revision-diff-viewer.js

@@ -66,7 +66,8 @@ var RevisionDiffViewer = function RevisionDiffViewer(_ref) {
     },
     showToolbar: true,
     showOutline: true,
-    showComment: true
+    showComment: true,
+    isDiffView: true
   }), /*#__PURE__*/_react["default"].createElement(_insertElementDialog["default"], {
     editor: editor
   }));

package/dist/views/sdoc-diff-viewer.js

@@ -40,7 +40,8 @@ var DiffViewer = function DiffViewer(_ref) {
     showToolbar: false,
     showOutline: false,
     showComment: false,
-    editor: editor
+    editor: editor,
+    isDiffView: true
   });
 };
 var _default = exports["default"] = DiffViewer;

package/dist/views/sdoc-viewer.js

@@ -36,7 +36,9 @@ var SDocViewer = function SDocViewer(_ref) {
     _ref$enableMathJax = _ref.enableMathJax,
     enableMathJax = _ref$enableMathJax === void 0 ? false : _ref$enableMathJax,
     _ref$mathJaxSource = _ref.mathJaxSource,
-    mathJaxSource = _ref$mathJaxSource === void 0 ? _constants.MATH_JAX_SOURCE_RUL : _ref$mathJaxSource;
+    mathJaxSource = _ref$mathJaxSource === void 0 ? _constants.MATH_JAX_SOURCE_RUL : _ref$mathJaxSource,
+    _ref$isDiffView = _ref.isDiffView,
+    isDiffView = _ref$isDiffView === void 0 ? false : _ref$isDiffView;
   // eslint-disable-next-line react-hooks/rules-of-hooks
   var _ref2 = enableMathJax ? (0, _useMathjax["default"])(mathJaxSource) : {
       isLoadingMathJax: false
@@ -80,7 +82,8 @@ var SDocViewer = function SDocViewer(_ref) {
     showComment: showComment
   }, /*#__PURE__*/_react["default"].createElement(_readonlyArticle["default"], {
     editor: validEditor,
-    slateValue: slateValue
+    slateValue: slateValue,
+    isDiffView: isDiffView
   }))))));
 };
 var _default = exports["default"] = SDocViewer;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seafile/sdoc-editor",
-  "version": "3.0.225",
+  "version": "3.0.227",
   "main": "dist/index.js",
   "scripts": {
     "test": "jest",
@@ -71,5 +71,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "8da759c5eb27c940bde666a47ea8dcb762442d05"
+  "gitHead": "efdb580351e0bf231e3ad96fdc9ad435d3d57858"
 }