@seafile/sdoc-editor 1.0.168 → 1.0.170

package/dist/android/js-bridge.js

@@ -9,12 +9,10 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/es
 class JSBridge {
   constructor() {
     (0, _defineProperty2.default)(this, "init", () => {
-      if (window.WebViewJavascriptBridge && !window.WebViewJavascriptBridge.inited) {
-        window.WebViewJavascriptBridge.init();
+      if (window.WebViewJavascriptBridge) {
+        this.initWebViewJavascriptBridge();
       } else {
-        document.addEventListener('WebViewJavascriptBridgeReady', function () {
-          window.WebViewJavascriptBridge.init();
-        }, false);
+        document.addEventListener('WebViewJavascriptBridgeReady', this.initWebViewJavascriptBridge, false);
       }
       this.initJSEventHandler();
     });
@@ -22,20 +20,21 @@ class JSBridge {
       if (!window.WebViewJavascriptBridge) return;
       window.WebViewJavascriptBridge.callHandler('finishPage');
     });
+    (0, _defineProperty2.default)(this, "initWebViewJavascriptBridge", () => {
+      if (window.WebViewJavascriptBridge.init && !window.WebViewJavascriptBridge.inited) {
+        window.WebViewJavascriptBridge.init();
+      }
+    });
     (0, _defineProperty2.default)(this, "initJSEventHandler", () => {
-      console.log('aa');
       if (!window.WebViewJavascriptBridge) return;
-      console.log('bb');
       window.WebViewJavascriptBridge.registerHandler('callJsFunction', (sData, responseCallback) => {
-        console.log(sData, '111');
         if (!sData) return;
         let parsedData = null;
         try {
           parsedData = JSON.parse(sData);
-          console.log(parsedData);
         } catch (err) {
-          parsedData = null;
           console.log('parsed error');
+          parsedData = null;
         }
         if (!parsedData) return;
         const {
@@ -43,7 +42,6 @@ class JSBridge {
           data
         } = parsedData;
         const eventHandler = this.eventHandlerMap[action];
-        console.log(data);
         const execActionSucceed = eventHandler(JSON.parse(data));
         if (execActionSucceed) {
           responseCallback(JSON.stringify({

package/dist/basic-sdk/editor/sdoc-editor.js

@@ -99,11 +99,15 @@ const SdocEditor = /*#__PURE__*/(0, _react.forwardRef)((_ref, ref) => {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
   (0, _react.useEffect)(() => {
-    if (_utils.isMobile) {
+    const mobileLogin = _context.default.getSetting('mobileLogin');
+    if (mobileLogin) {
       _jsBridge.default.init();
       (0, _outlineModule.registerOutlineEventHandler)();
       (0, _outlineModule.updateOutlineValue)(document.elements);
     }
+    return () => {
+      _jsBridge.default.finishPage();
+    };
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
   const onRefreshDocument = (0, _react.useCallback)(() => {

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

@@ -39,14 +39,18 @@ const RenderQuickInsert = (_ref, editor, readonly) => {
       (0, _helper.transformToText)(editor, element);
     }
   }, [editor, element]);
-  const genStyle = (top, left) => {
+  const genStyle = (0, _react.useCallback)((top, left) => {
     if (editor.isRemote) return null;
     const overflowY = top + sideMenuRef.current.offsetHeight - document.body.clientHeight;
     if (overflowY > 0) {
       top = top - overflowY - 10;
     }
+    const overflowX = left - sideMenuRef.current.offsetWidth;
+    if (overflowX < 0) {
+      left = sideMenuRef.current.offsetWidth + 10;
+    }
     return `top: ${top}px; left: ${left}px`;
-  };
+  }, [editor.isRemote]);
   const handleInsertMenuStyle = (0, _react.useCallback)(() => {
     const currentDom = _slateReact.ReactEditor.toDOMNode(editor, element);
     const {
@@ -55,7 +59,7 @@ const RenderQuickInsert = (_ref, editor, readonly) => {
     } = currentDom.getBoundingClientRect();
     const style = genStyle(top, left - 10);
     setMenuStyle(style);
-  }, [editor, element]);
+  }, [editor, element, genStyle]);
   const handleScroll = (0, _react.useCallback)(e => {
     handleInsertMenuStyle();
   }, [handleInsertMenuStyle]);

package/dist/basic-sdk/extension/toolbar/side-toolbar/side-menu.js

@@ -69,13 +69,18 @@ const SideMenu = (_ref, ref) => {
   }, [onReset, slateNode.id, t]);
   const onUpdateMenuLocation = (0, _react.useCallback)(() => {
     let top = menuPosition.top;
+    let left = menuPosition.left;
     if (sideMenuRef.current) {
       const overflowY = menuPosition.top + sideMenuRef.current.offsetHeight - document.body.clientHeight;
       if (overflowY > 0) {
         top = menuPosition.top - overflowY - 10;
       }
+      const overflowX = menuPosition.left - sideMenuRef.current.offsetWidth;
+      if (overflowX < 0) {
+        left = sideMenuRef.current.offsetWidth + 10;
+      }
     }
-    setMenuStyle(`top: ${top}px; left: ${menuPosition.left}px`);
+    setMenuStyle(`top: ${top}px; left: ${left}px`);
   }, [menuPosition.left, menuPosition.top]);
   (0, _react.useEffect)(() => {
     onUpdateMenuLocation();

package/dist/basic-sdk/views/sdoc-viewer.js

@@ -34,11 +34,15 @@ const SDocViewer = _ref => {
   const slateValue = (document || (0, _utils.generateDefaultDocContent)()).elements;
   const Provider = showComment ? _hooks.CollaboratorsProvider : _react.Fragment;
   (0, _react.useEffect)(() => {
-    if (_utils.isMobile) {
+    const mobileLogin = _context.default.getSetting('mobileLogin');
+    if (mobileLogin) {
       _jsBridge.default.init();
       (0, _outlineModule.registerOutlineEventHandler)();
       (0, _outlineModule.updateOutlineValue)(slateValue);
     }
+    return () => {
+      _jsBridge.default.finishPage();
+    };
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
   return /*#__PURE__*/_react.default.createElement(Provider, null, /*#__PURE__*/_react.default.createElement(_hooks.PluginsProvider, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seafile/sdoc-editor",
-  "version": "1.0.168",
+  "version": "1.0.170",
   "private": false,
   "description": "This is a sdoc editor",
   "main": "dist/index.js",