From 6f02b25db7ae5da8088cfdc1b839adaa9d4efcdf Mon Sep 17 00:00:00 2001
From: tellthemachines <isabel@tellthemachines.com>
Date: Thu, 3 Aug 2023 16:36:31 +1000
Subject: [PATCH 1/2] Add layout and block spacing to details block

---
 docs/reference-guides/core-blocks.md          | 2 +-
 packages/block-library/src/details/block.json | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/docs/reference-guides/core-blocks.md b/docs/reference-guides/core-blocks.md
index 51813220e58240..1ffc04c3f27859 100644
--- a/docs/reference-guides/core-blocks.md
+++ b/docs/reference-guides/core-blocks.md
@@ -248,7 +248,7 @@ Hide and show additional content. ([Source](https://github.com/WordPress/gutenbe
 
 -	**Name:** core/details
 -	**Category:** text
--	**Supports:** align (full, wide), color (background, gradients, link, text), spacing (margin, padding), typography (fontSize, lineHeight), ~~html~~
+-	**Supports:** align (full, wide), color (background, gradients, link, text), layout (~~allowEditing~~), spacing (blockGap, margin, padding), typography (fontSize, lineHeight), ~~html~~
 -	**Attributes:** showContent, summary
 
 ## Embed
diff --git a/packages/block-library/src/details/block.json b/packages/block-library/src/details/block.json
index 222be7357c3fb3..421a4d957e3e63 100644
--- a/packages/block-library/src/details/block.json
+++ b/packages/block-library/src/details/block.json
@@ -35,6 +35,7 @@
 		"spacing": {
 			"margin": true,
 			"padding": true,
+			"blockGap": true,
 			"__experimentalDefaultControls": {
 				"margin": false,
 				"padding": false
@@ -52,6 +53,9 @@
 			"__experimentalDefaultControls": {
 				"fontSize": true
 			}
+		},
+		"layout": {
+			"allowEditing": false
 		}
 	},
 	"editorStyle": "wp-block-details-editor",

From cd6eced8cdf464a708a730ce38a7b974b3d4ca31 Mon Sep 17 00:00:00 2001
From: tellthemachines <isabel@tellthemachines.com>
Date: Fri, 4 Aug 2023 11:57:53 +1000
Subject: [PATCH 2/2] Remove custom gap values.

---
 packages/block-library/src/details/style.scss | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/packages/block-library/src/details/style.scss b/packages/block-library/src/details/style.scss
index 415a3210a50aeb..904e056d049de7 100644
--- a/packages/block-library/src/details/style.scss
+++ b/packages/block-library/src/details/style.scss
@@ -6,14 +6,3 @@
 .wp-block-details summary {
 	cursor: pointer;
 }
-
-// Use block gap for block; falls back to browser default if not supported.
-.wp-block-details > *:not(summary) {
-	margin-block-start: var(--wp--style--block-gap);
-	margin-block-end: 0;
-}
-
-// Remove excess margin from the last block.
-.wp-block-details > *:last-child {
-	margin-bottom: 0;
-}