@seafile/sdoc-editor 0.1.51 → 0.1.53

package/dist/basic-sdk/editor.js

@@ -1,7 +1,6 @@
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
-import { Node, Editor } from '@seafile/slate';
+import { Node } from '@seafile/slate';
 import { Editable, Slate, ReactEditor } from '@seafile/slate-react';
 import defaultEditor, { renderLeaf, renderElement, Toolbar, ContextMenu } from './extension';
 import { focusEditor } from './extension/core';
@@ -26,6 +25,20 @@ var SDocEditor = function SDocEditor(_ref) {
     return newEditor;
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
+  var _useState = useState(document.children),
+    _useState2 = _slicedToArray(_useState, 2),
+    slateValue = _useState2[0],
+    setSlateValue = _useState2[1];
+  var _useState3 = useState(false),
+    _useState4 = _slicedToArray(_useState3, 2),
+    isShowContextMenu = _useState4[0],
+    setContextMenu = _useState4[1];
+  var _useState5 = useState({}),
+    _useState6 = _slicedToArray(_useState5, 2),
+    menuPosition = _useState6[0],
+    setMenuPosition = _useState6[1];
+  var _useCursors = useCursors(editor),
+    cursors = _useCursors.cursors;
 
   // init eventHandler
   // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -50,28 +63,6 @@ var SDocEditor = function SDocEditor(_ref) {
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
-
-  // handle placeholder
-  var onDOMBeforeInput = useCallback(function (e) {
-    if (e.data && e.data !== '') {
-      var _node$;
-      var node = Editor.parent(editor, editor.selection);
-      editor.onDOMBeforeInputId = (_node$ = node[0]) === null || _node$ === void 0 ? void 0 : _node$.id;
-      setSlateValue(_toConsumableArray(slateValue));
-    } else {
-      editor.onDOMBeforeInputId = null;
-      setSlateValue(_toConsumableArray(slateValue));
-    }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
-  var _useState = useState(false),
-    _useState2 = _slicedToArray(_useState, 2),
-    isShowContextMenu = _useState2[0],
-    setContextMenu = _useState2[1];
-  var _useState3 = useState({}),
-    _useState4 = _slicedToArray(_useState3, 2),
-    menuPosition = _useState4[0],
-    setMenuPosition = _useState4[1];
   var onContextMenu = useCallback(function (event) {
     if (editor.isAllInTable()) {
       event.preventDefault();
@@ -84,17 +75,11 @@ var SDocEditor = function SDocEditor(_ref) {
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
-  var _useState5 = useState(document.children),
-    _useState6 = _slicedToArray(_useState5, 2),
-    slateValue = _useState6[0],
-    setSlateValue = _useState6[1];
   var onChange = useCallback(function (slateValue) {
     setSlateValue(slateValue);
     setContextMenu(false);
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
-  var _useCursors = useCursors(editor),
-    cursors = _useCursors.cursors;
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     className: "sdoc-editor-container"
   }, /*#__PURE__*/React.createElement(Toolbar, {
@@ -116,7 +101,6 @@ var SDocEditor = function SDocEditor(_ref) {
     renderElement: renderElement,
     renderLeaf: renderLeaf,
     onKeyDown: eventProxy.onKeyDown,
-    onDOMBeforeInput: onDOMBeforeInput,
     cursors: cursors,
     onContextMenu: onContextMenu
   })))))), isShowContextMenu && /*#__PURE__*/React.createElement(ContextMenu, {

package/dist/basic-sdk/extension/plugins/header/render-elem.js

@@ -4,13 +4,14 @@ import { Placeholder } from '../../core';
 var renderHeader = function renderHeader(props, editor) {
   var element = props.element,
     attributes = props.attributes,
-    children = props.children;
+    children = props.children,
+    isComposing = props.isComposing;
   var type = element.type;
   var level = type.split('header')[1];
   var Tag = "h".concat(level);
   var isShowPlaceHolder = false;
   var firstChild = editor.children[0];
-  if (firstChild.id === element.id && Node.string(element) === '' && (editor === null || editor === void 0 ? void 0 : editor.onDOMBeforeInputId) !== (element === null || element === void 0 ? void 0 : element.id)) {
+  if (firstChild.id === element.id && Node.string(element) === '' && !isComposing) {
     isShowPlaceHolder = true;
   }
   return /*#__PURE__*/React.createElement(Tag, Object.assign({

package/dist/basic-sdk/extension/render/render-element.js

@@ -1,10 +1,10 @@
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import React from 'react';
-import { Node, Editor } from '@seafile/slate';
+import { Node } from '@seafile/slate';
 import { useSlateStatic } from '@seafile/slate-react';
 import { BLOCKQUOTE, LINK, CHECK_LIST_ITEM, HEADER1, HEADER2, HEADER3, HEADER4, HEADER5, HEADER6, LIST_ITEM, LIST_LIC, ORDERED_LIST, PARAGRAPH, UNORDERED_LIST, CODE_BLOCK, IMAGE, ELEMENT_TYPE } from '../constants';
 import { BlockquotePlugin, LinkPlugin, CheckListPlugin, HeaderPlugin, ListPlugin, CodeBlockPlugin, ImagePlugin, TablePlugin } from '../plugins';
-import { Placeholder, findNode } from '../core';
+import { Placeholder } from '../core';
 var CustomElement = function CustomElement(props) {
   var editor = useSlateStatic();
   var attributes = props.attributes,
@@ -14,22 +14,13 @@ var CustomElement = function CustomElement(props) {
     case PARAGRAPH:
       {
         var isShowPlaceHolder = false;
-        if (editor.children.length < 3) {
-          var firstParagraphNode = findNode(editor, {
-            at: [],
-            match: function match(node) {
-              return node.type === 'paragraph';
-            }
-          });
-          if (firstParagraphNode) {
-            var _firstParagraphNode = _slicedToArray(firstParagraphNode, 2),
-              node = _firstParagraphNode[0],
-              path = _firstParagraphNode[1];
-            var nextNode = Editor.next(editor, {
-              at: path
-            });
-            isShowPlaceHolder = (node === null || node === void 0 ? void 0 : node.id) === (element === null || element === void 0 ? void 0 : element.id) && Node.string(element) === '' && !nextNode && (editor === null || editor === void 0 ? void 0 : editor.onDOMBeforeInputId) !== (element === null || element === void 0 ? void 0 : element.id);
-          }
+        var isComposing = props.isComposing;
+        if (editor.children.length === 1) {
+          isShowPlaceHolder = Node.string(element) === '' && !isComposing;
+        }
+        if (editor.children.length === 2 && editor.children[0].type.startsWith('header')) {
+          var node = editor.children[1];
+          isShowPlaceHolder = Node.string(element) === '' && (node === null || node === void 0 ? void 0 : node.id) === (element === null || element === void 0 ? void 0 : element.id) && !isComposing;
         }
         return /*#__PURE__*/React.createElement("p", Object.assign({
           "data-id": element.id

package/dist/basic-sdk/node-id/helpers.js

@@ -54,20 +54,17 @@ export var decorateOperation = function decorateOperation(editor, operation) {
       }
     case OPERATION.SET_NODE:
       {
-        var _properties = newOperation.properties,
-          newProperties = newOperation.newProperties;
-        if (!_properties.id) _properties.id = slugid.nice();
-        // newProperties none has id attribute, keep the original id
-        newProperties.id = _properties.id;
-        newOperation['node_id'] = _properties.id; // the node which will be set to another type
+        var _path5 = newOperation.path;
+        var _node5 = Node.get(editor, _path5);
+        newOperation['node_id'] = _node5.id; // the node which will be set to another type
         break;
       }
     case OPERATION.MOVE_NODE:
       {
-        var _path5 = newOperation.path;
-        var _node5 = Node.get(editor, _path5);
+        var _path6 = newOperation.path;
+        var _node6 = Node.get(editor, _path6);
         // move operation not change the node's id
-        newOperation['node_id'] = _node5.id; // moved node's id
+        newOperation['node_id'] = _node6.id; // moved node's id
         break;
       }
     default:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seafile/sdoc-editor",
-  "version": "0.1.51",
+  "version": "0.1.53",
   "private": false,
   "description": "This is a sdoc editor",
   "main": "dist/index.js",
@@ -9,7 +9,7 @@
     "@seafile/slate": "0.91.8",
     "@seafile/slate-history": "0.86.2",
     "@seafile/slate-hyperscript": "0.81.7",
-    "@seafile/slate-react": "0.92.5",
+    "@seafile/slate-react": "0.92.6",
     "ahooks": "3.7.7",
     "classnames": "2.3.2",
     "deep-copy": "1.4.2",