@seafile/sdoc-editor 0.1.70 → 0.1.71

package/dist/basic-sdk/editor.js

@@ -111,8 +111,7 @@ var SDocEditor = function SDocEditor(_ref) {
     docUuid: config.docUuid
   }), /*#__PURE__*/React.createElement("div", {
     ref: scrollRef,
-    className: "sdoc-editor-article-container",
-    id: "sdoc-editor-article-container"
+    className: "sdoc-editor-article-container"
   }, /*#__PURE__*/React.createElement(ScrollContext.Provider, {
     value: {
       scrollRef: scrollRef

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

@@ -3,12 +3,15 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import React, { useCallback, useEffect, useState, useRef } from 'react';
 import { ReactEditor, useSlateStatic, useReadOnly } from '@seafile/slate-react';
 import { Transforms } from '@seafile/slate';
+import { useScrollContext } from '../../../hooks/use-scroll-context';
 import CodeBlockHoverMenu from '../../../../components/code-block-hover-menu';
 import '../../../assets/css/code-block.css';
 var CodeBlock = function CodeBlock(_ref) {
   var codeBlockProps = _ref.codeBlockProps;
   var readOnly = useReadOnly();
+  var editor = useSlateStatic();
   var codeBlockRef = useRef();
+  var scrollRef = useScrollContext();
   var attributes = codeBlockProps.attributes,
     children = codeBlockProps.children,
     element = codeBlockProps.element;
@@ -17,7 +20,6 @@ var CodeBlock = function CodeBlock(_ref) {
       white_space: 'nowrap'
     } : _element$style;
   var white_space = style.white_space;
-  var editor = useSlateStatic();
   var _useState = useState({
       top: '',
       left: ''
@@ -97,15 +99,12 @@ var CodeBlock = function CodeBlock(_ref) {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
   useEffect(function () {
+    if (readOnly) return;
     if (showHoverMenu) {
-      document.getElementById('sdoc-editor-article-container').addEventListener('scroll', onScroll);
+      scrollRef.current && scrollRef.current.addEventListener('scroll', onScroll);
     } else {
-      document.getElementById('sdoc-editor-article-container').removeEventListener('scroll', onScroll);
+      scrollRef.current && scrollRef.current.removeEventListener('scroll', onScroll);
     }
-    return function () {
-      var articleContainer = document.getElementById('sdoc-editor-article-container');
-      articleContainer && articleContainer.removeEventListener('scroll', onScroll);
-    };
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [showHoverMenu]);
   return /*#__PURE__*/React.createElement("div", {

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

@@ -1,27 +1,54 @@
 import slugid from 'slugid';
 import { CODE_BLOCK, CODE_LINE } from '../../../constants';
+import { genCodeLangs } from '../../../../utils/prismjs';
 var codeBlockRule = function codeBlockRule(element, parseChild) {
   var nodeName = element.nodeName,
     childNodes = element.childNodes;
   if (nodeName === 'PRE') {
+    var children = Array.from(childNodes).filter(function (item) {
+      return item.nodeName === 'CODE';
+    });
+    var codeChild = children[0];
+    var lang = codeChild.getAttribute('lang');
+    lang = genCodeLangs().find(function (item) {
+      return item.value === lang;
+    }) || 'plaintext';
     return {
       level: 'level1',
       id: slugid.nice(),
+      language: lang,
       type: CODE_BLOCK,
-      children: parseChild(childNodes)
+      children: parseChild(children)
     };
   }
   if (nodeName === 'CODE' && element.parentElement.nodeName === 'PRE') {
-    return {
-      level: 'level2',
-      id: slugid.nice(),
-      type: CODE_LINE,
-      children: [{
-        level: 'level3',
+    var content = element.textContent;
+    var hasNewLine = content.indexOf('\n') > -1;
+    if (!hasNewLine) {
+      return {
+        level: 'level2',
         id: slugid.nice(),
-        text: element.textContent
-      }]
-    };
+        type: CODE_LINE,
+        children: [{
+          level: 'level3',
+          id: slugid.nice(),
+          text: element.textContent
+        }]
+      };
+    }
+    var codes = content.split('\n');
+    return codes.map(function (item) {
+      return {
+        level: 'level2',
+        id: slugid.nice(),
+        type: CODE_LINE,
+        children: [{
+          level: 'level3',
+          id: slugid.nice(),
+          text: item
+        }]
+      };
+    });
   }
   return;
 };

package/dist/basic-sdk/extension/plugins/html/rules/list.js

@@ -34,6 +34,7 @@ var listRule = function listRule(element, parseChild) {
       id: slugid.nice(),
       type: LIST_ITEM,
       children: [{
+        id: slugid.nice(),
         level: 'level3',
         type: LIST_LIC,
         children: parseChild(childNodes)

package/dist/basic-sdk/views/viewer.js

@@ -1,30 +1,21 @@
-import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-import React, { useRef, useEffect, useState } from 'react';
+import React, { useRef, useEffect } from 'react';
 import { Editable, Slate } from '@seafile/slate-react';
 import defaultEditor, { renderLeaf as _renderLeaf, renderElement as _renderElement } from '../extension';
-import { withSocketIO } from '../socket';
 import withNodeId from '../node-id';
+import { ScrollContext } from '../hooks/use-scroll-context';
+import { generateDefaultDocContent } from '../../utils';
 import '../assets/css/layout.css';
 import '../assets/css/sdoc-editor-plugins.css';
-import { generateDefaultDocContent } from '../../utils';
 var SDocViewer = function SDocViewer(_ref) {
-  var isOpenSocket = _ref.isOpenSocket,
-    document = _ref.document,
-    config = _ref.config,
+  var document = _ref.document,
     customRenderLeaf = _ref.renderLeaf,
     customRenderElement = _ref.renderElement;
-  var editor = !isOpenSocket ? withNodeId(defaultEditor) : withSocketIO(withNodeId(defaultEditor, {
-    document: document,
-    config: config
-  }));
+  var editor = withNodeId(defaultEditor);
   var slateValue = (document || generateDefaultDocContent()).children;
   var articleRef = useRef(null);
-  var _useState = useState(false),
-    _useState2 = _slicedToArray(_useState, 2),
-    setUpdate = _useState2[1];
+  var scrollRef = useRef(null);
   useEffect(function () {
     editor.width = articleRef.current.children[0].clientWidth;
-    setUpdate(true);
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
   return /*#__PURE__*/React.createElement("div", {
@@ -32,12 +23,15 @@ var SDocViewer = function SDocViewer(_ref) {
   }, /*#__PURE__*/React.createElement("div", {
     className: "sdoc-editor-content"
   }, /*#__PURE__*/React.createElement("div", {
-    className: "flex-fill o-auto sdoc-editor-article-container",
-    id: "sdoc-editor-article-container"
+    ref: scrollRef,
+    className: "sdoc-editor-article-container"
+  }, /*#__PURE__*/React.createElement(ScrollContext.Provider, {
+    value: {
+      scrollRef: scrollRef
+    }
   }, /*#__PURE__*/React.createElement(Slate, {
     editor: editor,
-    value: slateValue,
-    onChange: function onChange() {}
+    value: slateValue
   }, /*#__PURE__*/React.createElement("div", {
     className: "article mx-auto",
     ref: articleRef
@@ -51,6 +45,6 @@ var SDocViewer = function SDocViewer(_ref) {
       return (customRenderLeaf || _renderLeaf)(props, editor);
     },
     onDOMBeforeInput: function onDOMBeforeInput(event) {}
-  }))))));
+  })))))));
 };
 export default SDocViewer;

package/package.json

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