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

Cherry Pick changes for WordPress 6.5 RC3 #59949

Merged
merged 9 commits into from
Mar 18, 2024
Merged

Conversation

youknowriad
Copy link
Contributor

It includes the following fixes:

#59845 – Prevent default on primary+k to prevent command center from opening on navigation link
#59820 – Ensure consistent return type in WP_Navigation_Block_Renderer::get_markup_for_inner_block()
#59801 – Do not focus new navigation block menu until loading is finished
#59842 – Interactivity: Ensure stores are initialized on client
#59875 – Block Hooks: Return early from saving meta data for the navigation without a $post->ID
#59886 – Interactivity API: Prevent non-object state from being added
#59910 – Avoid auto-removing font families without font faces
#59827 – Heading Block: Show default block name in list view when content is empty
#59935 – Font Library: fix JS errors when activating or deactivating system fonts

jeryj and others added 9 commits March 18, 2024 12:29
…59845)

The command center shortcut checks for defaultPrevented to see if it should open or not. To prevent the command center from opening, we need to add event.preventDefault when primary+k is used.
…arkup_for_inner_block()` (#59820)

* Fix for #59814

Fixes get_markup_for_inner_block()

* fix WPCS issues
)

* Do not focus navigation block until loading is finished

When a new navigation is created, we place focus on the navigation block. If we place focus while loading is still happening, focus will be lost when focus the loading is finished and the block gets replaced with the new content.

* Nest loading state inside of navigation ref

Instead of replacing the navigation block after loading, only replace the inside part of it so that focus is not lost

* Add coverage for focus loss on menu creation

* select the navigatiom after import in an effect similar to the method used when creating a menu, this way the select block call is later and the focus is maintained

* remove extraneous dependency causing err on delete newly created menus

* Update test to not determine link control behavior

* No need to return await inside an async function as it will always return a Promise

Co-authored-by: Dave Smith <getdavemail@gmail.com>

---------

Co-authored-by: Andrei Draganescu <andrei.draganescu@automattic.com>
Co-authored-by: Dave Smith <getdavemail@gmail.com>
If a store call happens after interactivity has hydrated, subscriptions may not be made correctly which means that when a store is later added, the subscriptions do not exist and the client will not update. This is undesirable.

We fix this by creating empty stores during directive resolution, ensuring subscriptions can be made so that subsequent store changes will update the client.
…thout a $post->ID (#59875)

Co-authored-by: Bernie Reiter <96308+ockham@users.noreply.github.com>
Co-authored-by: Hugo Drelon <69580439+Hug0-Drelon@users.noreply.github.com>
Ensure that `state` is an object when creating a store for a given namespace.

`store.state` is expected to be an object. There is code that prevents state from being updated if it is not an object, but it's possible to set the state to a non-object initially, which breaks subsequent updates.

Co-authored-by: sirreal <jonsurrell@git.wordpress.org>
Co-authored-by: DAreRodz <darerodz@git.wordpress.org>
…mpty (#59827)


Co-authored-by: t-hamano <wildworks@git.wordpress.org>
Co-authored-by: Mamaduka <mamaduka@git.wordpress.org>
Co-authored-by: andrewserong <andrewserong@git.wordpress.org>
Co-authored-by: getdave <get_dave@git.wordpress.org>
…nts (#59935)

Co-authored-by: creativecoder <grantmkin@git.wordpress.org>
Co-authored-by: madhusudhand <madhudollu@git.wordpress.org>
Co-authored-by: mikachan <mikachan@git.wordpress.org>
Copy link

github-actions bot commented Mar 18, 2024

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 props-bot label.

If you're merging code through a pull request on GitHub, copy and paste the following into the bottom of the merge commit message.

Co-authored-by: jeryj <jeryj@git.wordpress.org>
Co-authored-by: afragen <afragen@git.wordpress.org>
Co-authored-by: sirreal <jonsurrell@git.wordpress.org>
Co-authored-by: tjcafferkey <tomjcafferkey@git.wordpress.org>
Co-authored-by: matiasbenedetto <mmaattiiaass@git.wordpress.org>
Co-authored-by: t-hamano <wildworks@git.wordpress.org>
Co-authored-by: creativecoder <grantmkin@git.wordpress.org>
Co-authored-by: getdave <get_dave@git.wordpress.org>

To understand the WordPress project's expectations around crediting contributors, please review the Contributor Attribution page in the Core Handbook.

Copy link

Warning: Type of PR label mismatch

To merge this PR, it requires exactly 1 label indicating the type of PR. Other labels are optional and not being checked here.

  • Type-related labels to choose from: [Type] Automated Testing, [Type] Breaking Change, [Type] Bug, [Type] Build Tooling, [Type] Code Quality, [Type] Copy, [Type] Developer Documentation, [Type] Enhancement, [Type] Experimental, [Type] Feature, [Type] New API, [Type] Task, [Type] Technical Prototype, [Type] Performance, [Type] Project Management, [Type] Regression, [Type] Security, [Type] WP Core Ticket, Backport from WordPress Core.
  • Labels found: .

Read more about Type labels in Gutenberg. Don't worry if you don't have the required permissions to add labels; the PR reviewer should be able to help with the task.

1 similar comment
Copy link

Warning: Type of PR label mismatch

To merge this PR, it requires exactly 1 label indicating the type of PR. Other labels are optional and not being checked here.

  • Type-related labels to choose from: [Type] Automated Testing, [Type] Breaking Change, [Type] Bug, [Type] Build Tooling, [Type] Code Quality, [Type] Copy, [Type] Developer Documentation, [Type] Enhancement, [Type] Experimental, [Type] Feature, [Type] New API, [Type] Task, [Type] Technical Prototype, [Type] Performance, [Type] Project Management, [Type] Regression, [Type] Security, [Type] WP Core Ticket, Backport from WordPress Core.
  • Labels found: .

Read more about Type labels in Gutenberg. Don't worry if you don't have the required permissions to add labels; the PR reviewer should be able to help with the task.

@youknowriad youknowriad changed the base branch from trunk to wp/6.5 March 18, 2024 11:41
@youknowriad youknowriad added the [Type] Task Issues or PRs that have been broken down into an individual action to take label Mar 18, 2024
@getdave
Copy link
Contributor

getdave commented Mar 18, 2024

I checked and no PRs remain with the backport label. Tests pass. This seems good to merge.

Copy link
Contributor

@getdave getdave left a comment

Choose a reason for hiding this comment

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

LGTM 🚀

@getdave getdave merged commit af185d9 into wp/6.5 Mar 18, 2024
7 of 38 checks passed
@getdave getdave deleted the update/packages-rc2-6.5 branch March 18, 2024 14:03
pento pushed a commit to WordPress/wordpress-develop that referenced this pull request Mar 19, 2024
It includes all the backports from this Gutenberg PR WordPress/gutenberg#59949

Props get_dave, youknowriad.
See #60315.

git-svn-id: https://develop.svn.wordpress.org/trunk@57851 602fd350-edb4-49c9-b593-d223f7449a82
markjaquith pushed a commit to markjaquith/WordPress that referenced this pull request Mar 19, 2024
It includes all the backports from this Gutenberg PR WordPress/gutenberg#59949

Props get_dave, youknowriad.
See #60315.
Built from https://develop.svn.wordpress.org/trunk@57851


git-svn-id: http://core.svn.wordpress.org/trunk@57352 1a063a9b-81f0-0310-95a4-ce76da25c4cd
github-actions bot pushed a commit to platformsh/wordpress-performance that referenced this pull request Mar 19, 2024
It includes all the backports from this Gutenberg PR WordPress/gutenberg#59949

Props get_dave, youknowriad.
See #60315.
Built from https://develop.svn.wordpress.org/trunk@57851


git-svn-id: https://core.svn.wordpress.org/trunk@57352 1a063a9b-81f0-0310-95a4-ce76da25c4cd
pento pushed a commit to WordPress/wordpress-develop that referenced this pull request Mar 19, 2024
It includes all the backports from this Gutenberg PR WordPress/gutenberg#59949

Props get_dave, youknowriad, gziolo.
Reviewed by youknowriad.
Merges [57851] to the 6.5 branch.
See #60315.



git-svn-id: https://develop.svn.wordpress.org/branches/6.5@57852 602fd350-edb4-49c9-b593-d223f7449a82
markjaquith pushed a commit to markjaquith/WordPress that referenced this pull request Mar 19, 2024
It includes all the backports from this Gutenberg PR WordPress/gutenberg#59949

Props get_dave, youknowriad, gziolo.
Reviewed by youknowriad.
Merges [57851] to the 6.5 branch.
See #60315.


Built from https://develop.svn.wordpress.org/branches/6.5@57852


git-svn-id: http://core.svn.wordpress.org/branches/6.5@57353 1a063a9b-81f0-0310-95a4-ce76da25c4cd
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
[Type] Task Issues or PRs that have been broken down into an individual action to take
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

9 participants