From 4fd82ebce3e235ec8b542d30285b45d7a78883cb Mon Sep 17 00:00:00 2001
From: Aaron Robertshaw <60436221+aaronrobertshaw@users.noreply.github.com>
Date: Fri, 3 Sep 2021 12:03:59 +1000
Subject: [PATCH] Group letter spacing correctly under typography supports
 (#34515)

---
 packages/block-editor/src/hooks/letter-spacing.js | 3 ++-
 packages/blocks/src/api/constants.js              | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/block-editor/src/hooks/letter-spacing.js b/packages/block-editor/src/hooks/letter-spacing.js
index 6de6193fe4d814..25369ae9daaa81 100644
--- a/packages/block-editor/src/hooks/letter-spacing.js
+++ b/packages/block-editor/src/hooks/letter-spacing.js
@@ -14,7 +14,8 @@ import { cleanEmptyObject } from './utils';
  * Key within block settings' supports array indicating support for letter-spacing
  * e.g. settings found in `block.json`.
  */
-export const LETTER_SPACING_SUPPORT_KEY = '__experimentalLetterSpacing';
+export const LETTER_SPACING_SUPPORT_KEY =
+	'typography.__experimentalLetterSpacing';
 
 /**
  * Inspector control panel containing the letter-spacing options.
diff --git a/packages/blocks/src/api/constants.js b/packages/blocks/src/api/constants.js
index ff8cf6fdb94249..2ca489dd609f51 100644
--- a/packages/blocks/src/api/constants.js
+++ b/packages/blocks/src/api/constants.js
@@ -110,7 +110,7 @@ export const __EXPERIMENTAL_STYLE_PROPERTY = {
 	},
 	letterSpacing: {
 		value: [ 'typography', 'letterSpacing' ],
-		support: [ '__experimentalLetterSpacing' ],
+		support: [ 'typography', '__experimentalLetterSpacing' ],
 	},
 	'--wp--style--block-gap': {
 		value: [ 'spacing', 'blockGap' ],