@seafile/seafile-editor 3.0.30-wjk.1 → 3.0.31

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

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.updateImage = exports.lazyLoadImage = exports.isMenuDisabled = exports.insertSeafileImage = exports.insertImage = exports.handleUpdateFile = exports.getNewImagesUrlList = exports.getImagesUrlList = void 0;
+exports.updateImage = exports.lazyLoadImage = exports.isMenuDisabled = exports.insertSeafileImage = exports.insertImage = exports.handleUpdateFile = exports.getImagesUrlList = void 0;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectSpread2"));
 var _slate = require("slate");
 var _slugid = _interopRequireDefault(require("slugid"));
@@ -91,33 +91,6 @@ const getImagesUrlList = nodes => {
   return list;
 };
 exports.getImagesUrlList = getImagesUrlList;
-const getNewImagesUrlList = function () {
-  let lists = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
-  if (!Array.isArray(lists)) {
-    return [];
-  }
-  return lists.map(src => {
-    if (!src) {
-      return {
-        name: '',
-        thumbnail: ''
-      };
-    }
-    let name = '';
-    try {
-      name = decodeURIComponent(src.slice(src.lastIndexOf('/') + 1));
-    } catch (error) {
-      // eslint-disable-next-line no-console
-      console.log(error);
-      name = src.slice(src.lastIndexOf('/') + 1) || src;
-    }
-    return {
-      name: name || '',
-      thumbnail: src
-    };
-  });
-};
-exports.getNewImagesUrlList = getNewImagesUrlList;
 const handleUpdateFile = async (editor, file, insertPosition) => {
   var _editor$api;
   if (editor !== null && editor !== void 0 && (_editor$api = editor.api) !== null && _editor$api !== void 0 && _editor$api.uploadLocalImage) {

package/dist/extension/plugins/image/render-element/image-previewer.js

@@ -14,21 +14,40 @@ var _reactI18next = require("react-i18next");
 var _constants = require("../../../../constants");
 require("@seafile/react-image-lightbox/style.css");
 require("./style.css");
+const formatImageInfos = images => {
+  const formatImages = images.map(src => {
+    let name = '';
+    try {
+      name = src ? decodeURI(src.slice(src.lastIndexOf('/') + 1)).split(/[?？]/)[0] : '';
+    } catch (error) {
+      console.log('error', error);
+      name = '';
+    }
+    return {
+      name: name,
+      thumbnail: src
+    };
+  });
+  return formatImages;
+};
 const ImagePreviewer = _ref => {
   let {
     imgUrl,
     toggleImagePreviewer
   } = _ref;
   const editor = (0, _slateReact.useSlateStatic)();
-  let defaultImages = (0, _helper.getImagesUrlList)(editor.children);
-  console.log('defaultImages', defaultImages);
-  const images = (0, _helper.getNewImagesUrlList)(defaultImages);
-  console.log('images', images);
+  const originImages = (0, _helper.getImagesUrlList)(editor.children);
+  const images = formatImageInfos(originImages);
   const {
     t
   } = (0, _reactI18next.useTranslation)(_constants.TRANSLATE_NAMESPACE);
-  const [imageIndex, setImageIndex] = (0, _react.useState)(images.findIndex(item => item === imgUrl));
-  const mainSrc = images[imageIndex];
+  const [imageIndex, setImageIndex] = (0, _react.useState)(Math.max(0, images.findIndex(item => item.thumbnail === imgUrl)));
+  const imagesLength = images.length;
+  const imageItem = images[imageIndex];
+  const imageName = imageItem ? imageItem.name : '';
+  const mainSrc = imageItem ? imageItem.thumbnail : {};
+  const nextImg = images[(imageIndex + 1) % images.length];
+  const prevImg = images[(imageIndex + images.length - 1) % images.length];
   const moveToPrevImage = () => {
     const currentImageIndex = (imageIndex + images.length - 1) % images.length;
     setImageIndex(currentImageIndex);
@@ -42,15 +61,11 @@ const ImagePreviewer = _ref => {
     currentIndex: imageIndex,
     setImageIndex: setImageIndex,
     wrapperClassName: "sf-editor-image-previewer",
-    imageTitle: /*#__PURE__*/_react.default.createElement(ImageTitleElement, {
-      mainSrc: mainSrc,
-      imageIndex: imageIndex,
-      images: images
-    }),
+    imageTitle: "".concat(imageName, " (").concat(imageIndex + 1, "/").concat(imagesLength, ")"),
     mainSrc: mainSrc,
     toolbarButtons: [],
-    nextSrc: images[(imageIndex + 1) % images.length],
-    prevSrc: images[(imageIndex + images.length - 1) % images.length],
+    nextSrc: nextImg.thumbnail || nextImg.src,
+    prevSrc: prevImg.thumbnail || prevImg.src,
     onCloseRequest: toggleImagePreviewer,
     reactModalProps: {
       shouldReturnFocusAfterClose: true,
@@ -59,35 +74,8 @@ const ImagePreviewer = _ref => {
     onMovePrevRequest: moveToPrevImage,
     onMoveNextRequest: moveToNextImage,
     imagePadding: 70,
-    reactModalStyle: {
-      overlay: {
-        zIndex: 1071
-      }
-    },
     zoomInTip: t('Zoom_in'),
     zoomOutTip: t('Zoom_out')
   });
 };
-var _default = exports.default = ImagePreviewer;
-const ImageTitleElement = props => {
-  const {
-    mainSrc,
-    imageIndex,
-    images
-  } = props;
-  const getImgTitle = () => {
-    try {
-      return mainSrc ? decodeURI(mainSrc.slice(mainSrc.lastIndexOf('/') + 1)) : '';
-    } catch (error) {
-      console.log('error', error);
-      return '';
-    }
-  };
-  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("span", {
-    className: "d-flex"
-  }, /*#__PURE__*/_react.default.createElement("span", {
-    className: "text-truncate"
-  }, getImgTitle()), /*#__PURE__*/_react.default.createElement("span", {
-    className: "flex-shrink-0"
-  }, "(", imageIndex + 1, "/", images.length, ")")));
-};
+var _default = exports.default = ImagePreviewer;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seafile/seafile-editor",
-  "version": "3.0.30wjk.1",
+  "version": "3.0.31",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
@@ -85,7 +85,7 @@
     ]
   },
   "dependencies": {
-    "@seafile/react-image-lightbox": "^5.0.4",
+    "@seafile/react-image-lightbox": "^5.0.6",
     "classnames": "2.3.2",
     "copy-to-clipboard": "3.3.1",
     "deep-copy": "1.4.2",