From a0892133b230cff1119bedcf45ff4f58955ba3db Mon Sep 17 00:00:00 2001
From: Jeff Ong <jonger4@gmail.com>
Date: Mon, 1 Nov 2021 18:10:37 -0400
Subject: [PATCH 1/2] Add experimental support for additional CSS selectors.

---
 lib/class-wp-theme-json-gutenberg.php        | 7 +++++++
 packages/block-library/src/button/block.json | 3 ++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/lib/class-wp-theme-json-gutenberg.php b/lib/class-wp-theme-json-gutenberg.php
index 4ae644e25b15b..d2c6dafaf002a 100644
--- a/lib/class-wp-theme-json-gutenberg.php
+++ b/lib/class-wp-theme-json-gutenberg.php
@@ -424,6 +424,13 @@ private static function get_blocks_metadata() {
 				self::$blocks_metadata[ $block_name ]['duotone'] = $block_type->supports['color']['__experimentalDuotone'];
 			}
 
+			if (
+				isset( $block_type->supports['__experimentalAdditionalSelectors'] ) &&
+				is_string( $block_type->supports['__experimentalAdditionalSelectors'] )
+			) {
+				self::$blocks_metadata[ $block_name ]['selector'] .= ', ' . $block_type->supports['__experimentalAdditionalSelectors'];
+			}
+
 			// Assign defaults, then overwrite those that the block sets by itself.
 			// If the block selector is compounded, will append the element to each
 			// individual block selector.
diff --git a/packages/block-library/src/button/block.json b/packages/block-library/src/button/block.json
index 569ecc47fd0e7..b6f3f370c6e99 100644
--- a/packages/block-library/src/button/block.json
+++ b/packages/block-library/src/button/block.json
@@ -77,7 +77,8 @@
 			"radius": true,
 			"__experimentalSkipSerialization": true
 		},
-		"__experimentalSelector": ".wp-block-button__link"
+		"__experimentalSelector": ".wp-block-button__link",
+		"__experimentalAdditionalSelectors": ".wp-block-search__button, .wp-block-file .wp-block-file__button"
 	},
 	"styles": [
 		{ "name": "fill", "label": "Fill", "isDefault": true },

From 2f49c469bfb1da78d280c10f8eefa327a885e3a4 Mon Sep 17 00:00:00 2001
From: Jeff Ong <jonger4@gmail.com>
Date: Mon, 1 Nov 2021 18:11:07 -0400
Subject: [PATCH 2/2] Update buttons to match default button block styling.

---
 packages/block-library/src/file/style.scss   |  5 +++--
 packages/block-library/src/search/style.scss | 11 ++++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/packages/block-library/src/file/style.scss b/packages/block-library/src/file/style.scss
index 1e9b86588c885..87f5cb362d16b 100644
--- a/packages/block-library/src/file/style.scss
+++ b/packages/block-library/src/file/style.scss
@@ -18,8 +18,9 @@
 		background: #32373c;
 		border-radius: 2em;
 		color: $white;
-		font-size: 0.8em;
-		padding: 0.5em 1em;
+		font-size: inherit;
+		font-family: inherit;
+		padding: calc(0.667em + 2px) calc(1.333em + 2px); // Make padding match button block padding.
 	}
 
 	a.wp-block-file__button {
diff --git a/packages/block-library/src/search/style.scss b/packages/block-library/src/search/style.scss
index da8ca3e866aa8..ce1d00e681b70 100644
--- a/packages/block-library/src/search/style.scss
+++ b/packages/block-library/src/search/style.scss
@@ -1,13 +1,14 @@
 .wp-block-search__button {
 	background: #f7f7f7;
-	border: 1px solid #ccc;
-	padding: 0.375em 0.625em;
+	border: none;
 	color: #32373c;
-	margin-left: 0.625em;
-	word-break: normal;
+	cursor: pointer;
 	font-size: inherit;
 	font-family: inherit;
 	line-height: inherit;
+	margin-left: 0.625em;
+	padding: calc(0.667em + 2px) calc(1.333em + 2px); // Make padding match button block padding.
+	word-break: normal;
 
 	&.has-icon {
 		line-height: 0;
@@ -62,7 +63,7 @@
 	}
 
 	.wp-block-search__button {
-		padding: 0.125em 0.5em;
+		padding: calc(0.667em - 2px) calc(1.333em - 2px); // Make padding match button block padding, minus the padding from being placed inside the search wrapper.
 	}
 }