@seafile/seafile-editor 1.0.86-beta → 1.0.86-beta2

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

@@ -20,7 +20,7 @@ const isMacOS = (0, _common.isMac)();
 const InlineEditor = _ref => {
   let {
     isShowEditor,
-    focusNodePath,
+    focusRange,
     value,
     editorApi,
     onSave,
@@ -54,23 +54,17 @@ const InlineEditor = _ref => {
     const eventBus = _eventBus.default.getInstance();
     eventBus.dispatch('change');
   }, [editor, onContentChanged]);
-  const focusNode = (0, _react.useCallback)((editor, focusNodePath) => {
+  const focusNode = (0, _react.useCallback)((editor, focusRange) => {
     const [firstNode] = editor.children;
     if (!firstNode) return;
-    if (focusNodePath && Array.isArray(focusNodePath)) {
-      const customFocusNodePath = (0, _core.getNode)(editor, focusNodePath);
-      if (customFocusNodePath) {
-        const startOfFirstNode = _slate.Editor.start(editor, focusNodePath);
-        const range = {
-          anchor: startOfFirstNode,
-          focus: startOfFirstNode
-        };
-        (0, _core.focusEditor)(editor, range);
-        return;
-      }
-    }
-    if (focusNodePath && typeof focusNodePath === 'object' && focusNodePath.anchor) {
-      (0, _core.focusEditor)(editor, focusNodePath);
+    if (focusRange && typeof focusRange === 'object' && focusRange.anchor) {
+      const startOfFirstNode = _slate.Editor.start(editor, focusRange.anchor.path);
+      const range = {
+        anchor: startOfFirstNode,
+        focus: startOfFirstNode
+      };
+      (0, _core.focusEditor)(editor, range);
+      setTimeout(() => (0, _core.focusEditor)(editor, focusRange), 0);
       return;
     }
     const [firstNodeFirstChild] = firstNode.children;
@@ -92,9 +86,6 @@ const InlineEditor = _ref => {
     });
     const timer = setTimeout(() => {
       editor.forceNormalize = false;
-      if (isShowEditor) {
-        focusNode(editor, focusNodePath);
-      }
     }, 300);
     return () => {
       editor.forceNormalize = false;
@@ -103,13 +94,10 @@ const InlineEditor = _ref => {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
   (0, _react.useEffect)(() => {
-    if (focusNodePath) {
-      console.log(focusNodePath);
-      focusNode(editor, focusNodePath);
-    }
-
+    if (!isShowEditor) return;
+    focusNode(editor, focusRange);
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [focusNodePath]);
+  }, [isShowEditor, focusRange]);
 
   // willUnmount
   (0, _react.useEffect)(() => {
@@ -123,13 +111,14 @@ const InlineEditor = _ref => {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
   const onEditorClick = (0, _react.useCallback)(() => {
+    if (!isShowEditor) {
+      updateFocus(editor.selection);
+      return;
+    }
     const value = editor.children;
     if (value.length === 1 && _slate.Node.string(value[0]).length === 0) {
       focusNode(editor);
     }
-    if (!isShowEditor) {
-      updateFocus(editor.selection);
-    }
   }, [isShowEditor, editor, focusNode, updateFocus]);
   return /*#__PURE__*/_react.default.createElement("div", {
     className: "sf-simple-slate-editor-container"
@@ -152,6 +141,7 @@ const InlineEditor = _ref => {
   }, /*#__PURE__*/_react.default.createElement("div", {
     className: "article"
   }, /*#__PURE__*/_react.default.createElement(_extension.SetNodeToDecorations, null), /*#__PURE__*/_react.default.createElement(_slateReact.Editable, {
+    readOnly: !isShowEditor,
     decorate: decorate,
     renderElement: _extension.renderElement,
     renderLeaf: _extension.renderLeaf,

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

@@ -61,6 +61,6 @@
   display: flex;
 }
 
-.sf-long-text-inline-editor-container:not(.preview) .article>div[role=textbox]>:first-child {
+.sf-long-text-inline-editor-container .article>div>:first-child {
   margin-top: 0;
 }

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

@@ -9,12 +9,9 @@ exports.default = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _isHotkey = _interopRequireDefault(require("is-hotkey"));
 var _clickOutside = _interopRequireDefault(require("./click-outside"));
-var _formatter = _interopRequireDefault(require("./formatter"));
 var _fallbackEditor = _interopRequireDefault(require("./fallback-editor"));
 var _normalEditor = _interopRequireDefault(require("./normal-editor"));
-var _slateConvert = require("../../slate-convert");
 var _getBrowserInfo = _interopRequireDefault(require("../../utils/get-browser-Info"));
-var _extension = require("../../extension");
 require("./index.css");
 const LongTextInlineEditor = /*#__PURE__*/(0, _react.forwardRef)((_ref, ref) => {
   let {
@@ -33,15 +30,15 @@ const LongTextInlineEditor = /*#__PURE__*/(0, _react.forwardRef)((_ref, ref) =>
     text: value
   } : value);
   const longTextValueChangedRef = (0, _react.useRef)(false);
-  const [focusNodePath, setFocusNodePath] = (0, _react.useState)(null);
+  const [focusRange, setFocusRange] = (0, _react.useState)(null);
   const {
     isWindowsWechat
   } = (0, _react.useMemo)(() => {
     return (0, _getBrowserInfo.default)(isCheckBrowser);
   }, [isCheckBrowser]);
   const openEditor = (0, _react.useCallback)(function () {
-    let focusNodePath = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [0, 0];
-    setFocusNodePath(focusNodePath);
+    let focusRange = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [0, 0];
+    setFocusRange(focusRange);
     setShowEditor(true);
   }, []);
   const closeEditor = (0, _react.useCallback)(() => {
@@ -57,13 +54,6 @@ const LongTextInlineEditor = /*#__PURE__*/(0, _react.forwardRef)((_ref, ref) =>
     if (node.getAttribute(attribute)) return node.getAttribute(attribute);
     if (node.parentNode) return getAttributeNode(node.parentNode, attribute, deep--);
   }, []);
-  const previewClick = (0, _react.useCallback)((event, richValue) => {
-    if (event.target.nodeName === 'A') return;
-    // const nodeId = getAttributeNode(event.target, 'data-id');
-    onPreviewClick && onPreviewClick();
-
-    // openEditor(getNodePathById({ children: richValue }, nodeId));
-  }, [onPreviewClick, openEditor, getAttributeNode]);
   const onEditorValueChanged = (0, _react.useCallback)(value => {
     valueRef.current = value;
     longTextValueChangedRef.current = true;
@@ -85,19 +75,9 @@ const LongTextInlineEditor = /*#__PURE__*/(0, _react.forwardRef)((_ref, ref) =>
     };
   }, [openEditor, closeEditor]);
   const updateFocus = (0, _react.useCallback)(focusRange => {
-    console.log(focusRange);
+    onPreviewClick && onPreviewClick();
     openEditor(focusRange);
-  }, [openEditor]);
-
-  // if (!isShowEditor) {
-  //   const richValue = mdStringToSlate(valueRef.current.text);
-  //   return (
-  //     <div className="sf-long-text-inline-editor-container preview" onClick={(event) => previewClick(event, richValue)} >
-  //       {valueRef.current.text && (<Formatter value={isWindowsWechat ? valueRef.current : richValue} />)}
-  //     </div>
-  //   );
-  // }
-
+  }, [openEditor, onPreviewClick]);
   return /*#__PURE__*/_react.default.createElement(_clickOutside.default, {
     onClickOutside: closeEditor
   }, /*#__PURE__*/_react.default.createElement("div", {
@@ -113,7 +93,7 @@ const LongTextInlineEditor = /*#__PURE__*/(0, _react.forwardRef)((_ref, ref) =>
     updateFocus: updateFocus,
     lang: lang,
     headerName: headerName,
-    focusNodePath: focusNodePath,
+    focusRange: focusRange,
     value: valueRef.current.text,
     autoSave: autoSave,
     saveDelay: saveDelay,

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

@@ -11,11 +11,12 @@ var _simpleEditor = _interopRequireDefault(require("../simple-editor"));
 var _getPreviewContent = _interopRequireDefault(require("../../utils/get-preview-content"));
 var _markdownPreview = _interopRequireDefault(require("../markdown-preview"));
 var _longtextEditorDialog = _interopRequireDefault(require("../longtext-editor-dialog"));
+var _classnames = _interopRequireDefault(require("classnames"));
 const NormalEditor = _ref => {
   let {
     isShowEditor,
     updateFocus,
-    focusNodePath,
+    focusRange,
     lang,
     headerName,
     value: propsValue,
@@ -98,7 +99,9 @@ const NormalEditor = _ref => {
     };
   }, [autoSave, saveDelay, handelAutoSave]);
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
-    className: "sf-long-text-inline-editor-container",
+    className: (0, _classnames.default)('sf-long-text-inline-editor-container', {
+      'preview': !isShowEditor
+    }),
     style: style,
     ref: editorContainerRef
   }, !showExpandEditor ? /*#__PURE__*/_react.default.createElement(_simpleEditor.default, {
@@ -106,7 +109,7 @@ const NormalEditor = _ref => {
     isShowEditor: isShowEditor,
     updateFocus: updateFocus,
     isInline: true,
-    focusNodePath: focusNodePath,
+    focusRange: focusRange,
     value: valueRef.current.text,
     onSave: handelAutoSave,
     editorApi: editorApi,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seafile/seafile-editor",
-  "version": "1.0.86beta",
+  "version": "1.0.86beta2",
   "description": "",
   "main": "dist/index.js",
   "scripts": {