@seafile/sdoc-editor 3.0.143 → 3.0.145

package/dist/android/js-bridge.js

@@ -50,6 +50,13 @@ var JSBridge = /*#__PURE__*/(0, _createClass2["default"])(function JSBridge() {
         action = _parsedData.action,
         data = _parsedData.data;
       var eventHandler = _this.eventHandlerMap[action];
+      if (typeof eventHandler !== 'function') {
+        console.error("No event handler registered for action: ".concat(action));
+        responseCallback(JSON.stringify({
+          success: false
+        }));
+        return;
+      }
       var params = null;
       try {
         params = JSON.parse(data);
@@ -59,8 +66,16 @@ var JSBridge = /*#__PURE__*/(0, _createClass2["default"])(function JSBridge() {
         responseCallback(JSON.stringify({
           success: false
         }));
+        return;
+      }
+      var execActionSucceed = false;
+      try {
+        execActionSucceed = eventHandler(params, _this.editor);
+      } catch (err) {
+        console.error("Failed to execute action handler: ".concat(action));
+        console.error(err);
+        execActionSucceed = false;
       }
-      var execActionSucceed = eventHandler(params, _this.editor);
       if (execActionSucceed) {
         responseCallback(JSON.stringify({
           success: true

package/dist/android/toolbar-trigger.js

@@ -5,18 +5,19 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.updateEditorHistory = exports.registerToolbarMenuTrigger = void 0;
-var _basicSdk = require("@seafile/comment-editor/dist/basic-sdk");
 var _constants = require("../extension/constants");
 var _core = require("../extension/core");
 var _helpers = require("../extension/plugins/check-list/helpers");
 var _helpers2 = require("../extension/plugins/header/helpers");
-var _helpers3 = require("../extension/plugins/list/helpers");
-var _eventBus = _interopRequireDefault(require("../utils/event-bus"));
+var _helpers3 = require("../extension/plugins/image/helpers");
+var _helpers4 = require("../extension/plugins/list/helpers");
 var _constants2 = require("./constants");
 var _jsBridge = _interopRequireDefault(require("./js-bridge"));
 var headerTypes = [_constants.ELEMENT_TYPE.TITLE, _constants.ELEMENT_TYPE.SUBTITLE, _constants.ELEMENT_TYPE.HEADER1, _constants.ELEMENT_TYPE.HEADER2, _constants.ELEMENT_TYPE.HEADER3, _constants.ELEMENT_TYPE.HEADER4, _constants.ELEMENT_TYPE.HEADER5, _constants.ELEMENT_TYPE.HEADER6, _constants.ELEMENT_TYPE.PARAGRAPH];
 var onToolbarTrigger = function onToolbarTrigger(data, editor) {
-  var type = data.type;
+  var _ref = data || {},
+    type = _ref.type,
+    images = _ref.images;
   if (headerTypes.includes(type)) {
     var nodeEntry = (0, _core.getNearestBlockNode)(editor);
     if (!nodeEntry) return;
@@ -36,7 +37,7 @@ var onToolbarTrigger = function onToolbarTrigger(data, editor) {
     return true;
   }
   if (type === _constants.UNORDERED_LIST || type === _constants.ORDERED_LIST) {
-    (0, _helpers3.setListType)(editor, type);
+    (0, _helpers4.setListType)(editor, type);
     return true;
   }
   if (type === _constants.CHECK_LIST_ITEM) {
@@ -50,13 +51,13 @@ var onToolbarTrigger = function onToolbarTrigger(data, editor) {
     return true;
   }
   if (type === _constants.LOCAL_IMAGE) {
-    var eventBus = _eventBus["default"].getInstance();
-    eventBus.dispatch(_basicSdk.INTERNAL_EVENT.INSERT_ELEMENT, {
-      type: _constants.LOCAL_IMAGE,
-      editor: editor
-    });
+    if (!images || !Array.isArray(images) || images.length === 0) {
+      return true;
+    }
+    (0, _helpers3.insertImage)(editor, images, editor.selection);
     return true;
   }
+  return false;
 };
 var updateEditorHistory = exports.updateEditorHistory = function updateEditorHistory(editor) {
   if (!window.seadroid) {

package/dist/extension/commons/insert-element-dialog/index.js

@@ -78,6 +78,10 @@ var InsertElementDialog = function InsertElementDialog(_ref) {
     _useState22 = (0, _slicedToArray2["default"])(_useState21, 2),
     formula = _useState22[0],
     setFormula = _useState22[1];
+  var _useState23 = (0, _react.useState)(0),
+    _useState24 = (0, _slicedToArray2["default"])(_useState23, 2),
+    localInputTriggerToken = _useState24[0],
+    setLocalInputTriggerToken = _useState24[1];
   var _useTranslation = (0, _reactI18next.useTranslation)('sdoc-editor'),
     t = _useTranslation.t;
   var uploadLocalImageInputRef = (0, _react.useRef)();
@@ -135,6 +139,26 @@ var InsertElementDialog = function InsertElementDialog(_ref) {
     };
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
+  (0, _react.useEffect)(function () {
+    var triggerLocalInput = function triggerLocalInput(inputRef, type) {
+      var inputNode = inputRef.current;
+      if (!inputNode) {
+        console.error("[InsertElementDialog] ".concat(type, " input ref is empty."));
+        return;
+      }
+      inputNode.click();
+    };
+    if (dialogType === _constants2.LOCAL_IMAGE) {
+      requestAnimationFrame(function () {
+        return triggerLocalInput(uploadLocalImageInputRef, _constants2.LOCAL_IMAGE);
+      });
+    }
+    if (dialogType === _constants2.LOCAL_VIDEO) {
+      requestAnimationFrame(function () {
+        return triggerLocalInput(uploadLocalVideoInputRef, _constants2.LOCAL_VIDEO);
+      });
+    }
+  }, [dialogType, localInputTriggerToken]);
   var toggleDialog = (0, _react.useCallback)(function (_ref4) {
     var type = _ref4.type,
       element = _ref4.element,
@@ -149,7 +173,6 @@ var InsertElementDialog = function InsertElementDialog(_ref) {
       linkTitle = _ref4.linkTitle,
       handleSubmit = _ref4.handleSubmit,
       data = _ref4.data;
-    console.log('android test: xiaoqiang test');
     setInsertPosition(insertPosition);
     setSlateNode(slateNode);
     setElement(element);
@@ -170,16 +193,10 @@ var InsertElementDialog = function InsertElementDialog(_ref) {
     // Apply for comment editor, as it has a different editor instance
     setValidEditor(paramEditor || editor);
     setData(data);
-    if (type === _constants2.LOCAL_IMAGE) {
-      setTimeout(function () {
-        console.log('android test: xiaoqiang test 2');
-        uploadLocalImageInputRef.current && uploadLocalImageInputRef.current.click();
-      }, 0);
-    }
-    if (type === _constants2.LOCAL_VIDEO) {
-      setTimeout(function () {
-        uploadLocalVideoInputRef.current && uploadLocalVideoInputRef.current.click();
-      }, 0);
+    if (type === _constants2.LOCAL_IMAGE || type === _constants2.LOCAL_VIDEO) {
+      setLocalInputTriggerToken(function (token) {
+        return token + 1;
+      });
     }
   }, [editor]);
   var closeDialog = (0, _react.useCallback)(function () {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seafile/sdoc-editor",
-  "version": "3.0.143",
+  "version": "3.0.145",
   "main": "dist/index.js",
   "scripts": {
     "test": "jest",
@@ -20,7 +20,7 @@
     "@seafile/comment-editor": "1.0.24",
     "@seafile/print-js": "1.6.6",
     "@seafile/react-image-lightbox": "5.0.4",
-    "@seafile/seafile-database": "0.0.51",
+    "@seafile/seafile-database": "0.0.52",
     "@seafile/slate": "0.91.8",
     "@seafile/slate-history": "0.86.2",
     "@seafile/slate-hyperscript": "0.81.7",
@@ -72,5 +72,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "3fc6a2d8bb580c05385814d3d96bd7bcd1136f40"
+  "gitHead": "37c339298a9de9edcdbbd757b376f12caa6df0a3"
 }