@wordpress/block-library 9.0.4 → 9.0.6

package/build-style/style.css

@@ -2742,6 +2742,17 @@ p.has-text-align-left[style*="writing-mode:vertical-lr"] {
   margin: 0;
 }
 
+:where(.wp-block-post-comments-form) textarea,
+:where(.wp-block-post-comments-form) input:not([type=submit]) {
+  border: 1px solid #949494;
+  font-size: 1em;
+  font-family: inherit;
+}
+:where(.wp-block-post-comments-form) textarea,
+:where(.wp-block-post-comments-form) input:where(:not([type="submit"]):not([type="checkbox"])) {
+  padding: calc(0.667em + 2px);
+}
+
 .wp-block-post-comments-form {
   box-sizing: border-box;
 }
@@ -2770,16 +2781,6 @@ p.has-text-align-left[style*="writing-mode:vertical-lr"] {
   text-align: center;
   overflow-wrap: break-word;
 }
-.wp-block-post-comments-form textarea,
-.wp-block-post-comments-form input:not([type=submit]) {
-  border: 1px solid #949494;
-  font-size: 1em;
-  font-family: inherit;
-}
-.wp-block-post-comments-form textarea,
-.wp-block-post-comments-form input:not([type=submit]):not([type=checkbox]) {
-  padding: calc(0.667em + 2px);
-}
 .wp-block-post-comments-form .comment-form textarea,
 .wp-block-post-comments-form .comment-form input:not([type=submit]):not([type=checkbox]):not([type=hidden]) {
   display: block;
@@ -3439,326 +3440,326 @@ ul.wp-block-rss.is-grid li {
   fill: currentColor;
 }
 
-.wp-block-social-links:not(.is-style-logos-only) .wp-social-link {
+:where(.wp-block-social-links:not(.is-style-logos-only)) .wp-social-link {
   background-color: #f0f0f0;
   color: #444;
 }
-.wp-block-social-links:not(.is-style-logos-only) .wp-social-link-amazon {
+:where(.wp-block-social-links:not(.is-style-logos-only)) .wp-social-link-amazon {
   background-color: #f90;
   color: #fff;
 }
-.wp-block-social-links:not(.is-style-logos-only) .wp-social-link-bandcamp {
+:where(.wp-block-social-links:not(.is-style-logos-only)) .wp-social-link-bandcamp {
   background-color: #1ea0c3;
   color: #fff;
 }
-.wp-block-social-links:not(.is-style-logos-only) .wp-social-link-behance {
+:where(.wp-block-social-links:not(.is-style-logos-only)) .wp-social-link-behance {
   background-color: #0757fe;
   color: #fff;
 }
-.wp-block-social-links:not(.is-style-logos-only) .wp-social-link-bluesky {
+:where(.wp-block-social-links:not(.is-style-logos-only)) .wp-social-link-bluesky {
   background-color: #0a7aff;
   color: #fff;
 }
-.wp-block-social-links:not(.is-style-logos-only) .wp-social-link-codepen {
+:where(.wp-block-social-links:not(.is-style-logos-only)) .wp-social-link-codepen {
   background-color: #1e1f26;
   color: #fff;
 }
-.wp-block-social-links:not(.is-style-logos-only) .wp-social-link-deviantart {
+:where(.wp-block-social-links:not(.is-style-logos-only)) .wp-social-link-deviantart {
   background-color: #02e49b;
   color: #fff;
 }
-.wp-block-social-links:not(.is-style-logos-only) .wp-social-link-dribbble {
+:where(.wp-block-social-links:not(.is-style-logos-only)) .wp-social-link-dribbble {
   background-color: #e94c89;
   color: #fff;
 }
-.wp-block-social-links:not(.is-style-logos-only) .wp-social-link-dropbox {
+:where(.wp-block-social-links:not(.is-style-logos-only)) .wp-social-link-dropbox {
   background-color: #4280ff;
   color: #fff;
 }
-.wp-block-social-links:not(.is-style-logos-only) .wp-social-link-etsy {
+:where(.wp-block-social-links:not(.is-style-logos-only)) .wp-social-link-etsy {
   background-color: #f45800;
   color: #fff;
 }
-.wp-block-social-links:not(.is-style-logos-only) .wp-social-link-facebook {
+:where(.wp-block-social-links:not(.is-style-logos-only)) .wp-social-link-facebook {
   background-color: #1778f2;
   color: #fff;
 }
-.wp-block-social-links:not(.is-style-logos-only) .wp-social-link-fivehundredpx {
+:where(.wp-block-social-links:not(.is-style-logos-only)) .wp-social-link-fivehundredpx {
   background-color: #000;
   color: #fff;
 }
-.wp-block-social-links:not(.is-style-logos-only) .wp-social-link-flickr {
+:where(.wp-block-social-links:not(.is-style-logos-only)) .wp-social-link-flickr {
   background-color: #0461dd;
   color: #fff;
 }
-.wp-block-social-links:not(.is-style-logos-only) .wp-social-link-foursquare {
+:where(.wp-block-social-links:not(.is-style-logos-only)) .wp-social-link-foursquare {
   background-color: #e65678;
   color: #fff;
 }
-.wp-block-social-links:not(.is-style-logos-only) .wp-social-link-github {
+:where(.wp-block-social-links:not(.is-style-logos-only)) .wp-social-link-github {
   background-color: #24292d;
   color: #fff;
 }
-.wp-block-social-links:not(.is-style-logos-only) .wp-social-link-goodreads {
+:where(.wp-block-social-links:not(.is-style-logos-only)) .wp-social-link-goodreads {
   background-color: #eceadd;
   color: #382110;
 }
-.wp-block-social-links:not(.is-style-logos-only) .wp-social-link-google {
+:where(.wp-block-social-links:not(.is-style-logos-only)) .wp-social-link-google {
   background-color: #ea4434;
   color: #fff;
 }
-.wp-block-social-links:not(.is-style-logos-only) .wp-social-link-gravatar {
+:where(.wp-block-social-links:not(.is-style-logos-only)) .wp-social-link-gravatar {
   background-color: #1d4fc4;
   color: #fff;
 }
-.wp-block-social-links:not(.is-style-logos-only) .wp-social-link-instagram {
+:where(.wp-block-social-links:not(.is-style-logos-only)) .wp-social-link-instagram {
   background-color: #f00075;
   color: #fff;
 }
-.wp-block-social-links:not(.is-style-logos-only) .wp-social-link-lastfm {
+:where(.wp-block-social-links:not(.is-style-logos-only)) .wp-social-link-lastfm {
   background-color: #e21b24;
   color: #fff;
 }
-.wp-block-social-links:not(.is-style-logos-only) .wp-social-link-linkedin {
+:where(.wp-block-social-links:not(.is-style-logos-only)) .wp-social-link-linkedin {
   background-color: #0d66c2;
   color: #fff;
 }
-.wp-block-social-links:not(.is-style-logos-only) .wp-social-link-mastodon {
+:where(.wp-block-social-links:not(.is-style-logos-only)) .wp-social-link-mastodon {
   background-color: #3288d4;
   color: #fff;
 }
-.wp-block-social-links:not(.is-style-logos-only) .wp-social-link-medium {
+:where(.wp-block-social-links:not(.is-style-logos-only)) .wp-social-link-medium {
   background-color: #000;
   color: #fff;
 }
-.wp-block-social-links:not(.is-style-logos-only) .wp-social-link-meetup {
+:where(.wp-block-social-links:not(.is-style-logos-only)) .wp-social-link-meetup {
   background-color: #f6405f;
   color: #fff;
 }
-.wp-block-social-links:not(.is-style-logos-only) .wp-social-link-patreon {
+:where(.wp-block-social-links:not(.is-style-logos-only)) .wp-social-link-patreon {
   background-color: #000;
   color: #fff;
 }
-.wp-block-social-links:not(.is-style-logos-only) .wp-social-link-pinterest {
+:where(.wp-block-social-links:not(.is-style-logos-only)) .wp-social-link-pinterest {
   background-color: #e60122;
   color: #fff;
 }
-.wp-block-social-links:not(.is-style-logos-only) .wp-social-link-pocket {
+:where(.wp-block-social-links:not(.is-style-logos-only)) .wp-social-link-pocket {
   background-color: #ef4155;
   color: #fff;
 }
-.wp-block-social-links:not(.is-style-logos-only) .wp-social-link-reddit {
+:where(.wp-block-social-links:not(.is-style-logos-only)) .wp-social-link-reddit {
   background-color: #ff4500;
   color: #fff;
 }
-.wp-block-social-links:not(.is-style-logos-only) .wp-social-link-skype {
+:where(.wp-block-social-links:not(.is-style-logos-only)) .wp-social-link-skype {
   background-color: #0478d7;
   color: #fff;
 }
-.wp-block-social-links:not(.is-style-logos-only) .wp-social-link-snapchat {
+:where(.wp-block-social-links:not(.is-style-logos-only)) .wp-social-link-snapchat {
   background-color: #fefc00;
   color: #fff;
   stroke: #000;
 }
-.wp-block-social-links:not(.is-style-logos-only) .wp-social-link-soundcloud {
+:where(.wp-block-social-links:not(.is-style-logos-only)) .wp-social-link-soundcloud {
   background-color: #ff5600;
   color: #fff;
 }
-.wp-block-social-links:not(.is-style-logos-only) .wp-social-link-spotify {
+:where(.wp-block-social-links:not(.is-style-logos-only)) .wp-social-link-spotify {
   background-color: #1bd760;
   color: #fff;
 }
-.wp-block-social-links:not(.is-style-logos-only) .wp-social-link-telegram {
+:where(.wp-block-social-links:not(.is-style-logos-only)) .wp-social-link-telegram {
   background-color: #2aabee;
   color: #fff;
 }
-.wp-block-social-links:not(.is-style-logos-only) .wp-social-link-threads {
+:where(.wp-block-social-links:not(.is-style-logos-only)) .wp-social-link-threads {
   background-color: #000;
   color: #fff;
 }
-.wp-block-social-links:not(.is-style-logos-only) .wp-social-link-tiktok {
+:where(.wp-block-social-links:not(.is-style-logos-only)) .wp-social-link-tiktok {
   background-color: #000;
   color: #fff;
 }
-.wp-block-social-links:not(.is-style-logos-only) .wp-social-link-tumblr {
+:where(.wp-block-social-links:not(.is-style-logos-only)) .wp-social-link-tumblr {
   background-color: #011835;
   color: #fff;
 }
-.wp-block-social-links:not(.is-style-logos-only) .wp-social-link-twitch {
+:where(.wp-block-social-links:not(.is-style-logos-only)) .wp-social-link-twitch {
   background-color: #6440a4;
   color: #fff;
 }
-.wp-block-social-links:not(.is-style-logos-only) .wp-social-link-twitter {
+:where(.wp-block-social-links:not(.is-style-logos-only)) .wp-social-link-twitter {
   background-color: #1da1f2;
   color: #fff;
 }
-.wp-block-social-links:not(.is-style-logos-only) .wp-social-link-vimeo {
+:where(.wp-block-social-links:not(.is-style-logos-only)) .wp-social-link-vimeo {
   background-color: #1eb7ea;
   color: #fff;
 }
-.wp-block-social-links:not(.is-style-logos-only) .wp-social-link-vk {
+:where(.wp-block-social-links:not(.is-style-logos-only)) .wp-social-link-vk {
   background-color: #4680c2;
   color: #fff;
 }
-.wp-block-social-links:not(.is-style-logos-only) .wp-social-link-wordpress {
+:where(.wp-block-social-links:not(.is-style-logos-only)) .wp-social-link-wordpress {
   background-color: #3499cd;
   color: #fff;
 }
-.wp-block-social-links:not(.is-style-logos-only) .wp-social-link-whatsapp {
+:where(.wp-block-social-links:not(.is-style-logos-only)) .wp-social-link-whatsapp {
   background-color: #25d366;
   color: #fff;
 }
-.wp-block-social-links:not(.is-style-logos-only) .wp-social-link-x {
+:where(.wp-block-social-links:not(.is-style-logos-only)) .wp-social-link-x {
   background-color: #000;
   color: #fff;
 }
-.wp-block-social-links:not(.is-style-logos-only) .wp-social-link-yelp {
+:where(.wp-block-social-links:not(.is-style-logos-only)) .wp-social-link-yelp {
   background-color: #d32422;
   color: #fff;
 }
-.wp-block-social-links:not(.is-style-logos-only) .wp-social-link-youtube {
+:where(.wp-block-social-links:not(.is-style-logos-only)) .wp-social-link-youtube {
   background-color: #f00;
   color: #fff;
 }
 
-.wp-block-social-links.is-style-logos-only .wp-social-link {
+:where(.wp-block-social-links.is-style-logos-only) .wp-social-link {
   background: none;
 }
-.wp-block-social-links.is-style-logos-only .wp-social-link svg {
+:where(.wp-block-social-links.is-style-logos-only) .wp-social-link svg {
   width: 1.25em;
   height: 1.25em;
 }
-.wp-block-social-links.is-style-logos-only .wp-social-link-amazon {
+:where(.wp-block-social-links.is-style-logos-only) .wp-social-link-amazon {
   color: #f90;
 }
-.wp-block-social-links.is-style-logos-only .wp-social-link-bandcamp {
+:where(.wp-block-social-links.is-style-logos-only) .wp-social-link-bandcamp {
   color: #1ea0c3;
 }
-.wp-block-social-links.is-style-logos-only .wp-social-link-behance {
+:where(.wp-block-social-links.is-style-logos-only) .wp-social-link-behance {
   color: #0757fe;
 }
-.wp-block-social-links.is-style-logos-only .wp-social-link-bluesky {
+:where(.wp-block-social-links.is-style-logos-only) .wp-social-link-bluesky {
   color: #0a7aff;
 }
-.wp-block-social-links.is-style-logos-only .wp-social-link-codepen {
+:where(.wp-block-social-links.is-style-logos-only) .wp-social-link-codepen {
   color: #1e1f26;
 }
-.wp-block-social-links.is-style-logos-only .wp-social-link-deviantart {
+:where(.wp-block-social-links.is-style-logos-only) .wp-social-link-deviantart {
   color: #02e49b;
 }
-.wp-block-social-links.is-style-logos-only .wp-social-link-dribbble {
+:where(.wp-block-social-links.is-style-logos-only) .wp-social-link-dribbble {
   color: #e94c89;
 }
-.wp-block-social-links.is-style-logos-only .wp-social-link-dropbox {
+:where(.wp-block-social-links.is-style-logos-only) .wp-social-link-dropbox {
   color: #4280ff;
 }
-.wp-block-social-links.is-style-logos-only .wp-social-link-etsy {
+:where(.wp-block-social-links.is-style-logos-only) .wp-social-link-etsy {
   color: #f45800;
 }
-.wp-block-social-links.is-style-logos-only .wp-social-link-facebook {
+:where(.wp-block-social-links.is-style-logos-only) .wp-social-link-facebook {
   color: #1778f2;
 }
-.wp-block-social-links.is-style-logos-only .wp-social-link-fivehundredpx {
+:where(.wp-block-social-links.is-style-logos-only) .wp-social-link-fivehundredpx {
   color: #000;
 }
-.wp-block-social-links.is-style-logos-only .wp-social-link-flickr {
+:where(.wp-block-social-links.is-style-logos-only) .wp-social-link-flickr {
   color: #0461dd;
 }
-.wp-block-social-links.is-style-logos-only .wp-social-link-foursquare {
+:where(.wp-block-social-links.is-style-logos-only) .wp-social-link-foursquare {
   color: #e65678;
 }
-.wp-block-social-links.is-style-logos-only .wp-social-link-github {
+:where(.wp-block-social-links.is-style-logos-only) .wp-social-link-github {
   color: #24292d;
 }
-.wp-block-social-links.is-style-logos-only .wp-social-link-goodreads {
+:where(.wp-block-social-links.is-style-logos-only) .wp-social-link-goodreads {
   color: #382110;
 }
-.wp-block-social-links.is-style-logos-only .wp-social-link-google {
+:where(.wp-block-social-links.is-style-logos-only) .wp-social-link-google {
   color: #ea4434;
 }
-.wp-block-social-links.is-style-logos-only .wp-social-link-gravatar {
+:where(.wp-block-social-links.is-style-logos-only) .wp-social-link-gravatar {
   color: #1d4fc4;
 }
-.wp-block-social-links.is-style-logos-only .wp-social-link-instagram {
+:where(.wp-block-social-links.is-style-logos-only) .wp-social-link-instagram {
   color: #f00075;
 }
-.wp-block-social-links.is-style-logos-only .wp-social-link-lastfm {
+:where(.wp-block-social-links.is-style-logos-only) .wp-social-link-lastfm {
   color: #e21b24;
 }
-.wp-block-social-links.is-style-logos-only .wp-social-link-linkedin {
+:where(.wp-block-social-links.is-style-logos-only) .wp-social-link-linkedin {
   color: #0d66c2;
 }
-.wp-block-social-links.is-style-logos-only .wp-social-link-mastodon {
+:where(.wp-block-social-links.is-style-logos-only) .wp-social-link-mastodon {
   color: #3288d4;
 }
-.wp-block-social-links.is-style-logos-only .wp-social-link-medium {
+:where(.wp-block-social-links.is-style-logos-only) .wp-social-link-medium {
   color: #000;
 }
-.wp-block-social-links.is-style-logos-only .wp-social-link-meetup {
+:where(.wp-block-social-links.is-style-logos-only) .wp-social-link-meetup {
   color: #f6405f;
 }
-.wp-block-social-links.is-style-logos-only .wp-social-link-patreon {
+:where(.wp-block-social-links.is-style-logos-only) .wp-social-link-patreon {
   color: #000;
 }
-.wp-block-social-links.is-style-logos-only .wp-social-link-pinterest {
+:where(.wp-block-social-links.is-style-logos-only) .wp-social-link-pinterest {
   color: #e60122;
 }
-.wp-block-social-links.is-style-logos-only .wp-social-link-pocket {
+:where(.wp-block-social-links.is-style-logos-only) .wp-social-link-pocket {
   color: #ef4155;
 }
-.wp-block-social-links.is-style-logos-only .wp-social-link-reddit {
+:where(.wp-block-social-links.is-style-logos-only) .wp-social-link-reddit {
   color: #ff4500;
 }
-.wp-block-social-links.is-style-logos-only .wp-social-link-skype {
+:where(.wp-block-social-links.is-style-logos-only) .wp-social-link-skype {
   color: #0478d7;
 }
-.wp-block-social-links.is-style-logos-only .wp-social-link-snapchat {
+:where(.wp-block-social-links.is-style-logos-only) .wp-social-link-snapchat {
   color: #fff;
   stroke: #000;
 }
-.wp-block-social-links.is-style-logos-only .wp-social-link-soundcloud {
+:where(.wp-block-social-links.is-style-logos-only) .wp-social-link-soundcloud {
   color: #ff5600;
 }
-.wp-block-social-links.is-style-logos-only .wp-social-link-spotify {
+:where(.wp-block-social-links.is-style-logos-only) .wp-social-link-spotify {
   color: #1bd760;
 }
-.wp-block-social-links.is-style-logos-only .wp-social-link-telegram {
+:where(.wp-block-social-links.is-style-logos-only) .wp-social-link-telegram {
   color: #2aabee;
 }
-.wp-block-social-links.is-style-logos-only .wp-social-link-threads {
+:where(.wp-block-social-links.is-style-logos-only) .wp-social-link-threads {
   color: #000;
 }
-.wp-block-social-links.is-style-logos-only .wp-social-link-tiktok {
+:where(.wp-block-social-links.is-style-logos-only) .wp-social-link-tiktok {
   color: #000;
 }
-.wp-block-social-links.is-style-logos-only .wp-social-link-tumblr {
+:where(.wp-block-social-links.is-style-logos-only) .wp-social-link-tumblr {
   color: #011835;
 }
-.wp-block-social-links.is-style-logos-only .wp-social-link-twitch {
+:where(.wp-block-social-links.is-style-logos-only) .wp-social-link-twitch {
   color: #6440a4;
 }
-.wp-block-social-links.is-style-logos-only .wp-social-link-twitter {
+:where(.wp-block-social-links.is-style-logos-only) .wp-social-link-twitter {
   color: #1da1f2;
 }
-.wp-block-social-links.is-style-logos-only .wp-social-link-vimeo {
+:where(.wp-block-social-links.is-style-logos-only) .wp-social-link-vimeo {
   color: #1eb7ea;
 }
-.wp-block-social-links.is-style-logos-only .wp-social-link-vk {
+:where(.wp-block-social-links.is-style-logos-only) .wp-social-link-vk {
   color: #4680c2;
 }
-.wp-block-social-links.is-style-logos-only .wp-social-link-whatsapp {
+:where(.wp-block-social-links.is-style-logos-only) .wp-social-link-whatsapp {
   color: #25d366;
 }
-.wp-block-social-links.is-style-logos-only .wp-social-link-wordpress {
+:where(.wp-block-social-links.is-style-logos-only) .wp-social-link-wordpress {
   color: #3499cd;
 }
-.wp-block-social-links.is-style-logos-only .wp-social-link-x {
+:where(.wp-block-social-links.is-style-logos-only) .wp-social-link-x {
   color: #000;
 }
-.wp-block-social-links.is-style-logos-only .wp-social-link-yelp {
+:where(.wp-block-social-links.is-style-logos-only) .wp-social-link-yelp {
   color: #d32422;
 }
-.wp-block-social-links.is-style-logos-only .wp-social-link-youtube {
+:where(.wp-block-social-links.is-style-logos-only) .wp-social-link-youtube {
   color: #f00;
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/block-library",
-	"version": "9.0.4",
+	"version": "9.0.6",
 	"description": "Block library for the WordPress editor.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -36,11 +36,11 @@
 		"@wordpress/api-fetch": "^7.0.1",
 		"@wordpress/autop": "^4.0.1",
 		"@wordpress/blob": "^4.0.1",
-		"@wordpress/block-editor": "^13.0.3",
+		"@wordpress/block-editor": "^13.0.5",
 		"@wordpress/blocks": "^13.0.3",
 		"@wordpress/components": "^28.0.3",
 		"@wordpress/compose": "^7.0.1",
-		"@wordpress/core-data": "^7.0.3",
+		"@wordpress/core-data": "^7.0.5",
 		"@wordpress/data": "^10.0.2",
 		"@wordpress/date": "^5.0.1",
 		"@wordpress/deprecated": "^4.0.1",
@@ -56,10 +56,10 @@
 		"@wordpress/keyboard-shortcuts": "^5.0.2",
 		"@wordpress/keycodes": "^4.0.1",
 		"@wordpress/notices": "^5.0.2",
-		"@wordpress/patterns": "^2.0.3",
+		"@wordpress/patterns": "^2.0.5",
 		"@wordpress/primitives": "^4.0.1",
 		"@wordpress/private-apis": "^1.0.2",
-		"@wordpress/reusable-blocks": "^5.0.3",
+		"@wordpress/reusable-blocks": "^5.0.5",
 		"@wordpress/rich-text": "^7.0.2",
 		"@wordpress/server-side-render": "^5.0.3",
 		"@wordpress/url": "^4.0.1",
@@ -82,5 +82,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "9dd5f8dcfa4fc7242e5d48be20ee789ad087b432"
+	"gitHead": "38063ae466e1b62d400b910136757a4cafdbe7fa"
 }

package/src/block/block.json

@@ -12,9 +12,13 @@
 			"type": "number"
 		},
 		"content": {
-			"type": "object"
+			"type": "object",
+			"default": {}
 		}
 	},
+	"providesContext": {
+		"pattern/overrides": "content"
+	},
 	"supports": {
 		"customClassName": false,
 		"html": false,

package/src/image/image.js

@@ -49,7 +49,7 @@ import { Caption } from '../utils/caption';
 /**
  * Module constants
  */
-import { TOOLSPANEL_DROPDOWNMENU_PROPS } from '../utils/constants';
+import { useToolsPanelDropdownMenuProps } from '../utils/hooks';
 import { MIN_SIZE, ALLOWED_MEDIA_TYPES } from './constants';
 import { evalAspectRatio } from './utils';
 
@@ -373,6 +373,8 @@ export default function Image( {
 	const lightboxChecked =
 		!! lightbox?.enabled || ( ! lightbox && !! lightboxSetting?.enabled );
 
+	const dropdownMenuProps = useToolsPanelDropdownMenuProps();
+
 	const dimensionsControl = (
 		<DimensionsTool
 			value={ { width, height, scale, aspectRatio } }
@@ -419,7 +421,7 @@ export default function Image( {
 			<ToolsPanel
 				label={ __( 'Settings' ) }
 				resetAll={ resetAll }
-				dropdownMenuProps={ TOOLSPANEL_DROPDOWNMENU_PROPS }
+				dropdownMenuProps={ dropdownMenuProps }
 			>
 				{ isResizable && dimensionsControl }
 			</ToolsPanel>
@@ -443,16 +445,12 @@ export default function Image( {
 				return {};
 			}
 			const { getBlockBindingsSource } = unlock( select( blocksStore ) );
-			const { getBlockParentsByBlockName } = unlock(
-				select( blockEditorStore )
-			);
 			const {
 				url: urlBinding,
 				alt: altBinding,
 				title: titleBinding,
 			} = metadata?.bindings || {};
-			const hasParentPattern =
-				getBlockParentsByBlockName( clientId, 'core/block' ).length > 0;
+			const hasParentPattern = !! context[ 'pattern/overrides' ];
 			const urlBindingSource = getBlockBindingsSource(
 				urlBinding?.source
 			);
@@ -508,7 +506,12 @@ export default function Image( {
 					: __( 'Connected to dynamic data' ),
 			};
 		},
-		[ clientId, isSingleSelected, metadata?.bindings ]
+		[
+			arePatternOverridesEnabled,
+			context,
+			isSingleSelected,
+			metadata?.bindings,
+		]
 	);
 
 	const showUrlInput =
@@ -691,7 +694,7 @@ export default function Image( {
 				<ToolsPanel
 					label={ __( 'Settings' ) }
 					resetAll={ resetAll }
-					dropdownMenuProps={ TOOLSPANEL_DROPDOWNMENU_PROPS }
+					dropdownMenuProps={ dropdownMenuProps }
 				>
 					{ isSingleSelected && (
 						<ToolsPanelItem

package/src/image/index.php

@@ -28,12 +28,33 @@ function render_block_core_image( $attributes, $content, $block ) {
 		return '';
 	}
 
+	$has_id_binding = isset( $attributes['metadata']['bindings']['id'] ) && isset( $attributes['id'] );
+
+	// Ensure the `wp-image-id` classname on the image block supports block bindings.
+	if ( $has_id_binding ) {
+		// If there's a mismatch with the 'wp-image-' class and the actual id, the id was
+		// probably overridden by block bindings. Update it to the correct value.
+		// See https://github.com/WordPress/gutenberg/issues/62886 for why this is needed.
+		$id                       = $attributes['id'];
+		$image_classnames         = $p->get_attribute( 'class' );
+		$class_with_binding_value = "wp-image-$id";
+		if ( is_string( $image_classnames ) && ! str_contains( $image_classnames, $class_with_binding_value ) ) {
+			$image_classnames = preg_replace( '/wp-image-(\d+)/', $class_with_binding_value, $image_classnames );
+			$p->set_attribute( 'class', $image_classnames );
+		}
+	}
+
+	// For backwards compatibility, the data-id html attribute is only set for
+	// image blocks nested in a gallery. Detect if the image is in a gallery by
+	// checking the data-id attribute.
+	// See the `block_core_gallery_data_id_backcompatibility` function.
 	if ( isset( $attributes['data-id'] ) ) {
-		// Adds the data-id="$id" attribute to the img element to provide backwards
-		// compatibility for the Gallery Block, which now wraps Image Blocks within
-		// innerBlocks. The data-id attribute is added in a core/gallery
-		// `render_block_data` hook.
-		$p->set_attribute( 'data-id', $attributes['data-id'] );
+		// If there's a binding for the `id`, the `id` attribute is used for the
+		// value, since `data-id` does not support block bindings.
+		// Else the `data-id` is used for backwards compatibility, since
+		// third parties may be filtering its value.
+		$data_id = $has_id_binding ? $attributes['id'] : $attributes['data-id'];
+		$p->set_attribute( 'data-id', $data_id );
 	}
 
 	$link_destination  = isset( $attributes['linkDestination'] ) ? $attributes['linkDestination'] : 'none';

package/src/list-item/hooks/use-merge.js

@@ -92,11 +92,25 @@ export default function useMerge( clientId, onMerge ) {
 				// list.
 				const [ nestedListClientId ] = getBlockOrder( clientIdB );
 				if ( nestedListClientId ) {
-					moveBlocksToPosition(
-						getBlockOrder( nestedListClientId ),
-						nestedListClientId,
-						getBlockRootClientId( clientIdA )
-					);
+					// If we are merging with the previous list item, and the
+					// previous list item does not have nested list, move the
+					// nested list to the previous list item.
+					if (
+						getPreviousBlockClientId( clientIdB ) === clientIdA &&
+						! getBlockOrder( clientIdA ).length
+					) {
+						moveBlocksToPosition(
+							[ nestedListClientId ],
+							clientIdB,
+							clientIdA
+						);
+					} else {
+						moveBlocksToPosition(
+							getBlockOrder( nestedListClientId ),
+							nestedListClientId,
+							getBlockRootClientId( clientIdA )
+						);
+					}
 				}
 				mergeBlocks( clientIdA, clientIdB );
 			} );