@seafile/sdoc-editor 3.0.116 → 3.0.118

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/dist/extension/constants/index.js +2 -2
  2. package/dist/extension/plugins/html/rules/list.js +55 -7
  3. package/dist/extension/toolbar/side-toolbar/helpers.js +1 -1
  4. package/dist/slate-convert/html-to-slate/rules/list.js +63 -9
  5. package/package.json +3 -3
package/dist/extension/constants/index.js CHANGED
@@ -588,6 +588,6 @@ var FILEEXT_TYPE_MAP = exports.FILEEXT_TYPE_MAP = {
588
588
  EXCALIDRAW: 'draw',
589
589
  DOCUMENT: 'word'
590
590
  };
591
- var SUPPORTED_SIDE_OPERATION_TYPE = exports.SUPPORTED_SIDE_OPERATION_TYPE = [_elementType.PARAGRAPH, _elementType.SUBTITLE, _elementType.HEADER1, _elementType.HEADER2, _elementType.HEADER3, _elementType.HEADER4, _elementType.HEADER5, _elementType.HEADER6, _elementType.CHECK_LIST_ITEM, _elementType.CODE_BLOCK, _elementType.TABLE, _elementType.BLOCKQUOTE, _elementType.CALL_OUT, _elementType.IMAGE_BLOCK, _elementType.VIDEO, _elementType.WHITEBOARD, _elementType.FORMULA, _elementType.TOGGLE_HEADER].concat(TOGGLE_TITLE_TYPES);
591
+ var SUPPORTED_SIDE_OPERATION_TYPE = exports.SUPPORTED_SIDE_OPERATION_TYPE = [_elementType.PARAGRAPH, _elementType.SUBTITLE, _elementType.HEADER1, _elementType.HEADER2, _elementType.HEADER3, _elementType.HEADER4, _elementType.HEADER5, _elementType.HEADER6, _elementType.CHECK_LIST_ITEM, _elementType.CODE_BLOCK, _elementType.TABLE, _elementType.BLOCKQUOTE, _elementType.CALL_OUT, _elementType.IMAGE_BLOCK, _elementType.VIDEO, _elementType.WHITEBOARD, _elementType.FORMULA, _elementType.TOGGLE_HEADER].concat(TOGGLE_TITLE_TYPES, [_elementType.FILE_VIEW]);
592
592
  var MOUSE_ENTER_EVENT_DISABLED_MAP = exports.MOUSE_ENTER_EVENT_DISABLED_MAP = (_MOUSE_ENTER_EVENT_DI = {}, (0, _defineProperty2["default"])((0, _defineProperty2["default"])((0, _defineProperty2["default"])((0, _defineProperty2["default"])((0, _defineProperty2["default"])((0, _defineProperty2["default"])((0, _defineProperty2["default"])((0, _defineProperty2["default"])((0, _defineProperty2["default"])((0, _defineProperty2["default"])(_MOUSE_ENTER_EVENT_DI, _elementType.PARAGRAPH, [_elementType.CALL_OUT]), _elementType.TITLE, [_elementType.CALL_OUT]), _elementType.SUBTITLE, [_elementType.CALL_OUT]), _elementType.CHECK_LIST_ITEM, [_elementType.CALL_OUT]), _elementType.ORDERED_LIST, [_elementType.CALL_OUT]), _elementType.UNORDERED_LIST, [_elementType.CALL_OUT]), _elementType.LIST_ITEM, [_elementType.CALL_OUT]), _elementType.BLOCKQUOTE, [_elementType.CALL_OUT]), _elementType.HEADER1, [_elementType.CALL_OUT]), _elementType.HEADER2, [_elementType.CALL_OUT]), (0, _defineProperty2["default"])((0, _defineProperty2["default"])((0, _defineProperty2["default"])((0, _defineProperty2["default"])((0, _defineProperty2["default"])(_MOUSE_ENTER_EVENT_DI, _elementType.HEADER3, [_elementType.CALL_OUT]), _elementType.HEADER4, [_elementType.CALL_OUT]), _elementType.HEADER5, [_elementType.CALL_OUT]), _elementType.HEADER6, [_elementType.CALL_OUT]), _elementType.CALL_OUT, [_elementType.CALL_OUT]));
