@seafile/sdoc-editor 0.1.123 → 0.1.125

package/dist/basic-sdk/extension/plugins/code-block/index.js

@@ -1,12 +1,12 @@
 import { CODE_BLOCK } from '../../constants';
 import CodeBlockMenu from './menu';
 import withCodeBlock from './plugin';
-import { renderCodeBlock } from './render-elem';
+import { renderCodeBlock, renderCodeLine } from './render-elem';
 var CodeBlockPlugin = {
   type: CODE_BLOCK,
   nodeType: 'element',
   editorMenus: [CodeBlockMenu],
   editorPlugin: withCodeBlock,
-  renderElements: [renderCodeBlock]
+  renderElements: [renderCodeBlock, renderCodeLine]
 };
 export default CodeBlockPlugin;

package/dist/basic-sdk/extension/plugins/code-block/plugin.js

@@ -97,14 +97,22 @@ var withCodeBlock = function withCodeBlock(editor) {
       node = _ref2[0],
       path = _ref2[1];
     var type = getNodeType(node);
-    if (type === 'code-line' && path.length <= 1) {
+    if (type === CODE_LINE && path.length <= 1) {
       Transforms.setNodes(newEditor, {
         type: 'paragraph'
       }, {
         at: path
       });
+      return;
     }
     if (type === CODE_BLOCK) {
+      if (node.children.length === 0) {
+        Transforms.delete(newEditor, {
+          at: path
+        });
+        return;
+      }
+
       // code-block is the last node in the editor and needs to be followed by a p node
       var isLast = isLastNode(newEditor, node);
       if (isLast) {

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

@@ -126,6 +126,7 @@ var CodeBlock = function CodeBlock(_ref) {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
   return /*#__PURE__*/React.createElement("div", {
+    "data-id": element.id,
     ref: codeBlockRef,
     className: 'sdoc-code-block-container',
     onClick: onFocusCodeBlock,
@@ -151,4 +152,14 @@ export var renderCodeBlock = function renderCodeBlock(props, editor) {
     codeBlockProps: _objectSpread({}, props),
     editor: editor
   });
+};
+export var renderCodeLine = function renderCodeLine(props, editor) {
+  var element = props.element,
+    attributes = props.attributes,
+    children = props.children;
+  return /*#__PURE__*/React.createElement("div", Object.assign({
+    "data-id": element.id
+  }, attributes, {
+    className: 'sdoc-code-line'
+  }), children);
 };

package/dist/basic-sdk/extension/plugins/font/helpers.js

@@ -132,9 +132,10 @@ export var loadFont = function loadFont() {
 };
 export var generatorFontFamily = function generatorFontFamily(fontName, fontWeight, leaf) {
   var isCodeBlock = leaf && Object.keys(leaf).includes('token');
+  if (isCodeBlock) return {};
   var lang = context.getSetting('lang') || 'zh-cn';
   if (fontName === DEFAULT_FONT) {
-    return "".concat(isCodeBlock ? 'monospace' : 'Arial', ", ").concat(lang === 'zh-cn' ? "\u5B8B\u4F53" : 'Arial', ", 'sans-serif'");
+    return "'Arial', ".concat(lang === 'zh-cn' ? "\u5B8B\u4F53" : 'Arial', ", 'sans-serif'");
   }
   var fontObject = FONT.find(function (item) {
     return item.name === fontName;
@@ -143,5 +144,5 @@ export var generatorFontFamily = function generatorFontFamily(fontName, fontWeig
     fontFamilyName = fontObject.fontFamilyName;
   loadFont(fontObject, fontWeight);
   var validFontName = fontFamilyName && isMac() ? fontFamilyName['mac'] : fontName;
-  return "".concat(isCodeBlock ? 'monospace' : validFontName, ", ").concat(lang === 'zh-cn' ? "\u5B8B\u4F53" : 'Arial', ", ").concat(usuallyFontFamilyName || 'sans-serif');
+  return "".concat(validFontName, ", ").concat(lang === 'zh-cn' ? "\u5B8B\u4F53" : 'Arial', ", ").concat(usuallyFontFamilyName || 'sans-serif');
 };

package/dist/basic-sdk/extension/plugins/index.js

@@ -12,6 +12,7 @@ import HtmlPlugin from './html';
 import TextAlignPlugin from './text-align';
 import FontPlugin from './font';
 import SdocLinkPlugin from './sdoc-link';
+import ParagraphPlugin from './paragraph';
 var Plugins = [MarkDownPlugin, HtmlPlugin, HeaderPlugin, LinkPlugin, BlockquotePlugin, ListPlugin, CheckListPlugin, CodeBlockPlugin, ImagePlugin, TablePlugin, TextPlugin, TextAlignPlugin, FontPlugin, SdocLinkPlugin];
 export default Plugins;
-export { MarkDownPlugin, HeaderPlugin, LinkPlugin, BlockquotePlugin, ListPlugin, CheckListPlugin, CodeBlockPlugin, ImagePlugin, TablePlugin, TextPlugin, HtmlPlugin, TextAlignPlugin, FontPlugin, SdocLinkPlugin };
+export { MarkDownPlugin, HeaderPlugin, LinkPlugin, BlockquotePlugin, ListPlugin, CheckListPlugin, CodeBlockPlugin, ImagePlugin, TablePlugin, TextPlugin, HtmlPlugin, TextAlignPlugin, FontPlugin, SdocLinkPlugin, ParagraphPlugin };

package/dist/basic-sdk/extension/plugins/paragraph/index.js

@@ -0,0 +1,7 @@
+import { PARAGRAPH } from '../../constants';
+import { renderParagraph } from './render-elem';
+var ParagraphPlugin = {
+  type: PARAGRAPH,
+  renderElements: [renderParagraph]
+};
+export default ParagraphPlugin;

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

@@ -0,0 +1,35 @@
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import React from 'react';
+import { Node } from '@seafile/slate';
+import { useSlateStatic } from '@seafile/slate-react';
+import { Placeholder } from '../../core';
+var Paragraph = function Paragraph(_ref) {
+  var isComposing = _ref.isComposing,
+    element = _ref.element,
+    attributes = _ref.attributes,
+    children = _ref.children;
+  var editor = useSlateStatic();
+  var isShowPlaceHolder = false;
+  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;
+  }
+  var style = {
+    textAlign: element.align
+  };
+  return /*#__PURE__*/React.createElement("p", Object.assign({
+    "data-id": element.id
+  }, attributes, {
+    style: _objectSpread({
+      position: isShowPlaceHolder ? 'relative' : ''
+    }, style)
+  }), children, isShowPlaceHolder && /*#__PURE__*/React.createElement(Placeholder, {
+    title: 'Please_enter_text'
+  }));
+};
+export var renderParagraph = function renderParagraph(props) {
+  return /*#__PURE__*/React.createElement(Paragraph, props);
+};

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

@@ -1,40 +1,17 @@
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import React from 'react';
-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, CODE_LINE, IMAGE, ELEMENT_TYPE, SDOC_LINK } from '../constants';
-import { BlockquotePlugin, LinkPlugin, CheckListPlugin, HeaderPlugin, ListPlugin, CodeBlockPlugin, ImagePlugin, TablePlugin, SdocLinkPlugin } from '../plugins';
-import { Placeholder, findPath, getAboveNode } from '../core';
+import { BlockquotePlugin, LinkPlugin, CheckListPlugin, HeaderPlugin, ListPlugin, CodeBlockPlugin, ImagePlugin, TablePlugin, SdocLinkPlugin, ParagraphPlugin } from '../plugins';
 var CustomElement = function CustomElement(props) {
   var editor = useSlateStatic();
-  var attributes = props.attributes,
-    children = props.children,
-    element = props.element;
-  var style = {
-    textAlign: element.align
-  };
+  var element = props.element;
   switch (element.type) {
     case PARAGRAPH:
       {
-        var isShowPlaceHolder = false;
-        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
-        }, attributes, {
-          style: _objectSpread({
-            position: isShowPlaceHolder ? 'relative' : ''
-          }, style)
-        }), children, isShowPlaceHolder && /*#__PURE__*/React.createElement(Placeholder, {
-          title: 'Please_enter_text'
-        }));
+        var _ParagraphPlugin$rend = _slicedToArray(ParagraphPlugin.renderElements, 1),
+          renderParagraph = _ParagraphPlugin$rend[0];
+        return renderParagraph(props);
       }
     case HEADER1:
     case HEADER2:
@@ -94,16 +71,9 @@ var CustomElement = function CustomElement(props) {
       }
     case CODE_LINE:
       {
-        var path = findPath(editor, element);
-        var parentNode = getAboveNode(editor, {
-          at: path
-        });
-        if (parentNode[0].type === CODE_BLOCK) {
-          return /*#__PURE__*/React.createElement("div", Object.assign({}, attributes, {
-            className: 'sdoc-code-line'
-          }), children);
-        }
-        return children;
+        var _CodeBlockPlugin$rend2 = _slicedToArray(CodeBlockPlugin.renderElements, 2),
+          renderCodeLine = _CodeBlockPlugin$rend2[1];
+        return renderCodeLine(props, editor);
       }
     case IMAGE:
       {
@@ -137,11 +107,9 @@ var CustomElement = function CustomElement(props) {
       }
     default:
       {
-        return /*#__PURE__*/React.createElement("p", Object.assign({
-          "data-id": element.id
-        }, attributes, {
-          style: style
-        }), children);
+        var _ParagraphPlugin$rend2 = _slicedToArray(ParagraphPlugin.renderElements, 1),
+          _renderParagraph = _ParagraphPlugin$rend2[0];
+        return _renderParagraph(props);
       }
   }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seafile/sdoc-editor",
-  "version": "0.1.123",
+  "version": "0.1.125",
   "private": false,
   "description": "This is a sdoc editor",
   "main": "dist/index.js",