@seafile/seafile-editor 1.0.93-alpha → 1.0.93-alpha1

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

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

@@ -8,7 +8,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _isHotkey = _interopRequireDefault(require("is-hotkey"));
-var _constants = require("../../constants");
 var _clickOutside = _interopRequireDefault(require("./click-outside"));
 var _fallbackEditor = _interopRequireDefault(require("./fallback-editor"));
 var _normalEditor = _interopRequireDefault(require("./normal-editor"));
@@ -36,38 +35,29 @@ const LongTextInlineEditor = /*#__PURE__*/(0, _react.forwardRef)((_ref, ref) =>
   } = (0, _react.useMemo)(() => {
     return (0, _getBrowserInfo.default)(isCheckBrowser);
   }, [isCheckBrowser]);
-  const onHotKey = (0, _react.useCallback)(event => {
-    const keyCode = event.keyCode;
-    if ((0, _isHotkey.default)('space') || (0, _isHotkey.default)('enter') || [_constants.KeyCodes.PageUp, _constants.KeyCodes.PageDown, _constants.KeyCodes.LeftArrow, _constants.KeyCodes.UpArrow, _constants.KeyCodes.RightArrow, _constants.KeyCodes.DownArrow].includes(keyCode)) {
-      event.stopPropagation();
-      return;
-    }
-    const isModP = (0, _isHotkey.default)('mod+p', event);
-    if (keyCode === _constants.KeyCodes.Esc || isModP) {
-      event.preventDefault();
-      !isModP && event.stopPropagation();
-      if (longTextValueChangedRef.current) {
-        onSaveEditorValue(valueRef.current);
-      }
-      setEnableEdit(false);
-      return;
-    }
-  }, [onSaveEditorValue]);
   const openEditor = (0, _react.useCallback)(() => {
     setEnableEdit(true);
-    document.addEventListener('keydown', onHotKey);
-  }, [onHotKey]);
+  }, []);
   const closeEditor = (0, _react.useCallback)(() => {
     if (longTextValueChangedRef.current) {
       onSaveEditorValue(valueRef.current);
     }
     setEnableEdit(false);
-    document.removeEventListener('keydown', onHotKey);
-  }, [longTextValueChangedRef, valueRef, onSaveEditorValue, onHotKey]);
+  }, [longTextValueChangedRef, valueRef, onSaveEditorValue]);
   const onEditorValueChanged = (0, _react.useCallback)(value => {
     valueRef.current = value;
     longTextValueChangedRef.current = true;
   }, []);
+  const onHotKey = (0, _react.useCallback)(event => {
+    const keyCode = event.keyCode;
+    const isModP = (0, _isHotkey.default)('mod+p', event);
+    if (keyCode === 27 || isModP) {
+      event.preventDefault();
+      !isModP && event.stopPropagation();
+      closeEditor();
+      return;
+    }
+  }, [closeEditor]);
   (0, _react.useImperativeHandle)(ref, () => {
     return {
       openEditor: openEditor,
@@ -81,7 +71,8 @@ const LongTextInlineEditor = /*#__PURE__*/(0, _react.forwardRef)((_ref, ref) =>
   return /*#__PURE__*/_react.default.createElement(_clickOutside.default, {
     onClickOutside: closeEditor
   }, /*#__PURE__*/_react.default.createElement("div", {
-    className: "w-100"
+    className: "w-100",
+    onKeyDown: onHotKey
   }, isWindowsWechat ? /*#__PURE__*/_react.default.createElement(_fallbackEditor.default, {
     enableEdit: enableEdit,
     value: valueRef.current.text,
@@ -89,7 +80,6 @@ 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,
@@ -98,7 +88,9 @@ const LongTextInlineEditor = /*#__PURE__*/(0, _react.forwardRef)((_ref, ref) =>
     isCheckBrowser: isCheckBrowser,
     editorApi: editorApi,
     onSaveEditorValue: onSaveEditorValue,
-    onEditorValueChanged: onEditorValueChanged
+    onEditorValueChanged: onEditorValueChanged,
+    handelEnableEdit: handelEnableEdit,
+    closeEditor: closeEditor
   })));
 });
 var _default = exports.default = LongTextInlineEditor;

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

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

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

@@ -0,0 +1,51 @@
+"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;
+      }
+      if ((0, _isHotkey.default)('esc', event)) {
+        this.closeEditor && this.closeEditor();
+      }
+
+      // Disable default 'tab' behavior
+      if ((0, _isHotkey.default)('tab', event)) {
+        event.preventDefault();
+      } else {
+        return;
+      }
+    });
+    (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;

package/package.json

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