593
- var ROOT_ELEMENT_TYPES = exports.ROOT_ELEMENT_TYPES = [_elementType.PARAGRAPH, _elementType.TITLE, _elementType.SUBTITLE, _elementType.CHECK_LIST_ITEM, _elementType.ORDERED_LIST, _elementType.UNORDERED_LIST, _elementType.BLOCKQUOTE, _elementType.HEADER1, _elementType.HEADER2, _elementType.HEADER3, _elementType.HEADER4, _elementType.HEADER5, _elementType.HEADER6, _elementType.CALL_OUT, _elementType.TABLE, _elementType.CODE_BLOCK, _elementType.IMAGE_BLOCK, _elementType.VIDEO, _elementType.WHITEBOARD, _elementType.FORMULA, _elementType.MULTI_COLUMN, _elementType.TOGGLE_HEADER];
593
+ var ROOT_ELEMENT_TYPES = exports.ROOT_ELEMENT_TYPES = [_elementType.PARAGRAPH, _elementType.TITLE, _elementType.SUBTITLE, _elementType.CHECK_LIST_ITEM, _elementType.ORDERED_LIST, _elementType.UNORDERED_LIST, _elementType.BLOCKQUOTE, _elementType.HEADER1, _elementType.HEADER2, _elementType.HEADER3, _elementType.HEADER4, _elementType.HEADER5, _elementType.HEADER6, _elementType.CALL_OUT, _elementType.TABLE, _elementType.CODE_BLOCK, _elementType.IMAGE_BLOCK, _elementType.VIDEO, _elementType.WHITEBOARD, _elementType.FORMULA, _elementType.MULTI_COLUMN, _elementType.TOGGLE_HEADER, _elementType.FILE_VIEW];
package/dist/extension/plugins/html/rules/list.js CHANGED
@@ -8,6 +8,57 @@ exports["default"] = void 0;
8
8
  var _slugid = _interopRequireDefault(require("slugid"));
9
9
  var _constants = require("../../../constants");
10
10
  var PARAGRAPH_TAGS = ['DIV', 'P'];
11
+ var LIST_TYPES = [_constants.ORDERED_LIST, _constants.UNORDERED_LIST];
12
+ var createParagraphNode = function createParagraphNode() {
13
+ var children = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
14
+ return {
15
+ id: _slugid["default"].nice(),
16
+ type: _constants.PARAGRAPH,
17
+ children: children
18
+ };
19
+ };
20
+ var normalizeListItemChildren = function normalizeListItemChildren() {
21
+ var nodes = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
22
+ var nextChildren = [];
23
+ var paragraphChildren = [];
24
+ nodes.forEach(function (node) {
25
+ if (node.type === _constants.PARAGRAPH) {
26
+ if (paragraphChildren.length > 0) {
27
+ nextChildren.push(createParagraphNode(paragraphChildren));
28
+ paragraphChildren = [];
29
+ }
30
+ nextChildren.push(node);
31
+ return;
32
+ }
33
+ if (node.type && !_constants.INLINE_LEVEL_TYPES.includes(node.type) && !LIST_TYPES.includes(node.type)) {
34
+ if (paragraphChildren.length > 0) {
35
+ nextChildren.push(createParagraphNode(paragraphChildren));
36
+ paragraphChildren = [];
37
+ }
38
+ nextChildren.push(node);
39
+ return;
40
+ }
41
+ if (LIST_TYPES.includes(node.type)) {
42
+ if (paragraphChildren.length > 0) {
43
+ nextChildren.push(createParagraphNode(paragraphChildren));
44
+ paragraphChildren = [];
45
+ }
46
+ nextChildren.push(node);
47
+ return;
48
+ }
49
+ paragraphChildren.push(node);
50
+ });
51
+ if (paragraphChildren.length > 0) {
52
+ nextChildren.push(createParagraphNode(paragraphChildren));
53
+ }
54
+ if (nextChildren.length === 0) {
55
+ nextChildren.push(createParagraphNode([{
56
+ id: _slugid["default"].nice(),
57
+ text: ''
58
+ }]));
59
+ }
60
+ return nextChildren;
61
+ };
11
62
  var listRule = function listRule(element, parseChild) {
12
63
  var nodeName = element.nodeName,
13
64
  childNodes = element.childNodes;
@@ -31,22 +82,19 @@ var listRule = function listRule(element, parseChild) {
31
82
  children: parseChild(_validChildNodes)
32
83
  };
33
84
  }
