@seafile/seafile-editor 1.0.86-beta1 → 1.0.86-beta3

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

@@ -19,8 +19,7 @@ require("./index.css");
 const isMacOS = (0, _common.isMac)();
 const InlineEditor = _ref => {
   let {
-    isShowEditor,
-    focusNodePath,
+    enableEdit,
     value,
     editorApi,
     onSave,
@@ -28,9 +27,10 @@ const InlineEditor = _ref => {
     onContentChanged,
     isSupportFormula,
     onExpandEditorToggle,
-    updateFocus
+    handelEnableEdit
   } = _ref;
   const [slateValue, setSlateValue] = (0, _react.useState)(value);
+  const [focusRange, setFocusRange] = (0, _react.useState)(null);
   const editor = (0, _react.useMemo)(() => {
     const baseEditor = (0, _extension.inlineEditor)();
     return (0, _withPropsEditor.default)(baseEditor, {
@@ -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 && focusRange !== null && focusRange !== void 0 && 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 (!enableEdit) return;
+    focusNode(editor, focusRange);
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [focusNodePath]);
+  }, [enableEdit, focusRange]);
 
   // willUnmount
   (0, _react.useEffect)(() => {
@@ -123,17 +111,19 @@ const InlineEditor = _ref => {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
   const onEditorClick = (0, _react.useCallback)(() => {
+    if (!enableEdit) {
+      setFocusRange(editor.selection);
+      handelEnableEdit();
+      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]);
+  }, [enableEdit, editor, focusNode, handelEnableEdit]);
   return /*#__PURE__*/_react.default.createElement("div", {
     className: "sf-simple-slate-editor-container"
-  }, isShowEditor && /*#__PURE__*/_react.default.createElement(_extension.InlineToolbar, {
+  }, enableEdit && /*#__PURE__*/_react.default.createElement(_extension.InlineToolbar, {
     editor: editor,
     isSupportFormula: isSupportFormula,
     isSupportColumn: !!columns,
@@ -152,6 +142,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: !enableEdit,
     decorate: decorate,
     renderElement: _extension.renderElement,
     renderLeaf: _extension.renderLeaf,

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

@@ -10,7 +10,7 @@ var _react = _interopRequireWildcard(require("react"));
 var _isHotkey = _interopRequireDefault(require("is-hotkey"));
 const FallbackEditor = _ref => {
   let {
-    isShowEditor,
+    enableEdit,
     value: propsValue,
     onChange: propsOnChange,
     closeEditor
@@ -19,11 +19,11 @@ const FallbackEditor = _ref => {
   const showEditorRef = (0, _react.useRef)(false);
   const inputRef = (0, _react.useRef)(null);
   (0, _react.useEffect)(() => {
-    if (isShowEditor === showEditorRef.current) return;
-    if (isShowEditor && !showEditorRef.current) {
+    if (enableEdit === showEditorRef.current) return;
+    if (enableEdit && !showEditorRef.current) {
       setTimeout(() => inputRef.current.focus());
     }
-  }, [isShowEditor]);
+  }, [enableEdit]);
   const onChange = (0, _react.useCallback)(event => {
     const newValue = event.target.value;
     if (newValue === value) return;

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 {
@@ -24,46 +21,29 @@ const LongTextInlineEditor = /*#__PURE__*/(0, _react.forwardRef)((_ref, ref) =>
     value,
     lang,
     headerName,
-    onPreviewClick,
+    onClick,
     onSaveEditorValue,
     editorApi
   } = _ref;
-  const [isShowEditor, setShowEditor] = (0, _react.useState)(false);
+  const [enableEdit, setEnableEdit] = (0, _react.useState)(false);
   const valueRef = (0, _react.useRef)(typeof value === 'string' ? {
     text: value
   } : value);
   const longTextValueChangedRef = (0, _react.useRef)(false);
-  const [focusNodePath, setFocusNodePath] = (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);
-    setShowEditor(true);
+  const openEditor = (0, _react.useCallback)(() => {
+    setEnableEdit(true);
   }, []);
   const closeEditor = (0, _react.useCallback)(() => {
     if (longTextValueChangedRef.current) {
       onSaveEditorValue(valueRef.current);
     }
-    setShowEditor(false);
+    setEnableEdit(false);
   }, [longTextValueChangedRef, valueRef, onSaveEditorValue]);
-  const getAttributeNode = (0, _react.useCallback)(function (node, attribute) {
-    let deep = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 4;
-    if (!node || !node.getAttribute) return null;
-    if (deep === -1) return null;
-    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;
@@ -84,36 +64,25 @@ const LongTextInlineEditor = /*#__PURE__*/(0, _react.forwardRef)((_ref, ref) =>
       closeEditor: closeEditor
     };
   }, [openEditor, closeEditor]);
-  const updateFocus = (0, _react.useCallback)(focusRange => {
-    console.log(focusRange);
-    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>
-  //   );
-  // }
-
+  const handelEnableEdit = (0, _react.useCallback)(() => {
+    onClick && onClick();
+    openEditor();
+  }, [openEditor, onClick]);
   return /*#__PURE__*/_react.default.createElement(_clickOutside.default, {
     onClickOutside: closeEditor
   }, /*#__PURE__*/_react.default.createElement("div", {
     className: "w-100",
     onKeyDown: onHotKey
   }, isWindowsWechat ? /*#__PURE__*/_react.default.createElement(_fallbackEditor.default, {
-    isShowEditor: isShowEditor,
+    enableEdit: enableEdit,
     value: valueRef.current.text,
     onChange: onEditorValueChanged,
     closeEditor: closeEditor
   }) : /*#__PURE__*/_react.default.createElement(_normalEditor.default, {
-    isShowEditor: isShowEditor,
-    updateFocus: updateFocus,
+    enableEdit: enableEdit,
+    handelEnableEdit: handelEnableEdit,
     lang: lang,
     headerName: headerName,
-    focusNodePath: focusNodePath,
     value: valueRef.current.text,
     autoSave: autoSave,
     saveDelay: saveDelay,

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

@@ -14,9 +14,8 @@ var _longtextEditorDialog = _interopRequireDefault(require("../longtext-editor-d
 var _classnames = _interopRequireDefault(require("classnames"));
 const NormalEditor = _ref => {
   let {
-    isShowEditor,
-    updateFocus,
-    focusNodePath,
+    enableEdit,
+    handelEnableEdit,
     lang,
     headerName,
     value: propsValue,
@@ -100,17 +99,16 @@ const NormalEditor = _ref => {
   }, [autoSave, saveDelay, handelAutoSave]);
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _classnames.default)('sf-long-text-inline-editor-container', {
-      'preview': !isShowEditor
+      'preview': !enableEdit
     }),
     style: style,
     ref: editorContainerRef
   }, !showExpandEditor ? /*#__PURE__*/_react.default.createElement(_simpleEditor.default, {
     ref: editorRef,
-    isShowEditor: isShowEditor,
-    updateFocus: updateFocus,
+    enableEdit: enableEdit,
     isInline: true,
-    focusNodePath: focusNodePath,
     value: valueRef.current.text,
+    handelEnableEdit: handelEnableEdit,
     onSave: handelAutoSave,
     editorApi: editorApi,
     onContentChanged: onContentChanged,

package/package.json

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

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

@@ -1,68 +0,0 @@
-.sf-long-text-inline-editor-container.preview .longtext-preview-container {
-  width: 100%;
-  height: 100%;
-  overflow: hidden;
-  border-radius: 3px;
-  cursor: pointer;
-  padding: 16px 12px;
-  background-color: #FFF;
-}
-
-.sf-long-text-inline-editor-container.preview .longtext-preview-container .sf-slate-viewer-scroll-container {
-  overflow-y: auto;
-  height: fit-content;
-  padding: 0;
-  background: #fff;
-}
-
-.sf-long-text-inline-editor-container.preview .longtext-preview-container .sf-slate-viewer-article-container {
-  height: 100%;
-  width: 100%;
-  margin: 0;
-}
-
-.sf-long-text-inline-editor-container.preview .longtext-preview-container .sf-slate-viewer-article-container .article {
-  padding: 0;
-  height: auto;
-  min-height: 100% !important;
-  border: 0;
-  color: #212529;
-}
-
-.sf-long-text-inline-editor-container.preview .longtext-preview-container ol,
-.sf-long-text-inline-editor-container.preview .longtext-preview-container ul {
-  padding-inline-start: 40px;
-  margin-bottom: 1em;
-}
-
-.sf-long-text-inline-editor-container.preview .longtext-preview-container ol li a,
-.sf-long-text-inline-editor-container.preview .longtext-preview-container ul li a {
-  word-break: break-all;
-}
-
-.sf-long-text-inline-editor-container.preview .longtext-preview-container ul.contains-task-list,
-.sf-long-text-inline-editor-container.preview .longtext-preview-container ol.contains-task-list {
-  padding-inline-start: 20px;
-}
-
-.sf-long-text-inline-editor-container.preview .longtext-preview-container ul li.task-list-item,
-.sf-long-text-inline-editor-container.preview .longtext-preview-container ol li.task-list-item {
-  min-height: 20px;
-}
-
-.sf-long-text-inline-editor-container.preview .longtext-preview-container li.task-list-item input[type=checkbox] {
-  position: absolute;
-  left: -1.4em;
-  top: .4em;
-  display: inline-block;
-}
-
-.sf-long-text-inline-editor-container.preview .longtext-preview-container thead tr {
-  min-height: 42px;
-}
-
-.sf-long-text-inline-editor-container.preview .longtext-preview-container tbody tr {
-  font-weight: normal;
-  min-height: 42px;
-}
-

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

@@ -1,66 +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 _react = _interopRequireDefault(require("react"));
-var _loading = _interopRequireDefault(require("../../../containers/loading"));
-var _slateConvert = require("../../../slate-convert");
-var _slateViewer = _interopRequireDefault(require("../../../editors/slate-viewer"));
-require("./index.css");
-// Windows old Wechat (3.0 or earlier) inner core is chrome 53 and don't support ECMA6, can't use seafile-editor markdownViewer
-// Windows new Wechat (lastest version 3.3.5) support seafile-editor markdownViewer
-// so use dangerouslySetInnerHTML to preview
-class Formatter extends _react.default.PureComponent {
-  constructor(props) {
-    super(props);
-    (0, _defineProperty2.default)(this, "convertMarkdown", mdFile => {
-      _slateConvert.processor.process(mdFile).then(result => {
-        let innerHtml = String(result).replace(/<a /ig, '<a target="_blank" tabindex="-1"');
-        this.setState({
-          innerHtml
-        });
-      });
-    });
-    this.state = {
-      innerHtml: null
-    };
-  }
-  componentDidMount() {
-    const {
-      isWindowsWechat,
-      value
-    } = this.props;
-    if (isWindowsWechat) {
-      this.convertMarkdown(value);
-    }
-  }
-  render() {
-    const {
-      isWindowsWechat,
-      value,
-      isShowOutline
-    } = this.props;
-    const {
-      innerHtml
-    } = this.state;
-    if (isWindowsWechat && innerHtml === null) {
-      return /*#__PURE__*/_react.default.createElement(_loading.default, null);
-    }
-    return /*#__PURE__*/_react.default.createElement("div", {
-      className: "longtext-preview-container"
-    }, isWindowsWechat && /*#__PURE__*/_react.default.createElement("div", {
-      className: "article",
-      dangerouslySetInnerHTML: {
-        __html: this.state.innerHtml
-      }
-    }), !isWindowsWechat && /*#__PURE__*/_react.default.createElement(_slateViewer.default, {
-      value: value,
-      isShowOutline: isShowOutline
-    }));
-  }
-}
-var _default = exports.default = Formatter;