@wordpress/block-library 9.0.4 → 9.0.5

package/build-style/style.css

@@ -3439,326 +3439,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.5",
 	"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.4",
 		"@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.4",
 		"@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.4",
 		"@wordpress/primitives": "^4.0.1",
 		"@wordpress/private-apis": "^1.0.2",
-		"@wordpress/reusable-blocks": "^5.0.3",
+		"@wordpress/reusable-blocks": "^5.0.4",
 		"@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": "85486692a3e48b7d863226cf895a21d787434921"
 }

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/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 );
 			} );

package/src/media-text/edit.js

@@ -46,7 +46,7 @@ import {
 	TEMPLATE,
 } from './constants';
 import { unlock } from '../lock-unlock';
-import { TOOLSPANEL_DROPDOWNMENU_PROPS } from '../utils/constants';
+import { useToolsPanelDropdownMenuProps } from '../utils/hooks';
 
 const { ResolutionTool } = unlock( blockEditorPrivateApis );
 
@@ -276,6 +276,7 @@ function MediaTextEdit( {
 			mediaSizeSlug: newMediaSizeSlug,
 		} );
 	};
+	const dropdownMenuProps = useToolsPanelDropdownMenuProps();
 
 	const mediaTextGeneralSettings = (
 		<ToolsPanel
@@ -290,7 +291,7 @@ function MediaTextEdit( {
 					mediaSizeSlug: undefined,
 				} );
 			} }
-			dropdownMenuProps={ TOOLSPANEL_DROPDOWNMENU_PROPS }
+			dropdownMenuProps={ dropdownMenuProps }
 		>
 			<ToolsPanelItem
 				label={ __( 'Media width' ) }

package/src/query/edit/inspector-controls/index.js

@@ -34,7 +34,7 @@ import {
 	isControlAllowed,
 	useTaxonomies,
 } from '../../utils';
-import { TOOLSPANEL_DROPDOWNMENU_PROPS } from '../../../utils/constants';
+import { useToolsPanelDropdownMenuProps } from '../../../utils/hooks';
 
 const { BlockInfo } = unlock( blockEditorPrivateApis );
 
@@ -128,6 +128,7 @@ export default function QueryInspectorControls( props ) {
 		showAuthorControl ||
 		showSearchControl ||
 		showParentControl;
+	const dropdownMenuProps = useToolsPanelDropdownMenuProps();
 
 	return (
 		<>
@@ -221,7 +222,7 @@ export default function QueryInspectorControls( props ) {
 						} );
 						setQuerySearch( '' );
 					} }
-					dropdownMenuProps={ TOOLSPANEL_DROPDOWNMENU_PROPS }
+					dropdownMenuProps={ dropdownMenuProps }
 				>
 					{ showTaxControl && (
 						<ToolsPanelItem

package/src/social-links/style.scss

@@ -107,7 +107,7 @@
 }
 
 // Provide colors for a range of icons.
-.wp-block-social-links:not(.is-style-logos-only) {
+:where(.wp-block-social-links:not(.is-style-logos-only)) {
 	// Generic items such as mail, feed, etc.
 	@import "../social-link/socials-with-bg.scss";
 }
@@ -116,7 +116,7 @@
 // The specificity for this selector has not been reduced to 0-1-0 as per
 // global styles variation selectors as the lack of background should be
 // enforced for this block style.
-.wp-block-social-links.is-style-logos-only {
+:where(.wp-block-social-links.is-style-logos-only) {
 	.wp-social-link {
 		background: none;
 

package/src/utils/hooks.js

@@ -6,6 +6,7 @@ import { useLayoutEffect, useEffect, useRef } from '@wordpress/element';
 import { getBlobByURL, isBlobURL, revokeBlobURL } from '@wordpress/blob';
 import { store as blockEditorStore } from '@wordpress/block-editor';
 import { store as coreStore } from '@wordpress/core-data';
+import { useViewportMatch } from '@wordpress/compose';
 
 /**
  * Returns whether the current user can edit the given entity.
@@ -84,3 +85,16 @@ export function useUploadMediaFromBlobURL( args = {} ) {
 		} );
 	}, [ getSettings ] );
 }
+
+export function useToolsPanelDropdownMenuProps() {
+	const isMobile = useViewportMatch( 'medium', '<' );
+	return ! isMobile
+		? {
+				popoverProps: {
+					placement: 'left-start',
+					// For non-mobile, inner sidebar width (248px) - button width (24px) - border (1px) + padding (16px) + spacing (20px)
+					offset: 259,
+				},
+		  }
+		: {};
+}