@seafile/seafile-editor 3.0.16 → 3.0.18

package/dist/editors/inline-editor/index.js

@@ -23,6 +23,7 @@ var _userLinkClick = _interopRequireDefault(require("../../hooks/user-link-click
 require("./index.css");
 const isMacOS = (0, _common.isMac)();
 const InlineEditor = /*#__PURE__*/(0, _react.forwardRef)((_ref, ref) => {
+  var _editor$api;
   let {
     enableEdit,
     autoFocus,
@@ -35,13 +36,14 @@ const InlineEditor = /*#__PURE__*/(0, _react.forwardRef)((_ref, ref) => {
     isImageUploadOnly,
     isSupportMultipleFiles,
     onExpandEditorToggle,
-    handelEnableEdit
+    handelEnableEdit,
+    onLinkClick
   } = _ref;
   const [slateValue, setSlateValue] = (0, _react.useState)(value);
   const focusRangeRef = (0, _react.useRef)(null);
   const editor = (0, _react.useMemo)(() => {
-    const baseEditor = (0, _extension.inlineEditor)();
-    return (0, _withPropsEditor.default)(baseEditor, {
+    const _editor = (0, _extension.inlineEditor)();
+    return (0, _withPropsEditor.default)(_editor, {
       editorApi,
       onSave,
       columns,
@@ -53,7 +55,7 @@ const InlineEditor = /*#__PURE__*/(0, _react.forwardRef)((_ref, ref) => {
     return new _eventHandler.default(editor);
   }, [editor]);
   (0, _useAttachments.default)(editor);
-  (0, _userLinkClick.default)(editor._id);
+  (0, _userLinkClick.default)(editor._id, editor === null || editor === void 0 ? void 0 : (_editor$api = editor.api) === null || _editor$api === void 0 ? void 0 : _editor$api.server, onLinkClick);
   const decorate = (0, _extension.useHighlight)(editor);
   const onChange = (0, _react.useCallback)(value => {
     setSlateValue(value);

package/dist/editors/simple-slate-editor/index.js

@@ -15,9 +15,12 @@ var _eventHandler = _interopRequireDefault(require("../../utils/event-handler"))
 var _withPropsEditor = _interopRequireDefault(require("./with-props-editor"));
 var _core = require("../../extension/core");
 var _common = require("../../utils/common");
+var _useAttachments = _interopRequireDefault(require("../../hooks/use-attachments"));
+var _userLinkClick = _interopRequireDefault(require("../../hooks/user-link-click"));
 require("./style.css");
 const isMacOS = (0, _common.isMac)();
 const SimpleSlateEditor = _ref => {
+  var _editor$api;
   let {
     value,
     focusEnd,
@@ -26,17 +29,23 @@ const SimpleSlateEditor = _ref => {
     columns,
     onContentChanged,
     isSupportFormula,
-    onExpandEditorToggle
+    onExpandEditorToggle,
+    onLinkClick
   } = _ref;
   const [slateValue, setSlateValue] = (0, _react.useState)(value);
-  const editor = (0, _react.useMemo)(() => (0, _withPropsEditor.default)(_extension.baseEditor, {
-    editorApi,
-    onSave,
-    columns
-  }), [columns, editorApi, onSave]);
+  const editor = (0, _react.useMemo)(() => {
+    const _editor = (0, _extension.baseEditor)();
+    return (0, _withPropsEditor.default)(_editor, {
+      editorApi,
+      onSave,
+      columns
+    });
+  }, [columns, editorApi, onSave]);
   const eventProxy = (0, _react.useMemo)(() => {
     return new _eventHandler.default(editor);
   }, [editor]);
+  (0, _useAttachments.default)(editor);
+  (0, _userLinkClick.default)(editor._id, editor === null || editor === void 0 ? void 0 : (_editor$api = editor.api) === null || _editor$api === void 0 ? void 0 : _editor$api.server, onLinkClick);
   const decorate = (0, _extension.useHighlight)(editor);
   const onChange = (0, _react.useCallback)(value => {
     setSlateValue(value);

package/dist/editors/slate-editor/index.js

@@ -20,9 +20,11 @@ var _useAttachments = _interopRequireDefault(require("../../hooks/use-attachment
 var _common = require("../../utils/common");
 var _outline = _interopRequireDefault(require("../../containers/outline"));
 var _useContainerStyle = _interopRequireDefault(require("../../hooks/use-container-style"));
+var _userLinkClick = _interopRequireDefault(require("../../hooks/user-link-click"));
 require("./style.css");
 const isMacOS = (0, _common.isMac)();
 function SlateEditor(_ref) {
+  var _editor$api;
   let {
     value,
     editorApi,
@@ -31,6 +33,7 @@ function SlateEditor(_ref) {
     isReadonly,
     isSupportFormula,
     isSupportInsertSeafileImage,
+    onLinkClick,
     children
   } = _ref;
   const scrollRef = (0, _react.useRef)(null);
@@ -38,14 +41,18 @@ function SlateEditor(_ref) {
   const {
     containerStyle
   } = (0, _useContainerStyle.default)(scrollRef);
-  const editor = (0, _react.useMemo)(() => (0, _withPropsEditor.default)(_extension.baseEditor, {
-    editorApi,
-    onSave
-  }), [editorApi, onSave]);
+  const editor = (0, _react.useMemo)(() => {
+    const _editor = (0, _extension.baseEditor)();
+    return (0, _withPropsEditor.default)(_editor, {
+      editorApi,
+      onSave
+    });
+  }, [editorApi, onSave]);
   const eventProxy = (0, _react.useMemo)(() => {
     return new _eventHandler.default(editor);
   }, [editor]);
   (0, _useAttachments.default)(editor);
+  (0, _userLinkClick.default)(editor._id, editor === null || editor === void 0 ? void 0 : (_editor$api = editor.api) === null || _editor$api === void 0 ? void 0 : _editor$api.server, onLinkClick);
   const decorate = (0, _extension.useHighlight)(editor);
   const onChange = (0, _react.useCallback)(value => {
     setSlateValue(value);

package/dist/editors/slate-viewer/index.js

@@ -18,6 +18,7 @@ var _useContainerStyle = _interopRequireDefault(require("../../hooks/use-contain
 require("./style.css");
 const isMacOS = (0, _common.isMac)();
 function SlateViewer(_ref) {
+  var _window, _window$location;
   let {
     value,
     isShowOutline,
@@ -34,7 +35,7 @@ function SlateViewer(_ref) {
   }, []);
   const containerScrollRef = externalScrollRef ? externalScrollRef : scrollRef;
   const decorate = (0, _extension.useHighlight)(editor);
-  (0, _userLinkClick.default)(editor._id, onLinkClick);
+  (0, _userLinkClick.default)(editor._id, (_window = window) === null || _window === void 0 ? void 0 : (_window$location = _window.location) === null || _window$location === void 0 ? void 0 : _window$location.origin, onLinkClick);
 
   // willUnmount
   (0, _react.useEffect)(() => {
@@ -47,6 +48,9 @@ function SlateViewer(_ref) {
     };
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
+  (0, _react.useEffect)(() => {
+    editor.children = value;
+  }, [editor, value]);
   return /*#__PURE__*/_react.default.createElement("div", {
     className: "sf-slate-viewer-container ".concat(_common.isMobile && 'mobile')
   }, /*#__PURE__*/_react.default.createElement(_slateReact.Slate, {

package/dist/extension/editor.js

@@ -10,14 +10,18 @@ var _slateHistory = require("slate-history");
 var _slateReact = require("slate-react");
 var _slugid = require("slugid");
 var _plugins = _interopRequireDefault(require("./plugins"));
-const baseEditor = exports.baseEditor = _plugins.default.reduce((editor, pluginItem) => {
-  const withPlugin = pluginItem.editorPlugin;
-  if (withPlugin) {
-    return withPlugin(editor);
-  }
+const baseEditor = () => {
+  const editor = _plugins.default.reduce((editor, pluginItem) => {
+    const withPlugin = pluginItem.editorPlugin;
+    if (withPlugin) {
+      return withPlugin(editor);
+    }
+    return editor;
+  }, (0, _slateHistory.withHistory)((0, _slateReact.withReact)((0, _slate.createEditor)())));
   editor._id = (0, _slugid.nice)();
   return editor;
-}, (0, _slateHistory.withHistory)((0, _slateReact.withReact)((0, _slate.createEditor)())));
+};
+exports.baseEditor = baseEditor;
 const inlineEditor = () => {
   const editor = _plugins.default.reduce((editor, pluginItem) => {
     const withPlugin = pluginItem.editorPlugin;

package/dist/extension/plugins/link/render-elem/index.js

@@ -20,7 +20,8 @@ const renderLink = (_ref, editor) => {
   let {
     attributes,
     children,
-    element
+    element,
+    option
   } = _ref;
   const [isShowPopover, setIsShowPopover] = (0, _react.useState)(false);
   const [popoverPosition, setPopoverPosition] = (0, _react.useState)({
@@ -28,6 +29,9 @@ const renderLink = (_ref, editor) => {
     left: 0
   });
   const isReadonly = (0, _slateReact.useReadOnly)();
+  const {
+    render
+  } = option || {};
 
   // eslint-disable-next-line react-hooks/exhaustive-deps
   const isLinkActive = (0, _react.useMemo)(() => (0, _helper.isLinkType)(editor), [editor.selection]);
@@ -71,7 +75,15 @@ const renderLink = (_ref, editor) => {
   const onHrefClick = (0, _react.useCallback)(e => {
     e.preventDefault();
   }, []);
-  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("span", Object.assign({
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/(0, _react.isValidElement)(render) ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/(0, _react.cloneElement)(render, {
+    element,
+    isShowPopover,
+    onLinkClick,
+    onHrefClick,
+    attributes,
+    children,
+    editor
+  })) : /*#__PURE__*/_react.default.createElement("span", Object.assign({
     onClick: onLinkClick,
     "data-url": element.url,
     className: (0, _classnames.default)('sf-virtual-link', {

package/dist/extension/plugins/link/render-elem/link-popover.js

@@ -11,7 +11,6 @@ var _reactDom = require("react-dom");
 var _reactI18next = require("react-i18next");
 var _eventBus = _interopRequireDefault(require("../../../../utils/event-bus"));
 var _helper = require("../helper");
-var _common = require("../../../../utils/common");
 var _eventTypes = require("../../../../constants/event-types");
 var _constants = require("../../../../constants");
 const LinkPopover = _ref => {
@@ -30,11 +29,11 @@ const LinkPopover = _ref => {
       onClosePopover();
     };
   }, [onClosePopover]);
-  const onLinkClick = (0, _react.useCallback)(e => {
-    if (!(0, _common.isUrl)(linkUrl)) {
-      e.preventDefault();
-    }
-  }, [linkUrl]);
+  const onLinkClick = (0, _react.useCallback)(event => {
+    const eventBus = _eventBus.default.getInstance();
+    eventBus.dispatch(_eventTypes.EXTERNAL_EVENTS.ON_LINK_CLICK, event, editor._id);
+    onClosePopover();
+  }, [editor, onClosePopover]);
   const onUnwrapLink = (0, _react.useCallback)(e => {
     e.stopPropagation();
     (0, _helper.unWrapLinkNode)(editor);
@@ -61,11 +60,9 @@ const LinkPopover = _ref => {
     id: "link-op-menu",
     className: "sf-link-op-menu",
     style: popoverPosition
-  }, /*#__PURE__*/_react.default.createElement("a", {
-    href: linkUrl,
+  }, /*#__PURE__*/_react.default.createElement("span", {
+    "data-url": linkUrl,
     onClick: onLinkClick,
-    target: "_blank",
-    rel: "noopener noreferrer",
     className: "sf-link-op-menu-link"
   }, t('Open_link')), /*#__PURE__*/_react.default.createElement("div", {
     className: "sf-link-op-icons d-flex "

package/dist/hooks/user-link-click.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+var _common = require("../utils/common");
 const {
   useEffect
 } = require('react');
@@ -13,7 +14,7 @@ const {
 const {
   default: EventBus
 } = require('../utils/event-bus');
-const useLinkClick = (editorId, callback) => {
+const useLinkClick = (editorId, server, callback) => {
   useEffect(() => {
     function onLinkClick(event, sourceEditorId) {
       event.preventDefault();
@@ -26,15 +27,26 @@ const useLinkClick = (editorId, callback) => {
       if (!target) return;
       link = target.dataset.url;
       if (editorId !== sourceEditorId) return;
+      let isValid = true;
+      if (!(0, _common.isUrl)(link)) {
+        isValid = false;
+        if (link.startsWith('/') && (0, _common.isUrl)(server + link)) {
+          isValid = true;
+        }
+        if (!link.startsWith('/') && (link.startsWith('mailto:') || link.startsWith('tel:'))) {
+          isValid = true;
+        }
+      }
+      if (!isValid) return;
       if (callback) {
         callback(link);
-      } else {
-        window.open(link);
+        return;
       }
+      window.open(link);
     }
     const eventBus = EventBus.getInstance();
     const unsubscribe = eventBus.subscribe(EXTERNAL_EVENTS.ON_LINK_CLICK, onLinkClick);
     return unsubscribe;
-  }, [editorId, callback]);
+  }, [editorId, server, callback]);
 };
 var _default = exports.default = useLinkClick;

package/dist/pages/longtext-editor-dialog/index.js

@@ -30,7 +30,8 @@ function LongTextEditorDialog(_ref) {
     editorApi,
     onSaveEditorValue,
     onEditorValueChanged,
-    onCloseEditorDialog
+    onCloseEditorDialog,
+    onLinkClick
   } = _ref;
   const editorRef = (0, _react.useRef)(null);
   const [isValueChanged, setValueChanged] = (0, _react.useState)(false);
@@ -178,7 +179,8 @@ function LongTextEditorDialog(_ref) {
     focusEnd: focusEnd,
     editorApi: editorApi,
     mathJaxSource: mathJaxSource,
-    onContentChanged: onContentChanged
+    onContentChanged: onContentChanged,
+    onLinkClick: onLinkClick
   }), (readOnly || isWindowsWechat) && /*#__PURE__*/_react.default.createElement(_markdownPreview.default, {
     isWindowsWechat: isWindowsWechat,
     value: value,

package/dist/pages/markdown-editor.js

@@ -23,6 +23,7 @@ const SimpleEditor = /*#__PURE__*/(0, _react.forwardRef)((_ref, ref) => {
     isSupportInsertSeafileImage,
     onSave: propsOnSave,
     onContentChanged: propsOnContentChanged,
+    onLinkClick,
     children
   } = _ref;
   const [richValue, setRichValue] = (0, _react.useState)([]);
@@ -61,6 +62,7 @@ const SimpleEditor = /*#__PURE__*/(0, _react.forwardRef)((_ref, ref) => {
     editorApi: editorApi,
     onSave: propsOnSave,
     onContentChanged: onContentChanged,
+    onLinkClick,
     children: children
   };
   if (isFetching || isLoading || isLoadingMathJax) {

package/dist/pages/markdown-view.js

@@ -31,6 +31,7 @@ var _slateViewer = _interopRequireDefault(require("../editors/slate-viewer"));
 function MarkdownViewer(_ref) {
   let {
     isFetching,
+    isShowLoading = true,
     value,
     mathJaxSource,
     isShowOutline,
@@ -40,22 +41,26 @@ function MarkdownViewer(_ref) {
     options
   } = _ref;
   const [richValue, setRichValue] = (0, _react.useState)([]);
-  const [isLoading, setIsLoading] = (0, _react.useState)(true);
+  const [isLoading, setIsLoading] = (0, _react.useState)(Boolean(isShowLoading));
   const {
     isLoadingMathJax
   } = (0, _useMathjax.default)(mathJaxSource);
   (0, _react.useEffect)(() => {
     if (!isFetching) {
-      setIsLoading(true);
+      if (isShowLoading) {
+        setIsLoading(true);
+      }
       const richValue = (0, _slateConvert.mdStringToSlate)(value);
       beforeRenderCallback && beforeRenderCallback(richValue);
       setRichValue(richValue);
-      setTimeout(() => {
-        setIsLoading(false);
-      }, 0);
+      if (isShowLoading) {
+        setTimeout(() => {
+          setIsLoading(false);
+        }, 0);
+      }
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [isFetching, value]);
+  }, [isFetching, value, isShowLoading]);
   const props = {
     options,
     isSupportFormula: !!mathJaxSource,
@@ -64,7 +69,7 @@ function MarkdownViewer(_ref) {
     scrollRef: scrollRef,
     onLinkClick: onLinkClick
   };
-  if (isFetching || isLoading || isLoadingMathJax) {
+  if (isShowLoading && (isFetching || isLoading || isLoadingMathJax)) {
     const loadingOption = (options === null || options === void 0 ? void 0 : options.loading) || {};
     const {
       render

package/dist/slate-convert/md-to-slate/transform.js

@@ -99,10 +99,13 @@ const applyMarkForInlineItem = function (result, item) {
     textNode['referenceType'] = item.referenceType;
     textNode['label'] = (_item$children$ = item.children[0]) === null || _item$children$ === void 0 ? void 0 : _item$children$.value;
     textNode['children'] = [{
-      id: textNode.id,
+      id: _slugid.default.nice(),
       text: ''
     }];
     result.push((0, _objectSpread2.default)({}, textNode));
+
+    // reset testNode
+    textNode = {};
     return;
   }
   const attr_key = INLINE_KEY_MAP[type];
@@ -116,7 +119,7 @@ const applyMarkForInlineItem = function (result, item) {
   }
   textNode[attr_key] = true;
   children.forEach(item => {
-    applyMarkForInlineItem(result, item, textNode);
+    applyMarkForInlineItem(result, item, (0, _objectSpread2.default)({}, textNode));
   });
 };
 const transformNodeWithInlineChildren = node => {
@@ -158,10 +161,17 @@ const transformBlockquote = node => {
   return {
     id: _slugid.default.nice(),
     type: _elementTypes.BLOCKQUOTE,
-    children: children.map(child => {
+    children: Array.isArray(children) && children.length > 0 ? children.map(child => {
       const handler = elementHandlers[child.type];
-      return handler(child);
-    }).flat() // flat
+      return handler(child); // flat
+    }).flat() : [{
+      id: _slugid.default.nice(),
+      type: _elementTypes.PARAGRAPH,
+      children: [{
+        id: _slugid.default.nice(),
+        text: ''
+      }]
+    }]
   };
 };
 exports.transformBlockquote = transformBlockquote;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seafile/seafile-editor",
-  "version": "3.0.16",
+  "version": "3.0.18",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
@@ -30,14 +30,14 @@
     "@babel/plugin-transform-class-properties": "7.23.3",
     "@babel/plugin-transform-private-methods": "7.23.3",
     "@babel/runtime": "7.26.10",
-    "axios": "^1.13.2",
+    "axios": "^1.13.6",
     "babel-jest": "29.7.0",
     "babel-loader": "9.1.3",
     "babel-plugin-import": "^1.13.6",
     "babel-preset-react-app": "^10.0.1",
     "clean-webpack-plugin": "4.0.0",
     "css-loader": "6.8.1",
-    "css-minimizer-webpack-plugin": "5.0.1",
+    "css-minimizer-webpack-plugin": "8.0.0",
     "ejs": "3.1.10",
     "eslint": "8.49.0",
     "eslint-config-react-app": "7.0.1",
@@ -48,7 +48,7 @@
     "ignore-loader": "0.1.2",
     "jest": "29.7.0",
     "jest-environment-jsdom": "29.7.0",
-    "koa": "2.16.1",
+    "koa": "2.16.4",
     "koa-router": "7.3.0",
     "koa-send": "5.0.1",
     "koa2-cors": "2.0.6",
@@ -62,13 +62,13 @@
     "react": "18.3.1",
     "react-dom": "18.3.1",
     "react-i18next": "12.1.4",
-    "react-router": "6.16.0",
-    "react-router-dom": "6.16.0",
+    "react-router": "7.13.1",
+    "react-router-dom": "7.13.1",
     "seafile-js": "0.2.238",
     "style-loader": "3.3.3",
-    "terser-webpack-plugin": "5.3.9",
+    "terser-webpack-plugin": "5.4.0",
     "url-loader": "4.1.1",
-    "webpack": "5.98.0",
+    "webpack": "5.105.4",
     "webpack-dev-server": "5.2.2",
     "webpack-merge": "5.9.0"
   },