Fix broken clipboard

ckeditor · Aug 16, 2024 · 2e0562d · 2e0562d
1 parent 46c6bbf
commit 2e0562d
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/packages/ckeditor5-clipboard/tests/dragdrop.js b/packages/ckeditor5-clipboard/tests/dragdrop.js
@@ -2436,7 +2436,8 @@ describe( 'Drag and Drop', () => {
  const eventData = prepareEventData( model.document.selection.getLastPosition(), domTarget );
 
  viewDocument.fire( 'mousedown', {
- ...eventData
+ ...eventData,
+ preventDefault
  } );
 
  viewDocument.fire( 'dragstart', {

diff --git a/packages/ckeditor5-engine/src/view/view.ts b/packages/ckeditor5-engine/src/view/view.ts
@@ -824,12 +824,11 @@ export function getPointViewRange(
  rangeOffset?: number;
  }
 ): Range | null {
- const domDoc = ( domEvent.target as HTMLElement ).ownerDocument;
-
- if ( !domDoc ) {
+ if ( !domEvent.target ) {
  return null;
  }
 
+ const domDoc = ( domEvent.target as HTMLElement ).ownerDocument;
  const x = domEvent.clientX;
  const y = domEvent.clientY;
  let domRange;

diff --git a/packages/ckeditor5-widget/src/widget.ts b/packages/ckeditor5-widget/src/widget.ts
@@ -307,14 +307,16 @@ export default class Widget extends Plugin {
  return range && range.start.parent;
  } )();
 
- // If the click target is a text node, we need to get the parent element.
- const clickElementFromPoint = clickTargetFromPoint && clickTargetFromPoint.is( '$text' ) ?
- clickTargetFromPoint.parent : clickTargetFromPoint;
+ // If the click target is a text node, we need to abort heuristics. This is because the text node
+ // can be draggable and focusing the parent node breaks the drag and drop.
+ if ( !clickTargetFromPoint || clickTargetFromPoint.is( '$text' ) ) {
+ return;
+ }
 
  // If the element is a widget, we need to select the widget itself otherwise we need to select the first ancestor widget.
- if ( clickElementFromPoint && clickElementFromPoint.is( 'element' ) ) {
- element = isWidget( clickElementFromPoint ) ?
- clickElementFromPoint : clickElementFromPoint.findAncestor( isWidget );
+ if ( clickTargetFromPoint && clickTargetFromPoint.is( 'element' ) ) {
+ element = isWidget( clickTargetFromPoint ) ?
+ clickTargetFromPoint : clickTargetFromPoint.findAncestor( isWidget );
  }
 
  if ( !element ) {