@ckeditor/ckeditor5-engine 35.0.1 → 35.2.0
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.
- package/CHANGELOG.md +4 -4
- package/package.json +30 -24
- package/src/controller/datacontroller.js +467 -561
- package/src/controller/editingcontroller.js +168 -204
- package/src/conversion/conversion.js +541 -565
- package/src/conversion/conversionhelpers.js +24 -28
- package/src/conversion/downcastdispatcher.js +457 -686
- package/src/conversion/downcasthelpers.js +1583 -1965
- package/src/conversion/mapper.js +518 -707
- package/src/conversion/modelconsumable.js +240 -283
- package/src/conversion/upcastdispatcher.js +372 -718
- package/src/conversion/upcasthelpers.js +707 -818
- package/src/conversion/viewconsumable.js +524 -581
- package/src/dataprocessor/basichtmlwriter.js +12 -16
- package/src/dataprocessor/dataprocessor.js +5 -0
- package/src/dataprocessor/htmldataprocessor.js +100 -116
- package/src/dataprocessor/htmlwriter.js +1 -18
- package/src/dataprocessor/xmldataprocessor.js +116 -137
- package/src/dev-utils/model.js +260 -352
- package/src/dev-utils/operationreplayer.js +106 -126
- package/src/dev-utils/utils.js +34 -51
- package/src/dev-utils/view.js +632 -753
- package/src/index.js +0 -11
- package/src/model/batch.js +111 -127
- package/src/model/differ.js +988 -1233
- package/src/model/document.js +340 -449
- package/src/model/documentfragment.js +327 -364
- package/src/model/documentselection.js +996 -1189
- package/src/model/element.js +306 -410
- package/src/model/history.js +224 -262
- package/src/model/item.js +5 -0
- package/src/model/liveposition.js +84 -145
- package/src/model/liverange.js +108 -185
- package/src/model/markercollection.js +379 -480
- package/src/model/model.js +883 -1034
- package/src/model/node.js +419 -463
- package/src/model/nodelist.js +176 -201
- package/src/model/operation/attributeoperation.js +153 -182
- package/src/model/operation/detachoperation.js +64 -83
- package/src/model/operation/insertoperation.js +135 -166
- package/src/model/operation/markeroperation.js +114 -140
- package/src/model/operation/mergeoperation.js +163 -191
- package/src/model/operation/moveoperation.js +157 -187
- package/src/model/operation/nooperation.js +28 -38
- package/src/model/operation/operation.js +106 -125
- package/src/model/operation/operationfactory.js +30 -34
- package/src/model/operation/renameoperation.js +109 -135
- package/src/model/operation/rootattributeoperation.js +155 -188
- package/src/model/operation/splitoperation.js +196 -232
- package/src/model/operation/transform.js +1833 -2204
- package/src/model/operation/utils.js +140 -204
- package/src/model/position.js +980 -1053
- package/src/model/range.js +910 -1028
- package/src/model/rootelement.js +77 -97
- package/src/model/schema.js +1189 -1835
- package/src/model/selection.js +745 -862
- package/src/model/text.js +90 -114
- package/src/model/textproxy.js +204 -240
- package/src/model/treewalker.js +316 -397
- package/src/model/typecheckable.js +16 -0
- package/src/model/utils/autoparagraphing.js +32 -44
- package/src/model/utils/deletecontent.js +334 -418
- package/src/model/utils/findoptimalinsertionrange.js +25 -36
- package/src/model/utils/getselectedcontent.js +96 -118
- package/src/model/utils/insertcontent.js +757 -773
- package/src/model/utils/insertobject.js +96 -119
- package/src/model/utils/modifyselection.js +120 -158
- package/src/model/utils/selection-post-fixer.js +153 -201
- package/src/model/writer.js +1305 -1474
- package/src/view/attributeelement.js +189 -225
- package/src/view/containerelement.js +75 -85
- package/src/view/document.js +172 -215
- package/src/view/documentfragment.js +200 -249
- package/src/view/documentselection.js +338 -367
- package/src/view/domconverter.js +1370 -1617
- package/src/view/downcastwriter.js +1747 -2076
- package/src/view/editableelement.js +81 -97
- package/src/view/element.js +739 -890
- package/src/view/elementdefinition.js +5 -0
- package/src/view/emptyelement.js +82 -92
- package/src/view/filler.js +35 -50
- package/src/view/item.js +5 -0
- package/src/view/matcher.js +260 -559
- package/src/view/node.js +274 -360
- package/src/view/observer/arrowkeysobserver.js +19 -28
- package/src/view/observer/bubblingemittermixin.js +120 -263
- package/src/view/observer/bubblingeventinfo.js +47 -55
- package/src/view/observer/clickobserver.js +7 -13
- package/src/view/observer/compositionobserver.js +14 -24
- package/src/view/observer/domeventdata.js +57 -67
- package/src/view/observer/domeventobserver.js +40 -64
- package/src/view/observer/fakeselectionobserver.js +81 -96
- package/src/view/observer/focusobserver.js +45 -61
- package/src/view/observer/inputobserver.js +7 -13
- package/src/view/observer/keyobserver.js +17 -27
- package/src/view/observer/mouseobserver.js +7 -14
- package/src/view/observer/mutationobserver.js +220 -315
- package/src/view/observer/observer.js +81 -102
- package/src/view/observer/selectionobserver.js +199 -246
- package/src/view/observer/tabobserver.js +23 -36
- package/src/view/placeholder.js +128 -173
- package/src/view/position.js +350 -401
- package/src/view/range.js +453 -513
- package/src/view/rawelement.js +85 -112
- package/src/view/renderer.js +874 -1018
- package/src/view/rooteditableelement.js +80 -90
- package/src/view/selection.js +608 -689
- package/src/view/styles/background.js +43 -44
- package/src/view/styles/border.js +220 -276
- package/src/view/styles/margin.js +8 -17
- package/src/view/styles/padding.js +8 -16
- package/src/view/styles/utils.js +127 -160
- package/src/view/stylesmap.js +728 -905
- package/src/view/text.js +102 -126
- package/src/view/textproxy.js +144 -170
- package/src/view/treewalker.js +383 -479
- package/src/view/typecheckable.js +19 -0
- package/src/view/uielement.js +166 -187
- package/src/view/upcastwriter.js +395 -449
- package/src/view/view.js +569 -664
- package/src/dataprocessor/dataprocessor.jsdoc +0 -64
- package/src/model/item.jsdoc +0 -14
- package/src/view/elementdefinition.jsdoc +0 -59
- package/src/view/item.jsdoc +0 -14
|
@@ -2,15 +2,11 @@
|
|
|
2
2
|
* @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
|
|
3
3
|
* For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
|
|
4
4
|
*/
|
|
5
|
-
|
|
6
5
|
/**
|
|
7
6
|
* @module engine/view/observer/focusobserver
|
|
8
7
|
*/
|
|
9
|
-
|
|
10
8
|
/* globals setTimeout, clearTimeout */
|
|
11
|
-
|
|
12
9
|
import DomEventObserver from './domeventobserver';
|
|
13
|
-
|
|
14
10
|
/**
|
|
15
11
|
* {@link module:engine/view/document~Document#event:focus Focus}
|
|
16
12
|
* and {@link module:engine/view/document~Document#event:blur blur} events observer.
|
|
@@ -22,63 +18,52 @@ import DomEventObserver from './domeventobserver';
|
|
|
22
18
|
* @extends module:engine/view/observer/domeventobserver~DomEventObserver
|
|
23
19
|
*/
|
|
24
20
|
export default class FocusObserver extends DomEventObserver {
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
/**
|
|
71
|
-
* @inheritDoc
|
|
72
|
-
*/
|
|
73
|
-
destroy() {
|
|
74
|
-
if ( this._renderTimeoutId ) {
|
|
75
|
-
clearTimeout( this._renderTimeoutId );
|
|
76
|
-
}
|
|
77
|
-
|
|
78
|
-
super.destroy();
|
|
79
|
-
}
|
|
21
|
+
constructor(view) {
|
|
22
|
+
super(view);
|
|
23
|
+
this.domEventType = ['focus', 'blur'];
|
|
24
|
+
this.useCapture = true;
|
|
25
|
+
const document = this.document;
|
|
26
|
+
document.on('focus', () => {
|
|
27
|
+
document.isFocused = true;
|
|
28
|
+
// Unfortunately native `selectionchange` event is fired asynchronously.
|
|
29
|
+
// We need to wait until `SelectionObserver` handle the event and then render. Otherwise rendering will
|
|
30
|
+
// overwrite new DOM selection with selection from the view.
|
|
31
|
+
// See https://github.com/ckeditor/ckeditor5-engine/issues/795 for more details.
|
|
32
|
+
// Long timeout is needed to solve #676 and https://github.com/ckeditor/ckeditor5-engine/issues/1157 issues.
|
|
33
|
+
//
|
|
34
|
+
// Using `view.change()` instead of `view.forceRender()` to prevent double rendering
|
|
35
|
+
// in a situation where `selectionchange` already caused selection change.
|
|
36
|
+
this._renderTimeoutId = setTimeout(() => view.change(() => { }), 50);
|
|
37
|
+
});
|
|
38
|
+
document.on('blur', (evt, data) => {
|
|
39
|
+
const selectedEditable = document.selection.editableElement;
|
|
40
|
+
if (selectedEditable === null || selectedEditable === data.target) {
|
|
41
|
+
document.isFocused = false;
|
|
42
|
+
// Re-render the document to update view elements
|
|
43
|
+
// (changing document.isFocused already marked view as changed since last rendering).
|
|
44
|
+
view.change(() => { });
|
|
45
|
+
}
|
|
46
|
+
});
|
|
47
|
+
/**
|
|
48
|
+
* Identifier of the timeout currently used by focus listener to delay rendering execution.
|
|
49
|
+
*
|
|
50
|
+
* @private
|
|
51
|
+
* @member {Number} #_renderTimeoutId
|
|
52
|
+
*/
|
|
53
|
+
}
|
|
54
|
+
onDomEvent(domEvent) {
|
|
55
|
+
this.fire(domEvent.type, domEvent);
|
|
56
|
+
}
|
|
57
|
+
/**
|
|
58
|
+
* @inheritDoc
|
|
59
|
+
*/
|
|
60
|
+
destroy() {
|
|
61
|
+
if (this._renderTimeoutId) {
|
|
62
|
+
clearTimeout(this._renderTimeoutId);
|
|
63
|
+
}
|
|
64
|
+
super.destroy();
|
|
65
|
+
}
|
|
80
66
|
}
|
|
81
|
-
|
|
82
67
|
/**
|
|
83
68
|
* Fired when one of the editables gets focus.
|
|
84
69
|
*
|
|
@@ -91,7 +76,6 @@ export default class FocusObserver extends DomEventObserver {
|
|
|
91
76
|
* @event module:engine/view/document~Document#event:focus
|
|
92
77
|
* @param {module:engine/view/observer/domeventdata~DomEventData} data Event data.
|
|
93
78
|
*/
|
|
94
|
-
|
|
95
79
|
/**
|
|
96
80
|
* Fired when one of the editables loses focus.
|
|
97
81
|
*
|
|
@@ -2,13 +2,10 @@
|
|
|
2
2
|
* @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
|
|
3
3
|
* For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
|
|
4
4
|
*/
|
|
5
|
-
|
|
6
5
|
/**
|
|
7
6
|
* @module engine/view/observer/inputobserver
|
|
8
7
|
*/
|
|
9
|
-
|
|
10
8
|
import DomEventObserver from './domeventobserver';
|
|
11
|
-
|
|
12
9
|
/**
|
|
13
10
|
* Observer for events connected with data input.
|
|
14
11
|
*
|
|
@@ -17,17 +14,14 @@ import DomEventObserver from './domeventobserver';
|
|
|
17
14
|
* @extends module:engine/view/observer/domeventobserver~DomEventObserver
|
|
18
15
|
*/
|
|
19
16
|
export default class InputObserver extends DomEventObserver {
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
this.fire( domEvent.type, domEvent );
|
|
28
|
-
}
|
|
17
|
+
constructor(view) {
|
|
18
|
+
super(view);
|
|
19
|
+
this.domEventType = ['beforeinput'];
|
|
20
|
+
}
|
|
21
|
+
onDomEvent(domEvent) {
|
|
22
|
+
this.fire(domEvent.type, domEvent);
|
|
23
|
+
}
|
|
29
24
|
}
|
|
30
|
-
|
|
31
25
|
/**
|
|
32
26
|
* Fired before browser inputs (or deletes) some data.
|
|
33
27
|
*
|
|
@@ -2,14 +2,11 @@
|
|
|
2
2
|
* @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
|
|
3
3
|
* For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
|
|
4
4
|
*/
|
|
5
|
-
|
|
6
5
|
/**
|
|
7
6
|
* @module engine/view/observer/keyobserver
|
|
8
7
|
*/
|
|
9
|
-
|
|
10
8
|
import DomEventObserver from './domeventobserver';
|
|
11
9
|
import { getCode } from '@ckeditor/ckeditor5-utils/src/keyboard';
|
|
12
|
-
|
|
13
10
|
/**
|
|
14
11
|
* Observer for events connected with pressing keyboard keys.
|
|
15
12
|
*
|
|
@@ -18,28 +15,24 @@ import { getCode } from '@ckeditor/ckeditor5-utils/src/keyboard';
|
|
|
18
15
|
* @extends module:engine/view/observer/domeventobserver~DomEventObserver
|
|
19
16
|
*/
|
|
20
17
|
export default class KeyObserver extends DomEventObserver {
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
}
|
|
39
|
-
} );
|
|
40
|
-
}
|
|
18
|
+
constructor(view) {
|
|
19
|
+
super(view);
|
|
20
|
+
this.domEventType = ['keydown', 'keyup'];
|
|
21
|
+
}
|
|
22
|
+
onDomEvent(domEvt) {
|
|
23
|
+
const data = {
|
|
24
|
+
keyCode: domEvt.keyCode,
|
|
25
|
+
altKey: domEvt.altKey,
|
|
26
|
+
ctrlKey: domEvt.ctrlKey,
|
|
27
|
+
shiftKey: domEvt.shiftKey,
|
|
28
|
+
metaKey: domEvt.metaKey,
|
|
29
|
+
get keystroke() {
|
|
30
|
+
return getCode(this);
|
|
31
|
+
}
|
|
32
|
+
};
|
|
33
|
+
this.fire(domEvt.type, domEvt, data);
|
|
34
|
+
}
|
|
41
35
|
}
|
|
42
|
-
|
|
43
36
|
/**
|
|
44
37
|
* Fired when a key has been pressed.
|
|
45
38
|
*
|
|
@@ -52,7 +45,6 @@ export default class KeyObserver extends DomEventObserver {
|
|
|
52
45
|
* @event module:engine/view/document~Document#event:keydown
|
|
53
46
|
* @param {module:engine/view/observer/keyobserver~KeyEventData} keyEventData
|
|
54
47
|
*/
|
|
55
|
-
|
|
56
48
|
/**
|
|
57
49
|
* Fired when a key has been released.
|
|
58
50
|
*
|
|
@@ -65,7 +57,6 @@ export default class KeyObserver extends DomEventObserver {
|
|
|
65
57
|
* @event module:engine/view/document~Document#event:keyup
|
|
66
58
|
* @param {module:engine/view/observer/keyobserver~KeyEventData} keyEventData
|
|
67
59
|
*/
|
|
68
|
-
|
|
69
60
|
/**
|
|
70
61
|
* The value of both events - {@link module:engine/view/document~Document#event:keydown} and
|
|
71
62
|
* {@link module:engine/view/document~Document#event:keyup}.
|
|
@@ -74,7 +65,6 @@ export default class KeyObserver extends DomEventObserver {
|
|
|
74
65
|
* @extends module:engine/view/observer/domeventdata~DomEventData
|
|
75
66
|
* @implements module:utils/keyboard~KeystrokeInfo
|
|
76
67
|
*/
|
|
77
|
-
|
|
78
68
|
/**
|
|
79
69
|
* Code of the whole keystroke. See {@link module:utils/keyboard~getCode}.
|
|
80
70
|
*
|
|
@@ -2,13 +2,10 @@
|
|
|
2
2
|
* @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
|
|
3
3
|
* For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
|
|
4
4
|
*/
|
|
5
|
-
|
|
6
5
|
/**
|
|
7
6
|
* @module engine/view/observer/mouseobserver
|
|
8
7
|
*/
|
|
9
|
-
|
|
10
8
|
import DomEventObserver from './domeventobserver';
|
|
11
|
-
|
|
12
9
|
/**
|
|
13
10
|
* Mouse events observer.
|
|
14
11
|
*
|
|
@@ -18,17 +15,14 @@ import DomEventObserver from './domeventobserver';
|
|
|
18
15
|
* @extends module:engine/view/observer/domeventobserver~DomEventObserver
|
|
19
16
|
*/
|
|
20
17
|
export default class MouseObserver extends DomEventObserver {
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
this.fire( domEvent.type, domEvent );
|
|
29
|
-
}
|
|
18
|
+
constructor(view) {
|
|
19
|
+
super(view);
|
|
20
|
+
this.domEventType = ['mousedown', 'mouseup', 'mouseover', 'mouseout'];
|
|
21
|
+
}
|
|
22
|
+
onDomEvent(domEvent) {
|
|
23
|
+
this.fire(domEvent.type, domEvent);
|
|
24
|
+
}
|
|
30
25
|
}
|
|
31
|
-
|
|
32
26
|
/**
|
|
33
27
|
* Fired when the mouse button is pressed down on one of the editing roots of the editor.
|
|
34
28
|
*
|
|
@@ -41,7 +35,6 @@ export default class MouseObserver extends DomEventObserver {
|
|
|
41
35
|
* @event module:engine/view/document~Document#event:mousedown
|
|
42
36
|
* @param {module:engine/view/observer/domeventdata~DomEventData} data The event data.
|
|
43
37
|
*/
|
|
44
|
-
|
|
45
38
|
/**
|
|
46
39
|
* Fired when the mouse button is released over one of the editing roots of the editor.
|
|
47
40
|
*
|