@seafile/comment-editor 0.0.10 → 0.0.11-alpha.0

package/dist/basic-sdk/assets/css/layout.css

@@ -1,116 +1,5 @@
-.sdoc-editor-container.fullscreen .sdoc-content-wrapper {
-  height: 100vh !important;
-}
-
-.sdoc-editor-container.fullscreen .sdoc-article-container {
-  width: 100% !important;
-  padding: 0 !important;
-}
-
-.sdoc-editor-container.fullscreen .sdoc-editor__article {
-  padding: calc(100vw / 794 * 40) calc(100vw / 794 * 60) !important;
-  font-size: calc(100vw / 794 * 14.7) !important;
-}
-
-.sdoc-editor-container.fullscreen .sdoc-checkbox-input {
-  width: calc(100vw / 794 * 13) !important;
-}
-
-.sdoc-editor-container.fullscreen .sdoc-code-block-pre {
-  font-size: calc(100vw / 794 * 13.3) !important;
-}
-
-.sdoc-editor-container.fullscreen .sdoc-header-title {
-  font-size: calc(100vw / 794 * 33.7) !important;
-}
-
-.sdoc-editor-container.fullscreen .sdoc-header-subtitle {
-  font-size: calc(100vw / 794 * 20) !important;
-}
-
-.sdoc-editor-container.fullscreen .sdoc-header-1 {
-  font-size: calc(100vw / 794 * 26.7) !important;
-}
-
-.sdoc-editor-container.fullscreen .sdoc-header-2 {
-  font-size: calc(100vw / 794 * 21.3) !important;
-}
-
-.sdoc-editor-container.fullscreen .sdoc-header-3 {
-  font-size: calc(100vw / 794 * 18.7) !important;
-}
-
-.sdoc-editor-container.fullscreen .sdoc-header-4 {
-  font-size: calc(100vw / 794 * 16) !important;
-}
-
-.sdoc-editor-container.fullscreen .sdoc-header-5,
-.sdoc-editor-container.fullscreen .sdoc-header-6 {
-  font-size: calc(100vw / 794 * 14.7) !important;
-}
-
-.sdoc-editor-container {
-  flex: 1;
-  display: flex;
-  flex-direction: column;
-  min-height: 0;
-}
-
-.sdoc-editor-container .sdoc-editor-toolbar {
-  display: flex;
-  flex: 1;
-  justify-content: center;
-  position: relative;
-  height: 44px;
-  align-items: center;
-  padding: 0 10px;
-  background-color: #fff;
-  user-select: none;
-  border-bottom: 1px solid #e5e6e8;
-  position: relative;
-  z-index: 102;
-}
-
-.sdoc-editor-container .sdoc-editor-toolbar .sdoc-editor-toolbar-right-menu {
-  display: flex;
-  flex-direction: row-reverse;
-  position: absolute;
-  right: 8px;
-  border-right: none;
-}
-
 .sdoc-content-wrapper {
   width: 100%;
   height: calc(100vh - 44px);
   display: flex;
 }
-
-.sdoc-editor-container .sdoc-editor-content {
-  display: flex;
-  position: absolute;
-  min-width: 1100px;
-  width: 100%;
-}
-
-.sdoc-editor-container.mobile .sdoc-editor-content.readonly.no-outline {
-  min-width: 100% !important;
-  width: 100% !important;
-}
-
-.sdoc-editor-container .sdoc-scroll-container {
-  z-index: 100;
-  overflow: auto;
-  height: 100%;
-  position: relative;
-  flex: 1;
-  background: #f5f5f5;
-}
-
-.sdoc-editor-container .sdoc-article-container {
-  position: relative;
-  top: 0;
-  width: 794px;
-  margin: 0 auto;
-  padding-top: 20px;
-  padding-bottom: 20px;
-}

package/dist/basic-sdk/assets/css/sdoc-comment-editor-plugin.css

@@ -1,8 +1,3 @@
-/* List */
-.sdoc-editor-container .comment-editor .list-container {
-  padding-left: 2em !important; 
-}
-
 .comment-editor .list-container li p {
   margin: 0 !important;
 }
@@ -14,6 +9,6 @@
 }
 
 /* Image */
-.comment-editor .sdoc-image-wrapper  {
+.comment-editor .sdoc-image-wrapper {
   padding: 1px !important;
 }

package/dist/basic-sdk/extension/plugins/image/helpers.js

@@ -152,8 +152,10 @@ const updateImage = (editor, data) => {
 };
 exports.updateImage = updateImage;
 const getImageURL = (data, editor) => {
+  console.log('data', data);
   const {
     src: url,
+    is_upload,
     column_key
   } = data;
   if (column_key) {
@@ -174,12 +176,13 @@ const getImageURL = (data, editor) => {
   }
 
   // upload image | drag drop image | cut image
-  if (isImageUrlIsFromUpload(url)) return url;
+  if (isImageUrlIsFromUpload(url, is_upload)) return url;
 
   // copy from others doc
-  if (isImageUrlIsFromCopy(url)) return url;
+  if (isImageUrlIsFromCopy(url, is_upload)) return url;
   const serviceUrl = _context.default.getSetting('serviceUrl');
   const assetsUrl = _context.default.getSetting('assetsUrl');
+  console.log(111, (0, _urlJoin.default)(serviceUrl, assetsUrl, url));
   return (0, _urlJoin.default)(serviceUrl, assetsUrl, url);
 };
 exports.getImageURL = getImageURL;
@@ -301,14 +304,15 @@ const handleBase64Image = (editor, path, imgData) => {
   });
 };
 exports.handleBase64Image = handleBase64Image;
