Notes: Collapse note on blur #73158
Merged
Notes: Collapse note on blur #73158
+82
−5
Conversation
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
t-hamano
added
[Type] Bug
|
Size Change: +98 B (0%) Total Size: 2.42 MB
ℹ️ View Unchanged
|
Contributor
Author
|
I think the code quality could still be improved, but for now, it seems to be working as expected. Unfortunately, the package sync for RC1 has already begun, but let's consider whether it's worthwhile to ship this PR in RC2. I will work on refining this PR tomorrow. |
github-project-automation
bot
moved this to 🔎 Needs Review
in WordPress 6.9 Editor Tasks
t-hamano
moved this from 🔎 Needs Review
to 🏗️ In Progress
in WordPress 6.9 Editor Tasks
6 tasks
Mamaduka
reviewed
Nov 11, 2025
Member
Mamaduka
left a comment
Mamaduka
left a comment
There was a problem hiding this comment.
This looks good, @t-hamano! I left some feedback, and I'll try to test this better tomorrow.
I think the code quality could still be improved, but for now, it seems to be working as expected.
I would like to do some refactoring after stable release is out. I think there is room for improvement.
Member
|
For the merge commit here, let's please make sure we also utilize the list of co-authors from the related, now closed, PR: #73141 |
t-hamano
force-pushed
the
notes/on-blur-collapse
branch
from
7d94682 to
13ed27c
Compare
Mamaduka
reviewed
Nov 12, 2025
|
Flaky tests detected in f06d5a0. 🔍 Workflow run URL: https://github.com/WordPress/gutenberg/actions/runs/19324994915
|
|
The following accounts have interacted with this PR and/or linked issues. I will continue to update these lists as activity occurs. You can also manually ask me to refresh this list by adding the If you're merging code through a pull request on GitHub, copy and paste the following into the bottom of the merge commit message. To understand the WordPress project's expectations around crediting contributors, please review the Contributor Attribution page in the Core Handbook. |
t-hamano
moved this from 🏗️ In Progress
to 🔎 Needs Review
in WordPress 6.9 Editor Tasks
desrosj
reviewed
Nov 13, 2025
Co-authored-by: George Mamadashvili <georgemamadashvili@gmail.com>
Contributor
Author
OK, I figured out what is happening.
I'll look into a solution. Maybe we should use 4159287a028866e632ce501dea95a6af.mp4 |
Contributor
Author
|
It may be a bit aggressive, but I think it meets the requirements. 1fadaf1ea54d0321a623829f8cf3eb04.mp4 |
Mamaduka
reviewed
Nov 13, 2025
Member
Mamaduka
left a comment
Mamaduka
left a comment
There was a problem hiding this comment.
Nice work, @t-hamano!
It's a pity that we have to use so many safeguard in onBlur callback, but I don't have any better ideas.
It would be nice to get more testing and eyes on this.
I've noticed a small issue when selection moves to "orphaned" note. The spotlight remains.
Something like following should fix that. I've intentionally have condition for block selecction.
diff --git a/packages/editor/src/components/collab-sidebar/comments.js b/packages/editor/src/components/collab-sidebar/comments.js
index c35d3a7b68..64cbb21353 100644
--- a/packages/editor/src/components/collab-sidebar/comments.js
+++ b/packages/editor/src/components/collab-sidebar/comments.js
@@ -518,10 +518,10 @@ function Thread( {
const handleCommentSelect = () => {
setNewNoteFormState( 'closed' );
setSelectedThread( thread.id );
+ toggleBlockSpotlight( thread.blockClientId, true );
if ( !! thread.blockClientId ) {
// Pass `null` as the second parameter to prevent focusing the block.
selectBlock( thread.blockClientId, null );
- toggleBlockSpotlight( thread.blockClientId, true );
}
};Screencast
Co-authored-by: George Mamadashvili <georgemamadashvili@gmail.com>
Mamaduka
approved these changes
Nov 14, 2025
Member
Mamaduka
left a comment
Mamaduka
left a comment
There was a problem hiding this comment.
Can't spot any other issues and I like the fixed behavior. Since we're backporting this into RC, it would be nice to get more testing.
Contributor
Author
Contributor
Author
|
The Gutenberg package sync is planned at UTC9 tomorrow. Unless there is other feedback, I'd like to merge this PR in time for the package sync tomorrow. |
Member
|
I ended up testing this just in Playground because my local environment still won't run Everything seems to be working great and I think it's a good improvement. There is one nuance that I noticed, though. When you clock off of a note, the click off does not sync to the opposite view for notes. So when the all notes panel is open, clicking off a selected note leaves the note expanded for the floating drawer of notes. blur-testing.mov |
Contributor
|
I can confirm @desrosj results here, testing on my local. The expand/collapse state in this case doesn't sync between the Notes panel and the floating Notes sidebar. To replicate:
Additionally, expanding the Notes panel after step 5 will copy over the Note state to the expanded panel, meaning the Note that was previously collapsed before closing the panel will now be expanded. |
Contributor
Author
|
Thanks for the testing!
I believe this is a known issue that can be seen already in the trunk branch, or in 6.9 RC1. As far as I know, in the current implementation, the state of the floating sidebar and archive sidebar is not synchronized. Perhaps that issue can be addressed in a follow-up release if necessary. |
Member
That works for me. I wanted to mention it, but even with that nuance, the functionality is better with this PR than not. |
Contributor
Author
|
Thanks for the feedback! Now let's backport this PR to 6.9. |
Contributor
Author
|
This is the merged prop based on this comment and the comment: |
github-project-automation
bot
moved this from 🔎 Needs Review
to ✅ Done
in WordPress 6.9 Editor Tasks
github-actions
bot
removed
the
Backport to WP 6.9 Beta/RC
gutenbergplugin
pushed a commit
that referenced
this pull request
Nov 18, 2025
* Notes: Collapse note on blur * Update comment * WIP * Don't debounce onBlur and onFocus * Avoid prop drilling * Simplify conditional statement * Update packages/editor/src/components/collab-sidebar/comments.js Co-authored-by: George Mamadashvili <georgemamadashvili@gmail.com> * Correctly handle onBlur event * Add comment * Fix comment * Fix double space Co-authored-by: George Mamadashvili <georgemamadashvili@gmail.com> * Always toggle block spotlight on note selection --------- Co-authored-by: karthick-murugan <karthickmurugan@git.wordpress.org> Co-authored-by: t-hamano <wildworks@git.wordpress.org> Co-authored-by: jeffpaul <jeffpaul@git.wordpress.org> Co-authored-by: ellatrix <ellatrix@git.wordpress.org> Co-authored-by: Mamaduka <mamaduka@git.wordpress.org> Co-authored-by: desrosj <desrosj@git.wordpress.org> Co-authored-by: Mamaduka <mamaduka@git.wordpress.org> Co-authored-by: roseg43 <gabertronic@git.wordpress.org>
github-actions
bot
added
the
Backported to WP Core
|
I just cherry-picked this PR to the wp/6.9 branch to get it included in the next release: 48171a0 |
pento
pushed a commit
to WordPress/wordpress-develop
that referenced
this pull request
Nov 18, 2025
Changes can be found at https://github.com/WordPress/gutenberg/commits/wp/6.9/. - [Block Bindings: Add unit test coverage for `core/post-data` source](WordPress/gutenberg#73055) - [Block Bindings: Error handling for external sources.](WordPress/gutenberg#72585) - [Notes: Collapse note on blur](WordPress/gutenberg#73158) - [Border-radius values triggers unintended px conversion](WordPress/gutenberg#73324) - [Fix navigation tag entity binding](WordPress/gutenberg#73255) - [DataViews: ensure primary actions are not wrapped in the list layout](WordPress/gutenberg#73345) - [Fix: Fit Text may overflow into the padding area.](WordPress/gutenberg#73327) - [Merge "Icon Size" and "Icon size" translation strings](WordPress/gutenberg#73325) - [Notes: Improve delete confirm message for replies](WordPress/gutenberg#73173) - [Fix: Custom font size taking over fit text.](WordPress/gutenberg#73241) - [Fix a11y of descriptions and alerts for "Invalid" Nav Items](WordPress/gutenberg#73177) - [Stretchy text: Hide variations in Block Inspector (hack)](WordPress/gutenberg#73238) - [Update button label from "Add new note" to "Add new reply"](WordPress/gutenberg#73189) - [Notes: Fix first note creation with pinned sidebar](WordPress/gutenberg#73164) Developed in #10528. See https://make.wordpress.org/core/handbook/about/release-cycle/block-editor-release-process-for-major-releases/#package-updates-and-core-patches. Fixes #64267. Props priethor. git-svn-id: https://develop.svn.wordpress.org/trunk@61262 602fd350-edb4-49c9-b593-d223f7449a82
markjaquith
pushed a commit
to markjaquith/WordPress
that referenced
this pull request
Nov 18, 2025
Changes can be found at https://github.com/WordPress/gutenberg/commits/wp/6.9/. - [Block Bindings: Add unit test coverage for `core/post-data` source](WordPress/gutenberg#73055) - [Block Bindings: Error handling for external sources.](WordPress/gutenberg#72585) - [Notes: Collapse note on blur](WordPress/gutenberg#73158) - [Border-radius values triggers unintended px conversion](WordPress/gutenberg#73324) - [Fix navigation tag entity binding](WordPress/gutenberg#73255) - [DataViews: ensure primary actions are not wrapped in the list layout](WordPress/gutenberg#73345) - [Fix: Fit Text may overflow into the padding area.](WordPress/gutenberg#73327) - [Merge "Icon Size" and "Icon size" translation strings](WordPress/gutenberg#73325) - [Notes: Improve delete confirm message for replies](WordPress/gutenberg#73173) - [Fix: Custom font size taking over fit text.](WordPress/gutenberg#73241) - [Fix a11y of descriptions and alerts for "Invalid" Nav Items](WordPress/gutenberg#73177) - [Stretchy text: Hide variations in Block Inspector (hack)](WordPress/gutenberg#73238) - [Update button label from "Add new note" to "Add new reply"](WordPress/gutenberg#73189) - [Notes: Fix first note creation with pinned sidebar](WordPress/gutenberg#73164) Developed in WordPress/wordpress-develop#10528. See https://make.wordpress.org/core/handbook/about/release-cycle/block-editor-release-process-for-major-releases/#package-updates-and-core-patches. Fixes #64267. Props priethor. Built from https://develop.svn.wordpress.org/trunk@61262 git-svn-id: http://core.svn.wordpress.org/trunk@60574 1a063a9b-81f0-0310-95a4-ce76da25c4cd
github-actions bot
pushed a commit
to platformsh/wordpress-performance
that referenced
this pull request
Nov 18, 2025
Changes can be found at https://github.com/WordPress/gutenberg/commits/wp/6.9/. - [Block Bindings: Add unit test coverage for `core/post-data` source](WordPress/gutenberg#73055) - [Block Bindings: Error handling for external sources.](WordPress/gutenberg#72585) - [Notes: Collapse note on blur](WordPress/gutenberg#73158) - [Border-radius values triggers unintended px conversion](WordPress/gutenberg#73324) - [Fix navigation tag entity binding](WordPress/gutenberg#73255) - [DataViews: ensure primary actions are not wrapped in the list layout](WordPress/gutenberg#73345) - [Fix: Fit Text may overflow into the padding area.](WordPress/gutenberg#73327) - [Merge "Icon Size" and "Icon size" translation strings](WordPress/gutenberg#73325) - [Notes: Improve delete confirm message for replies](WordPress/gutenberg#73173) - [Fix: Custom font size taking over fit text.](WordPress/gutenberg#73241) - [Fix a11y of descriptions and alerts for "Invalid" Nav Items](WordPress/gutenberg#73177) - [Stretchy text: Hide variations in Block Inspector (hack)](WordPress/gutenberg#73238) - [Update button label from "Add new note" to "Add new reply"](WordPress/gutenberg#73189) - [Notes: Fix first note creation with pinned sidebar](WordPress/gutenberg#73164) Developed in WordPress/wordpress-develop#10528. See https://make.wordpress.org/core/handbook/about/release-cycle/block-editor-release-process-for-major-releases/#package-updates-and-core-patches. Fixes #64267. Props priethor. Built from https://develop.svn.wordpress.org/trunk@61262 git-svn-id: https://core.svn.wordpress.org/trunk@60574 1a063a9b-81f0-0310-95a4-ce76da25c4cd
pento
pushed a commit
to WordPress/wordpress-develop
that referenced
this pull request
Nov 18, 2025
Changes can be found at https://github.com/WordPress/gutenberg/commits/wp/6.9/. [Block Bindings: Add unit test coverage for core/post-data source](WordPress/gutenberg#73055) [Block Bindings: Error handling for external sources.](WordPress/gutenberg#72585) [Notes: Collapse note on blur](WordPress/gutenberg#73158) [Border-radius values triggers unintended px conversion](WordPress/gutenberg#73324) [Fix navigation tag entity binding](WordPress/gutenberg#73255) [DataViews: ensure primary actions are not wrapped in the list layout](WordPress/gutenberg#73345) [Fix: Fit Text may overflow into the padding area.](WordPress/gutenberg#73327) [Merge "Icon Size" and "Icon size" translation strings](WordPress/gutenberg#73325) [Notes: Improve delete confirm message for replies](WordPress/gutenberg#73173) [Fix: Custom font size taking over fit text.](WordPress/gutenberg#73241) [Fix a11y of descriptions and alerts for "Invalid" Nav Items](WordPress/gutenberg#73177) [Stretchy text: Hide variations in Block Inspector (hack)](WordPress/gutenberg#73238) [Update button label from "Add new note" to "Add new reply"](WordPress/gutenberg#73189) [Notes: Fix first note creation with pinned sidebar](WordPress/gutenberg#73164) Developed in #10528. See https://make.wordpress.org/core/handbook/about/release-cycle/block-editor-release-process-for-major-releases/#package-updates-and-core-patches. Reviewed by davidbaumwald. Merges [61262] to the 6.9 branch. Props priethor, ellatrix. See #64267. git-svn-id: https://develop.svn.wordpress.org/branches/6.9@61263 602fd350-edb4-49c9-b593-d223f7449a82
markjaquith
pushed a commit
to markjaquith/WordPress
that referenced
this pull request
Nov 18, 2025
Changes can be found at https://github.com/WordPress/gutenberg/commits/wp/6.9/. [Block Bindings: Add unit test coverage for core/post-data source](WordPress/gutenberg#73055) [Block Bindings: Error handling for external sources.](WordPress/gutenberg#72585) [Notes: Collapse note on blur](WordPress/gutenberg#73158) [Border-radius values triggers unintended px conversion](WordPress/gutenberg#73324) [Fix navigation tag entity binding](WordPress/gutenberg#73255) [DataViews: ensure primary actions are not wrapped in the list layout](WordPress/gutenberg#73345) [Fix: Fit Text may overflow into the padding area.](WordPress/gutenberg#73327) [Merge "Icon Size" and "Icon size" translation strings](WordPress/gutenberg#73325) [Notes: Improve delete confirm message for replies](WordPress/gutenberg#73173) [Fix: Custom font size taking over fit text.](WordPress/gutenberg#73241) [Fix a11y of descriptions and alerts for "Invalid" Nav Items](WordPress/gutenberg#73177) [Stretchy text: Hide variations in Block Inspector (hack)](WordPress/gutenberg#73238) [Update button label from "Add new note" to "Add new reply"](WordPress/gutenberg#73189) [Notes: Fix first note creation with pinned sidebar](WordPress/gutenberg#73164) Developed in WordPress/wordpress-develop#10528. See https://make.wordpress.org/core/handbook/about/release-cycle/block-editor-release-process-for-major-releases/#package-updates-and-core-patches. Reviewed by davidbaumwald. Merges [61262] to the 6.9 branch. Props priethor, ellatrix. See #64267. Built from https://develop.svn.wordpress.org/branches/6.9@61263 git-svn-id: http://core.svn.wordpress.org/branches/6.9@60575 1a063a9b-81f0-0310-95a4-ce76da25c4cd
6 tasks
Member
|
FYI I created #73412 as a follow-up to continue chasing down the issue that @desrosj flagged in #73158 (comment) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Closes #72858
What?
This PR collapses the note when the focus is removed from that note.
Why?
The current behavior is intentional, but it differs slightly from what the user expects.
How?
The note will be collapsed when the focus is moved away from the outside of the note. Note that the note will not be collapsed when performing actions within the note, such as opening action popovers or pressing the Approve button.
Testing Instructions
Verify that the autom-collapsing of notes works correctly with both mouse clicks and keyboard navigation.
Screenshots or screencast
f2f523b9ce0672cb6a4060f15e914d28.1.mp4