@seafile/seafile-editor 1.0.93-alpha2 → 1.0.93-alpha3

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

@@ -11,7 +11,7 @@ var _slateReact = require("slate-react");
 var _slate = require("slate");
 var _extension = require("../../extension");
 var _eventBus = _interopRequireDefault(require("../../utils/event-bus"));
-var _inlineEventHandel = _interopRequireDefault(require("../../utils/inline-event-handel"));
+var _eventHandler = _interopRequireDefault(require("../../utils/event-handler"));
 var _withPropsEditor = _interopRequireDefault(require("./with-props-editor"));
 var _core = require("../../extension/core");
 var _common = require("../../utils/common");
@@ -27,8 +27,7 @@ const InlineEditor = _ref => {
     onContentChanged,
     isSupportFormula,
     onExpandEditorToggle,
-    handelEnableEdit,
-    closeEditor
+    handelEnableEdit
   } = _ref;
   const [slateValue, setSlateValue] = (0, _react.useState)(value);
   const focusRangeRef = (0, _react.useRef)(null);
@@ -41,8 +40,8 @@ const InlineEditor = _ref => {
     });
   }, [columns, editorApi, onSave]);
   const eventProxy = (0, _react.useMemo)(() => {
-    return new _inlineEventHandel.default(editor, closeEditor);
-  }, [editor, closeEditor]);
+    return new _eventHandler.default(editor);
+  }, [editor]);
   const decorate = (0, _extension.useHighlight)(editor);
   const onChange = (0, _react.useCallback)(value => {
     setSlateValue(value);

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

@@ -49,15 +49,18 @@ const LongTextInlineEditor = /*#__PURE__*/(0, _react.forwardRef)((_ref, ref) =>
     longTextValueChangedRef.current = true;
   }, []);
   const onHotKey = (0, _react.useCallback)(event => {
-    // const keyCode = event.keyCode;
-    // const isModP = isHotkey('mod+p', event);
-    // if (keyCode === 27 || isModP) {
-    //   event.preventDefault();
-    //   !isModP && event.stopPropagation();
-    //   closeEditor();
-    //   return;
-    // }
-  }, [closeEditor]);
+    var _event$nativeEvent;
+    if (!enableEdit) return;
+    const keyCode = event.keyCode;
+    const isModP = (0, _isHotkey.default)('mod+p', event);
+    (event === null || event === void 0 ? void 0 : (_event$nativeEvent = event.nativeEvent) === null || _event$nativeEvent === void 0 ? void 0 : _event$nativeEvent.stopImmediatePropagation) && event.nativeEvent.stopImmediatePropagation();
+    if (keyCode === 27 || isModP) {
+      event.preventDefault();
+      !isModP && event.stopPropagation();
+      closeEditor();
+      return;
+    }
+  }, [enableEdit, closeEditor]);
   (0, _react.useImperativeHandle)(ref, () => {
     return {
       openEditor: openEditor,
@@ -80,6 +83,7 @@ const LongTextInlineEditor = /*#__PURE__*/(0, _react.forwardRef)((_ref, ref) =>
     closeEditor: closeEditor
   }) : /*#__PURE__*/_react.default.createElement(_normalEditor.default, {
     enableEdit: enableEdit,
+    handelEnableEdit: handelEnableEdit,
     lang: lang,
     headerName: headerName,
     value: valueRef.current.text,
@@ -88,9 +92,7 @@ const LongTextInlineEditor = /*#__PURE__*/(0, _react.forwardRef)((_ref, ref) =>
     isCheckBrowser: isCheckBrowser,
     editorApi: editorApi,
     onSaveEditorValue: onSaveEditorValue,
-    onEditorValueChanged: onEditorValueChanged,
-    handelEnableEdit: handelEnableEdit,
-    closeEditor: closeEditor
+    onEditorValueChanged: onEditorValueChanged
   })));
 });
 var _default = exports.default = LongTextInlineEditor;

package/dist/pages/longtext-inline-editor/normal-editor.js

@@ -15,6 +15,7 @@ var _classnames = _interopRequireDefault(require("classnames"));
 const NormalEditor = _ref => {
   let {
     enableEdit,
+    handelEnableEdit,
     lang,
     headerName,
     value: propsValue,
@@ -23,9 +24,7 @@ const NormalEditor = _ref => {
     isCheckBrowser = false,
     editorApi,
     onSaveEditorValue,
-    onEditorValueChanged,
-    closeEditor,
-    handelEnableEdit
+    onEditorValueChanged
   } = _ref;
   const editorContainerRef = (0, _react.useRef)(null);
   const editorRef = (0, _react.useRef)(null);
@@ -119,7 +118,6 @@ const NormalEditor = _ref => {
     isInline: true,
     value: valueRef.current.text,
     handelEnableEdit: handelEnableEdit,
-    closeEditor: closeEditor,
     onSave: handelAutoSave,
     editorApi: editorApi,
     onContentChanged: onContentChanged,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seafile/seafile-editor",
-  "version": "1.0.93-alpha2",
+  "version": "1.0.93-alpha3",
   "description": "",
   "main": "dist/index.js",
   "scripts": {

package/dist/utils/inline-event-handel.js

@@ -1,51 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/defineProperty"));
-var _isHotkey = _interopRequireDefault(require("is-hotkey"));
-class EventProxy {
-  constructor(_editor, closeEditor) {
-    (0, _defineProperty2.default)(this, "onKeyDown", event => {
-      const editor = this.editor;
-      if (editor.onHotKeyDown) {
-        const isHandled = editor.onHotKeyDown(event);
-        if (isHandled) return;
-      }
-
-      // Disable the default 'save page'
-      if ((0, _isHotkey.default)('mod+s', event)) {
-        event.preventDefault();
-        const {
-          onSave
-        } = this.editor;
-        onSave && onSave();
-        return;
-      }
-
-      // Disable default 'tab' behavior
-      if ((0, _isHotkey.default)('tab', event)) {
-        event.preventDefault();
-      } else {
-        event.stopPropagation();
-      }
-      if ((0, _isHotkey.default)('esc', event)) {
-        this.closeEditor && this.closeEditor();
-      }
-    });
-    (0, _defineProperty2.default)(this, "onCopy", event => {
-      const editor = this.editor;
-      if (editor.onCopy) {
-        const isHandled = editor.onCopy(event);
-        if (isHandled) return true;
-      }
-      return false;
-    });
-    this.editor = _editor;
-    this.closeEditor = closeEditor;
-  }
-}
-var _default = exports.default = EventProxy;