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 pinning the balloons to #text nodes #16959

Merged
merged 6 commits into from
Aug 27, 2024
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 20 additions & 11 deletions packages/ckeditor5-ui/src/panel/balloon/balloonpanelview.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import {
isRange,
toUnit,
isVisible,
isText,
ResizeObserver,
type Locale,
type ObservableChangeEvent,
Expand Down Expand Up @@ -396,7 +397,7 @@ export default class BalloonPanelView extends View {
return false;
}

const targetElement = getDomElement( options.target );
let targetElement = getDomElement( options.target );
const limiterElement = options.limiter ? getDomElement( options.limiter ) : global.document.body;

// Then we need to listen on scroll event of eny element in the document.
Expand All @@ -422,17 +423,25 @@ export default class BalloonPanelView extends View {
} );

// Hide the panel if the target element is no longer visible.
if ( targetElement && !this._resizeObserver ) {
const checkVisibility = () => {
// If the target element is no longer visible, hide the panel.
if ( !isVisible( targetElement ) ) {
this.unpin();
}
};
if ( !this._resizeObserver ) {
// If the target element is a text node, we need to check the parent element.
// It's because `ResizeObserver` accept only elements, not text nodes.
if ( targetElement && isText( targetElement ) ) {
targetElement = targetElement.parentElement;
}

if ( targetElement ) {
const checkVisibility = () => {
// If the target element is no longer visible, hide the panel.
if ( !isVisible( targetElement ) ) {
this.unpin();
}
};

// Element is being resized to 0x0 after it's parent became hidden,
// so we need to check size in order to determine if it's visible or not.
this._resizeObserver = new ResizeObserver( targetElement, checkVisibility );
// Element is being resized to 0x0 after it's parent became hidden,
// so we need to check size in order to determine if it's visible or not.
this._resizeObserver = new ResizeObserver( targetElement, checkVisibility );
}
}

return true;
Expand Down
29 changes: 29 additions & 0 deletions packages/ckeditor5-ui/tests/panel/balloon/balloonpanelview.js
Original file line number Diff line number Diff line change
Expand Up @@ -1107,6 +1107,35 @@ describe( 'BalloonPanelView', () => {
expect( view._resizeObserver ).to.be.null;
} );

it( 'should watch parent element visibility changes if target is text node', () => {
const resizeCallbackRef = createResizeObserverCallbackRef();
const textNode = target.appendChild(
document.createTextNode( 'Hello World' )
);

const range = document.createRange();
range.setStart( textNode, 1 );
range.setEnd( textNode, 8 );

view.pin( { target: range, limiter } );
clock.tick( 100 );

expect( view.isVisible ).to.be.true;

// It's still visible, nothing changed.
resizeCallbackRef.current( [ { target } ] );
clock.tick( 100 );
expect( view.isVisible ).to.be.true;

// Hide the target and force call resize callback.
target.style.display = 'none';
resizeCallbackRef.current( [ { target } ] );

// It should be hidden now.
clock.tick( 100 );
expect( view.isVisible ).to.be.false;
} );

function createResizeObserverCallbackRef() {
const resizeCallbackRef = { current: null };

Expand Down
18 changes: 16 additions & 2 deletions packages/ckeditor5-utils/src/dom/isvisible.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
* For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
*/

import isText from './istext.js';

Mati365 marked this conversation as resolved.
Show resolved Hide resolved
/**
* @module utils/dom/isvisible
*/
Expand All @@ -17,6 +19,18 @@
* **Note**: This helper does not check whether the element is hidden by cropping, overflow, etc..
* To check that, use {@link module:utils/dom/rect~Rect} instead.
*/
export default function isVisible( element: HTMLElement | null | undefined ): boolean {
return !!( element && element.getClientRects && element.getClientRects().length );
export default function isVisible( element: Text | HTMLElement | null | undefined ): boolean {
if ( !element ) {
return false;
}

if ( isText( element ) ) {
return isVisible( element.parentElement );
}

if ( element.getClientRects ) {
return !!( element.getClientRects().length );
}

return false;
}
13 changes: 13 additions & 0 deletions packages/ckeditor5-utils/tests/dom/isvisible.js
Original file line number Diff line number Diff line change
Expand Up @@ -80,4 +80,17 @@ describe( 'isVisible()', () => {

expect( isVisible( element ) ).to.be.false;
} );

it( 'should return visibility of parent element if text node is passed', () => {
document.body.appendChild( element );

const textNode = document.createTextNode( 'foo' );
element.appendChild( textNode );

expect( isVisible( textNode ) ).to.be.true;

element.style.display = 'none';

expect( isVisible( textNode ) ).to.be.false;
} );
} );