@seafile/sdoc-editor 3.0.73 → 3.0.75

package/dist/extension/plugins/link/hover/index.js

@@ -12,6 +12,7 @@ var _reactDom = require("react-dom");
 var _reactI18next = require("react-i18next");
 var _slate = require("@seafile/slate");
 var _slateReact = require("@seafile/slate-react");
+var _isUrl = _interopRequireDefault(require("is-url"));
 var _tooltip = _interopRequireDefault(require("../../../../components/tooltip"));
 var _eventBus = _interopRequireDefault(require("../../../../utils/event-bus"));
 var _helpers = require("../helpers");
@@ -35,6 +36,10 @@ var LinkHover = function LinkHover(_ref) {
     setIsShowTooltip(true);
   }, []);
   var onMouseDown = (0, _react.useCallback)(function (event) {
+    if (!(0, _isUrl["default"])(element.href)) {
+      event.preventDefault();
+      return;
+    }
     event.stopPropagation();
     if (!(0, _helpers.isWeChat)()) {
       window.open(element.href);

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

@@ -14,6 +14,7 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/es
 var _react = _interopRequireDefault(require("react"));
 var _slate = require("@seafile/slate");
 var _classnames = _interopRequireDefault(require("classnames"));
+var _isUrl = _interopRequireDefault(require("is-url"));
 var _constants = require("../../../constants");
 var _useScrollContext = require("../../../hooks/use-scroll-context");
 var _commonUtils = require("../../../utils/common-utils");
@@ -148,6 +149,9 @@ var Link = /*#__PURE__*/function (_React$Component) {
         isShowLinkMenu = _this$state.isShowLinkMenu,
         menuPosition = _this$state.menuPosition;
       var className = isShowLinkMenu ? 'seafile-ed-hovermenu-mouseclick' : null;
+      if (!(0, _isUrl["default"])(element.href)) {
+        return /*#__PURE__*/_react["default"].createElement("span", attributes, /*#__PURE__*/_react["default"].createElement("span", null, children));
+      }
       if (readonly) {
         var _element$children$;
         return /*#__PURE__*/_react["default"].createElement("span", Object.assign({

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

@@ -192,6 +192,7 @@ var Video = function Video(_ref) {
       scrollRef.current && scrollRef.current.addEventListener('scroll', onScroll);
       observerRefValue = scrollRef.current;
       resizeObserver = new ResizeObserver(function (entries) {
+        // eslint-disable-next-line no-unused-vars
         var _iterator = (0, _createForOfIteratorHelper2["default"])(entries),
           _step;
         try {

package/dist/extension/plugins/whiteboard/hover-menu/index.js

@@ -13,7 +13,8 @@ var _tooltip = _interopRequireDefault(require("../../../../components/tooltip"))
 var _commons = require("../../../commons");
 require("./index.css");
 var WhiteboardHoverMenu = function WhiteboardHoverMenu(_ref) {
-  var menuPosition = _ref.menuPosition,
+  var isValidUrl = _ref.isValidUrl,
+    menuPosition = _ref.menuPosition,
     onOpen = _ref.onOpen,
     openFullscreen = _ref.openFullscreen,
     onDeleteWhiteboard = _ref.onDeleteWhiteboard;
@@ -31,14 +32,16 @@ var WhiteboardHoverMenu = function WhiteboardHoverMenu(_ref) {
     style: menuPosition
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: "hover-menu-container"
-  }, /*#__PURE__*/_react["default"].createElement("span", {
+  }, isValidUrl && /*#__PURE__*/_react["default"].createElement("span", {
     className: "op-group-item"
   }, /*#__PURE__*/_react["default"].createElement("span", {
     id: "sdoc_whiteboard_open",
     role: "button",
     className: "op-item",
     onClick: onOpen
-  }, /*#__PURE__*/_react["default"].createElement("span", null, t('Open')))), /*#__PURE__*/_react["default"].createElement("span", {
+  }, /*#__PURE__*/_react["default"].createElement("span", {
+    className: "mr-1"
+  }, t('Open')))), /*#__PURE__*/_react["default"].createElement("span", {
     className: "op-group-item"
   }, /*#__PURE__*/_react["default"].createElement("span", {
     id: "sdoc_whiteboard_delete",
@@ -51,7 +54,7 @@ var WhiteboardHoverMenu = function WhiteboardHoverMenu(_ref) {
     target: "sdoc_whiteboard_delete",
     placement: "top",
     fade: true
-  }, t('Delete')))), /*#__PURE__*/_react["default"].createElement("span", {
+  }, t('Delete')))), isValidUrl && /*#__PURE__*/_react["default"].createElement("span", {
     className: "op-group-item"
   }, /*#__PURE__*/_react["default"].createElement("span", {
     id: "sdoc_whiteboard_full_screen_mode",
@@ -59,7 +62,7 @@ var WhiteboardHoverMenu = function WhiteboardHoverMenu(_ref) {
     className: "op-item",
     onClick: openFullscreen
   }, /*#__PURE__*/_react["default"].createElement("i", {
-    className: "sdocfont sdoc-fullscreen"
+    className: "sdocfont sdoc-fullscreen icon-font"
   }), showTooltip && /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
     target: "sdoc_whiteboard_full_screen_mode",
     placement: "top",

package/dist/extension/plugins/whiteboard/index.css

@@ -58,3 +58,12 @@
   height: 80%;
   overflow: auto;
 }
+
+.sdoc-whiteboard-tip {
+  width: 100%;
+  height: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  color: red;
+}

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

@@ -10,9 +10,11 @@ var _createForOfIteratorHelper2 = _interopRequireDefault(require("@babel/runtime
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
 var _reactDom = _interopRequireDefault(require("react-dom"));
+var _reactI18next = require("react-i18next");
 var _slate = require("@seafile/slate");
 var _slateReact = require("@seafile/slate-react");
 var _classnames = _interopRequireDefault(require("classnames"));
+var _isUrl = _interopRequireDefault(require("is-url"));
 var _constants = require("../../../constants");
 var _context = _interopRequireDefault(require("../../../context"));
 var _useScrollContext = require("../../../hooks/use-scroll-context");
@@ -33,6 +35,8 @@ var Whiteboard = function Whiteboard(_ref) {
   var scrollRef = (0, _useScrollContext.useScrollContext)();
   var isSelected = (0, _slateReact.useSelected)();
   var readOnly = (0, _slateReact.useReadOnly)();
+  var _useTranslation = (0, _reactI18next.useTranslation)('sdoc-editor'),
+    t = _useTranslation.t;
   var _useState = (0, _react.useState)({
       top: '',
       left: ''
@@ -44,7 +48,11 @@ var Whiteboard = function Whiteboard(_ref) {
     _useState4 = (0, _slicedToArray2["default"])(_useState3, 2),
     isShowZoomOut = _useState4[0],
     setIsShowZoomOut = _useState4[1];
+  var isValidUrl = (0, _react.useMemo)(function () {
+    return (0, _isUrl["default"])(link);
+  }, [link]);
   (0, _react.useEffect)(function () {
+    if (!isValidUrl) return;
     var handleMessage = function handleMessage(event) {
       var _event$data;
       if (((_event$data = event.data) === null || _event$data === void 0 ? void 0 : _event$data.type) === 'checkSdocParent') {
@@ -86,7 +94,7 @@ var Whiteboard = function Whiteboard(_ref) {
       window.removeEventListener('message', handleMessage);
       unsubscribeResizeArticle();
     };
-  }, []);
+  }, [isValidUrl]);
   var onDeleteWhiteboard = (0, _react.useCallback)(function () {
     var path = _slateReact.ReactEditor.findPath(editor, element);
     _slate.Transforms.removeNodes(editor, {
@@ -97,6 +105,7 @@ var Whiteboard = function Whiteboard(_ref) {
   }, [editor, element]);
   var handleDoubleClick = function handleDoubleClick(event) {
     event.preventDefault();
+    if (!isValidUrl) return;
     var siteRoot = _context["default"].getSetting('siteRoot');
     var url = "".concat(siteRoot, "lib/").concat(repo_id, "/file").concat(file_path);
     window.open(url, '_blank');
@@ -116,6 +125,7 @@ var Whiteboard = function Whiteboard(_ref) {
       scrollRef.current.addEventListener('scroll', handleScroll);
       observerRefValue = scrollRef.current;
       resizeObserver = new ResizeObserver(function (entries) {
+        // eslint-disable-next-line no-unused-vars
         var _iterator = (0, _createForOfIteratorHelper2["default"])(entries),
           _step;
         try {
@@ -172,7 +182,7 @@ var Whiteboard = function Whiteboard(_ref) {
     scrolling: "no"
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: "sdoc-whiteboard-title"
-  }, title), /*#__PURE__*/_react["default"].createElement("iframe", {
+  }, title), isValidUrl && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("iframe", {
     className: "sdoc-whiteboard-element",
     title: title,
     src: link,
@@ -181,7 +191,11 @@ var Whiteboard = function Whiteboard(_ref) {
     className: "iframe-overlay",
     onDoubleClick: handleDoubleClick,
     onClick: handleOnClick
-  })), isSelected && !readOnly && !isShowZoomOut && /*#__PURE__*/_react["default"].createElement(_hoverMenu["default"], {
+  })), !isValidUrl && /*#__PURE__*/_react["default"].createElement("div", {
+    ref: whiteboardRef,
+    className: "sdoc-whiteboard-tip"
+  }, t('Whiteboard_link_invalid_tip'))), isSelected && !readOnly && !isShowZoomOut && /*#__PURE__*/_react["default"].createElement(_hoverMenu["default"], {
+    isValidUrl: isValidUrl,
     menuPosition: menuPosition,
     onOpen: handleDoubleClick,
     openFullscreen: openFullscreen,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seafile/sdoc-editor",
-  "version": "3.0.73",
+  "version": "3.0.75",
   "main": "dist/index.js",
   "scripts": {
     "test": "jest",
@@ -17,7 +17,7 @@
   "license": "ISC",
   "description": "",
   "dependencies": {
-    "@seafile/comment-editor": "1.0.14",
+    "@seafile/comment-editor": "~1.0.15",
     "@seafile/print-js": "1.6.6",
     "@seafile/react-image-lightbox": "5.0.4",
     "@seafile/seafile-database": "0.0.19",
@@ -72,5 +72,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "8375f6d58025bca1016998680af2d51edee20984"
+  "gitHead": "8d8c95e1ddd3d22992930f73c25bf7973aca4c2c"
 }