Cherry-pick PRs for the WordPress 6.1 Beta 3 Release #44656
Conversation
The logical NOT here is a typo. The Query Loop block should display the filter for hierarchical post types; unless the `allowedControls` list omits the control filter.
* Hide the classic block using a filter * Update the comment wording
* Remove border from global styles preview. * Fix spacing. * Add missing semicolon Co-authored-by: Aki Hamano <54422211+t-hamano@users.noreply.github.com> Co-authored-by: Aki Hamano <54422211+t-hamano@users.noreply.github.com>
…inked mode in order to better differentiate sides (#44141)
…tEntityRecords through currying (#44453) Declare GetEntityRecord as a *callable interface* that is callable as usually, but also ships another signature without the state argument. This works around a TypeScript limitation that doesn't allow currying generic functions: ```ts type CurriedState = F extends ( state: any, ...args: infer P ) => infer R ? ( ...args: P ) => R : F; type Selector = <K extends string | number>( state: any, kind: K, key: K extends string ? 'string value' : false ) => K; type BadlyInferredSignature = CurriedState< Selector > // BadlyInferredSignature evaluates to: // (kind: string number, key: false | "string value") => string number ``` The signature without the state parameter shipped as CurriedSignature is used in the return value of `select( coreStore )`. See #41578 for more details. This commit includes a docgen update to add support for typecasting selectors
…rols` to `allowedControls` (#44523)
…plate or content blocks (#44480) * Reordering the filter so that any filters added int the block library get applied first, and become overridden by post editor initialization. Renaming `can` to `canInsert` for clarity * Updated comment * Formatting inline JS comment betterer :P
* ToggleGroupControl: fix unselected icon color * CHANGELOG * Snapshots
… issue (#44526) * Test commit, revert later. * Remove the aria-label from the ComboboxControl and let value take over. * Try suggested changes to TokenInput * CHANGELOG * Improve unit tests * Restore min users for combobox in post author field Co-authored-by: Alex Stine <alex.stine@yourtechadvisors.com>
* Add layout styles from Post Content block to post editor * Fix post content finding logic. * Remove extra styles when Post Content block exists. * templateContent should always be a string * Memoise post content block. * Change function signature and mark experimental * _Really_ make sure templateContent is a string * Update layout type for legacy layouts. * Fix selector specificity and legacy layout logic. * Fix 404s on fetch and only parse content if needed * Fix acces to layout when no Post Content block * Add doc comment to findPostContent * Increase specificity * Remove unneeded LayoutStyle
michalczaplinski
requested review from
spacedmonkey,
ajitbohra,
ellatrix,
tellthemachines and
nerrad
as code owners
There was a problem hiding this comment.
Changes from #44258 and #44506 are looking good! ✅
Those I had to cherry-pick manually because they contained some merge conflicts
This is painful when it happens! I've found the best way to avoid it is to make sure to cherry-pick the commits in the same order as they were merged to trunk. Unfortunately, GH doesn't seem to have a way to order the PRs by date merged, and date of the last change to the PR is not always reliable as comments etc. also count as changes, so with a big list of PRs it can take some time to get them in order 😅
(You can also do something like git rev-list [commit A] | grep $(git rev-parse [commit B]) to check if a certain commit is an ancestor of another but that will probably take even longer than looking through the PR history on GH.)
|
Thank you @michalczaplinski for the PR, and @tellthemachines and @t-hamano for testing! I think I'll merge this PR soon so I can publish the next round of npms and get the sync PR for I'd still like to run the list of cherry-picked PRs (see PR description) by Core folks: @dream-encode @hellofromtonya @audrasjb @desrosj. If y'all disagree with any of those, please LMK -- we'll then revert them and do another round of npms and a new sync PR. |
|
I think I'll use "Rebase and merge" to make it easier to revert individual commits (compared to "Squash and merge"). |
This PR has all the cherry-picked PRs that need to be merged into the
wp/6.1branch (note the PR base) for the WordPress 6.1 Beta 3 release.The PRs (the output format comes from the
other:cherry-picknpm script):These were cleanly cherry-picked by the script:
✅ cherry-pick commit: eb2ded5 for PR: #44634 – Quote block: stop slash insert...
✅ cherry-pick commit: 9d1fe96 for PR: #44630 – Query Loop: Fix condition for ...
✅ cherry-pick commit: 7e9fd39 for PR: #44554 – Hide the Classic block in the ...
✅ cherry-pick commit: 1bbc3ab for PR: #44594 – Fix navigation block console e...
✅ cherry-pick commit: 50bb90d for PR: #44555 – Theme export: Fix broken spaci...
✅ cherry-pick commit: 2159bbb for PR: #44580 – Code Block: Add box-sizing to ...
✅ cherry-pick commit: 14d6500 for PR: #44556 – Remove border from Global Styl...
✅ cherry-pick commit: ad37bdd for PR: #44141 – Spacing presets: Modify the st...
✅ cherry-pick commit: 4a0fbe0 for PR: #44453 – [TypeScript] Preserve the gene...
✅ cherry-pick commit: 4b92996 for PR: #44504 – Theme.json: fix some outline p...
✅ cherry-pick commit: af3f84e for PR: #44516 – Add style-engine to gutenberg ...
✅ cherry-pick commit: 9aaf066 for PR: #44523 – [Block Library - Query Loop]: ...
✅ cherry-pick commit: a3e9d0a for PR: #44520 – PostFeaturedImage: Fix applica...
✅ cherry-pick commit: 32de2fb for PR: #44286 – Post Featured Image: Fix borde...
✅ cherry-pick commit: 61a1bc2 for PR: #44482 – Template editor: fix crashes d...
✅ cherry-pick commit: add234f for PR: #44480 – Template part: prevent adding ...
✅ cherry-pick commit: 33f9e9f for PR: #44425 – Fix rotated image crop area as...
✅ cherry-pick commit: 1876d24 for PR: #44485 – Fix padding/margin visualizer ...
Those I had to cherry-pick manually because they contained some merge conflicts:
#44569 – 0c807b3 – Theme.json: fix some shadow pr...
#44575 – b06eac0 – ToggleGroupControl: fix unsele...
#44526 – 1f4e508 – TokenInput field: try alternat...
#44506 – 4a4d110 – Edit Post: Optimize legacy pos...
#44258 – cf0b87a – Add layout styles from Post Co...