Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix triple click issue in paragraph with widget #15011

Merged
38 changes: 28 additions & 10 deletions packages/ckeditor5-widget/src/widget.ts
Original file line number Diff line number Diff line change
Expand Up @@ -207,22 +207,25 @@ export default class Widget extends Plugin {
// But at least triple click inside nested editable causes broken selection in Safari.
// For such event, we select the entire nested editable element.
// See: https://github.com/ckeditor/ckeditor5/issues/1463.
if ( ( env.isSafari || env.isGecko ) && domEventData.domEvent.detail >= 3 ) {
const mapper = editor.editing.mapper;
const viewElement = element.is( 'attributeElement' ) ?
element.findAncestor( element => !element.is( 'attributeElement' ) )! : element;
const modelElement = mapper.toModelElement( viewElement )!;

domEventData.preventDefault();

this.editor.model.change( writer => {
writer.setSelection( modelElement, 'in' );
} );
if ( ( env.isSafari || env.isGecko ) && domEventData.domEvent.detail >= 3 ) {
this._setSelectionInAncestorElement( element, domEventData );
}

return;
}

const parentElement = element.parent;

// If triple click should select entire paragraph.
if ( parentElement &&
parentElement.is( 'element' ) &&
!isWidget( parentElement ) &&
domEventData.domEvent.detail >= 3
) {
this._setSelectionInAncestorElement( element, domEventData );
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why are checking the parent element? I'm not sure what this condition is checking.


// If target is not a widget element - check if one of the ancestors is.
if ( !isWidget( element ) ) {
element = element.findAncestor( isWidget );
Expand All @@ -249,6 +252,21 @@ export default class Widget extends Plugin {
this._setSelectionOverElement( modelElement! );
}

private _setSelectionInAncestorElement( element: ViewElement, domEventData: DomEventData<MouseEvent> ): void {
if ( element ) {
const mapper = this.editor.editing.mapper;
const viewElement = element.is( 'attributeElement' ) ?
element.findAncestor( element => !element.is( 'attributeElement' ) )! : element;
const modelElement = mapper.toModelElement( viewElement )!;

domEventData.preventDefault();

this.editor.model.change( writer => {
writer.setSelection( modelElement, 'in' );
} );
}
}

/**
* Handles {@link module:engine/view/document~Document#event:keydown keydown} events and changes
* the model selection when:
Expand Down
21 changes: 21 additions & 0 deletions packages/ckeditor5-widget/tests/widget-integration.js
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,27 @@ describe( 'Widget - integration', () => {
expect( getModelData( model ) ).to.equal( '<widget><nested>foo</nested><nested>[bar]</nested></widget>' );
} );

it( 'should select entire paragraph when triple click', () => {
setModelData( model, '<paragraph>[]foo bar</paragraph>' );

const viewRoot = viewDocument.getRoot();
const paragraph = viewRoot.getChild( 0 );
const preventDefault = sinon.spy();
const domEventDataMock = new DomEventData( view, {
target: view.domConverter.mapViewToDom( paragraph ),
preventDefault,
detail: 3
} );

viewDocument.fire( 'mousedown', domEventDataMock );

sinon.assert.called( preventDefault );

expect( getViewData( view ) ).to.equal( '<p>{foo bar}</p>' );

expect( getModelData( model ) ).to.equal( '<paragraph>[foo bar]</paragraph>' );
} );

it( 'should select the entire nested editable if quadra clicked', () => {
setModelData( model, '[]<widget><nested>foo bar</nested></widget>' );

Expand Down