@wordpress/block-library 8.23.0 → 8.24.1

package/build-style/cover/style.css

@@ -317,20 +317,20 @@
   color: inherit;
   /*rtl:raw: direction: rtl; */
 }
-.wp-block-cover-image p:not(.has-text-color),
-.wp-block-cover-image h1:not(.has-text-color),
-.wp-block-cover-image h2:not(.has-text-color),
-.wp-block-cover-image h3:not(.has-text-color),
-.wp-block-cover-image h4:not(.has-text-color),
-.wp-block-cover-image h5:not(.has-text-color),
-.wp-block-cover-image h6:not(.has-text-color),
-.wp-block-cover p:not(.has-text-color),
-.wp-block-cover h1:not(.has-text-color),
-.wp-block-cover h2:not(.has-text-color),
-.wp-block-cover h3:not(.has-text-color),
-.wp-block-cover h4:not(.has-text-color),
-.wp-block-cover h5:not(.has-text-color),
-.wp-block-cover h6:not(.has-text-color) {
+.wp-block-cover-image p:where(:not(.has-text-color)),
+.wp-block-cover-image h1:where(:not(.has-text-color)),
+.wp-block-cover-image h2:where(:not(.has-text-color)),
+.wp-block-cover-image h3:where(:not(.has-text-color)),
+.wp-block-cover-image h4:where(:not(.has-text-color)),
+.wp-block-cover-image h5:where(:not(.has-text-color)),
+.wp-block-cover-image h6:where(:not(.has-text-color)),
+.wp-block-cover p:where(:not(.has-text-color)),
+.wp-block-cover h1:where(:not(.has-text-color)),
+.wp-block-cover h2:where(:not(.has-text-color)),
+.wp-block-cover h3:where(:not(.has-text-color)),
+.wp-block-cover h4:where(:not(.has-text-color)),
+.wp-block-cover h5:where(:not(.has-text-color)),
+.wp-block-cover h6:where(:not(.has-text-color)) {
   color: inherit;
 }
 .wp-block-cover-image.is-position-top-left,

package/build-style/editor-rtl.css

@@ -1386,9 +1386,6 @@ figure.wp-block-image:not(.wp-block) {
   right: 50%;
   transform: translate(50%, -50%);
 }
-.wp-block-image > a {
-  cursor: default;
-}
 
 .wp-block-image .components-resizable-box__container {
   display: table;
@@ -3160,24 +3157,24 @@ div[data-type="core/post-featured-image"] img {
   background: linear-gradient(-135deg, #020381 0%, #2874fc 100%);
 }
 
-.editor-styles-wrapper {
+:where(.editor-styles-wrapper) {
   --wp--preset--font-size--normal: 16px;
   --wp--preset--font-size--huge: 42px;
 }
 
-.editor-styles-wrapper .has-regular-font-size {
+:where(.editor-styles-wrapper) .has-regular-font-size {
   font-size: 16px;
 }
 
-.editor-styles-wrapper .has-larger-font-size {
+:where(.editor-styles-wrapper) .has-larger-font-size {
   font-size: 42px;
 }
 
-.editor-styles-wrapper .has-normal-font-size {
+:where(.editor-styles-wrapper) .has-normal-font-size {
   font-size: var(--wp--preset--font-size--normal);
 }
 
-.editor-styles-wrapper .has-huge-font-size {
+:where(.editor-styles-wrapper) .has-huge-font-size {
   font-size: var(--wp--preset--font-size--huge);
 }
 
@@ -3187,6 +3184,6 @@ div[data-type="core/post-featured-image"] img {
  * These are only output in the editor, but styles here are NOT prefixed .editor-styles-wrapper.
  * This allows us to create normalization styles that are easily overridden by editor styles.
  */
-.editor-styles-wrapper iframe:not([frameborder]) {
+:where(.editor-styles-wrapper) iframe:not([frameborder]) {
   border: 0;
 }

package/build-style/editor.css

@@ -1394,9 +1394,6 @@ figure.wp-block-image:not(.wp-block) {
   left: 50%;
   transform: translate(-50%, -50%);
 }
-.wp-block-image > a {
-  cursor: default;
-}
 
 .wp-block-image .components-resizable-box__container {
   display: table;
@@ -3171,24 +3168,24 @@ div[data-type="core/post-featured-image"] img {
   background: linear-gradient(135deg, #020381 0%, #2874fc 100%);
 }
 
-.editor-styles-wrapper {
+:where(.editor-styles-wrapper) {
   --wp--preset--font-size--normal: 16px;
   --wp--preset--font-size--huge: 42px;
 }
 
-.editor-styles-wrapper .has-regular-font-size {
+:where(.editor-styles-wrapper) .has-regular-font-size {
   font-size: 16px;
 }
 
-.editor-styles-wrapper .has-larger-font-size {
+:where(.editor-styles-wrapper) .has-larger-font-size {
   font-size: 42px;
 }
 
-.editor-styles-wrapper .has-normal-font-size {
+:where(.editor-styles-wrapper) .has-normal-font-size {
   font-size: var(--wp--preset--font-size--normal);
 }
 
-.editor-styles-wrapper .has-huge-font-size {
+:where(.editor-styles-wrapper) .has-huge-font-size {
   font-size: var(--wp--preset--font-size--huge);
 }
 
@@ -3198,6 +3195,6 @@ div[data-type="core/post-featured-image"] img {
  * These are only output in the editor, but styles here are NOT prefixed .editor-styles-wrapper.
  * This allows us to create normalization styles that are easily overridden by editor styles.
  */
-.editor-styles-wrapper iframe:not([frameborder]) {
+:where(.editor-styles-wrapper) iframe:not([frameborder]) {
   border: 0;
 }

package/build-style/gallery/style-rtl.css

@@ -320,6 +320,34 @@ figure.wp-block-gallery.has-nested-images {
   text-align: center;
   width: 100%;
   box-sizing: border-box;
+  scrollbar-width: thin;
+  scrollbar-gutter: stable both-edges;
+  scrollbar-color: transparent transparent;
+  will-change: transform;
+}
+.wp-block-gallery.has-nested-images figure.wp-block-image figcaption::-webkit-scrollbar {
+  width: 12px;
+  height: 12px;
+}
+.wp-block-gallery.has-nested-images figure.wp-block-image figcaption::-webkit-scrollbar-track {
+  background-color: transparent;
+}
+.wp-block-gallery.has-nested-images figure.wp-block-image figcaption::-webkit-scrollbar-thumb {
+  background-color: transparent;
+  border-radius: 8px;
+  border: 3px solid transparent;
+  background-clip: padding-box;
+}
+.wp-block-gallery.has-nested-images figure.wp-block-image figcaption:hover::-webkit-scrollbar-thumb, .wp-block-gallery.has-nested-images figure.wp-block-image figcaption:focus::-webkit-scrollbar-thumb, .wp-block-gallery.has-nested-images figure.wp-block-image figcaption:focus-within::-webkit-scrollbar-thumb {
+  background-color: rgba(255, 255, 255, 0.8);
+}
+.wp-block-gallery.has-nested-images figure.wp-block-image figcaption:hover, .wp-block-gallery.has-nested-images figure.wp-block-image figcaption:focus, .wp-block-gallery.has-nested-images figure.wp-block-image figcaption:focus-within {
+  scrollbar-color: rgba(255, 255, 255, 0.8) transparent;
+}
+@media (hover: none) {
+  .wp-block-gallery.has-nested-images figure.wp-block-image figcaption {
+    scrollbar-color: rgba(255, 255, 255, 0.8) transparent;
+  }
 }
 .wp-block-gallery.has-nested-images figure.wp-block-image figcaption img {
   display: inline;

package/build-style/gallery/style.css

@@ -320,6 +320,34 @@ figure.wp-block-gallery.has-nested-images {
   text-align: center;
   width: 100%;
   box-sizing: border-box;
+  scrollbar-width: thin;
+  scrollbar-gutter: stable both-edges;
+  scrollbar-color: transparent transparent;
+  will-change: transform;
+}
+.wp-block-gallery.has-nested-images figure.wp-block-image figcaption::-webkit-scrollbar {
+  width: 12px;
+  height: 12px;
+}
+.wp-block-gallery.has-nested-images figure.wp-block-image figcaption::-webkit-scrollbar-track {
+  background-color: transparent;
+}
+.wp-block-gallery.has-nested-images figure.wp-block-image figcaption::-webkit-scrollbar-thumb {
+  background-color: transparent;
+  border-radius: 8px;
+  border: 3px solid transparent;
+  background-clip: padding-box;
+}
+.wp-block-gallery.has-nested-images figure.wp-block-image figcaption:hover::-webkit-scrollbar-thumb, .wp-block-gallery.has-nested-images figure.wp-block-image figcaption:focus::-webkit-scrollbar-thumb, .wp-block-gallery.has-nested-images figure.wp-block-image figcaption:focus-within::-webkit-scrollbar-thumb {
+  background-color: rgba(255, 255, 255, 0.8);
+}
+.wp-block-gallery.has-nested-images figure.wp-block-image figcaption:hover, .wp-block-gallery.has-nested-images figure.wp-block-image figcaption:focus, .wp-block-gallery.has-nested-images figure.wp-block-image figcaption:focus-within {
+  scrollbar-color: rgba(255, 255, 255, 0.8) transparent;
+}
+@media (hover: none) {
+  .wp-block-gallery.has-nested-images figure.wp-block-image figcaption {
+    scrollbar-color: rgba(255, 255, 255, 0.8) transparent;
+  }
 }
 .wp-block-gallery.has-nested-images figure.wp-block-image figcaption img {
   display: inline;

package/build-style/image/editor-rtl.css

@@ -128,9 +128,6 @@ figure.wp-block-image:not(.wp-block) {
   right: 50%;
   transform: translate(50%, -50%);
 }
-.wp-block-image > a {
-  cursor: default;
-}
 
 .wp-block-image .components-resizable-box__container {
   display: table;

package/build-style/image/editor.css

@@ -128,9 +128,6 @@ figure.wp-block-image:not(.wp-block) {
   left: 50%;
   transform: translate(-50%, -50%);
 }
-.wp-block-image > a {
-  cursor: default;
-}
 
 .wp-block-image .components-resizable-box__container {
   display: table;

package/build-style/style-rtl.css

@@ -833,20 +833,20 @@
   z-index: 1;
   color: inherit; direction: rtl;
 }
-.wp-block-cover-image p:not(.has-text-color),
-.wp-block-cover-image h1:not(.has-text-color),
-.wp-block-cover-image h2:not(.has-text-color),
-.wp-block-cover-image h3:not(.has-text-color),
-.wp-block-cover-image h4:not(.has-text-color),
-.wp-block-cover-image h5:not(.has-text-color),
-.wp-block-cover-image h6:not(.has-text-color),
-.wp-block-cover p:not(.has-text-color),
-.wp-block-cover h1:not(.has-text-color),
-.wp-block-cover h2:not(.has-text-color),
-.wp-block-cover h3:not(.has-text-color),
-.wp-block-cover h4:not(.has-text-color),
-.wp-block-cover h5:not(.has-text-color),
-.wp-block-cover h6:not(.has-text-color) {
+.wp-block-cover-image p:where(:not(.has-text-color)),
+.wp-block-cover-image h1:where(:not(.has-text-color)),
+.wp-block-cover-image h2:where(:not(.has-text-color)),
+.wp-block-cover-image h3:where(:not(.has-text-color)),
+.wp-block-cover-image h4:where(:not(.has-text-color)),
+.wp-block-cover-image h5:where(:not(.has-text-color)),
+.wp-block-cover-image h6:where(:not(.has-text-color)),
+.wp-block-cover p:where(:not(.has-text-color)),
+.wp-block-cover h1:where(:not(.has-text-color)),
+.wp-block-cover h2:where(:not(.has-text-color)),
+.wp-block-cover h3:where(:not(.has-text-color)),
+.wp-block-cover h4:where(:not(.has-text-color)),
+.wp-block-cover h5:where(:not(.has-text-color)),
+.wp-block-cover h6:where(:not(.has-text-color)) {
   color: inherit;
 }
 .wp-block-cover-image.is-position-top-left,
@@ -1431,6 +1431,34 @@ figure.wp-block-gallery.has-nested-images {
   text-align: center;
   width: 100%;
   box-sizing: border-box;
+  scrollbar-width: thin;
+  scrollbar-gutter: stable both-edges;
+  scrollbar-color: transparent transparent;
+  will-change: transform;
+}
+.wp-block-gallery.has-nested-images figure.wp-block-image figcaption::-webkit-scrollbar {
+  width: 12px;
+  height: 12px;
+}
+.wp-block-gallery.has-nested-images figure.wp-block-image figcaption::-webkit-scrollbar-track {
+  background-color: transparent;
+}
+.wp-block-gallery.has-nested-images figure.wp-block-image figcaption::-webkit-scrollbar-thumb {
+  background-color: transparent;
+  border-radius: 8px;
+  border: 3px solid transparent;
+  background-clip: padding-box;
+}
+.wp-block-gallery.has-nested-images figure.wp-block-image figcaption:hover::-webkit-scrollbar-thumb, .wp-block-gallery.has-nested-images figure.wp-block-image figcaption:focus::-webkit-scrollbar-thumb, .wp-block-gallery.has-nested-images figure.wp-block-image figcaption:focus-within::-webkit-scrollbar-thumb {
+  background-color: rgba(255, 255, 255, 0.8);
+}
+.wp-block-gallery.has-nested-images figure.wp-block-image figcaption:hover, .wp-block-gallery.has-nested-images figure.wp-block-image figcaption:focus, .wp-block-gallery.has-nested-images figure.wp-block-image figcaption:focus-within {
+  scrollbar-color: rgba(255, 255, 255, 0.8) transparent;
+}
+@media (hover: none) {
+  .wp-block-gallery.has-nested-images figure.wp-block-image figcaption {
+    scrollbar-color: rgba(255, 255, 255, 0.8) transparent;
+  }
 }
 .wp-block-gallery.has-nested-images figure.wp-block-image figcaption img {
   display: inline;

package/build-style/style.css

@@ -840,20 +840,20 @@
   color: inherit;
   /*rtl:raw: direction: rtl; */
 }
-.wp-block-cover-image p:not(.has-text-color),
-.wp-block-cover-image h1:not(.has-text-color),
-.wp-block-cover-image h2:not(.has-text-color),
-.wp-block-cover-image h3:not(.has-text-color),
-.wp-block-cover-image h4:not(.has-text-color),
-.wp-block-cover-image h5:not(.has-text-color),
-.wp-block-cover-image h6:not(.has-text-color),
-.wp-block-cover p:not(.has-text-color),
-.wp-block-cover h1:not(.has-text-color),
-.wp-block-cover h2:not(.has-text-color),
-.wp-block-cover h3:not(.has-text-color),
-.wp-block-cover h4:not(.has-text-color),
-.wp-block-cover h5:not(.has-text-color),
-.wp-block-cover h6:not(.has-text-color) {
+.wp-block-cover-image p:where(:not(.has-text-color)),
+.wp-block-cover-image h1:where(:not(.has-text-color)),
+.wp-block-cover-image h2:where(:not(.has-text-color)),
+.wp-block-cover-image h3:where(:not(.has-text-color)),
+.wp-block-cover-image h4:where(:not(.has-text-color)),
+.wp-block-cover-image h5:where(:not(.has-text-color)),
+.wp-block-cover-image h6:where(:not(.has-text-color)),
+.wp-block-cover p:where(:not(.has-text-color)),
+.wp-block-cover h1:where(:not(.has-text-color)),
+.wp-block-cover h2:where(:not(.has-text-color)),
+.wp-block-cover h3:where(:not(.has-text-color)),
+.wp-block-cover h4:where(:not(.has-text-color)),
+.wp-block-cover h5:where(:not(.has-text-color)),
+.wp-block-cover h6:where(:not(.has-text-color)) {
   color: inherit;
 }
 .wp-block-cover-image.is-position-top-left,
@@ -1439,6 +1439,34 @@ figure.wp-block-gallery.has-nested-images {
   text-align: center;
   width: 100%;
   box-sizing: border-box;
+  scrollbar-width: thin;
+  scrollbar-gutter: stable both-edges;
+  scrollbar-color: transparent transparent;
+  will-change: transform;
+}
+.wp-block-gallery.has-nested-images figure.wp-block-image figcaption::-webkit-scrollbar {
+  width: 12px;
+  height: 12px;
+}
+.wp-block-gallery.has-nested-images figure.wp-block-image figcaption::-webkit-scrollbar-track {
+  background-color: transparent;
+}
+.wp-block-gallery.has-nested-images figure.wp-block-image figcaption::-webkit-scrollbar-thumb {
+  background-color: transparent;
+  border-radius: 8px;
+  border: 3px solid transparent;
+  background-clip: padding-box;
+}
+.wp-block-gallery.has-nested-images figure.wp-block-image figcaption:hover::-webkit-scrollbar-thumb, .wp-block-gallery.has-nested-images figure.wp-block-image figcaption:focus::-webkit-scrollbar-thumb, .wp-block-gallery.has-nested-images figure.wp-block-image figcaption:focus-within::-webkit-scrollbar-thumb {
+  background-color: rgba(255, 255, 255, 0.8);
+}
+.wp-block-gallery.has-nested-images figure.wp-block-image figcaption:hover, .wp-block-gallery.has-nested-images figure.wp-block-image figcaption:focus, .wp-block-gallery.has-nested-images figure.wp-block-image figcaption:focus-within {
+  scrollbar-color: rgba(255, 255, 255, 0.8) transparent;
+}
+@media (hover: none) {
+  .wp-block-gallery.has-nested-images figure.wp-block-image figcaption {
+    scrollbar-color: rgba(255, 255, 255, 0.8) transparent;
+  }
 }
 .wp-block-gallery.has-nested-images figure.wp-block-image figcaption img {
   display: inline;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/block-library",
-	"version": "8.23.0",
+	"version": "8.24.1",
 	"description": "Block library for the WordPress editor.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -31,36 +31,36 @@
 	],
 	"dependencies": {
 		"@babel/runtime": "^7.16.0",
-		"@wordpress/a11y": "^3.46.0",
-		"@wordpress/api-fetch": "^6.43.0",
-		"@wordpress/autop": "^3.46.0",
-		"@wordpress/blob": "^3.46.0",
-		"@wordpress/block-editor": "^12.14.0",
-		"@wordpress/blocks": "^12.23.0",
-		"@wordpress/components": "^25.12.0",
-		"@wordpress/compose": "^6.23.0",
-		"@wordpress/core-data": "^6.23.0",
-		"@wordpress/data": "^9.16.0",
-		"@wordpress/date": "^4.46.0",
-		"@wordpress/deprecated": "^3.46.0",
-		"@wordpress/dom": "^3.46.0",
-		"@wordpress/element": "^5.23.0",
-		"@wordpress/escape-html": "^2.46.0",
-		"@wordpress/hooks": "^3.46.0",
-		"@wordpress/html-entities": "^3.46.0",
-		"@wordpress/i18n": "^4.46.0",
-		"@wordpress/icons": "^9.37.0",
-		"@wordpress/interactivity": "^2.7.0",
-		"@wordpress/keycodes": "^3.46.0",
-		"@wordpress/notices": "^4.14.0",
-		"@wordpress/primitives": "^3.44.0",
-		"@wordpress/private-apis": "^0.28.0",
-		"@wordpress/reusable-blocks": "^4.23.0",
-		"@wordpress/rich-text": "^6.23.0",
-		"@wordpress/server-side-render": "^4.23.0",
-		"@wordpress/url": "^3.47.0",
-		"@wordpress/viewport": "^5.23.0",
-		"@wordpress/wordcount": "^3.46.0",
+		"@wordpress/a11y": "^3.47.0",
+		"@wordpress/api-fetch": "^6.44.0",
+		"@wordpress/autop": "^3.47.0",
+		"@wordpress/blob": "^3.47.0",
+		"@wordpress/block-editor": "^12.15.0",
+		"@wordpress/blocks": "^12.24.0",
+		"@wordpress/components": "^25.13.0",
+		"@wordpress/compose": "^6.24.0",
+		"@wordpress/core-data": "^6.24.0",
+		"@wordpress/data": "^9.17.0",
+		"@wordpress/date": "^4.47.0",
+		"@wordpress/deprecated": "^3.47.0",
+		"@wordpress/dom": "^3.47.0",
+		"@wordpress/element": "^5.24.0",
+		"@wordpress/escape-html": "^2.47.0",
+		"@wordpress/hooks": "^3.47.0",
+		"@wordpress/html-entities": "^3.47.0",
+		"@wordpress/i18n": "^4.47.0",
+		"@wordpress/icons": "^9.38.0",
+		"@wordpress/interactivity": "^3.0.1",
+		"@wordpress/keycodes": "^3.47.0",
+		"@wordpress/notices": "^4.15.0",
+		"@wordpress/primitives": "^3.45.0",
+		"@wordpress/private-apis": "^0.29.0",
+		"@wordpress/reusable-blocks": "^4.24.0",
+		"@wordpress/rich-text": "^6.24.0",
+		"@wordpress/server-side-render": "^4.24.0",
+		"@wordpress/url": "^3.48.0",
+		"@wordpress/viewport": "^5.24.0",
+		"@wordpress/wordcount": "^3.47.0",
 		"change-case": "^4.1.2",
 		"classnames": "^2.3.1",
 		"colord": "^2.7.0",
@@ -78,5 +78,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "839018ff6029ba749780e288e08ff9cd898e50e8"
+	"gitHead": "12b897d7feff1cb00ddbf9016b62c1177d9c0081"
 }

package/src/block/edit.js

@@ -114,33 +114,28 @@ export default function ReusableBlockEdit( {
 			: InnerBlocks.ButtonBlockAppender,
 	} );
 
+	let children = null;
 	if ( hasAlreadyRendered ) {
-		return (
-			<div { ...blockProps }>
-				<Warning>
-					{ __( 'Block cannot be rendered inside itself.' ) }
-				</Warning>
-			</div>
+		children = (
+			<Warning>
+				{ __( 'Block cannot be rendered inside itself.' ) }
+			</Warning>
 		);
 	}
 
 	if ( isMissing ) {
-		return (
-			<div { ...blockProps }>
-				<Warning>
-					{ __( 'Block has been deleted or is unavailable.' ) }
-				</Warning>
-			</div>
+		children = (
+			<Warning>
+				{ __( 'Block has been deleted or is unavailable.' ) }
+			</Warning>
 		);
 	}
 
 	if ( ! hasResolved ) {
-		return (
-			<div { ...blockProps }>
-				<Placeholder>
-					<Spinner />
-				</Placeholder>
-			</div>
+		children = (
+			<Placeholder>
+				<Spinner />
+			</Placeholder>
 		);
 	}
 
@@ -157,7 +152,11 @@ export default function ReusableBlockEdit( {
 					/>
 				</PanelBody>
 			</InspectorControls>
-			<div { ...innerBlocksProps } />
+			{ children === null ? (
+				<div { ...innerBlocksProps } />
+			) : (
+				<div { ...blockProps }>{ children }</div>
+			) }
 		</RecursionProvider>
 	);
 }

package/src/block/edit.native.js

@@ -78,7 +78,7 @@ export default function ReusableBlockEdit( {
 		styles.spinnerDark
 	);
 
-	const { hasResolved, isEditing, isMissing, innerBlockCount } = useSelect(
+	const { hasResolved, isEditing, isMissing } = useSelect(
 		( select ) => {
 			const persistedBlock = select( coreStore ).getEntityRecord(
 				'postType',
@@ -176,20 +176,12 @@ export default function ReusableBlockEdit( {
 						{ infoTitle }
 					</Text>
 					<Text style={ [ infoTextStyle, infoDescriptionStyle ] }>
-						{ innerBlockCount > 1
-							? __(
-									'Alternatively, you can detach and edit these blocks separately by tapping “Detach patterns”.'
-							  )
-							: __(
-									'Alternatively, you can detach and edit this block separately by tapping “Detach pattern”.'
-							  ) }
+						{ __(
+							'Alternatively, you can detach and edit this block separately by tapping “Detach”.'
+						) }
 					</Text>
 					<TextControl
-						label={
-							innerBlockCount > 1
-								? __( 'Detach patterns' )
-								: __( 'Detach pattern' )
-						}
+						label={ __( 'Detach' ) }
 						separatorType="topFullWidth"
 						onPress={ onConvertToRegularBlocks }
 						labelStyle={ actionButtonStyle }

package/src/button/edit.js

@@ -8,6 +8,7 @@ import classnames from 'classnames';
  */
 import { NEW_TAB_TARGET, NOFOLLOW_REL } from './constants';
 import { getUpdatedLinkAttributes } from './get-updated-link-attributes';
+import removeAnchorTag from '../utils/remove-anchor-tag';
 
 /**
  * WordPress dependencies
@@ -166,11 +167,6 @@ function ButtonEdit( props ) {
 
 	const TagName = tagName || 'a';
 
-	function setButtonText( newText ) {
-		// Remove anchor tags from button text content.
-		setAttributes( { text: newText.replace( /<\/?a[^>]*>/g, '' ) } );
-	}
-
 	function onKeyDown( event ) {
 		if ( isKeyboardEvent.primary( event, 'k' ) ) {
 			startEditing( event );
@@ -245,7 +241,11 @@ function ButtonEdit( props ) {
 					aria-label={ __( 'Button text' ) }
 					placeholder={ placeholder || __( 'Add text…' ) }
 					value={ text }
-					onChange={ ( value ) => setButtonText( value ) }
+					onChange={ ( value ) =>
+						setAttributes( {
+							text: removeAnchorTag( value ),
+						} )
+					}
 					withoutInteractiveFormatting
 					className={ classnames(
 						className,

package/src/buttons/test/__snapshots__/edit.native.js.snap

@@ -71,9 +71,3 @@ exports[`Buttons block when a button is shown removing button along with buttons
 <p></p>
 <!-- /wp:paragraph -->"
 `;
-
-exports[`Buttons block when a button is shown removing button along with buttons block removes the button and buttons block when deleting the block using the delete (backspace) key 1`] = `
-"<!-- wp:paragraph -->
-<p></p>
-<!-- /wp:paragraph -->"
-`;

package/src/buttons/test/edit.native.js

@@ -18,7 +18,6 @@ import {
  */
 import { getBlockTypes, unregisterBlockType } from '@wordpress/blocks';
 import { registerCoreBlocks } from '@wordpress/block-library';
-import { BACKSPACE } from '@wordpress/keycodes';
 
 const BUTTONS_HTML = `<!-- wp:buttons -->
 <div class="wp-block-buttons"><!-- wp:button /--></div>
@@ -238,32 +237,6 @@ describe( 'Buttons block', () => {
 
 				expect( getEditorHtml() ).toMatchSnapshot();
 			} );
-
-			it( 'removes the button and buttons block when deleting the block using the delete (backspace) key', async () => {
-				const screen = await initializeEditor( {
-					initialHtml: BUTTONS_HTML,
-				} );
-
-				// Get block
-				const buttonsBlock = await getBlock( screen, 'Buttons' );
-				triggerBlockListLayout( buttonsBlock );
-
-				// Get inner button block
-				const buttonBlock = await getBlock( screen, 'Button' );
-				fireEvent.press( buttonBlock );
-
-				const buttonInput =
-					within( buttonBlock ).getByLabelText( 'Text input. Empty' );
-
-				// Delete block
-				fireEvent( buttonInput, 'onKeyDown', {
-					nativeEvent: {},
-					preventDefault() {},
-					keyCode: BACKSPACE,
-				} );
-
-				expect( getEditorHtml() ).toMatchSnapshot();
-			} );
 		} );
 	} );
 

package/src/column/edit.js

@@ -103,7 +103,7 @@ function ColumnEdit( {
 				/>
 			</BlockControls>
 			<InspectorControls>
-				<PanelBody title={ __( 'Column settings' ) }>
+				<PanelBody title={ __( 'Settings' ) }>
 					<UnitControl
 						label={ __( 'Width' ) }
 						labelPosition="edge"

package/src/column/edit.native.js

@@ -160,7 +160,7 @@ function ColumnEdit( {
 						/>
 					</BlockControls>
 					<InspectorControls>
-						<PanelBody title={ __( 'Column settings' ) }>
+						<PanelBody title={ __( 'Settings' ) }>
 							<UnitControl
 								label={ __( 'Width' ) }
 								min={ 1 }

package/src/cover/edit/index.js

@@ -335,6 +335,7 @@ function CoverEdit( {
 			templateInsertUpdatesSelection: true,
 			allowedBlocks,
 			templateLock,
+			dropZoneElement: ref.current,
 		}
 	);