-
Notifications
You must be signed in to change notification settings - Fork 278
fix(ui5-popover): close the popover once it is out of the viewport #13200
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
Open
duygu-rmdn
wants to merge
8
commits into
main
Choose a base branch
from
prev_popover_overlap
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+161
−0
Open
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
1a3c772
fix(ui5-popover): close the popover once it is out of the viewport
duygu-rmdn 9fa6bb9
fix(ui5-popover): add additional delay
duygu-rmdn f17c9e9
Merge branch 'main' into prev_popover_overlap
duygu-rmdn 6395efc
fix(ui5-dialog): edit tests
duygu-rmdn 1e8bb83
Merge branch 'main' into prev_popover_overlap
duygu-rmdn 6de5b12
Merge remote-tracking branch 'origin/main' into prev_popover_overlap
TeodorTaushanov fdabe5e
Merge remote-tracking branch 'origin/main' into prev_popover_overlap
TeodorTaushanov d7bec63
chore: fix tests
TeodorTaushanov File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -227,6 +227,7 @@ class Popover extends Popup { | |||||
| _oldPlacement?: CalculatedPlacement; | ||||||
| _width?: string; | ||||||
| _height?: string; | ||||||
| _openerIntersectionObserver?: IntersectionObserver | null; | ||||||
|
|
||||||
| _popoverResize: PopoverResize; | ||||||
|
|
||||||
|
|
@@ -290,11 +291,14 @@ class Popover extends Popup { | |||||
| this._initialHeight = this.style.height; | ||||||
|
|
||||||
| this._openerRect = opener.getBoundingClientRect(); | ||||||
| this._observeOpenerVisibility(); | ||||||
|
|
||||||
| await super.openPopup(); | ||||||
| } | ||||||
|
|
||||||
| closePopup(escPressed = false, preventRegistryUpdate = false, preventFocusRestore = false) : void { | ||||||
| this._unobserveOpenerVisibility(); | ||||||
|
|
||||||
| Object.assign(this.style, { | ||||||
| width: this._initialWidth, | ||||||
| height: this._initialHeight, | ||||||
|
|
@@ -363,6 +367,10 @@ class Popover extends Popup { | |||||
|
|
||||||
| let rootNode = this.getRootNode(); | ||||||
|
|
||||||
| if (!rootNode) { | ||||||
| return null; | ||||||
| } | ||||||
|
|
||||||
| if (rootNode === this) { | ||||||
| rootNode = document; | ||||||
| } | ||||||
|
|
@@ -550,6 +558,49 @@ class Popover extends Popup { | |||||
| return top + (Number.parseInt(this.style.top || "0") - actualTop); | ||||||
| } | ||||||
|
|
||||||
| /** | ||||||
| * Callback invoked when the opener element's intersection changes. | ||||||
| * Closes popover when opener is out of view. | ||||||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
? no longer visible in the viewport. ? |
||||||
| * @private | ||||||
| */ | ||||||
| _onOpenerIntersection(entries: Array<IntersectionObserverEntry>): void { | ||||||
| if (this.open && !entries[0]?.isIntersecting) { | ||||||
| this.closePopup(); | ||||||
| } | ||||||
| } | ||||||
|
|
||||||
| /** | ||||||
| * Starts observing the opener element's visibility in the viewport. | ||||||
| * @private | ||||||
| */ | ||||||
| _observeOpenerVisibility(): void { | ||||||
| this._unobserveOpenerVisibility(); | ||||||
|
|
||||||
| const opener = this.getOpenerHTMLElement(this.opener); | ||||||
|
|
||||||
| if (!opener) { | ||||||
| return; | ||||||
| } | ||||||
|
|
||||||
| this._openerIntersectionObserver = new IntersectionObserver( | ||||||
| this._onOpenerIntersection.bind(this), | ||||||
| { threshold: 0 }, | ||||||
| ); | ||||||
|
|
||||||
| this._openerIntersectionObserver.observe(opener); | ||||||
| } | ||||||
|
|
||||||
| /** | ||||||
| * Stops observing and cleans up the IntersectionObserver. | ||||||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
| * @private | ||||||
| */ | ||||||
| _unobserveOpenerVisibility(): void { | ||||||
| if (this._openerIntersectionObserver) { | ||||||
| this._openerIntersectionObserver.disconnect(); | ||||||
| this._openerIntersectionObserver = null; | ||||||
| } | ||||||
| } | ||||||
|
|
||||||
| getPopoverSize(calcScrollHeight: boolean = false): PopoverSize { | ||||||
| const rect = this.getBoundingClientRect(); | ||||||
| const width = rect.width; | ||||||
|
|
||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.