@seafile/sdoc-editor 3.0.115 → 3.0.117

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 (4) hide show
  1. package/dist/assets/css/layout.css +1 -0
  2. package/dist/extension/plugins/html/rules/list.js +55 -7
  3. package/dist/slate-convert/html-to-slate/rules/list.js +63 -9
  4. package/package.json +2 -2
package/dist/assets/css/layout.css CHANGED
@@ -97,6 +97,7 @@
97
97
  width: 100%;
98
98
  flex: 1;
99
99
  display: flex;
100
+ background: #f5f5f5;
100
101
  }
101
102
 
102
103
  .sdoc-editor-container .sdoc-editor-content {
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/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.115",
3
+ "version": "3.0.117",
4
4
  "main": "dist/index.js",
5
5
  "scripts": {
6
6
  "test": "jest",
@@ -72,5 +72,5 @@
72
72
  "publishConfig": {
73
73
  "access": "public"
74
74
  },
75
- "gitHead": "49c280cdc7d6958cd5ad0a125165bd79123d502b"
75
+ "gitHead": "f0ef2ee9984db404c96b3de492d7a33698583468"
76
76
  }