@seafile/seafile-editor 1.0.86-beta3 → 1.0.86

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

@@ -19,18 +19,16 @@ require("./index.css");
 const isMacOS = (0, _common.isMac)();
 const InlineEditor = _ref => {
   let {
-    enableEdit,
+    focusNodePath,
     value,
     editorApi,
     onSave,
     columns,
     onContentChanged,
     isSupportFormula,
-    onExpandEditorToggle,
-    handelEnableEdit
+    onExpandEditorToggle
   } = _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,18 +52,20 @@ const InlineEditor = _ref => {
     const eventBus = _eventBus.default.getInstance();
     eventBus.dispatch('change');
   }, [editor, onContentChanged]);
-  const focusNode = (0, _react.useCallback)((editor, focusRange) => {
+  const focusNode = (0, _react.useCallback)((editor, focusNodePath) => {
     const [firstNode] = editor.children;
     if (!firstNode) return;
-    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;
+    if (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;
+      }
     }
     const [firstNodeFirstChild] = firstNode.children;
     if (firstNodeFirstChild) {
@@ -86,6 +86,7 @@ const InlineEditor = _ref => {
     });
     const timer = setTimeout(() => {
       editor.forceNormalize = false;
+      focusNode(editor, focusNodePath);
     }, 300);
     return () => {
       editor.forceNormalize = false;
@@ -93,11 +94,6 @@ const InlineEditor = _ref => {
     };
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
-  (0, _react.useEffect)(() => {
-    if (!enableEdit) return;
-    focusNode(editor, focusRange);
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [enableEdit, focusRange]);
 
   // willUnmount
   (0, _react.useEffect)(() => {
@@ -111,19 +107,14 @@ 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);
     }
-  }, [enableEdit, editor, focusNode, handelEnableEdit]);
+  }, [editor, focusNode]);
   return /*#__PURE__*/_react.default.createElement("div", {
     className: "sf-simple-slate-editor-container"
-  }, enableEdit && /*#__PURE__*/_react.default.createElement(_extension.InlineToolbar, {
+  }, /*#__PURE__*/_react.default.createElement(_extension.InlineToolbar, {
     editor: editor,
     isSupportFormula: isSupportFormula,
     isSupportColumn: !!columns,
@@ -142,7 +133,6 @@ 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 {
-    enableEdit,
+    isShowEditor,
     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 (enableEdit === showEditorRef.current) return;
-    if (enableEdit && !showEditorRef.current) {
+    if (isShowEditor === showEditorRef.current) return;
+    if (isShowEditor && !showEditorRef.current) {
       setTimeout(() => inputRef.current.focus());
     }
-  }, [enableEdit]);
+  }, [isShowEditor]);
   const onChange = (0, _react.useCallback)(event => {
     const newValue = event.target.value;
     if (newValue === value) return;

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

@@ -0,0 +1,68 @@
+.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

@@ -0,0 +1,66 @@
+"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;

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

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

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

@@ -9,9 +9,12 @@ 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 {
@@ -21,29 +24,47 @@ const LongTextInlineEditor = /*#__PURE__*/(0, _react.forwardRef)((_ref, ref) =>
     value,
     lang,
     headerName,
-    onClick,
+    onPreviewClick,
     onSaveEditorValue,
     editorApi
   } = _ref;
-  const [enableEdit, setEnableEdit] = (0, _react.useState)(false);
+  const [isShowEditor, setShowEditor] = (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)([0, 0]);
   const {
     isWindowsWechat
   } = (0, _react.useMemo)(() => {
     return (0, _getBrowserInfo.default)(isCheckBrowser);
   }, [isCheckBrowser]);
-  const openEditor = (0, _react.useCallback)(() => {
-    setEnableEdit(true);
+  const openEditor = (0, _react.useCallback)(function () {
+    let focusNodePath = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [0, 0];
+    setFocusNodePath(focusNodePath);
+    setShowEditor(true);
   }, []);
   const closeEditor = (0, _react.useCallback)(() => {
     if (longTextValueChangedRef.current) {
       onSaveEditorValue(valueRef.current);
     }
-    setEnableEdit(false);
+    setShowEditor(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((0, _extension.getNodePathById)({
+      children: richValue
+    }, nodeId));
+  }, [onPreviewClick, openEditor, getAttributeNode]);
   const onEditorValueChanged = (0, _react.useCallback)(value => {
     valueRef.current = value;
     longTextValueChangedRef.current = true;
@@ -64,25 +85,29 @@ const LongTextInlineEditor = /*#__PURE__*/(0, _react.forwardRef)((_ref, ref) =>
       closeEditor: closeEditor
     };
   }, [openEditor, closeEditor]);
-  const handelEnableEdit = (0, _react.useCallback)(() => {
-    onClick && onClick();
-    openEditor();
-  }, [openEditor, onClick]);
+  if (!isShowEditor) {
+    const richValue = (0, _slateConvert.mdStringToSlate)(valueRef.current.text);
+    return /*#__PURE__*/_react.default.createElement("div", {
+      className: "sf-long-text-inline-editor-container preview",
+      onClick: event => previewClick(event, richValue)
+    }, valueRef.current.text && /*#__PURE__*/_react.default.createElement(_formatter.default, {
+      value: isWindowsWechat ? valueRef.current : richValue
+    }));
+  }
   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, {
-    enableEdit: enableEdit,
+    isShowEditor: isShowEditor,
     value: valueRef.current.text,
     onChange: onEditorValueChanged,
     closeEditor: closeEditor
   }) : /*#__PURE__*/_react.default.createElement(_normalEditor.default, {
-    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

@@ -11,11 +11,9 @@ 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 {
-    enableEdit,
-    handelEnableEdit,
+    focusNodePath,
     lang,
     headerName,
     value: propsValue,
@@ -98,17 +96,14 @@ 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': !enableEdit
-    }),
+    className: "sf-long-text-inline-editor-container",
     style: style,
     ref: editorContainerRef
   }, !showExpandEditor ? /*#__PURE__*/_react.default.createElement(_simpleEditor.default, {
     ref: editorRef,
-    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.86beta3",
+  "version": "1.0.86",
   "description": "",
   "main": "dist/index.js",
   "scripts": {