-const isImageUrlIsFromCopy = (url, uploadFromDtable) => {
-  if (uploadFromDtable) return false;
+const isImageUrlIsFromCopy = (url, is_upload) => {
+  if (is_upload) return false;
   if (url && url.startsWith('http')) return true;
   if (url && url.startsWith('attachment')) return true; // from yuque
   return false;
 };
 exports.isImageUrlIsFromCopy = isImageUrlIsFromCopy;
-const isImageUrlIsFromUpload = url => {
+const isImageUrlIsFromUpload = (url, is_upload) => {
+  if (url && is_upload) return true;
   if (url && url.startsWith('blob:http')) return true;
   return false;
 };

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

@@ -218,10 +218,10 @@ const Image = _ref => {
     }
   }, [data, editor]);
   const onImageLoaded = (0, _react.useCallback)(() => {
-    if ((0, _helpers.isImageUrlIsFromCopy)(data.src, data === null || data === void 0 ? void 0 : data.upload_from_dtable)) {
+    if ((0, _helpers.isImageUrlIsFromCopy)(data.src, data === null || data === void 0 ? void 0 : data.is_upload)) {
       setCopyImageLoading(true);
     }
-  }, [data.src, data === null || data === void 0 ? void 0 : data.upload_from_dtable, setCopyImageLoading]);
+  }, [data.src, data === null || data === void 0 ? void 0 : data.is_upload, setCopyImageLoading]);
   const onImageLoadError = (0, _react.useCallback)(() => {
     // Check is due to the image is pasted from the clipboard in base64
     if (data.src.startsWith('data:image/jpeg;base64')) {
@@ -249,6 +249,7 @@ const Image = _ref => {
       });
     }
   }, [data, editor, element]);
+  console.log(isCopyImageLoading, isUploadLoading);
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, isShowImagePlaceholder && /*#__PURE__*/_react.default.createElement("span", Object.assign({
     className: (0, _classnames.default)('sdoc-image-wrapper', className)
   }, attributes, {

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

@@ -39,10 +39,11 @@ const useCopyImage = _ref => {
   const [isCopyError, setIsCopyError] = (0, _react.useState)(is_copy_error);
   (0, _react.useEffect)(() => {
     const {
-      src: url
+      src: url,
+      is_upload
     } = data;
     if (isCopyError) return;
-    if (!(0, _helpers.isImageUrlIsFromCopy)(url)) return;
+    if (!(0, _helpers.isImageUrlIsFromCopy)(url, is_upload)) return;
     const downloadAndUploadImages = async url => {
       try {
         const response = await fetch(url);

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

@@ -11,12 +11,12 @@ var _slateReact = require("@seafile/slate-react");
 var _context = _interopRequireDefault(require("../../../context"));
 var _helpers = require("./helpers");
 var _imageCache = _interopRequireDefault(require("./image-cache"));
-const updateImageNode = async (editor, element, newUrl, uploadFromDtable) => {
+const updateImageNode = async (editor, element, newUrl) => {
   const nodePath = _slateReact.ReactEditor.findPath(editor, element);
   const newData = {
-    src: newUrl
+    src: newUrl,
+    is_upload: true
   };
-  uploadFromDtable && (newData['upload_from_dtable'] = true);
   _slate.Transforms.setNodes(editor, {
     data: newData
   }, {
@@ -45,8 +45,7 @@ const useUploadImage = _ref => {
         const fileItem = _imageCache.default.getImage(file_uuid);
         const imageUrl = await _context.default.api.uploadLocalImage([fileItem]);
         if (imageUrl && imageUrl[0]) {
-          const uploadFromDtable = imageUrl !== null && imageUrl !== void 0 && imageUrl.upload_from_dtable ? true : false;
-          updateImageNode(editor, element, imageUrl[0], uploadFromDtable);
+          updateImageNode(editor, element, imageUrl[0]);
         }
       } catch (error) {
         console.error(error.message);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seafile/comment-editor",
-  "version": "0.0.10",
+  "version": "0.0.11-alpha.0",
   "private": false,
   "description": "This is a comment editor",
   "main": "dist/index.js",

package/dist/basic-sdk/assets/css/sdoc-viewer.css

@@ -1,14 +0,0 @@
-.sdoc-editor-container .sdoc-editor-content.no-outline .sdoc-article-container {
-  margin-left: 0 !important;
-}
-
-.sdoc-editor-container.mobile .sdoc-editor-content.readonly .sdoc-article-container {
-  padding: 0;
-  width: 100% !important;
-  min-width: 100% !important;
-}
-
-.sdoc-editor-container.mobile .sdoc-editor-content.readonly .article {
-  width: 100vw !important;
-  padding: 1rem;
-}