Skip to content

Blocks: Fix unique key prop warning #974

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
n7studios merged 7 commits into from
Dec 10, 2025
Merged

Blocks: Fix unique key prop warning #974

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
56d0965
Blocks: Fix unique `key` prop warning
n7studios Dec 9, 2025
0b1e961
Blocks: SelectControl: Use 40px default size
n7studios Dec 9, 2025
8f62b74
Blocks: Fix Static Flag Warning
n7studios Dec 9, 2025
383534e
Apply properties to all controls
n7studios Dec 9, 2025
55ec21a
Merge remote-tracking branch 'origin/block-control-use-next-40px-defa…
n7studios Dec 9, 2025
46168ad
Merge pull request #976 from Kit/fix-block-static-flag-error
n7studios Dec 10, 2025
f4b5a0c
Merge pull request #975 from Kit/block-control-use-next-40px-default-…
n7studios Dec 10, 2025
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
2 changes: 1 addition & 1 deletion resources/backend/css/gutenberg.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
.components-flex-item button.wp-convertkit-refresh-resources {
margin: 24px 0 0 0;
padding: 0;
height: 32px;
height: 40px;
}

.components-flex-item button.wp-convertkit-refresh-resources span.dashicons {
Expand Down
2 changes: 1 addition & 1 deletion resources/backend/js/gutenberg-block-form.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ function convertKitGutenbergFormBlockRenderPreview(block, props) {
{
className: className.join(' '),
},
wp.components.SandBox({
wp.element.createElement(wp.components.SandBox, {
html,
title: block.name,
styles: [
Expand Down
31 changes: 26 additions & 5 deletions resources/backend/js/gutenberg.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,13 @@ function convertKitGutenbergRegisterBlock(block) {
label: field.label,
help: field.description,
value: props.attributes[attribute],

// Add __next40pxDefaultSize and __nextHasNoMarginBottom properties,
// preventing deprecation notices in the block editor and opt in to the new styles
// from 7.0.
__next40pxDefaultSize: true,
__nextHasNoMarginBottom: true,

onChange(value) {
if (field.type === 'number') {
// If value is a blank string i.e. no attribute value was provided,
Expand Down Expand Up @@ -229,10 +236,18 @@ function convertKitGutenbergRegisterBlock(block) {
[
el(
FlexItem,
{},
{
key: attribute + '-select',
},
el(SelectControl, fieldProperties)
),
el(FlexItem, {}, inlineRefreshButton(props)),
el(
FlexItem,
{
key: attribute + '-refresh',
},
inlineRefreshButton(props)
),
]
);

Expand Down Expand Up @@ -509,9 +524,15 @@ function convertKitGutenbergRegisterBlock(block) {
} else {
// Refresh button enabled; display the notice, link and button.
elements = [
!block.has_access_token
? block.no_access_token.notice
: block.no_resources.notice,
el(
'div',
{
key: props.clientId + '-notice',
},
!block.has_access_token
? block.no_access_token.notice
: block.no_resources.notice
),
noticeLink(props, setButtonDisabled),
refreshButton(props, buttonDisabled, setButtonDisabled),
];
Expand Down