@seafile/sdoc-editor 2.0.104 → 2.0.105

package/dist/extension/constants/font.js

@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.SDOC_FONT_SIZE = exports.RECENT_USED_FONTS_KEY = exports.GOOGLE_FONT_CLASS = exports.FONT_SIZE = exports.FONT = exports.DEFAULT_FONT = void 0;
+exports.SDOC_FONT_SIZE = exports.RECENT_USED_FONTS_KEY = exports.RECENT_PASTE_HTML_CONTENT = exports.GOOGLE_FONT_CLASS = exports.FONT_SIZE = exports.FONT = exports.DEFAULT_FONT = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/defineProperty"));
 var ELEMENT_TYPE = _interopRequireWildcard(require("./element-type"));
 // font family
@@ -88,6 +88,7 @@ var FONT_SIZE = exports.FONT_SIZE = [{
 var GOOGLE_FONT_CLASS = exports.GOOGLE_FONT_CLASS = 'sdoc-google-font';
 var DEFAULT_FONT = exports.DEFAULT_FONT = 'default_font';
 var RECENT_USED_FONTS_KEY = exports.RECENT_USED_FONTS_KEY = 'sdoc-recent-used-fonts';
+var RECENT_PASTE_HTML_CONTENT = exports.RECENT_PASTE_HTML_CONTENT = 'sdoc-recent-paste-html-content';
 var FONT = exports.FONT = [
 // { name: '\u5fae\u8f6f\u96c5\u9ed1', fontFamilyName: { mac: 'Microsoft YaHei', windows: '\u5fae\u8f6f\u96c5\u9ed1' }, supportFontWeight: FONT_WEIGHT_100_400_700, isSystemOwn: true, usuallyFontFamilyName: SANS_SERIF }, // 微软雅黑
 // { name: '\u5b8b\u4f53', fontFamilyName: { mac: 'SimSun', windows: '\u5b8b\u4f53' }, supportFontWeight: FONT_WEIGHT_100_400_700_800, isSystemOwn: true, usuallyFontFamilyName: SERIF }, // 宋体

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

@@ -6,7 +6,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 var _slugid = _interopRequireDefault(require("slugid"));
+var _localStorageUtils = _interopRequireDefault(require("../../../utils/local-storage-utils"));
 var _constants = require("../../constants");
+var _font = require("../../constants/font");
 var _core = require("../../core");
 var _helper = require("./helper");
 var withHtml = function withHtml(editor) {
@@ -37,6 +39,7 @@ var withHtml = function withHtml(editor) {
       var htmlContent = data.getData('text/html') || '';
       if (htmlContent) {
         var content = (0, _helper.deserializeHtml)(htmlContent);
+        _localStorageUtils["default"].setItem(_font.RECENT_PASTE_HTML_CONTENT, htmlContent);
         editor.insertFragment(content);
         return;
       }

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

@@ -51,6 +51,7 @@ var Image = function Image(_ref) {
   };
   var readOnly = (0, _slateReact.useReadOnly)();
   var imageRef = (0, _react.useRef)(null);
+  var urlRef = (0, _react.useRef)(element === null || element === void 0 ? void 0 : element.data);
   var resizerRef = (0, _react.useRef)(null);
   var imageCaptionInputRef = (0, _react.useRef)(null);
   var scrollRef = (0, _useScrollContext.useScrollContext)();
@@ -247,6 +248,12 @@ var Image = function Image(_ref) {
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
+  (0, _react.useEffect)(function () {
+    if (urlRef.current !== (element === null || element === void 0 ? void 0 : element.data)) {
+      urlRef.current = element === null || element === void 0 ? void 0 : element.data;
+      setIsShowImagePlaceholder(false);
+    }
+  }, [element === null || element === void 0 ? void 0 : element.data]);
   var onSetCaption = (0, _react.useCallback)(function (e) {
     var path = _slateReact.ReactEditor.findPath(editor, element);
     var newData = (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, data), {}, {

package/dist/extension/plugins/image/use-copy-image.js

@@ -13,6 +13,8 @@ var _react = require("react");
 var _slate = require("@seafile/slate");
 var _slateReact = require("@seafile/slate-react");
 var _context3 = _interopRequireDefault(require("../../../context"));
+var _localStorageUtils = _interopRequireDefault(require("../../../utils/local-storage-utils"));
+var _font = require("../../constants/font");
 var _helpers = require("./helpers");
 var updateImageNode = /*#__PURE__*/function () {
   var _ref = (0, _asyncToGenerator2["default"])(/*#__PURE__*/(0, _regeneratorRuntime2["default"])().mark(function _callee(editor, element, newUrl) {
@@ -68,6 +70,8 @@ var useCopyImage = function useCopyImage(_ref2) {
     if (isCopyError) return;
     if (isComment) return;
     if (!(0, _helpers.isImageUrlIsFromCopy)(url)) return;
+    var cacheContent = _localStorageUtils["default"].getItem(_font.RECENT_PASTE_HTML_CONTENT);
+    if (!cacheContent || JSON.stringify(cacheContent).indexOf(url) === -1) return;
     var downloadAndUploadImages = /*#__PURE__*/function () {
       var _ref3 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/(0, _regeneratorRuntime2["default"])().mark(function _callee2(url) {
         var response, blob, file, imageUrl;
@@ -129,6 +133,16 @@ var useCopyImage = function useCopyImage(_ref2) {
     downloadAndUploadImages(url);
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
+  (0, _react.useEffect)(function () {
+    if (!(0, _helpers.isImageUrlIsFromCopy)(data.src)) {
+      setIsLoading(false);
+      setIsCopyError(false);
+    }
+    if ((0, _helpers.isImageUrlIsFromCopy)(data.src) && data.is_copy_error === true) {
+      setIsLoading(false);
+      setIsCopyError(true);
+    }
+  }, [data.is_copy_error, data.src]);
   return {
     isCopyImageLoading: isLoading,
     setCopyImageLoading: setIsLoading,

package/dist/extension/plugins/image/use-upload-image.js

@@ -16,24 +16,25 @@ var _helpers = require("./helpers");
 var _imageCache = _interopRequireDefault(require("./image-cache"));
 var updateImageNode = /*#__PURE__*/function () {
   var _ref = (0, _asyncToGenerator2["default"])(/*#__PURE__*/(0, _regeneratorRuntime2["default"])().mark(function _callee(editor, element, newUrl) {
-    var url, nodePath, newData;
+    var isComment, url, nodePath, newData;
     return (0, _regeneratorRuntime2["default"])().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          url = (0, _helpers.isCommentEditor)(editor) ? (0, _helpers.getImageURL)({
+          isComment = (0, _helpers.isCommentEditor)(editor);
+          url = isComment ? (0, _helpers.getImageURL)({
             src: newUrl
           }, editor) : newUrl;
           nodePath = _slateReact.ReactEditor.findPath(editor, element);
           newData = {
             src: url,
-            is_comment: true
+            is_comment: isComment
           };
           _slate.Transforms.setNodes(editor, {
             data: newData
           }, {
             at: nodePath
           });
-        case 4:
+        case 5:
         case "end":
           return _context.stop();
       }
@@ -59,6 +60,7 @@ var useUploadImage = function useUploadImage(_ref2) {
     var url = data.src,
       file_uuid = data.file_uuid;
     if (!(0, _helpers.isImageUrlIsFromUpload)(url)) return;
+    if (!_imageCache["default"].getImage(file_uuid)) return;
     setIsLoading(true);
     var uploadCurrentImage = /*#__PURE__*/function () {
       var _ref3 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/(0, _regeneratorRuntime2["default"])().mark(function _callee2() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seafile/sdoc-editor",
-  "version": "2.0.104",
+  "version": "2.0.105",
   "main": "dist/index.js",
   "scripts": {
     "test": "jest",
@@ -70,5 +70,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "ab76134ff681c6ce99b8cfddc9cde542fbdc53de"
+  "gitHead": "3a1d0398a9d7919e6574399d0032f07bfac944ed"
 }