Skip to content

Blocks: update support from __experimentalLayout to layout #34128

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.

Sign up for GitHub

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

Merged
jeherve merged 1 commit into from
Nov 15, 2023
Merged

Blocks: update support from __experimentalLayout to layout #34128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
Blocks: update support from __experimentalLayout to layout 
Fixes #32853

Block support for layout has now graduated from experimental to stable. Everything works the same; the only difference is that when adding block support for layout in block.json, its name is now layout instead of __experimentalLayout.
  • Loading branch information
@jeherve
jeherve committed Nov 14, 2023
commit 5543c52a0e2ee8cbd02bc22f8fb3ec0dd01fa5a1
4 changes: 4 additions & 0 deletions projects/plugins/jetpack/changelog/update-block-layout-support
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: patch
Type: other

Blocks: update block support from __experimentalLayout to layout.
2 changes: 1 addition & 1 deletion projects/plugins/jetpack/extensions/blocks/payment-buttons/block.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
"blockGap": true
}
},
"__experimentalLayout": {
"layout": {
"allowSwitching": false,
"allowInheriting": false,
"default": {
Expand Down
2 changes: 1 addition & 1 deletion projects/plugins/jetpack/extensions/blocks/payment-buttons/edit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ function PaymentButtonsEdit( { clientId, attributes } ) {
orientation: 'horizontal',
template: [ [ 'jetpack/recurring-payments' ] ],
templateInsertUpdatesSelection: true,
__experimentalLayout: layout,
layout,
} );

// The ID needs to be just on the outermost wrapper - the toolbar and wpcom upgrade nudge
Expand Down
2 changes: 1 addition & 1 deletion projects/plugins/jetpack/extensions/blocks/payment-buttons/payment-buttons.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ function register_block() {
array(
'render_callback' => __NAMESPACE__ . '\render_block',
'supports' => array(
'__experimentalLayout' => array(
'layout' => array(
'allowSwitching' => false,
'allowInheriting' => false,
'default' => array(
Expand Down
2 changes: 1 addition & 1 deletion projects/plugins/jetpack/extensions/blocks/premium-content/buttons/edit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ function ButtonsEdit( { context, subscribeButton, setSubscribeButtonPlan } ) {
allowedBlocks={ ALLOWED_BLOCKS }
template={ isPreview ? previewTemplate : template }
templateInsertUpdatesSelection={ false }
__experimentalLayout={ { type: 'default', alignments: [] } }
layout={ { type: 'default', alignments: [] } }
__experimentalMoverDirection="horizontal"
/>
</div>
Expand Down
2 changes: 1 addition & 1 deletion projects/plugins/jetpack/extensions/blocks/tiled-gallery/edit.native.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ const TiledGalleryEdit = props => {
numColumns: displayedColumns,
marginHorizontal: TILE_SPACING,
marginVertical: TILE_SPACING,
__experimentalLayout: { type: 'default', alignments: [] },
layout: { type: 'default', alignments: [] },
gridProperties: {
numColumns: displayedColumns,
},
Expand Down