@ckeditor/ckeditor5-engine 35.0.1 → 35.1.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 +175 -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 +899 -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 +654 -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 +191 -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
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
|
|
3
|
+
* For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
|
|
4
|
+
*/
|
|
5
|
+
/**
|
|
6
|
+
* @module engine/view/typecheckable
|
|
7
|
+
*/
|
|
8
|
+
export default class TypeCheckable {
|
|
9
|
+
/* istanbul ignore next */
|
|
10
|
+
is() {
|
|
11
|
+
// There are a lot of overloads above.
|
|
12
|
+
// Overriding method in derived classes remove them and only `is( type: string ): boolean` is visible which we don't want.
|
|
13
|
+
// One option would be to copy them all to all classes, but that's ugly.
|
|
14
|
+
// It's best when TypeScript compiler doesn't see those overloads, except the one in the top base class.
|
|
15
|
+
// To overload a method, but not let the compiler see it, do after class definition:
|
|
16
|
+
// `MyClass.prototype.is = function( type: string ) {...}`
|
|
17
|
+
throw new Error('is() method is abstract');
|
|
18
|
+
}
|
|
19
|
+
}
|
package/src/view/uielement.js
CHANGED
|
@@ -2,16 +2,13 @@
|
|
|
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/uielement
|
|
8
7
|
*/
|
|
9
|
-
|
|
10
8
|
import Element from './element';
|
|
11
|
-
import CKEditorError from '@ckeditor/ckeditor5-utils/src/ckeditorerror';
|
|
12
9
|
import Node from './node';
|
|
10
|
+
import CKEditorError from '@ckeditor/ckeditor5-utils/src/ckeditorerror';
|
|
13
11
|
import { keyCodes } from '@ckeditor/ckeditor5-utils/src/keyboard';
|
|
14
|
-
|
|
15
12
|
/**
|
|
16
13
|
* UI element class. It should be used to represent editing UI which needs to be injected into the editing view
|
|
17
14
|
* If possible, you should keep your UI outside the editing view. However, if that is not possible,
|
|
@@ -33,135 +30,127 @@ import { keyCodes } from '@ckeditor/ckeditor5-utils/src/keyboard';
|
|
|
33
30
|
* @extends module:engine/view/element~Element
|
|
34
31
|
*/
|
|
35
32
|
export default class UIElement extends Element {
|
|
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
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
}
|
|
119
|
-
|
|
120
|
-
/**
|
|
121
|
-
* Renders this {@link module:engine/view/uielement~UIElement} to DOM. This method is called by
|
|
122
|
-
* {@link module:engine/view/domconverter~DomConverter}.
|
|
123
|
-
* Do not use inheritance to create custom rendering method, replace `render()` method instead:
|
|
124
|
-
*
|
|
125
|
-
* const myUIElement = downcastWriter.createUIElement( 'span' );
|
|
126
|
-
* myUIElement.render = function( domDocument, domConverter ) {
|
|
127
|
-
* const domElement = this.toDomElement( domDocument );
|
|
128
|
-
*
|
|
129
|
-
* domConverter.setContentOf( domElement, '<b>this is ui element</b>' );
|
|
130
|
-
*
|
|
131
|
-
* return domElement;
|
|
132
|
-
* };
|
|
133
|
-
*
|
|
134
|
-
* If changes in your UI element should trigger some editor UI update you should call
|
|
135
|
-
* the {@link module:core/editor/editorui~EditorUI#update `editor.ui.update()`} method
|
|
136
|
-
* after rendering your UI element.
|
|
137
|
-
*
|
|
138
|
-
* @param {Document} domDocument
|
|
139
|
-
* @param {module:engine/view/domconverter~DomConverter} domConverter Instance of the DomConverter used to optimize the output.
|
|
140
|
-
* @returns {HTMLElement}
|
|
141
|
-
*/
|
|
142
|
-
render( domDocument ) {
|
|
143
|
-
// Provide basic, default output.
|
|
144
|
-
return this.toDomElement( domDocument );
|
|
145
|
-
}
|
|
146
|
-
|
|
147
|
-
/**
|
|
148
|
-
* Creates DOM element based on this view UIElement.
|
|
149
|
-
* Note that each time this method is called new DOM element is created.
|
|
150
|
-
*
|
|
151
|
-
* @param {Document} domDocument
|
|
152
|
-
* @returns {HTMLElement}
|
|
153
|
-
*/
|
|
154
|
-
toDomElement( domDocument ) {
|
|
155
|
-
const domElement = domDocument.createElement( this.name );
|
|
156
|
-
|
|
157
|
-
for ( const key of this.getAttributeKeys() ) {
|
|
158
|
-
domElement.setAttribute( key, this.getAttribute( key ) );
|
|
159
|
-
}
|
|
160
|
-
|
|
161
|
-
return domElement;
|
|
162
|
-
}
|
|
33
|
+
/**
|
|
34
|
+
* Creates new instance of UIElement.
|
|
35
|
+
*
|
|
36
|
+
* Throws {@link module:utils/ckeditorerror~CKEditorError CKEditorError} `view-uielement-cannot-add` when third parameter is passed,
|
|
37
|
+
* to inform that usage of UIElement is incorrect (adding child nodes to UIElement is forbidden).
|
|
38
|
+
*
|
|
39
|
+
* @see module:engine/view/downcastwriter~DowncastWriter#createUIElement
|
|
40
|
+
* @protected
|
|
41
|
+
* @param {module:engine/view/document~Document} document The document instance to which this element belongs.
|
|
42
|
+
* @param {String} name Node name.
|
|
43
|
+
* @param {Object|Iterable} [attributes] Collection of attributes.
|
|
44
|
+
* @param {module:engine/view/node~Node|Iterable.<module:engine/view/node~Node>} [children]
|
|
45
|
+
* A list of nodes to be inserted into created element.
|
|
46
|
+
*/
|
|
47
|
+
constructor(...args) {
|
|
48
|
+
super(...args);
|
|
49
|
+
/**
|
|
50
|
+
* Returns `null` because filler is not needed for UIElements.
|
|
51
|
+
*
|
|
52
|
+
* @method #getFillerOffset
|
|
53
|
+
* @returns {null} Always returns null.
|
|
54
|
+
*/
|
|
55
|
+
this.getFillerOffset = getFillerOffset;
|
|
56
|
+
}
|
|
57
|
+
/**
|
|
58
|
+
* Overrides {@link module:engine/view/element~Element#_insertChild} method.
|
|
59
|
+
* Throws {@link module:utils/ckeditorerror~CKEditorError CKEditorError} `view-uielement-cannot-add` to prevent adding any child nodes
|
|
60
|
+
* to UIElement.
|
|
61
|
+
*
|
|
62
|
+
* @protected
|
|
63
|
+
*/
|
|
64
|
+
_insertChild(index, items) {
|
|
65
|
+
if (items && (items instanceof Node || Array.from(items).length > 0)) {
|
|
66
|
+
/**
|
|
67
|
+
* Cannot add children to {@link module:engine/view/uielement~UIElement}.
|
|
68
|
+
*
|
|
69
|
+
* @error view-uielement-cannot-add
|
|
70
|
+
*/
|
|
71
|
+
throw new CKEditorError('view-uielement-cannot-add', [this, items]);
|
|
72
|
+
}
|
|
73
|
+
return 0;
|
|
74
|
+
}
|
|
75
|
+
/**
|
|
76
|
+
* Renders this {@link module:engine/view/uielement~UIElement} to DOM. This method is called by
|
|
77
|
+
* {@link module:engine/view/domconverter~DomConverter}.
|
|
78
|
+
* Do not use inheritance to create custom rendering method, replace `render()` method instead:
|
|
79
|
+
*
|
|
80
|
+
* const myUIElement = downcastWriter.createUIElement( 'span' );
|
|
81
|
+
* myUIElement.render = function( domDocument, domConverter ) {
|
|
82
|
+
* const domElement = this.toDomElement( domDocument );
|
|
83
|
+
*
|
|
84
|
+
* domConverter.setContentOf( domElement, '<b>this is ui element</b>' );
|
|
85
|
+
*
|
|
86
|
+
* return domElement;
|
|
87
|
+
* };
|
|
88
|
+
*
|
|
89
|
+
* If changes in your UI element should trigger some editor UI update you should call
|
|
90
|
+
* the {@link module:core/editor/editorui~EditorUI#update `editor.ui.update()`} method
|
|
91
|
+
* after rendering your UI element.
|
|
92
|
+
*
|
|
93
|
+
* @param {Document} domDocument
|
|
94
|
+
* @param {module:engine/view/domconverter~DomConverter} domConverter Instance of the DomConverter used to optimize the output.
|
|
95
|
+
* @returns {HTMLElement}
|
|
96
|
+
*/
|
|
97
|
+
render(domDocument, domConverter) {
|
|
98
|
+
// Provide basic, default output.
|
|
99
|
+
return this.toDomElement(domDocument);
|
|
100
|
+
}
|
|
101
|
+
/**
|
|
102
|
+
* Creates DOM element based on this view UIElement.
|
|
103
|
+
* Note that each time this method is called new DOM element is created.
|
|
104
|
+
*
|
|
105
|
+
* @param {Document} domDocument
|
|
106
|
+
* @returns {HTMLElement}
|
|
107
|
+
*/
|
|
108
|
+
toDomElement(domDocument) {
|
|
109
|
+
const domElement = domDocument.createElement(this.name);
|
|
110
|
+
for (const key of this.getAttributeKeys()) {
|
|
111
|
+
domElement.setAttribute(key, this.getAttribute(key));
|
|
112
|
+
}
|
|
113
|
+
return domElement;
|
|
114
|
+
}
|
|
163
115
|
}
|
|
164
|
-
|
|
116
|
+
/**
|
|
117
|
+
* Checks whether this object is of the given.
|
|
118
|
+
*
|
|
119
|
+
* uiElement.is( 'uiElement' ); // -> true
|
|
120
|
+
* uiElement.is( 'element' ); // -> true
|
|
121
|
+
* uiElement.is( 'node' ); // -> true
|
|
122
|
+
* uiElement.is( 'view:uiElement' ); // -> true
|
|
123
|
+
* uiElement.is( 'view:element' ); // -> true
|
|
124
|
+
* uiElement.is( 'view:node' ); // -> true
|
|
125
|
+
*
|
|
126
|
+
* uiElement.is( 'model:element' ); // -> false
|
|
127
|
+
* uiElement.is( 'documentFragment' ); // -> false
|
|
128
|
+
*
|
|
129
|
+
* Assuming that the object being checked is an ui element, you can also check its
|
|
130
|
+
* {@link module:engine/view/uielement~UIElement#name name}:
|
|
131
|
+
*
|
|
132
|
+
* uiElement.is( 'element', 'span' ); // -> true if this is a span ui element
|
|
133
|
+
* uiElement.is( 'uiElement', 'span' ); // -> same as above
|
|
134
|
+
* text.is( 'element', 'span' ); -> false
|
|
135
|
+
*
|
|
136
|
+
* {@link module:engine/view/node~Node#is Check the entire list of view objects} which implement the `is()` method.
|
|
137
|
+
*
|
|
138
|
+
* @param {String} type Type to check.
|
|
139
|
+
* @param {String} [name] Element name.
|
|
140
|
+
* @returns {Boolean}
|
|
141
|
+
*/
|
|
142
|
+
UIElement.prototype.is = function (type, name) {
|
|
143
|
+
if (!name) {
|
|
144
|
+
return type === 'uiElement' || type === 'view:uiElement' ||
|
|
145
|
+
// From super.is(). This is highly utilised method and cannot call super. See ckeditor/ckeditor5#6529.
|
|
146
|
+
type === 'element' || type === 'view:element' ||
|
|
147
|
+
type === 'node' || type === 'view:node';
|
|
148
|
+
}
|
|
149
|
+
else {
|
|
150
|
+
return name === this.name && (type === 'uiElement' || type === 'view:uiElement' ||
|
|
151
|
+
type === 'element' || type === 'view:element');
|
|
152
|
+
}
|
|
153
|
+
};
|
|
165
154
|
/**
|
|
166
155
|
* This function injects UI element handling to the given {@link module:engine/view/document~Document document}.
|
|
167
156
|
*
|
|
@@ -171,68 +160,58 @@ export default class UIElement extends Element {
|
|
|
171
160
|
*
|
|
172
161
|
* @param {module:engine/view/view~View} view View controller to which the quirks handling will be injected.
|
|
173
162
|
*/
|
|
174
|
-
export function injectUiElementHandling(
|
|
175
|
-
|
|
163
|
+
export function injectUiElementHandling(view) {
|
|
164
|
+
view.document.on('arrowKey', (evt, data) => jumpOverUiElement(evt, data, view.domConverter), { priority: 'low' });
|
|
176
165
|
}
|
|
177
|
-
|
|
178
166
|
// Returns `null` because block filler is not needed for UIElements.
|
|
179
167
|
//
|
|
180
168
|
// @returns {null}
|
|
181
169
|
function getFillerOffset() {
|
|
182
|
-
|
|
170
|
+
return null;
|
|
183
171
|
}
|
|
184
|
-
|
|
185
172
|
// Selection cannot be placed in a `UIElement`. Whenever it is placed there, it is moved before it. This
|
|
186
173
|
// causes a situation when it is impossible to jump over `UIElement` using right arrow key, because the selection
|
|
187
174
|
// ends up in ui element (in DOM) and is moved back to the left. This handler fixes this situation.
|
|
188
|
-
function jumpOverUiElement(
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
domSelection.collapse( newDomPosition.parent, newDomPosition.offset );
|
|
231
|
-
} else {
|
|
232
|
-
// Selection was not collapse, so extend it instead of collapsing.
|
|
233
|
-
domSelection.extend( newDomPosition.parent, newDomPosition.offset );
|
|
234
|
-
}
|
|
235
|
-
}
|
|
236
|
-
}
|
|
237
|
-
}
|
|
175
|
+
function jumpOverUiElement(evt, data, domConverter) {
|
|
176
|
+
if (data.keyCode == keyCodes.arrowright) {
|
|
177
|
+
const domSelection = data.domTarget.ownerDocument.defaultView.getSelection();
|
|
178
|
+
const domSelectionCollapsed = domSelection.rangeCount == 1 && domSelection.getRangeAt(0).collapsed;
|
|
179
|
+
// Jump over UI element if selection is collapsed or shift key is pressed. These are the cases when selection would extend.
|
|
180
|
+
if (domSelectionCollapsed || data.shiftKey) {
|
|
181
|
+
const domParent = domSelection.focusNode;
|
|
182
|
+
const domOffset = domSelection.focusOffset;
|
|
183
|
+
const viewPosition = domConverter.domPositionToView(domParent, domOffset);
|
|
184
|
+
// In case if dom element is not converted to view or is not mapped or something. Happens for example in some tests.
|
|
185
|
+
if (viewPosition === null) {
|
|
186
|
+
return;
|
|
187
|
+
}
|
|
188
|
+
// Skip all following ui elements.
|
|
189
|
+
let jumpedOverAnyUiElement = false;
|
|
190
|
+
const nextViewPosition = viewPosition.getLastMatchingPosition(value => {
|
|
191
|
+
if (value.item.is('uiElement')) {
|
|
192
|
+
// Remember that there was at least one ui element.
|
|
193
|
+
jumpedOverAnyUiElement = true;
|
|
194
|
+
}
|
|
195
|
+
// Jump over ui elements, jump over empty attribute elements, move up from inside of attribute element.
|
|
196
|
+
if (value.item.is('uiElement') || value.item.is('attributeElement')) {
|
|
197
|
+
return true;
|
|
198
|
+
}
|
|
199
|
+
// Don't jump over text or don't get out of container element.
|
|
200
|
+
return false;
|
|
201
|
+
});
|
|
202
|
+
// If anything has been skipped, fix position.
|
|
203
|
+
// This `if` could be possibly omitted but maybe it is better not to mess with DOM selection if not needed.
|
|
204
|
+
if (jumpedOverAnyUiElement) {
|
|
205
|
+
const newDomPosition = domConverter.viewPositionToDom(nextViewPosition);
|
|
206
|
+
if (domSelectionCollapsed) {
|
|
207
|
+
// Selection was collapsed, so collapse it at further position.
|
|
208
|
+
domSelection.collapse(newDomPosition.parent, newDomPosition.offset);
|
|
209
|
+
}
|
|
210
|
+
else {
|
|
211
|
+
// Selection was not collapse, so extend it instead of collapsing.
|
|
212
|
+
domSelection.extend(newDomPosition.parent, newDomPosition.offset);
|
|
213
|
+
}
|
|
214
|
+
}
|
|
215
|
+
}
|
|
216
|
+
}
|
|
238
217
|
}
|