@seafile/sdoc-editor 2.0.80-test-0.0.1 → 2.0.80-test-0.0.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -42,9 +42,8 @@ const CommentItemCollapseWrapper = _ref => {
|
|
|
42
42
|
(0, _react.useEffect)(() => {
|
|
43
43
|
const initCommentContent = async () => {
|
|
44
44
|
const htmlString = await _mdToHtml.default.process(topLevelComment.comment);
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
setCommentContent(String(htmlString));
|
|
45
|
+
const htmlStringRes = String(htmlString);
|
|
46
|
+
setCommentContent((0, _helper.parseHtmlImages)(htmlStringRes));
|
|
48
47
|
};
|
|
49
48
|
initCommentContent();
|
|
50
49
|
}, [topLevelComment.comment]);
|
|
@@ -61,7 +60,8 @@ const CommentItemCollapseWrapper = _ref => {
|
|
|
61
60
|
mdString = '';
|
|
62
61
|
}
|
|
63
62
|
const htmlString = await _mdToHtml.default.process(mdString);
|
|
64
|
-
|
|
63
|
+
const htmlStringRes = String(htmlString);
|
|
64
|
+
setReplyContent((0, _helper.parseHtmlImages)(htmlStringRes));
|
|
65
65
|
};
|
|
66
66
|
initReplyContent();
|
|
67
67
|
}, [latestReply, t]);
|
|
@@ -17,6 +17,7 @@ var _context = _interopRequireDefault(require("../../context"));
|
|
|
17
17
|
var _mdToHtml = _interopRequireDefault(require("../../slate-convert/md-to-html"));
|
|
18
18
|
var _notificationHooks = require("../hooks/notification-hooks");
|
|
19
19
|
var _commentEditor = _interopRequireDefault(require("./comment-editor"));
|
|
20
|
+
var _helper = require("../helper");
|
|
20
21
|
const CommentItemContent = _ref => {
|
|
21
22
|
let {
|
|
22
23
|
isActive,
|
|
@@ -43,28 +44,11 @@ const CommentItemContent = _ref => {
|
|
|
43
44
|
transferHtml(comment.comment);
|
|
44
45
|
}, [comment.comment]);
|
|
45
46
|
const transferHtml = async mdString => {
|
|
46
|
-
// const htmlString = String(await processor.process(mdString)).replace(
|
|
47
|
-
// /<img\s+([^>]*?)src="\/(.*?)"/g,
|
|
48
|
-
// `<img $1src="${baseUrl}/$2"`
|
|
49
|
-
// );
|
|
50
|
-
|
|
51
47
|
const htmlString = await _mdToHtml.default.process(mdString);
|
|
52
48
|
console.log(3, mdString, htmlString);
|
|
53
49
|
console.log(4, String(htmlString));
|
|
54
50
|
const htmlStringRes = String(htmlString);
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
// return urlJoin(serviceUrl, assetsUrl, url);
|
|
58
|
-
|
|
59
|
-
if (htmlStringRes.includes('<img')) {
|
|
60
|
-
const serviceUrl = _context.default.getSetting('serviceUrl');
|
|
61
|
-
const assetsUrl = _context.default.getSetting('assetsUrl');
|
|
62
|
-
const baseUrl = (0, _urlJoin.default)(serviceUrl, assetsUrl);
|
|
63
|
-
console.log(2, baseUrl);
|
|
64
|
-
newHtmlString = htmlStringRes.replace(/<img\s+([^>]*?)src="\/(.*?)"/g, "<img $1src=\"".concat(baseUrl, "/$2\""));
|
|
65
|
-
}
|
|
66
|
-
// console.log(111, htmlStringRes, htmlStringRes.includes('<img'))
|
|
67
|
-
setEditorContent(newHtmlString);
|
|
51
|
+
setEditorContent((0, _helper.parseHtmlImages)(htmlStringRes));
|
|
68
52
|
};
|
|
69
53
|
const onDeleteToggle = (0, _react.useCallback)(event => {
|
|
70
54
|
event.stopPropagation();
|
|
@@ -14,6 +14,7 @@ var _context = _interopRequireDefault(require("../../context"));
|
|
|
14
14
|
var _mdToHtml = _interopRequireDefault(require("../../slate-convert/md-to-html"));
|
|
15
15
|
var _commentDeletePopover = _interopRequireDefault(require("./comment-delete-popover"));
|
|
16
16
|
var _commentEditor = _interopRequireDefault(require("./comment-editor"));
|
|
17
|
+
var _helper = require("../helper");
|
|
17
18
|
const CommentItemReply = _ref => {
|
|
18
19
|
let {
|
|
19
20
|
isActive,
|
|
@@ -40,7 +41,7 @@ const CommentItemReply = _ref => {
|
|
|
40
41
|
const transferHtml = async mdString => {
|
|
41
42
|
const htmlString = await _mdToHtml.default.process(mdString);
|
|
42
43
|
const formatHtml = String(htmlString).replace(/\n */g, '');
|
|
43
|
-
setEditorContent(formatHtml);
|
|
44
|
+
setEditorContent((0, _helper.parseHtmlImages)(formatHtml));
|
|
44
45
|
};
|
|
45
46
|
(0, _react.useEffect)(() => {
|
|
46
47
|
transferHtml(reply.reply);
|
|
@@ -4,9 +4,10 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
|
|
|
4
4
|
Object.defineProperty(exports, "__esModule", {
|
|
5
5
|
value: true
|
|
6
6
|
});
|
|
7
|
-
exports.useCursorPosition = exports.updateElementsAttrs = exports.updateCommentedElementsAttrs = exports.getSelectionRange = exports.getSelectedElemIds = exports.getPrimaryElementId = exports.getElementCommentCountTop = exports.getDomById = exports.getCursorPosition = exports.getCommentedTextsByElementId = exports.getAvatarUrl = void 0;
|
|
7
|
+
exports.useCursorPosition = exports.updateElementsAttrs = exports.updateCommentedElementsAttrs = exports.parseHtmlImages = exports.getSelectionRange = exports.getSelectedElemIds = exports.getPrimaryElementId = exports.getElementCommentCountTop = exports.getDomById = exports.getCursorPosition = exports.getCommentedTextsByElementId = exports.getAvatarUrl = void 0;
|
|
8
8
|
var _slate = require("@seafile/slate");
|
|
9
9
|
var _slateReact = require("@seafile/slate-react");
|
|
10
|
+
var _urlJoin = _interopRequireDefault(require("url-join"));
|
|
10
11
|
var _context = _interopRequireDefault(require("../context"));
|
|
11
12
|
var _core = require("../extension/core");
|
|
12
13
|
var _useScrollContext = require("../hooks/use-scroll-context");
|
|
@@ -181,4 +182,15 @@ const getPrimaryElementId = detail => {
|
|
|
181
182
|
}
|
|
182
183
|
return elementId;
|
|
183
184
|
};
|
|
184
|
-
exports.getPrimaryElementId = getPrimaryElementId;
|
|
185
|
+
exports.getPrimaryElementId = getPrimaryElementId;
|
|
186
|
+
const parseHtmlImages = htmlStringRes => {
|
|
187
|
+
let newHtmlString = htmlStringRes;
|
|
188
|
+
if (htmlStringRes.includes('<img')) {
|
|
189
|
+
const serviceUrl = _context.default.getSetting('serviceUrl');
|
|
190
|
+
const assetsUrl = _context.default.getSetting('assetsUrl');
|
|
191
|
+
const baseUrl = (0, _urlJoin.default)(serviceUrl, assetsUrl);
|
|
192
|
+
newHtmlString = htmlStringRes.replace(/<img\s+([^>]*?)src="\/(.*?)"/g, "<img $1src=\"".concat(baseUrl, "/$2\""));
|
|
193
|
+
}
|
|
194
|
+
return newHtmlString;
|
|
195
|
+
};
|
|
196
|
+
exports.parseHtmlImages = parseHtmlImages;
|