Fire addMarker event in data pipeline if marker is at element boundary
#9897
Conversation
| @@ -250,7 +250,7 @@ export default class DataController { | |||
| // Convert markers. | |||
| // For document fragment, simply take the markers assigned to this document fragment. | |||
| // For model root, all markers in that root will be taken. | |||
| // For model element, we need to check which markers are intersecting with this element and relatively modify the markers' ranges. | |||
| // For model element, we need to check which markers are contained in this element and relatively modify the markers' ranges. | |||
There was a problem hiding this comment.
This comment change is not entirely true - markers that are partly in that element are also included.
|
|
||
| if ( intersection ) { | ||
| result.push( [ marker.name, intersection ] ); | ||
| const isMarkerCollapsedAtElementBoundary = markerRange.isCollapsed && ( markerRange.start.isAtStart || markerRange.start.isAtEnd ); |
There was a problem hiding this comment.
| const isMarkerCollapsedAtElementBoundary = markerRange.isCollapsed && ( markerRange.start.isAtStart || markerRange.start.isAtEnd ); | |
| const isMarkerCollapsedAtElementBoundary = markerRange.isCollapsed && ( markerRange.start.isEqual( elementRange.start) || markerRange.start.isEqual( elemenetRange.end ) ); |
There was a problem hiding this comment.
It's worth adding tests for the previous implementation - with a collapsed marker that is at the start or end of some other element (not included in the checked element) and for a collapsed marker at the start or end inside some deeper nested element.
| } ); | ||
| } ); | ||
|
|
||
| data.toView( root ); |
There was a problem hiding this comment.
Let's check how this looks in the view as in other tests it's done.
There was a problem hiding this comment.
I rewrote the tests to make them look similar to others. I didn't use the markerToHighlight conversion, because it seems that it does not allow creating a collapsed marker. Instead, I'm using now markerToData helper.
Suggested merge commit message (convention)
Fix (engine): Fire
addMarkerevent in data pipeline if collapsed marker is at element boundary. Closes #8485.