34
- if (nodeName === 'LI' && PARAGRAPH_TAGS.includes(element.firstChild.nodeName)) {
85
+ if (nodeName === 'LI' && element.firstChild && PARAGRAPH_TAGS.includes(element.firstChild.nodeName)) {
35
86
  return {
36
87
  id: _slugid["default"].nice(),
37
88
  type: _constants.LIST_ITEM,
38
89
  children: parseChild(childNodes)
39
90
  };
40
91
  }
41
- if (nodeName === 'LI' && !PARAGRAPH_TAGS.includes(element.firstChild.nodeName)) {
92
+ if (nodeName === 'LI') {
93
+ var parsedChildren = parseChild(childNodes);
42
94
  return {
43
95
  id: _slugid["default"].nice(),
44
96
  type: _constants.LIST_ITEM,
45
- children: [{
46
- id: _slugid["default"].nice(),
47
- type: _constants.PARAGRAPH,
48
- children: parseChild(childNodes)
49
- }]
97
+ children: normalizeListItemChildren(parsedChildren)
50
98
  };
51
99
  }
52
100
  if (PARAGRAPH_TAGS.includes(nodeName) && element.parentElement.nodeName === 'LI') {
package/dist/extension/toolbar/side-toolbar/helpers.js CHANGED
@@ -352,7 +352,7 @@ var getTopValue = exports.getTopValue = function getTopValue(editor, dom, contai
352
352
  return top + offsetY - headerHeight;
353
353
  };
354
354
  var isNotSupportTransform = exports.isNotSupportTransform = function isNotSupportTransform(node) {
355
- if (node.type && [_constants2.CODE_BLOCK, _constants2.TABLE, _constants2.VIDEO, _constants2.WHITEBOARD].includes(node.type)) {
355
+ if (node.type && [_constants2.CODE_BLOCK, _constants2.TABLE, _constants2.VIDEO, _constants2.WHITEBOARD, _constants2.FILE_VIEW].includes(node.type)) {
356
356
  return true;
357
357
  }
358
358
  return false;
package/dist/slate-convert/html-to-slate/rules/list.js CHANGED
@@ -8,39 +8,93 @@ exports["default"] = void 0;
8
8
  var _slugid = _interopRequireDefault(require("slugid"));
9
9
  var _constants = require("../constants");
10
10
  var PARAGRAPH_TAGS = ['DIV', 'P'];
11
+ var LIST_TYPES = [_constants.ORDERED_LIST, _constants.UNORDERED_LIST];
12
+ var createParagraphNode = function createParagraphNode() {
13
+ var children = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
14
+ return {
15
+ id: _slugid["default"].nice(),
16
+ type: _constants.PARAGRAPH,
17
+ children: children
18
+ };
19
+ };
20
+ var normalizeListItemChildren = function normalizeListItemChildren() {
21
+ var nodes = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
22
+ var nextChildren = [];
23
+ var paragraphChildren = [];
24
+ nodes.forEach(function (node) {
25
+ if (node.type === _constants.PARAGRAPH) {
26
+ if (paragraphChildren.length > 0) {
27
+ nextChildren.push(createParagraphNode(paragraphChildren));
28
+ paragraphChildren = [];
29
+ }
30
+ nextChildren.push(node);
31
+ return;
32
+ }
33
+ if (node.type && !_constants.INLINE_LEVEL_TYPES.includes(node.type) && !LIST_TYPES.includes(node.type)) {
34
+ if (paragraphChildren.length > 0) {
35
+ nextChildren.push(createParagraphNode(paragraphChildren));
36
+ paragraphChildren = [];
37
+ }
38
+ nextChildren.push(node);
39
+ return;
40
+ }
41
+ if (LIST_TYPES.includes(node.type)) {
42
+ if (paragraphChildren.length > 0) {
43
+ nextChildren.push(createParagraphNode(paragraphChildren));
44
+ paragraphChildren = [];
45
+ }
46
+ nextChildren.push(node);
47
+ return;
48
+ }
49
+ paragraphChildren.push(node);
50
+ });
51
+ if (paragraphChildren.length > 0) {
52
+ nextChildren.push(createParagraphNode(paragraphChildren));
53
+ }
54
+ if (nextChildren.length === 0) {
55
+ nextChildren.push(createParagraphNode([{
56
+ id: _slugid["default"].nice(),
57
+ text: ''
58
+ }]));
59
+ }
60
+ return nextChildren;
61
+ };
11
62
  var listRule = function listRule(element, parseChild) {
12
63
  var nodeName = element.nodeName,
13
64
  childNodes = element.childNodes;
14
65
  if (nodeName === 'UL') {
66
+ var validChildNodes = Array.from(childNodes).filter(function (item) {
67
+ return item.nodeName === 'LI';
68
+ });
15
69
  return {
16
70
  id: _slugid["default"].nice(),
17
71
  type: _constants.UNORDERED_LIST,
18
- children: parseChild(childNodes)
72
+ children: parseChild(validChildNodes)
19
73
  };
20
74
  }
21
75
  if (nodeName === 'OL') {
76
+ var _validChildNodes = Array.from(childNodes).filter(function (item) {
77
+ return item.nodeName === 'LI';
78
+ });
22
79
  return {
23
80
  id: _slugid["default"].nice(),
24
81
  type: _constants.ORDERED_LIST,
25
- children: parseChild(childNodes)
82
+ children: parseChild(_validChildNodes)
26
83
  };
27
84
  }
28
- if (nodeName === 'LI' && PARAGRAPH_TAGS.includes(element.firstChild.nodeName)) {
85
+ if (nodeName === 'LI' && element.firstChild && PARAGRAPH_TAGS.includes(element.firstChild.nodeName)) {
29
86
  return {
30
87
  id: _slugid["default"].nice(),
31
88
  type: _constants.LIST_ITEM,
32
89
  children: parseChild(childNodes)
33
90
  };
34
91
  }
35
- if (nodeName === 'LI' && !PARAGRAPH_TAGS.includes(element.firstChild.nodeName)) {
92
+ if (nodeName === 'LI') {
93
+ var parsedChildren = parseChild(childNodes);
36
94
  return {
37
95
  id: _slugid["default"].nice(),
38
96
  type: _constants.LIST_ITEM,
39
- children: [{
40
- id: _slugid["default"].nice(),
41
- type: _constants.PARAGRAPH,
42
- children: parseChild(childNodes)
43
- }]
97
+ children: normalizeListItemChildren(parsedChildren)
44
98
  };
45
99
  }
46
100
  if (PARAGRAPH_TAGS.includes(nodeName) && element.parentElement.nodeName === 'LI') {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@seafile/sdoc-editor",
3
- "version": "3.0.116",
3
+ "version": "3.0.118",
4
4
  "main": "dist/index.js",
5
5
  "scripts": {
6
6
  "test": "jest",
@@ -20,7 +20,7 @@
20
20
  "@seafile/comment-editor": "1.0.18",
21
21
  "@seafile/print-js": "1.6.6",
22
22
  "@seafile/react-image-lightbox": "5.0.4",
23
- "@seafile/seafile-database": "0.0.39",
23
+ "@seafile/seafile-database": "0.0.40",
24
24
  "@seafile/slate": "0.91.8",
25
25
  "@seafile/slate-history": "0.86.2",
26
26
  "@seafile/slate-hyperscript": "0.81.7",
@@ -72,5 +72,5 @@
72
72
  "publishConfig": {
73
73
  "access": "public"
74
74
  },
75
- "gitHead": "b3900cdded82aacd80336d4880895ff93f388de6"
75
+ "gitHead": "a0b0278e602bc7aa6f553b610304179dafeeb483"
76
76
  }